diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb b/Assets/Shaders/DeferredComposite_CS.shshaderb
index 889de5fb..4326daf1 100644
Binary files a/Assets/Shaders/DeferredComposite_CS.shshaderb and b/Assets/Shaders/DeferredComposite_CS.shshaderb differ
diff --git a/Assets/Shaders/DeferredComposite_CS.shshaderb.shmeta b/Assets/Shaders/DeferredComposite_CS.shshaderb.shmeta
index 8f18b04a..62c2a3fe 100644
--- a/Assets/Shaders/DeferredComposite_CS.shshaderb.shmeta
+++ b/Assets/Shaders/DeferredComposite_CS.shshaderb.shmeta
@@ -1,3 +1,3 @@
 Name: DeferredComposite_CS
-ID: 42814284
+ID: 45072428
 Type: 2
diff --git a/Assets/Shaders/Kirsch_CS.shshaderb b/Assets/Shaders/Kirsch_CS.shshaderb
index 6219d9a9..4c54946c 100644
Binary files a/Assets/Shaders/Kirsch_CS.shshaderb and b/Assets/Shaders/Kirsch_CS.shshaderb differ
diff --git a/Assets/Shaders/PureCopy_CS.shshaderb b/Assets/Shaders/PureCopy_CS.shshaderb
index 9f1b0534..30a629f5 100644
Binary files a/Assets/Shaders/PureCopy_CS.shshaderb and b/Assets/Shaders/PureCopy_CS.shshaderb differ
diff --git a/Assets/Shaders/TestCube_FS.shshaderb b/Assets/Shaders/TestCube_FS.shshaderb
index b0113dc7..95b4f62a 100644
Binary files a/Assets/Shaders/TestCube_FS.shshaderb and b/Assets/Shaders/TestCube_FS.shshaderb differ
diff --git a/Assets/Shaders/TestCube_FS.shshaderb.shmeta b/Assets/Shaders/TestCube_FS.shshaderb.shmeta
index 42f270af..fbe098b1 100644
--- a/Assets/Shaders/TestCube_FS.shshaderb.shmeta
+++ b/Assets/Shaders/TestCube_FS.shshaderb.shmeta
@@ -1,3 +1,3 @@
 Name: TestCube_FS
-ID: 37450402
+ID: 46377769
 Type: 2
diff --git a/Assets/Shaders/TestCube_VS.shshaderb b/Assets/Shaders/TestCube_VS.shshaderb
index 03e23af3..7a7b047a 100644
Binary files a/Assets/Shaders/TestCube_VS.shshaderb and b/Assets/Shaders/TestCube_VS.shshaderb differ
diff --git a/Assets/Shaders/TestCube_VS.shshaderb.shmeta b/Assets/Shaders/TestCube_VS.shshaderb.shmeta
index b133437b..5c9f895f 100644
--- a/Assets/Shaders/TestCube_VS.shshaderb.shmeta
+++ b/Assets/Shaders/TestCube_VS.shshaderb.shmeta
@@ -1,3 +1,3 @@
 Name: TestCube_VS
-ID: 41688429
+ID: 39210065
 Type: 2
diff --git a/SHADE_Engine/src/Assets/Asset Types/SHShaderAsset.h b/SHADE_Engine/src/Assets/Asset Types/SHShaderAsset.h
index adcd215a..d71c1bb3 100644
--- a/SHADE_Engine/src/Assets/Asset Types/SHShaderAsset.h	
+++ b/SHADE_Engine/src/Assets/Asset Types/SHShaderAsset.h	
@@ -10,6 +10,7 @@
  *****************************************************************************/
 #pragma once
 
+#include <vulkan/vulkan.hpp>
 #include "SHAssetData.h"
 #include "SH_API.h"
 #include <vector>
@@ -17,12 +18,14 @@
 
 namespace SHADE
 {
+  //! Tighter control over types of shaders. Maps directly to their
+  //! equivalent vk::ShaderStageFlagBits.
   enum class SH_SHADER_TYPE : uint8_t
   {
-    VERTEX,
-    FRAGMENT,
-    COMPUTE,
-    INAVLID_TYPE
+    VERTEX       = static_cast<uint8_t>(vk::ShaderStageFlagBits::eVertex),
+    FRAGMENT     = static_cast<uint8_t>(vk::ShaderStageFlagBits::eFragment),
+    COMPUTE      = static_cast<uint8_t>(vk::ShaderStageFlagBits::eCompute),
+    INAVLID_TYPE = std::numeric_limits<uint8_t>::max()
   };
 
   struct SH_API SHShaderAsset : SHAssetData
diff --git a/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp b/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp
index 329e34e9..fd1f6d8a 100644
--- a/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp
+++ b/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp
@@ -19,144 +19,145 @@
 
 namespace SHADE
 {
-	std::string SHShaderSourceCompiler::CompileShaderSourceToBinary(AssetPath path, SHShaderAsset const& data) noexcept
-	{
-		std::string newPath{ path.string() };
+  std::string SHShaderSourceCompiler::CompileShaderSourceToBinary(AssetPath path, SHShaderAsset const& data) noexcept
+  {
+    std::string newPath{ path.string() };
     newPath = newPath.substr(0, newPath.find_last_of('.'));
     newPath += SHADER_BUILT_IN_EXTENSION.data();
 
-		std::ofstream file{ newPath, std::ios::binary | std::ios::out | std::ios::trunc };
+    std::ofstream file{ newPath, std::ios::binary | std::ios::out | std::ios::trunc };
 
-		file.write(
-			reinterpret_cast<char const*>(& data.shaderType), sizeof(uint8_t)
-		);
+    file.write(
+      reinterpret_cast<char const*>(& data.shaderType), sizeof(uint8_t)
+    );
 
-		size_t const byteCount = sizeof(uint32_t) * data.spirvBinary.size();
+    size_t const byteCount = sizeof(uint32_t) * data.spirvBinary.size();
 
-		file.write(
-			reinterpret_cast<char const*>(&byteCount), sizeof(size_t)
-		);
+    file.write(
+      reinterpret_cast<char const*>(&byteCount), sizeof(size_t)
+    );
 
-		file.write(
-			reinterpret_cast<char const*>(data.spirvBinary.data()), byteCount
-		);
+    file.write(
+      reinterpret_cast<char const*>(data.spirvBinary.data()), byteCount
+    );
 
-		file.close();
+    file.close();
 
-		return newPath;
-	}
+    return newPath;
+  }
 
-	SHShaderAsset const* SHShaderSourceCompiler::CompileShaderSourceToMemory(std::string const& data, std::string const& name, SH_SHADER_TYPE type) noexcept
-	{
-		// shaderc compiler
-		shaderc::Compiler compiler;
-		shaderc::CompileOptions options;
+  SHShaderAsset const* SHShaderSourceCompiler::CompileShaderSourceToMemory(std::string const& data, std::string const& name, SH_SHADER_TYPE type) noexcept
+  {
+    // shaderc compiler
+    shaderc::Compiler compiler;
+    shaderc::CompileOptions options;
 
-		options.AddMacroDefinition("MY_DEFINE", "1");
+    options.AddMacroDefinition("MY_DEFINE", "1");
 
-		//TODO: Check if we need optimisation levels when compiling into spirv
-		// Set optimization levels
-		//if (opLevel != shaderc_optimization_level_zero)
-		//	options.SetOptimizationLevel(opLevel);
+    //TODO: Check if we need optimisation levels when compiling into spirv
+    // Set optimization levels
+    //if (opLevel != shaderc_optimization_level_zero)
+    //	options.SetOptimizationLevel(opLevel);
 
-		// Attempt to get the shaderc equivalent shader stage
-		shaderc_shader_kind shaderKind;
-		switch (type)
-		{
-		case SH_SHADER_TYPE::VERTEX:
-			shaderKind = shaderc_shader_kind::shaderc_glsl_vertex_shader;
-			break;
-		case SH_SHADER_TYPE::FRAGMENT:
-			shaderKind = shaderc_shader_kind::shaderc_glsl_fragment_shader;
-			break;
-		case SH_SHADER_TYPE::COMPUTE:
-			shaderKind = shaderc_shader_kind::shaderc_glsl_compute_shader;
-			break;
-		default:
-			shaderKind = shaderc_shader_kind::shaderc_glsl_vertex_shader;
-			break;
-		}
+    // Attempt to get the shaderc equivalent shader stage
+    shaderc_shader_kind shaderKind;
+    switch (type)
+    {
+    case SH_SHADER_TYPE::VERTEX:
+      shaderKind = shaderc_shader_kind::shaderc_glsl_vertex_shader;
+      break;
+    case SH_SHADER_TYPE::FRAGMENT:
+      shaderKind = shaderc_shader_kind::shaderc_glsl_fragment_shader;
+      break;
+    case SH_SHADER_TYPE::COMPUTE:
+      shaderKind = shaderc_shader_kind::shaderc_glsl_compute_shader;
+      break;
+    default:
+      shaderKind = shaderc_shader_kind::shaderc_glsl_vertex_shader;
+      break;
+    }
 
-		// Compile the shader and get the result
-		shaderc::SpvCompilationResult compileResult = compiler.CompileGlslToSpv(data, shaderKind, name.c_str(), options);
+    // Compile the shader and get the result
+    shaderc::SpvCompilationResult compileResult = compiler.CompileGlslToSpv(data, shaderKind, name.c_str(), options);
 
-		if (compileResult.GetCompilationStatus() != shaderc_compilation_status_success)
-		{
-			SHLOG_ERROR("Shaderc failed to compile GLSL shader to binary | " + compileResult.GetErrorMessage());
-			return nullptr;
-		}
+    if (compileResult.GetCompilationStatus() != shaderc_compilation_status_success)
+    {
+      SHLOG_ERROR("Shaderc failed to compile GLSL shader to binary | " + compileResult.GetErrorMessage());
+      return nullptr;
+    }
 
-		auto result = new SHShaderAsset();
-		result->spirvBinary.resize(compileResult.end() - compileResult.begin());
+    auto result = new SHShaderAsset();
+    result->spirvBinary.resize(compileResult.end() - compileResult.begin());
 
-		std::ranges::copy(compileResult.begin(), compileResult.end(), result->spirvBinary.data());
+    std::ranges::copy(compileResult.begin(), compileResult.end(), result->spirvBinary.data());
 
     result->name = name;
     result->shaderType = type;
 
-		return result;
-	}
+    return result;
+  }
 
-	SH_SHADER_TYPE SHShaderSourceCompiler::GetShaderTypeFromFilename(std::string name) noexcept
-	{
-		for (auto i { 0}; i < SHADER_TYPE_MAX_COUNT; ++i)
-		{
-			if (name.find(SHADER_IDENTIFIERS[i].data()) != std::string::npos)
-			{
-				return static_cast<SH_SHADER_TYPE>(i);
-			}
-		}
+  SH_SHADER_TYPE SHShaderSourceCompiler::GetShaderTypeFromFilename(std::string name) noexcept
+  {
+    for (auto i { 0 }; i < SHADER_TYPE_MAX_COUNT; ++i)
+    {
+      const auto& [SHADER_SUFFIX, SHADER_TYPE] = SHADER_IDENTIFIERS[i];
+      if (name.find(SHADER_SUFFIX.data()) != std::string::npos)
+      {
+        return SHADER_TYPE;
+      }
+    }
 
-		return SH_SHADER_TYPE::INAVLID_TYPE;
-	}
+    return SH_SHADER_TYPE::INAVLID_TYPE;
+  }
 
   std::optional<AssetPath> SHShaderSourceCompiler::LoadAndCompileShader(AssetPath path) noexcept
-	{
-		auto type = GetShaderTypeFromFilename(path.filename().string());
+  {
+    auto type = GetShaderTypeFromFilename(path.filename().string());
 
-		if (type == SH_SHADER_TYPE::INAVLID_TYPE)
-		{
-			SHLOG_ERROR("Invalid filename for shaders, follow suffix in SHAssetMacros.h: {}", path.string());
-			return {};
-		}
+    if (type == SH_SHADER_TYPE::INAVLID_TYPE)
+    {
+      SHLOG_ERROR("Invalid filename for shaders, follow suffix in SHAssetMacros.h: {}", path.string());
+      return {};
+    }
 
     path.make_preferred();
 
-		std::ifstream file{ path.string(), std::ios::in };
+    std::ifstream file{ path.string(), std::ios::in };
 
-		if (file.is_open())
-		{
-			std::stringstream stream;
+    if (file.is_open())
+    {
+      std::stringstream stream;
 
-			stream << file.rdbuf();
+      stream << file.rdbuf();
 
-			std::string const content = stream.str();
+      std::string const content = stream.str();
 
-			auto data = CompileShaderSourceToMemory(content, path.filename().string(), type);
+      auto data = CompileShaderSourceToMemory(content, path.filename().string(), type);
 
-			if (data == nullptr)
-			{
-				return{};
-			}
+      if (data == nullptr)
+      {
+        return{};
+      }
 
-			return CompileShaderSourceToBinary(path, *data);
-		}
+      return CompileShaderSourceToBinary(path, *data);
+    }
 
-		SHLOG_ERROR("Unable to open shader file: {}", path.string());
+    SHLOG_ERROR("Unable to open shader file: {}", path.string());
 
-		return {};
-	}
+    return {};
+  }
 
-	std::optional<AssetPath> SHShaderSourceCompiler::CompileShaderFromString
-	(std::string const& string, AssetPath path, SH_SHADER_TYPE type) noexcept
-	{
-		auto const data = CompileShaderSourceToMemory(string, path.filename().string(), type);
+  std::optional<AssetPath> SHShaderSourceCompiler::CompileShaderFromString
+  (std::string const& string, AssetPath path, SH_SHADER_TYPE type) noexcept
+  {
+    auto const data = CompileShaderSourceToMemory(string, path.filename().string(), type);
 
-		if (data == nullptr)
-		{
-			return{};
-		}
+    if (data == nullptr)
+    {
+      return{};
+    }
 
-		return CompileShaderSourceToBinary(path, *data);
-	}
+    return CompileShaderSourceToBinary(path, *data);
+  }
 }
diff --git a/SHADE_Engine/src/Assets/SHAssetMacros.h b/SHADE_Engine/src/Assets/SHAssetMacros.h
index a21a9840..3376a2d5 100644
--- a/SHADE_Engine/src/Assets/SHAssetMacros.h
+++ b/SHADE_Engine/src/Assets/SHAssetMacros.h
@@ -13,6 +13,7 @@
 #include <cstdint>
 #include <string>
 #include <filesystem>
+#include "Asset Types/SHShaderAsset.h"
 
 // FMOD Fwd Declare
 namespace FMOD
@@ -113,10 +114,10 @@ constexpr std::string_view VERTEX_SHADER{ "_VS" };
 constexpr std::string_view FRAGMENT_SHADER{ "_FS" };
 constexpr std::string_view COMPUTER_SHADER{ "_CS" };
 
-constexpr std::string_view SHADER_IDENTIFIERS[] = {
-	VERTEX_SHADER,
-	FRAGMENT_SHADER,
-	COMPUTER_SHADER
+constexpr std::pair<std::string_view, SHADE::SH_SHADER_TYPE> SHADER_IDENTIFIERS[] = {
+	std::make_pair(VERTEX_SHADER, SHADE::SH_SHADER_TYPE::VERTEX),
+	std::make_pair(FRAGMENT_SHADER, SHADE::SH_SHADER_TYPE::FRAGMENT),
+	std::make_pair(COMPUTER_SHADER, SHADE::SH_SHADER_TYPE::COMPUTE)
 };
 
 constexpr size_t SHADER_TYPE_MAX_COUNT{ 3 };
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
index 7391da2c..97380fa3 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
@@ -37,6 +37,8 @@ of DigiPen Institute of Technology is prohibited.
 #include "Assets/Asset Types/SHTextureAsset.h"
 #include "Graphics/MiddleEnd/Interface/SHMousePickSystem.h"
 #include "Graphics/MiddleEnd/Lights/SHLightingSubSystem.h"
+#include "Assets/SHAssetManager.h"
+#include "Resource/SHResourceManager.h"
 
 namespace SHADE
 {
@@ -109,9 +111,10 @@ namespace SHADE
     transferCmdBuffer = graphicsCmdPool->RequestCommandBuffer(SH_CMD_BUFFER_TYPE::PRIMARY);
     graphicsTexCmdBuffer = graphicsCmdPool->RequestCommandBuffer(SH_CMD_BUFFER_TYPE::PRIMARY);
 
-
-    shaderModuleLibrary.ImportAllShaderSource(device);
-    shaderModuleLibrary.ReflectAllShaderModules();
+    // Load Built In Shaders
+    static constexpr AssetID VS_DEFAULT   = 39210065; defaultVertShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEFAULT);
+    static constexpr AssetID FS_DEFAULT   = 46377769; defaultFragShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(FS_DEFAULT);
+    static constexpr AssetID CS_COMPOSITE = 45072428; deferredCompositeShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(CS_COMPOSITE);
   }
 
   void SHGraphicsSystem::InitSceneRenderGraph(void) noexcept
@@ -180,16 +183,7 @@ namespace SHADE
     gBufferSubpass->AddColorOutput("Albedo");
     gBufferSubpass->AddDepthOutput("Depth Buffer", SH_ATT_DESC_TYPE_FLAGS::DEPTH_STENCIL);
 
-    //// kirsch
-    //auto kirschShader = shaderModuleLibrary.GetShaderModule("KirschCs.glsl");
-    //gBufferNode->AddNodeCompute(kirschShader, { "Position", "Scene" });
-
-    //// copy
-    //auto pureCopyShader = shaderModuleLibrary.GetShaderModule("PureCopyCs.glsl");
-    //gBufferNode->AddNodeCompute(pureCopyShader, { "Position", "Scene" });
-
     // deferred composite
-    auto deferredCompositeShader = shaderModuleLibrary.GetBuiltInShaderModule("DeferredComposite_CS");
     gBufferNode->AddNodeCompute(deferredCompositeShader, { "Position", "Normals", "Albedo", "Light Layer Indices", "Scene" });
 
 
@@ -207,10 +201,7 @@ namespace SHADE
 
     worldRenderer->SetCameraDirector(cameraSystem->CreateDirector());
 
-    auto cubeVS = shaderModuleLibrary.GetBuiltInShaderModule("TestCube_VS");
-    auto cubeFS = shaderModuleLibrary.GetBuiltInShaderModule("TestCube_FS");
-
-    defaultMaterial = AddMaterial(cubeVS, cubeFS, gBufferSubpass);
+    defaultMaterial = AddMaterial(defaultVertShader, defaultFragShader, gBufferSubpass);
   }
 
   void SHGraphicsSystem::InitMiddleEnd(void) noexcept
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
index c5908db4..3f899446 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
@@ -25,7 +25,6 @@ of DigiPen Institute of Technology is prohibited.
 #include "ECS_Base/System/SHSystemRoutine.h"
 #include "Graphics/Descriptors/SHVkDescriptorPool.h"
 #include "Graphics/RenderGraph/SHRenderGraph.h"
-#include "Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.h"
 #include "SHMeshLibrary.h"
 #include "Graphics/MiddleEnd/Materials/SHMaterialInstanceCache.h"
 #include "../Textures/SHTextureLibrary.h"
@@ -329,6 +328,7 @@ namespace SHADE
     SHTextureLibrary                                          texLibrary;
     SHSamplerCache                                            samplerCache;
     SHMaterialInstanceCache                                   materialInstanceCache;
+
     // Viewports  
 #ifdef SHEDITOR
     Handle<SHViewport>                                        editorViewport;
@@ -349,10 +349,13 @@ namespace SHADE
     // Temp Cameras
     Handle<SHCamera>                                          worldCamera;
     Handle<SHCamera>                                          screenCamera;
-    
-    SHShaderModuleLibrary                                     shaderModuleLibrary;
 
-    // Temp Materials
+    // Built-In Shaders
+    Handle<SHVkShaderModule>                                  defaultVertShader;
+    Handle<SHVkShaderModule>                                  defaultFragShader;
+    Handle<SHVkShaderModule>                                  deferredCompositeShader;
+
+    // Built-In Materials
     Handle<SHMaterial>                                        defaultMaterial;
 
     Handle<SHRenderGraph>                                     worldRenderGraph;
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Materials/SHMaterialSpec.h b/SHADE_Engine/src/Graphics/MiddleEnd/Materials/SHMaterialSpec.h
new file mode 100644
index 00000000..338c34b2
--- /dev/null
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Materials/SHMaterialSpec.h
@@ -0,0 +1,36 @@
+/************************************************************************************//*!
+\file           SHMaterialSpec.h
+\author         Tng Kah Wei, kahwei.tng, 390009620
+\par            email: kahwei.tng\@digipen.edu
+\date           Oct 31, 2022
+\brief			Contains the struct definition of SHMaterialSpec.
+
+Copyright (C) 2022 DigiPen Institute of Technology.
+Reproduction or disclosure of this file or its contents without the prior written consent
+of DigiPen Institute of Technology is prohibited.
+*//*************************************************************************************/
+#pragma once
+// Standard Library
+#include <string>
+#include <vector>
+#include <utility>
+// Project Includes
+#include "Assets/SHAssetMacros.h"
+
+namespace SHADE
+{
+  /*************************************************************************************/
+  /*!
+    \brief
+    Describes a Material's serialized properties. A representation of a material that is
+    independent of GPU resources.
+  */
+  /*************************************************************************************/
+  struct SHMaterialSpec
+  {
+    AssetID vertexShader;
+    AssetID fragShader;
+    std::string subpassName;
+    YAML::Node properties;
+  };
+}
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.cpp
deleted file mode 100644
index d0b160df..00000000
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-#include "SHPch.h"
-#include "SHShaderModuleLibrary.h"
-#include "Graphics/Devices/SHVkLogicalDevice.h"
-#include "Assets/SHAssetManager.h"
-
-namespace SHADE
-{
-  /***************************************************************************/
-  /*!
-  
-    \brief
-      Imports all shader binaries from the source library.
-    
-    \param logicalDeviceHdl
-      For creating shader modules.
-
-    \param sourceLib
-      The source library class that stores the container of shader binary data.
-   
-  */
-  /***************************************************************************/
-  //void SHShaderModuleLibrary::ImportFromSourceLibrary(Handle<SHVkLogicalDevice>& logicalDeviceHdl, SHShaderSourceLibrary const& sourceLib) noexcept
-  //{
-  //  auto const& sources = sourceLib.GetSourceLibrary();
-  //  for (auto const& source : sources)
-  //  {
-  //    vk::ShaderStageFlagBits shaderType{};
-  //    switch (source.shaderType)
-  //    {
-  //    case SH_SHADER_TYPE::VERTEX:
-  //      shaderType = vk::ShaderStageFlagBits::eVertex;
-  //      break;
-  //    case SH_SHADER_TYPE::FRAGMENT:
-  //      shaderType = vk::ShaderStageFlagBits::eFragment;
-  //      break;
-  //    case SH_SHADER_TYPE::COMPUTE:
-  //      shaderType = vk::ShaderStageFlagBits::eCompute;
-  //      break;
-  //    default:
-  //      shaderType = vk::ShaderStageFlagBits::eVertex;
-  //      break;
-  //    }
-
-  //    Handle<SHVkShaderModule> newShaderModule = logicalDeviceHdl->CreateShaderModule(source.spirvBinary, "main", shaderType, source.name);
-  //    shaderModules.emplace(source.id, newShaderModule);
-  //    stringToID.emplace(source.name, source.id);
-  //  }
-  //}
-
-  /***************************************************************************/
-  /*!
-  
-    \brief
-      Gets the shader module based on module name.
-    
-    \param shaderName
-   
-    \return 
-  
-  */
-  /***************************************************************************/
-  //Handle<SHVkShaderModule> SHShaderModuleLibrary::GetShaderModule(std::string shaderName) const noexcept
-  //{
-  //  if (stringToID.contains(shaderName))
-  //    return shaderModules.at(stringToID.at(shaderName));
-  //  else
-  //    return {};
-  //}
-
-  vk::ShaderStageFlagBits SHShaderModuleLibrary::GetVkShaderFlag(SH_SHADER_TYPE type) noexcept
-  {
-    vk::ShaderStageFlagBits shaderType{};
-    switch (type)
-    {
-    case SH_SHADER_TYPE::VERTEX:
-      shaderType = vk::ShaderStageFlagBits::eVertex;
-      break;
-    case SH_SHADER_TYPE::FRAGMENT:
-      shaderType = vk::ShaderStageFlagBits::eFragment;
-      break;
-    case SH_SHADER_TYPE::COMPUTE:
-      shaderType = vk::ShaderStageFlagBits::eCompute;
-      break;
-    default:
-      shaderType = vk::ShaderStageFlagBits::eVertex;
-      break;
-    }
-
-    return shaderType;
-  }
-
-  Handle<SHVkShaderModule> SHShaderModuleLibrary::GetBuiltInShaderModule(std::string shaderName) const noexcept
-  {
-      if (builtInShaderModules.contains(shaderName))
-        return builtInShaderModules.at(shaderName);
-      else
-        return {};
-  }
-
-  void SHShaderModuleLibrary::ImportAllShaderSource(Handle<SHVkLogicalDevice>& logicalDeviceHdl) noexcept
-  {
-    uint32_t idCounter{ 0 };
-
-    auto const data = SHAssetManager::GetAllDataOfType(AssetType::SHADER);
-    for (auto const& dataPtr : data)
-    {
-      auto const shader = dynamic_cast<SHShaderAsset const*>(dataPtr);
-
-	    Handle<SHVkShaderModule> newShaderModule = 
-        logicalDeviceHdl->CreateShaderModule(shader->spirvBinary, "main", GetVkShaderFlag(shader->shaderType), shader->name);
-
-	    shaderModules.emplace(idCounter++, newShaderModule);
-    }
-
-    auto const builtIn = SHAssetManager::GetAllDataOfType(AssetType::SHADER_BUILT_IN);
-    for (auto const& dataPtr : builtIn)
-    {
-      auto const shader = dynamic_cast<SHShaderAsset const*>(dataPtr);
-
-      Handle<SHVkShaderModule> newShaderModule =
-        logicalDeviceHdl->CreateShaderModule(shader->spirvBinary, "main", GetVkShaderFlag(shader->shaderType), shader->name);
-
-      builtInShaderModules.emplace(shader->name, newShaderModule);
-    }
-  }
-
-  void SHShaderModuleLibrary::ReflectAllShaderModules() noexcept
-  {
-    for (auto& module : shaderModules)
-    {
-      module.second->Reflect();
-    }
-
-    for (auto& module : builtInShaderModules)
-    {
-      module.second->Reflect();
-    }
-  }
-}
diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.h b/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.h
deleted file mode 100644
index 9daae816..00000000
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Shaders/SHShaderModuleLibrary.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef SH_SHADER_MODULE_LIBRARY_H
-#define SH_SHADER_MODULE_LIBRARY_H
-
-#include "Graphics/Shaders/SHVkShaderModule.h"
-#include "Assets/Asset Types/SHShaderAsset.h"
-
-namespace SHADE
-{
-  class SHVkLogicalDevice;
-
-  /*
-   * The purpose of this shader module library is to be separate from the source library. The source library contains
-   * pure shader binary data that contains no vulkan related objects. Every time we load on unload a scene/level,
-   * this class and the source library class is cleared of its modules and recreated. 
-   */
-  class SHShaderModuleLibrary
-  {
-  private:
-    /*-----------------------------------------------------------------------*/
-    /* PRIVATE MEMBER VARIABLES                                              */
-    /*-----------------------------------------------------------------------*/
-    //! Stored shader modules
-    std::unordered_map<uint32_t, Handle<SHVkShaderModule>> shaderModules;
-    std::unordered_map<std::string, Handle<SHVkShaderModule>> builtInShaderModules;
-
-    inline vk::ShaderStageFlagBits GetVkShaderFlag(SH_SHADER_TYPE type) noexcept;
-
-  public:
-    /*-----------------------------------------------------------------------*/
-    /* PUBLIC MEMBER FUNCTIONS                                               */
-    /*-----------------------------------------------------------------------*/
-    //void ImportFromSourceLibrary(Handle<SHVkLogicalDevice>& logicalDeviceHdl, SHShaderSourceLibrary const& sourceLib) noexcept;
-
-    /*-----------------------------------------------------------------------*/
-    /* SETTERS AND GETTERS                                                   */
-    /*-----------------------------------------------------------------------*/
-    Handle<SHVkShaderModule> GetBuiltInShaderModule(std::string shaderName) const noexcept;
-    
-    void ImportAllShaderSource(Handle<SHVkLogicalDevice>& logicalDeviceHdl) noexcept;
-    void ReflectAllShaderModules() noexcept;
-  };
-}
-
-#endif
\ No newline at end of file
diff --git a/SHADE_Engine/src/Resource/SHResourceManager.h b/SHADE_Engine/src/Resource/SHResourceManager.h
index 84f93b10..61689420 100644
--- a/SHADE_Engine/src/Resource/SHResourceManager.h
+++ b/SHADE_Engine/src/Resource/SHResourceManager.h
@@ -17,9 +17,45 @@ of DigiPen Institute of Technology is prohibited.
 #include "SH_API.h"
 #include "SHResourceLibrary.h"
 #include "Assets/SHAssetMacros.h"
+#include "Assets/Asset Types/SHMeshAsset.h"
+#include "Assets/Asset Types/SHTextureAsset.h"
+#include "Assets/Asset Types/SHShaderAsset.h"
+#include "Graphics/Shaders/SHVkShaderModule.h"
+#include "Graphics/MiddleEnd/Textures/SHTextureLibrary.h"
+#include "Graphics/MiddleEnd/Interface/SHMeshLibrary.h"
+#include "Graphics/MiddleEnd/Interface/SHMaterial.h"
+#include "Assets/Asset Types/SHMaterialAsset.h"
 
 namespace SHADE
 {
+  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;
+  };
+
+
   /// <summary>
   /// Static class responsible for loading and caching runtime resources from their
   /// serialised Asset IDs.
@@ -124,6 +160,14 @@ namespace SHADE
     /// <returns>Reference to the AssetHandleMap of the specified type.</returns>
     template<typename ResourceType>
     static std::pair<AssetHandleMapRef, HandleAssetMapRef> getAssetHandleMap();
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="ResourceType"></typeparam>
+    /// <param name="assetData"></param>
+    /// <returns></returns>
+    template<typename ResourceType>
+    static Handle<ResourceType> load(AssetID assetId, const typename SHResourceLoader<ResourceType>::AssetType& assetData);
   };
 }
 
diff --git a/SHADE_Engine/src/Resource/SHResourceManager.hpp b/SHADE_Engine/src/Resource/SHResourceManager.hpp
index 072adaa2..15834cdf 100644
--- a/SHADE_Engine/src/Resource/SHResourceManager.hpp
+++ b/SHADE_Engine/src/Resource/SHResourceManager.hpp
@@ -3,7 +3,7 @@
 \author         Tng Kah Wei, kahwei.tng, 390009620
 \par            email: kahwei.tng\@digipen.edu
 \date           Oct 21, 2022
-\brief          Contains the definition of the function templates of the 
+\brief          Contains the definition of the function templates of the
                 SHResourceManager static class.
 
 Copyright (C) 2022 DigiPen Institute of Technology.
@@ -13,12 +13,17 @@ of DigiPen Institute of Technology is prohibited.
 #pragma once
 // Primary Include
 #include "SHResourceManager.h"
+// External Dependencies
+#include <yaml-cpp/yaml.h>
 // Project Includes
 #include "Assets/SHAssetManager.h"
 #include "Assets/Asset Types/SHAssetIncludes.h"
 #include "Graphics/MiddleEnd/Interface/SHGraphicsSystem.h"
 #include "ECS_Base/Managers/SHSystemManager.h"
 #include "Tools/SHLog.h"
+#include "Graphics/Shaders/SHVkShaderModule.h"
+#include "Graphics/Devices/SHVkLogicalDevice.h"
+#include "Graphics/MiddleEnd/Materials/SHMaterialSpec.h"
 
 namespace SHADE
 {
@@ -40,67 +45,19 @@ namespace SHADE
       return Handle<ResourceType>(typedHandleMap.get()[assetId]);
 
     /* Otherwise, we need to load it! */
-    // Meshes
-    if constexpr (std::is_same_v<ResourceType, SHMesh>)
+    // Load Asset Data
+    const auto* assetData = SHAssetManager::GetData<SHResourceLoader<ResourceType>::AssetType>(assetId);
+    if (assetData == nullptr)
     {
-      // Get system
-      SHGraphicsSystem* gfxSystem = SHSystemManager::GetSystem<SHGraphicsSystem>();
-      if (gfxSystem == nullptr)
-        throw std::runtime_error("[SHResourceManager] Attempted to load graphics resource without a SHGraphicsSystem installed.");
-
-      // Load
-      const SHMeshAsset* assetData = SHAssetManager::GetData<SHMeshAsset>(assetId);
-      if (assetData == nullptr)
-      {
-        SHLog::Warning("[SHResourceManager] Attempted to load an asset with an invalid Asset ID.");
-        return {};
-      }
-      loadedAssetData.emplace_back(assetId);
-
-      Handle<SHMesh> meshHandle = gfxSystem->AddMesh
-      (
-        assetData->vertexPosition.size(), 
-        assetData->vertexPosition.data(),
-        assetData->texCoords.data(),
-        assetData->vertexTangent.data(),
-        assetData->vertexNormal.data(),
-        assetData->indices.size(),
-        assetData->indices.data()
-      );
-      Handle genericHandle = Handle(meshHandle);
-      typedHandleMap.get().emplace(assetId, genericHandle);
-      typedAssetIdMap.get().emplace(genericHandle, assetId);
-      return meshHandle;
+      SHLog::Warning("[SHResourceManager] Attempted to load an asset with an invalid Asset ID.");
+      return {};
     }
-    // Textures
-    else if constexpr (std::is_same_v<ResourceType, SHTexture>)
-    {
-      // Get system
-      SHGraphicsSystem* gfxSystem = SHSystemManager::GetSystem<SHGraphicsSystem>();
-      if (gfxSystem == nullptr)
-        throw std::runtime_error("[SHResourceManager] Attempted to load graphics resource without a SHGraphicsSystem installed.");
 
-      // Load
-      const SHTextureAsset* assetData = SHAssetManager::GetData<SHTextureAsset>(assetId);
-      if (assetData == nullptr)
-      {
-        SHLog::Warning("[SHResourceManager] Attempted to load an asset with an invalid Asset ID.");
-        return {};
-      }
-      loadedAssetData.emplace_back(assetId);
-
-      Handle<SHTexture> texHandle = gfxSystem->AddTexture
-      (
-        assetData->numBytes,
-        assetData->pixelData,
-        assetData->width,
-        assetData->height,
-        assetData->format,
-        assetData->mipOffsets
-      );
-      typedHandleMap.get().emplace(assetId, Handle(texHandle));
-      return texHandle;
-    }
+    auto handle = load<ResourceType>(assetId, *assetData);
+    Handle genericHandle = Handle();
+    typedHandleMap.get().emplace(assetId, genericHandle);
+    typedAssetIdMap.get().emplace(genericHandle, assetId);
+    return handle;
   }
 
   template<typename ResourceType>
@@ -152,7 +109,7 @@ namespace SHADE
   template<typename ResourceType>
   std::pair<SHResourceManager::AssetHandleMapRef, SHResourceManager::HandleAssetMapRef> SHResourceManager::getAssetHandleMap()
   {
-     const std::type_index TYPE = typeid(ResourceType);
+    const std::type_index TYPE = typeid(ResourceType);
 
     if (!handlesMap.contains(TYPE))
     {
@@ -160,7 +117,7 @@ namespace SHADE
       assetIdMap.emplace(TYPE, HandleAssetMap{});
       typedFreeFuncMap.emplace
       (
-        TYPE, 
+        TYPE,
         [TYPE](AssetID assetId)
         {
           static_cast<Handle<ResourceType>>(SHResourceManager::handlesMap[TYPE][assetId]).Free();
@@ -169,4 +126,129 @@ namespace SHADE
     }
     return std::make_pair(std::ref(handlesMap[TYPE]), std::ref(assetIdMap[TYPE]));
   }
+
+  template<typename ResourceType>
+  Handle<ResourceType> SHResourceManager::load(AssetID assetId, const typename SHResourceLoader<ResourceType>::AssetType& assetData)
+  {
+    // Get system
+    SHGraphicsSystem* gfxSystem = SHSystemManager::GetSystem<SHGraphicsSystem>();
+    if (gfxSystem == nullptr)
+      throw std::runtime_error("[SHResourceManager] Attempted to load graphics resource without a SHGraphicsSystem installed.");
+
+    // Meshes
+    if constexpr (std::is_same_v<ResourceType, SHMesh>)
+    {
+      loadedAssetData.emplace_back(assetId);
+
+      return gfxSystem->AddMesh
+      (
+        assetData.vertexPosition.size(),
+        assetData.vertexPosition.data(),
+        assetData.texCoords.data(),
+        assetData.vertexTangent.data(),
+        assetData.vertexNormal.data(),
+        assetData.indices.size(),
+        assetData.indices.data()
+      );
+    }
+    // Textures
+    else if constexpr (std::is_same_v<ResourceType, SHTexture>)
+    {
+      loadedAssetData.emplace_back(assetId);
+
+      return gfxSystem->AddTexture
+      (
+        assetData.numBytes,
+        assetData.pixelData,
+        assetData.width,
+        assetData.height,
+        assetData.format,
+        assetData.mipOffsets
+      );
+    }
+    // Shaders
+    else if constexpr (std::is_same_v<ResourceType, SHVkShaderModule>)
+    {
+      auto shader = gfxSystem->GetDevice()->CreateShaderModule
+      (
+        assetData.spirvBinary,
+        "main",
+        static_cast<vk::ShaderStageFlagBits>(assetData.shaderType),
+        assetData.name
+      );
+      shader->Reflect();
+      return shader;
+    }
+    // Materials
+    else if constexpr (std::is_same_v<ResourceType, SHMaterial>)
+    {
+      // Get the data we need to construct
+      SHMaterialSpec matSpec = YAML::Node(assetData.data).as<SHMaterialSpec>();
+
+      // Load shaders
+      auto vertexShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(matSpec.vertexShader);
+      auto fragShader   = SHResourceManager::LoadOrGet<SHVkShaderModule>(matSpec.fragShader);
+
+      // Ensure that both shaders are present
+      if (!(vertexShader && fragShader))
+      {
+        SHLOG_ERROR("[SHResourceManager] Failed to load material as shaders failed to be loaded.");
+        return {};
+      }
+
+      // Grab subpass from worldRenderer
+      auto renderPass = gfxSystem->GetPrimaryRenderpass();
+      if (!renderPass)
+      {
+        SHLOG_ERROR("[SHResourceManager] Failed to load material as RenderPass could not be found.");
+        return {};
+      }
+      auto subPass = renderPass->GetSubpass(matSpec.subpassName);
+      if (!subPass)
+      {
+        SHLOG_ERROR("[SHResourceManager] Failed to load material as SubPass could not be found.");
+        return {};
+      }
+      
+      // Create material
+      auto matHandle = gfxSystem->AddMaterial(vertexShader, fragShader, subPass);
+
+      // Set properties for the material
+      Handle<SHShaderBlockInterface> pipelineProperties = matHandle->GetShaderBlockInterface();
+      for (int i = 0; i < static_cast<int>(pipelineProperties->GetVariableCount()); ++i)
+      {
+        const std::string& PROP_NAME = pipelineProperties->GetVariableName(i);
+        const auto& PROP_NODE = matSpec.properties;
+        if (PROP_NODE)
+        {
+          const std::string& VAR_NAME = pipelineProperties->GetVariableName(i);
+          const SHShaderBlockInterface::Variable* VARIABLE = pipelineProperties->GetVariable(i);
+          switch (VARIABLE->type)
+          {
+            case SHADE::SHShaderBlockInterface::Variable::Type::FLOAT:
+              matHandle->SetProperty(VARIABLE->offset, PROP_NODE.as<float>());
+              break;
+            case SHADE::SHShaderBlockInterface::Variable::Type::INT:
+              matHandle->SetProperty(VARIABLE->offset, PROP_NODE.as<int>());
+              break;
+            case SHADE::SHShaderBlockInterface::Variable::Type::VECTOR2:
+              matHandle->SetProperty(VARIABLE->offset, PROP_NODE.as<SHVec2>());
+              break;
+            case SHADE::SHShaderBlockInterface::Variable::Type::VECTOR3:
+              matHandle->SetProperty(VARIABLE->offset, PROP_NODE.as<SHVec3>());
+              break;
+            case SHADE::SHShaderBlockInterface::Variable::Type::VECTOR4:
+              matHandle->SetProperty(VARIABLE->offset, PROP_NODE.as<SHVec4>());
+              break;
+            case SHADE::SHShaderBlockInterface::Variable::Type::OTHER:
+            default:
+              continue;
+              break;
+          }
+        }
+      }
+
+      return matHandle;
+    }
+  }
 }
diff --git a/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp b/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
index a6f02249..2179d1cf 100644
--- a/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
+++ b/SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
@@ -12,8 +12,11 @@
 #include "Resource/SHResourceManager.h"
 #include "Graphics/MiddleEnd/Interface/SHRenderable.h"
 #include "Graphics/MiddleEnd/Interface/SHMaterial.h"
+#include "Graphics/MiddleEnd/Interface/SHMaterialInstance.h"
 #include "SHSerializationTools.h"
 #include "Physics/Components/SHColliderComponent.h"
+#include "Graphics/MiddleEnd/Materials/SHMaterialSpec.h"
+#include "Tools/SHLog.h"
 
 namespace YAML
 {
@@ -303,104 +306,45 @@ namespace YAML
             // Write Material
             YAML::Node node;
             
-            node[VERT_SHADER_YAML_TAG.data()] = 0; // SHResourceManager::GetAssetID<SHVkShaderModule>(vertexShader).value_or(0);
-            node[FRAG_SHADER_YAML_TAG.data()] = 0; // SHResourceManager::GetAssetID<SHVkShaderModule>(fragShader).value_or(0);
-            node[SUBPASS_YAML_TAG.data()]     = rhs.GetPipeline()->GetPipelineState().GetSubpass()->GetName();
+            node[VERT_SHADER_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHVkShaderModule>(vertexShader).value_or(0);
+            node[FRAG_SHADER_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHVkShaderModule>(fragShader).value_or(0);
+            node[SUBPASS_YAML_TAG.data()]     = rhs.GetPipeline()->GetPipelineState().GetSubpass()->GetName(); 
             node[PROPS_YAML_TAG.data()]       = propertiesNode;
 
             return node;
         }
-        static bool decode(YAML::Node const& node, SHMaterial& rhs)
-        {
-            /*
-            // Retrieve Shader Asset IDs
-            AssetID vertShaderId = 0;
-            AssetID fragShaderId = 0;
-            if (node[VERT_SHADER_YAML_TAG.data()])
-                vertShaderId = node[VERT_SHADER_YAML_TAG.data()].as<AssetID>();
-            if (node[FRAG_SHADER_YAML_TAG.data()])
-                fragShaderId = node[FRAG_SHADER_YAML_TAG.data()].as<AssetID>();
+    };
 
-            // Ensure that both shaders are present
-            if (vertShaderId == 0 || fragShaderId == 0)
-                return false; // No pipeline
+    template<>
+    struct convert<SHMaterialSpec>
+    {
+      static constexpr std::string_view VERT_SHADER_YAML_TAG = "VertexShader";
+      static constexpr std::string_view FRAG_SHADER_YAML_TAG = "FragmentShader";
+      static constexpr std::string_view SUBPASS_YAML_TAG = "SubPass";
+      static constexpr std::string_view PROPS_YAML_TAG = "Properties";
 
-            // Get Shader Modules
-            Handle<SHVkShaderModule> vertexShader, fragShader;
-            vertexShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(vertShaderId);
-            fragShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(fragShaderId);
+      static bool decode(YAML::Node const& node, SHMaterialSpec& rhs)
+      {
+        // Retrieve Shader Asset IDs
+        if (!node[VERT_SHADER_YAML_TAG.data()])
+          return false;
+        rhs.vertexShader = node[VERT_SHADER_YAML_TAG.data()].as<AssetID>();
+        if (!node[FRAG_SHADER_YAML_TAG.data()])
+          return false;
+        rhs.fragShader = node[FRAG_SHADER_YAML_TAG.data()].as<AssetID>();
 
-            // Get Pipeline Library
-            if (node[SUBPASS_YAML_TAG.data()])
-            {
-                auto gfxSystem = SHSystemManager::GetSystem<SHGraphicsSystem>();
-                if (!gfxSystem)
-                    return false;
+        // Retrieve Subpass
+        if (!node[SUBPASS_YAML_TAG.data()])
+          return false;
+        rhs.subpassName = node[SUBPASS_YAML_TAG.data()].as<std::string>();
 
-                // Grab subpass from worldRenderer
-                auto renderPass = gfxSystem->GetPrimaryRenderpass();
-                if (!renderPass)
-                    return false;
-                auto subPass = renderPass->GetSubpass(node[SUBPASS_YAML_TAG.data()].as<std::string>());
-                if (!subPass)
-                    return false;
+        // Retrieve
+        if (!node[PROPS_YAML_TAG.data()])
+          return false;
+        rhs.properties = node[PROPS_YAML_TAG.data()];
 
-                // Set Pipeline
-                rhs.SetPipeline(renderPass->GetOrCreatePipeline
-                (
-                    std::make_pair(vertexShader, fragShader),
-                    subPass
-                ));
-            }
-            */
-
-            // TODO: Load Proper Material!
-            // Set default material 
-            auto gfxSystem = SHSystemManager::GetSystem<SHGraphicsSystem>();
-            if (!gfxSystem)
-              return false;
-            rhs.SetPipeline(gfxSystem->GetDefaultMaterial()->GetPipeline());
-
-            if (node[PROPS_YAML_TAG.data()].IsDefined())
-            {
-                // Loop through all properties
-                Handle<SHShaderBlockInterface> pipelineProperties = rhs.GetShaderBlockInterface();
-                const YAML::Node& PROPS_NODE = node[PROPS_YAML_TAG.data()];
-                for (int i = 0; i < static_cast<int>(pipelineProperties->GetVariableCount()); ++i)
-                {
-                    const std::string& PROP_NAME = pipelineProperties->GetVariableName(i);
-                    const auto& PROP_NODE = PROPS_NODE[PROP_NAME.data()];
-                    if (PROP_NODE)
-                    {
-                        const std::string& VAR_NAME = pipelineProperties->GetVariableName(i);
-                        const SHShaderBlockInterface::Variable* VARIABLE = pipelineProperties->GetVariable(i);
-                        switch (VARIABLE->type)
-                        {
-                            case SHADE::SHShaderBlockInterface::Variable::Type::FLOAT:
-                                rhs.SetProperty(VARIABLE->offset, PROP_NODE.as<float>());
-                                break;
-                            case SHADE::SHShaderBlockInterface::Variable::Type::INT:
-                                rhs.SetProperty(VARIABLE->offset, PROP_NODE.as<int>());
-                                break;
-                            case SHADE::SHShaderBlockInterface::Variable::Type::VECTOR2:
-                                rhs.SetProperty(VARIABLE->offset, SHSerializationTools::YAMLToVec2(PROP_NODE));
-                                break;
-                            case SHADE::SHShaderBlockInterface::Variable::Type::VECTOR3:
-                                rhs.SetProperty(VARIABLE->offset, SHSerializationTools::YAMLToVec3(PROP_NODE));
-                                break;
-                            case SHADE::SHShaderBlockInterface::Variable::Type::VECTOR4:
-                                rhs.SetProperty(VARIABLE->offset, SHSerializationTools::YAMLToVec4(PROP_NODE));
-                                break;
-                            case SHADE::SHShaderBlockInterface::Variable::Type::OTHER:
-                            default:
-                                continue;
-                                break;
-                        }
-                    }
-                }
-            }
-            return true;
-        }
+        return true;
+      }
     };
 
     template<>
@@ -413,7 +357,7 @@ namespace YAML
         {
             YAML::Node node;
             node[MESH_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHMesh>(rhs.GetMesh()).value_or(0);
-            node[MAT_YAML_TAG.data()] = 0;  // TODO: Asset ID            
+            node[MAT_YAML_TAG.data()] = SHResourceManager::GetAssetID<SHMaterial>(rhs.GetMaterial()->GetBaseMaterial()).value_or(0);
             return node;
         }
         static bool decode(YAML::Node const& node, SHRenderable& rhs)
@@ -424,12 +368,17 @@ namespace YAML
             }
             if (node[MAT_YAML_TAG.data()].IsDefined())
             {
-                // TODO: Convert Asset ID To Material HAndle
                 // Temporarily, use default material
                 auto gfxSystem = SHSystemManager::GetSystem<SHGraphicsSystem>();
                 if (!gfxSystem)
                   return false;
-                rhs.SetMaterial(gfxSystem->AddOrGetBaseMaterialInstance(gfxSystem->GetDefaultMaterial()));
+                Handle<SHMaterial> baseMat = SHResourceManager::LoadOrGet<SHMaterial>(node[MAT_YAML_TAG.data()].as<AssetID>());
+                if (!baseMat)
+                {
+                  baseMat = gfxSystem->GetDefaultMaterial();
+                  SHLog::Warning("[SHSerializationHelper] Unable to load specified material. Falling back to default material.");
+                }
+                rhs.SetMaterial(gfxSystem->AddOrGetBaseMaterialInstance(baseMat));
             }
             return true;
         }
diff --git a/SHADE_Managed/src/Input/Input.hxx b/SHADE_Managed/src/Input/Input.hxx
index f281e4c8..ec015e8b 100644
--- a/SHADE_Managed/src/Input/Input.hxx
+++ b/SHADE_Managed/src/Input/Input.hxx
@@ -31,10 +31,159 @@ namespace SHADE
         /// <summary>
         /// Represents the available supported keycodes that can be passed into the 
         /// key-based Input functions.
+        /// 
+        /// Attempting to follow https://docs.unity3d.com/ScriptReference/KeyCode.html
+        /// Win32 keycodes are shift-insensitive, i.e. 'A' and 'a' are the same keycode and '1' and '!' are the same keycode
         /// </summary>
         enum class KeyCode : int
         {
+            Backspace       = static_cast<int>(SHInputManager::SH_KEYCODE::BACKSPACE),
+            Delete          = static_cast<int>(SHInputManager::SH_KEYCODE::DEL),
+            Tab             = static_cast<int>(SHInputManager::SH_KEYCODE::TAB),
+            Clear           = static_cast<int>(SHInputManager::SH_KEYCODE::CLEAR),
+            Return          = static_cast<int>(SHInputManager::SH_KEYCODE::ENTER),
+            Pause           = static_cast<int>(SHInputManager::SH_KEYCODE::PAUSE),
+            Escape          = static_cast<int>(SHInputManager::SH_KEYCODE::ESCAPE),
             Space           = static_cast<int>(SHInputManager::SH_KEYCODE::SPACE),
+            Keypad0         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_0),
+            Keypad1         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_1),
+            Keypad2         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_2),
+            Keypad3         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_3),
+            Keypad4         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_4),
+            Keypad5         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_5),
+            Keypad6         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_6),
+            Keypad7         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_7),
+            Keypad8         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_8),
+            Keypad9         = static_cast<int>(SHInputManager::SH_KEYCODE::NUMPAD_9),
+            KeypadPeriod    = static_cast<int>(SHInputManager::SH_KEYCODE::DECIMAL),
+            KeypadDivide    = static_cast<int>(SHInputManager::SH_KEYCODE::DIVIDE),
+            KeypadMultiply  = static_cast<int>(SHInputManager::SH_KEYCODE::MULTIPLY),
+            KeypadMinus     = static_cast<int>(SHInputManager::SH_KEYCODE::SUBTRACT),
+            KeypadPlus      = static_cast<int>(SHInputManager::SH_KEYCODE::ADD),
+            KeypadEnter     = static_cast<int>(SHInputManager::SH_KEYCODE::ENTER),
+            //KeypadEquals
+            UpArrow         = static_cast<int>(SHInputManager::SH_KEYCODE::UP_ARROW),
+            DownArrow       = static_cast<int>(SHInputManager::SH_KEYCODE::DOWN_ARROW),
+            RightArrow      = static_cast<int>(SHInputManager::SH_KEYCODE::RIGHT_ARROW),
+            LeftArrow       = static_cast<int>(SHInputManager::SH_KEYCODE::LEFT_ARROW),
+            Insert          = static_cast<int>(SHInputManager::SH_KEYCODE::INSERT),
+            Home            = static_cast<int>(SHInputManager::SH_KEYCODE::HOME),
+            End             = static_cast<int>(SHInputManager::SH_KEYCODE::END),
+            PageUp          = static_cast<int>(SHInputManager::SH_KEYCODE::PAGE_UP),
+            PageDown        = static_cast<int>(SHInputManager::SH_KEYCODE::PAGE_DOWN),
+            F1              = static_cast<int>(SHInputManager::SH_KEYCODE::F1),
+            F2              = static_cast<int>(SHInputManager::SH_KEYCODE::F2),
+            F3              = static_cast<int>(SHInputManager::SH_KEYCODE::F3),
+            F4              = static_cast<int>(SHInputManager::SH_KEYCODE::F4),
+            F5              = static_cast<int>(SHInputManager::SH_KEYCODE::F5),
+            F6              = static_cast<int>(SHInputManager::SH_KEYCODE::F6),
+            F7              = static_cast<int>(SHInputManager::SH_KEYCODE::F7),
+            F8              = static_cast<int>(SHInputManager::SH_KEYCODE::F8),
+            F9              = static_cast<int>(SHInputManager::SH_KEYCODE::F9),
+            F10             = static_cast<int>(SHInputManager::SH_KEYCODE::F10),
+            F11             = static_cast<int>(SHInputManager::SH_KEYCODE::F11),
+            F12             = static_cast<int>(SHInputManager::SH_KEYCODE::F12),
+            F13             = static_cast<int>(SHInputManager::SH_KEYCODE::F13),
+            F14             = static_cast<int>(SHInputManager::SH_KEYCODE::F14),
+            F15             = static_cast<int>(SHInputManager::SH_KEYCODE::F15),
+            F16             = static_cast<int>(SHInputManager::SH_KEYCODE::F16),
+            F17             = static_cast<int>(SHInputManager::SH_KEYCODE::F17),
+            F18             = static_cast<int>(SHInputManager::SH_KEYCODE::F18),
+            F19             = static_cast<int>(SHInputManager::SH_KEYCODE::F19),
+            F20             = static_cast<int>(SHInputManager::SH_KEYCODE::F20),
+            F21             = static_cast<int>(SHInputManager::SH_KEYCODE::F21),
+            F22             = static_cast<int>(SHInputManager::SH_KEYCODE::F22),
+            F23             = static_cast<int>(SHInputManager::SH_KEYCODE::F23),
+            F24             = static_cast<int>(SHInputManager::SH_KEYCODE::F24),
+            Alpha0          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_0),
+            Alpha1          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_1),
+            Alpha2          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_2),
+            Alpha3          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_3),
+            Alpha4          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_4),
+            Alpha5          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_5),
+            Alpha6          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_6),
+            Alpha7          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_7),
+            Alpha8          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_8),
+            Alpha9          = static_cast<int>(SHInputManager::SH_KEYCODE::NUMBER_9),
+            //Exclaim
+            //DoubleQuote
+            //Hash
+            //Dollar
+            //Percent
+            //Ampersand
+            Quote           = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_7),
+            //LeftParen
+            //RightParen
+            //Asterisk
+            //Plus
+            Comma           = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_COMMA),
+            Minus           = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_MINUS),
+            Period          = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_PERIOD),
+            Slash           = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_2),
+            //Colon
+            Semicolon       = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_1),
+            //Less
+            Equals          = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_PLUS),
+            //Greater
+            //Question
+            //At
+            LeftBracket     = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_4),
+            Backslash       = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_5),
+            RightBracket    = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_6),
+            //Caret
+            //Underscore
+            BackQuote       = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_3),
+            A               = static_cast<int>(SHInputManager::SH_KEYCODE::A),
+            B               = static_cast<int>(SHInputManager::SH_KEYCODE::B),
+            C               = static_cast<int>(SHInputManager::SH_KEYCODE::C),
+            D               = static_cast<int>(SHInputManager::SH_KEYCODE::D),
+            E               = static_cast<int>(SHInputManager::SH_KEYCODE::E),
+            F               = static_cast<int>(SHInputManager::SH_KEYCODE::F),
+            G               = static_cast<int>(SHInputManager::SH_KEYCODE::G),
+            H               = static_cast<int>(SHInputManager::SH_KEYCODE::H),
+            I               = static_cast<int>(SHInputManager::SH_KEYCODE::I),
+            J               = static_cast<int>(SHInputManager::SH_KEYCODE::J),
+            K               = static_cast<int>(SHInputManager::SH_KEYCODE::K),
+            L               = static_cast<int>(SHInputManager::SH_KEYCODE::L),
+            M               = static_cast<int>(SHInputManager::SH_KEYCODE::M),
+            N               = static_cast<int>(SHInputManager::SH_KEYCODE::N),
+            O               = static_cast<int>(SHInputManager::SH_KEYCODE::O),
+            P               = static_cast<int>(SHInputManager::SH_KEYCODE::P),
+            Q               = static_cast<int>(SHInputManager::SH_KEYCODE::Q),
+            R               = static_cast<int>(SHInputManager::SH_KEYCODE::R),
+            S               = static_cast<int>(SHInputManager::SH_KEYCODE::S),
+            T               = static_cast<int>(SHInputManager::SH_KEYCODE::T),
+            U               = static_cast<int>(SHInputManager::SH_KEYCODE::U),
+            V               = static_cast<int>(SHInputManager::SH_KEYCODE::V),
+            W               = static_cast<int>(SHInputManager::SH_KEYCODE::W),
+            X               = static_cast<int>(SHInputManager::SH_KEYCODE::X),
+            Y               = static_cast<int>(SHInputManager::SH_KEYCODE::Y),
+            Z               = static_cast<int>(SHInputManager::SH_KEYCODE::Z),
+            //LeftCurlyBracket
+            //Pipe
+            //RightCurlyBracket
+            //Tilde
+            NumLock        = static_cast<int>(SHInputManager::SH_KEYCODE::NUM_LOCK),
+            CapsLock       = static_cast<int>(SHInputManager::SH_KEYCODE::CAPS_LOCK),
+            ScrollLock     = static_cast<int>(SHInputManager::SH_KEYCODE::SCROLL_LOCK),
+            RightShift     = static_cast<int>(SHInputManager::SH_KEYCODE::RIGHT_SHIFT),
+            LeftShift      = static_cast<int>(SHInputManager::SH_KEYCODE::LEFT_SHIFT),
+            RightControl   = static_cast<int>(SHInputManager::SH_KEYCODE::RIGHT_CTRL),
+            LeftControl    = static_cast<int>(SHInputManager::SH_KEYCODE::LEFT_CTRL),
+            RightAlt       = static_cast<int>(SHInputManager::SH_KEYCODE::RIGHT_ALT),
+            LeftAlt        = static_cast<int>(SHInputManager::SH_KEYCODE::LEFT_ALT),
+            LeftWindows    = static_cast<int>(SHInputManager::SH_KEYCODE::LEFT_WINDOWS),
+            RightWindows   = static_cast<int>(SHInputManager::SH_KEYCODE::RIGHT_WINDOWS),
+            //AltGr
+            Help           = static_cast<int>(SHInputManager::SH_KEYCODE::HELP),
+            Print          = static_cast<int>(SHInputManager::SH_KEYCODE::PRINT),
+            SysReq         = static_cast<int>(SHInputManager::SH_KEYCODE::PRINT_SCREEN),
+            //Break
+            //Menu
+            //Mouse buttons use mouse codes, which are enums declared later
+            //TODO Controller input
+#if 0
+            Space = static_cast<int>(SHInputManager::SH_KEYCODE::SPACE),
             //Apostrophe		= static_cast<int>(SHInputManager::SH_KEYCODE::APOSTROPHE),
             Comma           = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_COMMA),
             Minus           = static_cast<int>(SHInputManager::SH_KEYCODE::OEM_MINUS),
@@ -190,7 +339,8 @@ namespace SHADE
             JoystickButton6       =  JoystickView,        
             JoystickButton7       =  JoystickMenu,        
             JoystickButton8       =  JoystickLeftStick,   
-            JoystickButton9       =  JoystickRightStick  
+            JoystickButton9       =  JoystickRightStick
+#endif
 
         };
         /// <summary>