diff --git a/Assets/PrefabStock.cs b/Assets/PrefabStock.cs
new file mode 100644
index 0000000..12084de
--- /dev/null
+++ b/Assets/PrefabStock.cs
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:202846e687fb376fe8501ce0d2e7dfa068c64b762d76acf7e96eb0c1dbb1beb7
+size 170
diff --git a/Assets/PrefabStock.cs.meta b/Assets/PrefabStock.cs.meta
new file mode 100644
index 0000000..e72a1fe
--- /dev/null
+++ b/Assets/PrefabStock.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d108ea5449e40394f826491026a514b1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Prefabs/Core.meta b/Assets/Prefabs/Core.meta
new file mode 100644
index 0000000..bec6f47
--- /dev/null
+++ b/Assets/Prefabs/Core.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 55d75d195690abe49bb3ce6dfcd3fcdb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Prefabs/Core/Arrow.prefab b/Assets/Prefabs/Core/Arrow.prefab
new file mode 100644
index 0000000..2fe5d3e
--- /dev/null
+++ b/Assets/Prefabs/Core/Arrow.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:787f1745f3a3e510e2d9bb4cfc0107633e177913921011d361a9edc424ec2348
+size 4667
diff --git a/Assets/Prefabs/Core/Arrow.prefab.meta b/Assets/Prefabs/Core/Arrow.prefab.meta
new file mode 100644
index 0000000..d71ac6b
--- /dev/null
+++ b/Assets/Prefabs/Core/Arrow.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: be38bed7caf53c140987d5fe0b289a7c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Prefabs/Core/SpawnPoint.prefab b/Assets/Prefabs/Core/SpawnPoint.prefab
new file mode 100644
index 0000000..1f96cdd
--- /dev/null
+++ b/Assets/Prefabs/Core/SpawnPoint.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c19758c231bb76c36185e0d4888dbb765340d0107194a30e2e602cb272565e86
+size 5820
diff --git a/Assets/Prefabs/SpawnPoint.prefab.meta b/Assets/Prefabs/Core/SpawnPoint.prefab.meta
similarity index 100%
rename from Assets/Prefabs/SpawnPoint.prefab.meta
rename to Assets/Prefabs/Core/SpawnPoint.prefab.meta
diff --git a/Assets/Prefabs/Core/Waypoint.prefab b/Assets/Prefabs/Core/Waypoint.prefab
new file mode 100644
index 0000000..79b256a
--- /dev/null
+++ b/Assets/Prefabs/Core/Waypoint.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f498f143d9dfb8f3a9c67569aa26b011c5925026783dadc6b3fa1bbe0f98b5ba
+size 118321
diff --git a/Assets/Prefabs/Waypoint.prefab.meta b/Assets/Prefabs/Core/Waypoint.prefab.meta
similarity index 100%
rename from Assets/Prefabs/Waypoint.prefab.meta
rename to Assets/Prefabs/Core/Waypoint.prefab.meta
diff --git a/Assets/Prefabs/Core/arrow.obj.meta b/Assets/Prefabs/Core/arrow.obj.meta
new file mode 100644
index 0000000..3da1490
--- /dev/null
+++ b/Assets/Prefabs/Core/arrow.obj.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 0e8d8faeb7386b14689a7745abe865cb
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: //RootNode
+    100002: default
+    400000: //RootNode
+    400002: default
+    2100000: defaultMat
+    2300000: default
+    3300000: default
+    4300000: default
+  externalObjects: {}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    previousCalculatedGlobalScale: 1
+    hasPreviousCalculatedGlobalScale: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Prefabs/SpawnPoint.prefab b/Assets/Prefabs/SpawnPoint.prefab
deleted file mode 100644
index 4604733..0000000
--- a/Assets/Prefabs/SpawnPoint.prefab
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c0f26a4c03739c5530e95904b6ffa57942379342789911fdccb58f60f0efaafb
-size 5829
diff --git a/Assets/Prefabs/Waypoint.prefab b/Assets/Prefabs/Waypoint.prefab
deleted file mode 100644
index 7c1ab4e..0000000
--- a/Assets/Prefabs/Waypoint.prefab
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aefaa8ed873274f243ea66772a3a9982ddfac5853af80f5213130707bf7fa591
-size 118312
diff --git a/Assets/Resources/Waypoint 1.mat b/Assets/Resources/Waypoint 1.mat
index ab8a673..b5e29bb 100644
--- a/Assets/Resources/Waypoint 1.mat	
+++ b/Assets/Resources/Waypoint 1.mat	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2fe5af6e1aa0bc2f5075138d0f669e1c52b01d93711ae80d0a4b1e6ca7a9125
-size 2059
+oid sha256:ebce9ff9ef02d8909fed8e3c34b5e0488fd9eeb7cbd7f25a1c5edaa24c11a2ad
+size 2057
diff --git a/Assets/Scenes/Local Simulator.unity b/Assets/Scenes/Local Simulator.unity
new file mode 100644
index 0000000..a8183cf
--- /dev/null
+++ b/Assets/Scenes/Local Simulator.unity	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:beb0b3e011b6bc347e0e10b0e434f172979f17a4b2b6444f32b926a5e9d53087
+size 56814
diff --git a/Assets/Scenes/Local Simulator.unity.meta b/Assets/Scenes/Local Simulator.unity.meta
new file mode 100644
index 0000000..ba2196e
--- /dev/null
+++ b/Assets/Scenes/Local Simulator.unity.meta	
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 353465e664c68874fad1ff3f4675237a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Game Management/GameManager.cs b/Assets/Scripts/Game Management/GameManager.cs
index 36e1334..dd03ebd 100644
--- a/Assets/Scripts/Game Management/GameManager.cs	
+++ b/Assets/Scripts/Game Management/GameManager.cs	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c81782378bebe242a7d7d7ab0bb9aa961e949cf38991273edf335c5a5cab503
-size 1879
+oid sha256:42356d43cad6396ea918580afcdce9c9dd7814948e96a26d3dd3f4cdb2b4be0c
+size 2910
diff --git a/Assets/Scripts/Game Management/Host Stats Tracker.cs b/Assets/Scripts/Game Management/Host Stats Tracker.cs
index a9c6b7a..bb3f384 100644
--- a/Assets/Scripts/Game Management/Host Stats Tracker.cs	
+++ b/Assets/Scripts/Game Management/Host Stats Tracker.cs	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f640a7aadbe7d4fac95671a75d7d826dd8216d88ea9cc33e7655dd39a850bda8
-size 690
+oid sha256:6b26521c11df72d49e7f6aa0a75ee1cbb635856171c1877982977fef745c5a9c
+size 835
diff --git a/Assets/Scripts/Game Management/ObjectiveManager.cs b/Assets/Scripts/Game Management/ObjectiveManager.cs
new file mode 100644
index 0000000..638b27d
--- /dev/null
+++ b/Assets/Scripts/Game Management/ObjectiveManager.cs	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b930f921436653aef446248c9a1bfaba84315c9ba4181e63328e7ad59ee96adb
+size 1715
diff --git a/Assets/Scripts/Objectives/ObjectiveManager.cs.meta b/Assets/Scripts/Game Management/ObjectiveManager.cs.meta
similarity index 100%
rename from Assets/Scripts/Objectives/ObjectiveManager.cs.meta
rename to Assets/Scripts/Game Management/ObjectiveManager.cs.meta
diff --git a/Assets/Scripts/Game Management/SpawnPoint.cs b/Assets/Scripts/Game Management/SpawnPoint.cs
new file mode 100644
index 0000000..d0f705e
--- /dev/null
+++ b/Assets/Scripts/Game Management/SpawnPoint.cs	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3070492bd3c8fef036cd1a3482837137d4a39595ee6d6f3df594f9ac817dcc3
+size 286
diff --git a/Assets/Scripts/Game Management/SpawnPoint.cs.meta b/Assets/Scripts/Game Management/SpawnPoint.cs.meta
new file mode 100644
index 0000000..5b02b7b
--- /dev/null
+++ b/Assets/Scripts/Game Management/SpawnPoint.cs.meta	
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9bc0a00d930e6e84bae5638ed9662f1b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Objectives/IObjective.cs b/Assets/Scripts/Objectives/IObjective.cs
index d61a59d..4832ffb 100644
--- a/Assets/Scripts/Objectives/IObjective.cs
+++ b/Assets/Scripts/Objectives/IObjective.cs
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3b52db27de92f9a9ec97dfb6487c3bbfabac6f359f15306d453b82ef277210e
-size 458
+oid sha256:9c1b1bc8101aa90a8dd7b9cfa1b37dfe49fcedb0e4ba12c67d958e91cfad9839
+size 501
diff --git a/Assets/Scripts/Objectives/Ob_Hold.cs b/Assets/Scripts/Objectives/Ob_Hold.cs
new file mode 100644
index 0000000..11efdc1
--- /dev/null
+++ b/Assets/Scripts/Objectives/Ob_Hold.cs
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aae7ee5d1d61d80553d2a1db5c1c06bb17d456487cf84eae738a348d36a3a69b
+size 312
diff --git a/Assets/Scripts/Objectives/Ob_Hold.cs.meta b/Assets/Scripts/Objectives/Ob_Hold.cs.meta
new file mode 100644
index 0000000..77e6238
--- /dev/null
+++ b/Assets/Scripts/Objectives/Ob_Hold.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 877dc5d98d5e46143b38e50d71f457b6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Objectives/Ob_Kills.cs b/Assets/Scripts/Objectives/Ob_Kills.cs
index 9214833..f52fa31 100644
--- a/Assets/Scripts/Objectives/Ob_Kills.cs
+++ b/Assets/Scripts/Objectives/Ob_Kills.cs
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da74bd5f241d1ddf39c14fa7da6d5c8e1851a385c2c6adbc8f96428ae73644a4
-size 638
+oid sha256:bab928c65c20e904d5b35ae18b4bc8ae178f14594197068fdf0bb85c30918130
+size 728
diff --git a/Assets/Scripts/Objectives/Ob_Waypoints.cs b/Assets/Scripts/Objectives/Ob_Waypoints.cs
index b9df69f..2dbdb99 100644
--- a/Assets/Scripts/Objectives/Ob_Waypoints.cs
+++ b/Assets/Scripts/Objectives/Ob_Waypoints.cs
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c36588675321f627279e3b7bb61041b7eafd6494621a838221cb6dd1bbb28f52
-size 2008
+oid sha256:c7daa4f57d50bac00028352086f4d302b488baa066c4f96956bd9089f6284dcf
+size 2495
diff --git a/Assets/Scripts/Objectives/ObjectiveManager.cs b/Assets/Scripts/Objectives/ObjectiveManager.cs
deleted file mode 100644
index ba0b0b1..0000000
--- a/Assets/Scripts/Objectives/ObjectiveManager.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9224a9691e43627a04c216fd040bf298832be7cb127c5317dc6d3ead072fb0f0
-size 1130
diff --git a/Assets/Scripts/Objectives/Prefabs.meta b/Assets/Scripts/Objectives/Prefabs.meta
new file mode 100644
index 0000000..f8d997f
--- /dev/null
+++ b/Assets/Scripts/Objectives/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5846b503ce6859345b887743ec9cb79c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab b/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab
new file mode 100644
index 0000000..99e8e67
--- /dev/null
+++ b/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a929d6f4a45b4b4193071216844e8cff7416339958d1a6a9beb188f3796334a
+size 1311
diff --git a/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab.meta b/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab.meta
new file mode 100644
index 0000000..d4ce302
--- /dev/null
+++ b/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e4278a1b185a6ec4facb3b22f29b909e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab b/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab
new file mode 100644
index 0000000..32e5847
--- /dev/null
+++ b/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcadb595d80224e567ae3427dedbb14627252b9b410d96a29f0914297f23bb58
+size 1319
diff --git a/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab.meta b/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab.meta
new file mode 100644
index 0000000..ca952e5
--- /dev/null
+++ b/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 01b3cb5c8e917db428f35e73152deaa9
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Objectives/Waypoint.cs b/Assets/Scripts/Objectives/Waypoint.cs
index 1987571..4544a79 100644
--- a/Assets/Scripts/Objectives/Waypoint.cs
+++ b/Assets/Scripts/Objectives/Waypoint.cs
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5880a07836f751a1d721d649edf318caa330cfa402bddfb921bd78d942dd7121
-size 683
+oid sha256:690bed6dbdf7a2de9cb690a525a8d685657ac36eb77815f24bed0f5220b4324f
+size 755
diff --git a/Assets/Scripts/Objectives/arrow-sketchup-yz-y.obj.meta b/Assets/Scripts/Objectives/arrow-sketchup-yz-y.obj.meta
new file mode 100644
index 0000000..6d357b0
--- /dev/null
+++ b/Assets/Scripts/Objectives/arrow-sketchup-yz-y.obj.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 8df21cc64a497e949ba48920d8d57322
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: //RootNode
+    100002: default
+    400000: //RootNode
+    400002: default
+    2100000: defaultMat
+    2300000: default
+    3300000: default
+    4300000: default
+  externalObjects: {}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    previousCalculatedGlobalScale: 1
+    hasPreviousCalculatedGlobalScale: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: