diff --git a/Assets/.DS_Store b/Assets/.DS_Store
index 89f0496..8ae0254 100644
Binary files a/Assets/.DS_Store and b/Assets/.DS_Store differ
diff --git a/Assets/PlayerControls.inputactions b/Assets/PlayerControls.inputactions
index 3f3842d..6012f13 100644
--- a/Assets/PlayerControls.inputactions
+++ b/Assets/PlayerControls.inputactions
@@ -21,7 +21,7 @@
                     "expectedControlType": "Button",
                     "processors": "",
                     "interactions": "",
-                    "initialStateCheck": false
+                    "initialStateCheck": true
                 },
                 {
                     "name": "ThrowTambourine",
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index b433859..42de1c0 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -13,9 +13,9 @@ GameObject:
   - component: {fileID: 5885597207104481988}
   - component: {fileID: 5885597207104481989}
   - component: {fileID: 5885597207104481990}
-  - component: {fileID: 2233892752547184614}
   - component: {fileID: 5885597207104481984}
   - component: {fileID: 1407172087}
+  - component: {fileID: 5559747613460074786}
   m_Layer: 2
   m_Name: Player
   m_TagString: Player
@@ -80,7 +80,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -106,7 +106,7 @@ Rigidbody2D:
   m_UseAutoMass: 0
   m_Mass: 1
   m_LinearDrag: 0
-  m_AngularDrag: 0.05
+  m_AngularDrag: 0
   m_GravityScale: 1
   m_Material: {fileID: 6200000, guid: 83749aa79f3034041ac7616c39c77dfb, type: 2}
   m_IncludeLayers:
@@ -117,7 +117,7 @@ Rigidbody2D:
     m_Bits: 0
   m_Interpolate: 0
   m_SleepingMode: 1
-  m_CollisionDetection: 0
+  m_CollisionDetection: 1
   m_Constraints: 4
 --- !u!231 &5885597207104481989
 SpringJoint2D:
@@ -175,31 +175,6 @@ CircleCollider2D:
   m_Offset: {x: 0, y: 0}
   serializedVersion: 2
   m_Radius: 0.5
---- !u!114 &2233892752547184614
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5885597207104481991}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b0115312556794123a3cafad4b83d0a7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  moveSpeed: 15
-  jumpSpeed: 5
-  airSpeed: 0
-  playerInput: {fileID: 1407172087}
-  groundLayer:
-    serializedVersion: 2
-    m_Bits: 64
-  boxSize: {x: 0.03, y: 0.21}
-  maxDistanceFromGround: 0.13
-  launcher: {fileID: 6559806128767475056}
-  hasTambourine: 1
-  grapplingGun: {fileID: 3465910379319867675}
-  grapplingRope: {fileID: 7648135587659148198}
 --- !u!232 &5885597207104481984
 DistanceJoint2D:
   m_ObjectHideFlags: 0
@@ -250,6 +225,31 @@ MonoBehaviour:
   m_DefaultActionMap: Player
   m_SplitScreenIndex: -1
   m_Camera: {fileID: 0}
+--- !u!114 &5559747613460074786
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5885597207104481991}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7b873819f9a3f36ef898a0403972da28, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxRunSpeed: 20
+  runAcceleration: 20
+  snappiness: 2.5
+  jumpSpeed: 5
+  airSpeedMultiplier: 0.5
+  groundLayer:
+    serializedVersion: 2
+    m_Bits: 64
+  boxSize: {x: 0.03, y: 0.21}
+  maxDistanceFromGround: 0.13
+  grapplingGun: {fileID: 3465910379319867675}
+  grapplingRope: {fileID: 7648135587659148198}
+  stateController: {fileID: 0}
 --- !u!1 &5885597207531562995
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/GrappleScene.unity b/Assets/Scenes/GrappleScene.unity
index 7d51799..487052f 100644
--- a/Assets/Scenes/GrappleScene.unity
+++ b/Assets/Scenes/GrappleScene.unity
@@ -188,6 +188,17 @@ MonoBehaviour:
   player: {fileID: 5885597207104481991, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
   spawnPoint: {fileID: 1159415542}
   deathCanvas: {fileID: 880696833}
+--- !u!114 &129360812 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3465910379319867675, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+  m_PrefabInstance: {fileID: 1407172085}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e8c21a2613bf4423a2f49601a3310e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &193907867
 GameObject:
   m_ObjectHideFlags: 0
@@ -428,7 +439,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 232844149}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -25.49, y: -16.83, z: 0}
+  m_LocalPosition: {x: -25.49, y: -17.19, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1360,25 +1371,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &580890946 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5885597207104481991, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
-  m_PrefabInstance: {fileID: 1407172085}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &580890947
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 580890946}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7b873819f9a3f36ef898a0403972da28, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  maxRunSpeed: 20
-  runAcceleration: 20
 --- !u!1 &619394800
 GameObject:
   m_ObjectHideFlags: 0
@@ -2333,14 +2325,82 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 2233892752547184614, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
-      propertyPath: stateController
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_NotificationBehavior
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[0].m_ActionId
+      value: 183693a0-ab31-4f85-a4ef-b43b8a80fa77
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[1].m_ActionId
+      value: 2116b59e-20ee-4f7c-a656-aad81b0ae23a
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[2].m_ActionId
+      value: 00940c0e-3199-4943-a074-8cde87588db2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[3].m_ActionId
+      value: 5a10231f-97fe-4bfb-89d8-4ac906d76de6
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[0].m_ActionName
+      value: Player/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d]
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[1].m_ActionName
+      value: Player/Grapple[/Keyboard/l]
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[2].m_ActionName
+      value: Player/ThrowTambourine[/Keyboard/k]
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[3].m_ActionName
+      value: Player/Jump[/Keyboard/space]
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
-      objectReference: {fileID: 128936490}
+      objectReference: {fileID: 1787574353}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnGrapple
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: PlayerMovement, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
     - target: {fileID: 3465910379319867675, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
       propertyPath: m_camera
       value: 
       objectReference: {fileID: 519420031}
+    - target: {fileID: 5559747613460074786, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+      propertyPath: launcher
+      value: 
+      objectReference: {fileID: 2001713740}
     - target: {fileID: 5885597207104481986, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
       propertyPath: m_RootOrder
       value: 13
@@ -2385,18 +2445,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5885597207104481988, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
-      propertyPath: m_Mass
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5885597207104481988, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
-      propertyPath: m_AngularDrag
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5885597207104481988, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
-      propertyPath: m_CollisionDetection
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 5885597207104481991, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
       propertyPath: m_Name
       value: Player
@@ -2406,8 +2454,8 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents:
     - targetCorrespondingSourceObject: {fileID: 5885597207104481991, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 580890947}
+      insertIndex: 7
+      addedObject: {fileID: 1787574362}
   m_SourcePrefab: {fileID: 100100000, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
 --- !u!1 &1411598161
 GameObject:
@@ -3211,6 +3259,60 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1767983939}
   m_CullTransparentMesh: 1
+--- !u!1 &1787574352 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5885597207104481991, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+  m_PrefabInstance: {fileID: 1407172085}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1787574353 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5559747613460074786, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+  m_PrefabInstance: {fileID: 1407172085}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1787574352}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7b873819f9a3f36ef898a0403972da28, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1787574354 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1407172087, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+  m_PrefabInstance: {fileID: 1407172085}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1787574352}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1787574362
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1787574352}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0115312556794123a3cafad4b83d0a7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moveSpeed: 0
+  jumpSpeed: 0
+  airSpeed: 0
+  playerInput: {fileID: 1787574354}
+  groundLayer:
+    serializedVersion: 2
+    m_Bits: 64
+  boxSize: {x: 0, y: 0}
+  maxDistanceFromGround: 0
+  launcher: {fileID: 2001713740}
+  hasTambourine: 1
+  grapplingGun: {fileID: 129360812}
+  grapplingRope: {fileID: 2119213706}
+  playerController: {fileID: 1787574353}
+  stateController: {fileID: 0}
 --- !u!1 &1796403731
 GameObject:
   m_ObjectHideFlags: 0
@@ -3366,7 +3468,7 @@ TilemapCollider2D:
   m_Offset: {x: 0, y: 0}
   m_MaximumTileChangeCount: 1000
   m_ExtrusionFactor: 0
-  m_UseDelaunayMesh: 0
+  m_UseDelaunayMesh: 1
 --- !u!483693784 &1818375524
 TilemapRenderer:
   m_ObjectHideFlags: 0
@@ -4714,7 +4816,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -27, y: -17, z: 0}
     second:
       serializedVersion: 2
@@ -4724,7 +4826,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -26, y: -17, z: 0}
     second:
       serializedVersion: 2
@@ -4734,7 +4836,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -25, y: -17, z: 0}
     second:
       serializedVersion: 2
@@ -4744,7 +4846,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -24, y: -17, z: 0}
     second:
       serializedVersion: 2
@@ -4754,7 +4856,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -23, y: -17, z: 0}
     second:
       serializedVersion: 2
@@ -4764,7 +4866,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -22, y: -17, z: 0}
     second:
       serializedVersion: 2
@@ -4774,7 +4876,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -21, y: -17, z: 0}
     second:
       serializedVersion: 2
@@ -4784,7 +4886,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -20, y: -17, z: 0}
     second:
       serializedVersion: 2
@@ -4794,7 +4896,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -19, y: -17, z: 0}
     second:
       serializedVersion: 2
@@ -7714,7 +7816,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -36, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7724,7 +7826,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -35, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7734,7 +7836,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -34, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7744,7 +7846,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -33, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7754,7 +7856,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -32, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7764,7 +7866,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -31, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7774,7 +7876,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -30, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7784,7 +7886,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -29, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7794,7 +7896,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -19, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7804,7 +7906,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -18, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7814,7 +7916,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -17, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7824,7 +7926,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -16, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7834,7 +7936,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -15, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7844,7 +7946,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -14, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7854,7 +7956,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -13, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7864,7 +7966,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -12, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7874,7 +7976,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -11, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7884,7 +7986,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -10, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7894,7 +7996,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -9, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7904,7 +8006,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -8, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7914,7 +8016,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -7, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7924,7 +8026,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -6, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7934,7 +8036,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -5, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7944,7 +8046,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -4, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7954,7 +8056,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -3, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7964,7 +8066,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -2, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7974,7 +8076,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -1, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7984,7 +8086,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 0, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -7994,7 +8096,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 1, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8004,7 +8106,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 2, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8014,7 +8116,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 3, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8024,7 +8126,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 4, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8034,7 +8136,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 5, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8044,7 +8146,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 6, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8054,7 +8156,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 7, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8064,7 +8166,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 8, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8074,7 +8176,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 9, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8084,7 +8186,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 10, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8094,7 +8196,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 11, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8104,7 +8206,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 12, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8114,7 +8216,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 13, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8124,7 +8226,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 14, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8134,7 +8236,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 15, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8144,7 +8246,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 16, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8154,7 +8256,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 17, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8164,7 +8266,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 18, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8174,7 +8276,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 19, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8184,7 +8286,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 20, y: -11, z: 0}
     second:
       serializedVersion: 2
@@ -8194,7 +8296,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -38, y: -10, z: 0}
     second:
       serializedVersion: 2
@@ -9014,7 +9116,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -8, y: -5, z: 0}
     second:
       serializedVersion: 2
@@ -9024,7 +9126,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -7, y: -5, z: 0}
     second:
       serializedVersion: 2
@@ -9034,7 +9136,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -6, y: -5, z: 0}
     second:
       serializedVersion: 2
@@ -9044,7 +9146,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -5, y: -5, z: 0}
     second:
       serializedVersion: 2
@@ -9054,7 +9156,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -4, y: -5, z: 0}
     second:
       serializedVersion: 2
@@ -9064,7 +9166,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -3, y: -5, z: 0}
     second:
       serializedVersion: 2
@@ -9074,7 +9176,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -2, y: -5, z: 0}
     second:
       serializedVersion: 2
@@ -9084,7 +9186,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: -1, y: -5, z: 0}
     second:
       serializedVersion: 2
@@ -9094,7 +9196,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 1
   - first: {x: 0, y: -5, z: 0}
     second:
       serializedVersion: 2
@@ -9925,494 +10027,24 @@ CompositeCollider2D:
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
-  m_GeometryType: 1
+  m_GeometryType: 0
   m_GenerationType: 1
   m_EdgeRadius: 0
   m_ColliderPaths:
   - m_Collider: {fileID: 1818375523}
     m_ColliderPaths:
     - - X: 210000000
-        Y: -107500000
-      - X: 208437504
-        Y: -107187504
-      - X: 200937504
-        Y: -107187504
-      - X: 200000000
-        Y: -107812496
-      - X: 200000000
-        Y: -107500000
-      - X: 198437504
-        Y: -107187504
-      - X: 190937504
-        Y: -107187504
-      - X: 190000000
-        Y: -107812496
-      - X: 190000000
-        Y: -107500000
-      - X: 188437504
-        Y: -107187504
-      - X: 180937504
-        Y: -107187504
-      - X: 180000000
-        Y: -107812496
-      - X: 180000000
-        Y: -107500000
-      - X: 178437504
-        Y: -107187504
-      - X: 170937504
-        Y: -107187504
-      - X: 170000000
-        Y: -107812496
-      - X: 170000000
-        Y: -107500000
-      - X: 168437504
-        Y: -107187504
-      - X: 160937504
-        Y: -107187504
-      - X: 160000000
-        Y: -107812496
-      - X: 160000000
-        Y: -107500000
-      - X: 158437504
-        Y: -107187504
-      - X: 150937504
-        Y: -107187504
-      - X: 150000000
-        Y: -107812496
-      - X: 150000000
-        Y: -107500000
-      - X: 148437504
-        Y: -107187504
-      - X: 140937504
-        Y: -107187504
-      - X: 140000000
-        Y: -107812496
-      - X: 140000000
-        Y: -107500000
-      - X: 138437504
-        Y: -107187504
-      - X: 130937504
-        Y: -107187504
-      - X: 130000000
-        Y: -107812496
-      - X: 130000000
-        Y: -107500000
-      - X: 128437504
-        Y: -107187504
-      - X: 120937504
-        Y: -107187504
-      - X: 120000000
-        Y: -107812496
-      - X: 120000000
-        Y: -107500000
-      - X: 118437504
-        Y: -107187504
-      - X: 110937504
-        Y: -107187504
-      - X: 110000000
-        Y: -107812496
-      - X: 110000000
-        Y: -107500000
-      - X: 108437504
-        Y: -107187504
-      - X: 100937504
-        Y: -107187504
-      - X: 100000000
-        Y: -107812496
-      - X: 100000000
-        Y: -107500000
-      - X: 98437504
-        Y: -107187504
-      - X: 90937504
-        Y: -107187504
-      - X: 90000000
-        Y: -107812496
-      - X: 90000000
-        Y: -107500000
-      - X: 88437504
-        Y: -107187504
-      - X: 80937504
-        Y: -107187504
-      - X: 80000000
-        Y: -107812496
-      - X: 80000000
-        Y: -107500000
-      - X: 78437504
-        Y: -107187504
-      - X: 70937504
-        Y: -107187504
-      - X: 70000000
-        Y: -107812496
-      - X: 70000000
-        Y: -107500000
-      - X: 68437504
-        Y: -107187504
-      - X: 60937500
-        Y: -107187504
-      - X: 60000000
-        Y: -107812496
-      - X: 60000000
-        Y: -107500000
-      - X: 58437500
-        Y: -107187504
-      - X: 50937500
-        Y: -107187504
-      - X: 50000000
-        Y: -107812496
-      - X: 50000000
-        Y: -107500000
-      - X: 48437500
-        Y: -107187504
-      - X: 40937500
-        Y: -107187504
-      - X: 40000000
-        Y: -107812496
-      - X: 40000000
-        Y: -107500000
-      - X: 38437500
-        Y: -107187504
-      - X: 30937500
-        Y: -107187504
-      - X: 30000000
-        Y: -107812496
-      - X: 30000000
-        Y: -107500000
-      - X: 28437500
-        Y: -107187504
-      - X: 20937500
-        Y: -107187504
-      - X: 20000000
-        Y: -107812496
-      - X: 20000000
-        Y: -107500000
-      - X: 18437500
-        Y: -107187504
-      - X: 10937500
-        Y: -107187504
-      - X: 10000000
-        Y: -107812496
-      - X: 10000000
-        Y: -107500000
-      - X: 8437500
-        Y: -107187504
-      - X: 937500
-        Y: -107187504
-      - X: 0
-        Y: -107812496
-      - X: 0
-        Y: -107500000
-      - X: -1562500
-        Y: -107187504
-      - X: -9062500
-        Y: -107187504
-      - X: -10000000
-        Y: -107812496
-      - X: -10000000
-        Y: -107500000
-      - X: -11562500
-        Y: -107187504
-      - X: -19062500
-        Y: -107187504
-      - X: -20000000
-        Y: -107812496
-      - X: -20000000
-        Y: -107500000
-      - X: -21562500
-        Y: -107187504
-      - X: -29062500
-        Y: -107187504
-      - X: -30000000
-        Y: -107812496
-      - X: -30000000
-        Y: -107500000
-      - X: -31562500
-        Y: -107187504
-      - X: -39062500
-        Y: -107187504
-      - X: -40000000
-        Y: -107812496
-      - X: -40000000
-        Y: -107500000
-      - X: -41562500
-        Y: -107187504
-      - X: -49062500
-        Y: -107187504
-      - X: -50000000
-        Y: -107812496
-      - X: -50000000
-        Y: -107500000
-      - X: -51562500
-        Y: -107187504
-      - X: -59062500
-        Y: -107187504
-      - X: -60000000
-        Y: -107812496
-      - X: -60000000
-        Y: -107500000
-      - X: -61562500
-        Y: -107187504
-      - X: -69062496
-        Y: -107187504
-      - X: -70000000
-        Y: -107812496
-      - X: -70000000
-        Y: -107500000
-      - X: -71562496
-        Y: -107187504
-      - X: -79062496
-        Y: -107187504
-      - X: -80000000
-        Y: -107812496
-      - X: -80000000
-        Y: -107500000
-      - X: -81562496
-        Y: -107187504
-      - X: -89062496
-        Y: -107187504
-      - X: -90000000
-        Y: -107812496
-      - X: -90000000
-        Y: -107500000
-      - X: -91562496
-        Y: -107187504
-      - X: -99062496
-        Y: -107187504
-      - X: -100000000
-        Y: -107812496
-      - X: -100000000
-        Y: -107500000
-      - X: -101562496
-        Y: -107187504
-      - X: -109062496
-        Y: -107187504
-      - X: -110000000
-        Y: -107812496
-      - X: -110000000
-        Y: -107500000
-      - X: -111562496
-        Y: -107187504
-      - X: -119062496
-        Y: -107187504
-      - X: -120000000
-        Y: -107812496
-      - X: -120000000
-        Y: -107500000
-      - X: -121562496
-        Y: -107187504
-      - X: -129062496
-        Y: -107187504
-      - X: -130000000
-        Y: -107812496
-      - X: -130000000
-        Y: -107500000
-      - X: -131562496
-        Y: -107187504
-      - X: -139062496
-        Y: -107187504
-      - X: -140000000
-        Y: -107812496
-      - X: -140000000
-        Y: -107500000
-      - X: -141562496
-        Y: -107187504
-      - X: -149062496
-        Y: -107187504
-      - X: -150000000
-        Y: -107812496
-      - X: -150000000
-        Y: -107500000
-      - X: -151562496
-        Y: -107187504
-      - X: -159062496
-        Y: -107187504
-      - X: -160000000
-        Y: -107812496
-      - X: -160000000
-        Y: -107500000
-      - X: -161562496
-        Y: -107187504
-      - X: -169062496
-        Y: -107187504
-      - X: -170000000
-        Y: -107812496
-      - X: -170000000
-        Y: -107500000
-      - X: -171562496
-        Y: -107187504
-      - X: -179062496
-        Y: -107187504
-      - X: -180000000
-        Y: -107812496
-      - X: -181250000
-        Y: -107187504
-      - X: -188124992
-        Y: -107187504
-      - X: -189687504
-        Y: -108437504
+        Y: -110000000
       - X: -190000000
-        Y: -108750000
+        Y: -110000000
       - X: -190000000
-        Y: -164375008
-      - X: -190312496
-        Y: -164375008
-      - X: -194687504
-        Y: -163124992
-      - X: -199687504
-        Y: -163124992
-      - X: -200000000
-        Y: -163437504
-      - X: -200000000
-        Y: -164375008
-      - X: -200312496
-        Y: -164375008
-      - X: -204687504
-        Y: -163124992
-      - X: -209687504
-        Y: -163124992
-      - X: -210000000
-        Y: -163437504
-      - X: -210000000
-        Y: -164375008
-      - X: -210312496
-        Y: -164375008
-      - X: -214687504
-        Y: -163124992
-      - X: -219687504
-        Y: -163124992
-      - X: -220000000
-        Y: -163437504
-      - X: -220000000
-        Y: -164375008
-      - X: -220312496
-        Y: -164375008
-      - X: -224687504
-        Y: -163124992
-      - X: -229687504
-        Y: -163124992
-      - X: -230000000
-        Y: -163437504
-      - X: -230000000
-        Y: -164375008
-      - X: -230312496
-        Y: -164375008
-      - X: -234687504
-        Y: -163124992
-      - X: -239687504
-        Y: -163124992
-      - X: -240000000
-        Y: -163437504
-      - X: -240000000
-        Y: -164375008
-      - X: -240312496
-        Y: -164375008
-      - X: -244687504
-        Y: -163124992
-      - X: -249687504
-        Y: -163124992
-      - X: -250000000
-        Y: -163437504
-      - X: -250000000
-        Y: -164375008
-      - X: -250312496
-        Y: -164375008
-      - X: -254687504
-        Y: -163124992
-      - X: -259687504
-        Y: -163124992
-      - X: -260000000
-        Y: -163437504
-      - X: -260000000
-        Y: -164375008
-      - X: -260312496
-        Y: -164375008
-      - X: -264687504
-        Y: -163124992
-      - X: -269687488
-        Y: -163124992
-      - X: -270000000
-        Y: -163437504
-      - X: -270000000
-        Y: -164375008
-      - X: -270312512
-        Y: -164375008
-      - X: -274687488
-        Y: -163124992
-      - X: -279687488
-        Y: -163124992
+        Y: -170000000
       - X: -280000000
-        Y: -163437504
+        Y: -170000000
       - X: -280000000
-        Y: -107812496
-      - X: -281562496
-        Y: -107500000
-      - X: -289062496
-        Y: -107500000
-      - X: -290000000
-        Y: -108125000
-      - X: -290000000
-        Y: -107500000
-      - X: -291562496
-        Y: -107187504
-      - X: -299062496
-        Y: -107187504
-      - X: -300000000
-        Y: -107812496
-      - X: -300000000
-        Y: -107500000
-      - X: -301562496
-        Y: -107187504
-      - X: -309062496
-        Y: -107187504
-      - X: -310000000
-        Y: -107812496
-      - X: -310000000
-        Y: -107500000
-      - X: -311562496
-        Y: -107187504
-      - X: -319062496
-        Y: -107187504
-      - X: -320000000
-        Y: -107812496
-      - X: -320000000
-        Y: -107500000
-      - X: -321562496
-        Y: -107187504
-      - X: -329062496
-        Y: -107187504
-      - X: -330000000
-        Y: -107812496
-      - X: -330000000
-        Y: -107500000
-      - X: -331562496
-        Y: -107187504
-      - X: -339062496
-        Y: -107187504
-      - X: -340000000
-        Y: -107812496
-      - X: -340000000
-        Y: -107500000
-      - X: -341562496
-        Y: -107187504
-      - X: -349062496
-        Y: -107187504
-      - X: -350000000
-        Y: -107812496
-      - X: -350000000
-        Y: -107500000
-      - X: -351562496
-        Y: -107187504
-      - X: -359062496
-        Y: -107187504
-      - X: -360000000
-        Y: -107812496
-      - X: -360000000
-        Y: -107500000
-      - X: -361562496
-        Y: -107187504
-      - X: -369062496
-        Y: -107187504
+        Y: -110000000
       - X: -370000000
-        Y: -107812496
+        Y: -110000000
       - X: -370000000
         Y: 110000000
       - X: -380000000
@@ -10526,77 +10158,9 @@ CompositeCollider2D:
       - X: 0
         Y: -46875000
       - X: 0
-        Y: -47500000
-      - X: -1562500
-        Y: -47187500
-      - X: -9062500
-        Y: -47187500
-      - X: -10000000
-        Y: -47812500
-      - X: -10000000
-        Y: -47500000
-      - X: -11562500
-        Y: -47187500
-      - X: -19062500
-        Y: -47187500
-      - X: -20000000
-        Y: -47812500
-      - X: -20000000
-        Y: -47500000
-      - X: -21562500
-        Y: -47187500
-      - X: -29062500
-        Y: -47187500
-      - X: -30000000
-        Y: -47812500
-      - X: -30000000
-        Y: -47500000
-      - X: -31562500
-        Y: -47187500
-      - X: -39062500
-        Y: -47187500
-      - X: -40000000
-        Y: -47812500
-      - X: -40000000
-        Y: -47500000
-      - X: -41562500
-        Y: -47187500
-      - X: -49062500
-        Y: -47187500
-      - X: -50000000
-        Y: -47812500
-      - X: -50000000
-        Y: -47500000
-      - X: -51562500
-        Y: -47187500
-      - X: -59062500
-        Y: -47187500
-      - X: -60000000
-        Y: -47812500
-      - X: -60000000
-        Y: -47500000
-      - X: -61562500
-        Y: -47187500
-      - X: -69062496
-        Y: -47187500
-      - X: -70000000
-        Y: -47812500
-      - X: -70000000
-        Y: -47500000
-      - X: -71562496
-        Y: -47187500
-      - X: -79062496
-        Y: -47187500
-      - X: -80000000
-        Y: -47812500
-      - X: -80000000
-        Y: -47500000
-      - X: -81562496
-        Y: -47187500
-      - X: -89062496
-        Y: -47187500
+        Y: -50000000
       - X: -90000000
-        Y: -47812500
+        Y: -50000000
       - X: -90000000
         Y: -30000000
       - X: -350000000
@@ -10613,51 +10177,43 @@ CompositeCollider2D:
         Y: -63125000
   m_CompositePaths:
     m_Paths:
-    - - {x: 21, y: -18.765684}
-      - {x: 21, y: -10.984093}
-      - {x: 20.765907, y: -10.749816}
-      - {x: -18.76617, y: -10.718787}
-      - {x: -19.000431, y: -10.951552}
-      - {x: -19.029926, y: -16.201818}
-      - {x: -19.266924, y: -16.435038}
-      - {x: -27.768635, y: -16.34617}
-      - {x: -28, y: -16.112371}
-      - {x: -28, y: -11.015564}
-      - {x: -28.234314, y: -10.78125}
-      - {x: -36.765686, y: -10.78125}
-      - {x: -37, y: -10.546935}
-      - {x: -37, y: 10.765686}
-      - {x: -37.234314, y: 11}
-      - {x: -37.765686, y: 11}
-      - {x: -38, y: 10.765686}
-      - {x: -38, y: -18.765684}
-      - {x: -37.765686, y: -19}
-      - {x: 20.765684, y: -19}
-    - - {x: -21.101807, y: -6.25}
-      - {x: -20.765684, y: -6}
-      - {x: 8.765686, y: -6}
-      - {x: 9, y: -5.7656856}
-      - {x: 9, y: -1.8638368}
-      - {x: 8.458485, y: -1.6789536}
-      - {x: 8.176715, y: -2.0434988}
-      - {x: 5.3454943, y: -2.825137}
-      - {x: 5.1767144, y: -3.043499}
-      - {x: 2.33842, y: -3.8238776}
-      - {x: 2.1649773, y: -4.0376363}
-      - {x: 0.5407948, y: -4.3853807}
-      - {x: -0.2014138, y: -4.7190695}
-      - {x: -8.763683, y: -4.77958}
-      - {x: -9, y: -4.544927}
-      - {x: -9, y: -3.2343147}
-      - {x: -9.234315, y: -3}
-      - {x: -34.765686, y: -3}
-      - {x: -35, y: -3.2343147}
-      - {x: -35, y: -5.7656856}
-      - {x: -34.765686, y: -6}
-      - {x: -26.234316, y: -6}
-      - {x: -25.898193, y: -6.25}
+    - - {x: 21, y: -18.882843}
+      - {x: 21, y: -11.117158}
+      - {x: 20.882843, y: -11}
+      - {x: -18.882843, y: -11}
+      - {x: -19, y: -11.117158}
+      - {x: -19, y: -16.882843}
+      - {x: -19.117157, y: -17}
+      - {x: -27.882841, y: -17}
+      - {x: -28, y: -16.882843}
+      - {x: -28, y: -11.117158}
+      - {x: -28.117159, y: -11}
+      - {x: -36.882843, y: -11}
+      - {x: -37, y: -10.882842}
+      - {x: -37, y: 10.882842}
+      - {x: -37.117157, y: 11}
+      - {x: -38, y: 10.882842}
+      - {x: -38, y: -18.882843}
+      - {x: -37.882843, y: -19}
+      - {x: 20.882843, y: -19}
+    - - {x: -21.117157, y: -6.25}
+      - {x: -20.882843, y: -6}
+      - {x: 8.882842, y: -6}
+      - {x: 9, y: -5.882843}
+      - {x: 9, y: -1.8268197}
+      - {x: 2.2543635, y: -4.018818}
+      - {x: 0.5492318, y: -4.3823714}
+      - {x: -0.1171574, y: -5}
+      - {x: -8.882842, y: -5}
+      - {x: -9.117158, y: -3}
+      - {x: -34.882843, y: -3}
+      - {x: -35, y: -3.1171572}
+      - {x: -35, y: -5.882843}
+      - {x: -34.882843, y: -6}
+      - {x: -26.117157, y: -6}
+      - {x: -25.882843, y: -6.25}
   m_VertexDistance: 0.11
-  m_OffsetDistance: 0.4
+  m_OffsetDistance: 0.2
   m_UseDelaunayMesh: 1
   m_CompositeGameObject: {fileID: 1818375521}
 --- !u!50 &1818375527
@@ -11029,6 +10585,17 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2001713740 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6559806128767475056, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+  m_PrefabInstance: {fileID: 1407172085}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b49ff353512cc43728014da636fce388, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2026489080
 GameObject:
   m_ObjectHideFlags: 0
@@ -11141,3 +10708,14 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5e69412b9141e4bdeaaaf00f6dce7b82, type: 3}
+--- !u!114 &2119213706 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7648135587659148198, guid: 576d3fc87874f426294e4bbacb171478, type: 3}
+  m_PrefabInstance: {fileID: 1407172085}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06317215013e44d0fb7902fbc1c5e84e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
diff --git a/Assets/Scripts/Launch.cs b/Assets/Scripts/Launch.cs
index e40a23c..f4246e2 100644
--- a/Assets/Scripts/Launch.cs
+++ b/Assets/Scripts/Launch.cs
@@ -9,7 +9,7 @@ public class Launch : MonoBehaviour {
     [SerializeField] private float horizSpeed;
     [SerializeField] private float vertSpeed;
 
-    public void ThrowTambourine(int facing) {
+    public void ThrowTambourine(float facing) {
         GameObject newTambourine = Instantiate(tambourine, this.gameObject.transform.position, this.gameObject.transform.rotation);
         // multiply horizSpeed by facing if not using moving launch point
         newTambourine.GetComponent<Rigidbody2D>().AddForce(new Vector2(horizSpeed * facing, vertSpeed), ForceMode2D.Impulse);
diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs
index 1cf03c7..cd86a34 100644
--- a/Assets/Scripts/PlayerBehavior.cs
+++ b/Assets/Scripts/PlayerBehavior.cs
@@ -22,14 +22,16 @@ public class PlayerBehavior : MonoBehaviour
     [Header("Tambourine:")]
     [SerializeField] private Launch launcher;
     [HideInInspector] public bool hasTambourine = true;
+    GameObject tambourine;
 
     [Header("Grappling:")]
     [SerializeField] public Tutorial_GrapplingGun grapplingGun;
     [SerializeField] public Tutorial_GrapplingRope grapplingRope;
     private GameObject grappleSurface;
 
-    [Header("State Control:")]
-    private StateController stateController;
+    [Header("Controllers:")]
+    [SerializeField] private PlayerMovement playerController;
+    [SerializeField] private StateController stateController;
 
 
     void Start()
@@ -42,59 +44,24 @@ public class PlayerBehavior : MonoBehaviour
     void Update()
     {
 
-        // jump
-        // if (Input.GetKeyDown(KeyCode.Space)) {
-        if (playerInput.actions["Jump"].WasPressedThisFrame() && IsGrounded())
-        {
-            _rb.AddForce(Vector2.up * jumpSpeed, ForceMode2D.Impulse);
-        }
-
         // throw tambourine
         // if (Input.GetKeyDown(KeyCode.K)) {
         if (playerInput.actions["ThrowTambourine"].WasPressedThisFrame())
         {
-            if (hasTambourine && !grapplingRope.isGrappling)
-            {
-                launcher.ThrowTambourine(forward);
-                hasTambourine = false;
-            }
+            ThrowTambourine();
         }
 
         // grapple
-        GameObject tambourine = GameObject.FindGameObjectWithTag("tambourine");
+        tambourine = GameObject.FindGameObjectWithTag("tambourine");
         // if (Input.GetKeyDown(KeyCode.L)) {
         if (playerInput.actions["Grapple"].WasPressedThisFrame())
         {
-            if (tambourine != null)
-            { // grapple to tambourine
-                if (!grapplingRope.isGrappling && tambourine.GetComponent<TambourineBehavior>().pinned)
-                {
-                    grapplingGun.GrappleToTambourine(tambourine);
-                    grapplingRope.isGrappling = true;
-                }
-            }
-            else
-            {
-                if (grappleSurface != null)
-                {
-                    grapplingGun.GrappleToSurface(grappleSurface.transform.position);
-                    grapplingRope.isGrappling = true;
-                }
-            }
+            AttemptGrapple();
         }
         // if (Input.GetKeyUp(KeyCode.L)) {
         if (playerInput.actions["Grapple"].WasReleasedThisFrame())
         {
-            if (tambourine != null && grapplingRope.isGrappling)
-            {
-                tambourine.GetComponent<TambourineBehavior>().DestroySelf();
-            }
-            grapplingGun.ReleaseGrapple();
-        }
-        // if (Input.GetKey(KeyCode.L)) {
-        if (playerInput.actions["Grapple"].IsPressed())
-        {
-            Debug.DrawRay(transform.position, new Vector2(0.500f * forward, 0.866f), Color.green);
+            LetGoOfGrapple();
         }
     }
 
@@ -111,52 +78,38 @@ public class PlayerBehavior : MonoBehaviour
         }
     }
 
-    // void FixedUpdate() {
-    //     if (grapplingRope.isGrappling && _hInput != 0 && !IsGrounded()) {
-    //         // print("grappling force");
-    //         _rb.AddForce(new Vector2(_hInput * (airSpeed / 3), 0));
-    //     } else if (_hInput != 0 && !IsGrounded()) {
-    //         _rb.AddForce(new Vector2(_hInput * airSpeed, 0));
-    //     } else if (_hInput != 0) {
-    //         // print("normal movement");
-    //         _rb.AddForce(new Vector2(_hInput * moveSpeed, 0));
-    //         // _rb.velocity = new Vector2(_hInput * moveSpeed, _rb.velocity.y);
-    //     }
-    // }
+    void ThrowTambourine() {
+        if (hasTambourine && !grapplingRope.isGrappling)
+            {
+                launcher.ThrowTambourine(forward);
+                hasTambourine = false;
+            }
+    }
 
-    void OnTriggerEnter2D(Collider2D col)
-    {
-        if (col.tag == "grappleSurface")
-        {
-            grappleSurface = col.gameObject;
+    void AttemptGrapple() {
+        if (tambourine != null)
+        { // grapple to tambourine
+            if (!grapplingRope.isGrappling && tambourine.GetComponent<TambourineBehavior>().pinned)
+            {
+                grapplingGun.GrappleToTambourine(tambourine);
+                grapplingRope.isGrappling = true;
+            }
         }
-        else if (col.tag == "instaDeath")
+        else
         {
-            stateController.ToggleDeathCanvas();
-            Destroy(this.gameObject);
+            if (grappleSurface != null)
+            {
+                grapplingGun.GrappleToSurface(grappleSurface.transform.position);
+                grapplingRope.isGrappling = true;
+            }
         }
     }
 
-    void OnTriggerExit2D(Collider2D col)
-    {
-        if (col.tag == "grappleSurface")
-        {
-            grappleSurface = null;
-        }
-    }
-
-    bool IsGrounded()
-    {
-        if (Physics2D.BoxCast(transform.position, boxSize, 0, -transform.up, maxDistanceFromGround, groundLayer))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    void OnDrawGizmos()
-    {
-        Gizmos.color = Color.red;
-        Gizmos.DrawCube(transform.position - transform.up * maxDistanceFromGround, boxSize);
+    void LetGoOfGrapple() {
+        if (tambourine != null && grapplingRope.isGrappling)
+            {
+                tambourine.GetComponent<TambourineBehavior>().DestroySelf();
+            }
+            grapplingGun.ReleaseGrapple();
     }
 }
diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
index ca59cd3..c3be015 100644
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -7,7 +7,11 @@ public class PlayerMovement : MonoBehaviour
 
     public float maxRunSpeed;
     public float runAcceleration;
+    public float snappiness = 1;
+    public float jumpSpeed;
+    [Range(0,1)] public float airSpeedMultiplier;
     private bool onGround = false;
+    private float forward = 1;
 
     float hangTimeThreshold = 0.1f;
     float hangTimeAccel = 0;
@@ -15,6 +19,22 @@ public class PlayerMovement : MonoBehaviour
 
     private Vector2 movement = Vector2.zero;
 
+    public LayerMask groundLayer;
+    public Vector2 boxSize;
+    public float maxDistanceFromGround;
+
+    [Header("Grappling:")]
+    [SerializeField] public Tutorial_GrapplingGun grapplingGun;
+    [SerializeField] public Tutorial_GrapplingRope grapplingRope;
+    private GameObject grappleSurface;
+
+    [Header("Tambourine:")]
+    [SerializeField] private Launch launcher;
+    [HideInInspector] public bool hasTambourine = true;
+
+    [Header("State Control:")]
+    [SerializeField] private StateController stateController;
+
     void OnValidate()
     {
         this.runAcceleration = Mathf.Clamp(runAcceleration, 0.1f, this.maxRunSpeed);
@@ -23,6 +43,7 @@ public class PlayerMovement : MonoBehaviour
     void Start()
     {
         this.rb = this.GetComponent<Rigidbody2D>();
+        stateController = GameObject.Find("StateController").GetComponent<StateController>();
     }
 
     void OnMove(InputValue value)
@@ -31,6 +52,12 @@ public class PlayerMovement : MonoBehaviour
         //Debug.Log(this.movement);
     }
 
+    void OnJump() {
+        if (IsGrounded()) {
+            rb.AddForce(Vector2.up * jumpSpeed, ForceMode2D.Impulse);
+        }
+    }
+
     void FixedUpdate()
     {
         Run(1);
@@ -46,29 +73,76 @@ public class PlayerMovement : MonoBehaviour
         float targetSpeed = this.movement.x * this.maxRunSpeed;
 
         float speedDiff = targetSpeed - this.rb.velocity.x;
+        forward = Mathf.Sign(speedDiff);
 
-        float accel = 0.5f;
+        float accel = AccelerationRate() * snappiness;
 
         float accelRate = (Mathf.Abs(targetSpeed) > 0.1) ? accel : -accel;
 
         float velPower = 1.0f;
 
-        float move = Mathf.Pow(Mathf.Abs(speedDiff) * accelRate, velPower) * Mathf.Sign(speedDiff);
+        float move = Mathf.Pow(Mathf.Abs(speedDiff) * accelRate, velPower) * forward;
 
-        this.rb.AddForce(move * Vector2.right, ForceMode2D.Force);
+        this.onGround = IsGrounded();
 
         float frictionAmount = 0.5f;
 
-        this.onGround = true;
+        // accelerate
+        if (onGround && (Mathf.Abs(this.movement.x) > 0.1f)) {
+            this.rb.AddForce(move * Vector2.right, ForceMode2D.Force);
+        } else if (!onGround && (Mathf.Abs(this.movement.x) > 0.1f)) {
+            this.rb.AddForce(move * Vector2.right * airSpeedMultiplier, ForceMode2D.Force);
+        }
 
-        if (this.onGround && (Mathf.Abs(this.movement.x) < 0.1f))
+        // decelerate until stopped
+        if (Mathf.Abs(this.movement.x) < 0.1f)
         {
-            float amount = Mathf.Min(
-                Mathf.Abs(this.rb.velocity.x),
-                Mathf.Abs(frictionAmount)
-                );
-            amount *= Mathf.Sign(this.rb.velocity.x);
-            this.rb.AddForce(-amount * Vector2.right, ForceMode2D.Impulse);
+            if (Mathf.Abs(rb.velocity.x) > 0.1f) {
+                float amount = Mathf.Min(
+                    Mathf.Abs(this.rb.velocity.x),
+                    Mathf.Abs(frictionAmount)
+                    );
+                amount *= Mathf.Sign(this.rb.velocity.x);
+                this.rb.AddForce(-amount * Vector2.right * snappiness, ForceMode2D.Impulse);
+            } else {
+                this.rb.velocity = new Vector2(0, rb.velocity.y);
+            }
         }
     }
+
+    void OnTriggerEnter2D(Collider2D col)
+    {
+        if (col.tag == "grappleSurface")
+        {
+            grappleSurface = col.gameObject;
+        }
+        else if (col.tag == "instaDeath")
+        {
+            this.stateController.SetDeathCanvasActive(true);
+            Destroy(this.gameObject);
+        }
+    }
+
+    void OnTriggerExit2D(Collider2D col)
+    {
+        if (col.tag == "grappleSurface")
+        {
+            grappleSurface = null;
+        }
+    }
+
+    bool IsGrounded()
+    {
+        if (Physics2D.BoxCast(transform.position, boxSize, 0, -transform.up, maxDistanceFromGround, groundLayer))
+        {
+            return true;
+        }
+        return false;
+    }
+
+    void OnDrawGizmos()
+    {
+        Gizmos.color = Color.red;
+        Gizmos.DrawCube(transform.position - transform.up * maxDistanceFromGround, boxSize);
+    }
 }
diff --git a/Assets/Scripts/StateController.cs b/Assets/Scripts/StateController.cs
index ca551a0..98e9539 100644
--- a/Assets/Scripts/StateController.cs
+++ b/Assets/Scripts/StateController.cs
@@ -14,11 +14,11 @@ public class StateController : MonoBehaviour {
     }
 
     public void RespawnPlayer() {
-        ToggleDeathCanvas();
+        SetDeathCanvasActive(false);
         Instantiate(player, spawnPoint.transform.position, spawnPoint.transform.rotation);
     }
 
-    public void ToggleDeathCanvas() {
-        deathCanvas.SetActive(!deathCanvas.activeSelf);
+    public void SetDeathCanvasActive(bool activeState) {
+        deathCanvas.SetActive(activeState);
     }
 }
diff --git a/Assets/Sprites/Tilesets/Cave0/Cave0.prefab b/Assets/Sprites/Tilesets/Cave0/Cave0.prefab
index 20024a0..451f7c1 100644
--- a/Assets/Sprites/Tilesets/Cave0/Cave0.prefab
+++ b/Assets/Sprites/Tilesets/Cave0/Cave0.prefab
@@ -476,7 +476,7 @@ Tilemap:
       m_TileColorIndex: 0
       m_TileObjectToInstantiateIndex: 65535
       dummyAlignment: 0
-      m_AllTileFlags: 1073741825
+      m_AllTileFlags: 2147483649
   - first: {x: 2, y: -7, z: 0}
     second:
       serializedVersion: 2
@@ -1679,7 +1679,7 @@ TilemapRenderer:
   m_Mode: 0
   m_DetectChunkCullingBounds: 0
   m_MaskInteraction: 0
---- !u!114 &541010514327157900
+--- !u!114 &7222719822761566809
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
diff --git a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_63.asset b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_63.asset
index 399ef32..89e3fd4 100644
--- a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_63.asset
+++ b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_63.asset
@@ -33,4 +33,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 1
+  m_ColliderType: 0
diff --git a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_64.asset b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_64.asset
index f1ea85d..6c9db8a 100644
--- a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_64.asset
+++ b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_64.asset
@@ -33,4 +33,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 1
+  m_ColliderType: 0
diff --git a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_65.asset b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_65.asset
index 540eb2d..bdd68e7 100644
--- a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_65.asset
+++ b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_65.asset
@@ -33,4 +33,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 1
+  m_ColliderType: 0
diff --git a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_68.asset b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_68.asset
index 02ddc9c..f9a7220 100644
--- a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_68.asset
+++ b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_68.asset
@@ -33,4 +33,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 1
+  m_ColliderType: 0
diff --git a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_96.asset b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_96.asset
index 359413b..816e6d3 100644
--- a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_96.asset
+++ b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_96.asset
@@ -33,4 +33,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 1
+  m_ColliderType: 0
diff --git a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_97.asset b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_97.asset
index 914b691..eb5febb 100644
--- a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_97.asset
+++ b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_97.asset
@@ -33,4 +33,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 1
+  m_ColliderType: 0
diff --git a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_98.asset b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_98.asset
index 85c1a1a..bc8de07 100644
--- a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_98.asset
+++ b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_98.asset
@@ -33,4 +33,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 1
+  m_ColliderType: 0
diff --git a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_99.asset b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_99.asset
index a94306e..b971700 100644
--- a/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_99.asset
+++ b/Assets/Sprites/Tilesets/Cave0/tile_cave_platform_99.asset
@@ -33,4 +33,4 @@ MonoBehaviour:
     e33: 1
   m_InstancedGameObject: {fileID: 0}
   m_Flags: 1
-  m_ColliderType: 1
+  m_ColliderType: 0
diff --git a/Assets/Sprites/Tilesets/tile_cave_platform.gif.meta b/Assets/Sprites/Tilesets/tile_cave_platform.gif.meta
index 8f054ba..b20a96d 100644
--- a/Assets/Sprites/Tilesets/tile_cave_platform.gif.meta
+++ b/Assets/Sprites/Tilesets/tile_cave_platform.gif.meta
@@ -2364,113 +2364,113 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable:
-      tile_cave_platform_48: 860358998
-      tile_cave_platform_42: 1678161876
-      tile_cave_platform_52: -101254409
-      tile_cave_platform_22: -1347213101
-      tile_cave_platform_28: 555492011
-      tile_cave_platform_4: 816183649
-      tile_cave_platform_70: -622248163
-      tile_cave_platform_99: 1725201896
-      tile_cave_platform_12: -1749207181
-      tile_cave_platform_3: -1869149979
-      tile_cave_platform_23: 1444723485
-      tile_cave_platform_37: 891890011
-      tile_cave_platform_83: 437206413
-      tile_cave_platform_56: 990158993
-      tile_cave_platform_82: -748917288
-      tile_cave_platform_101: 30499823
-      tile_cave_platform_81: 1501013548
-      tile_cave_platform_45: -1828034864
-      tile_cave_platform_18: 1982126232
-      tile_cave_platform_25: -610258227
-      tile_cave_platform_74: 208169506
+      tile_cave_platform_0: 187170972
+      tile_cave_platform_1: -1566370012
       tile_cave_platform_10: 1378621459
-      tile_cave_platform_55: 1128775583
+      tile_cave_platform_100: 186572125
+      tile_cave_platform_101: 30499823
+      tile_cave_platform_102: 157912657
+      tile_cave_platform_103: -240375783
+      tile_cave_platform_104: 418300172
+      tile_cave_platform_105: 284850178
+      tile_cave_platform_106: 2054305501
+      tile_cave_platform_11: -2102710647
+      tile_cave_platform_12: -1749207181
+      tile_cave_platform_13: 858304779
+      tile_cave_platform_14: 948235904
       tile_cave_platform_15: 828061470
       tile_cave_platform_16: -1419052898
-      tile_cave_platform_41: 691336754
-      tile_cave_platform_38: 1676765538
-      tile_cave_platform_69: 1201609837
-      tile_cave_platform_39: 1594244300
-      tile_cave_platform_32: 300324828
-      tile_cave_platform_21: -411309469
-      tile_cave_platform_47: 2023151002
-      tile_cave_platform_98: 232799033
-      tile_cave_platform_103: -240375783
-      tile_cave_platform_68: -1027637906
-      tile_cave_platform_58: -866399296
-      tile_cave_platform_27: -201151014
       tile_cave_platform_17: 464019165
+      tile_cave_platform_18: 1982126232
+      tile_cave_platform_19: 535637540
+      tile_cave_platform_2: -1386356081
+      tile_cave_platform_20: -186269060
+      tile_cave_platform_21: -411309469
+      tile_cave_platform_22: -1347213101
+      tile_cave_platform_23: 1444723485
+      tile_cave_platform_24: -1183118302
+      tile_cave_platform_25: -610258227
+      tile_cave_platform_26: -1594682787
+      tile_cave_platform_27: -201151014
+      tile_cave_platform_28: 555492011
+      tile_cave_platform_29: 82606424
+      tile_cave_platform_3: -1869149979
       tile_cave_platform_30: -1332320381
-      tile_cave_platform_94: 1336928453
-      tile_cave_platform_80: -264131660
-      tile_cave_platform_104: 418300172
-      tile_cave_platform_1: -1566370012
+      tile_cave_platform_31: -1331211415
+      tile_cave_platform_32: 300324828
       tile_cave_platform_33: 554307562
       tile_cave_platform_34: -132886666
-      tile_cave_platform_0: 187170972
-      tile_cave_platform_73: 422422043
-      tile_cave_platform_2: -1386356081
-      tile_cave_platform_90: -2099172758
-      tile_cave_platform_50: 1169626773
-      tile_cave_platform_79: -254508583
-      tile_cave_platform_5: 1941844380
-      tile_cave_platform_89: 1609023694
-      tile_cave_platform_95: 1191579864
-      tile_cave_platform_13: 858304779
-      tile_cave_platform_91: -1907997159
-      tile_cave_platform_46: -1326824629
       tile_cave_platform_35: -2043734024
-      tile_cave_platform_54: 672327527
-      tile_cave_platform_105: 284850178
-      tile_cave_platform_76: 738992274
-      tile_cave_platform_85: -193765208
       tile_cave_platform_36: -903480771
-      tile_cave_platform_7: -1680641961
-      tile_cave_platform_100: 186572125
-      tile_cave_platform_11: -2102710647
-      tile_cave_platform_57: -660347865
-      tile_cave_platform_19: 535637540
-      tile_cave_platform_26: -1594682787
-      tile_cave_platform_63: -268434342
-      tile_cave_platform_77: -1772568650
-      tile_cave_platform_92: 1436478779
-      tile_cave_platform_31: -1331211415
-      tile_cave_platform_87: -1728563952
-      tile_cave_platform_96: 1096025109
+      tile_cave_platform_37: 891890011
+      tile_cave_platform_38: 1676765538
+      tile_cave_platform_39: 1594244300
+      tile_cave_platform_4: 816183649
       tile_cave_platform_40: -1517529945
-      tile_cave_platform_93: 596793319
+      tile_cave_platform_41: 691336754
+      tile_cave_platform_42: 1678161876
+      tile_cave_platform_43: -408254474
+      tile_cave_platform_44: 332401312
+      tile_cave_platform_45: -1828034864
+      tile_cave_platform_46: -1326824629
+      tile_cave_platform_47: 2023151002
+      tile_cave_platform_48: 860358998
+      tile_cave_platform_49: -1431529915
+      tile_cave_platform_5: 1941844380
+      tile_cave_platform_50: 1169626773
+      tile_cave_platform_51: -2103391120
+      tile_cave_platform_52: -101254409
+      tile_cave_platform_53: 368925175
+      tile_cave_platform_54: 672327527
+      tile_cave_platform_55: 1128775583
+      tile_cave_platform_56: 990158993
+      tile_cave_platform_57: -660347865
+      tile_cave_platform_58: -866399296
+      tile_cave_platform_59: 878730313
+      tile_cave_platform_6: -1806684432
+      tile_cave_platform_60: -270402943
+      tile_cave_platform_61: 1707607318
+      tile_cave_platform_62: 780055922
+      tile_cave_platform_63: -268434342
+      tile_cave_platform_64: 784849295
       tile_cave_platform_65: -1180649061
       tile_cave_platform_66: -1656921007
-      tile_cave_platform_64: 784849295
-      tile_cave_platform_86: -983927808
-      tile_cave_platform_9: 840204991
-      tile_cave_platform_59: 878730313
-      tile_cave_platform_106: 2054305501
-      tile_cave_platform_6: -1806684432
-      tile_cave_platform_53: 368925175
-      tile_cave_platform_60: -270402943
-      tile_cave_platform_24: -1183118302
-      tile_cave_platform_61: 1707607318
-      tile_cave_platform_43: -408254474
-      tile_cave_platform_78: -1319854462
-      tile_cave_platform_71: 431461063
-      tile_cave_platform_88: -345751969
-      tile_cave_platform_49: -1431529915
-      tile_cave_platform_97: -809172117
-      tile_cave_platform_51: -2103391120
-      tile_cave_platform_62: 780055922
-      tile_cave_platform_84: 1328316489
-      tile_cave_platform_44: 332401312
-      tile_cave_platform_20: -186269060
-      tile_cave_platform_29: 82606424
-      tile_cave_platform_75: -1873221857
-      tile_cave_platform_14: 948235904
-      tile_cave_platform_102: 157912657
-      tile_cave_platform_72: 2028675851
-      tile_cave_platform_8: -1443274602
       tile_cave_platform_67: -1117257055
+      tile_cave_platform_68: -1027637906
+      tile_cave_platform_69: 1201609837
+      tile_cave_platform_7: -1680641961
+      tile_cave_platform_70: -622248163
+      tile_cave_platform_71: 431461063
+      tile_cave_platform_72: 2028675851
+      tile_cave_platform_73: 422422043
+      tile_cave_platform_74: 208169506
+      tile_cave_platform_75: -1873221857
+      tile_cave_platform_76: 738992274
+      tile_cave_platform_77: -1772568650
+      tile_cave_platform_78: -1319854462
+      tile_cave_platform_79: -254508583
+      tile_cave_platform_8: -1443274602
+      tile_cave_platform_80: -264131660
+      tile_cave_platform_81: 1501013548
+      tile_cave_platform_82: -748917288
+      tile_cave_platform_83: 437206413
+      tile_cave_platform_84: 1328316489
+      tile_cave_platform_85: -193765208
+      tile_cave_platform_86: -983927808
+      tile_cave_platform_87: -1728563952
+      tile_cave_platform_88: -345751969
+      tile_cave_platform_89: 1609023694
+      tile_cave_platform_9: 840204991
+      tile_cave_platform_90: -2099172758
+      tile_cave_platform_91: -1907997159
+      tile_cave_platform_92: 1436478779
+      tile_cave_platform_93: 596793319
+      tile_cave_platform_94: 1336928453
+      tile_cave_platform_95: 1191579864
+      tile_cave_platform_96: 1096025109
+      tile_cave_platform_97: -809172117
+      tile_cave_platform_98: 232799033
+      tile_cave_platform_99: 1725201896
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
diff --git a/Assets/ofb-assets b/Assets/ofb-assets
index 23938e9..413bfb2 160000
--- a/Assets/ofb-assets
+++ b/Assets/ofb-assets
@@ -1 +1 @@
-Subproject commit 23938e9b94b9022413054828a87c05d8f5decc2b
+Subproject commit 413bfb2c6937c2d11546a7a81aed5ae43d5cc147