diff --git a/res/shaders/Metal.slang b/res/shaders/Metal.slang
new file mode 100644
index 0000000..f82d970
--- /dev/null
+++ b/res/shaders/Metal.slang
@@ -0,0 +1,38 @@
+import Common;
+import MaterialParameter;
+import VertexData;
+import StaticMeshVertexData;
+import Scene;
+
+[numthreads(1, 1, 1)]
+[shader("amplification")]
+void taskMain(uint threadID: SV_GroupThreadID, uint groupID: SV_GroupID) { DispatchMesh(1, 1, 1, groupID); }
+
+[numthreads(1, 1, 1)]
+[shader("mesh")]
+void meshMain(in payload uint taskGroupId, out vertices FragmentParameter vertices[MAX_VERTICES],
+              out indices uint3 indices[MAX_PRIMITIVES]) {
+
+    InstanceData inst = pScene.instances[pOffsets.instanceOffset + taskGroupId];
+    MeshData mesh = pScene.meshData[pOffsets.instanceOffset + taskGroupId];
+    MeshletDescription m = pScene.meshletInfos[mesh.meshletRange.offset];
+    SetMeshOutputCounts(m.vertexIndices.size, m.primitiveIndices.size);
+
+    for (uint p = 0; p < m.primitiveIndices.size; p++) {
+        uint baseIndex = m.primitiveIndices.offset + (p * 3);
+        uint local_idx0 = pScene.primitiveIndices[baseIndex + 0];
+        uint local_idx1 = pScene.primitiveIndices[baseIndex + 1];
+        uint local_idx2 = pScene.primitiveIndices[baseIndex + 2];
+        indices[p] = uint3(local_idx0, local_idx1, local_idx2);
+    }
+    for (uint v = 0; v < m.vertexIndices.size; v++) {
+        uint vertexIndex = pScene.vertexIndices[m.vertexIndices.offset + v];
+        VertexAttributes attr = pVertexData.getAttributes(m.indicesOffset + vertexIndex);
+        vertices[v] = attr.getParameter(inst.transformMatrix, inst.inverseTransformMatrix);
+    }
+}
+
+[shader("pixel")]
+void pixelMain(in FragmentParameter input, out float4 outColor : SV_Target) {
+    outColor = float4(1.0, 0.0, 0.0, 1.0);
+}
diff --git a/src/Editor/main.cpp b/src/Editor/main.cpp
index 66c47d0..d39ca1b 100644
--- a/src/Editor/main.cpp
+++ b/src/Editor/main.cpp
@@ -21,8 +21,8 @@ static Gfx::OGraphics graphics;
 
 int main() {
     std::string gameName = "MeshShadingDemo";
-    std::filesystem::path outputPath = fmt::format("/home/dynamitos/{0}Game/", gameName);
-    std::filesystem::path sourcePath = fmt::format("/home/dynamitos/{0}/", gameName);
+    std::filesystem::path outputPath = fmt::format("/Users/dynamitos/{0}Game/", gameName);
+    std::filesystem::path sourcePath = fmt::format("/Users/dynamitos/{0}/", gameName);
 #ifdef WIN32
     std::string libraryEnding = "dll";
 #elif __APPLE__
@@ -45,9 +45,9 @@ int main() {
         AssetImporter::importFont(FontImportArgs{
             .filePath = "./fonts/arial.ttf",
         });
-        AssetImporter::importEnvironmentMap(EnvironmentImportArgs{
-            .filePath = sourcePath / "import" / "textures" / "newport_loft.hdr",
-        });
+        // AssetImporter::importEnvironmentMap(EnvironmentImportArgs{
+        //     .filePath = sourcePath / "import" / "textures" / "newport_loft.hdr",
+        // });
         // AssetImporter::importTexture(TextureImportArgs{
         //     .filePath = sourcePath / "import" / "textures" / "grass_block_side.png",
         //     .importPath = "",
@@ -56,6 +56,11 @@ int main() {
         //    .filePath = sourcePath / "import" / "models" / "main1_sponza" / "sponza.gltf",
         //    .importPath = "sponza",
         //});
+        // AssetImporter::importMesh(MeshImportArgs{
+        //     .filePath = sourcePath / "import" / "models" / "rttest.gltf",
+        //     .importPath = "rttest",
+        // });
+
         AssetImporter::importMesh(MeshImportArgs{
             .filePath = sourcePath / "import" / "models" / "cube.fbx",
             .importPath = "",
diff --git a/src/Engine/Graphics/Metal/Descriptor.mm b/src/Engine/Graphics/Metal/Descriptor.mm
index 00cf5a3..5c09301 100644
--- a/src/Engine/Graphics/Metal/Descriptor.mm
+++ b/src/Engine/Graphics/Metal/Descriptor.mm
@@ -116,13 +116,11 @@ void DescriptorSetHandle::updateBuffer(const std::string& name, uint32 index, Gf
 
 void DescriptorSetHandle::updateBuffer(const std::string& name, uint32 index, Gfx::PUniformBuffer uniformBuffer) {
     uint32 flattenedIndex = owner->getLayout()->variableMapping[name].index + index;
-    PIndexBuffer buffer = uniformBuffer.cast<IndexBuffer>();
-    bufferWrites.add(BufferWriteInfo{
+    PUniformBuffer buffer = uniformBuffer.cast<UniformBuffer>();
+    uniformWrites.add(UniformWriteInfo{
         .index = flattenedIndex,
-        .buffer = buffer->getAlloc(),
-        .access = owner->getLayout()->variableMapping[name].access,
+        .content = buffer->getContents(),
     });
-    boundResources.add(buffer->getAlloc());
 }
 
 void DescriptorSetHandle::updateSampler(const std::string& name, uint32 index, Gfx::PSampler samplerState) {