diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
index 4b02d8d..93d5804 100644
--- a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
+++ b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
@@ -6,12 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
       <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/src/inc/system/application_class.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/application_class.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/imguiManager.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/imguiManager.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/stats.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/stats.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/application_class.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/application_class.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/stats.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/stats.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/imgui.ini" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -29,7 +25,9 @@
     <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
     <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
     <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
-    <setting file="cidr-memory-view://2" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="cidr-memory-view://4" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/um/d3d11.h" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0/um/dinput.h" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/enginecustom/include/Inc/VertexTypes.h" root0="SKIP_HIGHLIGHTING" />
@@ -60,7 +58,7 @@
     "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
     "C++ Project.enginecustom.executor": "Run",
     "C/C++ Project.KhaoticDemo.executor": "Run",
-    "C/C++ Project.enginecustom.executor": "Debug",
+    "C/C++ Project.enginecustom.executor": "Run",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.git.unshallow": "true",
     "SHARE_PROJECT_CONFIGURATION_FILES": "true",
@@ -213,7 +211,8 @@
       <workItem from="1748861785837" duration="357000" />
       <workItem from="1748865625274" duration="797000" />
       <workItem from="1748869642637" duration="3049000" />
-      <workItem from="1748954607174" duration="13379000" />
+      <workItem from="1748954607174" duration="14202000" />
+      <workItem from="1748969487337" duration="402000" />
     </task>
     <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
       <option name="closed" value="true" />
diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj
index e12c190..1032e5a 100644
--- a/enginecustom/enginecustom.vcxproj
+++ b/enginecustom/enginecustom.vcxproj
@@ -181,11 +181,15 @@
       <DestinationFolders>F:\Github_Repo\khaotic-engine-Reborn\x64\Debug\\src\hlsl</DestinationFolders>
       <DestinationFileName>%(Filename)%(Extension)</DestinationFileName>
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
     <CopyFileToFolders Include="src\hlsl\depth.vs">
       <DestinationFolders>F:\Github_Repo\khaotic-engine-Reborn\x64\Debug\\src\hlsl</DestinationFolders>
       <DestinationFileName>%(Filename)%(Extension)</DestinationFileName>
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
     <CopyFileToFolders Include="src\hlsl\font.ps">
       <FileType>Document</FileType>
@@ -261,11 +265,15 @@
       <DestinationFolders>F:\Github_Repo\khaotic-engine-Reborn\x64\Debug\\src\hlsl</DestinationFolders>
       <DestinationFileName>%(Filename)%(Extension)</DestinationFileName>
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
     <CopyFileToFolders Include="src\hlsl\skybox.vs">
       <DestinationFolders>F:\Github_Repo\khaotic-engine-Reborn\x64\Debug\\src\hlsl</DestinationFolders>
       <DestinationFileName>%(Filename)%(Extension)</DestinationFileName>
       <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\src\hlsl</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\src\hlsl</DestinationFolders>
     </CopyFileToFolders>
     <CopyFileToFolders Include="src\hlsl\specmap.ps">
       <FileType>Document</FileType>
@@ -346,6 +354,82 @@
       <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Skybox</DestinationFolders>
       <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Skybox</DestinationFolders>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\dirt01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\EmptyTexture.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\font01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\ground01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\light01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\marble01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\moss01.png">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </ExcludedFromBuild>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\normal01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\spec02.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite02.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite03.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite04.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\stone01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\stone01.tga">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\wall.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\wall01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\water01.png">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture</DestinationFolders>
+    </CopyFileToFolders>
     <Image Include="KhaoticIcon.ico" />
     <CopyFileToFolders Include="sprite01.tga" />
     <CopyFileToFolders Include="sprite02.tga" />
@@ -362,6 +446,42 @@
     <CopyFileToFolders Include="sprite_data_01.txt" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="assets\Model\OBJ\86.obj" />
+    <Content Include="assets\Model\OBJ\cone.obj" />
+    <Content Include="assets\Model\OBJ\invertcube.obj" />
+    <Content Include="assets\Model\OBJ\isosphere.obj" />
+    <Content Include="assets\Model\OBJ\monke.obj" />
+    <Content Include="assets\Model\OBJ\plane.obj" />
+    <Content Include="assets\Model\OBJ\vaisseautri.obj" />
+    <Content Include="assets\Model\TXT\bath.txt" />
+    <Content Include="assets\Model\TXT\chunk.txt" />
+    <Content Include="assets\Model\TXT\cube.txt" />
+    <Content Include="assets\Model\TXT\ground.txt" />
+    <Content Include="assets\Model\TXT\plane.txt" />
+    <Content Include="assets\Model\TXT\sphere.txt" />
+    <Content Include="assets\Model\TXT\square.txt" />
+    <Content Include="assets\Model\TXT\wall.txt" />
+    <Content Include="assets\Model\TXT\water.txt" />
+    <CopyFileToFolders Include="assets\Texture\alpha01.png" />
+    <Content Include="assets\Texture\dirt01.png" />
+    <Content Include="assets\Texture\EmptyTexture.png" />
+    <Content Include="assets\Texture\font01.png" />
+    <Content Include="assets\Texture\ground01.png" />
+    <Content Include="assets\Texture\imgui.ini" />
+    <Content Include="assets\Texture\light01.png" />
+    <Content Include="assets\Texture\marble01.png" />
+    <Content Include="assets\Texture\moss01.png" />
+    <Content Include="assets\Texture\normal01.png" />
+    <Content Include="assets\Texture\spec02.png" />
+    <Content Include="assets\Texture\sprite01.png" />
+    <Content Include="assets\Texture\sprite02.png" />
+    <Content Include="assets\Texture\sprite03.png" />
+    <Content Include="assets\Texture\sprite04.png" />
+    <Content Include="assets\Texture\stone01.png" />
+    <Content Include="assets\Texture\stone01.tga" />
+    <Content Include="assets\Texture\wall.png" />
+    <Content Include="assets\Texture\wall01.png" />
+    <Content Include="assets\Texture\water01.png" />
     <Content Include="TODO.txt" />
   </ItemGroup>
   <ItemGroup>
@@ -372,8 +492,89 @@
     </CopyFileToFolders>
   </ItemGroup>
   <ItemGroup>
+    <None Include="assets\Texture\imgui.ini" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="assets\Model\OBJ\86.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\cone.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\invertcube.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\isosphere.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\monke.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\plane.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\vaisseau.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\vaisseautri.obj">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\OBJ</DestinationFolders>
+    </CopyFileToFolders>
+  </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="assets\Model\TXT\bath.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\chunk.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\cube.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\ground.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\plane.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\sphere.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\square.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\wall.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\water.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Model\TXT</DestinationFolders>
+    </CopyFileToFolders>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
diff --git a/enginecustom/enginecustom.vcxproj.filters b/enginecustom/enginecustom.vcxproj.filters
index 780dc36..c0840c6 100644
--- a/enginecustom/enginecustom.vcxproj.filters
+++ b/enginecustom/enginecustom.vcxproj.filters
@@ -240,6 +240,12 @@
     <ClCompile Include="src\src\system\timer_class.cpp">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="src\src\system\scene_manager.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\system\stats.cpp">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\imconfig.h">
@@ -428,6 +434,12 @@
     <ClInclude Include="src\inc\system\timer_class.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
+    <ClInclude Include="src\inc\system\scene_manager.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="src\inc\system\stats.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="KhaoticIcon.ico">
@@ -512,8 +524,119 @@
     </CopyFileToFolders>
     <CopyFileToFolders Include="src\hlsl\depth.ps" />
     <CopyFileToFolders Include="src\hlsl\depth.vs" />
+    <CopyFileToFolders Include="assets\Texture\alpha01.png">
+      <Filter>Fichiers de ressources</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\dirt01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\EmptyTexture.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\font01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\ground01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\light01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\marble01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\moss01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\normal01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\spec02.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite02.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite03.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\sprite04.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\stone01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\stone01.tga">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\wall.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\wall01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Texture\water01.png">
+      <Filter>Texture</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\vaisseautri.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\vaisseau.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\plane.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\monke.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\isosphere.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\invertcube.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\cone.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\OBJ\86.obj">
+      <Filter>Assets\Model\OBJ</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\bath.txt">
+      <Filter>Assets\Model\TXT</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\chunk.txt">
+      <Filter>Assets\Model\TXT</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\cube.txt">
+      <Filter>Assets\Model\TXT</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\ground.txt">
+      <Filter>Assets\Model\TXT</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\plane.txt">
+      <Filter>Assets\Model\TXT</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\sphere.txt">
+      <Filter>Assets\Model\TXT</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\square.txt">
+      <Filter>Assets\Model\TXT</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\wall.txt">
+      <Filter>Assets\Model\TXT</Filter>
+    </CopyFileToFolders>
+    <CopyFileToFolders Include="assets\Model\TXT\water.txt">
+      <Filter>Assets\Model\TXT</Filter>
+    </CopyFileToFolders>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="assets\Texture\imgui.ini">
+      <Filter>Texture</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/enginecustom/imgui.ini b/enginecustom/imgui.ini
index e67966c..98a402f 100644
--- a/enginecustom/imgui.ini
+++ b/enginecustom/imgui.ini
@@ -1,114 +1,37 @@
+[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=1281,19
-Size=303,631
+Pos=1267,19
+Size=317,842
 Collapsed=0
-DockId=0x0000000F,0
+DockId=0x00000002,0
 
-[Window][Objects]
-Pos=0,19
-Size=281,842
-Collapsed=0
-DockId=0x00000011,0
-
-[Window][Terrain]
-Pos=0,19
-Size=280,842
-Collapsed=0
-DockId=0x00000007,0
-
-[Window][Light]
-Pos=0,19
-Size=281,842
-Collapsed=0
-DockId=0x00000012,0
-
-[Window][Shader Manager]
-Pos=8,27
-Size=330,487
-Collapsed=0
-DockId=0x00000001,2
-
-[Window][Engine Settings]
-Pos=1281,527
-Size=303,334
-Collapsed=0
-DockId=0x00000010,0
-
-[Window][DockSpace Demo]
-Size=1584,861
-Collapsed=0
-
-[Window][Render Window]
-Pos=8,27
-Size=1559,974
-Collapsed=0
-DockId=0x00000011,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=0,636
-Size=1279,225
-Collapsed=0
-DockId=0x00000006,0
-
-[Window][Render Stats]
-Pos=0,636
-Size=1279,225
+[Window][render Stats]
+Pos=275,630
+Size=1309,231
 Collapsed=0
 DockId=0x00000004,0
 
-[Window][render Window]
-Pos=16,718
-Size=997,758
-Collapsed=1
-
-[Window][render Stats]
-Pos=0,652
-Size=1584,209
+[Window][Objects]
+Pos=0,19
+Size=273,842
 Collapsed=0
-DockId=0x00000014,0
+DockId=0x00000005,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=0,19 Size=1584,842 Split=Y
-  DockNode            ID=0x00000013 Parent=0xCCBD8CF7 SizeRef=1584,631 Split=X
-    DockNode          ID=0x00000002 Parent=0x00000013 SizeRef=1743,826 Split=Y
-      DockNode        ID=0x0000000A Parent=0x00000002 SizeRef=1568,599 Split=X
-        DockNode      ID=0x00000009 Parent=0x0000000A SizeRef=281,974 Split=Y Selected=0x031DC75C
-          DockNode    ID=0x00000011 Parent=0x00000009 SizeRef=281,441 Selected=0x031DC75C
-          DockNode    ID=0x00000012 Parent=0x00000009 SizeRef=281,440 Selected=0x321620B2
-        DockNode      ID=0x0000000D Parent=0x0000000A SizeRef=1460,974 Split=Y
-          DockNode    ID=0x0000000B Parent=0x0000000D SizeRef=1568,637 Split=X Selected=0x321620B2
-            DockNode  ID=0x00000007 Parent=0x0000000B SizeRef=280,883 Selected=0x393905AB
-            DockNode  ID=0x00000008 Parent=0x0000000B SizeRef=1178,883 CentralNode=1 Selected=0x4FC83240
-          DockNode    ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F
-      DockNode        ID=0x0000000E Parent=0x00000002 SizeRef=1568,225 Split=X Selected=0xD99DEA49
-        DockNode      ID=0x00000004 Parent=0x0000000E SizeRef=871,225 Selected=0xD99DEA49
-        DockNode      ID=0x00000006 Parent=0x0000000E SizeRef=870,225 Selected=0xAB74BEE9
-    DockNode          ID=0x00000005 Parent=0x00000013 SizeRef=303,826 Split=Y Selected=0x9F035453
-      DockNode        ID=0x0000000F Parent=0x00000005 SizeRef=303,667 Selected=0x9F035453
-      DockNode        ID=0x00000010 Parent=0x00000005 SizeRef=303,441 Selected=0x0B098C4B
-  DockNode            ID=0x00000014 Parent=0xCCBD8CF7 SizeRef=1584,209 Selected=0xF5D1BB37
+DockSpace       ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=0,19 Size=1584,842 Split=X
+  DockNode      ID=0x00000005 Parent=0xCCBD8CF7 SizeRef=273,842 Selected=0x031DC75C
+  DockNode      ID=0x00000006 Parent=0xCCBD8CF7 SizeRef=1309,842 Split=Y
+    DockNode    ID=0x00000003 Parent=0x00000006 SizeRef=1584,609 Split=X
+      DockNode  ID=0x00000001 Parent=0x00000003 SizeRef=990,842 CentralNode=1
+      DockNode  ID=0x00000002 Parent=0x00000003 SizeRef=317,842 Selected=0x9F035453
+    DockNode    ID=0x00000004 Parent=0x00000006 SizeRef=1584,231 Selected=0xF5D1BB37
 
diff --git a/src/hlsl/skybox.ps b/src/hlsl/skybox.ps
new file mode 100644
index 0000000..8cc9c38
--- /dev/null
+++ b/src/hlsl/skybox.ps
@@ -0,0 +1,53 @@
+/////////////
+// GLOBALS //
+/////////////
+Texture2D shaderTexture : register(t0);
+SamplerState SampleType : register(s0);
+cbuffer SkyboxBuffer
+{
+    float4 ambientColor;
+    float4 diffuseColor;
+    float3 lightDirection;
+    float intensity;
+};
+
+cbuffer SkyboxColorBuffer
+{
+    float4 sunColor;
+};
+
+//////////////
+// TYPEDEFS //
+//////////////
+struct PixelInputType
+{
+    float4 position : SV_POSITION;
+    float2 tex : TEXCOORD0;
+    float3 normal : NORMAL;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Pixel Shader
+////////////////////////////////////////////////////////////////////////////////
+float4 SkyboxPixelShader(PixelInputType input) : SV_TARGET
+{
+    // Inverser les coordonnées de texture pour compenser les normales inversées
+    float2 invertedTexCoord = float2(1.0 - input.tex.x, 1.0 - input.tex.y);
+    
+    // Échantillonner la texture avec les coordonnées inversées
+    float4 textureColor = shaderTexture.Sample(SampleType, invertedTexCoord);
+    
+    // Pour une skybox, l'éclairage devrait être plus simple - on ignore l'orientation des normales
+    // et on applique une luminosité uniforme ou un gradient basé sur la position (hauteur)
+    
+    // Calculer un facteur de luminosité uniforme à appliquer
+    float lightFactor = saturate(intensity);
+    
+    // Combiner la couleur ambiante et diffuse pour l'éclairage de la skybox
+    float4 lightColor = ambientColor + (diffuseColor * lightFactor);
+    
+    // Appliquer la couleur de l'éclairage à la texture
+    float4 finalColor = saturate(lightColor) * textureColor;
+    
+    return finalColor;
+}
\ No newline at end of file
diff --git a/src/hlsl/skybox.vs b/src/hlsl/skybox.vs
new file mode 100644
index 0000000..d3f4e1c
--- /dev/null
+++ b/src/hlsl/skybox.vs
@@ -0,0 +1,67 @@
+/////////////
+// GLOBALS //
+/////////////
+cbuffer MatrixBuffer
+{
+    matrix worldMatrix;
+    matrix viewMatrix;
+    matrix projectionMatrix;
+};
+
+cbuffer CameraBuffer
+{
+    float3 cameraPosition;
+    float padding;
+};
+
+cbuffer SkyboxBuffer
+{
+    float4 ambientColor;
+    float4 diffuseColor;
+    float3 lightDirection;
+    float intensity;
+};
+
+//////////////
+// TYPEDEFS //
+//////////////
+struct VertexInputType
+{
+    float4 position : POSITION;
+    float2 tex : TEXCOORD0;
+    float3 normal : NORMAL;
+};
+
+struct PixelInputType
+{
+    float4 position : SV_POSITION;
+    float2 tex : TEXCOORD0;
+    float3 normal : NORMAL;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Vertex Shader
+////////////////////////////////////////////////////////////////////////////////
+PixelInputType SkyboxVertexShader(VertexInputType input)
+{
+    PixelInputType output;
+
+    // Change the position vector to be 4 units for proper matrix calculations.
+    input.position.w = 1.0f;
+
+    // Calculate the position of the vertex against the world, view, and projection matrices.
+    output.position = mul(input.position, worldMatrix);
+    output.position = mul(output.position, viewMatrix);
+    output.position = mul(output.position, projectionMatrix);
+    
+    // Store the texture coordinates for the pixel shader.
+    output.tex = input.tex;
+    
+    // Calculate the normal vector against the world matrix only.
+    output.normal = mul(input.normal, (float3x3) worldMatrix);
+	
+    // Normalize the normal vector.
+    output.normal = normalize(output.normal);
+
+    return output;
+}