diff --git a/Assets/More PostProcessing Effects/Shaders/NormalMapDistortion.shader b/Assets/More PostProcessing Effects/Shaders/NormalMapDistortion.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/NormalMapDistortion.shader.meta b/Assets/More PostProcessing Effects/Shaders/NormalMapDistortion.shader.meta
diff --git a/Assets/More PostProcessing Effects/Shaders/Posterization.shader b/Assets/More PostProcessing Effects/Shaders/Posterization.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/Posterization.shader.meta b/Assets/More PostProcessing Effects/Shaders/Posterization.shader.meta
diff --git a/Assets/More PostProcessing Effects/Shaders/RadialBlur.shader b/Assets/More PostProcessing Effects/Shaders/RadialBlur.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/RadialBlur.shader.meta b/Assets/More PostProcessing Effects/Shaders/RadialBlur.shader.meta
diff --git a/Assets/More PostProcessing Effects/Shaders/Ripple.shader b/Assets/More PostProcessing Effects/Shaders/Ripple.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/Ripple.shader.meta b/Assets/More PostProcessing Effects/Shaders/Ripple.shader.meta
diff --git a/Assets/More PostProcessing Effects/Shaders/Scanner.shader b/Assets/More PostProcessing Effects/Shaders/Scanner.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/Scanner.shader.meta b/Assets/More PostProcessing Effects/Shaders/Scanner.shader.meta
diff --git a/Assets/More PostProcessing Effects/Shaders/Shadows2D.shader b/Assets/More PostProcessing Effects/Shaders/Shadows2D.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/Shadows2D.shader.meta b/Assets/More PostProcessing Effects/Shaders/Shadows2D.shader.meta
diff --git a/Assets/More PostProcessing Effects/Shaders/Sobel.shader b/Assets/More PostProcessing Effects/Shaders/Sobel.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/Sobel.shader.meta b/Assets/More PostProcessing Effects/Shaders/Sobel.shader.meta
diff --git a/Assets/More PostProcessing Effects/Shaders/ThermalVision.shader b/Assets/More PostProcessing Effects/Shaders/ThermalVision.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/ThermalVision.shader.meta b/Assets/More PostProcessing Effects/Shaders/ThermalVision.shader.meta
diff --git a/Assets/More PostProcessing Effects/Shaders/Waves.shader b/Assets/More PostProcessing Effects/Shaders/Waves.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/Waves.shader.meta b/Assets/More PostProcessing Effects/Shaders/Waves.shader.meta
diff --git a/Assets/More PostProcessing Effects/Shaders/Wiggle.shader b/Assets/More PostProcessing Effects/Shaders/Wiggle.shader
diff --git a/Assets/More PostProcessing Effects/Shaders/Wiggle.shader.meta b/Assets/More PostProcessing Effects/Shaders/Wiggle.shader.meta
diff --git a/Assets/More PostProcessing Effects/Textures.meta b/Assets/More PostProcessing Effects/Textures.meta
diff --git a/Assets/More PostProcessing Effects/Textures/MorePPEffects_NMD_Default.png b/Assets/More PostProcessing Effects/Textures/MorePPEffects_NMD_Default.png
diff --git a/Assets/More PostProcessing Effects/Textures/MorePPEffects_NMD_Default.png.meta b/Assets/More PostProcessing Effects/Textures/MorePPEffects_NMD_Default.png.meta
diff --git a/Assets/NPCs/Villager.mat b/Assets/NPCs/Villager.mat
@@ -73,4 +73,4 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
diff --git a/Assets/More PostProcessing Effects.meta → Assets/Portfolio.meta b/Assets/More PostProcessing Effects.meta → Assets/Portfolio.meta
diff --git a/Assets/Portfolio.unity b/Assets/Portfolio.unity
diff --git a/Assets/skyb1.meta → Assets/Portfolio.unity.meta b/Assets/skyb1.meta → Assets/Portfolio.unity.meta
diff --git a/Assets/Portfolio/NavMesh.asset b/Assets/Portfolio/NavMesh.asset
diff --git a/Assets/Test2/NavMesh.asset.meta → Assets/Portfolio/NavMesh.asset.meta b/Assets/Test2/NavMesh.asset.meta → Assets/Portfolio/NavMesh.asset.meta
diff --git a/Assets/PostProcessing/default.asset b/Assets/PostProcessing/default.asset
diff --git a/Assets/PostProcessing/ppp2.asset b/Assets/PostProcessing/ppp2.asset
@@ -50,7 +50,7 @@ MonoBehaviour:
       ambientOnly: 0
       highPrecision: 0
   screenSpaceReflection:
-    m_Enabled: 0
+    m_Enabled: 1
     m_Settings:
       reflection:
         blendType: 1
@@ -100,10 +100,10 @@ MonoBehaviour:
     m_Enabled: 1
     m_Settings:
       bloom:
-        intensity: 1
-        threshold: 1.1
-        softKnee: 1
-        radius: 2.42
+        intensity: 0.34
+        threshold: 0.62
+        softKnee: 0
+        radius: 4.12
         antiFlicker: 1
       lensDirt:
         texture: {fileID: 2800000, guid: 69e847bbff1cf5449a4ee0bbd045dbc9, type: 3}
@@ -125,7 +125,7 @@ MonoBehaviour:
         tint: 0
         hueShift: 0
         saturation: 1.1703162
-        contrast: 1.38
+        contrast: 1.23
       channelMixer:
         red: {x: 1, y: 0, z: 0}
         green: {x: 0, y: 1, z: 0}
@@ -293,7 +293,7 @@ MonoBehaviour:
       size: 1
       luminanceContribution: 0.8
   vignette:
-    m_Enabled: 0
+    m_Enabled: 1
     m_Settings:
       mode: 0
       color: {r: 0, g: 0, b: 0, a: 1}

diff --git a/Assets/Prefabs/FlamesParticleEffect.prefab b/Assets/Prefabs/FlamesParticleEffect.prefab
diff --git a/Assets/Prefabs/FlamesParticleEffect.prefab.meta b/Assets/Prefabs/FlamesParticleEffect.prefab.meta
diff --git a/Assets/Test2.meta → Assets/Prefabs/FromOtherScene.meta b/Assets/Test2.meta → Assets/Prefabs/FromOtherScene.meta
diff --git a/Assets/Prefabs/FromOtherScene/Audio.prefab b/Assets/Prefabs/FromOtherScene/Audio.prefab
diff --git a/Assets/Prefabs/FromOtherScene/Audio.prefab.meta b/Assets/Prefabs/FromOtherScene/Audio.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/BridgeBuilder.prefab b/Assets/Prefabs/FromOtherScene/BridgeBuilder.prefab
@@ -0,0 +1,112 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1068000822704612}
+  m_IsPrefabParent: 1
+--- !u!1 &1068000822704612
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4647252967324650}
+  - component: {fileID: 33327970547557150}
+  - component: {fileID: 65529156190105232}
+  - component: {fileID: 23411708799250824}
+  - component: {fileID: 114139791970956568}
+  m_Layer: 0
+  m_Name: BridgeBuilder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4647252967324650
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1068000822704612}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 64.809, y: -1.5294, z: 68.889}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23411708799250824
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1068000822704612}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 801249bb48d67d1468cdd0c3763d7e7e, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  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
+--- !u!33 &33327970547557150
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1068000822704612}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!65 &65529156190105232
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1068000822704612}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &114139791970956568
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1068000822704612}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 73f7cedf71f81694bbee21d5fd909b14, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  player_location: {fileID: 0}
+  bridge_segment: {fileID: 1353397812860094, guid: ad7e2ea6968440b41b9607a59ca22acd,
+    type: 2}
+  parent: {fileID: 1068000822704612}
+  bridge_size: 0f00000010000000
diff --git a/Assets/Prefabs/FromOtherScene/BridgeBuilder.prefab.meta b/Assets/Prefabs/FromOtherScene/BridgeBuilder.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/Canvas.prefab b/Assets/Prefabs/FromOtherScene/Canvas.prefab
@@ -0,0 +1,250 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1353489072735704}
+  m_IsPrefabParent: 1
+--- !u!1 &1353489072735704
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224320336576426700}
+  - component: {fileID: 223696972396893826}
+  - component: {fileID: 114511281320698500}
+  - component: {fileID: 114045548405260332}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1401807287217098
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224477560090262082}
+  - component: {fileID: 222387619434071792}
+  - component: {fileID: 114930913090631732}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1624223008913860
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224692707334497740}
+  - component: {fileID: 222291260093624102}
+  - component: {fileID: 114410018220530322}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114045548405260332
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1353489072735704}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &114410018220530322
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1624223008913860}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114511281320698500
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1353489072735704}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!114 &114930913090631732
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1401807287217098}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 150
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 300
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: fewgewfgewewf
+--- !u!222 &222291260093624102
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1624223008913860}
+--- !u!222 &222387619434071792
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1401807287217098}
+--- !u!223 &223696972396893826
+Canvas:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1353489072735704}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &224320336576426700
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1353489072735704}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 224692707334497740}
+  - {fileID: 224477560090262082}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!224 &224477560090262082
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1401807287217098}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.12129712, y: 0.1212971, z: 0.1212971}
+  m_Children: []
+  m_Father: {fileID: 224320336576426700}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -37}
+  m_SizeDelta: {x: 1600, y: 300}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224692707334497740
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1624223008913860}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.06634732, y: 0.066347376, z: 0.066347376}
+  m_Children: []
+  m_Father: {fileID: 224320336576426700}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
diff --git a/Assets/Prefabs/FromOtherScene/Canvas.prefab.meta b/Assets/Prefabs/FromOtherScene/Canvas.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/EnviromentCubes.prefab b/Assets/Prefabs/FromOtherScene/EnviromentCubes.prefab
diff --git a/Assets/Prefabs/FromOtherScene/EnviromentCubes.prefab.meta b/Assets/Prefabs/FromOtherScene/EnviromentCubes.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/GroundWaveController.prefab b/Assets/Prefabs/FromOtherScene/GroundWaveController.prefab
@@ -0,0 +1,69 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1675482850081266}
+  m_IsPrefabParent: 1
+--- !u!1 &1675482850081266
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4762677963198544}
+  - component: {fileID: 114247242987435762}
+  m_Layer: 0
+  m_Name: GroundWaveController
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4762677963198544
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1675482850081266}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 82.54, y: 0, z: 16.38}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &114247242987435762
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1675482850081266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4dac7370b5ff5154ab242c6a3754aa09, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PathSegment: {fileID: 0}
+  waveSegment: {fileID: 1826272401173434, guid: 79c378602d96f4745b3a40fce2da8f14,
+    type: 2}
+  StartPosition: {fileID: 1675482850081266}
+  player: {fileID: 0}
+  player_height: 0
+  wave_scale: 2
+  cube_scale: 0
+  speed: 1
+  max: 10
+  min: 2
+  noise_scale: 5
+  pathwidth: 40
+  pathLength: 40
+  groundWave: 1
+  start_low: 0
diff --git a/Assets/Prefabs/FromOtherScene/GroundWaveController.prefab.meta b/Assets/Prefabs/FromOtherScene/GroundWaveController.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/MirrorRoom.prefab b/Assets/Prefabs/FromOtherScene/MirrorRoom.prefab
@@ -0,0 +1,347 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1210666463833382}
+  m_IsPrefabParent: 1
+--- !u!1 &1210666463833382
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4778524116208466}
+  m_Layer: 0
+  m_Name: MirrorRoom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1529325054505546
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4078608514784764}
+  m_Layer: 0
+  m_Name: MaskDoor
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1634978005240420
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4591151315775364}
+  - component: {fileID: 33738820119214498}
+  - component: {fileID: 65243142314517048}
+  - component: {fileID: 23852232708569778}
+  m_Layer: 0
+  m_Name: Cube (11)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!1 &1638656099282042
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4466279340021066}
+  - component: {fileID: 33235448671910686}
+  - component: {fileID: 65848431833370798}
+  - component: {fileID: 23778167321952270}
+  - component: {fileID: 114451315409149410}
+  m_Layer: 0
+  m_Name: mirror
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1997686780481614
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4748562143358934}
+  - component: {fileID: 33625181215223190}
+  - component: {fileID: 65139483716706444}
+  - component: {fileID: 23133430042521240}
+  - component: {fileID: 114796861401994104}
+  m_Layer: 0
+  m_Name: door (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4078608514784764
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1529325054505546}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 60.26, y: -0.14001, z: 125.81}
+  m_LocalScale: {x: 5.884859, y: 0.3052134, z: 5.3348675}
+  m_Children:
+  - {fileID: 4466279340021066}
+  - {fileID: 4591151315775364}
+  m_Father: {fileID: 4778524116208466}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!4 &4466279340021066
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1638656099282042}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.265, y: -263.2, z: -0.145}
+  m_LocalScale: {x: 1.573951, y: 0.19166385, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4078608514784764}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: -72.819}
+--- !u!4 &4591151315775364
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1634978005240420}
+  m_LocalRotation: {x: 0.000000029802322, y: -0.7071066, z: -0.00000010430813, w: 0.707107}
+  m_LocalPosition: {x: 0.9125188, y: -263.22165, z: -0.14296126}
+  m_LocalScale: {x: 0.7849248, y: 2.8486872, z: 0.078042306}
+  m_Children: []
+  m_Father: {fileID: 4078608514784764}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: -17.181002, z: -90.00001}
+--- !u!4 &4748562143358934
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1997686780481614}
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.70710677}
+  m_LocalPosition: {x: 58.614, y: 3.28, z: 63.575996}
+  m_LocalScale: {x: 18.686417, y: 0.24710003, z: 9.670981}
+  m_Children: []
+  m_Father: {fileID: 4778524116208466}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: 0}
+--- !u!4 &4778524116208466
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1210666463833382}
+  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: 4078608514784764}
+  - {fileID: 4748562143358934}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23133430042521240
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1997686780481614}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 801249bb48d67d1468cdd0c3763d7e7e, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  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
+--- !u!23 &23778167321952270
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1638656099282042}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: c7979c6f44069764f94e7a3e4215f42b, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  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
+--- !u!23 &23852232708569778
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1634978005240420}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 84fc5cbc54660e146996d1ecbba46c4d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  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
+--- !u!33 &33235448671910686
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1638656099282042}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &33625181215223190
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1997686780481614}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &33738820119214498
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1634978005240420}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!65 &65139483716706444
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1997686780481614}
+  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!65 &65243142314517048
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1634978005240420}
+  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!65 &65848431833370798
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1638656099282042}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &114451315409149410
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1638656099282042}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5013a182bb3608f4ca0cbaff912deb79, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  door: {fileID: 1997686780481614}
+  NoTex: {fileID: 2100000, guid: c2bdf69668caf68408a7935f2d5c4c1c, type: 2}
+  mainCamera: {fileID: 0}
+--- !u!114 &114796861401994104
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1997686780481614}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4d786ef71d73d1d428ce4238b9802139, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_queues: b90b0000
diff --git a/Assets/Prefabs/FromOtherScene/MirrorRoom.prefab.meta b/Assets/Prefabs/FromOtherScene/MirrorRoom.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/NPC.prefab b/Assets/Prefabs/FromOtherScene/NPC.prefab
diff --git a/Assets/Prefabs/FromOtherScene/NPC.prefab.meta b/Assets/Prefabs/FromOtherScene/NPC.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/ParticleMan.prefab b/Assets/Prefabs/FromOtherScene/ParticleMan.prefab
diff --git a/Assets/Prefabs/FromOtherScene/ParticleMan.prefab.meta b/Assets/Prefabs/FromOtherScene/ParticleMan.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/ParticleNPC.prefab b/Assets/Prefabs/FromOtherScene/ParticleNPC.prefab
diff --git a/Assets/Prefabs/FromOtherScene/ParticleNPC.prefab.meta b/Assets/Prefabs/FromOtherScene/ParticleNPC.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/Staue.prefab b/Assets/Prefabs/FromOtherScene/Staue.prefab
diff --git a/Assets/Prefabs/FromOtherScene/Staue.prefab.meta b/Assets/Prefabs/FromOtherScene/Staue.prefab.meta
diff --git a/Assets/Prefabs/FromOtherScene/ThirdPersonController.prefab b/Assets/Prefabs/FromOtherScene/ThirdPersonController.prefab
diff --git a/Assets/Prefabs/FromOtherScene/ThirdPersonController.prefab.meta b/Assets/Prefabs/FromOtherScene/ThirdPersonController.prefab.meta
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
@@ -0,0 +1,291 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1317197963796212}
+  m_IsPrefabParent: 1
+--- !u!1 &1232777308150212
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4037774565819828}
+  - component: {fileID: 33807204387591226}
+  - component: {fileID: 65461403836643232}
+  - component: {fileID: 23645682913764942}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1317197963796212
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4573125482650806}
+  - component: {fileID: 143022559207968302}
+  - component: {fileID: 114230282836769816}
+  m_Layer: 0
+  m_Name: Player
+  m_TagString: Player
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1681225437472572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4678546031507562}
+  m_Layer: 0
+  m_Name: FloorLevel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1732653515857662
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4780276445738664}
+  - component: {fileID: 20673807360284872}
+  - component: {fileID: 92570751571446960}
+  - component: {fileID: 124858219699589592}
+  - component: {fileID: 81032399123290598}
+  - component: {fileID: 114772771620016844}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4037774565819828
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1232777308150212}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.89, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4573125482650806}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4573125482650806
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1317197963796212}
+  m_LocalRotation: {x: -0, y: 0.4820291, z: -0, w: 0.8761552}
+  m_LocalPosition: {x: 34.81, y: -0.334, z: 39.47}
+  m_LocalScale: {x: 0.703641, y: 0.703641, z: 0.703641}
+  m_Children:
+  - {fileID: 4780276445738664}
+  - {fileID: 4037774565819828}
+  - {fileID: 4678546031507562}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 57.636, z: 0}
+--- !u!4 &4678546031507562
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1681225437472572}
+  m_LocalRotation: {x: -0, y: -0.075283386, z: -0, w: 0.9971622}
+  m_LocalPosition: {x: 0, y: -0.98827976, z: 0}
+  m_LocalScale: {x: 1.4211792, y: 1.4211793, z: 1.4211792}
+  m_Children: []
+  m_Father: {fileID: 4573125482650806}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4780276445738664
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1732653515857662}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4573125482650806}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &20673807360284872
+Camera:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1732653515857662}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+  m_StereoMirrorMode: 0
+--- !u!23 &23645682913764942
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1232777308150212}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  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_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  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
+--- !u!33 &33807204387591226
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1232777308150212}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!65 &65461403836643232
+BoxCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1232777308150212}
+  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!81 &81032399123290598
+AudioListener:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1732653515857662}
+  m_Enabled: 1
+--- !u!92 &92570751571446960
+Behaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1732653515857662}
+  m_Enabled: 1
+--- !u!114 &114230282836769816
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1317197963796212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0acbd65b707ae842a45370bdf00194f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moveSpeed: 10
+  sensitivity: 50
+  upDownRange: 60
+  HUD_text: {fileID: 0}
+  console_active: 0
+--- !u!114 &114772771620016844
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1732653515857662}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ff26db721962cdf4a8edcdfa9a767d2a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  profile: {fileID: 11400000, guid: f15440719f32da04b8c276c330229a73, type: 2}
+--- !u!124 &124858219699589592
+Behaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1732653515857662}
+  m_Enabled: 1
+--- !u!143 &143022559207968302
+CharacterController:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1317197963796212}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Height: 2
+  m_Radius: 0.5
+  m_SlopeLimit: 45
+  m_StepOffset: 0.3
+  m_SkinWidth: 0.08
+  m_MinMoveDistance: 0.001
+  m_Center: {x: 0, y: 0, z: 0}
diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta
diff --git a/Assets/PuzzleTest.unity b/Assets/PuzzleTest.unity
diff --git a/Assets/Scripts/BridgeBuilder.cs b/Assets/Scripts/BridgeBuilder.cs
@@ -20,14 +20,12 @@ void Start ()
 	{
 		bridge = new GameObject[bridge_size [0], bridge_size [1]];
 
-		Debug.Log (bridge.Length);
-
 		for (int i = 0; i < bridge_size [0]; i++) 
 		{
 			for (int j = 0; j < bridge_size [1]; j++) 
 			{
-				Vector3 segment_pos = new Vector3 (parent.transform.position.x - j, parent.transform.position.y, parent.transform.position.z + i);
-				bridge [i, j] = Instantiate (bridge_segment, segment_pos, Quaternion.identity, parent.gameObject.transform);
+				Vector3 segment_pos = new Vector3 (-j, 0.0f, i);
+				bridge [i, j] = Instantiate (bridge_segment, segment_pos, Quaternion.identity, gameObject.transform);
 				bridge[i,j].GetComponent<Renderer>().material.SetColor("_EmissionColor", Color.black);
 			}
 		}

diff --git a/Assets/Scripts/BridgeSegment.cs b/Assets/Scripts/BridgeSegment.cs
@@ -19,6 +19,7 @@ void Start ()
 		player_location = GameObject.FindGameObjectWithTag ("Player").transform;
 		startPos = new Vector3 (this.transform.position.x, this.transform.position.y - 1.0f, this.transform.position.z);
 		endPos = this.transform.position;
+
 	}
 
 	float GetDistance()
@@ -30,8 +31,7 @@ float GetDistance()
 		//dist /= range;
 
 		//dist = dist * dist;
-
-		//Debug.Log (dist);
+
 
 		return dist;
 	}

diff --git a/Assets/Scripts/GroundWave.cs b/Assets/Scripts/GroundWave.cs
@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using CielaSpike;
 
 public class GroundWave : MonoBehaviour 
 {
@@ -99,23 +98,18 @@ public void Init(Transform controller_loc, Transform p_location, float p_height,
 		x_location = xLoc / scale;
 		y_location = yLoc / scale;
 
-		this.StartCoroutineAsync (Move ());
+		this.StartCoroutine (Move ());
 	}
 
 	IEnumerator Move()
 	{
 		while (going) 
 		{
-
-
 			num = Mathf.PerlinNoise (x_location + time, y_location + time);
 			num += Mathf.PerlinNoise (x_location - (time + 0.2f), y_location - (time + 0.2f));
 
 			num /= 2.0f;
 
-
-
-
 			perlin_location = endPos;
 
 			perlin_location.y += num * wave_scale;
@@ -125,28 +119,14 @@ IEnumerator Move()
 
 			this_position.y = controller_location.y;
 
-
-			yield return Ninja.JumpToUnity;
-
 			Vector3 p_pos = player_location.position;
 
-			yield return Ninja.JumpBack;
-
 			distance = Vector3.Distance (p_pos, this_position);
 
-
-			yield return Ninja.JumpToUnity;
-
-
 			final_emission = Color.Lerp (startColor, endColor, num);
 
 			final_emission = Color.Lerp (player_color, final_emission, (distance - min) / max);
 
-			//band = 1.0f - audio_effect.average_band_buffer/ 2.0f;
-
-			//final_emission = Color.Lerp(Color.red, final_emission, band);
-
-
 			this.transform.localPosition = perlin_location;
 			this.transform.localPosition = Vector3.Slerp (player_pos, transform.position, ((distance - min) / max) - 0.1f);
 
@@ -155,7 +135,7 @@ IEnumerator Move()
 
 
 			time += Time.deltaTime;
-			yield return Ninja.JumpBack;
+
 		}
 
 		yield return null;

diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
@@ -0,0 +1,215 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class PlayerController : MonoBehaviour
+{
+    [SerializeField]
+    private float moveSpeed = 2.0f, sensitivity = 5.0f, upDownRange = 6.0f;
+
+    private float forwardSpeed = 0.0f, sideSpeed = 0.0f, verticalRotation = 0.0f, verticalVelocity = 0.0f;
+
+    private CharacterController characterController;
+
+    private bool playerEnabled = true;
+
+	public Text HUD_text;
+
+	public bool console_active = false;
+
+    private float stepCycle = 0.5f, stepTimer = 0.0f;
+
+    //jacobs rotation code for controller
+    private float rotY;
+    private float rotX;
+
+	void OnEnable()
+    {
+        // Intro Sequence - Disable then re-enable the player
+        //EventManager.OnGameStart += DisablePlayer;
+        //EventManager.OnIntroComplete += EnablePlayer;
+    }
+
+	void OnTriggerEnter(Collider col)
+	{
+		if (col.tag == "Console") 
+		{
+			console_active = true;
+
+			//col.gameObject.GetComponentInChildren<Console> ().ActivatePointer (true);
+		}
+	}
+
+	void OnTriggerExit(Collider col)
+	{
+		if (col.tag == "Console") 
+		{
+			console_active = false;
+
+			//col.gameObject.GetComponentInChildren<Console> ().ActivatePointer (false);
+		}
+	}
+
+    // Use this for initialization
+    void Start()
+    {
+
+        // Disable the cursor
+        Cursor.visible = false;
+		Cursor.lockState = CursorLockMode.Locked;
+
+        // Get Components
+        characterController = GetComponent<CharacterController>();
+        rotY = transform.rotation.eulerAngles.x;
+        rotX = transform.rotation.eulerAngles.y;
+
+		//RotatePlayer(new Vector3(0.0f, 180.0f, 0.0f));
+    }
+
+	void RotatePlayer(Vector3 angle)
+	{
+		Quaternion rot = Quaternion.Euler(angle.x, angle.y, angle.y);
+		transform.Rotate (angle);//  new Vector3(angle.x, angle.y, angle.z);
+	}
+
+    // Update is called once per frame
+    void Update()
+    {
+        // If the player is active
+        if(playerEnabled)
+        {
+			RaycastHit hit;
+			Ray ray = Camera.main.ScreenPointToRay(new Vector3((Screen.width / 2), (Screen.height / 2)));
+
+			if (Physics.Raycast(ray.origin, ray.direction, out hit, 7.0f))
+			{
+				if (hit.collider.gameObject.tag == "PuzzleLayer")
+				{
+                    Debug.Log("Puzzle ray cast");
+					HUD_text.text = "LMB/RMB to rotate this segment";
+					if (Input.GetMouseButtonDown(0) || Input.GetButton("A"))
+					{
+						hit.collider.gameObject.SendMessage("SetDirection", 1);
+						hit.collider.gameObject.SendMessage("Rotate", true);
+					}
+
+					else if (Input.GetMouseButtonDown(1) || Input.GetButton("B"))
+					{
+						hit.collider.gameObject.SendMessage("SetDirection", -1);
+						hit.collider.gameObject.SendMessage("Rotate", true);
+
+					}
+
+				}
+				else if (hit.collider.gameObject.tag == "PuzzleReset")
+				{
+					HUD_text.text = "LMB reset the puzzle";
+					if (Input.GetMouseButtonDown(0))
+					{
+						hit.collider.gameObject.SendMessage("Reset");
+					}
+
+				}
+				else
+				{
+					HUD_text.text = "";
+				}
+
+			}
+			else
+			{
+				HUD_text.text = "";
+
+			}
+
+            // Camera Rotation
+            //float rotLeftRight = Input.GetAxis("Mouse X") * 100;
+            //rotLeftRight *= Time.deltaTime;
+            //transform.Rotate(0, rotLeftRight, 0);
+
+            //verticalRotation -= Input.GetAxis("Mouse Y") * 100;
+            //verticalRotation = Mathf.Clamp(verticalRotation, -upDownRange, upDownRange);
+
+            //Camera.main.transform.localRotation = Quaternion.Euler(verticalRotation, 0, 0);
+
+            // New rotational code to allow for delta time and controller input
+            float mouseY = -Input.GetAxis("Mouse Y");
+            float mouseX = Input.GetAxis("Mouse X");
+
+            rotY += mouseY * sensitivity * Time.deltaTime;
+            rotX = mouseX * sensitivity * Time.deltaTime;
+
+			transform.Rotate (new Vector3(0.0f, rotX, 0.0f));
+
+           // Quaternion xRotation = Quaternion.Euler(0.0f, rotX, 0.0f);
+            //transform.localRotation = xRotation;
+            rotY = Mathf.Clamp(rotY, -upDownRange, upDownRange);
+
+
+            Quaternion localRotation = Quaternion.Euler(rotY, 0.0f, 0.0f);
+            Camera.main.transform.localRotation = localRotation;
+            // Move the camera
+            // Movement
+            forwardSpeed = Input.GetAxis("Vertical") * moveSpeed;
+            sideSpeed = Input.GetAxis("Horizontal") * moveSpeed;
+
+            // Stop the player falling if they're grounded
+            verticalVelocity = characterController.isGrounded ? 0 : verticalVelocity + (Physics.gravity.y * Time.deltaTime);
+
+            Vector3 speed = new Vector3(sideSpeed, verticalVelocity, forwardSpeed);
+            speed = transform.rotation * speed;
+            characterController.Move(speed * Time.deltaTime);
+
+			if (console_active) 
+			{
+				RaycastHit hitConsole;
+				Ray rayConsole = Camera.main.ViewportPointToRay (new Vector3 (0.5f, 0.5f, 0.0f));
+				if (Physics.Raycast (rayConsole, out hitConsole)) 
+				{
+					if (hitConsole.collider.gameObject.tag == "Screen") 
+					{
+						hitConsole.collider.gameObject.SendMessage ("UpdateConsolePointer", hitConsole.point);
+					}
+				}
+			}
+
+            // Increase the step timer
+            stepTimer += Time.deltaTime;
+
+            // Check if the player is moving
+            if(speed.sqrMagnitude > 0.0f)
+            {
+                // Check if the player is grounded
+                if(characterController.isGrounded)
+                {
+                    // If the step timer exceeds the cycle interval
+                    if (stepTimer > stepCycle)
+                    {
+                        // Reset the timer
+                        stepTimer -= 0.5f;
+
+                        // Post a footstep event
+                        //AkSoundEngine.PostEvent("footstep", gameObject);
+                    }
+                }
+
+            }
+            else
+            {
+                stepTimer = 0.0f;
+            }
+        }
+    }
+
+	void DisablePlayer()
+    {
+        playerEnabled = false;
+    }
+
+    void EnablePlayer()
+    {
+        playerEnabled = true;
+    }
+
+}
diff --git a/...or/MorePPEffects/Anaglyph3DEditor.cs.meta → Assets/Scripts/PlayerController.cs.meta b/...or/MorePPEffects/Anaglyph3DEditor.cs.meta → Assets/Scripts/PlayerController.cs.meta
diff --git a/Assets/Standard Assets/Characters/ThirdPersonCharacter/Models/EthanMat.mat b/Assets/Standard Assets/Characters/ThirdPersonCharacter/Models/EthanMat.mat
@@ -72,5 +72,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Test2/NavMesh.asset b/Assets/Test2/NavMesh.asset
diff --git a/Assets/Thumbs.db b/Assets/Thumbs.db
diff --git a/Assets/skyb1/back.psd b/Assets/skyb1/back.psd
diff --git a/Assets/skyb1/back.psd.meta b/Assets/skyb1/back.psd.meta
diff --git a/Assets/skyb1/bot.psd b/Assets/skyb1/bot.psd
diff --git a/Assets/skyb1/bot.psd.meta b/Assets/skyb1/bot.psd.meta
diff --git a/Assets/skyb1/front.psd b/Assets/skyb1/front.psd
diff --git a/Assets/skyb1/front.psd.meta b/Assets/skyb1/front.psd.meta
diff --git a/Assets/skyb1/l.psd b/Assets/skyb1/l.psd