diff --git a/Nuake/BaseClass.h b/Nuake/BaseClass.h
new file mode 100644
index 00000000..15c3b600
--- /dev/null
+++ b/Nuake/BaseClass.h
@@ -0,0 +1,7 @@
+#pragma once
+#include <string>
+
+class BaseClass {
+public:
+	std::string Name;
+};
\ No newline at end of file
diff --git a/Nuake/BrushClass.h b/Nuake/BrushClass.h
new file mode 100644
index 00000000..e23bd102
--- /dev/null
+++ b/Nuake/BrushClass.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "BaseClass.h"
+#include "ClassProperty.h"
+#include <string>
+#include <vector>
+
+
+class BrushClass : public BaseClass {
+	std::string name;
+	std::vector<ClassProperty> Props;
+	std::string Description;
+};
\ No newline at end of file
diff --git a/Nuake/ClassProperty.h b/Nuake/ClassProperty.h
new file mode 100644
index 00000000..3ca73569
--- /dev/null
+++ b/Nuake/ClassProperty.h
@@ -0,0 +1,15 @@
+#pragma once
+#include <string>
+enum class ClassPropertyType {
+	AABB,
+	Float,
+	String,
+	DropDown,
+	Color,
+	Int
+};
+
+struct ClassProperty {
+	std::string name;
+	ClassPropertyType type;
+};
\ No newline at end of file
diff --git a/Nuake/FDGSerializer.h b/Nuake/FDGSerializer.h
new file mode 100644
index 00000000..98bb1932
--- /dev/null
+++ b/Nuake/FDGSerializer.h
@@ -0,0 +1,10 @@
+#pragma once
+#include <string>
+class FGDSerializer
+{
+	static bool BeginFGDFile(const std::string path);
+
+	static bool RegisterEntity();
+
+	static bool EndFGDFile();
+};
\ No newline at end of file
diff --git a/Nuake/Nuake.vcxproj b/Nuake/Nuake.vcxproj
index f81dcf27..9f2b5342 100644
--- a/Nuake/Nuake.vcxproj
+++ b/Nuake/Nuake.vcxproj
@@ -102,6 +102,7 @@
     <ClInclude Include="src\Core\Physics\PhysicsManager.h" />
     <ClInclude Include="src\Core\Physics\PhysicsShapes.h" />
     <ClInclude Include="src\Core\Physics\RaycastResult.h" />
+    <ClInclude Include="src\Core\Physics\RaycastResults.h" />
     <ClInclude Include="src\Core\Physics\Rigibody.h" />
     <ClInclude Include="src\Core\TextureManager.h" />
     <ClInclude Include="src\Core\Timestep.h" />
@@ -109,6 +110,7 @@
     <ClInclude Include="src\Rendering\Framebuffer.h" />
     <ClInclude Include="src\Rendering\GBuffer.h" />
     <ClInclude Include="src\Rendering\ImGuiAPI.h" />
+    <ClInclude Include="src\Rendering\MSAAFramebuffer.h" />
     <ClInclude Include="src\Rendering\Mesh\Mesh.h" />
     <ClInclude Include="src\Rendering\ProceduralSky.h" />
     <ClInclude Include="src\Rendering\Renderer.h" />
@@ -120,6 +122,7 @@
     <ClInclude Include="src\Rendering\Textures\FontBitmap.h" />
     <ClInclude Include="src\Rendering\Textures\HDR.h" />
     <ClInclude Include="src\Rendering\Textures\Material.h" />
+    <ClInclude Include="src\Rendering\Textures\MultiSampledTexture.h" />
     <ClInclude Include="src\Rendering\Textures\Texture.h" />
     <ClInclude Include="src\Rendering\Vertex.h" />
     <ClInclude Include="src\Resource\File.h" />
@@ -129,35 +132,39 @@
     <ClInclude Include="src\Resource\Serializable.h" />
     <ClInclude Include="src\Resource\Serializer.h" />
     <ClInclude Include="src\Resource\TrenchbroomMap.h" />
+    <ClInclude Include="src\Scene\Components\BaseComponent.h" />
+    <ClInclude Include="src\Scene\Components\BoxCollider.h" />
+    <ClInclude Include="src\Scene\Components\CameraComponent.h" />
+    <ClInclude Include="src\Scene\Components\CharacterControllerComponent.h" />
+    <ClInclude Include="src\Scene\Components\Components.h" />
+    <ClInclude Include="src\Scene\Components\InterfaceComponent.h" />
+    <ClInclude Include="src\Scene\Components\LightComponent.h" />
+    <ClInclude Include="src\Scene\Components\LuaScriptComponent.h" />
+    <ClInclude Include="src\Scene\Components\MeshCollider.h" />
+    <ClInclude Include="src\Scene\Components\MeshComponent.h" />
+    <ClInclude Include="src\Scene\Components\ModelComponent.h" />
+    <ClInclude Include="src\Scene\Components\NameComponent.h" />
+    <ClInclude Include="src\Scene\Components\NativeScriptComponent.h" />
+    <ClInclude Include="src\Scene\Components\ParentComponent.h" />
+    <ClInclude Include="src\Scene\Components\QuakeMap.h" />
+    <ClInclude Include="src\Scene\Components\RigidbodyComponent.h" />
+    <ClInclude Include="src\Scene\Components\SphereCollider.h" />
+    <ClInclude Include="src\Scene\Components\TransformComponent.h" />
+    <ClInclude Include="src\Scene\Components\WrenScriptComponent.h" />
     <ClInclude Include="src\Scene\EditorCamera.h" />
-    <ClInclude Include="src\Scene\Entities\Components.h" />
-    <ClInclude Include="src\Scene\Entities\Components\BaseComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\BoxCollider.h" />
-    <ClInclude Include="src\Scene\Entities\Components\CameraComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\CharacterControllerComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\InterfaceComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\LightComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\LuaScriptComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\MeshCollider.h" />
-    <ClInclude Include="src\Scene\Entities\Components\MeshComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\ModelComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\NameComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\NativeScriptComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\ParentComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\QuakeMap.h" />
-    <ClInclude Include="src\Scene\Entities\Components\RigidbodyComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\SphereCollider.h" />
-    <ClInclude Include="src\Scene\Entities\Components\TransformComponent.h" />
-    <ClInclude Include="src\Scene\Entities\Components\WrenScriptComponent.h" />
     <ClInclude Include="src\Scene\Entities\Entity.h" />
     <ClInclude Include="src\Scene\Entities\ImGuiHelper.h" />
     <ClInclude Include="src\Scene\Entities\ScriptableEntity.h" />
     <ClInclude Include="src\Scene\Lighting\Environment.h" />
     <ClInclude Include="src\Scene\Scene.h" />
+    <ClInclude Include="src\Scene\Systems\PhysicsSystem.h" />
+    <ClInclude Include="src\Scene\Systems\ScriptingSystem.h" />
+    <ClInclude Include="src\Scene\Systems\System.h" />
     <ClInclude Include="src\Scripting\Modules\EngineModule.h" />
     <ClInclude Include="src\Scripting\Modules\EntityModule.h" />
     <ClInclude Include="src\Scripting\Modules\InputModule.h" />
     <ClInclude Include="src\Scripting\Modules\MathModule.h" />
+    <ClInclude Include="src\Scripting\Modules\PhysicsModule.h" />
     <ClInclude Include="src\Scripting\Modules\SceneModule.h" />
     <ClInclude Include="src\Scripting\Modules\ScriptModule.h" />
     <ClInclude Include="src\Scripting\ScriptLoader.h" />
@@ -714,6 +721,7 @@
     <ClCompile Include="src\Rendering\Camera.cpp" />
     <ClCompile Include="src\Rendering\Framebuffer.cpp" />
     <ClCompile Include="src\Rendering\GBuffer.cpp" />
+    <ClCompile Include="src\Rendering\MSAAFramebuffer.cpp" />
     <ClCompile Include="src\Rendering\Mesh\Mesh.cpp" />
     <ClCompile Include="src\Rendering\ProceduralSky.cpp" />
     <ClCompile Include="src\Rendering\Renderer.cpp" />
@@ -724,22 +732,26 @@
     <ClCompile Include="src\Rendering\Textures\Cubemap.cpp" />
     <ClCompile Include="src\Rendering\Textures\HDR.cpp" />
     <ClCompile Include="src\Rendering\Textures\Material.cpp" />
+    <ClCompile Include="src\Rendering\Textures\MultiSampledTexture.cpp" />
     <ClCompile Include="src\Rendering\Textures\Texture.cpp" />
     <ClCompile Include="src\Resource\Project.cpp" />
+    <ClCompile Include="src\Scene\Components\BoxCollider.cpp" />
+    <ClCompile Include="src\Scene\Components\CameraComponent.cpp" />
+    <ClCompile Include="src\Scene\Components\Components.cpp" />
+    <ClCompile Include="src\Scene\Components\LightComponent.cpp" />
+    <ClCompile Include="src\Scene\Components\MeshComponent.cpp" />
+    <ClCompile Include="src\Scene\Components\ModelComponent.cpp" />
+    <ClCompile Include="src\Scene\Components\QuakeMap.cpp" />
+    <ClCompile Include="src\Scene\Components\RigidbodyComponent.cpp" />
+    <ClCompile Include="src\Scene\Components\TransformComponent.cpp" />
     <ClCompile Include="src\Scene\EditorCamera.cpp" />
-    <ClCompile Include="src\Scene\Entities\Components.cpp" />
-    <ClCompile Include="src\Scene\Entities\Components\BoxCollider.cpp" />
-    <ClCompile Include="src\Scene\Entities\Components\CameraComponent.cpp" />
-    <ClCompile Include="src\Scene\Entities\Components\LightComponent.cpp" />
-    <ClCompile Include="src\Scene\Entities\Components\MeshComponent.cpp" />
-    <ClCompile Include="src\Scene\Entities\Components\ModelComponent.cpp" />
-    <ClCompile Include="src\Scene\Entities\Components\QuakeMap.cpp" />
-    <ClCompile Include="src\Scene\Entities\Components\RigidbodyComponent.cpp" />
-    <ClCompile Include="src\Scene\Entities\Components\TransformComponent.cpp" />
     <ClCompile Include="src\Scene\Entities\Entity.cpp" />
     <ClCompile Include="src\Scene\Entities\ScriptableEntity.cpp" />
     <ClCompile Include="src\Scene\Lighting\Environment.cpp" />
     <ClCompile Include="src\Scene\Scene.cpp" />
+    <ClCompile Include="src\Scene\Systems\PhysicsSystem.cpp" />
+    <ClCompile Include="src\Scene\Systems\ScriptingSystem.cpp" />
+    <ClCompile Include="src\Scene\Systems\System.cpp" />
     <ClCompile Include="src\Scripting\ScriptLoader.cpp" />
     <ClCompile Include="src\Scripting\ScriptingEngine.cpp" />
     <ClCompile Include="src\Scripting\WrenScript.cpp" />
diff --git a/Nuake/Nuake.vcxproj.filters b/Nuake/Nuake.vcxproj.filters
index 7bc648f0..f1e52f53 100644
--- a/Nuake/Nuake.vcxproj.filters
+++ b/Nuake/Nuake.vcxproj.filters
@@ -28,15 +28,18 @@
     <Filter Include="src\Scene">
       <UniqueIdentifier>{0A06D2B3-7670-862A-BFAE-37D02B58647F}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\Scene\Components">
+      <UniqueIdentifier>{DFD07067-CB5F-FA30-747E-0E2C60EC0AD7}</UniqueIdentifier>
+    </Filter>
     <Filter Include="src\Scene\Entities">
       <UniqueIdentifier>{FE8943C2-EA6D-0418-53CE-FE6A3FD1EE99}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\Scene\Entities\Components">
-      <UniqueIdentifier>{5374FF1D-BF8C-E647-8839-76E1F4107BE1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\Scene\Lighting">
       <UniqueIdentifier>{CF04C898-BBE8-88EE-2449-8341104C7370}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\Scene\Systems">
+      <UniqueIdentifier>{11C62E55-7DDC-2CEB-C653-B80C32A9FD72}</UniqueIdentifier>
+    </Filter>
     <Filter Include="src\Scripting">
       <UniqueIdentifier>{6FBC2D98-DB7C-A9CE-A4B7-F24B1037EEAA}</UniqueIdentifier>
     </Filter>
@@ -274,6 +277,9 @@
     <ClInclude Include="src\Core\Physics\RaycastResult.h">
       <Filter>src\Core\Physics</Filter>
     </ClInclude>
+    <ClInclude Include="src\Core\Physics\RaycastResults.h">
+      <Filter>src\Core\Physics</Filter>
+    </ClInclude>
     <ClInclude Include="src\Core\Physics\Rigibody.h">
       <Filter>src\Core\Physics</Filter>
     </ClInclude>
@@ -295,6 +301,9 @@
     <ClInclude Include="src\Rendering\ImGuiAPI.h">
       <Filter>src\Rendering</Filter>
     </ClInclude>
+    <ClInclude Include="src\Rendering\MSAAFramebuffer.h">
+      <Filter>src\Rendering</Filter>
+    </ClInclude>
     <ClInclude Include="src\Rendering\Mesh\Mesh.h">
       <Filter>src\Rendering\Mesh</Filter>
     </ClInclude>
@@ -328,6 +337,9 @@
     <ClInclude Include="src\Rendering\Textures\Material.h">
       <Filter>src\Rendering\Textures</Filter>
     </ClInclude>
+    <ClInclude Include="src\Rendering\Textures\MultiSampledTexture.h">
+      <Filter>src\Rendering\Textures</Filter>
+    </ClInclude>
     <ClInclude Include="src\Rendering\Textures\Texture.h">
       <Filter>src\Rendering\Textures</Filter>
     </ClInclude>
@@ -355,66 +367,66 @@
     <ClInclude Include="src\Resource\TrenchbroomMap.h">
       <Filter>src\Resource</Filter>
     </ClInclude>
+    <ClInclude Include="src\Scene\Components\BaseComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\BoxCollider.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\CameraComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\CharacterControllerComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\Components.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\InterfaceComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\LightComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\LuaScriptComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\MeshCollider.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\MeshComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\ModelComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\NameComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\NativeScriptComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\ParentComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\QuakeMap.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\RigidbodyComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\SphereCollider.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\TransformComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Components\WrenScriptComponent.h">
+      <Filter>src\Scene\Components</Filter>
+    </ClInclude>
     <ClInclude Include="src\Scene\EditorCamera.h">
       <Filter>src\Scene</Filter>
     </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components.h">
-      <Filter>src\Scene\Entities</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\BaseComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\BoxCollider.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\CameraComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\CharacterControllerComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\InterfaceComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\LightComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\LuaScriptComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\MeshCollider.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\MeshComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\ModelComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\NameComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\NativeScriptComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\ParentComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\QuakeMap.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\RigidbodyComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\SphereCollider.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\TransformComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Scene\Entities\Components\WrenScriptComponent.h">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClInclude>
     <ClInclude Include="src\Scene\Entities\Entity.h">
       <Filter>src\Scene\Entities</Filter>
     </ClInclude>
@@ -430,6 +442,15 @@
     <ClInclude Include="src\Scene\Scene.h">
       <Filter>src\Scene</Filter>
     </ClInclude>
+    <ClInclude Include="src\Scene\Systems\PhysicsSystem.h">
+      <Filter>src\Scene\Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Systems\ScriptingSystem.h">
+      <Filter>src\Scene\Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Scene\Systems\System.h">
+      <Filter>src\Scene\Systems</Filter>
+    </ClInclude>
     <ClInclude Include="src\Scripting\Modules\EngineModule.h">
       <Filter>src\Scripting\Modules</Filter>
     </ClInclude>
@@ -442,6 +463,9 @@
     <ClInclude Include="src\Scripting\Modules\MathModule.h">
       <Filter>src\Scripting\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="src\Scripting\Modules\PhysicsModule.h">
+      <Filter>src\Scripting\Modules</Filter>
+    </ClInclude>
     <ClInclude Include="src\Scripting\Modules\SceneModule.h">
       <Filter>src\Scripting\Modules</Filter>
     </ClInclude>
@@ -2104,6 +2128,9 @@
     <ClCompile Include="src\Rendering\GBuffer.cpp">
       <Filter>src\Rendering</Filter>
     </ClCompile>
+    <ClCompile Include="src\Rendering\MSAAFramebuffer.cpp">
+      <Filter>src\Rendering</Filter>
+    </ClCompile>
     <ClCompile Include="src\Rendering\Mesh\Mesh.cpp">
       <Filter>src\Rendering\Mesh</Filter>
     </ClCompile>
@@ -2134,42 +2161,45 @@
     <ClCompile Include="src\Rendering\Textures\Material.cpp">
       <Filter>src\Rendering\Textures</Filter>
     </ClCompile>
+    <ClCompile Include="src\Rendering\Textures\MultiSampledTexture.cpp">
+      <Filter>src\Rendering\Textures</Filter>
+    </ClCompile>
     <ClCompile Include="src\Rendering\Textures\Texture.cpp">
       <Filter>src\Rendering\Textures</Filter>
     </ClCompile>
     <ClCompile Include="src\Resource\Project.cpp">
       <Filter>src\Resource</Filter>
     </ClCompile>
+    <ClCompile Include="src\Scene\Components\BoxCollider.cpp">
+      <Filter>src\Scene\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Components\CameraComponent.cpp">
+      <Filter>src\Scene\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Components\Components.cpp">
+      <Filter>src\Scene\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Components\LightComponent.cpp">
+      <Filter>src\Scene\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Components\MeshComponent.cpp">
+      <Filter>src\Scene\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Components\ModelComponent.cpp">
+      <Filter>src\Scene\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Components\QuakeMap.cpp">
+      <Filter>src\Scene\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Components\RigidbodyComponent.cpp">
+      <Filter>src\Scene\Components</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Components\TransformComponent.cpp">
+      <Filter>src\Scene\Components</Filter>
+    </ClCompile>
     <ClCompile Include="src\Scene\EditorCamera.cpp">
       <Filter>src\Scene</Filter>
     </ClCompile>
-    <ClCompile Include="src\Scene\Entities\Components.cpp">
-      <Filter>src\Scene\Entities</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scene\Entities\Components\BoxCollider.cpp">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scene\Entities\Components\CameraComponent.cpp">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scene\Entities\Components\LightComponent.cpp">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scene\Entities\Components\MeshComponent.cpp">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scene\Entities\Components\ModelComponent.cpp">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scene\Entities\Components\QuakeMap.cpp">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scene\Entities\Components\RigidbodyComponent.cpp">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Scene\Entities\Components\TransformComponent.cpp">
-      <Filter>src\Scene\Entities\Components</Filter>
-    </ClCompile>
     <ClCompile Include="src\Scene\Entities\Entity.cpp">
       <Filter>src\Scene\Entities</Filter>
     </ClCompile>
@@ -2182,6 +2212,15 @@
     <ClCompile Include="src\Scene\Scene.cpp">
       <Filter>src\Scene</Filter>
     </ClCompile>
+    <ClCompile Include="src\Scene\Systems\PhysicsSystem.cpp">
+      <Filter>src\Scene\Systems</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Systems\ScriptingSystem.cpp">
+      <Filter>src\Scene\Systems</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scene\Systems\System.cpp">
+      <Filter>src\Scene\Systems</Filter>
+    </ClCompile>
     <ClCompile Include="src\Scripting\ScriptLoader.cpp">
       <Filter>src\Scripting</Filter>
     </ClCompile>
diff --git a/Nuake/PointClass.h b/Nuake/PointClass.h
new file mode 100644
index 00000000..07bde658
--- /dev/null
+++ b/Nuake/PointClass.h
@@ -0,0 +1,6 @@
+#pragma once
+#include "BaseClass.h"
+
+class PointClass : public BaseClass {
+
+};
\ No newline at end of file
diff --git a/bin-int/Debug-windows-x86_64/Editor/vc142.idb b/bin-int/Debug-windows-x86_64/Editor/vc142.idb
index ef7f8d1a..4d22ed04 100644
Binary files a/bin-int/Debug-windows-x86_64/Editor/vc142.idb and b/bin-int/Debug-windows-x86_64/Editor/vc142.idb differ
diff --git a/bin-int/Debug-windows-x86_64/Nuake/Nuake.idb b/bin-int/Debug-windows-x86_64/Nuake/Nuake.idb
index 341d3921..e1634f33 100644
Binary files a/bin-int/Debug-windows-x86_64/Nuake/Nuake.idb and b/bin-int/Debug-windows-x86_64/Nuake/Nuake.idb differ