diff --git a/Nuake/src/Core/Physics/DynamicWorld.cpp b/Nuake/src/Core/Physics/DynamicWorld.cpp
index 08343187..0f74b536 100644
--- a/Nuake/src/Core/Physics/DynamicWorld.cpp
+++ b/Nuake/src/Core/Physics/DynamicWorld.cpp
@@ -313,24 +313,28 @@ namespace Nuake
 				JPH::TriangleList triangles;
 				triangles.reserve(indices.size());
 
-				for (int i = 0; i < indices.size(); i += 3)
+				for (int i = 0; i < indices.size() - 3; i += 3)
 				{
-					const Vector3& p1 = vertices[i].position;
-					const Vector3& p2 = vertices[i + 1].position;
-					const Vector3& p3 = vertices[i + 2].position;
+					const Vector3& p1 = vertices[indices[i]].position;
+					const Vector3& p2 = vertices[indices[i + 1]].position;
+					const Vector3& p3 = vertices[indices[i + 2]].position;
 
 					triangles.push_back(JPH::Triangle(JPH::Float3(p1.x, p1.y, p1.z), JPH::Float3(p2.x, p2.y, p2.z), JPH::Float3(p3.x, p3.y, p3.z)));
 				}
 
 				JPH::MeshShapeSettings shapeSettings(std::move(triangles));
+				
+				shapeResult = shapeSettings.Create();
 			}
 				break;
 			}
 
 			const auto& startPos = rb->GetPosition();
 			JPH::BodyCreationSettings bodySettings(shapeResult.Get(), JPH::Vec3(startPos.x, startPos.y, startPos.z), JPH::Quat::sIdentity(), JPH::EMotionType::Dynamic, Layers::MOVING);
-			bodySettings.mUserData = rb->GetEntity().GetID();
 
+			bodySettings.mOverrideMassProperties = JPH::EOverrideMassProperties::CalculateInertia;
+			bodySettings.mMassPropertiesOverride.mMass = 10.0f;
+			bodySettings.mUserData = rb->GetEntity().GetID();
 			// Create the actual rigid body
 			JPH::BodyID floor = _JoltBodyInterface->CreateAndAddBody(bodySettings, JPH::EActivation::Activate); // Note that if we run out of bodies this can return nullptr
 			_registeredBodies.push_back((uint32_t)floor.GetIndexAndSequenceNumber());
diff --git a/Nuake/src/Core/Physics/PhysicsShapes.h b/Nuake/src/Core/Physics/PhysicsShapes.h
index c4d990c7..106c76c5 100644
--- a/Nuake/src/Core/Physics/PhysicsShapes.h
+++ b/Nuake/src/Core/Physics/PhysicsShapes.h
@@ -49,7 +49,12 @@ namespace Nuake
 			float Radius;
 			float Height;
 		public:
-			Capsule(float radius, float height) : Radius(radius), Height(height) {}
+			Capsule(float radius, float height) :
+				Radius(radius),
+				Height(height)
+			{
+				m_Type = CAPSULE;
+			}
 
 			float GetRadius() const { return Radius; }
 			void SetRadius(float radius) { Radius = radius; }
@@ -63,7 +68,10 @@ namespace Nuake
 			float Radius;
 			float Height;
 		public:
-			Cylinder(float radius, float height) : Radius(radius), Height(height) {}
+			Cylinder(float radius, float height) : Radius(radius), Height(height)
+			{
+				m_Type = CYLINDER;
+			}
 
 			float GetRadius() const { return Radius; }
 			void SetRadius(float radius) { Radius = radius; }
@@ -76,7 +84,10 @@ namespace Nuake
 		private:
 			Ref<Mesh> m_Mesh;
 		public:
-			MeshShape(Ref<Mesh> mesh) : m_Mesh(mesh) {}
+			MeshShape(Ref<Mesh> mesh) : m_Mesh(mesh)
+			{
+				m_Type = MESH;
+			}
 
 			void SetMesh(Ref<Mesh> mesh) { m_Mesh = mesh; }
 			Ref<Mesh> GetMesh() { return m_Mesh; }