diff --git a/Code/GameLogic/DynamicObject.cpp b/Code/GameLogic/DynamicObject.cpp
index 784f04cf..bdb5be0c 100644
--- a/Code/GameLogic/DynamicObject.cpp
+++ b/Code/GameLogic/DynamicObject.cpp
@@ -1,5 +1,6 @@
 #include "DynamicObject.h"
 
+using namespace GameLogic;
 
 DynamicObject::DynamicObject(void)
 {
diff --git a/Code/GameLogic/Game.h b/Code/GameLogic/Game.h
index c5bb9664..7fa0e255 100644
--- a/Code/GameLogic/Game.h
+++ b/Code/GameLogic/Game.h
@@ -12,8 +12,8 @@ namespace GameLogic
 		
 		
 	private:
-		GameLogic::Level *level;
-		GameLogic::Player *player;
+		Level*		level;
+		Player**	player;
 
 	public:
 		Game();
@@ -23,9 +23,5 @@ namespace GameLogic
 		void StartGame();
 		void Update();
 	};
-}
-
-	
-	
-
+}		
 #endif
\ No newline at end of file
diff --git a/Code/GameLogic/GameLogic.vcxproj b/Code/GameLogic/GameLogic.vcxproj
index 14b6c6fc..00e8a192 100644
--- a/Code/GameLogic/GameLogic.vcxproj
+++ b/Code/GameLogic/GameLogic.vcxproj
@@ -153,20 +153,24 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="DynamicObject.h" />
     <ClInclude Include="Game.h" />
     <ClInclude Include="IGame.h" />
     <ClInclude Include="Level.h" />
     <ClInclude Include="Object.h" />
     <ClInclude Include="Player.h" />
-    <ClInclude Include="WorldObject.h" />
+    <ClInclude Include="StaticObject.h" />
+    <ClInclude Include="Weapon.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="DynamicObject.cpp" />
     <ClCompile Include="Game.cpp" />
     <ClCompile Include="IGame.cpp" />
     <ClCompile Include="Level.cpp" />
     <ClCompile Include="Object.cpp" />
     <ClCompile Include="Player.cpp" />
-    <ClCompile Include="WorldObject.cpp" />
+    <ClCompile Include="StaticObject.cpp" />
+    <ClCompile Include="Weapon.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Code/GameLogic/GameLogic.vcxproj.filters b/Code/GameLogic/GameLogic.vcxproj.filters
index d69ec9ff..8b240487 100644
--- a/Code/GameLogic/GameLogic.vcxproj.filters
+++ b/Code/GameLogic/GameLogic.vcxproj.filters
@@ -27,10 +27,16 @@
     <ClInclude Include="Player.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="WorldObject.h">
+    <ClInclude Include="IGame.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="IGame.h">
+    <ClInclude Include="StaticObject.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Weapon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DynamicObject.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -47,10 +53,16 @@
     <ClCompile Include="Player.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="WorldObject.cpp">
+    <ClCompile Include="IGame.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="IGame.cpp">
+    <ClCompile Include="StaticObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Weapon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DynamicObject.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/Code/GameLogic/IGame.h b/Code/GameLogic/IGame.h
index 199c4404..ddd28396 100644
--- a/Code/GameLogic/IGame.h
+++ b/Code/GameLogic/IGame.h
@@ -1,3 +1,5 @@
+// Game Logic interface 
+
 #ifndef IGAME_H
 #define IGAME_H
 
@@ -7,7 +9,6 @@
 #define DLL_USAGE __declspec(dllimport)
 #endif
 
-
 namespace GameLogic
 {
 	class Game;
@@ -26,6 +27,4 @@ namespace GameLogic
 	private:
 	};
 }
-
-
 #endif
\ No newline at end of file
diff --git a/Code/GameLogic/StaticObject.cpp b/Code/GameLogic/StaticObject.cpp
index fee6e62a..855ef645 100644
--- a/Code/GameLogic/StaticObject.cpp
+++ b/Code/GameLogic/StaticObject.cpp
@@ -1,5 +1,6 @@
 #include "StaticObject.h"
 
+using namespace GameLogic;
 
 StaticObject::StaticObject(void)
 {