diff --git a/axios/Axios_WP7.csproj b/axios/Axios_WP7.csproj
index 897dcf9..9df37ff 100644
--- a/axios/Axios_WP7.csproj
+++ b/axios/Axios_WP7.csproj
@@ -155,6 +155,7 @@
     <Compile Include="Dynamics\TimeStep.cs" />
     <Compile Include="Dynamics\World.cs" />
     <Compile Include="Dynamics\WorldCallbacks.cs" />
+    <Compile Include="Engine\AxiosCommandConsole.cs" />
     <Compile Include="Engine\AxiosEvents.cs" />
     <Compile Include="Engine\AxiosGameObject.cs" />
     <Compile Include="Engine\AxiosGameScreen.cs" />
diff --git a/axios/Axios_Windows.csproj b/axios/Axios_Windows.csproj
index 195fc78..8d24a3f 100644
--- a/axios/Axios_Windows.csproj
+++ b/axios/Axios_Windows.csproj
@@ -98,6 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Engine\AxiosBreakableGameObject.cs" />
+    <Compile Include="Engine\AxiosCommandConsole.cs" />
     <Compile Include="Engine\AxiosEvents.cs" />
     <Compile Include="Axios_settings.cs" />
     <Compile Include="Collision\Collision.cs" />
diff --git a/axios/Axios_Xbox_360.csproj b/axios/Axios_Xbox_360.csproj
index 9ce7f6f..33ed00a 100644
--- a/axios/Axios_Xbox_360.csproj
+++ b/axios/Axios_Xbox_360.csproj
@@ -149,6 +149,7 @@
     <Compile Include="Dynamics\World.cs" />
     <Compile Include="Dynamics\WorldCallbacks.cs" />
     <Compile Include="Engine\AxiosBreakableGameObject.cs" />
+    <Compile Include="Engine\AxiosCommandConsole.cs" />
     <Compile Include="Engine\AxiosEvents.cs" />
     <Compile Include="Engine\AxiosGameObject.cs" />
     <Compile Include="Engine\AxiosGameScreen.cs" />
diff --git a/axios/Engine/AxiosCommandConsole.cs b/axios/Engine/AxiosCommandConsole.cs
new file mode 100644
index 0000000..1251e09
--- /dev/null
+++ b/axios/Engine/AxiosCommandConsole.cs
@@ -0,0 +1,26 @@
+#if WINDOWS
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using XNACC.Console;
+using Microsoft.Xna.Framework.Graphics;
+
+namespace Axios.Engine
+{
+    class AxiosCommandConsole : CommandConsoleBase
+    {
+        public AxiosCommandConsole(AxiosGameScreen gameScreen)
+            : base(gameScreen.ScreenManager.Game)
+        {
+            Keyboard = gameScreen.ScreenManager.InputState;
+        }
+
+        public AxiosCommandConsole(AxiosGameScreen gameScreen, SpriteFont font)
+            : base(gameScreen.ScreenManager.Game, font)
+        {
+            Keyboard = gameScreen.ScreenManager.InputState;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/axios/ScreenSystem/ScreenManager.cs b/axios/ScreenSystem/ScreenManager.cs
index dcd2545..eb4f79d 100644
--- a/axios/ScreenSystem/ScreenManager.cs
+++ b/axios/ScreenSystem/ScreenManager.cs
@@ -57,6 +57,11 @@ namespace GameStateManagement
 
         #region Properties
 
+        public InputState InputState
+        {
+            get { return input; }
+            private set { input = value; }
+        }
 
         public SpriteFonts Fonts
         {