diff --git a/Assets/Scenes/M2Scene.shade b/Assets/Scenes/M2Scene.shade
index 60dbb5f9..443d4a87 100644
--- a/Assets/Scenes/M2Scene.shade
+++ b/Assets/Scenes/M2Scene.shade
@@ -50,7 +50,7 @@
       Colliders:
         - Is Trigger: false
           Type: Box
-          Half Extents: {x: 0.00427246094, y: 0.000122070312, z: 0.00427246094}
+          Half Extents: {x: 24.7399445, y: 0.25, z: 8.75}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1
@@ -85,12 +85,28 @@
       Colliders:
         - Is Trigger: false
           Type: Box
-          Half Extents: {x: 0.000244140625, y: 0.000244140625, z: 0.000244140625}
+          Half Extents: {x: 1, y: 1, z: 1}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1
           Position Offset: {x: 0, y: 0.5, z: 0}
-  Scripts: ~
+  Scripts:
+    - Type: PlayerController
+      drag: 2
+      currentState: 0
+      maxMoveVel: 2
+      moveForce: 50
+      sprintMultiplier: 2
+      rotationFactorPerFrame: 1
+      maxJumpHeight: 4
+      maxJumpTime: 0.75
+      fallMultipler: 2
+      lightMultiper: 0.75
+      mediumMultiper: 0.5
+      heavyMultiper: 0.25
+    - Type: PickAndThrow
+      throwForce: [200, 300, 200]
+      item: 5
 - EID: 3
   Name: Default
   IsActive: true
@@ -110,7 +126,12 @@
       Translate: {x: 0, y: 0, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 1, y: 1, z: 1}
-  Scripts: ~
+  Scripts:
+    - Type: SHADE_Scripting.ThirdPersonCamera
+      armLength: 2
+      turnSpeedPitch: 0.300000012
+      turnSpeedYaw: 0.5
+      pitchClamp: 45
 - EID: 9
   Name: Default
   IsActive: true
@@ -135,7 +156,7 @@
       Scale: {x: 2, y: 2, z: 2}
     Renderable Component:
       Mesh: 144838771
-      Material: 126974645
+      Material: 123745521
     RigidBody Component:
       Type: Dynamic
       Mass: 1
@@ -153,19 +174,21 @@
       Colliders:
         - Is Trigger: false
           Type: Box
-          Half Extents: {x: 0.000244140625, y: 0.000244140625, z: 0.000244140625}
+          Half Extents: {x: 1, y: 1, z: 1}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1
           Position Offset: {x: 0, y: 0.5, z: 0}
         - Is Trigger: true
           Type: Box
-          Half Extents: {x: 0.00048828125, y: 0.00048828125, z: 0.00048828125}
+          Half Extents: {x: 2, y: 2, z: 2}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1
           Position Offset: {x: 0, y: 0.5, z: 0}
-  Scripts: ~
+  Scripts:
+    - Type: Item
+      currCategory: 0
 - EID: 6
   Name: AI
   IsActive: true
@@ -174,7 +197,7 @@
     Transform Component:
       Translate: {x: -8, y: -2, z: 2.5}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 2, y: 2, z: 2}
+      Scale: {x: 1, y: 1, z: 1}
     Renderable Component:
       Mesh: 149697411
       Material: 126974645
@@ -195,21 +218,28 @@
       Colliders:
         - Is Trigger: false
           Type: Box
-          Half Extents: {x: 0.000244140625, y: 0.000244140625, z: 0.000244140625}
+          Half Extents: {x: 0.5, y: 0.5, z: 0.5}
           Friction: 0.400000006
           Bounciness: 0
           Density: 1
           Position Offset: {x: 0, y: 0.5, z: 0}
-  Scripts: ~
+  Scripts:
+    - Type: AIPrototype
+      movementForceMultiplier: 100
+      patrolSpeed: 0.400000006
+      chaseSpeed: 0.800000012
+      distanceToCapture: 1.20000005
+      distanceToStartChase: 2
+      distanceToEndChase: 2.5
 - EID: 7
   Name: Default
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 3, y: -1, z: -1}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 5, y: 5, z: 5}
+      Translate: {x: 0, y: -16.8647861, z: -14.039052}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 28.1434975, y: 28.1434975, z: 28.1434975}
     Renderable Component:
       Mesh: 149697411
       Material: 126974645
diff --git a/SHADE_Engine/src/Serialization/SHYAMLConverters.h b/SHADE_Engine/src/Serialization/SHYAMLConverters.h
index af0b280b..d4b97244 100644
--- a/SHADE_Engine/src/Serialization/SHYAMLConverters.h
+++ b/SHADE_Engine/src/Serialization/SHYAMLConverters.h
@@ -168,7 +168,7 @@ namespace YAML
       case SHCollider::Type::BOX:
       {
         if (node[HalfExtents].IsDefined())
-          rhs.SetBoundingBox(node[HalfExtents].as<SHVec3>());
+          rhs.SetBoundingBox(node[HalfExtents].as<SHVec3>() * 2.0f);
       }
       break;
       case SHCollider::Type::SPHERE: