diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua
index 18920194..bc1f6a03 100644
--- a/SHADE_Engine/premake5.lua
+++ b/SHADE_Engine/premake5.lua
@@ -8,7 +8,7 @@ project "SHADE_Engine"
   pchheader "SHpch.h"
   pchsource "%{prj.location}/src/SHpch.cpp"
   staticruntime "off"
-
+  buildoptions{"/bigobj"}
   files  
   {
     "%{prj.location}/src/**.h",
diff --git a/SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanel.cpp b/SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanel.cpp
index 93232917..55d78421 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanel.cpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/HierarchyPanel/SHHierarchyPanel.cpp
@@ -133,7 +133,7 @@ namespace SHADE
       auto size = ImGui::GetWindowSize();
       auto g = ImGui::GetCurrentContext();
       ImGui::SetCursorPosX(size.x - g->Style.FramePadding.x * 15.0f);
-      if (ImGui::SmallButton(ICON_MD_DESELECT))
+      if (ImGui::SmallButton(ICON_MD_CLEAR_ALL))
       {
         auto editor = SHSystemManager::GetSystem<SHEditor>();
         editor->selectedEntities.clear();
diff --git a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
index 587ffc48..521e1213 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
@@ -348,14 +348,16 @@ namespace SHADE
     if (ImGui::CollapsingHeader(componentType.get_name().data()))
     {
       DrawContextMenu(component);
-      SHEditorWidgets::DragDropReadOnlyField<AssetID>("Mesh", "Mesh Asset", [component]()
+      Handle<SHMesh> const& mesh = component->GetMesh();
+
+      SHEditorWidgets::DragDropReadOnlyField<AssetID>("Mesh", std::to_string(SHResourceManager::GetAssetID<SHMesh>(mesh).value_or(0)).data(), [component]()
       {
         Handle<SHMesh> const& mesh = component->GetMesh();
         return SHResourceManager::GetAssetID<SHMesh>(mesh).value_or(0);
       },
         [component](AssetID const& id)
         {
-          //component->SetMesh(SHResourceManager::LoadOrGet<SHMesh>(id));
+          component->SetMesh(SHResourceManager::LoadOrGet<SHMesh>(id));
         }, SHDragDrop::DRAG_RESOURCE);
     }
     else
diff --git a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp
index 6309d805..c4a86785 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp
@@ -136,6 +136,7 @@ namespace SHADE
         {
           DrawAddComponentButton<SHTransformComponent>(eid);
           DrawAddComponentButton<SHCameraComponent>(eid);
+          DrawAddComponentButton<SHLightComponent>(eid);
 
           // Components that require Transforms
 
diff --git a/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp b/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
index bcd378c5..a6f02249 100644
--- a/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
+++ b/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
@@ -239,6 +239,7 @@ namespace YAML
           YAML::convert<SHCollider>::decode(colliderNode, rhs.GetCollider(numColliders++));
         }
       }
+      return true;
     }
   };