diff --git a/Code/Game/GameClient/DanBiasGame_Impl.cpp b/Code/Game/GameClient/DanBiasGame_Impl.cpp
index b0107a17..2a46b8d6 100644
--- a/Code/Game/GameClient/DanBiasGame_Impl.cpp
+++ b/Code/Game/GameClient/DanBiasGame_Impl.cpp
@@ -166,6 +166,7 @@ namespace DanBias
 	DanBiasGame::Result DanBiasGame::Update(float deltaTime)
 	{
 		{ // updating mouse input
+		  // TODO: Is obosolete when Dennis's input system is wired in
 			POINT mousePos;
 			GetCursorPos( &mousePos );
 
@@ -179,7 +180,7 @@ namespace DanBias
 			mouseNormalisedY /= (float)(windowVertex.bottom - windowVertex.top);
 
 			data.inputObj.Update( mouseNormalisedX, mouseNormalisedY );
-		}		
+		}
 
 		if( data.serverOwner )
 		{
diff --git a/Code/Game/GameClient/GameClientState/MainState.cpp b/Code/Game/GameClient/GameClientState/MainState.cpp
index f34b9ad6..5b96b385 100644
--- a/Code/Game/GameClient/GameClientState/MainState.cpp
+++ b/Code/Game/GameClient/GameClientState/MainState.cpp
@@ -79,9 +79,10 @@ GameClientState::ClientState MainState::Update( float deltaTime )
 	{
 		bool test = this->privData->input->IsMousePressed();
 		if(test)
-		{
+		{ // HACK: debug trap still in use?
 			int i = 0;
 		};
+
 		this->privData->input->GetMousePos( mouseState.x, mouseState.y );
 		mouseState.mouseButtonPressed = this->privData->input->IsMousePressed();
 	}
diff --git a/Code/Misc/Input/Include/ApplicationKeyboard.h b/Code/Misc/Input/Include/ApplicationKeyboard.h
new file mode 100644
index 00000000..3e506e22
--- /dev/null
+++ b/Code/Misc/Input/Include/ApplicationKeyboard.h
@@ -0,0 +1,22 @@
+/////////////////////////////////////////////////////////////////////
+// Created by [Dan Andersson] [2014]
+/////////////////////////////////////////////////////////////////////
+#ifndef INPUT_APPLICATION_KEBOARD_H
+#define INPUT_APPLICATION_KEBOARD_H
+
+#include "InputObject.h"
+#include <vector>
+
+namespace Input
+{
+	class AplicationKeyboard : public InputObject
+	{
+	public:
+
+	protected:
+		AplicationKeyboard();
+		~AplicationKeyboard();
+	};
+}
+
+#endif // !INPUT_KEBOARD_H
diff --git a/Code/Misc/Input/Include/Win32/Win32ApplicationKeyboard.h b/Code/Misc/Input/Include/Win32/Win32ApplicationKeyboard.h
new file mode 100644
index 00000000..f19f5940
--- /dev/null
+++ b/Code/Misc/Input/Include/Win32/Win32ApplicationKeyboard.h
@@ -0,0 +1,24 @@
+/////////////////////////////////////////////////////////////////////
+// Created by [Dan Andersson] [2014]
+/////////////////////////////////////////////////////////////////////
+#ifndef INPUT_WIN32_APPLICATION_KEBOARD_H
+#define INPUT_WIN32_APPLICATION_KEBOARD_H
+
+#include "..\ApplicationKeyboard.h"
+//#include <Windows.h>
+
+namespace Input
+{
+	class Win32ApplicationKeyboard :public AplicationKeyboard
+	{
+	public:
+		Win32ApplicationKeyboard();
+		~Win32ApplicationKeyboard();
+
+
+	private:
+
+	};
+}
+
+#endif // !INPUT_WIN32_APPLICATION_KEBOARD_H
diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
index 36cbfd54..23827e1d 100644
--- a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
+++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
@@ -224,7 +224,7 @@ namespace Oyster
 #else
 		API::State API::ReloadShaders()
 		{
-
+			return API::State::Sucsess;
 		}
 
 		void API::StartRenderWireFrame()
diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.h b/Code/OysterGraphics/DllInterfaces/GFXAPI.h
index 71e12662..827f639f 100644
--- a/Code/OysterGraphics/DllInterfaces/GFXAPI.h
+++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.h
@@ -38,7 +38,7 @@ namespace Oyster
 			typedef void* Texture;
 
 			static State Init(HWND Window, bool MSAA_Quality, bool Fullscreen, Option options);
-#ifdef _DEBUG
+
 			static State ReloadShaders();
 
 			//should be called after rendered normal models, before GUI or Text rendering
@@ -51,7 +51,6 @@ namespace Oyster
 			static void RenderDebugSphere(Math::Matrix world);
 
 			static void StartRenderFullModel();
-#endif
 			
 			//! @todo Memory Leaks