diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs
index be7d42f..96f4c78 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -1,4 +1,7 @@
 using Robust.Client;
+using Robust.Client.Graphics;
+using Robust.Client.State;
+using Robust.Client.UserInterface.States;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -39,17 +42,19 @@ public sealed class EntryPoint : GameClient
         base.PostInit();
             
         // DEVNOTE: The line below will disable lighting, so you can see in-game sprites without the need for lights
-        //IoCManager.Resolve<ILightManager>().Enabled = false;
+        IoCManager.Resolve<ILightManager>().Enabled = false;
+
+        var stateManager = IoCManager.Resolve<IStateManager>();
+
+        // DEVNOTE: It's recommended to look at how this works! It's for debug purposes and you probably want something prettier for the final game.
+        stateManager.RequestStateChange<DebugBuiltinConnectionScreenState>();
 
         // DEVNOTE: Further setup...
-        var client = IoCManager.Resolve<IBaseClient>();
+        //var client = IoCManager.Resolve<IBaseClient>();
             
         // DEVNOTE: You might want a main menu to connect to a server, or start a singleplayer game.
         // Be sure to check out StateManager for this! Below you'll find examples to start a game.
-            
-        // If you want to connect to a server...
-        // client.ConnectToServer("ip-goes-here", 1212);
-            
+
         // Optionally, singleplayer also works!
         // client.StartSinglePlayer();
     }
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 05cc305..6c20165 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -1,188 +1,197 @@
 version: 1 # Currently unused.
 binds: # These are all the current engine keybinds.
-- function: UIClick
-  type: State
-  key: MouseLeft
-  canFocus: true
-- function: UIRightClick
-  type: State
-  key: MouseRight
-  canFocus: true
-  priority: 10
-- function: CloseModals
-  type: State
-  key: Escape
-  priority: 10
-- function: Use
-  type: State
-  key: MouseLeft
-  canFocus: true
-- function: ShowDebugMonitors
-  type: Toggle
-  key: F3
-- function: HideUI
-  type: Toggle
-  mod1: Shift
-  key: F4
-- function: MoveUp
-  type: State
-  key: W
-- function: MoveLeft
-  type: State
-  key: A
-- function: MoveRight
-  type: State
-  key: D
-- function: MoveDown
-  type: State
-  key: S
-- function: Walk
-  type: State
-  key: Shift
-- function: EditorLinePlace
-  type: State
-  key: MouseLeft
-  canFocus: true
-  mod1: Shift
-- function: EditorGridPlace
-  type: State
-  key: MouseLeft
-  canFocus: true
-  mod1: Control
-- function: EditorPlaceObject
-  type: State
-  key: MouseLeft
-  canFocus: true
-- function: EditorCancelPlace
-  type: State
-  key: MouseRight
-  canFocus: true
-- function: EditorRotateObject
-  type: State
-  key: MouseMiddle
-- function: TextCursorSelect
-  type: State
-  key: MouseLeft
-  mod1: Shift
-  canFocus: true
-- function: ShowDebugConsole
-  type: State
-  key: Tilde
-- function: TextCursorLeft
-  type: State
-  key: Left
-  canRepeat: true
-- function: TextCursorRight
-  type: State
-  key: Right
-  canRepeat: true
-- function: TextCursorWordLeft
-  type: State
-  key: Left
-  mod1: Control
-  canRepeat: true
-  allowSubCombs: true
-- function: TextCursorWordRight
-  type: State
-  key: Right
-  mod1: Control
-  canRepeat: true
-  allowSubCombs: true
-- function: TextCursorBegin
-  type: State
-  key: Home
-- function: TextCursorEnd
-  type: State
-  key: End
-  canRepeat: true
-- function: TextCursorSelectLeft
-  type: State
-  key: Left
-  mod1: Shift
-  canRepeat: true
-  allowSubCombs: true
-- function: TextCursorSelectRight
-  type: State
-  key: Right
-  mod1: Shift
-  canRepeat: true
-  allowSubCombs: true
-- function: TextCursorSelectWordLeft
-  type: State
-  key: Left
-  mod1: Shift
-  mod2: Control
-  canRepeat: true
-  allowSubCombs: true
-- function: TextCursorSelectWordRight
-  type: State
-  key: Right
-  mod1: Shift
-  mod2: Control
-  canRepeat: true
-  allowSubCombs: true
-- function: TextCursorSelectBegin
-  type: State
-  mod1: Shift
-  key: Home
-  allowSubCombs: true
-- function: TextCursorSelectEnd
-  type: State
-  mod1: Shift
-  key: End
-  canRepeat: true
-  allowSubCombs: true
-- function: TextBackspace
-  type: State
-  key: BackSpace
-  canRepeat: true
-- function: TextSubmit
-  type: State
-  key: Return
-- function: TextSubmit
-  type: State
-  key: NumpadEnter
-- function: TextSelectAll
-  type: State
-  key: A
-  mod1: Control
-  allowSubCombs: true
-- function: TextCopy
-  type: State
-  key: C
-  mod1: Control
-  allowSubCombs: true
-- function: TextCut
-  type: State
-  key: X
-  mod1: Control
-  allowSubCombs: true
-- function: TextPaste
-  type: State
-  key: V
-  mod1: Control
-  allowSubCombs: true
-- function: TextHistoryPrev
-  type: State
-  key: Up
-- function: TextHistoryNext
-  type: State
-  key: Down
-- function: TextReleaseFocus
-  type: State
-  key: Escape
-  priority: 15
-- function: TextScrollToBottom
-  type: State
-  key: PageDown
-- function: TextDelete
-  type: State
-  key: Delete
-  canRepeat: true
-- function: GuiTabNavigateNext
-  type: State
-  key: Tab
-- function: GuiTabNavigatePrev
-  type: State
-  key: Tab
-  mod1: Shift
+  - function: UIClick
+    type: State
+    key: MouseLeft
+    canFocus: true
+  - function: UIRightClick
+    type: State
+    key: MouseRight
+    canFocus: true
+    priority: 10
+  - function: CloseModals
+    type: State
+    key: Escape
+    priority: 10
+  - function: Use
+    type: State
+    key: MouseLeft
+    canFocus: true
+  - function: ShowDebugMonitors
+    type: Toggle
+    key: F3
+  - function: HideUI
+    type: Toggle
+    mod1: Shift
+    key: F4
+  - function: MoveUp
+    type: State
+    key: W
+  - function: MoveLeft
+    type: State
+    key: A
+  - function: MoveRight
+    type: State
+    key: D
+  - function: MoveDown
+    type: State
+    key: S
+  - function: Walk
+    type: State
+    key: Shift
+  - function: EditorLinePlace
+    type: State
+    key: MouseLeft
+    canFocus: true
+    mod1: Shift
+  - function: EditorGridPlace
+    type: State
+    key: MouseLeft
+    canFocus: true
+    mod1: Control
+  - function: EditorPlaceObject
+    type: State
+    key: MouseLeft
+    canFocus: true
+  - function: EditorCancelPlace
+    type: State
+    key: MouseRight
+    canFocus: true
+  - function: EditorRotateObject
+    type: State
+    key: MouseMiddle
+  - function: TextCursorSelect
+    type: State
+    key: MouseLeft
+    mod1: Shift
+    canFocus: true
+  - function: ShowDebugConsole
+    type: State
+    key: Tilde
+  - function: TextCursorLeft
+    type: State
+    key: Left
+    canRepeat: true
+  - function: TextCursorRight
+    type: State
+    key: Right
+    canRepeat: true
+  - function: TextCursorWordLeft
+    type: State
+    key: Left
+    mod1: Control
+    canRepeat: true
+    allowSubCombs: true
+  - function: TextCursorWordRight
+    type: State
+    key: Right
+    mod1: Control
+    canRepeat: true
+    allowSubCombs: true
+  - function: TextCursorBegin
+    type: State
+    key: Home
+  - function: TextCursorEnd
+    type: State
+    key: End
+    canRepeat: true
+  - function: TextCursorSelectLeft
+    type: State
+    key: Left
+    mod1: Shift
+    canRepeat: true
+    allowSubCombs: true
+  - function: TextCursorSelectRight
+    type: State
+    key: Right
+    mod1: Shift
+    canRepeat: true
+    allowSubCombs: true
+  - function: TextCursorSelectWordLeft
+    type: State
+    key: Left
+    mod1: Shift
+    mod2: Control
+    canRepeat: true
+    allowSubCombs: true
+  - function: TextCursorSelectWordRight
+    type: State
+    key: Right
+    mod1: Shift
+    mod2: Control
+    canRepeat: true
+    allowSubCombs: true
+  - function: TextCursorSelectBegin
+    type: State
+    mod1: Shift
+    key: Home
+    allowSubCombs: true
+  - function: TextCursorSelectEnd
+    type: State
+    mod1: Shift
+    key: End
+    canRepeat: true
+    allowSubCombs: true
+  - function: TextBackspace
+    type: State
+    key: BackSpace
+    canRepeat: true
+  - function: TextSubmit
+    type: State
+    key: Return
+  - function: TextSubmit
+    type: State
+    key: NumpadEnter
+  - function: TextSelectAll
+    type: State
+    key: A
+    mod1: Control
+    allowSubCombs: true
+  - function: TextCopy
+    type: State
+    key: C
+    mod1: Control
+    allowSubCombs: true
+  - function: TextCut
+    type: State
+    key: X
+    mod1: Control
+    allowSubCombs: true
+  - function: TextPaste
+    type: State
+    key: V
+    mod1: Control
+    allowSubCombs: true
+  - function: TextHistoryPrev
+    type: State
+    key: Up
+  - function: TextHistoryNext
+    type: State
+    key: Down
+  - function: TextReleaseFocus
+    type: State
+    key: Escape
+    priority: 15
+  - function: TextScrollToBottom
+    type: State
+    key: PageDown
+  - function: TextDelete
+    type: State
+    key: Delete
+    canRepeat: true
+  - function: GuiTabNavigateNext
+    type: State
+    key: Tab
+  - function: GuiTabNavigatePrev
+    type: State
+    key: Tab
+    mod1: Shift
+  - function: TextTabComplete
+    type: State
+    key: Tab
+  - function: TextCompleteNext
+    type: State
+    key: Down
+  - function: TextCompletePrev
+    type: State
+    key: Up
\ No newline at end of file
diff --git a/RobustToolbox b/RobustToolbox
index 105aa13..2aaa412 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 105aa13eb1054dc1debef88fc0b24621239100d8
+Subproject commit 2aaa41252a601d7794ba2d095bc21f32d73f5a0a