diff --git a/.gitignore b/.gitignore
index c5b8a6d..6bd0012 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,10 +9,6 @@
 *.slo
 *.lo
 *.o
-*.obj
-
-# Don't ignore 3d model in OBJ
-!enginecustom/assets/Model/OBJ/*.obj
 
 # Precompiled Headers
 *.gch
diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
index 74dd12c..f253d11 100644
--- a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
+++ b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
@@ -5,10 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/applicationclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/applicationclass.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/vulkan.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/vulkan.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/vulkan.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/vulkan.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/assets/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/assets/imgui.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -23,6 +23,7 @@
   </component>
   <component name="HighlightingSettingsPerFile">
     <setting file="file://C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/shared/windef.h" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/um/DirectXMath.h" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/enginecustom/include/Vulkan/Include/vulkan/vulkan_core.h" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/enginecustom/src/src/shader/CelShadingShader.cpp" root0="FORCE_HIGHLIGHTING" />
   </component>
@@ -156,6 +157,11 @@
       <workItem from="1742664377329" duration="746000" />
       <workItem from="1742665243312" duration="310000" />
       <workItem from="1742667326806" duration="95000" />
+      <workItem from="1743185728805" duration="15000" />
+      <workItem from="1743185754182" duration="815000" />
+      <workItem from="1743355100472" duration="708000" />
+      <workItem from="1743355837694" duration="1514000" />
+      <workItem from="1743370106270" duration="280000" />
     </task>
     <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
       <option name="closed" value="true" />
diff --git a/enginecustom/assets/imgui.ini b/enginecustom/assets/imgui.ini
index a41f470..1c2a1c4 100644
--- a/enginecustom/assets/imgui.ini
+++ b/enginecustom/assets/imgui.ini
@@ -1,40 +1,89 @@
-[Window][DockSpace]
-Pos=0,0
-Size=1584,861
-Collapsed=0
-
 [Window][Debug##Default]
 Pos=60,60
 Size=400,400
 Collapsed=0
 
 [Window][Khaotic Engine]
-Pos=1223,27
-Size=353,826
+Pos=1233,27
+Size=343,826
 Collapsed=0
-DockId=0x00000002,0
+DockId=0x00000005,0
 
 [Window][Objects]
 Pos=8,27
-Size=345,826
+Size=289,413
 Collapsed=0
-DockId=0x00000003,0
-
-[Window][Engine Settings]
-Pos=1223,27
-Size=353,826
-Collapsed=0
-DockId=0x00000002,1
+DockId=0x00000007,0
 
 [Window][Terrain]
-Pos=58,60
-Size=320,74
+Pos=8,442
+Size=289,411
+Collapsed=0
+DockId=0x00000008,0
+
+[Window][Light]
+Pos=8,27
+Size=290,866
+Collapsed=0
+DockId=0x00000004,1
+
+[Window][Shader Manager]
+Pos=8,27
+Size=330,487
+Collapsed=0
+DockId=0x00000001,2
+
+[Window][Engine Settings]
+Pos=1233,27
+Size=343,826
+Collapsed=0
+DockId=0x00000005,1
+
+[Window][DockSpace Demo]
+Size=1584,861
 Collapsed=0
 
-[Docking][Data]
-DockSpace     ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=X
-  DockNode    ID=0x00000003 Parent=0xCCBD8CF7 SizeRef=345,826 Selected=0x031DC75C
-  DockNode    ID=0x00000004 Parent=0xCCBD8CF7 SizeRef=1221,826 Split=X
-    DockNode  ID=0x00000001 Parent=0x00000004 SizeRef=866,826 CentralNode=1
-    DockNode  ID=0x00000002 Parent=0x00000004 SizeRef=353,826 Selected=0x9F035453
+[Window][Render Window]
+Pos=8,27
+Size=1559,974
+Collapsed=0
+DockId=0x00000007,0
+
+[Window][DockSpace]
+Pos=0,0
+Size=1584,861
+Collapsed=0
+
+[Window][Add Object]
+Pos=1188,0
+Size=396,430
+Collapsed=0
+
+[Window][Log]
+Pos=8,518
+Size=1568,335
+Collapsed=0
+DockId=0x0000000C,0
+
+[Window][Log Window]
+Pos=299,627
+Size=932,226
+Collapsed=0
+DockId=0x00000006,0
+
+[Docking][Data]
+DockSpace         ID=0xC0DFADC4 Pos=8,27 Size=1568,826 Split=X
+  DockNode        ID=0x00000001 Parent=0xC0DFADC4 SizeRef=330,1094 Selected=0x393905AB
+  DockNode        ID=0x00000003 Parent=0xC0DFADC4 SizeRef=1700,1094 CentralNode=1
+DockSpace         ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=X
+  DockNode        ID=0x00000009 Parent=0xCCBD8CF7 SizeRef=289,974 Split=Y Selected=0x031DC75C
+    DockNode      ID=0x00000007 Parent=0x00000009 SizeRef=289,299 Selected=0x031DC75C
+    DockNode      ID=0x00000008 Parent=0x00000009 SizeRef=289,297 Selected=0x393905AB
+  DockNode        ID=0x0000000D Parent=0xCCBD8CF7 SizeRef=1613,974 Split=X
+    DockNode      ID=0x00000002 Parent=0x0000000D SizeRef=1268,826 Split=Y
+      DockNode    ID=0x0000000B Parent=0x00000002 SizeRef=1568,637 Split=Y
+        DockNode  ID=0x00000004 Parent=0x0000000B SizeRef=932,598 CentralNode=1
+        DockNode  ID=0x00000006 Parent=0x0000000B SizeRef=932,226 Selected=0xAB74BEE9
+      DockNode    ID=0x0000000C Parent=0x00000002 SizeRef=1568,335 Selected=0x139FDA3F
+    DockNode      ID=0x00000005 Parent=0x0000000D SizeRef=343,826 Selected=0x0B098C4B
 
diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj
index af24eb0..e1bd7a4 100644
--- a/enginecustom/enginecustom.vcxproj
+++ b/enginecustom/enginecustom.vcxproj
@@ -497,6 +497,8 @@
     </CopyFileToFolders>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="assets\Model\OBJ\invertcube.obj" />
+    <Content Include="assets\Model\OBJ\vaisseautri.obj" />
     <Content Include="TODO.txt" />
   </ItemGroup>
   <PropertyGroup Label="Globals">