diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities.meta b/Assets/Prefabs/Environment.meta
similarity index 77%
rename from Assets/Scripts/PlayerScripts/MovementAbilities.meta
rename to Assets/Prefabs/Environment.meta
index e71f985..c6ba055 100644
--- a/Assets/Scripts/PlayerScripts/MovementAbilities.meta
+++ b/Assets/Prefabs/Environment.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d808f60ee05185d43a154521748992a0
+guid: d8346ea4dac8f744d9b0f28eac5eee5f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Prefabs/Environment/Gate.prefab b/Assets/Prefabs/Environment/Gate.prefab
new file mode 100644
index 0000000..59e6ac4
--- /dev/null
+++ b/Assets/Prefabs/Environment/Gate.prefab
@@ -0,0 +1,258 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6150409028514810267
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6150409028514810262}
+  - component: {fileID: 6150409028514810263}
+  - component: {fileID: 6150409028514810264}
+  - component: {fileID: 6150409028514810265}
+  - component: {fileID: 6150409028514810266}
+  m_Layer: 0
+  m_Name: RightDoor
+  m_TagString: kickable
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6150409028514810262
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 7.25, y: 0, z: 17.02}
+  m_LocalScale: {x: 3, y: 6.0429916, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6150409029086178024}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6150409028514810263
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6150409028514810264
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 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_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &6150409028514810265
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &6150409028514810266
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409028514810267}
+  serializedVersion: 2
+  m_Mass: 20
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!1 &6150409029086178026
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6150409029086178024}
+  m_Layer: 0
+  m_Name: Gate
+  m_TagString: kickable
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6150409029086178024
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029086178026}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -13.5969095, y: 3.74, z: 36.95}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 6150409029095057644}
+  - {fileID: 6150409028514810262}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6150409029095057617
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6150409029095057644}
+  - component: {fileID: 6150409029095057645}
+  - component: {fileID: 6150409029095057646}
+  - component: {fileID: 6150409029095057647}
+  - component: {fileID: 6150409029095057616}
+  m_Layer: 0
+  m_Name: LeftDoor
+  m_TagString: kickable
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6150409029095057644
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.12, y: 0, z: 17.02}
+  m_LocalScale: {x: 3, y: 6.0429916, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6150409029086178024}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6150409029095057645
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6150409029095057646
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 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_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &6150409029095057647
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &6150409029095057616
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150409029095057617}
+  serializedVersion: 2
+  m_Mass: 20
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
diff --git a/Assets/Prefabs/Environment/Gate.prefab.meta b/Assets/Prefabs/Environment/Gate.prefab.meta
new file mode 100644
index 0000000..95d1916
--- /dev/null
+++ b/Assets/Prefabs/Environment/Gate.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b95800967feee2a46a6c25838eb2fc6c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Prefabs/Game/Managers/SpawnManager.prefab b/Assets/Prefabs/Game/Managers/SpawnManager.prefab
index 33afe4c..8b0d174 100644
--- a/Assets/Prefabs/Game/Managers/SpawnManager.prefab
+++ b/Assets/Prefabs/Game/Managers/SpawnManager.prefab
@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 2718425332668433510}
   - component: {fileID: 2718425332668433513}
   - component: {fileID: 2718425332668433511}
+  - component: {fileID: 8643895533179698638}
   m_Layer: 0
   m_Name: SpawnManager
   m_TagString: Untagged
@@ -63,3 +64,16 @@ MonoBehaviour:
   PrefabHashGenerator: SpawnManager
   AlwaysReplicateAsRoot: 0
   DontDestroyWithOwner: 0
+--- !u!114 &8643895533179698638
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2718425332668433512}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66519fc5420181e45850c591aa1179ec, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  allItems: []
diff --git a/Assets/Prefabs/Lobby/LobbyPlayerCard.prefab b/Assets/Prefabs/Lobby/LobbyPlayerCard.prefab
index c30aed9..67b2ac2 100644
--- a/Assets/Prefabs/Lobby/LobbyPlayerCard.prefab
+++ b/Assets/Prefabs/Lobby/LobbyPlayerCard.prefab
@@ -240,13 +240,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 5256177651161589512}
+  m_Father: {fileID: 3190317820503267266}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 5}
+  m_SizeDelta: {x: -40, y: -30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8460389566829090228
 CanvasRenderer:
@@ -276,7 +276,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 6621380958853746498, guid: 9d82c67b12dc08a4e8782d89114d7e45, type: 3}
   m_Type: 0
   m_PreserveAspect: 1
   m_FillCenter: 1
@@ -550,82 +550,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &6910176360734585072
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5256177651161589512}
-  - component: {fileID: 6757151871973992427}
-  - component: {fileID: 6618375997168480435}
-  m_Layer: 0
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5256177651161589512
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6910176360734585072}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 4346605747764717236}
-  m_Father: {fileID: 3190317820503267266}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 5}
-  m_SizeDelta: {x: -40, y: -30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6757151871973992427
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6910176360734585072}
-  m_CullTransparentMesh: 1
---- !u!114 &6618375997168480435
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6910176360734585072}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7494610771549648403
 GameObject:
   m_ObjectHideFlags: 0
@@ -654,14 +578,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 5256177651161589512}
+  - {fileID: 4346605747764717236}
   m_Father: {fileID: 4327595082631380924}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0.15}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -7.523164e-37}
+  m_AnchoredPosition: {x: -108, y: 36}
+  m_SizeDelta: {x: 53.4095, y: 51.399}
   m_Pivot: {x: 0.5, y: 0.49999997}
 --- !u!114 &7093129836083058353
 MonoBehaviour:
@@ -682,7 +606,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 2
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -703,14 +627,14 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 0
-  m_TargetGraphic: {fileID: 6618375997168480435}
-  toggleTransition: 1
+  m_TargetGraphic: {fileID: 697679293}
+  toggleTransition: 0
   graphic: {fileID: 4993484075183320852}
   m_Group: {fileID: 0}
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 0
+  m_IsOn: 1
 --- !u!1 &7853593261180160953
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Lobby/LobbyUI.prefab b/Assets/Prefabs/Lobby/LobbyUI.prefab
index a13dcaf..dc5d266 100644
--- a/Assets/Prefabs/Lobby/LobbyUI.prefab
+++ b/Assets/Prefabs/Lobby/LobbyUI.prefab
@@ -284,7 +284,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &914205285
 RectTransform:
   m_ObjectHideFlags: 0
@@ -496,7 +496,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1063540716
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2624,14 +2624,22 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3190317820503267266, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -104.4
+      objectReference: {fileID: 0}
     - target: {fileID: 3190317820503267266, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 35
       objectReference: {fileID: 0}
     - target: {fileID: 4237331793813064128, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
       propertyPath: m_Name
       value: LobbyPlayerCard (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 7093129836083058353, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
+      propertyPath: m_IsOn
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
 --- !u!114 &5410293112989509655 stripped
@@ -2749,9 +2757,13 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3190317820503267266, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -105
+      objectReference: {fileID: 0}
     - target: {fileID: 3190317820503267266, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 35
       objectReference: {fileID: 0}
     - target: {fileID: 4237331793813064128, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3}
       propertyPath: m_Name
diff --git a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab
index d1acf47..31c580f 100644
--- a/Assets/Prefabs/Player/DebugPlayerPrefab.prefab
+++ b/Assets/Prefabs/Player/DebugPlayerPrefab.prefab
@@ -205,13 +205,11 @@ GameObject:
   - component: {fileID: 3471270956356843213}
   - component: {fileID: 8100520363622627413}
   - component: {fileID: 7097691538269713306}
-  - component: {fileID: 7616279934999327372}
   - component: {fileID: 7058615058147771192}
   - component: {fileID: 3559681995605743320}
   - component: {fileID: 8445875817354890259}
   - component: {fileID: 4889953713382264203}
   - component: {fileID: 6743056025486776975}
-  - component: {fileID: 4367973138255890080}
   - component: {fileID: 4788888989419098570}
   - component: {fileID: 471283137481508403}
   - component: {fileID: 5784126162129930074}
@@ -231,7 +229,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3607330906377400225}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -2, y: 1.25, z: 0}
+  m_LocalPosition: {x: -2.12, y: 1.25, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2731864384567516644}
@@ -311,20 +309,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5a5d879591af1084ab5d3a35fcd53086, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  items: []
+  networkItemList: []
   pStats: {fileID: 0}
---- !u!114 &7616279934999327372
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3607330906377400225}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1a8c22589436d2449a89cf3a40b6d252, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  invMan: {fileID: 0}
 --- !u!54 &7058615058147771192
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -441,20 +428,6 @@ MonoBehaviour:
   minAngle: -30
   maxAngle: 45
   sensitivity: 200
---- !u!114 &4367973138255890080
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3607330906377400225}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a504b3f7be0e5254e815029049abbeac, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  cam: {fileID: 0}
-  controller: {fileID: 0}
 --- !u!114 &4788888989419098570
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -508,15 +481,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f4264f4f7bed1d7499a037436582ed17, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  wallMaxDistance: 1
+  wallMaxDistance: 5
   wallSpeedMultiplier: 1.2
-  minimumHeight: 1.2
+  minimumHeight: 0.1
   maxAngleRoll: 20
   normalizedAngleThreshold: 0.1
-  jumpDuration: 1
+  jumpDuration: 0.02
   wallBouncing: 3
   cameraTransitionDuration: 1
-  wallGravityDownForce: 20
+  wallGravityDownForce: 3
 --- !u!1 &5633209979457551608
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Demos/MovementScene.unity b/Assets/Scenes/Demos/MovementScene.unity
index 1a205ac..d915af7 100644
--- a/Assets/Scenes/Demos/MovementScene.unity
+++ b/Assets/Scenes/Demos/MovementScene.unity
@@ -936,21 +936,13 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 1818923263116056088, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
-      propertyPath: jumpDuration
-      value: 0.02
-      objectReference: {fileID: 0}
-    - target: {fileID: 1818923263116056088, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
-      propertyPath: minimumHeight
-      value: 0.1
-      objectReference: {fileID: 0}
     - target: {fileID: 1818923263116056088, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
       propertyPath: wallMaxDistance
-      value: 5
+      value: 0.8
       objectReference: {fileID: 0}
-    - target: {fileID: 1818923263116056088, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
-      propertyPath: wallGravityDownForce
-      value: 3
+    - target: {fileID: 3607330906377400225, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
+      propertyPath: m_TagString
+      value: Player
       objectReference: {fileID: 0}
     - target: {fileID: 5633209979457551608, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
       propertyPath: m_Name
@@ -966,7 +958,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 4.14
+      value: 7.4
       objectReference: {fileID: 0}
     - target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
       propertyPath: m_LocalPosition.z
@@ -1000,9 +992,13 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8720404377688450390, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -2.12
+    - target: {fileID: 8100520363622627413, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
+      propertyPath: kickPow
+      value: 150
+      objectReference: {fileID: 0}
+    - target: {fileID: 8100520363622627413, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
+      propertyPath: hasWallrun
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
@@ -1552,3 +1548,60 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2061208975}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &6150409027306451727
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -13.5969095
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3.74
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 36.95
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6150409029086178026, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
+      propertyPath: m_Name
+      value: Gate
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity
index e55d479..dd9c485 100644
--- a/Assets/Scenes/Lobby.unity
+++ b/Assets/Scenes/Lobby.unity
@@ -429,14 +429,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 914205284, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1063540715, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 2240580173848419138, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
diff --git a/Assets/Scripts/Environment.meta b/Assets/Scripts/Environment.meta
index a9d37e1..107254c 100644
--- a/Assets/Scripts/Environment.meta
+++ b/Assets/Scripts/Environment.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: ff94b826cbaf8214995230b0108dfcb7
+=======
+guid: f3064a5694a1bdf489cf61344dfc527e
+>>>>>>> Sprint5Melby
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Scripts/Network/Game/SpawnManager.cs b/Assets/Scripts/Network/Game/SpawnManager.cs
index f088565..04c6908 100644
--- a/Assets/Scripts/Network/Game/SpawnManager.cs
+++ b/Assets/Scripts/Network/Game/SpawnManager.cs
@@ -33,7 +33,9 @@ public class SpawnManager : NetworkBehaviour {
                     } else {
                         // Spawn as player
                         _runner = Instantiate(runnerPrefab, runnersSpawnPoints[runnersSpawned], Quaternion.identity).gameObject;
-                        _runner.GetComponent<NetworkObject>().SpawnAsPlayerObject(NetworkManager.Singleton.LocalClientId, null, true);
+                        //Recreate Inventory
+                        _runner.GetComponentInChildren<PlayerInventory>().UpdateEquips(playerData.pInv.NetworkItemList, this.gameObject.GetComponent<InventoryManager>().ItemDict);
+                        _runner.GetComponent<NetworkObject>().SpawnAsPlayerObject(NetworkManager.Singleton.LocalClientId);
 
                         // Increment runners
                         runnersSpawned++;
@@ -51,6 +53,7 @@ public class SpawnManager : NetworkBehaviour {
         if (SceneManager.GetActiveScene().buildIndex == 3) { // Mountain Level
             runnersSpawnPoints = SpawnPoints.Instance.getRunnerSpawnPoints(0);
             kingSpawnPoint = SpawnPoints.Instance.getKingSpawnPoint(0);
+            
         }
     }
 
@@ -67,6 +70,8 @@ public class SpawnManager : NetworkBehaviour {
                 } else {
                     // Spawn as player
                     _runner = Instantiate(runnerPrefab, runnersSpawnPoints[runnersSpawned], Quaternion.identity).gameObject;
+                    //Recreate Inventory
+                    _runner.GetComponentInChildren<PlayerInventory>().UpdateEquips(playerData.pInv.NetworkItemList, this.gameObject.GetComponent<InventoryManager>().ItemDict);
                     _runner.GetComponent<NetworkObject>().SpawnAsPlayerObject(clientId, null, true);
 
                     // Increment runners
diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs
index 219facb..6cc870c 100644
--- a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs
+++ b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs
@@ -28,8 +28,6 @@ public class dKickController : NetworkBehaviour
     }
 
     void Kick(){
-        //Note: when we merge this into PlayerMovement, we may want to change isgrounded to our 
-        //custom is grounded
         if (Input.GetKeyDown(KeyCode.F) && isKicking == false && characterController.isGrounded == false)
         {
             Debug.Log("dive");
@@ -67,6 +65,9 @@ public class dKickController : NetworkBehaviour
         //if (!IsLocalPlayer) { return; }
         Collider myCollider = collision.contacts[0].thisCollider;
         if (collision.transform.CompareTag("kickable") && myCollider == leg.GetComponent<Collider>()){
+            if(collision.gameObject.GetComponent<Rigidbody>().isKinematic == true){
+                collision.gameObject.GetComponent<Rigidbody>().isKinematic = false;
+            }
             Vector3 direction = this.transform.forward;
             Debug.Log(direction);
             collision.rigidbody.AddForce(direction * pStats.KickPow, ForceMode.Impulse);
diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dWallRun.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dWallRun.cs
index 5589355..3c849cd 100644
--- a/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dWallRun.cs
+++ b/Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dWallRun.cs
@@ -7,7 +7,7 @@ using UnityEngine.Rendering;
 public class dWallRun : NetworkBehaviour
 {
 
-    public float wallMaxDistance = 5;
+    public float wallMaxDistance = .8f;
     public float wallSpeedMultiplier = 1.2f;
     public float minimumHeight = .1f;
     public float maxAngleRoll = 20;
@@ -151,13 +151,35 @@ public class dWallRun : NetworkBehaviour
             Vector3 moveToSet = alongWall * vertical * playerMovementController.PlayerSpeed() * Time.deltaTime;// * wallSpeedMultiplier;
             Vector3 velNorm = playerMovementController.vel;
             velNorm.Normalize();
+
             moveToSet = new Vector3(moveToSet.x * -velNorm.x, moveToSet.y, moveToSet.z * -velNorm.z);
+
+            Vector3 moveToSetNorm = moveToSet;
+            moveToSetNorm.Normalize();
+
+            if((moveToSetNorm.x < 0 && velNorm.x > 0)){
+                moveToSet.x = (moveToSet.x * -velNorm.x);
+            }
+            else if((moveToSetNorm.x > 0 && velNorm.x < 0) ){
+                moveToSet.x = (-moveToSet.x * -velNorm.x);
+            }
+
+            if((moveToSetNorm.z < 0 && velNorm.z > 0)){
+                moveToSet.z =  (moveToSet.z * -velNorm.z);
+            }
+            else if((moveToSetNorm.z > 0 && velNorm.z < 0)){
+                moveToSet.z =  (-moveToSet.z * -velNorm.z);
+            }
+
             moveToSet.y = 0;
             
 
             playerMovementController.SetPlayerVelocity(moveToSet);
-            Debug.Log(moveToSet);
             isWallRunning = true;
+            if(playerMovementController.curJumpNum != 0){
+                playerMovementController.curJumpNum = 0 ;
+            }
+            
         }
     }
 
@@ -175,10 +197,6 @@ public class dWallRun : NetworkBehaviour
 
     public Vector3 GetWallJumpDirection() //Add call in jump where if we are wallrunning and jump, the jump vector is multiplied by this
     {
-        if(isWallRunning)
-        {
-            return lastWallNormal * wallBouncing + Vector3.up;
-        }
-        return Vector3.zero;
-    } 
+        return lastWallNormal * wallBouncing + (transform.up);
+    }
 }
diff --git a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
index e9c068f..a460449 100644
--- a/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
+++ b/Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
@@ -26,7 +26,7 @@ public class dPlayerMovement : NetworkBehaviour
     private CharacterController moveController;
 
     //Jump value
-    private int curJumpNum;
+    public int curJumpNum;
     private bool jumpPressed;
     bool tempSet = false;
     float tempTraction = 0.0f;
@@ -65,7 +65,7 @@ public class dPlayerMovement : NetworkBehaviour
     private Rigidbody rB;
     private CapsuleCollider capCol;
     private bool firstHit = false;
-    private bool heldDown = false;
+    //private bool heldDown = false; //Variable for testing Ragdoll reenable if needed
     private bool beginRagTimer = false;
     private float ragTime; 
     private Vector3 prevRot;
@@ -261,7 +261,14 @@ public class dPlayerMovement : NetworkBehaviour
         //If space is pressed apply an upwards force to the player
         if (Input.GetAxis("Jump") != 0 && !jumpPressed && curJumpNum + 1 < pStats.JumpNum && !isSliding)
         {
-            AddImpact(transform.up, pStats.JumpPow);
+            if(wallRun.IsWallRunning()){
+                AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow * 1.3f);
+                AddImpact(transform.up, pStats.JumpPow);
+            }
+            else{
+                AddImpact(transform.up, pStats.JumpPow);
+            }
+
             curJumpNum++;
             jumpPressed = true;
         }
@@ -357,8 +364,10 @@ public class dPlayerMovement : NetworkBehaviour
 
         //Wallrunning
         else if (pStats.HasWallrun) { wallRun.WallRunRoutine(); } //adjusted later if we are wallrunning
-                                                             //If gliding 
-                                                             //Go down slowly
+
+        else{
+            vel.y -= pStats.PlayerGrav * Time.deltaTime;
+        }
     }
 
 
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/KickController.cs b/Assets/Scripts/PlayerScripts/KickController.cs
similarity index 91%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/KickController.cs
rename to Assets/Scripts/PlayerScripts/KickController.cs
index 0ab048d..bbfb748 100644
--- a/Assets/Scripts/PlayerScripts/MovementAbilities/KickController.cs
+++ b/Assets/Scripts/PlayerScripts/KickController.cs
@@ -62,11 +62,14 @@ public class KickController : NetworkBehaviour
 
     }
 
-    private void OnCollisionEnter(Collision collision)
+  private void OnCollisionEnter(Collision collision)
     {
         //if (!IsLocalPlayer) { return; }
         Collider myCollider = collision.contacts[0].thisCollider;
         if (collision.transform.CompareTag("kickable") && myCollider == leg.GetComponent<Collider>()){
+            if(collision.gameObject.GetComponent<Rigidbody>().isKinematic == true){
+                collision.gameObject.GetComponent<Rigidbody>().isKinematic = false;
+            }
             Vector3 direction = this.transform.forward;
             Debug.Log(direction);
             collision.rigidbody.AddForce(direction * pStats.KickPow, ForceMode.Impulse);
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/KickController.cs.meta b/Assets/Scripts/PlayerScripts/KickController.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/KickController.cs.meta
rename to Assets/Scripts/PlayerScripts/KickController.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/PlayerInventory.cs b/Assets/Scripts/PlayerScripts/PlayerInventory.cs
index 63080c9..7e3ec80 100644
--- a/Assets/Scripts/PlayerScripts/PlayerInventory.cs
+++ b/Assets/Scripts/PlayerScripts/PlayerInventory.cs
@@ -7,7 +7,7 @@ public class PlayerInventory : NetworkBehaviour
 {
 
     //List of items
-    [SerializeField] private Dictionary<string, Item> playerItemDict = new Dictionary<string, Item>();
+    [SerializeField] Dictionary<string, Item> playerItemDict = new Dictionary<string, Item>();
     public Dictionary<string, Item> PlayerItemDict{
         get{ return playerItemDict; }
     }
@@ -18,11 +18,9 @@ public class PlayerInventory : NetworkBehaviour
     }
     //Scripts
     public PlayerStats pStats;
-    public InventoryManager invMan;
     
     void Awake(){
-        pStats = GetComponent<PlayerStats>();
-        invMan =  FindObjectOfType<InventoryManager>();   
+        pStats = GetComponent<PlayerStats>();  
     }
     
     //Adds player Item to a dictionary
@@ -69,14 +67,9 @@ public class PlayerInventory : NetworkBehaviour
     }
 
     //Equips All items in list at start of next scene
-    public void UpdateEquips(){
-        if(invMan != null){
-            foreach(string itemName in networkItemList){
-                invMan.ItemDict[itemName].Equip(pStats, this.gameObject);
-            }
-        }
-        else{
-            Debug.Log("invMan is currently not set or disabled");
+    public void UpdateEquips(List<string> items, Dictionary<string, Item> allItems){
+        foreach(string itemName in items){
+            AddItem(allItems[itemName]);
         }
     }
 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts.meta b/Assets/Scripts/PlayerScripts/PlayerItems.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs b/Assets/Scripts/PlayerScripts/PlayerItems/InventoryManager.cs
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs
rename to Assets/Scripts/PlayerScripts/PlayerItems/InventoryManager.cs
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs.meta b/Assets/Scripts/PlayerScripts/PlayerItems/InventoryManager.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/InventoryManager.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Item.cs b/Assets/Scripts/PlayerScripts/PlayerItems/Item.cs
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Item.cs
rename to Assets/Scripts/PlayerScripts/PlayerItems/Item.cs
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Item.cs.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Item.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Item.cs.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Item.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts.meta
new file mode 100644
index 0000000..30a7c41
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 286df2f965f4f3c4eb74950f0550e68f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/Blink.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Blink.cs
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/Blink.cs
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Blink.cs
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/Blink.cs.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Blink.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/Blink.cs.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Blink.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/Dash.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/Dash.cs
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/Dash.cs.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/Dash.cs.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/GamePadControlls.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GamePadControlls.cs
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/GamePadControlls.cs
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GamePadControlls.cs
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/GamePadControlls.cs.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GamePadControlls.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/GamePadControlls.cs.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GamePadControlls.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/GamePadControlls.inputactions b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GamePadControlls.inputactions
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/GamePadControlls.inputactions
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GamePadControlls.inputactions
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/GamePadControlls.inputactions.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GamePadControlls.inputactions.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/GamePadControlls.inputactions.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GamePadControlls.inputactions.meta
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/GrapplingHook.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GrapplingHook.cs
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/GrapplingHook.cs
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GrapplingHook.cs
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/GrapplingHook.cs.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GrapplingHook.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/GrapplingHook.cs.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/GrapplingHook.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/Nitro.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Nitro.cs
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/Nitro.cs
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Nitro.cs
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/Nitro.cs.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Nitro.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/Nitro.cs.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Nitro.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/WallRun.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/WallRun.cs
similarity index 81%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/WallRun.cs
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/WallRun.cs
index 4f9c68c..0a1efe4 100644
--- a/Assets/Scripts/PlayerScripts/MovementAbilities/WallRun.cs
+++ b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/WallRun.cs
@@ -7,7 +7,7 @@ using UnityEngine.Rendering;
 public class WallRun : NetworkBehaviour
 {
 
-    public float wallMaxDistance = 5;
+     public float wallMaxDistance = 5;
     public float wallSpeedMultiplier = 1.2f;
     public float minimumHeight = .1f;
     public float maxAngleRoll = 20;
@@ -83,14 +83,14 @@ public class WallRun : NetworkBehaviour
             {
                 Vector3 dir = transform.TransformDirection(directions[i]);
                 Physics.Raycast(transform.position, dir, out hits[i], wallMaxDistance);
-                // if(hits[i].collider != null)
-                // {
-                //     Debug.DrawRay(transform.position, dir * hits[i].distance, Color.green);
-                // }
-                // else
-                // {
-                //     Debug.DrawRay(transform.position, dir * wallMaxDistance, Color.red);
-                // }
+                if(hits[i].collider != null)
+                {
+                    Debug.DrawRay(transform.position, dir * hits[i].distance, Color.green);
+                }
+                else
+                {
+                    Debug.DrawRay(transform.position, dir * wallMaxDistance, Color.red);
+                }
             }
 
             if(CanWallRun())
@@ -151,13 +151,35 @@ public class WallRun : NetworkBehaviour
             Vector3 moveToSet = alongWall * vertical * playerMovementController.PlayerSpeed() * Time.deltaTime;// * wallSpeedMultiplier;
             Vector3 velNorm = playerMovementController.vel;
             velNorm.Normalize();
+
             moveToSet = new Vector3(moveToSet.x * -velNorm.x, moveToSet.y, moveToSet.z * -velNorm.z);
+
+            Vector3 moveToSetNorm = moveToSet;
+            moveToSetNorm.Normalize();
+
+            if((moveToSetNorm.x < 0 && velNorm.x > 0)){
+                moveToSet.x = (moveToSet.x * -velNorm.x);
+            }
+            else if((moveToSetNorm.x > 0 && velNorm.x < 0) ){
+                moveToSet.x = (-moveToSet.x * -velNorm.x);
+            }
+
+            if((moveToSetNorm.z < 0 && velNorm.z > 0)){
+                moveToSet.z =  (moveToSet.z * -velNorm.z);
+            }
+            else if((moveToSetNorm.z > 0 && velNorm.z < 0)){
+                moveToSet.z =  (-moveToSet.z * -velNorm.z);
+            }
+
             moveToSet.y = 0;
             
 
             playerMovementController.SetPlayerVelocity(moveToSet);
-            Debug.Log(moveToSet);
             isWallRunning = true;
+            if(playerMovementController.curJumpNum != 0){
+                playerMovementController.curJumpNum = 0 ;
+            }
+            
         }
     }
 
@@ -175,10 +197,6 @@ public class WallRun : NetworkBehaviour
 
     public Vector3 GetWallJumpDirection() //Add call in jump where if we are wallrunning and jump, the jump vector is multiplied by this
     {
-        if(isWallRunning)
-        {
-            return lastWallNormal * wallBouncing + Vector3.up;
-        }
-        return Vector3.zero;
+        return lastWallNormal * wallBouncing + (transform.up);
     } 
 }
diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/WallRun.cs.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/WallRun.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/MovementAbilities/WallRun.cs.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/WallRun.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Blink.asset b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Blink.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Blink.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Blink.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Blink.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Blink.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Blink.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Blink.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Nitro.asset b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Nitro.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Nitro.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Nitro.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Nitro.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Nitro.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/Nitro.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/Nitro.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/QuickStandup.asset b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/QuickStandup.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/QuickStandup.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/QuickStandup.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/QuickStandup.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/QuickStandup.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/ObsoleteItems/QuickStandup.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/QuickStandup.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Dash.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Dash.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Dash.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Dash.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Glider.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Glider.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Glider.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Glider.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Grapple.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Grapple.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Grapple.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Grapple.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/RollerSkates.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/RollerSkates.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/RollerSkates.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/RollerSkates.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/RollerSkates.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/RollerSkates.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/RollerSkates.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/RollerSkates.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Springs.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Springs.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Springs.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Springs.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Springs.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/StrongerKick.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/StrongerKick.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/StrongerKick.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/StrongerKick.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/TripleJump.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/TripleJump.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/TripleJump.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/TripleJump.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/TripleJump.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/TripleJump.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/TripleJump.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/TripleJump.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Wall Run.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Wall Run.asset
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Wall Run.asset
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Wall Run.asset
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Wall Run.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Wall Run.asset.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Wall Run.asset.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Wall Run.asset.meta
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs b/Assets/Scripts/PlayerScripts/PlayerItems/SpecialItem.cs
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs
rename to Assets/Scripts/PlayerScripts/PlayerItems/SpecialItem.cs
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs.meta b/Assets/Scripts/PlayerScripts/PlayerItems/SpecialItem.cs.meta
similarity index 100%
rename from Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs.meta
rename to Assets/Scripts/PlayerScripts/PlayerItems/SpecialItem.cs.meta
diff --git a/Assets/Scripts/PlayerScripts/PlayerMovement.cs b/Assets/Scripts/PlayerScripts/PlayerMovement.cs
index 29bf397..d2ebab2 100644
--- a/Assets/Scripts/PlayerScripts/PlayerMovement.cs
+++ b/Assets/Scripts/PlayerScripts/PlayerMovement.cs
@@ -28,7 +28,7 @@ public class PlayerMovement : NetworkBehaviour
     private CharacterController moveController;
 
     //Jump value
-    private int curJumpNum;
+    public int curJumpNum;
     private bool jumpPressed;
     bool tempSet = false;
     float tempTraction = 0.0f;
@@ -67,7 +67,7 @@ public class PlayerMovement : NetworkBehaviour
     private Rigidbody rB;
     private CapsuleCollider capCol;
     private bool firstHit = false;
-    private bool heldDown = false;
+    //private bool heldDown = false;  //Variable for testing ragdoll reenable if needed
     private bool beginRagTimer = false;
     private float ragTime; 
     private Vector3 prevRot;
@@ -241,7 +241,13 @@ public class PlayerMovement : NetworkBehaviour
         //If space is pressed apply an upwards force to the player
         if ((Input.GetAxis("Jump") != 0) && !jumpPressed && curJumpNum + 1 < pStats.JumpNum && !isSliding)
         {
-            AddImpact(transform.up, pStats.JumpPow);
+            if(wallRun.IsWallRunning()){
+                AddImpact((wallRun.GetWallJumpDirection()), pStats.JumpPow * 1.3f);
+                AddImpact(transform.up, pStats.JumpPow);
+            }
+            else{
+                AddImpact(transform.up, pStats.JumpPow);
+            }
             curJumpNum++;
             jumpPressed = true;
         }
@@ -293,13 +299,13 @@ public class PlayerMovement : NetworkBehaviour
         Vector3 lastCamPos = new Vector3(0,0,0);
         Vector3 rotOffset = transform.localEulerAngles; 
         if(moveController.enabled){
-        transform.parent.Rotate(Vector3.up * sensitivity * Time.deltaTime * Input.GetAxis("Mouse X"));
+            transform.parent.Rotate(Vector3.up * sensitivity * Time.deltaTime * Input.GetAxis("Mouse X"));
 
 
-        camRotation.x -= Input.GetAxis("Mouse Y") * sensitivity * Time.deltaTime;
-        camRotation.x = Mathf.Clamp(camRotation.x, minAngle, maxAngle);
+            camRotation.x -= Input.GetAxis("Mouse Y") * sensitivity * Time.deltaTime;
+            camRotation.x = Mathf.Clamp(camRotation.x, minAngle, maxAngle);
 
-        cam.transform.localEulerAngles = camRotation;
+            cam.transform.localEulerAngles = camRotation;
         }
     }
 
@@ -330,7 +336,7 @@ public class PlayerMovement : NetworkBehaviour
                 tempSet = true;
             }
         }
-        else{
+        else if(!jumpPressed && pStats.HasGlider){
 
             if(tempSet == true){
                pStats.Traction = tempTraction;
@@ -342,9 +348,11 @@ public class PlayerMovement : NetworkBehaviour
         }
 
         //Wallrunning
-        if (pStats.HasWallrun) { wallRun.WallRunRoutine(); } //adjusted later if we are wallrunning
-                                                             //If gliding 
-                                                             //Go down slowly
+        else if (pStats.HasWallrun) { wallRun.WallRunRoutine(); } //adjusted later if we are wallrunning
+
+        else{
+            vel.y -= pStats.PlayerGrav * Time.deltaTime;
+        }
     }
 
 
diff --git a/Assets/Scripts/PlayerScripts/PlayerStats.cs b/Assets/Scripts/PlayerScripts/PlayerStats.cs
index 42a5cc2..fdcd55a 100644
--- a/Assets/Scripts/PlayerScripts/PlayerStats.cs
+++ b/Assets/Scripts/PlayerScripts/PlayerStats.cs
@@ -6,119 +6,118 @@ using UnityEngine.Assertions;
 public class PlayerStats : MonoBehaviour
 {
     //Maximum possible player speed
-    private float maxVel = 25.0f;
+    [SerializeField] private float maxVel = 25.0f;
     public float MaxVel{
         get{ return maxVel; }
         set{ maxVel = value; }
     }
 
     //Minimum possible player speed
-    private float minVel = 2.0f;
+    [SerializeField] private float minVel = 2.0f;
     public float MinVel{
         get{ return minVel; }
         set{ minVel = value; }
     }
     
     //Current player speed
-    private float curVel = 0.0f;
+    [SerializeField] private float curVel = 0.0f;
     public float CurVel{
         get{ return curVel; }
         set{ curVel = value; }
     }
 
     //Player Acceleration
-    private float acc = 0.1f;
+    [SerializeField] private float acc = 0.1f;
     public float Acc{
         get{ return acc; }
         set{ acc = value; }
     }
 
     //Player Jump power
-    private float jumpPow = 300.0f;
+    [SerializeField] private float jumpPow = 300.0f;
     public float JumpPow{
         get{ return jumpPow; }
         set{ jumpPow = value; }
     }
 
     //Players Number of Jumps
-    private int jumpNum = 2;
+    [SerializeField] private int jumpNum = 2;
     public int JumpNum{
         get{ return jumpNum; }
         set{ jumpNum = value; }
     }
 
     //Player Traction
-    private float traction = 3.0f;
+    [SerializeField] private float traction = 3.0f;
     public float Traction{
         get{ return traction; }
         set{ traction = value; }
     }
 
     //Player Kick Power
-    private float kickPow = 100.0f;
+    [SerializeField] private float kickPow = 150.0f;
     public float KickPow{
         get{ return kickPow; }
         set{ kickPow = value; }
     }
 
     //Player Recovery Time When Knocked Down
-    private float recovTime = 3.0f;
+    [SerializeField] private float recovTime = 3.0f;
     public float RecovTime{
         get{ return recovTime; }
         set{ recovTime = value; }
     }
 
-    //MAY BE UNNECCESARY DEPENDING ON HOW GLIDER TURNS OUT
     //Gravity Affecting the player
-    private float playerGrav = 20.0f;
+    [SerializeField] private float playerGrav = 20.0f;
     public float PlayerGrav{
         get{ return playerGrav; }
         set{ playerGrav = value; }
     }
 
     //If The Player Has Blink
-    private bool hasBlink = false;
+    [SerializeField] private bool hasBlink = false;
     public bool HasBlink{
         get{ return hasBlink; }
         set{ hasBlink = value; }
     }
 
     //If The Player Has Glider
-    private bool hasGlider = true;
+    [SerializeField] private bool hasGlider = false;
     public bool HasGlider{
         get{ return hasGlider; }
         set{ hasGlider = value; }
     }
 
     //If The Player Has Grapple
-    private bool hasGrapple = false;
+    [SerializeField] private bool hasGrapple = false;
     public bool HasGrapple{
         get{ return hasGrapple; }
         set{ hasGrapple = value; }
     }
 
     //If The Player Has Wallrun
-    private bool hasWallrun = true;
+    [SerializeField] private bool hasWallrun = false;
     public bool HasWallrun{
         get{ return hasWallrun; }
         set{ hasWallrun = value; }
     }
 
     //If The Player Has Nitro
-    private bool hasNitro = false;
+    [SerializeField] private bool hasNitro = false;
     public bool HasNitro{
         get{ return hasNitro; }
         set{ hasNitro = value; }
     }
 
     //If The Player Has Dash
-    private bool hasDash;
+    [SerializeField] private bool hasDash = false;
     public bool HasDash{
         get{ return hasDash; }
         set{ hasDash = value; }
     }
 
-    private int playerPoints = 15;
+    [SerializeField] private int playerPoints = 15;
     public int PlayerPoints{
         get{ return playerPoints; }
         set{ playerPoints = value; }
diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset
index cdc1f3e..7b88692 100644
--- a/ProjectSettings/DynamicsManager.asset
+++ b/ProjectSettings/DynamicsManager.asset
@@ -3,10 +3,11 @@
 --- !u!55 &1
 PhysicsManager:
   m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 13
   m_Gravity: {x: 0, y: -9.81, z: 0}
   m_DefaultMaterial: {fileID: 0}
   m_BounceThreshold: 2
+  m_DefaultMaxDepenetrationVelocity: 10
   m_SleepThreshold: 0.005
   m_DefaultContactOffset: 0.01
   m_DefaultSolverIterations: 6
@@ -22,7 +23,8 @@ PhysicsManager:
   m_AutoSyncTransforms: 0
   m_ReuseCollisionCallbacks: 1
   m_ClothInterCollisionSettingsToggle: 0
-  m_ContactPairsMode: 0
+  m_ClothGravity: {x: 0, y: -9.81, z: 0}
+  m_ContactPairsMode: 3
   m_BroadphaseType: 0
   m_WorldBounds:
     m_Center: {x: 0, y: 0, z: 0}
@@ -31,4 +33,5 @@ PhysicsManager:
   m_FrictionType: 0
   m_EnableEnhancedDeterminism: 0
   m_EnableUnifiedHeightmaps: 1
-  m_DefaultMaxAngluarSpeed: 7
+  m_SolverType: 0
+  m_DefaultMaxAngularSpeed: 7
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 91c82e8..9418679 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -21,19 +21,19 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7b151b180b650d262f3d192c0e27d1e33136e7a923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c6f1f05033f2b212d111c633c133af6f9
+      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
+      value: 22424703114646680e0b0227036c731f1415016439262f2434
       flags: 0
     RecentlyUsedScenePath-7:
       value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a
+      value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
+      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
       flags: 0
     UnityRemoteCompression:
       value: 337f73