diff --git a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
index e3f93713..fdc94d1f 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
@@ -358,6 +358,7 @@ namespace SHADE
         [component](AssetID const& id)
         {
           component->SetMesh(SHResourceManager::LoadOrGet<SHMesh>(id));
+          SHResourceManager::FinaliseChanges();
         }, SHDragDrop::DRAG_RESOURCE);
     }
     else
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index 16e2b1e8..007c8639 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -106,10 +106,7 @@ namespace SHADE
     descPool = device->CreateDescriptorPools();
 
     // Create generic command buffer
-    //transferCmdPool = device->CreateCommandPool(SH_QUEUE_FAMILY_ARRAY_INDEX::GRAPHICS, SH_CMD_POOL_RESET::POOL_BASED, true);
     graphicsCmdPool = device->CreateCommandPool(SH_QUEUE_FAMILY_ARRAY_INDEX::GRAPHICS, SH_CMD_POOL_RESET::POOL_BASED, true);
-    transferCmdBuffer = graphicsCmdPool->RequestCommandBuffer(SH_CMD_BUFFER_TYPE::PRIMARY);
-    graphicsTexCmdBuffer = graphicsCmdPool->RequestCommandBuffer(SH_CMD_BUFFER_TYPE::PRIMARY);
 
     // Load Built In Shaders
     static constexpr AssetID VS_DEFAULT   = 39210065; defaultVertShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEFAULT);
@@ -621,10 +618,14 @@ namespace SHADE
 
   void SHGraphicsSystem::BuildMeshBuffers()
   {
+      transferCmdBuffer = graphicsCmdPool->RequestCommandBuffer(SH_CMD_BUFFER_TYPE::PRIMARY);
+      device->WaitIdle();
 	  transferCmdBuffer->BeginRecording();
 	  meshLibrary.BuildBuffers(device, transferCmdBuffer);
 	  transferCmdBuffer->EndRecording();
 	  graphicsQueue->SubmitCommandBuffer({ transferCmdBuffer });
+      device->WaitIdle();
+      transferCmdBuffer.Free(); transferCmdBuffer = {};
   }
 
   /*---------------------------------------------------------------------------------*/
@@ -649,10 +650,14 @@ namespace SHADE
 
   void SHGraphicsSystem::BuildTextures()
   {
+      graphicsTexCmdBuffer = graphicsCmdPool->RequestCommandBuffer(SH_CMD_BUFFER_TYPE::PRIMARY);
+      device->WaitIdle();
       texLibrary.BuildTextures
       (
           device, graphicsTexCmdBuffer, graphicsQueue, descPool
       );
+      device->WaitIdle();
+      graphicsTexCmdBuffer.Free(); graphicsTexCmdBuffer = {};
   }
 
 #pragma endregion ADD_REMOVE
@@ -692,6 +697,7 @@ namespace SHADE
   void SHGraphicsSystem::EndRoutine::Execute(double) noexcept
   {
     reinterpret_cast<SHGraphicsSystem*>(system)->EndRender();
+    SHResourceManager::FinaliseChanges();
   }
   
   /*-----------------------------------------------------------------------------------*/
@@ -709,6 +715,11 @@ namespace SHADE
       if (!renderable.HasChanged())
         continue;
     
+      if (!renderable.GetMesh())
+      {
+        SHLOG_CRITICAL("NULL Mesh provided!");
+      }
+
       // Remove from the SuperBatch it is previously in (prevMat if mat has changed)
       Handle<SHMaterialInstance> prevMaterial = renderable.HasMaterialChanged() ? renderable.GetPrevMaterial() : renderable.GetMaterial();
       if (prevMaterial)
diff --git a/SHADE_Engine/src/Resource/SHResourceManager.cpp b/SHADE_Engine/src/Resource/SHResourceManager.cpp
index 156c31c7..dad9fd9f 100644
--- a/SHADE_Engine/src/Resource/SHResourceManager.cpp
+++ b/SHADE_Engine/src/Resource/SHResourceManager.cpp
@@ -21,9 +21,11 @@ namespace SHADE
   /*-----------------------------------------------------------------------------------*/
   SHResourceHub SHResourceManager::resourceHub;
   std::unordered_map<std::type_index, std::unordered_map<AssetID, Handle<void>>> SHResourceManager::handlesMap;
-  std::unordered_map<std::type_index, SHADE::SHResourceManager::HandleAssetMap> SHResourceManager::assetIdMap;
+  std::unordered_map<std::type_index, SHResourceManager::HandleAssetMap> SHResourceManager::assetIdMap;
   std::unordered_map<std::type_index, std::function<void(AssetID)>> SHResourceManager::typedFreeFuncMap;
   std::vector<AssetID> SHResourceManager::loadedAssetData;
+  bool SHResourceManager::textureChanged = false;
+  bool SHResourceManager::meshChanged    = false;
 
   /*-----------------------------------------------------------------------------------*/
   /* Function Definitions                                                              */
@@ -63,8 +65,17 @@ namespace SHADE
     SHGraphicsSystem* gfxSystem = SHSystemManager::GetSystem<SHGraphicsSystem>();
     if (gfxSystem == nullptr)
       throw std::runtime_error("[SHResourceManager] Attempted to load graphics resource without a SHGraphicsSystem installed.");
-    gfxSystem->BuildMeshBuffers();
-    gfxSystem->BuildTextures();
+
+    if (meshChanged)
+    {
+      gfxSystem->BuildMeshBuffers();
+      meshChanged = false;
+    }
+    if (textureChanged)
+    {
+      gfxSystem->BuildTextures();
+      textureChanged = false;
+    }
 
     // Free CPU Resources
     for (auto assetId : loadedAssetData)
diff --git a/SHADE_Engine/src/Resource/SHResourceManager.h b/SHADE_Engine/src/Resource/SHResourceManager.h
index 61689420..e5e303e1 100644
--- a/SHADE_Engine/src/Resource/SHResourceManager.h
+++ b/SHADE_Engine/src/Resource/SHResourceManager.h
@@ -28,33 +28,15 @@ of DigiPen Institute of Technology is prohibited.
 
 namespace SHADE
 {
+  /// <summary>
+  /// Template structs that maps a resource to their loaded asset representation type.
+  /// </summary>
   template<typename T = void>
-  struct SHResourceLoader
-  {
-    using AssetType = void;
-  };
-
-  template<>
-  struct SHResourceLoader<SHMesh>
-  {
-    using AssetType = SHMeshAsset;
-  };
-  template<>
-  struct SHResourceLoader<SHTexture>
-  {
-    using AssetType = SHTextureAsset;
-  };
-  template<>
-  struct SHResourceLoader<SHVkShaderModule>
-  {
-    using AssetType = SHShaderAsset;
-  };
-  template<>
-  struct SHResourceLoader<SHMaterial>
-  {
-    using AssetType = SHMaterialAsset;
-  };
-
+  struct SHResourceLoader                              { using AssetType = void;            };
+  template<> struct SHResourceLoader<SHMesh>           { using AssetType = SHMeshAsset;     };
+  template<> struct SHResourceLoader<SHTexture>        { using AssetType = SHTextureAsset;  };
+  template<> struct SHResourceLoader<SHVkShaderModule> { using AssetType = SHShaderAsset;   };
+  template<> struct SHResourceLoader<SHMaterial>       { using AssetType = SHMaterialAsset; };
 
   /// <summary>
   /// Static class responsible for loading and caching runtime resources from their
@@ -97,7 +79,7 @@ namespace SHADE
     /// <param name="assetId">Handle to the resource to unload.</param>
     static void Unload(AssetID assetId);
     /// <summary>
-    /// Needs to be called to finalise all changes to loads.
+    /// Needs to be called to finalise all changes to loads, unless at runtime.
     /// </summary>
     static void FinaliseChanges();
 
@@ -147,6 +129,9 @@ namespace SHADE
     static std::unordered_map<std::type_index, std::function<void(AssetID)>> typedFreeFuncMap;
     // Pointers to temp CPU resources
     static std::vector<AssetID> loadedAssetData;
+    // Dirty Flags
+    static bool meshChanged;
+    static bool textureChanged;
 
     /*---------------------------------------------------------------------------------*/
     /* Helper Functions                                                                */
diff --git a/SHADE_Engine/src/Resource/SHResourceManager.hpp b/SHADE_Engine/src/Resource/SHResourceManager.hpp
index 15834cdf..1623d70a 100644
--- a/SHADE_Engine/src/Resource/SHResourceManager.hpp
+++ b/SHADE_Engine/src/Resource/SHResourceManager.hpp
@@ -54,7 +54,7 @@ namespace SHADE
     }
 
     auto handle = load<ResourceType>(assetId, *assetData);
-    Handle genericHandle = Handle();
+    Handle genericHandle = Handle(handle);
     typedHandleMap.get().emplace(assetId, genericHandle);
     typedAssetIdMap.get().emplace(genericHandle, assetId);
     return handle;
@@ -139,6 +139,7 @@ namespace SHADE
     if constexpr (std::is_same_v<ResourceType, SHMesh>)
     {
       loadedAssetData.emplace_back(assetId);
+      meshChanged = true;
 
       return gfxSystem->AddMesh
       (
@@ -155,6 +156,7 @@ namespace SHADE
     else if constexpr (std::is_same_v<ResourceType, SHTexture>)
     {
       loadedAssetData.emplace_back(assetId);
+      textureChanged = true;
 
       return gfxSystem->AddTexture
       (