diff --git a/Assets/Models/LidarScans/Gun Splat.glb b/Assets/Models/LidarScans/Gun Splat.glb
new file mode 100644
index 0000000..cdf0bd0
Binary files /dev/null and b/Assets/Models/LidarScans/Gun Splat.glb differ
diff --git a/Assets/Models/LidarScans/Gun Splat.glb.meta b/Assets/Models/LidarScans/Gun Splat.glb.meta
new file mode 100644
index 0000000..afe0df0
--- /dev/null
+++ b/Assets/Models/LidarScans/Gun Splat.glb.meta	
@@ -0,0 +1,28 @@
+fileFormatVersion: 2
+guid: 4f15ea45bfb5e4f11bc2bce50e39fc10
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3}
+  editorImportSettings:
+    generateSecondaryUVSet: 0
+  importSettings:
+    nodeNameMethod: 1
+    animationMethod: 2
+    generateMipMaps: 1
+    texturesReadable: 0
+    defaultMinFilterMode: 9729
+    defaultMagFilterMode: 9729
+    anisotropicFilterLevel: 1
+  instantiationSettings:
+    mask: -1
+    layer: 0
+    skinUpdateWhenOffscreen: 1
+    lightIntensityFactor: 1
+    sceneObjectCreation: 2
+  assetDependencies: []
+  reportItems: []
diff --git a/Assets/Models/LidarScans/Gun.glb b/Assets/Models/LidarScans/Gun.glb
new file mode 100644
index 0000000..28ac1a4
Binary files /dev/null and b/Assets/Models/LidarScans/Gun.glb differ
diff --git a/Assets/Models/LidarScans/Gun.glb.meta b/Assets/Models/LidarScans/Gun.glb.meta
new file mode 100644
index 0000000..03e02d7
--- /dev/null
+++ b/Assets/Models/LidarScans/Gun.glb.meta
@@ -0,0 +1,28 @@
+fileFormatVersion: 2
+guid: 1f8bcc19961184a0cb43c6f06d60da3c
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3}
+  editorImportSettings:
+    generateSecondaryUVSet: 0
+  importSettings:
+    nodeNameMethod: 1
+    animationMethod: 2
+    generateMipMaps: 1
+    texturesReadable: 0
+    defaultMinFilterMode: 9729
+    defaultMagFilterMode: 9729
+    anisotropicFilterLevel: 1
+  instantiationSettings:
+    mask: -1
+    layer: 0
+    skinUpdateWhenOffscreen: 1
+    lightIntensityFactor: 1
+    sceneObjectCreation: 2
+  assetDependencies: []
+  reportItems: []
diff --git a/Assets/Models/LidarScans/material_0.mat b/Assets/Models/LidarScans/material_0.mat
new file mode 100644
index 0000000..26fa4ef
--- /dev/null
+++ b/Assets/Models/LidarScans/material_0.mat
@@ -0,0 +1,44 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: material_0
+  m_Shader: {fileID: 4800000, guid: 4340a3cf1cde6416d957808a6ac79eed, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 1
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - baseColorTexture:
+        m_Texture: {fileID: -5390149515647955136, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _CullMode: 1
+    - _DstBlend: 0
+    - _Mode: 0
+    - _SrcBlend: 1
+    - _ZWrite: 1
+    - alphaCutoff: 0.5
+    - baseColorTexture_texCoord: 0
+    m_Colors:
+    - baseColorFactor: {r: 1, g: 1, b: 1, a: 1}
+    - baseColorTexture_Rotation: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/Models/LidarScans/material_0.mat.meta b/Assets/Models/LidarScans/material_0.mat.meta
new file mode 100644
index 0000000..913d8e2
--- /dev/null
+++ b/Assets/Models/LidarScans/material_0.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5657ef173352c496298621a17d76a84a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/Testing Scenes/Movement.unity b/Assets/Scenes/Testing Scenes/Movement.unity
index c828767..5f4718b 100644
--- a/Assets/Scenes/Testing Scenes/Movement.unity	
+++ b/Assets/Scenes/Testing Scenes/Movement.unity	
@@ -428,25 +428,45 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 126029702024624554, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+      propertyPath: m_Height
+      value: 1.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 126029702024624554, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+      propertyPath: m_Radius
+      value: 0.24
+      objectReference: {fileID: 0}
     - target: {fileID: 2075247097621853228, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
       propertyPath: far clip plane
       value: 3394
       objectReference: {fileID: 0}
+    - target: {fileID: 2075247097621853228, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+      propertyPath: near clip plane
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4867483367381507360, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.658
+      objectReference: {fileID: 0}
     - target: {fileID: 6882903375964528458, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
       propertyPath: m_Name
       value: Player
       objectReference: {fileID: 0}
+    - target: {fileID: 6882903375964528458, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8110894233409421727, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 25.42353
+      value: 346.076
       objectReference: {fileID: 0}
     - target: {fileID: 8110894233409421727, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -26.88406
+      value: -17.995
       objectReference: {fileID: 0}
     - target: {fileID: 8110894233409421727, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -1.14443
+      value: 153.66
       objectReference: {fileID: 0}
     - target: {fileID: 8110894233409421727, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
       propertyPath: m_LocalRotation.w
@@ -477,10 +497,86 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects:
+    - {fileID: 8003886823554712882, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 4867483367381507360, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1153408757}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 8543759782269834926, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1358066754}
+  m_SourcePrefab: {fileID: 100100000, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+--- !u!1001 &271705868
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8098169881513260187, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_Name
+      value: Gun
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 15.806
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 15.806
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 15.806
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 263.32
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -147.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 395.47
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+  m_SourcePrefab: {fileID: 3150474306388093854, guid: 1f8bcc19961184a0cb43c6f06d60da3c, type: 3}
 --- !u!1 &277384078 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: -8098169881513260187, guid: 4e219defa86804242a4efe4306a4b26b, type: 3}
@@ -575,8 +671,157 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -8098169881513260187, guid: f152111ec2b56453aabe8644b80b2f6b, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 343869063}
   m_SourcePrefab: {fileID: 3150474306388093854, guid: f152111ec2b56453aabe8644b80b2f6b, type: 3}
+--- !u!1 &343869062 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -8098169881513260187, guid: f152111ec2b56453aabe8644b80b2f6b, type: 3}
+  m_PrefabInstance: {fileID: 343869061}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &343869063
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 343869062}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 1050908021570271116, guid: f152111ec2b56453aabe8644b80b2f6b, type: 3}
+--- !u!1 &487503082
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 487503084}
+  - component: {fileID: 487503083}
+  m_Layer: 0
+  m_Name: GameObject (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &487503083
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 487503082}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 180c6606991a4b64f812f9713907fd0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::EnemySpawner
+  enemyType: 2
+  healthOverride: 0
+--- !u!4 &487503084
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 487503082}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.07095997, y: 0.5789249, z: -0.050682172, w: 0.8107047}
+  m_LocalPosition: {x: 243.82, y: -35.34, z: 91.07}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &571790233 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -8098169881513260187, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
+  m_PrefabInstance: {fileID: 1410308539}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &571790237
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 571790233}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 1050908021570271116, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
+--- !u!1 &606146705
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 606146707}
+  - component: {fileID: 606146706}
+  m_Layer: 0
+  m_Name: GameObject (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &606146706
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 606146705}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 180c6606991a4b64f812f9713907fd0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::EnemySpawner
+  enemyType: 1
+  healthOverride: 0
+--- !u!4 &606146707
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 606146705}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.07095997, y: 0.5789249, z: -0.050682172, w: 0.8107047}
+  m_LocalPosition: {x: 244.40219, y: -35.34, z: 89.64255}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &710092520
 GameObject:
   m_ObjectHideFlags: 0
@@ -674,6 +919,298 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1001 &1022368674
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8098169881513260187, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_Name
+      value: "Untitled_Scan_3_43_58\xD4\xC7\xBBam"
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 267.54
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -148.87833
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 384.19
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7596054609887090473, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 5657ef173352c496298621a17d76a84a, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 3150474306388093854, guid: 36664af9e8d0b72469ed99976aafb980, type: 3}
+--- !u!1001 &1153408756
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1358066751}
+    m_Modifications:
+    - target: {fileID: -8098169881513260187, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_Name
+      value: Gun Splat
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.05
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.0791769
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.755
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9211828
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.30416393
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.21869422
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.105259016
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -30.954
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -32.99
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 22.412
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -8098169881513260187, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1153408759}
+  m_SourcePrefab: {fileID: 3150474306388093854, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+--- !u!4 &1153408757 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+  m_PrefabInstance: {fileID: 1153408756}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1153408758 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -8098169881513260187, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+  m_PrefabInstance: {fileID: 1153408756}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1153408759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1153408758}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e348b4e172ba23d45960c0071cc09b1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::SimpleGun
+  damage: 25
+  range: 100
+  fireRate: 8
+  maxAmmo: 30
+  currentAmmo: 0
+  isAutomatic: 1
+  recoilKickback: 0.08
+  recoilKickUp: 0.04
+  recoilRecoverySpeed: 12
+  bobFrequency: 10
+  bobHorizontalAmplitude: 0.05
+  bobVerticalAmplitude: 0.03
+  sprintBobMultiplier: 1.5
+  bobReturnSpeed: 6
+  fpsCam: {fileID: 0}
+--- !u!1 &1358066750 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8543759782269834926, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+  m_PrefabInstance: {fileID: 110786869}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1358066751 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4867483367381507360, guid: 33de4b621d70a49aab5df775f2b826ef, type: 3}
+  m_PrefabInstance: {fileID: 110786869}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1358066754
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1358066750}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9ad5c2eb6d6ecad47af3a531cd239ec5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::CameraShake
+--- !u!1 &1360218907
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1360218911}
+  - component: {fileID: 1360218910}
+  - component: {fileID: 1360218909}
+  - component: {fileID: 1360218908}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!65 &1360218908
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1360218907}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1360218909
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1360218907}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_MaskInteraction: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1360218910
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1360218907}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &1360218911
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1360218907}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 259.77628, y: -147.80795, z: 399.10724}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1410308539
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -688,19 +1225,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
       propertyPath: m_LocalScale.x
-      value: 3.5014
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
       propertyPath: m_LocalScale.y
-      value: 3.5014
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
       propertyPath: m_LocalScale.z
-      value: 3.5014
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 59.6
+      value: 344.4
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
       propertyPath: m_LocalPosition.y
@@ -708,7 +1245,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 36.19
+      value: 154.2
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
       propertyPath: m_LocalRotation.w
@@ -738,10 +1275,17 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -8098169881513260187, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 571790237}
   m_SourcePrefab: {fileID: 3150474306388093854, guid: 3df8bb31de452e64fa85a1265898d698, type: 3}
 --- !u!43 &1435567018
 Mesh:
@@ -921,6 +1465,75 @@ Mesh:
       - serializedVersion: 1
         m_IndexStart: 0
         m_IndexCount: 0
+--- !u!1001 &1561924620
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8098169881513260187, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_Name
+      value: Gun Splat
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 43.029
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 43.029
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 43.029
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 304.18
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -146.63
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 403.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3447742079981357586, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 3150474306388093854, guid: 4f15ea45bfb5e4f11bc2bce50e39fc10, type: 3}
 --- !u!43 &1667608430
 Mesh:
   m_ObjectHideFlags: 0
@@ -1125,7 +1738,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 4e219defa86804242a4efe4306a4b26b, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 25.61
+      value: -37.51
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 4e219defa86804242a4efe4306a4b26b, type: 3}
       propertyPath: m_LocalPosition.y
@@ -1133,7 +1746,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 4e219defa86804242a4efe4306a4b26b, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 13.37
+      value: -52.9
       objectReference: {fileID: 0}
     - target: {fileID: 3447742079981357586, guid: 4e219defa86804242a4efe4306a4b26b, type: 3}
       propertyPath: m_LocalRotation.w
@@ -8121,6 +8734,98 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1 &1882479419
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1882479421}
+  - component: {fileID: 1882479420}
+  m_Layer: 0
+  m_Name: GameObject (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1882479420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1882479419}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 180c6606991a4b64f812f9713907fd0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::EnemySpawner
+  enemyType: 0
+  healthOverride: 0
+--- !u!4 &1882479421
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1882479419}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.07095997, y: 0.5789249, z: -0.050682172, w: 0.8107047}
+  m_LocalPosition: {x: 243.82, y: -35.34, z: 91.07}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2073272903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2073272905}
+  - component: {fileID: 2073272904}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2073272904
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2073272903}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 180c6606991a4b64f812f9713907fd0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::EnemySpawner
+  enemyType: 1
+  healthOverride: 0
+--- !u!4 &2073272905
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2073272903}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.07095997, y: 0.5789249, z: -0.050682172, w: 0.8107047}
+  m_LocalPosition: {x: 243.82, y: -35.34, z: 91.07}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -8132,3 +8837,11 @@ SceneRoots:
   - {fileID: 1719075356}
   - {fileID: 1410308539}
   - {fileID: 343869061}
+  - {fileID: 2073272905}
+  - {fileID: 487503084}
+  - {fileID: 606146707}
+  - {fileID: 1882479421}
+  - {fileID: 1360218911}
+  - {fileID: 271705868}
+  - {fileID: 1022368674}
+  - {fileID: 1561924620}
diff --git a/Assets/Scripts/SimpleGun.cs b/Assets/Scripts/SimpleGun.cs
index 7069f40..b80f2e6 100644
--- a/Assets/Scripts/SimpleGun.cs
+++ b/Assets/Scripts/SimpleGun.cs
@@ -60,9 +60,7 @@ public class SimpleGun : MonoBehaviour
         playerController = GetComponentInParent<CharacterController>();
         originalLocalPos = transform.localPosition;
 
-        // Strip colliders from all children so they don't block the CharacterController
-        StripChildColliders();
-        
+
         // NUCLEAR OPTION: Remove ANY collider on this object or children
         Collider[] allColliders = GetComponentsInChildren<Collider>();
         foreach (Collider col in allColliders)
@@ -74,10 +72,8 @@ public class SimpleGun : MonoBehaviour
             }
         }
 
-        // Only create a procedural gun if there's no existing model geometry
-        if (GetComponentsInChildren<MeshRenderer>().Length == 0)
-            CreateSimpleGunModel();
-
+        // Strip colliders from all children so they don't block the CharacterController
+        StripChildColliders();
         CreateMuzzleFlash();
         InitDecalPool();
     }
diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
index a222017..6151947 100644
--- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -94,7 +94,7 @@
             {
                 "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
                 "key": "ShapeBuilder.ActiveShapeIndex",
-                "value": "{\"m_Value\":8}"
+                "value": "{\"m_Value\":6}"
             },
             {
                 "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
@@ -106,6 +106,11 @@
                 "key": "ShapeBuilder.LastSize.Stairs",
                 "value": "{\"m_Value\":{\"x\":-6.0228424072265629,\"y\":4.082866668701172,\"z\":-12.89936351776123}}"
             },
+            {
+                "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastSize.Cube",
+                "value": "{\"m_Value\":{\"x\":-5.0246992111206059,\"y\":4.772355556488037,\"z\":-22.316036224365236}}"
+            },
             {
                 "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "ShapeBuilder.LastRotation.Plane",
@@ -116,6 +121,11 @@
                 "key": "ShapeBuilder.LastRotation.Stairs",
                 "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
             },
+            {
+                "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.LastRotation.Cube",
+                "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}"
+            },
             {
                 "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "ShapeBuilder.PivotLocation.Plane",
@@ -126,6 +136,11 @@
                 "key": "ShapeBuilder.PivotLocation.Stairs",
                 "value": "{\"m_Value\":0}"
             },
+            {
+                "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.PivotLocation.Cube",
+                "value": "{\"m_Value\":0}"
+            },
             {
                 "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "ShapeBuilder.Plane",
@@ -135,6 +150,11 @@
                 "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
                 "key": "ShapeBuilder.Stairs",
                 "value": "{}"
+            },
+            {
+                "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+                "key": "ShapeBuilder.Cube",
+                "value": "{}"
             }
         ]
     }