diff --git a/.gitmodules b/.gitmodules
index c3f4ac9..fbb2b39 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "sond-bevy-particles"]
 	path = sond-bevy-particles
 	url = git@github.com:Waridley/bevy-particles.git
+[submodule "leafwing_abilities"]
+	path = leafwing_abilities
+	url = git@github.com:k-specht/leafwing_abilities.git
diff --git a/.idea/runConfigurations/Build__debug_.xml b/.idea/runConfigurations/Build__debug_.xml
deleted file mode 100644
index 67be387..0000000
--- a/.idea/runConfigurations/Build__debug_.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build (debug)" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="build --package sond-has --bin sond-has --features=&quot;bevy/dynamic_linking&quot;" />
-    <option name="workingDirectory" value="file://$PROJECT_DIR$/rs" />
-    <option name="emulateTerminal" value="false" />
-    <option name="channel" value="DEFAULT" />
-    <option name="requiredFeatures" value="false" />
-    <option name="allFeatures" value="false" />
-    <option name="withSudo" value="false" />
-    <option name="buildTarget" value="REMOTE" />
-    <option name="backtrace" value="SHORT" />
-    <envs />
-    <option name="isRedirectInput" value="false" />
-    <option name="redirectInputPath" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run__debug_.xml b/.idea/runConfigurations/Run__debug_.xml
index 5c6ed2b..da4ea12 100644
--- a/.idea/runConfigurations/Run__debug_.xml
+++ b/.idea/runConfigurations/Run__debug_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run (debug)" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --package sond-has --bin sond-has" />
+    <option name="command" value="run --profile=&quot;desktop&quot; --package sond-has --bin sond-has --features=&quot;bevy/file_watcher,bevy/asset_processor&quot;" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$/rs" />
     <option name="emulateTerminal" value="false" />
     <option name="channel" value="DEFAULT" />
diff --git a/.idea/runConfigurations/Run__release_.xml b/.idea/runConfigurations/Run__release_.xml
index 9b73e04..2867fb4 100644
--- a/.idea/runConfigurations/Run__release_.xml
+++ b/.idea/runConfigurations/Run__release_.xml
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run (release)" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --release --package sond-has --bin sond-has" />
+    <option name="command" value="run --profile=&quot;desktop-release&quot; --package sond-has --bin sond-has" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$/rs" />
+    <option name="emulateTerminal" value="false" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
     <option name="allFeatures" value="false" />
-    <option name="emulateTerminal" value="false" />
     <option name="withSudo" value="false" />
     <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
diff --git a/.idea/runConfigurations/Test.xml b/.idea/runConfigurations/Test.xml
index 59ef23f..b19e2ae 100644
--- a/.idea/runConfigurations/Test.xml
+++ b/.idea/runConfigurations/Test.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Test" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="test --no-default-features --features=&quot;testing&quot;" />
+    <option name="command" value="test --profile=&quot;desktop&quot; --no-default-features --features=&quot;testing&quot;" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$/rs" />
     <option name="emulateTerminal" value="true" />
     <option name="channel" value="DEFAULT" />
@@ -12,8 +12,6 @@
     <envs />
     <option name="isRedirectInput" value="false" />
     <option name="redirectInputPath" value="" />
-    <method v="2">
-      <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
-    </method>
+    <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Visual_Tests.xml b/.idea/runConfigurations/Visual_Tests.xml
index 2ca6222..679c02b 100644
--- a/.idea/runConfigurations/Visual_Tests.xml
+++ b/.idea/runConfigurations/Visual_Tests.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Visual Tests" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="test --features=&quot;vis_test&quot;" />
+    <option name="command" value="test --profile=&quot;desktop&quot; --features=&quot;vis_test&quot;" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$/rs" />
     <option name="emulateTerminal" value="true" />
     <option name="channel" value="DEFAULT" />
@@ -12,8 +12,6 @@
     <envs />
     <option name="isRedirectInput" value="false" />
     <option name="redirectInputPath" value="" />
-    <method v="2">
-      <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
-    </method>
+    <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Web.xml b/.idea/runConfigurations/Web.xml
new file mode 100644
index 0000000..41ad73d
--- /dev/null
+++ b/.idea/runConfigurations/Web.xml
@@ -0,0 +1,5 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Web" type="JavascriptDebugType" uri="http://localhost:63342/has/rs/dist/index.html" useBuiltInWebServerPort="true">
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/clippy.xml b/.idea/runConfigurations/clippy.xml
index 96e0e99..ef6f6b9 100644
--- a/.idea/runConfigurations/clippy.xml
+++ b/.idea/runConfigurations/clippy.xml
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="clippy" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="clippy --workspace --all-targets --all-features" />
+    <option name="command" value="clippy --workspace --all-targets --all-features --profile=&quot;desktop&quot;" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$/rs" />
+    <option name="emulateTerminal" value="false" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
     <option name="allFeatures" value="false" />
-    <option name="emulateTerminal" value="false" />
     <option name="withSudo" value="false" />
     <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
diff --git a/.idea/runConfigurations/rustfmt.xml b/.idea/runConfigurations/rustfmt.xml
index 6b729f3..3030f39 100644
--- a/.idea/runConfigurations/rustfmt.xml
+++ b/.idea/runConfigurations/rustfmt.xml
@@ -2,18 +2,16 @@
   <configuration default="false" name="rustfmt" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="command" value="fmt --all" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$/rs" />
+    <option name="emulateTerminal" value="false" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
     <option name="allFeatures" value="false" />
-    <option name="emulateTerminal" value="false" />
     <option name="withSudo" value="false" />
     <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
     <envs />
     <option name="isRedirectInput" value="false" />
     <option name="redirectInputPath" value="" />
-    <method v="2">
-      <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
-    </method>
+    <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/trunk_build__release_.xml b/.idea/runConfigurations/trunk_build__release_.xml
new file mode 100644
index 0000000..8f2fc10
--- /dev/null
+++ b/.idea/runConfigurations/trunk_build__release_.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="trunk build (release)" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="trunk build --release" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/rs" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/trunk_serve__LAN___debug_.xml b/.idea/runConfigurations/trunk_serve__LAN___debug_.xml
new file mode 100644
index 0000000..30e85c4
--- /dev/null
+++ b/.idea/runConfigurations/trunk_serve__LAN___debug_.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="trunk serve (LAN) (debug)" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="trunk serve --public-url=&quot;/&quot; --open --address=&quot;0.0.0.0&quot;" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/rs" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/trunk_serve__debug_.xml b/.idea/runConfigurations/trunk_serve__debug_.xml
new file mode 100644
index 0000000..667d1f5
--- /dev/null
+++ b/.idea/runConfigurations/trunk_serve__debug_.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="trunk serve (debug)" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="trunk serve --public-url=&quot;/&quot; --open" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/rs" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/trunk_watch__debug_.xml b/.idea/runConfigurations/trunk_watch__debug_.xml
new file mode 100644
index 0000000..5561cfc
--- /dev/null
+++ b/.idea/runConfigurations/trunk_watch__debug_.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="trunk watch (debug)" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="trunk watch" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/rs" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/web__debug_.xml b/.idea/runConfigurations/web__debug_.xml
deleted file mode 100644
index 306ab49..0000000
--- a/.idea/runConfigurations/web__debug_.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="web (debug)" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --target wasm32-unknown-unknown" />
-    <option name="workingDirectory" value="file://$PROJECT_DIR$/rs" />
-    <option name="channel" value="DEFAULT" />
-    <option name="requiredFeatures" value="true" />
-    <option name="allFeatures" value="false" />
-    <option name="emulateTerminal" value="false" />
-    <option name="withSudo" value="false" />
-    <option name="buildTarget" value="REMOTE" />
-    <option name="backtrace" value="SHORT" />
-    <envs />
-    <option name="isRedirectInput" value="false" />
-    <option name="redirectInputPath" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/web__release_.xml b/.idea/runConfigurations/web__release_.xml
deleted file mode 100644
index 7b384ff..0000000
--- a/.idea/runConfigurations/web__release_.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="web (release)" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --release --target wasm32-unknown-unknown" />
-    <option name="workingDirectory" value="file://$PROJECT_DIR$/rs" />
-    <option name="channel" value="DEFAULT" />
-    <option name="requiredFeatures" value="true" />
-    <option name="allFeatures" value="false" />
-    <option name="emulateTerminal" value="false" />
-    <option name="withSudo" value="false" />
-    <option name="buildTarget" value="REMOTE" />
-    <option name="backtrace" value="SHORT" />
-    <envs />
-    <option name="isRedirectInput" value="false" />
-    <option name="redirectInputPath" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/bevy_rapier b/bevy_rapier
index b310bfe..fdf7172 160000
--- a/bevy_rapier
+++ b/bevy_rapier
@@ -1 +1 @@
-Subproject commit b310bfe60768727f3390213c733ccb6c132bc702
+Subproject commit fdf71724f1ac45c1fe26d0e67ba41c52b960407c
diff --git a/leafwing_abilities b/leafwing_abilities
new file mode 160000
index 0000000..9771159
--- /dev/null
+++ b/leafwing_abilities
@@ -0,0 +1 @@
+Subproject commit 9771159679ab16c8c65fb255a0d6a35fcc388fcd
diff --git a/promo/screenshots/pretty_sky.png b/promo/screenshots/pretty_sky.png
new file mode 100644
index 0000000..f2df5cf
--- /dev/null
+++ b/promo/screenshots/pretty_sky.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c63cd3fb0e29565479f5453f57b25a6a216fdb2606e497dcd5c32fda9054272d
+size 3341907
diff --git a/rs/.cargo/config.toml b/rs/.cargo/config.toml
index 39c16a8..2e72bdd 100644
--- a/rs/.cargo/config.toml
+++ b/rs/.cargo/config.toml
@@ -17,9 +17,6 @@ rustflags = ["-C", "link-arg=-fuse-ld=/opt/homebrew/bin/zld", "-Zshare-generics=
 linker = "rust-lld.exe"
 rustflags = ["-Zshare-generics=n"]
 
-[target.wasm32-unknown-unknown]
-runner = "wasm-server-runner"
-
 # Optional: Uncommenting the following improves compile times, but reduces the amount of debug info to 'line number tables only'
 # In most cases the gains are negligible, but if you are on macos and have slow compile times you should see significant gains.
 #[profile.dev]
diff --git a/rs/.gitignore b/rs/.gitignore
index 162a06c..76b70b0 100644
--- a/rs/.gitignore
+++ b/rs/.gitignore
@@ -1,2 +1,3 @@
 target/
-dist/
\ No newline at end of file
+dist/
+imported_assets/
\ No newline at end of file
diff --git a/rs/Cargo.lock b/rs/Cargo.lock
index 504d1a7..115fb8f 100644
--- a/rs/Cargo.lock
+++ b/rs/Cargo.lock
@@ -20,24 +20,24 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.11.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8"
+checksum = "ca8410747ed85a17c4a1e9ed3f5a74d3e7bdcc876cf9a18ff40ae21d645997b2"
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.15.2"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00"
+checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6"
 dependencies = [
  "accesskit",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56"
+checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -47,23 +47,23 @@ dependencies = [
 
 [[package]]
 name = "accesskit_windows"
-version = "0.14.3"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31"
+checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
- "arrayvec",
  "once_cell",
  "paste",
+ "static_assertions",
  "windows 0.48.0",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.14.4"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0"
+checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -190,6 +190,18 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "array-init"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc"
+
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -205,6 +217,16 @@ dependencies = [
  "libloading 0.7.4",
 ]
 
+[[package]]
+name = "async-broadcast"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
+dependencies = [
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -218,29 +240,41 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0"
+checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c"
 dependencies = [
- "async-lock",
+ "async-lock 3.1.2",
  "async-task",
  "concurrent-queue",
  "fastrand 2.0.1",
- "futures-lite",
+ "futures-lite 2.1.0",
  "slab",
 ]
 
+[[package]]
+name = "async-fs"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
+dependencies = [
+ "async-lock 2.8.0",
+ "autocfg",
+ "blocking",
+ "futures-lite 1.13.0",
+]
+
 [[package]]
 name = "async-io"
 version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
 dependencies = [
- "async-lock",
+ "async-lock 2.8.0",
  "autocfg",
  "cfg-if",
  "concurrent-queue",
- "futures-lite",
+ "futures-lite 1.13.0",
  "log",
  "parking",
  "polling 2.8.0",
@@ -256,11 +290,11 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10da8f3146014722c89e7859e1d7bb97873125d7346d10ca642ffab794355828"
 dependencies = [
- "async-lock",
+ "async-lock 2.8.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite",
+ "futures-lite 1.13.0",
  "parking",
  "polling 3.3.0",
  "rustix 0.38.21",
@@ -279,6 +313,17 @@ dependencies = [
  "event-listener 2.5.3",
 ]
 
+[[package]]
+name = "async-lock"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dea8b3453dd7cc96711834b75400d671b73e3656975fa68d9f277163b7f7e316"
+dependencies = [
+ "event-listener 4.0.0",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-process"
 version = "1.8.1"
@@ -286,12 +331,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
 dependencies = [
  "async-io 1.13.0",
- "async-lock",
+ "async-lock 2.8.0",
  "async-signal",
  "blocking",
  "cfg-if",
  "event-listener 3.0.1",
- "futures-lite",
+ "futures-lite 1.13.0",
  "rustix 0.38.21",
  "windows-sys 0.48.0",
 ]
@@ -303,7 +348,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
 dependencies = [
  "async-io 2.1.0",
- "async-lock",
+ "async-lock 2.8.0",
  "atomic-waker",
  "cfg-if",
  "futures-core",
@@ -367,18 +412,18 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "bevy"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7"
+checksum = "e4bc7e09282a82a48d70ade0c4c1154b0fd7882a735a39c66766a5d0f4718ea9"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy_a11y"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42"
+checksum = "68080288c932634f6563d3a8299efe0ddc9ea6787539c4c771ba250d089a94f0"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -388,9 +433,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_animation"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44eae3f1c35a87e38ad146f72317f19ce7616dad8bbdfb88ee752c1282d28c5"
+checksum = "7aa37683b1281e1ba8cf285644e6e3f0704f14b3901c5ee282067ff7ff6f4a56"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -407,9 +452,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531"
+checksum = "d41731817993f92e4363dd3335558e779e290bc71eefc0b5547052b85810907e"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -423,26 +468,30 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68"
+checksum = "935984568f75867dd7357133b06f4b1502cd2be55e4642d483ce597e46e63bff"
 dependencies = [
- "anyhow",
- "async-channel",
+ "async-broadcast",
+ "async-fs",
+ "async-lock 2.8.0",
  "bevy_app",
- "bevy_diagnostic",
+ "bevy_asset_macros",
  "bevy_ecs",
  "bevy_log",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
  "bevy_winit",
+ "blake3",
  "crossbeam-channel",
  "downcast-rs",
- "fastrand 1.9.0",
+ "futures-io",
+ "futures-lite 1.13.0",
  "js-sys",
- "notify",
+ "notify-debouncer-full",
  "parking_lot",
+ "ron",
  "serde",
  "thiserror",
  "wasm-bindgen",
@@ -450,13 +499,24 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "bevy_asset_macros"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f48b9bbe4ec605e4910b5cd1e1a0acbfbe0b80af5f3bcc4489a9fdd1e80058c"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "bevy_audio"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de308bd63a2f7a0b77ffeb7cf00cc185ec01393c5db2091fe03964f97152749"
+checksum = "18a69889e1bfa4dbac4e641536b94f91c441da55796ad9832e77836b8264688b"
 dependencies = [
- "anyhow",
  "bevy_app",
  "bevy_asset",
  "bevy_derive",
@@ -466,27 +526,27 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "oboe",
- "parking_lot",
  "rodio",
 ]
 
 [[package]]
 name = "bevy_common_assets"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0e5659f20aeaa1703e76d87c62d66f92aaa56e431fbed71bb38345b576aa6f0"
+checksum = "9397adf1558aa3f08e20aa567538a7238b451362fc8c6b678d409c040c221799"
 dependencies = [
  "anyhow",
  "bevy",
  "ron",
  "serde",
+ "thiserror",
 ]
 
 [[package]]
 name = "bevy_core"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48"
+checksum = "3daa24502a14839509f02407bc7e48299fe84d260877de23b60662de0f4f4b6c"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -500,15 +560,16 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3"
+checksum = "b4b77c4fca6e90edbe2e72da7bc9aa7aed7dfdfded0920ae0a0c845f5e11084a"
 dependencies = [
  "bevy_app",
  "bevy_asset",
  "bevy_core",
  "bevy_derive",
  "bevy_ecs",
+ "bevy_log",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
@@ -521,9 +582,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e"
+checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500"
 dependencies = [
  "bevy_macro_utils",
  "quote",
@@ -532,9 +593,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e"
+checksum = "fa38ca5967d335cc1006a0e0f1a86c350e2f15fd1878449f61d04cd57a7c4060"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -547,9 +608,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6"
+checksum = "7709fbd22f81fb681534cd913c41e1cd18b17143368743281195d7f024b61aea"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -568,9 +629,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80"
+checksum = "a8843aa489f159f25cdcd9fee75cd7d221a7098a71eaa72cb2d6b40ac4e3f1ba"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -580,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001"
+checksum = "5328a3715e933ebbff07d0e99528dc423c4f7a53590ed1ac19a120348b028990"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -590,9 +651,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b"
+checksum = "9b81ca2ebf66cbc7f998f1f142b15038ffe3c4ae1d51f70adda26dcf51b0c4ca"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -606,9 +667,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2"
+checksum = "db232274ddca2ae452eb2731b98267b795d133ddd14013121bc7daddde1c7491"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -626,11 +687,10 @@ dependencies = [
 
 [[package]]
 name = "bevy_gltf"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f07494a733dca032e71a20f4b1f423de765da49cbff34406ae6cd813f9b50c41"
+checksum = "85adc6b1fc86687bf67149e0bafaa4d6da432232fa956472d1b37f19121d3ace"
 dependencies = [
- "anyhow",
  "base64 0.13.1",
  "bevy_animation",
  "bevy_app",
@@ -657,9 +717,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d"
+checksum = "06bd477152ce2ae1430f5e0a4f19216e5785c22fee1ab23788b5982dc59d1a55"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -672,9 +732,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc"
+checksum = "cab9a599189b2a694c182d60cd52219dd9364f9892ff542d87799b8e45d9e6dc"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -687,9 +747,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e"
+checksum = "f124bece9831afd80897815231072d51bfe3ac58c6bb58eca8880963b6d0487c"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -726,22 +786,23 @@ dependencies = [
 
 [[package]]
 name = "bevy_kira_audio"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db07967c1370395b617ec87aea116e943911e046e87fd075a0231a50be2c823f"
+checksum = "9a9678086759e54871faab0829592423492e19f8de5076127315cf892ae56f33"
 dependencies = [
  "anyhow",
  "bevy",
  "kira",
  "parking_lot",
  "thiserror",
+ "uuid",
 ]
 
 [[package]]
 name = "bevy_log"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe"
+checksum = "0dc10ba1d225a8477b9e80a1bf797d8a8b8274e83c9b24fb4d9351aec9229755"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -755,21 +816,22 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981"
+checksum = "e566640c6b6dced73d2006c764c2cffebe1a82be4809486c4a5d7b4b50efed4d"
 dependencies = [
+ "proc-macro2",
  "quote",
  "rustc-hash",
  "syn 2.0.38",
- "toml_edit",
+ "toml_edit 0.20.7",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b"
+checksum = "58ddc2b76783939c530178f88e5711a1b01044d7b02db4033e2eb8b43b6cf4ec"
 dependencies = [
  "glam",
  "serde",
@@ -777,18 +839,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497"
+checksum = "8ec4962977a746d870170532fc92759e04d3dbcae8b7b82e7ca3bb83b1d75277"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85"
+checksum = "520bfd2a898c74f84ea52cfb8eb061f37373ad15e623489d5f75d27ebd6138fe"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -803,15 +865,18 @@ dependencies = [
  "bevy_window",
  "bitflags 2.4.1",
  "bytemuck",
+ "fixedbitset",
  "naga_oil",
  "radsort",
+ "smallvec",
+ "thread_local",
 ]
 
 [[package]]
 name = "bevy_pkv"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e0e807560d0660c1e54b139e05ad03cff3ec5773fd87baaaafef0cd3317d73"
+checksum = "3244c1ecb6931888e9ebb8d4424ec0b12aa9fa405f82f6a58b6b7695f2a7847c"
 dependencies = [
  "bevy_ecs",
  "cfg_aliases",
@@ -827,35 +892,28 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6"
-
-[[package]]
-name = "bevy_quickmenu"
-version = "0.2.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "768195e32757a643c7c110a2ac8568e44e871838b3768c41ea93401c3d4642d5"
-dependencies = [
- "bevy",
-]
+checksum = "c77ec20c8fafcdc196508ef5ccb4f0400a8d193cb61f7b14a36ed9a25ad423cf"
 
 [[package]]
 name = "bevy_rapier3d"
-version = "0.22.0"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3f0a2641af76c9eb17da0dcb0fb20cd9d615b93b67be0b85f1867487e956b5a"
 dependencies = [
  "bevy",
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "log",
- "nalgebra 0.32.3",
+ "nalgebra",
  "rapier3d",
 ]
 
 [[package]]
 name = "bevy_reflect"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5"
+checksum = "d7921f15fc944c9c8ad01d7dbcea6505b8909c6655cd9382bab1407181556038"
 dependencies = [
  "bevy_math",
  "bevy_ptr",
@@ -864,8 +922,6 @@ dependencies = [
  "downcast-rs",
  "erased-serde",
  "glam",
- "once_cell",
- "parking_lot",
  "serde",
  "smallvec",
  "smol_str",
@@ -874,12 +930,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528"
+checksum = "b4a8c5475f216e751ef4452a1306b00711f33d2d04d9f149e4c845dfeb6753a0"
 dependencies = [
  "bevy_macro_utils",
- "bit-set",
  "proc-macro2",
  "quote",
  "syn 2.0.38",
@@ -888,11 +943,10 @@ dependencies = [
 
 [[package]]
 name = "bevy_render"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb"
+checksum = "bdefdd3737125b0d94a6ff20bb70fa8cfe9d7d5dcd72ba4dfe6c5f1d30d9f6e4"
 dependencies = [
- "anyhow",
  "async-channel",
  "bevy_app",
  "bevy_asset",
@@ -916,15 +970,13 @@ dependencies = [
  "codespan-reporting",
  "downcast-rs",
  "encase",
- "futures-lite",
+ "futures-lite 1.13.0",
  "hexasphere",
  "image",
  "js-sys",
  "ktx2",
  "naga",
  "naga_oil",
- "parking_lot",
- "regex",
  "ruzstd",
  "serde",
  "smallvec",
@@ -933,14 +985,13 @@ dependencies = [
  "wasm-bindgen",
  "web-sys",
  "wgpu",
- "wgpu-hal",
 ]
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9"
+checksum = "64d86bfc5a1e7fbeeaec0c4ceab18155530f5506624670965db3415f75826bea"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -950,11 +1001,10 @@ dependencies = [
 
 [[package]]
 name = "bevy_scene"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681"
+checksum = "e7df078b5e406e37c8a1c6ba0d652bf105fde713ce3c3efda7263fe27467eee5"
 dependencies = [
- "anyhow",
  "bevy_app",
  "bevy_asset",
  "bevy_derive",
@@ -972,9 +1022,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397"
+checksum = "c7cc0c9d946e17e3e0aaa202f182837bc796c4f862b2e5a805134f873f21cf7f"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -991,32 +1041,32 @@ dependencies = [
  "bytemuck",
  "fixedbitset",
  "guillotiere",
+ "radsort",
  "rectangle-pack",
  "thiserror",
 ]
 
 [[package]]
 name = "bevy_tasks"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf"
+checksum = "f4fefa7fe0da8923525f7500e274f1bd60dbd79918a25cf7d0dfa0a6ba15c1cf"
 dependencies = [
  "async-channel",
  "async-executor",
  "async-task",
  "concurrent-queue",
- "futures-lite",
+ "futures-lite 1.13.0",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355"
+checksum = "3a9a79d49ca06170d69149949b134c14e8b99ace1444c1ca2cd4743b19d5b055"
 dependencies = [
  "ab_glyph",
- "anyhow",
  "bevy_app",
  "bevy_asset",
  "bevy_ecs",
@@ -1034,9 +1084,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d"
+checksum = "e6250d76eed3077128b6a3d004f9f198b01107800b9824051e32bb658054e837"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1049,9 +1099,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4"
+checksum = "d541e0c292edbd96afae816ee680e02247422423ccd5dc635c1e211a20ed64be"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1059,13 +1109,14 @@ dependencies = [
  "bevy_math",
  "bevy_reflect",
  "serde",
+ "thiserror",
 ]
 
 [[package]]
 name = "bevy_ui"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b6d295a755e5b79e869a09e087029d72974562a521ec7ccfba7141fa948a32"
+checksum = "d785e3b75dabcb2a8ad0d50933f8f3446d59e512cabc2d2a145e28c2bb8792ba"
 dependencies = [
  "bevy_a11y",
  "bevy_app",
@@ -1093,15 +1144,16 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7"
+checksum = "7915222f4a08ccc782e08d10b751b42e5f9d786e697d0cb3fd09333cb7e8b6ea"
 dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
  "getrandom 0.2.10",
  "hashbrown 0.14.2",
  "instant",
+ "nonmax",
  "petgraph",
  "thiserror",
  "tracing",
@@ -1110,9 +1162,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57"
+checksum = "7aafecc952b6b8eb1a93c12590bd867d25df2f4ae1033a01dfdfc3c35ebccfff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1121,10 +1173,11 @@ dependencies = [
 
 [[package]]
 name = "bevy_window"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944"
+checksum = "41ee72bf7f974000e9b31bb971a89387f1432ba9413f35c4fef59fef49767260"
 dependencies = [
+ "bevy_a11y",
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
@@ -1137,9 +1190,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_winit"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53"
+checksum = "1eb71f287eca9006dda998784c7b931e400ae2cc4c505da315882a8b082f21ad"
 dependencies = [
  "accesskit_winit",
  "approx",
@@ -1194,6 +1247,9 @@ name = "bit-vec"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "bitflags"
@@ -1210,6 +1266,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "blake3"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -1242,11 +1311,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a"
 dependencies = [
  "async-channel",
- "async-lock",
+ "async-lock 2.8.0",
  "async-task",
  "fastrand 2.0.1",
  "futures-io",
- "futures-lite",
+ "futures-lite 1.13.0",
  "piper",
  "tracing",
 ]
@@ -1411,6 +1480,12 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff"
 
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
 [[package]]
 name = "constgebra"
 version = "0.1.3"
@@ -1460,7 +1535,7 @@ dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
  "libc",
 ]
 
@@ -1598,12 +1673,12 @@ dependencies = [
 
 [[package]]
 name = "d3d12"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
+checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
 dependencies = [
- "bitflags 1.3.2",
- "libloading 0.7.4",
+ "bitflags 2.4.1",
+ "libloading 0.8.1",
  "winapi",
 ]
 
@@ -1763,6 +1838,27 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "event-listener"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+dependencies = [
+ "event-listener 4.0.0",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -1787,6 +1883,15 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "file-id"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.22"
@@ -1827,7 +1932,28 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1836,6 +1962,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -1872,6 +2004,19 @@ dependencies = [
  "waker-fn",
 ]
 
+[[package]]
+name = "futures-lite"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143"
+dependencies = [
+ "fastrand 2.0.1",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -2012,21 +2157,21 @@ dependencies = [
 
 [[package]]
 name = "gpu-alloc"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "gpu-alloc-types",
 ]
 
 [[package]]
 name = "gpu-alloc-types"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
 ]
 
 [[package]]
@@ -2296,9 +2441,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2371,9 +2516,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "leafwing-input-manager"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b56a6f71e8f5beefc8d3841ffa6ea9bbb1123956fa7c75fd673e69b65a8ca62f"
+checksum = "5f5730f7b7b516b7ede475443aca506769e7527b576975133d97d6d912ece4d2"
 dependencies = [
  "bevy",
  "derive_more",
@@ -2388,8 +2533,6 @@ dependencies = [
 [[package]]
 name = "leafwing_abilities"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1930cd3cba93e895a3837965c9591c600eddd09c703d90a289c663413747c8f6"
 dependencies = [
  "bevy",
  "derive_more",
@@ -2402,10 +2545,8 @@ dependencies = [
 [[package]]
 name = "leafwing_abilities_macros"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb5add9f03e9a0d583ff49ece51c555efd93d1f5c59816f15dc8ce8804d4e0a1"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -2413,14 +2554,14 @@ dependencies = [
 
 [[package]]
 name = "leafwing_input_manager_macros"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11aefabfcc9ef0a78bc97eea053d2f1bb050d5278a4134bdc1b769064a90064a"
+checksum = "cde8ae98d45607e4015d0b772d4a234788ebd7a41f09879f408c7f772b81e5bf"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2558,16 +2699,17 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
+checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "block",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "log",
  "objc",
+ "paste",
 ]
 
 [[package]]
@@ -2606,12 +2748,12 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
+checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
 dependencies = [
  "bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "codespan-reporting",
  "hexf-parse",
  "indexmap 1.9.3",
@@ -2627,9 +2769,9 @@ dependencies = [
 
 [[package]]
 name = "naga_oil"
-version = "0.8.2"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b"
+checksum = "a1fa9518ff79ae8a98c3abe3897d873a85561d1b5642981c2245c1c4b9b2429d"
 dependencies = [
  "bit-set",
  "codespan-reporting",
@@ -2638,29 +2780,13 @@ dependencies = [
  "naga",
  "once_cell",
  "regex",
- "regex-syntax 0.6.29",
+ "regex-syntax 0.7.5",
  "rustc-hash",
  "thiserror",
  "tracing",
  "unicode-ident",
 ]
 
-[[package]]
-name = "nalgebra"
-version = "0.31.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20bd243ab3dbb395b39ee730402d2e5405e448c75133ec49cc977762c4cba3d1"
-dependencies = [
- "approx",
- "matrixmultiply",
- "nalgebra-macros 0.1.0",
- "num-complex",
- "num-rational",
- "num-traits",
- "simba 0.7.3",
- "typenum",
-]
-
 [[package]]
 name = "nalgebra"
 version = "0.32.3"
@@ -2670,37 +2796,15 @@ dependencies = [
  "approx",
  "glam",
  "matrixmultiply",
- "nalgebra-macros 0.2.1",
+ "nalgebra-macros",
  "num-complex",
  "num-rational",
  "num-traits",
- "simba 0.8.1",
+ "serde",
+ "simba",
  "typenum",
 ]
 
-[[package]]
-name = "nalgebra-glm"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8e68654c920c582d34a4180c527ce2acf9ec8c695363681ff42acde46239d43"
-dependencies = [
- "approx",
- "nalgebra 0.31.4",
- "num-traits",
- "simba 0.7.3",
-]
-
-[[package]]
-name = "nalgebra-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "nalgebra-macros"
 version = "0.2.1"
@@ -2779,20 +2883,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ba869e17168793186c10ca82c7079a4ffdeac4f1a7d9e755b9491c028180e40"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.7.3",
  "rand_xorshift",
 ]
 
-[[package]]
-name = "noises-and-patterns"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4489ef1a49ebc802c1f872fb00ecff684a318a3291d10fd292c89962c76493ca"
-dependencies = [
- "nalgebra 0.31.4",
- "nalgebra-glm",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2803,6 +2897,12 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nonmax"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e4a593ea4fffed8684ad13d75c82cf0b6dc2b88947e0ed85b9e70f555a7e422"
+
 [[package]]
 name = "notify"
 version = "6.1.1"
@@ -2822,6 +2922,20 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "notify-debouncer-full"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154"
+dependencies = [
+ "crossbeam-channel",
+ "file-id",
+ "log",
+ "notify",
+ "parking_lot",
+ "walkdir",
+]
+
 [[package]]
 name = "ntapi"
 version = "0.4.1"
@@ -2848,6 +2962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
 dependencies = [
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -2916,7 +3031,7 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -2928,7 +3043,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 2.0.38",
@@ -3047,6 +3162,15 @@ dependencies = [
  "redox_syscall 0.3.5",
 ]
 
+[[package]]
+name = "ordered-float"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -3102,11 +3226,12 @@ dependencies = [
  "bitflags 1.3.2",
  "downcast-rs",
  "either",
- "nalgebra 0.32.3",
+ "nalgebra",
  "num-derive",
  "num-traits",
  "rustc-hash",
- "simba 0.8.1",
+ "serde",
+ "simba",
  "slab",
  "smallvec",
  "spade",
@@ -3237,7 +3362,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.7",
 ]
 
 [[package]]
@@ -3288,11 +3422,22 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
  "getrandom 0.1.16",
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
  "rand_hc",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -3300,7 +3445,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
@@ -3312,13 +3467,22 @@ dependencies = [
  "getrandom 0.1.16",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.10",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 dependencies = [
- "rand_core",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -3327,7 +3491,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
 dependencies = [
- "rand_core",
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -3349,12 +3513,13 @@ dependencies = [
  "crossbeam",
  "downcast-rs",
  "instant",
- "nalgebra 0.32.3",
+ "nalgebra",
  "num-derive",
  "num-traits",
  "parry3d",
  "rustc-hash",
- "simba 0.8.1",
+ "serde",
+ "simba",
 ]
 
 [[package]]
@@ -3461,6 +3626,12 @@ version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
+[[package]]
+name = "regex-syntax"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -3682,19 +3853,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "simba"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f3fd720c48c53cace224ae62bef1bbff363a70c68c4802a78b5cc6159618176"
-dependencies = [
- "approx",
- "num-complex",
- "num-traits",
- "paste",
- "wide",
-]
-
 [[package]]
 name = "simba"
 version = "0.8.1"
@@ -3773,7 +3931,7 @@ name = "sond-bevy-enum-components-macros"
 version = "0.1.0"
 dependencies = [
  "convert_case 0.6.0",
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -3791,18 +3949,21 @@ dependencies = [
 name = "sond-has"
 version = "0.1.0"
 dependencies = [
+ "array-init",
  "bevy",
  "bevy_common_assets",
  "bevy_kira_audio",
  "bevy_pkv",
- "bevy_quickmenu",
  "bevy_rapier3d",
  "colored",
+ "fixedbitset",
+ "futures-lite 2.1.0",
  "leafwing-input-manager",
  "leafwing_abilities",
  "nanorand",
  "noise",
- "noises-and-patterns",
+ "ordered-float",
+ "petgraph",
  "rapier3d",
  "serde",
  "sond-bevy-enum-components",
@@ -3823,7 +3984,7 @@ version = "0.1.0"
 dependencies = [
  "async-process",
  "bevy",
- "futures-lite",
+ "futures-lite 1.13.0",
  "sond-has-dylib",
 ]
 
@@ -4077,6 +4238,17 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -4202,6 +4374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 dependencies = [
  "getrandom 0.2.10",
+ "rand 0.8.5",
  "serde",
 ]
 
@@ -4253,9 +4426,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -4263,9 +4436,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
 dependencies = [
  "bumpalo",
  "log",
@@ -4278,9 +4451,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4290,9 +4463,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4300,9 +4473,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4313,9 +4486,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
 
 [[package]]
 name = "wayland-scanner"
@@ -4330,9 +4503,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4340,9 +4513,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu"
-version = "0.16.3"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd"
+checksum = "ed547920565c56c7a29afb4538ac5ae5048865a5d2f05bff3ad4fbeb921a9a2c"
 dependencies = [
  "arrayvec",
  "cfg-if",
@@ -4364,9 +4537,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.16.1"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
+checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7"
 dependencies = [
  "arrayvec",
  "bit-vec",
@@ -4387,9 +4560,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.16.2"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
+checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17"
 dependencies = [
  "android_system_properties",
  "arrayvec",
@@ -4399,7 +4572,6 @@ dependencies = [
  "block",
  "core-graphics-types",
  "d3d12",
- "foreign-types",
  "glow",
  "gpu-alloc",
  "gpu-allocator",
@@ -4429,9 +4601,9 @@ dependencies = [
 
 [[package]]
 name = "wgpu-types"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
+checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
 dependencies = [
  "bitflags 2.4.1",
  "js-sys",
@@ -4768,7 +4940,3 @@ dependencies = [
  "quote",
  "syn 2.0.38",
 ]
-
-[[patch.unused]]
-name = "rapier3d"
-version = "0.16.1"
diff --git a/rs/Cargo.toml b/rs/Cargo.toml
index 3d2ffb5..0a5cf62 100644
--- a/rs/Cargo.toml
+++ b/rs/Cargo.toml
@@ -19,11 +19,12 @@ default = [
 
 
 [patch.crates-io]
-rapier3d = { version = "0.16", path = "../rapier/crates/rapier3d" }
-bevy_rapier3d = { version = "0.22.0", path = "../bevy_rapier/bevy_rapier3d" }
+#rapier3d = { version = "0.16", path = "../rapier/crates/rapier3d" }
+#bevy_rapier3d = { version = "0.23.0", path = "../bevy_rapier/bevy_rapier3d" }
+leafwing_abilities = { version = "0.5.0", path = "../leafwing_abilities" }
 
 [workspace.dependencies.bevy]
-version = "0.11.0"
+version = "0.12.1"
 default-features = false
 features = [
     "animation",
@@ -31,11 +32,11 @@ features = [
 #    "bevy_audio", # using kira
     "bevy_gilrs",
     "bevy_scene",
-#    "bevy_winit",
+#    "bevy_winit", # not in CI
     "bevy_core_pipeline",
     "bevy_pbr",
     "bevy_gltf",
-#    "bevy_render",
+#    "bevy_render", # not in CI
     "bevy_sprite",
     "bevy_text",
     "bevy_ui",
@@ -46,7 +47,7 @@ features = [
     "zstd",
     "vorbis",
     "x11",
-    "filesystem_watcher",
+#    "file_watcher", # only for development
     "bevy_gizmos",
     "android_shared_stdcxx",
     "tonemapping_luts",
@@ -60,19 +61,23 @@ enum_components = { package = "sond-bevy-enum-components", path = "../sond-bevy-
 particles = { package = "sond-bevy-particles", path = "../sond-bevy-particles" }
 
 # Engine
-bevy_rapier3d = { version = "0.22", default-features = false, features = ["dim3"] }
-rapier3d = { version = "0.17.2", features = ["wasm-bindgen"] }
-bevy_kira_audio = "0.17.0"
-leafwing-input-manager = "0.10.0"
+bevy_rapier3d = { version = "0.23.0", default-features = false, features = ["dim3"] }
+rapier3d = { version = "0.17.2", features = ["wasm-bindgen", "serde-serialize"] }
+bevy_kira_audio = "0.18.0"
+leafwing-input-manager = "0.11.1"
 leafwing_abilities = "0.5.0"
 bevy_quickmenu = "0.2.0"
-bevy_common_assets = { version = "0.7.0", features = ["ron"] }
+bevy_common_assets = { version = "0.8.0", features = ["ron"] }
 
 # Util
-bevy_pkv = "0.8.0"
+array-init = "2.1.0"
+bevy_pkv = "0.9.0" # settings
+fixedbitset = "0.4.2" # petgraph edge storage
+futures-lite = "2.1.0" # especially for `yield_now()`
 nanorand = { version = "0.7.0", default-features = false, features = ["std", "wyrand", "getrandom"] } # wasm is broken without std and getrandom
 noise = "0.8.2"
-noises-and-patterns = "0.1.0"
+ordered-float = "4.2.0"
+petgraph = { version = "0.6.4", default-features = false } # pathfinding
 static_assertions = "1.1.0"
 serde = "1"
 
@@ -88,14 +93,18 @@ rapier3d = { workspace = true }
 bevy_kira_audio = { workspace = true }
 leafwing-input-manager = { workspace = true }
 leafwing_abilities = { workspace = true }
-bevy_quickmenu = { workspace = true }
+#bevy_quickmenu = { workspace = true }
 bevy_common_assets = { workspace = true }
 
 # Util
+array-init = { workspace = true }
 bevy_pkv = { workspace = true }
+fixedbitset = { workspace = true }
+futures-lite = { workspace = true }
 nanorand = { workspace = true }
 noise = { workspace = true }
-noises-and-patterns = { workspace = true }
+ordered-float = { workspace = true }
+petgraph = { workspace = true }
 static_assertions = { workspace = true }
 serde = { workspace = true }
 
@@ -116,3 +125,15 @@ lto = "thin"
 name = "integration"
 required-features = ["testing"]
 harness = false
+
+[lints.clippy]
+needless_update = "allow" # `..default()` used a lot to allow quick adding/removing of fields
+too_many_arguments = "allow" # Systems often need lots of arguments
+
+# Helps prevent full rebuild when switching between deskop and WASM due to rustflags
+[profile.desktop]
+inherits = "dev"
+[profile.desktop-release]
+inherits = "release"
+opt-level = 3
+lto = true
diff --git a/rs/Trunk.toml b/rs/Trunk.toml
new file mode 100644
index 0000000..c22643d
--- /dev/null
+++ b/rs/Trunk.toml
@@ -0,0 +1,3 @@
+[build]
+filehash = false
+public_url = "./"
diff --git a/rs/assets/pickups/pickup_material.mat.ron.meta b/rs/assets/pickups/pickup_material.mat.ron.meta
new file mode 100644
index 0000000..3ff7d92
--- /dev/null
+++ b/rs/assets/pickups/pickup_material.mat.ron.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_common_assets::ron::RonAssetLoader<sond_has::mats::BubbleMaterial>",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/sfx/SFX_-_hit_big_02.ogg.meta b/rs/assets/sfx/SFX_-_hit_big_02.ogg.meta
new file mode 100644
index 0000000..f498067
--- /dev/null
+++ b/rs/assets/sfx/SFX_-_hit_big_02.ogg.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_kira_audio::source::ogg_loader::OggLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/sfx/SFX_-_magic_spell_01.ogg.meta b/rs/assets/sfx/SFX_-_magic_spell_01.ogg.meta
new file mode 100644
index 0000000..f498067
--- /dev/null
+++ b/rs/assets/sfx/SFX_-_magic_spell_01.ogg.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_kira_audio::source::ogg_loader::OggLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/sfx/SFX_-_magic_spell_02.ogg.meta b/rs/assets/sfx/SFX_-_magic_spell_02.ogg.meta
new file mode 100644
index 0000000..f498067
--- /dev/null
+++ b/rs/assets/sfx/SFX_-_magic_spell_02.ogg.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_kira_audio::source::ogg_loader::OggLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/sfx/SFX_-_magic_spell_03.ogg.meta b/rs/assets/sfx/SFX_-_magic_spell_03.ogg.meta
new file mode 100644
index 0000000..f498067
--- /dev/null
+++ b/rs/assets/sfx/SFX_-_magic_spell_03.ogg.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_kira_audio::source::ogg_loader::OggLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/sfx/SFX_-_magic_spell_04.ogg.meta b/rs/assets/sfx/SFX_-_magic_spell_04.ogg.meta
new file mode 100644
index 0000000..f498067
--- /dev/null
+++ b/rs/assets/sfx/SFX_-_magic_spell_04.ogg.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_kira_audio::source::ogg_loader::OggLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/sfx/SFX_-_magic_spell_05.ogg.meta b/rs/assets/sfx/SFX_-_magic_spell_05.ogg.meta
new file mode 100644
index 0000000..f498067
--- /dev/null
+++ b/rs/assets/sfx/SFX_-_magic_spell_05.ogg.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_kira_audio::source::ogg_loader::OggLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/sfx/SFX_-_negative_09.ogg.meta b/rs/assets/sfx/SFX_-_negative_09.ogg.meta
new file mode 100644
index 0000000..f498067
--- /dev/null
+++ b/rs/assets/sfx/SFX_-_negative_09.ogg.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_kira_audio::source::ogg_loader::OggLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/shaders/bubble.wgsl b/rs/assets/shaders/bubble.wgsl
index 219d3cb..c23053a 100644
--- a/rs/assets/shaders/bubble.wgsl
+++ b/rs/assets/shaders/bubble.wgsl
@@ -1,5 +1,5 @@
-#import bevy_pbr::mesh_vertex_output    MeshVertexOutput
-#import bevy_pbr::mesh_view_bindings	view
+#import bevy_pbr::forward_io::VertexOutput
+#import bevy_pbr::mesh_view_bindings::view
 #import bevy_pbr::mesh_bindings
 
 struct BubbleMaterial {
@@ -13,7 +13,7 @@ var<uniform> material: BubbleMaterial;
 
 @fragment
 fn fragment(
-	in: MeshVertexOutput
+	in: VertexOutput
 ) -> @location(0) vec4<f32> {
 	var N = normalize(in.world_normal);
 	var V = normalize(view.world_position.xyz - in.world_position.xyz);
diff --git a/rs/assets/shaders/bubble.wgsl.meta b/rs/assets/shaders/bubble.wgsl.meta
new file mode 100644
index 0000000..44fcdda
--- /dev/null
+++ b/rs/assets/shaders/bubble.wgsl.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_render::render_resource::shader::ShaderLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/shaders/skybox.wgsl b/rs/assets/shaders/skybox.wgsl
new file mode 100644
index 0000000..ba43d32
--- /dev/null
+++ b/rs/assets/shaders/skybox.wgsl
@@ -0,0 +1,55 @@
+#import bevy_render::view::View
+#import bevy_render::globals::Globals
+
+struct SkyCube {
+	face_index: u32,
+	face_width: f32,
+	face_rotation: mat3x3<f32>,
+	rotation: mat3x3<f32>,
+}
+
+@group(0) @binding(0) var<uniform> cube: SkyCube;
+@group(0) @binding(1) var<uniform> view: View;
+@group(0) @binding(2) var<uniform> globals: Globals;
+
+fn ray_dir(position: vec2<f32>) -> vec3<f32> {
+	return cube.face_rotation * normalize(vec3((position / (cube.face_width * 0.5)) - vec2(1.0), 1.0));
+}
+
+struct VertexOutput {
+    @builtin(position) position: vec4<f32>,
+};
+
+//  3 |  2.
+//  2 |  :  `.
+//  1 |  x-----x.
+//  0 |  |  s  |  `.
+// -1 |  0-----x.....1
+//    +---------------
+//      -1  0  1  2  3
+//
+// The axes are clip-space x and y. The region marked s is the visible region.
+// The digits in the corners of the right-angled triangle are the vertex
+// indices.
+@vertex
+fn vertex(@builtin(vertex_index) vertex_index: u32) -> VertexOutput {
+    // See the explanation above for how this works.
+    let clip_position = vec4(
+        f32(vertex_index & 1u),
+        f32((vertex_index >> 1u) & 1u),
+        0.25,
+        0.5
+    ) * 4.0 - vec4(1.0);
+
+    return VertexOutput(clip_position);
+}
+
+@fragment
+fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
+	let ray_dir = ray_dir(in.position.xy);
+	let sample_dir = cube.rotation * ray_dir;
+	let daytime = (sin(globals.time * 0.01) + 1.0) * 0.707;
+	let sample_color = vec4(normalize((sample_dir + vec3(1.0))) * (daytime * daytime), 1.0);
+
+	return sample_color;
+}
diff --git a/rs/assets/shaders/skybox.wgsl.meta b/rs/assets/shaders/skybox.wgsl.meta
new file mode 100644
index 0000000..44fcdda
--- /dev/null
+++ b/rs/assets/shaders/skybox.wgsl.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_render::render_resource::shader::ShaderLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/ships/player.glb.meta b/rs/assets/ships/player.glb.meta
new file mode 100644
index 0000000..69379fd
--- /dev/null
+++ b/rs/assets/ships/player.glb.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_gltf::loader::GltfLoader",
+		settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/assets/ships/rocket_baseA.glb.meta b/rs/assets/ships/rocket_baseA.glb.meta
new file mode 100644
index 0000000..cd8fcb1
--- /dev/null
+++ b/rs/assets/ships/rocket_baseA.glb.meta
@@ -0,0 +1,7 @@
+(
+    meta_format_version: "1.0",
+    asset: Load(
+        loader: "bevy_gltf::loader::GltfLoader",
+        settings: (),
+    ),
+)
\ No newline at end of file
diff --git a/rs/index.html b/rs/index.html
index 8e75610..f778c8a 100644
--- a/rs/index.html
+++ b/rs/index.html
@@ -6,7 +6,7 @@
 		background-color: black;
 	}
 </style>
-<link data-trunk rel="copy-dir" href="assets" />
+<link data-trunk rel="copy-dir" href="imported_assets" />
 </head>
 <body>
 <script>
@@ -69,7 +69,6 @@
         });
     })();
 </script>
-<button onclick="window.location.reload()">Reload Game</button>
 <canvas id="game_canvas"></canvas>
 </body>
 </html>
\ No newline at end of file
diff --git a/rs/src/enemies/dummy.rs b/rs/src/enemies/dummy.rs
index b919312..b6dec3d 100644
--- a/rs/src/enemies/dummy.rs
+++ b/rs/src/enemies/dummy.rs
@@ -1,14 +1,25 @@
-#![allow(clippy::needless_update)] // ..default() used a lot to make it easier to add/remove field assignments quickly
 use super::enemy::Dummy;
 use crate::util::{consume_spawn_events, Spawnable};
-use bevy::ecs::system::{EntityCommands, SystemParamItem};
-use bevy::prelude::*;
+use bevy::{
+	ecs::system::{EntityCommands, SystemParamItem},
+	prelude::*,
+};
+use bevy_rapier3d::{
+	math::Vect,
+	prelude::{Collider, RigidBody},
+};
 use enum_components::EntityEnumCommands;
+use std::time::Duration;
 
 pub fn plugin(app: &mut App) -> &mut App {
 	app.add_systems(Startup, setup)
 		.add_event::<NewDummy>()
+		.insert_resource(DummySpawnTimer(Timer::new(
+			Duration::from_secs(15),
+			TimerMode::Repeating,
+		)))
 		.add_systems(Update, consume_spawn_events::<Dummy>)
+		.add_systems(Last, spawn_new_dummies)
 }
 
 fn setup(
@@ -16,14 +27,28 @@ fn setup(
 	mut meshes: ResMut<Assets<Mesh>>,
 	mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-	let mesh = meshes.add(shape::Cube::new(4.0).into());
+	let mesh = meshes.add(
+		shape::Capsule {
+			radius: 2.0,
+			depth: 4.0,
+			..default()
+		}
+		.into(),
+	);
 	let material = materials.add(Color::YELLOW.into());
-	cmds.insert_resource(DummyTemplate { mesh, material });
+	let collider = Collider::capsule(Vect::NEG_Y * 2.0, Vect::Y * 2.0, 2.0);
+	cmds.insert_resource(DummyTemplate {
+		mesh,
+		material,
+		collider,
+	});
 }
 
 #[derive(Bundle, Default, Clone)]
 struct DummyBundle {
 	mat_mesh: MaterialMeshBundle<StandardMaterial>,
+	body: RigidBody,
+	collider: Collider,
 }
 
 impl Spawnable for Dummy {
@@ -35,7 +60,11 @@ impl Spawnable for Dummy {
 		params: &mut SystemParamItem<'w, 's, Self::Params>,
 		NewDummy { transform }: Self::InstanceData,
 	) -> EntityCommands<'w, 's, 'a> {
-		let DummyTemplate { mesh, material } = params.clone();
+		let DummyTemplate {
+			mesh,
+			material,
+			collider,
+		} = params.clone();
 		let mut cmds = cmds.spawn(DummyBundle {
 			mat_mesh: MaterialMeshBundle {
 				mesh,
@@ -43,6 +72,7 @@ impl Spawnable for Dummy {
 				transform,
 				..default()
 			},
+			collider,
 			..default()
 		});
 		cmds.set_enum(Dummy);
@@ -54,9 +84,26 @@ impl Spawnable for Dummy {
 pub struct DummyTemplate {
 	mesh: Handle<Mesh>,
 	material: Handle<StandardMaterial>,
+	collider: Collider,
 }
 
 #[derive(Event, Default, Debug, Clone)]
 pub struct NewDummy {
 	transform: Transform,
 }
+
+pub fn spawn_new_dummies(
+	mut events: EventWriter<NewDummy>,
+	mut timer: ResMut<DummySpawnTimer>,
+	t: Res<Time>,
+) {
+	timer.tick(t.delta());
+	if timer.just_finished() {
+		events.send(NewDummy {
+			transform: Transform::default(),
+		});
+	}
+}
+
+#[derive(Resource, Debug, Deref, DerefMut)]
+pub struct DummySpawnTimer(Timer);
diff --git a/rs/src/lib.rs b/rs/src/lib.rs
index a6815a5..000f50c 100644
--- a/rs/src/lib.rs
+++ b/rs/src/lib.rs
@@ -1,7 +1,7 @@
 use crate::mats::BubbleMaterial;
-use bevy::asset::ChangeWatcher;
-use bevy::window::PrimaryWindow;
-use bevy::{diagnostic::FrameTimeDiagnosticsPlugin, prelude::*, DefaultPlugins};
+use bevy::{
+	diagnostic::FrameTimeDiagnosticsPlugin, prelude::*, window::PrimaryWindow, DefaultPlugins,
+};
 use bevy_common_assets::ron::RonAssetPlugin;
 use bevy_kira_audio::AudioPlugin;
 use bevy_pkv::PkvStore;
@@ -13,19 +13,21 @@ use util::FnPluginExt;
 
 pub mod enemies;
 pub mod mats;
+pub mod nav;
+pub mod offloading;
 pub mod pickups;
+pub mod planet;
 pub mod player;
 pub mod settings;
-pub mod terrain;
 #[cfg(feature = "testing")]
 pub mod tests;
 pub mod ui;
 pub mod util;
 
 /// Epsilon
-pub const E: f32 = 1.0e-5;
+pub const EPS: f32 = 1.0e-5;
 /// Rotational epsilon in radians
-pub const R_E: f32 = TAU / (360.0 * 4.0);
+pub const R_EPS: f32 = TAU / (360.0 * 4.0);
 /// Fixed delta time
 pub const DT: f32 = 1.0 / 64.0;
 /// Up vector
@@ -33,7 +35,7 @@ pub const UP: Vect = Vect::Z;
 
 pub fn run() {
 	let mut app = App::new();
-	let mut default_plugins = DefaultPlugins.set(WindowPlugin {
+	let default_plugins = DefaultPlugins.set(WindowPlugin {
 		primary_window: Some(Window {
 			title: "Sonday Hack-and-Slash Game".to_string(),
 			resizable: true,
@@ -43,20 +45,19 @@ pub fn run() {
 		}),
 		..default()
 	});
-	#[cfg(debug_assertions)]
-	{
-		default_plugins = default_plugins.set(AssetPlugin {
-			watch_for_changes: ChangeWatcher::with_delay(Duration::from_secs(1)),
-			..default()
-		});
-	}
+
+	let default_plugins = default_plugins.set(AssetPlugin {
+		mode: AssetMode::Processed,
+		..default()
+	});
+
 	app.add_plugins(default_plugins)
 		.insert_resource(RapierConfiguration {
 			gravity: Vect::new(0.0, 0.0, -9.81),
-			// timestep_mode: TimestepMode::Fixed {
-			// 	dt: DT,
-			// 	substeps: 1,
-			// },
+			timestep_mode: TimestepMode::Fixed {
+				dt: DT,
+				substeps: 1,
+			},
 			..default()
 		})
 		.add_plugins((
@@ -64,6 +65,8 @@ pub fn run() {
 			FrameTimeDiagnosticsPlugin,
 			AudioPlugin,
 			ParticlesPlugin,
+			offloading::OffloadingPlugin,
+			planet::sky::SkyPlugin,
 		))
 		.insert_resource(PkvStore::new_with_qualifier(
 			"studio",
@@ -74,15 +77,15 @@ pub fn run() {
 		.fn_plugin(player::plugin)
 		.fn_plugin(pickups::plugin)
 		.fn_plugin(settings::plugin)
-		.fn_plugin(terrain::plugin)
+		.fn_plugin(planet::terrain::plugin)
 		.fn_plugin(ui::plugin)
 		.add_plugins((
 			RonAssetPlugin::<BubbleMaterial>::new(&["mat.ron"]),
 			MaterialPlugin::<BubbleMaterial>::default(),
 		))
 		.add_systems(Startup, startup)
-		.add_systems(Update, terminal_velocity)
-		.add_systems(Update, fullscreen);
+		.add_systems(Update, (terminal_velocity, fullscreen))
+		.add_systems(PostUpdate, (despawn_oob,));
 
 	#[cfg(all(debug_assertions, feature = "render"))]
 	{
@@ -93,9 +96,31 @@ pub fn run() {
 	app.run()
 }
 
+/// The absolute furthest any entity can be away from the origin before being forcibly despawned.
+/// Helps prevent crashes from `inf` translations or other bugs, as well as avoiding processing
+/// irrelevant entities.
 #[derive(Resource)]
 pub struct AbsoluteBounds {
-	extents: f32,
+	pub extents: f32,
+}
+
+impl AbsoluteBounds {
+	fn test(&self, point: Vec3) -> InBounds {
+		point.x.abs() <= self.extents
+			&& point.y.abs() <= self.extents
+			&& point.z.abs() <= self.extents
+	}
+}
+
+pub type InBounds = bool;
+
+fn despawn_oob(mut cmds: Commands, bounds: Res<AbsoluteBounds>, q: Query<(Entity, &Transform)>) {
+	for (id, xform) in &q {
+		if !bounds.test(xform.translation) {
+			bevy::log::warn!("Entity {id:?} is way out of bounds. Despawning.");
+			cmds.entity(id).despawn()
+		}
+	}
 }
 
 #[derive(Component, Deref, DerefMut, Debug, Default, Reflect)]
@@ -139,7 +164,9 @@ pub fn tick_cooldown<A: Ability>(
 
 fn startup(
 	mut cmds: Commands,
-	#[cfg(all(debug_assertions, feature = "render"))] mut dbg_render_ctx: ResMut<DebugRenderContext>,
+	#[cfg(all(debug_assertions, feature = "render"))] mut dbg_render_ctx: ResMut<
+		DebugRenderContext,
+	>,
 ) {
 	#[cfg(target_family = "wasm")]
 	cmds.insert_resource(Msaa::Off);
@@ -149,23 +176,13 @@ fn startup(
 		dbg_render_ctx.enabled = false;
 	}
 
-	cmds.insert_resource(AbsoluteBounds { extents: 2048.0 });
-
-	cmds.spawn(DirectionalLightBundle {
-		directional_light: DirectionalLight {
-			illuminance: 10000.0,
-			..default()
-		},
-		transform: Transform::from_rotation(Quat::from_rotation_arc(
-			Vec3::NEG_Z,
-			Vec3::new(-1.0, 0.5, -1.0).normalize(),
-		)),
-		..default()
-	});
+	cmds.insert_resource(AbsoluteBounds { extents: 65536.0 });
 
 	cmds.insert_resource(AmbientLight {
 		color: Color::rgb(0.64, 0.32, 1.0),
-		brightness: 0.05,
+		brightness: 0.1,
+		// // If using EnvironmentLight diffuse instead, must still insert ambient light so a default one is not used
+		// brightness: 0.0,
 	});
 }
 
diff --git a/rs/src/mats.rs b/rs/src/mats.rs
index 96bc18a..8825259 100644
--- a/rs/src/mats.rs
+++ b/rs/src/mats.rs
@@ -5,7 +5,7 @@ use bevy::{
 };
 use serde::{Deserialize, Serialize};
 
-#[derive(AsBindGroup, Debug, Clone, TypeUuid, Serialize, Deserialize, Reflect)]
+#[derive(Asset, AsBindGroup, Debug, Clone, TypeUuid, Serialize, Deserialize, Reflect)]
 #[uuid = "32c44b20-ae2c-43b2-96c8-aa9bb12d6a8b"]
 pub struct BubbleMaterial {
 	#[uniform(0)]
diff --git a/rs/src/nav.rs b/rs/src/nav.rs
new file mode 100644
index 0000000..e8a3114
--- /dev/null
+++ b/rs/src/nav.rs
@@ -0,0 +1,359 @@
+use bevy::prelude::*;
+use fixedbitset::FixedBitSet;
+use petgraph::visit::{
+	Data, EdgeRef, GraphBase, GraphRef, IntoEdgeReferences, IntoEdges, IntoNeighbors, Visitable,
+};
+use rapier3d::prelude::*;
+use std::{f32::consts::SQRT_2, ops::Range};
+
+pub struct NavGraph {
+	_chunks: Vec<NavChunk>,
+	_seams: Vec<Seam>,
+}
+
+pub struct NavMesh {
+	_vertices: Vec<Vec3>,
+	_triangle_indices: Vec<[usize; 3]>,
+}
+
+pub struct NavVolume {
+	_shape: TypedShape<'static>,
+}
+
+pub enum NavChunk {
+	Mesh(NavMesh),
+	Volume(NavVolume),
+}
+
+pub struct Seam {}
+
+#[derive(Copy, Clone, Deref)]
+pub struct HeightmapNavGraph<'a, F: FnMut(TriPair) -> bool + Copy> {
+	#[deref]
+	heights: &'a HeightField,
+	filter: F,
+}
+
+impl<'a, F: FnMut(TriPair) -> bool + Copy> HeightmapNavGraph<'a, F> {
+	pub fn new(heights: &'a HeightField, filter: F) -> Self {
+		Self { heights, filter }
+	}
+
+	pub fn astar(
+		self,
+		start: <Self as GraphBase>::NodeId,
+		goal: <Self as GraphBase>::NodeId,
+		edge_cost: impl FnMut(TriPair) -> f32,
+	) -> Option<(f32, Vec<<Self as GraphBase>::NodeId>)> {
+		petgraph::algo::astar(
+			self,
+			start,
+			|id| id == goal,
+			edge_cost,
+			|id| {
+				// // Manhattan distance
+				// let (i, j, left) = self.split_triangle_id(id);
+				// let (gi, gj, gleft) = self.split_triangle_id(goal);
+				// let left = !left as usize; // treat left as 0 and right as 1
+				// let gleft = !gleft as usize;
+				// ((gi * 2 + gleft).abs_diff(i * 2 + left)
+				// 	+ (gj * 2 + gleft).abs_diff(j * 2 + left))
+				// 	as f32
+
+				// Euclidian distance
+				let goal = self.triangle_at_id(goal).unwrap().center();
+				let center = self.triangle_at_id(id).unwrap().center();
+				Vec3::from(goal).distance(Vec3::from(center))
+			},
+		)
+	}
+}
+
+pub fn height_field_graph_with_max_climb(
+	heights: &HeightField,
+	max_climb_radians: f32,
+) -> HeightmapNavGraph<impl FnMut(TriPair) -> bool + Copy + '_> {
+	HeightmapNavGraph {
+		heights,
+		filter: move |pair: TriPair| {
+			let (si, sj, sl) = heights.split_triangle_id(pair.source());
+			let (ti, tj, _tl) = heights.split_triangle_id(pair.target());
+			let (si, sj, ti, tj) = (si as f32, sj as f32, ti as f32, tj as f32);
+			let dir = if si == ti && sj == tj {
+				// same cell, towards other triangle
+				if sl {
+					Vec3::new(SQRT_2, 0.0, SQRT_2)
+				} else {
+					Vec3::new(-SQRT_2, 0.0, -SQRT_2)
+				}
+			} else {
+				Vec3::new(tj - sj, 0.0, ti - si).normalize()
+			};
+			let snorm = heights
+				.triangle_at_id(pair.source())
+				.unwrap()
+				.normal()
+				.unwrap();
+			if snorm.angle(&Vec3::Y.into()) > max_climb_radians {
+				// Already on a steep slope
+				let dot = dir.dot(snorm.into());
+				if dot < 0.0 {
+					// Against normal -- Uphill
+					false
+				} else {
+					// With normal -- Downhill
+					true
+				}
+			} else {
+				// Not on steep slope, check slope of target
+				let tnorm = heights
+					.triangle_at_id(pair.target())
+					.unwrap()
+					.normal()
+					.unwrap();
+				let dot = dir.dot(tnorm.into());
+				if dot < 0.0 {
+					// Against normal, so uphill
+					tnorm.angle(&Vec3::Y.into()) <= max_climb_radians
+				} else {
+					// Normal is pointing away from us, so downhill
+					true
+				}
+			}
+		},
+	}
+}
+
+pub trait FnsThatShouldBePub {
+	fn num_triangles(&self) -> usize;
+
+	fn split_triangle_id(&self, id: u32) -> (usize, usize, bool);
+
+	fn triangle_id(&self, i: usize, j: usize, left: bool) -> u32;
+}
+
+impl FnsThatShouldBePub for HeightField {
+	fn num_triangles(&self) -> usize {
+		self.nrows() * self.ncols() * 2
+	}
+
+	fn split_triangle_id(&self, id: u32) -> (usize, usize, bool) {
+		let left = id < self.num_triangles() as u32 / 2;
+		let cell_id = if left {
+			id as usize
+		} else {
+			id as usize - self.num_triangles() / 2
+		};
+		let j = cell_id / self.nrows();
+		let i = cell_id - j * self.nrows();
+		(i, j, left)
+	}
+
+	fn triangle_id(&self, i: usize, j: usize, left: bool) -> u32 {
+		let tid = j * self.nrows() + i;
+		if left {
+			tid as u32
+		} else {
+			(tid + self.num_triangles() / 2) as u32
+		}
+	}
+}
+
+impl<F: FnMut(TriPair) -> bool + Copy> GraphBase for HeightmapNavGraph<'_, F> {
+	type EdgeId = TriPair;
+	type NodeId = TriId;
+}
+
+impl<F: FnMut(TriPair) -> bool + Copy> Visitable for HeightmapNavGraph<'_, F> {
+	type Map = FixedBitSet;
+
+	fn visit_map(&self) -> Self::Map {
+		FixedBitSet::with_capacity(self.heights.nrows() * self.heights.ncols())
+	}
+
+	fn reset_map(&self, map: &mut Self::Map) {
+		if map.len() != self.heights.nrows() * self.heights.nrows() {
+			*map = FixedBitSet::with_capacity(self.heights.nrows() * self.heights.ncols())
+		} else {
+			map.clear()
+		}
+	}
+}
+
+impl<'a, F: FnMut(TriPair) -> bool + Copy> IntoEdgeReferences for HeightmapNavGraph<'a, F> {
+	type EdgeRef = TriPair;
+	type EdgeReferences = EdgeIter<'a, F>;
+
+	fn edge_references(self) -> Self::EdgeReferences {
+		EdgeIter::new(self)
+	}
+}
+
+pub struct EdgeIter<'a, F: FnMut(TriPair) -> bool + Copy> {
+	graph: HeightmapNavGraph<'a, F>,
+	range: Range<TriId>,
+	curr_edges: Option<<Vec<TriPair> as IntoIterator>::IntoIter>,
+}
+
+impl<'a, F: FnMut(TriPair) -> bool + Copy> EdgeIter<'a, F> {
+	fn new(data: HeightmapNavGraph<'a, F>) -> Self {
+		let range = 0..data.num_triangles() as u32;
+		Self {
+			graph: data,
+			range,
+			curr_edges: None,
+		}
+	}
+}
+
+impl<F: FnMut(TriPair) -> bool + Copy> Iterator for EdgeIter<'_, F> {
+	type Item = TriPair;
+
+	fn next(&mut self) -> Option<Self::Item> {
+		loop {
+			if let Some(mut curr) = self.curr_edges.take() {
+				if let Some(pair) = curr.next() {
+					return Some(pair);
+				} else {
+					self.curr_edges = self.range.next().map(|id| self.graph.edges(id));
+				}
+			} else {
+				return None;
+			}
+		}
+	}
+}
+
+impl<F: FnMut(TriPair) -> bool + Copy> Data for HeightmapNavGraph<'_, F> {
+	type NodeWeight = Vec3; // normal
+	type EdgeWeight = ();
+}
+
+impl<F: FnMut(TriPair) -> bool + Copy> GraphRef for HeightmapNavGraph<'_, F> {}
+
+impl<F: FnMut(TriPair) -> bool + Copy> IntoNeighbors for HeightmapNavGraph<'_, F> {
+	type Neighbors = <Vec<TriId> as IntoIterator>::IntoIter;
+
+	fn neighbors(mut self, a: Self::NodeId) -> Self::Neighbors {
+		//TODO: Create special iterator instead of allocating vecs
+		let (i, j, left) = self.split_triangle_id(a);
+		let mut neighbors = Vec::new();
+
+		let mut try_push = |this: &mut Self, target| {
+			if (this.filter)(TriPair::new(a, target)) {
+				neighbors.push(target);
+			}
+		};
+
+		if left {
+			let right = self.triangle_id(i, j, false);
+			(try_push)(&mut self, right);
+
+			if i > 0 {
+				let up = self.triangle_id(i - 1, j, false);
+				(try_push)(&mut self, up);
+			}
+
+			if j > 0 {
+				let left = self.triangle_id(i, j - 1, false);
+				(try_push)(&mut self, left);
+			}
+		} else {
+			let left = self.triangle_id(i, j, true);
+			(try_push)(&mut self, left);
+
+			if j < self.heights.ncols() - 1 {
+				let right = self.triangle_id(i, j + 1, true);
+				(try_push)(&mut self, right);
+			}
+
+			if i < self.heights.nrows() - 1 {
+				let down = self.triangle_id(i + 1, j, true);
+				(try_push)(&mut self, down);
+			}
+		}
+		neighbors.into_iter()
+	}
+}
+
+impl<F: FnMut(TriPair) -> bool + Copy> IntoEdges for HeightmapNavGraph<'_, F> {
+	type Edges = <Vec<TriPair> as IntoIterator>::IntoIter;
+
+	fn edges(mut self, a: Self::NodeId) -> Self::Edges {
+		//TODO: Create special iterator instead of allocating vecs
+		let mut edges = Vec::new();
+		let (i, j, left) = self.split_triangle_id(a);
+
+		let mut try_push = |this: &mut Self, target| {
+			let pair = TriPair::new(a, target);
+			if (this.filter)(pair) {
+				edges.push(pair);
+			}
+		};
+
+		if left {
+			let right = self.triangle_id(i, j, false);
+			(try_push)(&mut self, right);
+
+			if i > 0 {
+				let up = self.triangle_id(i - 1, j, false);
+				(try_push)(&mut self, up);
+			}
+
+			if j > 0 {
+				let left = self.triangle_id(i, j - 1, false);
+				(try_push)(&mut self, left);
+			}
+		} else {
+			let left = self.triangle_id(i, j, true);
+			(try_push)(&mut self, left);
+
+			if j < self.heights.ncols() - 1 {
+				let right = self.triangle_id(i, j + 1, true);
+				(try_push)(&mut self, right);
+			}
+
+			if i < self.heights.nrows() - 1 {
+				let down = self.triangle_id(i + 1, j, true);
+				(try_push)(&mut self, down);
+			}
+		}
+		edges.into_iter()
+	}
+}
+
+type TriId = u32;
+
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub struct TriPair {
+	source: TriId,
+	target: TriId,
+}
+
+impl TriPair {
+	fn new(source: TriId, target: TriId) -> Self {
+		Self { source, target }
+	}
+}
+
+impl EdgeRef for TriPair {
+	type NodeId = TriId;
+	type EdgeId = Self;
+	type Weight = ();
+
+	fn source(&self) -> Self::NodeId {
+		self.source
+	}
+
+	fn target(&self) -> Self::NodeId {
+		self.target
+	}
+
+	fn weight(&self) -> &Self::Weight {
+		&()
+	}
+
+	fn id(&self) -> Self::EdgeId {
+		*self
+	}
+}
diff --git a/rs/src/offloading.rs b/rs/src/offloading.rs
new file mode 100644
index 0000000..088f212
--- /dev/null
+++ b/rs/src/offloading.rs
@@ -0,0 +1,79 @@
+use bevy::prelude::*;
+use std::{any::Any, future::Future};
+
+#[cfg(target_arch = "wasm32")]
+mod wasm;
+#[cfg(target_arch = "wasm32")]
+pub use wasm::*;
+
+#[cfg(not(target_arch = "wasm32"))]
+mod desktop;
+#[cfg(not(target_arch = "wasm32"))]
+pub use desktop::*;
+
+pub struct OffloadingPlugin;
+
+impl Plugin for OffloadingPlugin {
+	fn build(&self, _app: &mut App) {
+		#[cfg(target_arch = "wasm32")]
+		_app.add_systems(Update, wasm::tick_offloaded_tasks);
+	}
+}
+
+pub type TaskHandle<T> = <TaskOffloader<'static, 'static> as Offload>::Task<T>;
+
+pub trait Offload {
+	type Task<Out: Any + Send + 'static>: OffloadedTask<Out>;
+
+	fn start<Out: Send + Sync + 'static>(
+		&mut self,
+		task: impl Future<Output = Out> + Send + Sync + 'static,
+	) -> Self::Task<Out>;
+}
+
+pub trait OffloadedTask<Out: 'static>: Future<Output = Out> {
+	fn let_go(self);
+	fn check(&mut self) -> Option<Out>
+	where
+		Self: Unpin,
+	{
+		futures_lite::future::block_on(futures_lite::future::poll_once(self))
+	}
+}
+
+#[cfg(feature = "testing")]
+pub(crate) mod tests {
+	use crate::offloading::{Offload, OffloadedTask, TaskOffloader};
+	use bevy::prelude::*;
+	use std::sync::atomic::{AtomicBool, Ordering::Relaxed};
+
+	pub(crate) fn spawning(mut offloader: TaskOffloader, t: Res<Time>) {
+		static SPAWNED: AtomicBool = AtomicBool::new(false);
+		if !SPAWNED.load(Relaxed) && t.elapsed_seconds() > 3.0 {
+			bevy::log::info!("Hello from async task!");
+			for task in 0..100 {
+				offloader
+					.start(async move {
+						bevy::log::info!("Starting task {task}...");
+						for i in task..task + 1_000_000u64 {
+							std::hint::black_box(i);
+							if i % 10_000 == 0 {
+								bevy::log::info!("Task {task} yielding at {i}");
+								futures_lite::future::yield_now().await;
+							}
+						}
+						bevy::log::info!("Task {task} done!");
+					})
+					.let_go();
+			}
+			bevy::log::info!("Done spawning counting tasks");
+			SPAWNED.store(true, Relaxed);
+		}
+	}
+}
+
+#[inline(always)]
+pub async fn wasm_yield() {
+	#[cfg(target_arch = "wasm32")]
+	::futures_lite::future::yield_now().await
+}
diff --git a/rs/src/offloading/desktop.rs b/rs/src/offloading/desktop.rs
new file mode 100644
index 0000000..89459b4
--- /dev/null
+++ b/rs/src/offloading/desktop.rs
@@ -0,0 +1,45 @@
+use crate::offloading::{Offload, OffloadedTask};
+use bevy::{ecs::system::SystemParam, prelude::*, tasks::AsyncComputeTaskPool};
+use std::{
+	any::Any,
+	future::Future,
+	marker::PhantomData,
+	pin::Pin,
+	task::{Context, Poll},
+};
+
+#[derive(SystemParam, Debug)]
+pub struct TaskOffloader<'w, 's>(PhantomData<Commands<'w, 's>>);
+
+mod private {
+	use std::any::Any;
+
+	// Don't want to accidentally use functions from bevy's task on desktop and then not have them
+	// available on WASM.
+	pub struct Task<Out: Any + Send + 'static>(pub(super) bevy::tasks::Task<Out>);
+}
+
+impl Offload for TaskOffloader<'_, '_> {
+	type Task<Out: Any + Send + 'static> = private::Task<Out>;
+
+	fn start<Out: Send + Sync + 'static>(
+		&mut self,
+		task: impl Future<Output = Out> + Send + Sync + 'static,
+	) -> Self::Task<Out> {
+		private::Task(AsyncComputeTaskPool::get().spawn(task))
+	}
+}
+
+impl<Out: Any + Send + 'static> OffloadedTask<Out> for private::Task<Out> {
+	fn let_go(self) {
+		self.0.detach()
+	}
+}
+
+impl<Out: Any + Send + 'static> Future for private::Task<Out> {
+	type Output = Out;
+
+	fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+		unsafe { self.map_unchecked_mut(|this| &mut this.0) }.poll(cx)
+	}
+}
diff --git a/rs/src/offloading/wasm.rs b/rs/src/offloading/wasm.rs
new file mode 100644
index 0000000..52bcefc
--- /dev/null
+++ b/rs/src/offloading/wasm.rs
@@ -0,0 +1,143 @@
+use crate::offloading::{Offload, OffloadedTask};
+use bevy::{ecs::system::SystemParam, prelude::*, tasks::AsyncComputeTaskPool, utils::HashMap};
+use futures_lite::FutureExt;
+use rapier3d::crossbeam::atomic::AtomicCell;
+use std::{
+	any::Any,
+	cell::Cell,
+	future::Future,
+	pin::Pin,
+	ptr::NonNull,
+	sync::{Arc, Weak},
+	task::{Context, Poll},
+};
+
+#[derive(SystemParam)]
+pub struct TaskOffloader<'w, 's> {
+	cmds: Commands<'w, 's>,
+}
+
+type OutputSlot = AtomicCell<Poll<DynOutput>>;
+type DynOutput = Box<dyn Any + Send + 'static>;
+type DynTask = Box<dyn Future<Output = DynOutput> + Send + Sync + 'static>;
+
+mod private {
+	use super::{DynTask, OutputSlot};
+	use bevy::prelude::{Component, Entity};
+	use rapier3d::crossbeam::atomic::AtomicCell;
+	use std::{
+		any::Any,
+		future::Future,
+		marker::PhantomData,
+		sync::{Arc, Weak},
+		task::Poll,
+	};
+	pub struct Task<Out: Any + Send + 'static>(
+		pub(super) Entity,
+		pub(super) Arc<OutputSlot>,
+		pub(super) PhantomData<Out>,
+	);
+	#[derive(Component)]
+	pub struct TaskComponent {
+		pub(super) status: TaskStatus,
+	}
+
+	pub enum TaskStatus {
+		Pending { f: DynTask, out: Weak<OutputSlot> },
+		Running,
+		Finished(Weak<OutputSlot>),
+	}
+}
+
+impl Offload for TaskOffloader<'_, '_> {
+	type Task<Out: Any + Send + 'static> = private::Task<Out>;
+
+	fn start<Out: Any + Send>(
+		&mut self,
+		task: impl Future<Output = Out> + Send + Sync + 'static,
+	) -> Self::Task<Out> {
+		let out = Arc::new(AtomicCell::new(Poll::Pending));
+		private::Task(
+			self.cmds
+				.spawn(private::TaskComponent {
+					status: private::TaskStatus::Pending {
+						f: Box::new(
+							async move { Box::new(task.await) as Box<dyn Any + Send + 'static> },
+						) as _,
+						out: Arc::downgrade(&out),
+					},
+				})
+				.id(),
+			out,
+			default(),
+		)
+	}
+}
+
+impl<Out: Any + Send + 'static> Future for private::Task<Out> {
+	type Output = Out;
+
+	fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+		match self.1.swap(Poll::Pending) {
+			Poll::Ready(out) => {
+				let out = *out.downcast::<Out>().expect(
+					"The only way to get a `Task<Out>` should be via `TaskOffloader::start::<Out>`",
+				);
+				Poll::Ready(out)
+			}
+			Poll::Pending => Poll::Pending,
+		}
+	}
+}
+
+impl<Out: Any + Send + 'static> OffloadedTask<Out> for private::Task<Out> {
+	fn let_go(self) {
+		// Drop Arc, causing Weak to fail to upgrade and entity to despawn when finished
+	}
+}
+
+/// Returns Ready on every poll to split tasks over multiple frames
+struct Microtask<'a>(&'a mut (dyn Future<Output = DynOutput> + Send + Sync));
+
+impl Future for Microtask<'_> {
+	type Output = Poll<Box<dyn Any + Send + 'static>>;
+
+	fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+		Poll::Ready(unsafe { self.map_unchecked_mut(|it| it.0) }.poll(cx))
+	}
+}
+
+pub fn tick_offloaded_tasks(
+	mut cmds: Commands,
+	mut q: Query<(Entity, &mut private::TaskComponent)>,
+) {
+	use private::TaskStatus::*;
+	for (id, mut task) in &mut q {
+		match std::mem::replace(&mut task.status, Running) {
+			Pending { mut f, out } => {
+				let result = futures_lite::future::block_on(async move {
+					let result = Microtask(&mut *f).await;
+					match result {
+						Poll::Pending => {
+							out.upgrade().map(|out| out.store(Poll::Pending));
+							Pending { f, out }
+						}
+						Poll::Ready(result) => {
+							out.upgrade().map(|out| out.store(Poll::Ready(result)));
+							Finished(out)
+						}
+					}
+				});
+				task.status = result;
+			}
+			Running => continue,
+			Finished(out) => {
+				if out.upgrade().is_none() {
+					cmds.entity(id).despawn();
+				} else {
+					task.status = Finished(out);
+				}
+			}
+		}
+	}
+}
diff --git a/rs/src/pickups.rs b/rs/src/pickups.rs
index e77506f..19ee041 100644
--- a/rs/src/pickups.rs
+++ b/rs/src/pickups.rs
@@ -1,7 +1,10 @@
 use crate::{
 	mats::BubbleMaterial,
 	pickups::pickup::PickupItem,
-	player::{player_entity::Arm, RotVel},
+	player::{
+		player_entity::{Arm, Arms},
+		RotVel,
+	},
 };
 use bevy::{
 	math::Vec3Swizzles,
@@ -34,7 +37,7 @@ pub struct PopSfx(pub Handle<AudioSource>);
 
 pub fn setup(mut cmds: Commands, mut meshes: ResMut<Assets<Mesh>>, asset_server: Res<AssetServer>) {
 	cmds.insert_resource(SpawnTimer(Timer::new(
-		Duration::from_secs(5),
+		Duration::from_secs(8),
 		TimerMode::Repeating,
 	)));
 
@@ -83,9 +86,9 @@ pub fn spawn_pickups(
 ) {
 	if timer.tick(t.delta()).finished() {
 		let transform = Transform::from_translation(Vec3::new(
-			rng.generate::<f32>() * 640.0 - 320.0,
-			rng.generate::<f32>() * 640.0 - 320.0,
-			-212.0,
+			rng.generate::<f32>() * 2048.0 - 1024.0,
+			rng.generate::<f32>() * 2048.0 - 1024.0,
+			-768.0,
 		));
 		let points = transform.translation.xy().length() * 0.1 + 10.0;
 
@@ -113,7 +116,8 @@ pub fn spawn_pickups(
 pub fn collect(
 	mut cmds: Commands,
 	ctx: Res<RapierContext>,
-	arms: Query<&RotVel, ERef<Arm>>,
+	arms_q: Query<&RotVel, ERef<Arms>>,
+	arm_q: Query<(), ERef<Arm>>,
 	pickups: Query<(Entity, Pickup, &GlobalTransform, &Collider)>,
 	sfx: Res<PopSfx>,
 	audio: Res<Audio>,
@@ -126,7 +130,8 @@ pub fn collect(
 			col,
 			QueryFilter::exclude_fixed().exclude_rigid_body(id),
 			|other| {
-				if let Ok(rvel) = arms.get(other) {
+				if let Ok(()) = arm_q.get(other) {
+					let rvel = arms_q.single();
 					if **rvel >= 16.0 {
 						audio.play(sfx.0.clone()).with_volume(0.3);
 						match pickup {
@@ -180,12 +185,12 @@ pub struct MissSfx(Handle<AudioSource>);
 pub fn miss(
 	mut cmds: Commands,
 	q: Query<(Entity, &GlobalTransform, Pickup)>,
-	miss_sfx: Res<MissSfx>,
-	audio: Res<Audio>,
+	_miss_sfx: Res<MissSfx>,
+	_audio: Res<Audio>,
 ) {
 	for (id, xform, pickup) in &q {
 		if xform.translation().z > 512.0 {
-			audio.play((**miss_sfx).clone()).with_volume(0.1);
+			// audio.play((**miss_sfx).clone()).with_volume(0.1);
 			match pickup {
 				PickupItem::Health(val) => {
 					let val = (val.0 / 2.0) as i64;
diff --git a/rs/src/planet.rs b/rs/src/planet.rs
new file mode 100644
index 0000000..8f44a5b
--- /dev/null
+++ b/rs/src/planet.rs
@@ -0,0 +1,142 @@
+use bevy::{
+	math::Vec3,
+	prelude::{Component, Deref, DerefMut, Vec2},
+};
+use bevy_rapier3d::{na::Vector2, parry::math::Vector};
+use serde::{Deserialize, Serialize};
+use std::ops::{Add, Sub};
+
+pub mod chunks;
+pub mod sky;
+pub mod terrain;
+
+#[derive(
+	Component, Default, Debug, Copy, Clone, Deref, DerefMut, PartialEq, Serialize, Deserialize,
+)]
+pub struct PlanetVec3(pub Vector<f64>);
+
+impl PlanetVec3 {
+	pub fn new(x: f64, y: f64, z: f64) -> Self {
+		Self(Vector::new(x, y, z))
+	}
+
+	pub fn relative_to(self, other: Self) -> Vec3 {
+		let diff = self - other;
+		diff.into()
+	}
+}
+
+impl From<Vec3> for PlanetVec3 {
+	fn from(value: Vec3) -> Self {
+		Self(Vector::new(value.x as f64, value.y as f64, value.z as f64))
+	}
+}
+
+impl From<PlanetVec3> for Vec3 {
+	fn from(value: PlanetVec3) -> Self {
+		Vec3 {
+			x: value.x as f32,
+			y: value.y as f32,
+			z: value.z as f32,
+		}
+	}
+}
+
+impl Add<PlanetVec3> for PlanetVec3 {
+	type Output = Self;
+
+	fn add(self, rhs: Self) -> Self::Output {
+		Self(*self + *rhs)
+	}
+}
+
+impl Add<Vec3> for PlanetVec3 {
+	type Output = Self;
+
+	fn add(self, rhs: Vec3) -> Self::Output {
+		let rhs = Vector::new(rhs.x as f64, rhs.y as f64, rhs.z as f64);
+		Self(*self + rhs)
+	}
+}
+
+impl Sub<PlanetVec3> for PlanetVec3 {
+	type Output = Self;
+
+	fn sub(self, rhs: Self) -> Self::Output {
+		Self(*self - *rhs)
+	}
+}
+
+impl Sub<Vec3> for PlanetVec3 {
+	type Output = Self;
+
+	fn sub(self, rhs: Vec3) -> Self::Output {
+		let rhs = Vector::new(rhs.x as f64, rhs.y as f64, rhs.z as f64);
+		Self(*self - rhs)
+	}
+}
+
+#[derive(
+	Component, Default, Debug, Copy, Clone, Deref, DerefMut, PartialEq, Serialize, Deserialize,
+)]
+pub struct PlanetVec2(pub Vector2<f64>);
+
+impl PlanetVec2 {
+	pub fn new(x: f64, y: f64) -> Self {
+		Self(Vector2::new(x, y))
+	}
+
+	pub fn relative_to(self, other: Self) -> Vec2 {
+		let diff = self - other;
+		diff.into()
+	}
+}
+
+impl From<Vec2> for PlanetVec2 {
+	fn from(value: Vec2) -> Self {
+		Self(Vector2::new(value.x as f64, value.y as f64))
+	}
+}
+
+impl From<PlanetVec2> for Vec2 {
+	fn from(value: PlanetVec2) -> Self {
+		Vec2 {
+			x: value.x as f32,
+			y: value.y as f32,
+		}
+	}
+}
+
+impl Add<PlanetVec2> for PlanetVec2 {
+	type Output = Self;
+
+	fn add(self, rhs: Self) -> Self::Output {
+		Self(*self + *rhs)
+	}
+}
+
+impl Add<Vec2> for PlanetVec2 {
+	type Output = Self;
+
+	fn add(self, rhs: Vec2) -> Self::Output {
+		let rhs = Vector2::new(rhs.x as f64, rhs.y as f64);
+		Self(*self + rhs)
+	}
+}
+
+impl Sub<PlanetVec2> for PlanetVec2 {
+	type Output = Self;
+
+	fn sub(self, rhs: Self) -> Self::Output {
+		Self(*self - *rhs)
+	}
+}
+
+impl Sub<Vec2> for PlanetVec2 {
+	type Output = Self;
+
+	fn sub(self, rhs: Vec2) -> Self::Output {
+		let rhs = Vector2::new(rhs.x as f64, rhs.y as f64);
+		Self(*self - rhs)
+	}
+}
diff --git a/rs/src/planet/chunks.rs b/rs/src/planet/chunks.rs
new file mode 100644
index 0000000..ba00443
--- /dev/null
+++ b/rs/src/planet/chunks.rs
@@ -0,0 +1,9 @@
+use super::terrain::Ground;
+use crate::planet::PlanetVec3;
+use bevy::prelude::*;
+
+#[derive(Bundle, Debug)]
+pub struct ChunkBundle {
+	pub center: PlanetVec3,
+	pub ground: Ground,
+}
diff --git a/rs/src/planet/sky.rs b/rs/src/planet/sky.rs
new file mode 100644
index 0000000..0838664
--- /dev/null
+++ b/rs/src/planet/sky.rs
@@ -0,0 +1,401 @@
+use bevy::{
+	app::{App, Plugin},
+	asset::Handle,
+};
+
+use bevy::{
+	ecs::{
+		prelude::{Component, Entity},
+		query::With,
+		schedule::IntoSystemConfigs,
+		system::{Commands, Query, Res, ResMut, Resource},
+	},
+	render::{
+		extract_component::{ExtractComponent, ExtractComponentPlugin},
+		render_asset::RenderAssets,
+		render_resource::{
+			BindGroup, BindGroupEntries, BindGroupLayout, BindGroupLayoutDescriptor,
+			BindGroupLayoutEntry, BindingType, BufferBindingType, CachedRenderPipelineId,
+			ColorTargetState, FragmentState, MultisampleState, PipelineCache, PrimitiveState,
+			RenderPipelineDescriptor, Shader, ShaderStages, ShaderType, SpecializedRenderPipeline,
+			SpecializedRenderPipelines, TextureFormat, TextureViewDimension, VertexState,
+		},
+		renderer::RenderDevice,
+		texture::Image,
+		view::{Msaa, ViewUniform, ViewUniforms},
+		Render, RenderApp, RenderSet,
+	},
+};
+
+use bevy::{
+	core_pipeline::{
+		core_3d::{graph::node::MAIN_OPAQUE_PASS, CORE_3D},
+		Skybox,
+	},
+	ecs::query::QueryItem,
+	math::Vec3,
+};
+
+use bevy::{prelude::*, render::camera::ExtractedCamera};
+
+use bevy::render::{
+	globals::{GlobalsBuffer, GlobalsUniform},
+	render_graph::{
+		NodeRunError, OutputSlotError, RenderGraphApp, RenderGraphContext, SlotLabel, ViewNode,
+		ViewNodeRunner,
+	},
+	render_resource::{
+		AsBindGroup, RenderPassColorAttachment, RenderPassDescriptor, TextureView,
+		TextureViewDescriptor,
+	},
+	renderer::RenderContext,
+	texture::FallbackImage,
+	view::ViewUniformOffset,
+};
+
+pub struct SkyPlugin;
+
+impl Plugin for SkyPlugin {
+	fn build(&self, app: &mut App) {
+		// /// Copied from Bevy source since it's not public
+		// const SKYBOX_SHADER_HANDLE: Handle<Shader> = Handle::weak_from_u128(55594763423201);
+		// let mut shaders = app.world.resource_mut::<Assets<Shader>>();
+		// shaders.insert(SKYBOX_SHADER_HANDLE, Shader::from_wgsl(
+		// 	include_str!("skybox.wgsl"),
+		// 	"skybox.wgsl",
+		// ));
+
+		app.add_plugins((ExtractComponentPlugin::<SkyShader>::default(),))
+			.add_systems(Update, notify_skybox_changed);
+
+		let render_app = app.get_sub_app_mut(RenderApp).unwrap();
+		render_app
+			.add_render_graph_node::<ViewNodeRunner<SkyNode>>(CORE_3D, "sky_generator")
+			.add_render_graph_edge(CORE_3D, "sky_generator", MAIN_OPAQUE_PASS)
+			.init_resource::<SpecializedRenderPipelines<SkyPipeline>>()
+			.add_systems(
+				Render,
+				(
+					prepare_sky_pipelines.in_set(RenderSet::Prepare),
+					prepare_sky_bind_groups.in_set(RenderSet::PrepareBindGroups),
+				),
+			);
+	}
+
+	fn finish(&self, app: &mut App) {
+		let render_app = app.get_sub_app_mut(RenderApp).unwrap();
+		let render_device = render_app.world.resource::<RenderDevice>().clone();
+		render_app.insert_resource(SkyPipeline::new(&render_device));
+	}
+}
+
+#[derive(Component, ExtractComponent, Clone, Debug)]
+pub struct SkyShader(pub Handle<Shader>);
+
+pub fn notify_skybox_changed(
+	mut image_asset_events: EventWriter<AssetEvent<Image>>,
+	q: Query<&Skybox, With<SkyShader>>,
+) {
+	for skybox in &q {
+		image_asset_events.send(AssetEvent::Modified { id: skybox.0.id() });
+	}
+}
+
+pub fn prepare_sky_pipelines(
+	mut cmds: Commands,
+	pipeline_cache: Res<PipelineCache>,
+	mut pipelines: ResMut<SpecializedRenderPipelines<SkyPipeline>>,
+	sky_pipeline: Res<SkyPipeline>,
+	msaa: Res<Msaa>,
+	q: Query<(Entity, &Skybox, &ExtractedCamera, &SkyShader)>,
+) {
+	for (id, skybox, _cam, shader) in &q {
+		let pipeline = pipelines.specialize(
+			&pipeline_cache,
+			&sky_pipeline,
+			SkyPipelineKey {
+				skybox: skybox.0.clone(),
+				shader: shader.0.clone(),
+				msaa: msaa.samples(),
+			},
+		);
+		cmds.entity(id).insert(SkyPipelineId(pipeline));
+	}
+}
+
+#[derive(Resource)]
+pub struct SkyPipeline {
+	bind_group_layout: BindGroupLayout,
+}
+
+impl SkyPipeline {
+	fn new(render_device: &RenderDevice) -> Self {
+		let mut entries = SkyCubeUniforms::bind_group_layout_entries(render_device);
+		entries.push(BindGroupLayoutEntry {
+			binding: 1,
+			visibility: ShaderStages::VERTEX_FRAGMENT,
+			ty: BindingType::Buffer {
+				ty: BufferBindingType::Uniform,
+				has_dynamic_offset: true,
+				min_binding_size: Some(ViewUniform::min_size()),
+			},
+			count: None,
+		});
+		entries.push(BindGroupLayoutEntry {
+			binding: 2,
+			visibility: ShaderStages::VERTEX_FRAGMENT,
+			ty: BindingType::Buffer {
+				ty: BufferBindingType::Uniform,
+				has_dynamic_offset: false,
+				min_binding_size: Some(GlobalsUniform::min_size()),
+			},
+			count: None,
+		});
+		Self {
+			bind_group_layout: render_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
+				label: "skybox_bind_group_layout".into(),
+				entries: &entries,
+			}),
+		}
+	}
+}
+
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
+pub struct SkyPipelineKey {
+	skybox: Handle<Image>,
+	shader: Handle<Shader>,
+	msaa: u32,
+}
+
+#[derive(Component, Debug)]
+pub struct SkyPipelineId(CachedRenderPipelineId);
+
+#[derive(Component, Debug)]
+pub struct SkyViews {
+	views: [TextureView; 6],
+	bind_groups: [BindGroup; 6],
+}
+
+impl SpecializedRenderPipeline for SkyPipeline {
+	type Key = SkyPipelineKey;
+
+	fn specialize(&self, key: Self::Key) -> RenderPipelineDescriptor {
+		RenderPipelineDescriptor {
+			label: Some("sky_pipeline".into()),
+			layout: vec![self.bind_group_layout.clone()],
+			push_constant_ranges: vec![],
+			vertex: VertexState {
+				shader: key.shader.clone(),
+				shader_defs: vec![],
+				entry_point: "vertex".into(),
+				buffers: vec![],
+			},
+			primitive: PrimitiveState::default(),
+			depth_stencil: None,
+			multisample: MultisampleState {
+				count: key.msaa,
+				..default()
+			},
+			fragment: Some(FragmentState {
+				shader: key.shader,
+				shader_defs: vec![],
+				entry_point: "fragment".into(),
+				targets: vec![Some(ColorTargetState::from(TextureFormat::Rgba32Float))],
+			}),
+		}
+	}
+}
+
+#[derive(Default)]
+pub struct SkyNode;
+
+impl ViewNode for SkyNode {
+	type ViewQuery = (
+		&'static Skybox,
+		&'static SkyPipelineId,
+		&'static SkyViews,
+		&'static ViewUniformOffset,
+	);
+
+	fn run(
+		&self,
+		_graph: &mut RenderGraphContext,
+		render_context: &mut RenderContext,
+		(skybox, pipeline_id, sky_views, view_uniform_offset): QueryItem<Self::ViewQuery>,
+		world: &World,
+	) -> Result<(), NodeRunError> {
+		let pipeline_cache = world.resource::<PipelineCache>();
+		let images = world.resource::<RenderAssets<Image>>();
+		let Some(_out) = images.get(skybox.0.clone()) else {
+			return Err(OutputSlotError::InvalidSlot(SlotLabel::Name("Skybox".into())).into());
+		};
+
+		let Some(pipeline) = pipeline_cache.get_render_pipeline(pipeline_id.0) else {
+			return Ok(());
+		};
+		let _fallback_image = world.resource::<FallbackImage>();
+		let _sky_pipeline = world.resource::<SkyPipeline>();
+
+		// Option 2: separate pass for each face
+		{
+			for i in 0..6 {
+				let view = &sky_views.views[i];
+
+				let mut render_pass =
+					render_context
+						.command_encoder()
+						.begin_render_pass(&RenderPassDescriptor {
+							label: Some("generate_sky_pass"),
+							color_attachments: &[Some(RenderPassColorAttachment {
+								view,
+								resolve_target: None,
+								ops: default(),
+							})],
+							depth_stencil_attachment: None,
+						});
+
+				render_pass.set_pipeline(pipeline);
+				render_pass.set_bind_group(
+					0,
+					&sky_views.bind_groups[i],
+					&[view_uniform_offset.offset],
+				);
+				render_pass.draw(0..3, 0..1);
+			}
+		}
+
+		Ok(())
+	}
+}
+
+pub static BIND_GROUP_LABELS: [&str; 6] = [
+	"sky_bind_group_1",
+	"sky_bind_group_2",
+	"sky_bind_group_3",
+	"sky_bind_group_4",
+	"sky_bind_group_5",
+	"sky_bind_group_6",
+];
+pub static VIEW_LABELS: [&str; 6] = [
+	"sky_view_1",
+	"sky_view_2",
+	"sky_view_3",
+	"sky_view_4",
+	"sky_view_5",
+	"sky_view_6",
+];
+pub static FACE_ROTATIONS: [Mat3; 6] = [
+	Mat3 {
+		x_axis: Vec3::new(0.0, 0.0, -1.0),
+		y_axis: Vec3::new(0.0, 1.0, 0.0),
+		z_axis: Vec3::new(1.0, 0.0, 0.0),
+	},
+	Mat3 {
+		x_axis: Vec3::new(0.0, 0.0, 1.0),
+		y_axis: Vec3::new(0.0, 1.0, 0.0),
+		z_axis: Vec3::new(-1.0, 0.0, 0.0),
+	},
+	Mat3 {
+		x_axis: Vec3::new(1.0, 0.0, 0.0),
+		y_axis: Vec3::new(0.0, 0.0, 1.0),
+		z_axis: Vec3::new(0.0, -1.0, 0.0),
+	},
+	Mat3 {
+		x_axis: Vec3::new(1.0, 0.0, 0.0),
+		y_axis: Vec3::new(0.0, 0.0, -1.0),
+		z_axis: Vec3::new(0.0, 1.0, 0.0),
+	},
+	Mat3 {
+		x_axis: Vec3::new(1.0, 0.0, 0.0),
+		y_axis: Vec3::new(0.0, 1.0, 0.0),
+		z_axis: Vec3::new(0.0, 0.0, 1.0),
+	},
+	Mat3 {
+		x_axis: Vec3::new(-1.0, 0.0, 0.0),
+		y_axis: Vec3::new(0.0, 1.0, 0.0),
+		z_axis: Vec3::new(0.0, 0.0, -1.0),
+	},
+];
+
+fn prepare_sky_bind_groups(
+	mut commands: Commands,
+	pipeline: Res<SkyPipeline>,
+	view_uniforms: Res<ViewUniforms>,
+	globals: Res<GlobalsBuffer>,
+	images: Res<RenderAssets<Image>>,
+	fallback_image: Res<FallbackImage>,
+	render_device: Res<RenderDevice>,
+	views: Query<(Entity, &Skybox)>,
+	t: Res<Time>,
+) {
+	let s = t.elapsed_seconds_wrapped();
+	let sin_t_z = (s * 0.1).sin();
+	let cos_t_z = (s * 0.1).cos();
+	let sin_t_x = (s * 0.25).sin();
+	let cos_t_x = (s * 0.25).cos();
+	let cube_rotation = Mat3 {
+		x_axis: Vec3::new(sin_t_z, cos_t_z, 0.0),
+		y_axis: Vec3::new(cos_t_z, -sin_t_z, 0.0),
+		z_axis: Vec3::new(0.0, 0.0, 1.0),
+	} * Mat3 {
+		x_axis: Vec3::new(1.0, 0.0, 0.0),
+		y_axis: Vec3::new(0.0, sin_t_x, cos_t_x),
+		z_axis: Vec3::new(0.0, cos_t_x, -sin_t_x),
+	};
+	for (entity, skybox) in &views {
+		if let (Some(skybox), Some(view_uniforms)) =
+			(images.get(&skybox.0), view_uniforms.uniforms.binding())
+		{
+			let bind_groups = array_init::array_init(|i| {
+				let uniforms = SkyCubeUniforms {
+					face_index: i as _,
+					face_width: skybox.size.x,
+					face_rotation: FACE_ROTATIONS[i],
+					rotation: cube_rotation,
+				}
+				.unprepared_bind_group(
+					&SkyCubeUniforms::bind_group_layout(&render_device),
+					&render_device,
+					&images,
+					&fallback_image,
+				)
+				.unwrap();
+				render_device.create_bind_group(
+					BIND_GROUP_LABELS[i],
+					&pipeline.bind_group_layout,
+					&BindGroupEntries::sequential((
+						uniforms.bindings[0].1.get_binding(),
+						view_uniforms.clone(),
+						globals.buffer.binding().unwrap(),
+					)),
+				)
+			});
+
+			let views = array_init::array_init(|i| {
+				skybox.texture.create_view(&TextureViewDescriptor {
+					label: Some(VIEW_LABELS[i]),
+					dimension: Some(TextureViewDimension::D2),
+					base_array_layer: i as _,
+					array_layer_count: Some(1),
+					..default()
+				})
+			});
+
+			commands
+				.entity(entity)
+				.insert(SkyViews { views, bind_groups });
+		}
+	}
+}
+
+#[derive(AsBindGroup, Default)]
+pub struct SkyCubeUniforms {
+	#[uniform(0)]
+	face_index: u32,
+	#[uniform(0)]
+	face_width: f32,
+	#[uniform(0)]
+	face_rotation: Mat3,
+	#[uniform(0)]
+	rotation: Mat3,
+}
diff --git a/rs/src/planet/terrain.rs b/rs/src/planet/terrain.rs
new file mode 100644
index 0000000..ea5770e
--- /dev/null
+++ b/rs/src/planet/terrain.rs
@@ -0,0 +1,354 @@
+use crate::{
+	nav::FnsThatShouldBePub,
+	offloading::{wasm_yield, Offload, OffloadedTask, TaskHandle, TaskOffloader},
+	planet::{
+		terrain::noise::{ChooseAndSmooth, Source, SyncWorley},
+		PlanetVec2, PlanetVec3,
+	},
+	util::{Factory, Spawnable},
+};
+use ::noise::{
+	Add, Billow, Fbm, HybridMulti, MultiFractal, NoiseFn, Perlin, RidgedMulti, ScaleBias, Seedable,
+	Value,
+};
+use bevy::{
+	ecs::system::{EntityCommands, SystemParamItem},
+	prelude::*,
+	render::mesh::{PrimitiveTopology, VertexAttributeValues::Float32x3},
+};
+use bevy_rapier3d::{parry::shape::SharedShape, prelude::*};
+use rapier3d::{
+	geometry::HeightField,
+	na::{DMatrix, Vector3},
+};
+use std::{f32::consts::*, sync::Arc};
+
+pub mod noise;
+
+const CHUNK_WIDTH: usize = 128;
+const CHUNK_SCALE: Vector3<f32> = Vector3::new(2048.0, 1024.0, 2048.0);
+
+pub type Noise = ChooseAndSmooth<4>;
+
+pub fn plugin(app: &mut App) -> &mut App {
+	app.add_systems(Startup, setup)
+		.add_systems(PostStartup, spawn_boxes)
+		.insert_resource(ChunkLoadingTasks::default())
+		.add_systems(Update, spawn_loaded_chunks)
+}
+
+pub fn setup(
+	mut cmds: Commands,
+	mut materials: ResMut<Assets<StandardMaterial>>,
+	mut meshes: ResMut<Assets<Mesh>>,
+	mut chunk_loading_tasks: ResMut<ChunkLoadingTasks>,
+	mut task_offloader: TaskOffloader,
+) {
+	let material = materials.add(StandardMaterial {
+		base_color: Color::rgb(0.1, 0.1, 0.1),
+		reflectance: 0.3,
+		perceptual_roughness: 0.0,
+		..default()
+	});
+
+	cmds.insert_resource(TerrainMaterial(material.clone()));
+
+	// Add is not Clone, so we'll use a closer to get multiple copies
+	let base = || {
+		Add::new(
+			ScaleBias::new(
+				HybridMulti::<Value>::default()
+					.set_frequency(0.00032)
+					.set_persistence(0.5),
+			)
+			.set_scale(2.0),
+			Fbm::<Perlin>::default()
+				.set_frequency(0.00128)
+				.set_octaves(2)
+				.set_persistence(0.45),
+		)
+	};
+
+	let strength_noise = Fbm::<Perlin>::default()
+		.set_frequency(0.00128)
+		.set_octaves(2);
+
+	let perlin = Source::new(
+		Add::new(
+			ScaleBias::new(
+				Fbm::<Perlin>::default()
+					.set_frequency(0.0256)
+					.set_persistence(0.45),
+			)
+			.set_scale(0.05),
+			base(),
+		),
+		strength_noise.clone(),
+		// Constant::new(-1.0),
+	);
+
+	let worley = Source::new(
+		Add::new(
+			ScaleBias::new(SyncWorley::default().set_frequency(0.05)).set_scale(0.1),
+			base(),
+		),
+		strength_noise.clone().set_seed(1),
+		// Constant::new(-1.0),
+	);
+
+	let billow = Source::new(
+		Add::new(
+			ScaleBias::new(
+				Billow::<Perlin>::default()
+					.set_frequency(0.02)
+					.set_octaves(2),
+			)
+			.set_scale(0.04),
+			base(),
+		),
+		strength_noise.clone().set_seed(2),
+		// Constant::new(-1.0),
+	);
+
+	let ridged = Source::new(
+		Add::new(
+			ScaleBias::new(RidgedMulti::<Perlin>::default().set_frequency(0.02)).set_scale(0.07),
+			base(),
+		),
+		strength_noise.clone().set_seed(3),
+		// Constant::new(-1.0),
+	);
+
+	let noise = ChooseAndSmooth::new([perlin, worley, billow, ridged]);
+
+	let noise = Arc::new(noise);
+
+	let (columns, rows) = (CHUNK_WIDTH, CHUNK_WIDTH);
+
+	{
+		let noise = noise.clone();
+		let center = PlanetVec2::new(0.0, 0.0);
+		chunk_loading_tasks.push((
+			center,
+			task_offloader.start(async move {
+				let heights = noise
+					.generate_map(PlanetVec2::new(0.0, 0.0), rows, columns)
+					.await;
+				let heights =
+					HeightField::new(DMatrix::from_vec(rows, columns, heights), CHUNK_SCALE);
+
+				fn face_normal(a: [f32; 3], b: [f32; 3], c: [f32; 3]) -> [f32; 3] {
+					let (a, b, c) = (Vec3::from(a), Vec3::from(b), Vec3::from(c));
+					(b - a).cross(c - a).normalize().into()
+				}
+
+				let mut vertices = Vec::with_capacity(heights.num_triangles() * 3);
+				let mut normals = Vec::with_capacity(vertices.len());
+				for (i, tri) in heights.triangles().enumerate() {
+					let tri = [
+						[
+							tri.a.x + center.x as f32,
+							tri.a.y + center.y as f32,
+							tri.a.z,
+						],
+						[
+							tri.b.x + center.x as f32,
+							tri.b.y + center.y as f32,
+							tri.b.z,
+						],
+						[
+							tri.c.x + center.x as f32,
+							tri.c.y + center.y as f32,
+							tri.c.z,
+						],
+					];
+
+					vertices.extend_from_slice(&tri);
+					let normal = face_normal(tri[0], tri[1], tri[2]);
+					normals.extend_from_slice(&[normal; 3]);
+					if i % 1024 == 0 {
+						wasm_yield().await;
+					}
+				}
+
+				let mut mesh = Mesh::new(PrimitiveTopology::TriangleList);
+				mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, Float32x3(vertices));
+				mesh.insert_attribute(Mesh::ATTRIBUTE_NORMAL, normals);
+
+				(heights, mesh)
+			}),
+		));
+	}
+
+	let planet_noise = PlanetHeightSource::new(noise);
+
+	cmds.insert_resource(planet_noise);
+
+	let mesh = Mesh::from(shape::Cube { size: 64.0 });
+	let collider = Collider::cuboid(32.0, 32.0, 32.0);
+	let mesh = meshes.add(mesh);
+
+	cmds.insert_resource(TerrainTemplate {
+		mesh,
+		material,
+		collider,
+	});
+}
+
+pub fn spawn_boxes(mut factory: Factory<TerrainObject>) {
+	factory.spawn(Transform::from_translation(Vec3::new(0.0, 0.0, -48.0)));
+	factory.spawn(Transform {
+		translation: Vec3::new(-40.0, -8.0, -44.0),
+		rotation: Quat::from_euler(EulerRot::ZXY, 0.0, 0.0, -FRAC_PI_3),
+		..default()
+	});
+	factory.spawn(Transform {
+		translation: Vec3::new(42.0, 24.0, -36.0),
+		rotation: Quat::from_rotation_y(FRAC_PI_4),
+		..default()
+	});
+	factory.spawn(Transform::from_translation(Vec3::new(-32.0, 42.0, -44.0)));
+	factory.spawn(Transform::from_translation(Vec3::new(-64.0, 72.0, -32.0)));
+	factory.spawn(Transform::from_translation(Vec3::new(-96.0, 0.0, -64.0)));
+	factory.spawn(Transform {
+		translation: Vec3::new(-24.0, 96.0, 16.0),
+		rotation: Quat::from_rotation_x(FRAC_PI_3),
+		..default()
+	});
+}
+
+/// Share mesh, material, and collider amongst multiple `TerrainObjects`
+#[derive(Resource, Clone)]
+pub struct TerrainTemplate {
+	pub mesh: Handle<Mesh>,
+	pub material: Handle<StandardMaterial>,
+	pub collider: Collider,
+}
+
+impl Spawnable for TerrainObject {
+	type Params = Res<'static, TerrainTemplate>;
+	type InstanceData = Transform;
+
+	fn spawn<'w, 's, 'a>(
+		cmds: &'a mut Commands<'w, 's>,
+		params: &mut SystemParamItem<'w, 's, Self::Params>,
+		transform: Transform,
+	) -> EntityCommands<'w, 's, 'a> {
+		cmds.spawn(TerrainObject {
+			mat_mesh_bundle: PbrBundle {
+				mesh: params.mesh.clone(),
+				material: params.material.clone(),
+				transform,
+				..default()
+			},
+			collider: params.collider.clone(),
+			..default()
+		})
+	}
+}
+
+#[derive(Bundle)]
+pub struct TerrainObject {
+	pub mat_mesh_bundle: PbrBundle,
+	pub rigid_body: RigidBody,
+	pub collider: Collider,
+	pub restitution: Restitution,
+	pub friction: Friction,
+	pub ccd: Ccd,
+}
+
+impl Default for TerrainObject {
+	fn default() -> Self {
+		Self {
+			mat_mesh_bundle: PbrBundle::default(),
+			rigid_body: RigidBody::Fixed,
+			collider: Collider::default(),
+			restitution: Restitution::new(0.5),
+			friction: Friction::new(0.01),
+			ccd: Ccd::disabled(),
+		}
+	}
+}
+
+#[derive(Component, Debug, Clone)]
+pub struct Ground {
+	pub heights: Arc<HeightField>,
+}
+
+#[derive(Resource)]
+pub struct PlanetHeightSource {
+	pub noise: Arc<Noise>,
+}
+
+impl PlanetHeightSource {
+	pub fn new(noise: impl Into<Arc<Noise>>) -> Self {
+		Self {
+			noise: noise.into(),
+		}
+	}
+	pub fn local(&self, center: PlanetVec2, size: Vec2) -> LocalHeightSource {
+		LocalHeightSource {
+			center,
+			noise: self.noise.clone(),
+			size,
+		}
+	}
+}
+
+pub struct LocalHeightSource {
+	pub center: PlanetVec2,
+	pub noise: Arc<Noise>,
+	pub size: Vec2,
+}
+
+impl LocalHeightSource {
+	pub fn get(&self, j: usize, i: usize) -> f32 {
+		let local = Vec2 {
+			x: j as f32 - self.size.x * 0.5,
+			y: i as f32 - self.size.y * 0.5,
+		};
+		let point = self.center + local;
+		self.noise.get([point.x, point.y]) as f32
+	}
+}
+
+#[derive(Resource, Default, Deref, DerefMut)]
+pub struct ChunkLoadingTasks(Vec<(PlanetVec2, TaskHandle<(HeightField, Mesh)>)>);
+
+#[derive(Resource, Clone, Debug, Deref, DerefMut)]
+pub struct TerrainMaterial(Handle<StandardMaterial>);
+
+pub fn spawn_loaded_chunks(
+	mut cmds: Commands,
+	mut tasks: ResMut<ChunkLoadingTasks>,
+	mut meshes: ResMut<Assets<Mesh>>,
+	mat: Res<TerrainMaterial>,
+) {
+	tasks.retain_mut(|(_center, task)| {
+		if let Some((heights, mesh)) = task.check() {
+			let mesh = meshes.add(mesh);
+			let heights = Arc::new(heights);
+			cmds.spawn((
+				PlanetVec3::default(),
+				RigidBody::Fixed,
+				Collider::from(SharedShape(heights.clone())),
+				PbrBundle {
+					mesh,
+					transform: Transform {
+						translation: Vec3::new(0.0, 0.0, -768.0),
+						rotation: Quat::from_rotation_x(FRAC_PI_2),
+						..default()
+					},
+					material: mat.0.clone(),
+					..default()
+				},
+				Ground { heights },
+			));
+			// remove from vec
+			false
+		} else {
+			// try again next frame
+			true
+		}
+	})
+}
diff --git a/rs/src/planet/terrain/noise.rs b/rs/src/planet/terrain/noise.rs
new file mode 100644
index 0000000..e6195fe
--- /dev/null
+++ b/rs/src/planet/terrain/noise.rs
@@ -0,0 +1,256 @@
+use crate::{offloading::wasm_yield, planet::PlanetVec2};
+use noise::{
+	core::worley::{distance_functions, worley_2d, ReturnType},
+	permutationtable::PermutationTable,
+	NoiseFn, Seedable,
+};
+use ordered_float::OrderedFloat;
+
+use std::f64::consts::PI;
+
+use std::sync::Arc;
+
+type OF64 = OrderedFloat<f64>;
+const KERNEL_WIDTH: usize = 25;
+
+/// Approximation of a gaussian function for the convolution kernel, using cosine to force
+/// a definite integral of as close to 1 as possible with `f64` math for the whole kernel.
+// TODO: Generate kernel in a macro to get more accuracy and potentially performance
+fn kernel_coef(x: f64, y: f64) -> f64 {
+	let kernel_radius = (KERNEL_WIDTH - 1) as f64 * 0.5;
+	let len = ((x * x) + (y * y)).sqrt();
+	let t = f64::min(len / kernel_radius, 1.0);
+	((t * PI).cos() + 1.0) / (kernel_radius * kernel_radius * ((PI * PI) - 4.0) / PI)
+}
+
+pub struct ChooseAndSmooth<const N: usize> {
+	pub sources: [Source; N],
+}
+
+impl<const N: usize> ChooseAndSmooth<N> {
+	pub fn new(sources: [Source; N]) -> Self {
+		Self { sources }
+	}
+
+	fn strongest_at(&self, point: [f64; 2]) -> usize {
+		self.sources
+			.iter()
+			.map(|source| OF64::from(source.strength.get(point)))
+			.enumerate()
+			.max_by_key(|(_, val)| *val)
+			.unwrap()
+			.0
+	}
+
+	// Needs to be async to allow splitting work over multiple frames on WASM
+	pub async fn generate_map(&self, center: PlanetVec2, rows: usize, columns: usize) -> Vec<f32> {
+		// Extra space around edges for blurring
+		let winner_rows = rows + KERNEL_WIDTH - 1;
+		let winner_cols = columns + KERNEL_WIDTH - 1;
+
+		let mut winners = Vec::with_capacity(winner_rows * winner_cols);
+		let mut ret = Vec::with_capacity(rows * columns);
+
+		for x in 0..winner_cols {
+			for y in 0..winner_rows {
+				winners.push(self.strongest_at([
+					center.x + (x as f64 - (winner_rows as f64 * 0.5)),
+					center.y + (y as f64 - (winner_cols as f64 * 0.5)),
+				]) as u8)
+			}
+			if x % 4 == 0 {
+				wasm_yield().await;
+			}
+		}
+
+		for x in 0..columns {
+			for y in 0..rows {
+				let point = [
+					center.x + (x as f64 - (rows as f64 * 0.5)),
+					center.y + (y as f64 - (columns as f64 * 0.5)),
+				];
+				let mut value_caches = [None; N];
+				let mut sum = 0.0;
+
+				// Gaussian blur kernel convolution
+				for j in 0..KERNEL_WIDTH {
+					for i in 0..KERNEL_WIDTH {
+						let strongest = winners[((x + j) * winner_rows) + y + i] as usize;
+
+						let i = i as f64;
+						let j = j as f64;
+						let radius = (KERNEL_WIDTH - 1) as f64 * 0.5;
+
+						sum += *value_caches[strongest]
+							.get_or_insert_with(|| self.sources[strongest].noise.get(point))
+							* kernel_coef(i - radius, j - radius)
+					}
+				}
+				ret.push(sum as f32)
+			}
+			if x % 4 == 0 {
+				wasm_yield().await;
+			}
+		}
+
+		ret
+	}
+}
+
+impl<const N: usize> NoiseFn<f64, 2> for ChooseAndSmooth<N> {
+	fn get(&self, point: [f64; 2]) -> f64 {
+		let mut value_caches = [None; N];
+		let mut sum = 0.0;
+
+		// Gaussian blur kernel convolution
+		for j in -((KERNEL_WIDTH / 2) as isize)..=((KERNEL_WIDTH / 2) as isize) {
+			for i in -((KERNEL_WIDTH / 2) as isize)..=((KERNEL_WIDTH / 2) as isize) {
+				let j = j as f64;
+				let i = i as f64;
+
+				let cell = [point[0] + j, point[1] + i];
+				let strongest = self.strongest_at(cell);
+				sum += *value_caches[strongest]
+					.get_or_insert_with(|| self.sources[strongest].noise.get(point))
+					/ kernel_coef(i, j)
+			}
+		}
+		sum
+	}
+}
+
+pub struct Source {
+	pub noise: Box<dyn NoiseFn<f64, 2> + Send + Sync>,
+	pub strength: Box<dyn NoiseFn<f64, 2> + Send + Sync>,
+}
+
+impl Source {
+	pub fn new(
+		source: impl NoiseFn<f64, 2> + Send + Sync + 'static,
+		strength: impl NoiseFn<f64, 2> + Send + Sync + 'static,
+	) -> Self {
+		Self {
+			noise: Box::new(source),
+			strength: Box::new(strength),
+		}
+	}
+}
+
+/// Workaround for the fact that `::noise::Worley` contains a non-Send/Sync distance function pointer.
+/// Copied from `noise` crate, but with  `Rc<dyn Fn(&[f64], &[f64]) -> f64>` replaced by `Arc<
+/// dyn Fn(&[f64], &[f64]) -> f64 + Send + Sync>`
+pub struct SyncWorley {
+	/// Specifies the distance function to use when calculating the boundaries of
+	/// the cell.
+	pub distance_function: Arc<DistanceFunction>,
+
+	/// Signifies whether the distance from the borders of the cell should be returned, or the
+	/// value for the cell.
+	pub return_type: ReturnType,
+
+	/// Frequency of the seed points.
+	pub frequency: f64,
+
+	seed: u32,
+	perm_table: PermutationTable,
+}
+
+pub type DistanceFunction = dyn Fn(&[f64], &[f64]) -> f64 + Send + Sync;
+
+impl SyncWorley {
+	pub const DEFAULT_SEED: u32 = 0;
+	pub const DEFAULT_FREQUENCY: f64 = 1.0;
+
+	pub fn new(seed: u32) -> Self {
+		Self {
+			perm_table: PermutationTable::new(seed),
+			seed,
+			distance_function: Arc::new(distance_functions::euclidean),
+			return_type: ReturnType::Value,
+			frequency: Self::DEFAULT_FREQUENCY,
+		}
+	}
+
+	/// Sets the distance function used by the Worley cells.
+	pub fn set_distance_function<F>(self, function: F) -> Self
+	where
+		F: Fn(&[f64], &[f64]) -> f64 + Send + Sync + 'static,
+	{
+		Self {
+			distance_function: Arc::new(function),
+			..self
+		}
+	}
+
+	/// Enables or disables applying the distance from the nearest seed point
+	/// to the output value.
+	pub fn set_return_type(self, return_type: ReturnType) -> Self {
+		Self {
+			return_type,
+			..self
+		}
+	}
+
+	/// Sets the frequency of the seed points.
+	pub fn set_frequency(self, frequency: f64) -> Self {
+		Self { frequency, ..self }
+	}
+}
+
+impl Default for SyncWorley {
+	fn default() -> Self {
+		Self::new(Self::DEFAULT_SEED)
+	}
+}
+
+impl Seedable for SyncWorley {
+	/// Sets the seed value used by the Worley cells.
+	fn set_seed(self, seed: u32) -> Self {
+		// If the new seed is the same as the current seed, just return self.
+		if self.seed == seed {
+			return self;
+		}
+
+		// Otherwise, regenerate the permutation table based on the new seed.
+		Self {
+			perm_table: PermutationTable::new(seed),
+			seed,
+			..self
+		}
+	}
+
+	fn seed(&self) -> u32 {
+		self.seed
+	}
+}
+
+impl NoiseFn<f64, 2> for SyncWorley {
+	fn get(&self, point: [f64; 2]) -> f64 {
+		worley_2d(
+			&self.perm_table,
+			&*self.distance_function,
+			self.return_type,
+			[point[0] * self.frequency, point[1] * self.frequency],
+		)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn kernel_integral_1() {
+		let offset = (KERNEL_WIDTH - 1) as f64 * 0.5;
+		let mut sum = 0.0;
+		for x in 0..KERNEL_WIDTH {
+			for y in 0..=KERNEL_WIDTH {
+				let y = y as f64 - offset;
+				let x = x as f64 - offset;
+				sum += kernel_coef(x, y);
+			}
+		}
+		let diff = (sum - 1.0).abs();
+		assert!(diff < 1.0e-3, "{sum}");
+	}
+}
diff --git a/rs/src/player.rs b/rs/src/player.rs
index 0b5ba9f..2030971 100644
--- a/rs/src/player.rs
+++ b/rs/src/player.rs
@@ -1,10 +1,12 @@
-use crate::{terminal_velocity, AbsoluteBounds, TerminalVelocity, R_E};
+use crate::{terminal_velocity, TerminalVelocity, R_EPS};
+
 use bevy::{
 	ecs::system::EntityCommands,
 	prelude::{
 		shape::{Icosphere, RegularPolygon},
 		*,
 	},
+	utils::HashSet,
 };
 use bevy_rapier3d::{
 	control::KinematicCharacterController,
@@ -23,6 +25,7 @@ use particles::{
 	InitialGlobalTransform, InitialTransform, Lifetime, ParticleBundle, PreviousGlobalTransform,
 	PreviousTransform, Spewer, SpewerBundle,
 };
+use rapier3d::{math::Point, prelude::Aabb};
 use std::{
 	f32::consts::*,
 	num::NonZeroU8,
@@ -40,64 +43,67 @@ pub const ACCEL: f32 = 3.0;
 pub const PLAYER_GRAVITY: f32 = 64.0;
 pub const MAX_JUMPS: f32 = 2.0;
 pub const JUMP_VEL: f32 = 64.0;
-pub const CLIMB_ANGLE: f32 = FRAC_PI_3 - R_E;
-pub const SLIDE_ANGLE: f32 = FRAC_PI_3 - R_E;
+pub const CLIMB_ANGLE: f32 = FRAC_PI_3 - R_EPS;
+pub const SLIDE_ANGLE: f32 = FRAC_PI_3 - R_EPS;
 pub const HOVER_HEIGHT: f32 = 2.0;
-const G1: bevy_rapier3d::geometry::Group = bevy_rapier3d::geometry::Group::GROUP_1;
+const G1: Group = Group::GROUP_1;
 
 pub fn plugin(app: &mut App) -> &mut App {
 	app.fn_plugin(input::plugin)
 		.add_systems(Startup, setup)
-		.add_systems(PreUpdate, ctrl::gravity)
-		.add_systems(PreUpdate, ctrl::repel_ground.after(ctrl::gravity))
-		// .add_systems(Update, tick_cooldown::<Jump>)
-		.add_systems(PreUpdate, ctrl::reset_jump_on_ground)
 		.add_systems(
 			Update,
 			(
+				ctrl::gravity,
+				ctrl::repel_ground.after(ctrl::gravity),
+				ctrl::reset_jump_on_ground.after(ctrl::repel_ground),
 				input::movement_input.before(terminal_velocity),
-				input::look_input.before(terminal_velocity),
-				camera::position_target.after(input::look_input),
+				camera::position_target.after(terminal_velocity),
 				camera::follow_target.after(camera::position_target),
 				ctrl::move_player.after(terminal_velocity),
 				idle,
 			),
 		)
-		.add_systems(Last, reset_oob)
+		.add_systems(
+			Last,
+			(reset_oob, countdown_respawn, spawn_players, kill_on_key),
+		)
+		.add_event::<PlayerSpawnEvent>();
+	app
 }
 
-fn setup(
+pub fn setup(
 	mut cmds: Commands,
 	mut materials: ResMut<Assets<StandardMaterial>>,
 	mut meshes: ResMut<Assets<Mesh>>,
+	mut images: ResMut<Assets<Image>>,
 	asset_server: Res<AssetServer>,
 	settings: Res<Settings>,
+	mut spawn_events: EventWriter<PlayerSpawnEvent>,
 ) {
+	cmds.insert_resource(PlayerBounds {
+		aabb: Aabb::new(
+			Point::new(-16384.0, -16384.0, -8192.0),
+			Point::new(16384.0, 16384.0, 8192.0),
+		),
+	});
+
 	let id = unsafe { PlayerId::new_unchecked(1) };
-	spawn_camera(&mut cmds, id, &settings);
+	spawn_camera(&mut cmds, id, &settings, &mut images, &asset_server);
 
 	let aoe_sfx = asset_server.load("sfx/SFX_-_magic_spell_03.ogg");
 	cmds.insert_resource(AoESound(aoe_sfx));
 
-	let ship = asset_server.load("ships/player.glb#Scene0");
-	let vis = SceneBundle {
-		scene: ship,
-		// transform: Transform {
-		// 	translation: Vec3::new(-1.875, -0.625, 0.25),
-		// 	rotation: Quat::from_rotation_y(FRAC_PI_4),
-		// 	scale: Vec3::splat(0.75),
-		// },
-		..default()
-	};
+	let ship_scene = asset_server.load("ships/player.glb#Scene0");
 
-	let particle_mesh = Mesh::from(shape::Torus {
+	let antigrav_pulse_mesh = Mesh::from(shape::Torus {
 		radius: 0.640,
 		ring_radius: 0.064,
 		subdivisions_segments: 6,
 		subdivisions_sides: 3,
 	});
-	let particle_mesh = meshes.add(particle_mesh);
-	let particle_material = materials.add(StandardMaterial {
+	let antigrav_pulse_mesh = meshes.add(antigrav_pulse_mesh);
+	let antigrav_pulse_mat = materials.add(StandardMaterial {
 		// base_color: Color::rgba(0.0, 1.0, 0.5, 0.3),
 		base_color: Color::NONE,
 		emissive: Color::rgb(0.0, 12.0, 7.2),
@@ -105,72 +111,55 @@ fn setup(
 		..default()
 	});
 
-	let particle_mesh = MaterialMeshBundle {
-		mesh: particle_mesh,
-		material: particle_material,
-		..default()
-	};
-
-	let arm = Mesh::try_from(Icosphere {
+	let arm_mesh = Mesh::try_from(Icosphere {
 		radius: 0.3,
 		subdivisions: 2,
 	})
 	.expect("create icosphere mesh");
-	let arm_mesh = meshes.add(arm);
-	let arm1 = MaterialMeshBundle::<StandardMaterial> {
-		mesh: arm_mesh.clone(),
-		material: materials.add(StandardMaterial {
-			base_color: Color::NONE,
-			emissive: Color::GREEN * 6.0,
-			reflectance: 0.0,
-			double_sided: true,
-			cull_mode: None,
-			..default()
-		}),
-		transform: Transform::from_translation(Vec3::X * 2.0),
+	let arm_mesh = meshes.add(arm_mesh);
+	let arm_particle_mesh = meshes.add(Mesh::from(RegularPolygon::new(0.1, 3)));
+	let arm_mat_template = StandardMaterial {
+		base_color: Color::NONE,
+		reflectance: 0.0,
+		double_sided: true,
+		cull_mode: None,
 		..default()
 	};
-	let arm2 = MaterialMeshBundle::<StandardMaterial> {
-		mesh: arm_mesh.clone(),
-		material: materials.add(StandardMaterial {
-			base_color: Color::NONE,
+	let arm_mats = [
+		materials.add(StandardMaterial {
+			emissive: Color::GREEN * 6.0,
+			..arm_mat_template.clone()
+		}),
+		materials.add(StandardMaterial {
 			emissive: Color::WHITE * 6.0,
-			reflectance: 0.0,
-			double_sided: true,
-			cull_mode: None,
-			..default()
+			..arm_mat_template.clone()
 		}),
-		transform: Transform::from_translation(
-			Quat::from_rotation_z(FRAC_PI_3 * 2.0) * Vec3::X * 2.0,
-		),
-		..default()
-	};
-	let arm3 = MaterialMeshBundle::<StandardMaterial> {
-		mesh: arm_mesh,
-		material: materials.add(StandardMaterial {
-			base_color: Color::NONE,
+		materials.add(StandardMaterial {
 			emissive: Color::CYAN * 6.0,
-			reflectance: 0.0,
-			double_sided: true,
-			cull_mode: None,
-			..default()
+			..arm_mat_template
 		}),
-		transform: Transform::from_translation(
-			Quat::from_rotation_z(FRAC_PI_3 * 4.0) * Vec3::X * 2.0,
-		),
-		..default()
-	};
-
-	let arm_particle_mesh = meshes.add(Mesh::from(RegularPolygon::new(0.1, 3)));
+	];
 
-	use PlayerArm::*;
-	cmds.spawn_player(
-		id,
-		vis,
-		particle_mesh,
-		[(arm1, A), (arm2, B), (arm3, C)],
+	cmds.insert_resource(PlayerSpawnData {
+		ship_scene,
+		arm_mesh,
+		antigrav_pulse_mesh,
+		antigrav_pulse_mat,
 		arm_particle_mesh,
-	);
+		arm_mats,
+	});
+
+	spawn_events.send(PlayerSpawnEvent { id });
+}
+
+#[derive(Resource, Clone, Debug)]
+pub struct PlayerSpawnData {
+	pub ship_scene: Handle<Scene>,
+	pub antigrav_pulse_mesh: Handle<Mesh>,
+	pub antigrav_pulse_mat: Handle<StandardMaterial>,
+	pub arm_mesh: Handle<Mesh>,
+	pub arm_particle_mesh: Handle<Mesh>,
+	pub arm_mats: [Handle<StandardMaterial>; 3],
 }
 
 #[derive(EnumComponent)]
@@ -178,20 +167,21 @@ fn setup(
 pub enum PlayerEntity {
 	Root,
 	Controller,
-	Vis,
-	VisNode,
+	Ship,
+	ShipCenter,
 	CamPivot,
 	Cam,
 	HoverParticle,
+	Arms,
 	Arm(PlayerArm),
-	OrbitalParticle,
 }
-use crate::settings::Settings;
 use crate::{
 	player::{
+		ctrl::CtrlState,
 		input::{AoESound, PlayerAction},
 		prefs::PlayerPrefs,
 	},
+	settings::Settings,
 	util::FnPluginExt,
 };
 use player_entity::*;
@@ -205,7 +195,7 @@ pub enum PlayerArm {
 
 pub type PlayerId = NonZeroU8;
 
-#[derive(Component, Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Component, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct BelongsToPlayer(PlayerId);
 
 impl BelongsToPlayer {
@@ -222,29 +212,59 @@ impl BelongsToPlayer {
 	}
 }
 
-pub trait SpawnPlayer<'c, 'w: 'c, 's: 'c> {
-	fn spawn_player(
-		&'c mut self,
-		id: PlayerId,
-		scene: SceneBundle,
-		particle_mesh: MaterialMeshBundle<StandardMaterial>,
-		arm_meshes: [(MaterialMeshBundle<StandardMaterial>, PlayerArm); 3],
-		arm_particle_mesh: Handle<Mesh>,
-	) -> EntityCommands<'w, 's, 'c>;
-}
+pub fn spawn_players(
+	mut cmds: Commands,
+	spawn_data: Res<PlayerSpawnData>,
+	mut events: ResMut<Events<PlayerSpawnEvent>>,
+) {
+	for event in events.drain() {
+		let PlayerSpawnData {
+			ship_scene,
+			antigrav_pulse_mesh,
+			antigrav_pulse_mat,
+			arm_mesh,
+			arm_particle_mesh,
+			arm_mats: [mat_a, mat_b, mat_c],
+		} = spawn_data.clone();
+
+		let vis = SceneBundle {
+			scene: ship_scene,
+			..default()
+		};
+
+		let antigrav_pulse_mesh = MaterialMeshBundle {
+			mesh: antigrav_pulse_mesh,
+			material: antigrav_pulse_mat,
+			..default()
+		};
+
+		let arm1 = MaterialMeshBundle::<StandardMaterial> {
+			mesh: arm_mesh.clone(),
+			material: mat_a,
+			transform: Transform::from_translation(Vec3::X * 2.0),
+			..default()
+		};
+		let arm2 = MaterialMeshBundle::<StandardMaterial> {
+			mesh: arm_mesh.clone(),
+			material: mat_b,
+			transform: Transform::from_translation(
+				Quat::from_rotation_z(FRAC_PI_3 * 2.0) * Vec3::X * 2.0,
+			),
+			..default()
+		};
+		let arm3 = MaterialMeshBundle::<StandardMaterial> {
+			mesh: arm_mesh,
+			material: mat_c,
+			transform: Transform::from_translation(
+				Quat::from_rotation_z(FRAC_PI_3 * 4.0) * Vec3::X * 2.0,
+			),
+			..default()
+		};
 
-impl<'c, 'w: 'c, 's: 'c> SpawnPlayer<'c, 'w, 's> for Commands<'w, 's> {
-	fn spawn_player(
-		&'c mut self,
-		id: PlayerId,
-		vis: SceneBundle,
-		particle_mesh: MaterialMeshBundle<StandardMaterial>,
-		arm_meshes: [(MaterialMeshBundle<StandardMaterial>, PlayerArm); 3],
-		arm_particle_mesh: Handle<Mesh>,
-	) -> EntityCommands<'w, 's, 'c> {
+		let id = event.id;
 		let owner = BelongsToPlayer::with_id(id);
 		let char_collider = Collider::ball(1.2);
-		let mut root = self.spawn((
+		let mut root = cmds.spawn((
 			owner,
 			TerminalVelocity(Velocity {
 				linvel: Vect::splat(128.0),
@@ -259,48 +279,92 @@ impl<'c, 'w: 'c, 's: 'c> SpawnPlayer<'c, 'w, 's> for Commands<'w, 's> {
 			},
 			VisibilityBundle::default(),
 		));
-		root.set_enum(player_entity::Root);
+		root.set_enum(Root);
 
-		root.with_children(|builder| {
-			builder
-				.spawn((
-					owner,
-					char_collider,
-					TransformBundle::default(),
-					CtrlVel::default(),
-					CollisionGroups::new(Group::GROUP_1, !Group::GROUP_1),
-					KinematicCharacterController {
-						up: Vect::Z,
-						snap_to_ground: None,
-						autostep: None,
-						max_slope_climb_angle: CLIMB_ANGLE,
-						min_slope_slide_angle: SLIDE_ANGLE,
-						filter_flags: QueryFilterFlags::EXCLUDE_SENSORS,
-						filter_groups: Some(CollisionGroups::new(G1, !G1)),
-						..default()
-					},
-					InputManagerBundle::<PlayerAction> {
-						input_map: PlayerPrefs::default().input_map,
-						..default()
-					},
-					PlayerAction::abilities_bundle(),
-				))
-				.set_enum(player_entity::Controller);
-		});
-		player_vis(&mut root, owner, vis, particle_mesh);
-		player_arms(&mut root, owner, arm_meshes, arm_particle_mesh);
-		root
+		build_player_scene(
+			&mut root,
+			owner,
+			vis,
+			char_collider,
+			antigrav_pulse_mesh,
+			[
+				(arm1, PlayerArm::A),
+				(arm2, PlayerArm::B),
+				(arm3, PlayerArm::C),
+			],
+			arm_particle_mesh,
+		);
 	}
 }
 
+fn build_player_scene(
+	root: &mut EntityCommands,
+	owner: BelongsToPlayer,
+	vis: SceneBundle,
+	char_collider: Collider,
+	particle_mesh: MaterialMeshBundle<StandardMaterial>,
+	arm_meshes: [(MaterialMeshBundle<StandardMaterial>, PlayerArm); 3],
+	arm_particle_mesh: Handle<Mesh>,
+) {
+	player_controller(root, owner, char_collider);
+	player_vis(root, owner, vis, particle_mesh);
+
+	root.with_children(|builder| {
+		let mut arms = builder.spawn((
+			TransformBundle::default(),
+			VisibilityBundle::default(),
+			RotVel::new(8.0),
+		));
+		arms.set_enum(Arms);
+		player_arms(&mut arms, owner, arm_meshes, arm_particle_mesh);
+	});
+}
+
+fn player_controller(root: &mut EntityCommands, owner: BelongsToPlayer, char_collider: Collider) {
+	root.with_children(|builder| {
+		let PlayerPrefs {
+			invert_camera,
+			fov,
+			input_map,
+			sens,
+		} = PlayerPrefs::default();
+		builder
+			.spawn((
+				owner,
+				char_collider,
+				TransformBundle::default(),
+				CtrlVel::default(),
+				CollisionGroups::new(Group::GROUP_1, !Group::GROUP_1),
+				KinematicCharacterController {
+					up: Vect::Z,
+					snap_to_ground: None,
+					autostep: None,
+					max_slope_climb_angle: CLIMB_ANGLE,
+					min_slope_slide_angle: SLIDE_ANGLE,
+					filter_flags: QueryFilterFlags::EXCLUDE_SENSORS,
+					filter_groups: Some(CollisionGroups::new(G1, !G1)),
+					..default()
+				},
+				InputManagerBundle::<PlayerAction> {
+					input_map,
+					..default()
+				},
+				PlayerAction::abilities_bundle(),
+				CtrlState::default(),
+				(invert_camera, fov, sens),
+			))
+			.set_enum(Controller);
+	});
+}
+
 fn player_vis(
 	cmds: &mut EntityCommands,
 	owner: BelongsToPlayer,
 	vis: SceneBundle,
 	particle_mesh: MaterialMeshBundle<StandardMaterial>,
 ) {
-	let pivot = camera::spawn_pivot(cmds.commands(), owner).id();
-	let vis_node = cmds
+	let camera_pivot = camera::spawn_pivot(cmds.commands(), owner).id();
+	let ship_center = cmds
 		.commands()
 		.spawn((
 			owner,
@@ -312,7 +376,7 @@ fn player_vis(
 			// TransformBundle::default(),
 			VisibilityBundle::default(), // for children ComputedVisibility
 		))
-		.set_enum(player_entity::VisNode)
+		.set_enum(ShipCenter)
 		.with_children(move |builder| {
 			// Mesh is a child so we can apply transform independent of collider to align them
 			builder
@@ -321,7 +385,7 @@ fn player_vis(
 					TransformBundle::default(),
 					VisibilityBundle::default(),
 				))
-				.set_enum(player_entity::Vis)
+				.set_enum(Ship)
 				.with_children(|builder| {
 					builder.spawn((owner, vis));
 
@@ -385,8 +449,8 @@ fn player_vis(
 					builder.spawn(PointLightBundle {
 						point_light: PointLight {
 							color: Color::rgb(0.0, 1.0, 0.6),
-							intensity: 4000.0,
-							range: 8.0,
+							intensity: 2048.0,
+							range: 12.0,
 							shadows_enabled: false,
 							..default()
 						},
@@ -395,9 +459,9 @@ fn player_vis(
 					});
 				});
 		})
-		.add_child(pivot)
+		.add_child(camera_pivot)
 		.id();
-	cmds.add_child(vis_node);
+	cmds.add_child(ship_center);
 }
 
 #[derive(Component, Debug, Default, Copy, Clone, Reflect)]
@@ -470,15 +534,15 @@ fn player_arms(
 							time_created,
 							initial_transform: InitialTransform(xform),
 							initial_global_transform: InitialGlobalTransform(*glob_xform),
-							lifetime: Lifetime(Duration::from_secs_f32(0.1)),
+							lifetime: Lifetime(Duration::from_secs_f32(0.12)),
 						},
 						Linear {
-							velocity: Vec3::NEG_Z * 2.0,
+							velocity: Vec3::NEG_Z * 2.4,
 						},
 						TargetScale { scale: Vec3::ZERO },
 					))
 				}),
-				interval: Duration::from_millis(1),
+				interval: Duration::from_micros(1500),
 				use_global_coords: true,
 				..default()
 			};
@@ -494,7 +558,7 @@ fn player_arms(
 					KinematicPositionBased,
 					RotVel::new(8.0),
 				))
-				.set_enum(player_entity::Arm(which));
+				.set_enum(Arm(which));
 		}
 	});
 }
@@ -502,42 +566,102 @@ fn player_arms(
 pub fn reset_oob(
 	mut cmds: Commands,
 	q: Query<(Entity, &GlobalTransform, PlayerEntity, &BelongsToPlayer)>,
-	bounds: Res<AbsoluteBounds>,
+	player_root_nodes: Query<(Entity, &BelongsToPlayer), ERef<Root>>,
+	bounds: Res<PlayerBounds>,
 ) {
-	let mut to_respawn = vec![];
+	let mut to_respawn = HashSet::new();
 	for (_id, xform, which, owner) in &q {
 		if let PlayerEntityItem::Root(..) = which {
-			if xform.translation().x.abs() > bounds.extents
-				|| xform.translation().y.abs() > bounds.extents
-				|| xform.translation().z.abs() > bounds.extents
+			if !bounds
+				.aabb
+				.contains_local_point(&xform.translation().into())
 			{
-				to_respawn.push(owner)
+				bevy::log::error!("Player {owner:?} is out of bounds. Respawning.");
+				to_respawn.insert(owner);
 			}
 		}
 	}
-	for (id, _, _, owner) in &q {
+	for (id, owner) in &player_root_nodes {
 		if to_respawn.contains(&owner) {
 			cmds.entity(id).despawn_recursive();
-			todo!("respawn player")
+			cmds.spawn(PlayerRespawnTimer {
+				id: owner.0,
+				timer: Timer::new(Duration::from_secs(3), TimerMode::Once),
+			});
 		}
 	}
 }
 
+#[derive(Resource, Debug, Deref, DerefMut)]
+pub struct PlayerBounds {
+	pub aabb: Aabb,
+}
+
 pub fn idle(
-	mut vis_q: Query<&mut Transform, ERef<Vis>>,
-	mut arm_q: Query<(&mut Transform, &RotVel), ERef<Arm>>,
+	mut vis_q: Query<&mut Transform, ERef<Ship>>,
+	mut arms_q: Query<(&mut Transform, &RotVel), ERef<Arms>>,
+	mut arm_q: Query<&mut Transform, ERef<Arm>>,
 	t: Res<Time>,
 ) {
+	let s = t.elapsed_seconds_wrapped();
 	for mut xform in &mut vis_q {
-		xform.translation.y = (t.elapsed_seconds_wrapped() * 3.0).sin() * 0.24;
+		xform.translation.y = (s * 3.0).sin() * 0.24;
 		xform.rotate_local_y(-2.0 * t.delta_seconds());
 	}
-	for (mut xform, rvel) in &mut arm_q {
-		xform.translation = Quat::from_rotation_z(t.delta_seconds() * **rvel)
-			* Vec3 {
-				z: (t.elapsed_seconds_wrapped() + 2.0 * xform.translation.angle_between(Vec3::X))
-					.sin(),
-				..xform.translation
-			}
+	for (mut xform, rvel) in &mut arms_q {
+		xform.rotation =
+			(xform.rotation * Quat::from_rotation_z(t.delta_seconds() * **rvel)).normalize();
+	}
+	for (n, mut xform) in arm_q.iter_mut().enumerate() {
+		let phase = (n as f32) * FRAC_PI_3 * 2.0;
+		xform.translation = Vec3 {
+			z: ((s * 15.1) + phase).sin() * 0.3
+				+ ((s * 15.3) + phase).sin() * 0.3
+				+ ((s * 15.7) + phase).sin() * 0.3,
+			..xform.translation
+		};
+	}
+}
+
+#[derive(Component, Clone, Debug, Deref, DerefMut)]
+pub struct PlayerRespawnTimer {
+	pub id: PlayerId,
+	#[deref]
+	pub timer: Timer,
+}
+
+#[derive(Event, Clone, Debug)]
+pub struct PlayerSpawnEvent {
+	id: PlayerId,
+}
+
+pub fn countdown_respawn(
+	mut cmds: Commands,
+	mut q: Query<(Entity, &mut PlayerRespawnTimer)>,
+	mut spawn_events: EventWriter<PlayerSpawnEvent>,
+	t: Res<Time>,
+) {
+	for (id, mut data) in &mut q {
+		data.tick(t.delta());
+		if data.just_finished() {
+			cmds.entity(id).despawn();
+			spawn_events.send(PlayerSpawnEvent { id: data.id });
+		}
+	}
+}
+
+pub fn kill_on_key(
+	mut cmds: Commands,
+	mut q: Query<(Entity, &BelongsToPlayer), ERef<Root>>,
+	input: Res<Input<KeyCode>>,
+) {
+	if input.just_pressed(KeyCode::K) {
+		for (id, owner) in &mut q {
+			cmds.entity(id).despawn_recursive();
+			cmds.spawn(PlayerRespawnTimer {
+				id: owner.0,
+				timer: Timer::new(Duration::from_secs(2), TimerMode::Once),
+			});
+		}
 	}
 }
diff --git a/rs/src/player/camera.rs b/rs/src/player/camera.rs
index 88eddf9..8b1938f 100644
--- a/rs/src/player/camera.rs
+++ b/rs/src/player/camera.rs
@@ -2,13 +2,16 @@ use super::{
 	player_entity::{Cam, CamPivot},
 	BelongsToPlayer, G1,
 };
-use crate::player::PlayerId;
-use crate::settings::Settings;
-use bevy::core_pipeline::fxaa::Fxaa;
+use crate::{planet::sky::SkyShader, player::PlayerId, settings::Settings};
+
 use bevy::{
-	core_pipeline::{bloom::BloomSettings, clear_color::ClearColorConfig},
+	core_pipeline::{bloom::BloomSettings, clear_color::ClearColorConfig, fxaa::Fxaa, Skybox},
 	ecs::system::{EntityCommands, Res},
 	prelude::*,
+	render::render_resource::{
+		Extent3d, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
+		TextureViewDescriptor, TextureViewDimension,
+	},
 	transform::components::{GlobalTransform, Transform},
 };
 use bevy_rapier3d::{
@@ -28,7 +31,74 @@ pub fn spawn_camera<'w, 's, 'a>(
 	cmds: &'a mut Commands<'w, 's>,
 	player_id: PlayerId,
 	settings: &Settings,
+	images: &mut Assets<Image>,
+	asset_server: &AssetServer,
 ) -> EntityCommands<'w, 's, 'a> {
+	let (sky_texture, sky_diffuse) = {
+		let size = Extent3d {
+			width: 16,
+			height: 96,
+			depth_or_array_layers: 1,
+		};
+		let mut tex = Image {
+			texture_descriptor: TextureDescriptor {
+				label: Some("skybox_texture"),
+				size,
+				dimension: TextureDimension::D2,
+				format: TextureFormat::Rgba32Float,
+				mip_level_count: 1,
+				sample_count: 1,
+				usage: TextureUsages::TEXTURE_BINDING
+					| TextureUsages::COPY_DST
+					| TextureUsages::RENDER_ATTACHMENT,
+				view_formats: &[],
+			},
+			texture_view_descriptor: Some(TextureViewDescriptor {
+				label: Some("skybox_view"),
+				dimension: Some(TextureViewDimension::Cube),
+				..default()
+			}),
+			..default()
+		};
+		tex.resize(size);
+
+		let size = Extent3d {
+			width: 1,
+			height: 6,
+			depth_or_array_layers: 1,
+		};
+		let mut diffuse = Image {
+			texture_descriptor: TextureDescriptor {
+				label: Some("skybox_specular"),
+				size,
+				format: TextureFormat::Rgba8Unorm,
+				..tex.texture_descriptor.clone()
+			},
+			texture_view_descriptor: Some(TextureViewDescriptor {
+				label: Some("skybox_specular_view"),
+				..tex.texture_view_descriptor.clone().unwrap()
+			}),
+			..tex.clone()
+		};
+		diffuse.resize(size);
+
+		for chunk in tex.data.chunks_mut(4) {
+			// Displays fuchsia if shader/custom pipeline aren't working
+			chunk.copy_from_slice(&Color::FUCHSIA.as_rgba_u8());
+		}
+		/* Looks washed out. Using AmbientLight instead. */
+		// for chunk in diffuse.data.chunks_mut(4) {
+		// 	chunk.copy_from_slice(&Color::rgb(0.24, 0.08, 0.48).as_rgba_u8());
+		// }
+
+		tex.reinterpret_stacked_2d_as_array(6);
+		diffuse.reinterpret_stacked_2d_as_array(6);
+
+		(images.add(tex), images.add(diffuse))
+	};
+
+	let skybox_shader = asset_server.load::<Shader>("shaders/skybox.wgsl");
+
 	let mut cmds = cmds.spawn((
 		BelongsToPlayer::with_id(player_id),
 		TransformBundle::default(),
@@ -55,6 +125,12 @@ pub fn spawn_camera<'w, 's, 'a>(
 				},
 				..default()
 			},
+			Skybox(sky_texture.clone()),
+			SkyShader(skybox_shader),
+			EnvironmentMapLight {
+				diffuse_map: sky_diffuse.clone(),
+				specular_map: sky_texture.clone(),
+			},
 			BloomSettings {
 				intensity: 0.1,
 				..default()
@@ -96,16 +172,26 @@ pub fn position_target(
 	mut cam_q: Query<(&mut CamTarget, &Collider, &BelongsToPlayer), ERef<Cam>>,
 ) {
 	for (mut target, col, cam_owner) in &mut cam_q {
-		let pivot_xform = cam_pivot_q
+		let Some(pivot_xform) = cam_pivot_q
 			.iter()
 			.find_map(|(xform, owner)| (owner == cam_owner).then_some(xform))
-			.unwrap();
+		else {
+			continue;
+		};
 
 		let filter = QueryFilter::from(CollisionGroups::new(G1, !G1)).exclude_sensors();
 		let (_, rot, tr) = pivot_xform.to_scale_rotation_translation();
 		let dir = rot * Vect::NEG_Y;
 		let pos = tr + (dir * MIN_CAM_DIST); // start at minimum distance, not player origin
-		let result = ctx.cast_shape(pos, -rot, dir, col, MAX_CAM_DIST - MIN_CAM_DIST, filter);
+		let result = ctx.cast_shape(
+			pos,
+			-rot,
+			dir,
+			col,
+			MAX_CAM_DIST - MIN_CAM_DIST,
+			true,
+			filter,
+		);
 		let toi = if let Some((_, toi)) = result {
 			let toi = toi.toi;
 			if toi == 0.0 {
@@ -116,6 +202,7 @@ pub fn position_target(
 						-dir,
 						col,
 						(MAX_CAM_DIST - MIN_CAM_DIST) * 0.3, // Don't want enormous object right in front of camera if possible
+						true,
 						filter,
 					)
 					.is_some()
@@ -123,6 +210,7 @@ pub fn position_target(
 					// Max distance is still inside something, just let it be close
 					toi
 				} else {
+					// TODO: Add hysteresis when this happens.
 					// Something is in-between character and camera, but better than camera being inside it
 					MAX_CAM_DIST
 				}
diff --git a/rs/src/player/ctrl.rs b/rs/src/player/ctrl.rs
index 3635646..290c8ac 100644
--- a/rs/src/player/ctrl.rs
+++ b/rs/src/player/ctrl.rs
@@ -4,7 +4,6 @@ use crate::{
 		player_entity::{Controller, Root},
 		BelongsToPlayer, G1, HOVER_HEIGHT, PLAYER_GRAVITY, SLIDE_ANGLE,
 	},
-	util::quantize,
 	UP,
 };
 use bevy::prelude::*;
@@ -12,7 +11,7 @@ use bevy_rapier3d::prelude::*;
 use enum_components::ERef;
 use leafwing_abilities::prelude::*;
 
-#[derive(Component)]
+#[derive(Component, Default)]
 pub struct CtrlState {
 	pub grounded: bool,
 }
@@ -31,57 +30,96 @@ pub fn repel_ground(
 			&GlobalTransform,
 			&mut CtrlVel,
 			&mut KinematicCharacterControllerOutput,
+			&mut CtrlState,
 		),
 		ERef<Controller>,
 	>,
 	t: Res<Time>,
 ) {
-	for (body_id, global, mut ctrl_vel, mut state) in &mut q {
+	for (body_id, global, mut ctrl_vel, mut state, mut ctrl_state) in &mut q {
 		let global = global.compute_transform();
 		let col = Collider::ball(1.0);
 
+		let max_toi = HOVER_HEIGHT;
 		let result = ctx.cast_shape(
 			global.translation + (global.rotation.mul_vec3(ctrl_vel.linvel) * t.delta_seconds()), // predict next frame
 			global.rotation,
 			-UP,
 			&col,
-			HOVER_HEIGHT,
+			max_toi,
+			true,
 			QueryFilter::new()
 				.exclude_sensors()
 				.exclude_rigid_body(**body_id)
 				.groups(CollisionGroups::new(G1, !G1)),
 		);
 
-		if let Some((_, toi)) = result {
-			let angle = quantize::<10>(toi.normal1.angle_between(UP));
-			let dist = HOVER_HEIGHT - toi.toi;
+		if let Some((
+			_,
+			Toi {
+				toi,
+				details: Some(details),
+				..
+			},
+		)) = result
+		{
+			let angle = details.normal1.angle_between(UP);
+			let x = max_toi - toi; // Spring compression distance
 			if angle < SLIDE_ANGLE {
+				ctrl_state.grounded = true;
 				state.grounded = true;
-				let repel_accel = dist * dist * 64.0 - ctrl_vel.linvel.z;
-				ctrl_vel.linvel.z += repel_accel * f32::min(t.delta_seconds() * 2.0, 0.256);
+
+				// Empirically decided
+				let stiffness = 256.0;
+				let damping = 0.98;
+
+				// Think of the antigrav spring as radiating out in a spherical cone (sector),
+				// so the spring coefficient for a constant-area contact patch follows the inverse square law,
+				// not a constant like typical hooke's law springs.
+				let repel_accel = x * x * stiffness;
+
+				ctrl_vel.linvel.z += (PLAYER_GRAVITY * t.delta_seconds()) // Resist gravity for this frame
+					+ repel_accel * f32::min(t.delta_seconds(), 0.125); // don't let low framerate eject player
+
+				ctrl_vel.linvel.z *= damping;
 			} else {
+				ctrl_state.grounded = false;
 				state.grounded = false;
-				let repel_dir = global.rotation.inverse().mul_vec3(toi.normal1); // convert to local space
-				let repel_dir = Vec3 {
-					z: f32::min(-(1.0 - repel_dir.z) + ctrl_vel.linvel.z, 0.0),
-					..repel_dir
+
+				if ctrl_vel.linvel.z < 0.0 {
+					let norm = global.rotation.inverse() * details.normal1; // To player's local space
+					let v_dot_norm = ctrl_vel.linvel.dot(norm);
+					if v_dot_norm < 0.0 {
+						// Player is moving "into" the slope
+
+						ctrl_vel.linvel -= v_dot_norm * norm; // Remove the penetrating part
+
+						if ctrl_vel.linvel.z > 0.0 {
+							// Remove any upwards sliding
+							ctrl_vel.linvel.z = 0.0;
+						}
+					}
+				} else {
+					// Let player keep sliding up until gravity stops them
 				}
-				.normalize();
-				let repel_speed = 32.0;
-				ctrl_vel.linvel = repel_dir * repel_speed;
 			}
+		} else {
+			ctrl_state.grounded = false;
 		}
 	}
 }
 
-pub fn reset_jump_on_ground(
-	mut q: Query<(
-		AbilityState<PlayerAction>,
-		&KinematicCharacterControllerOutput,
-	)>,
-) {
-	for (mut state, out) in &mut q {
-		if out.grounded {
+pub fn reset_jump_on_ground(mut q: Query<(AbilityState<PlayerAction>, &CtrlState)>) {
+	for (mut state, ctrl_state) in &mut q {
+		if ctrl_state.grounded
+			&& state
+				.cooldowns
+				.get(PlayerAction::Jump)
+				.as_ref()
+				.unwrap()
+				.ready()
+				.is_ok()
+		{
 			let charges = state.charges.get_mut(PlayerAction::Jump).as_mut().unwrap();
 			charges.set_charges(charges.max_charges());
 		}
@@ -91,16 +129,11 @@ pub fn reset_jump_on_ground(
 pub fn gravity(mut q: Query<(&mut CtrlVel, &KinematicCharacterControllerOutput)>, t: Res<Time>) {
 	for (mut ctrl_vel, out) in q.iter_mut() {
 		if out.grounded {
+			// Only when actual collider is grounded, not the antigrav pulses.
+			// Let `repel_ground` handle counteracting gravity when hovering.
 			ctrl_vel.linvel.z = f32::max(ctrl_vel.linvel.z, 0.0)
 		}
 
-		let mut info = [(TOIStatus::Converged, Vect::NAN, Vect::NAN); 4];
-		for (i, col) in out.collisions.iter().enumerate() {
-			if let Some(slot) = info.get_mut(i) {
-				*slot = (col.toi.status, col.translation_remaining, col.toi.normal1)
-			}
-		}
-
 		let decr = PLAYER_GRAVITY * t.delta_seconds();
 
 		ctrl_vel.linvel.z -= decr;
diff --git a/rs/src/player/input.rs b/rs/src/player/input.rs
index 9db183a..27b7819 100644
--- a/rs/src/player/input.rs
+++ b/rs/src/player/input.rs
@@ -1,15 +1,15 @@
-use crate::util::Lerp;
 use crate::{
 	player::{
 		camera::CameraVertSlider,
 		ctrl::CtrlVel,
-		player_entity::{Arm, CamPivot},
+		player_entity::{Arm, Arms, CamPivot},
+		prefs::LookSensitivity,
 		BelongsToPlayer, RotVel, ACCEL, JUMP_VEL, MAX_JUMPS, MAX_SPEED,
 	},
 	terminal_velocity,
-	ui::pause_menu::PauseMenuAction,
+	util::Lerp,
 };
-use bevy::{math::Vec3Swizzles, prelude::*};
+use bevy::{input::mouse::MouseMotion, math::Vec3Swizzles, prelude::*, window::CursorGrabMode};
 use bevy_kira_audio::prelude::{Audio, AudioSource, *};
 use enum_components::ERef;
 use leafwing_abilities::prelude::*;
@@ -17,7 +17,7 @@ use leafwing_input_manager::prelude::*;
 use particles::Spewer;
 use serde::{Deserialize, Serialize};
 use std::{
-	f32::consts::{PI, TAU},
+	f32::consts::{FRAC_PI_3, PI, TAU},
 	time::Duration,
 };
 
@@ -27,19 +27,26 @@ pub fn plugin(app: &mut App) -> &mut App {
 		AbilityPlugin::<PlayerAction>::default(),
 	))
 	.add_systems(First, setup)
-	.add_systems(Update, abilities)
-	.add_systems(Update, jump.before(terminal_velocity))
+	.add_systems(
+		Update,
+		(
+			grab_mouse,
+			abilities,
+			look_input.before(terminal_velocity),
+			jump.before(terminal_velocity),
+		),
+	)
 }
 
 fn setup(
 	mut cmds: Commands,
-	q: Query<Entity, (With<ActionState<PlayerAction>>, Without<InputStorageTime>)>,
+	q: Query<Entity, (With<ActionState<PlayerAction>>, Without<InputStorageTimer>)>,
 ) {
 	for id in q.iter() {
-		let duration = Duration::from_millis(120);
+		let duration = Duration::from_millis(64);
 		let mut timer = Timer::new(duration, TimerMode::Once);
 		timer.set_elapsed(duration);
-		cmds.entity(id).insert(InputStorageTime(timer));
+		cmds.entity(id).insert(InputStorageTimer(timer));
 	}
 }
 
@@ -69,7 +76,7 @@ impl PlayerAction {
 		use PlayerAction::*;
 
 		let secs = match *self {
-			Jump => 2.0,
+			Jump => 0.128, // debouncing
 			AoE => 2.5,
 			Pause => return None,
 		};
@@ -108,8 +115,9 @@ pub struct AoESound(pub Handle<AudioSource>);
 
 pub fn abilities(
 	mut action_q: Query<AbilityState<PlayerAction>>,
-	mut arm_q: Query<(&mut Transform, &mut RotVel, &mut Spewer), ERef<Arm>>,
-	mut pause_events: EventWriter<PauseMenuAction>,
+	mut arms_q: Query<&mut RotVel, ERef<Arms>>,
+	mut arm_q: Query<(&mut Transform, &mut Spewer), ERef<Arm>>,
+	// mut pause_events: EventWriter<PauseMenuAction>,
 	sfx: Res<AoESound>,
 	audio: Res<Audio>,
 	t: Res<Time>,
@@ -119,12 +127,14 @@ pub fn abilities(
 		match state.trigger_if_just_pressed(AoE) {
 			Ok(()) => {
 				audio.play(sfx.0.clone()).with_volume(0.5);
-				for (mut arm, mut rvel, mut spewer) in &mut arm_q {
+				for mut rvel in &mut arms_q {
+					**rvel = 36.0;
+				}
+				for (mut arm, mut spewer) in &mut arm_q {
 					// TODO: Filter by player
 					arm.translation *= 6.0;
 					arm.scale *= 6.0;
-					**rvel = 36.0;
-					spewer.interval = Duration::from_micros(100);
+					spewer.interval = Duration::from_micros(200);
 				}
 			}
 			Err(CannotUseAbility::OnCooldown) => {
@@ -134,17 +144,18 @@ pub fn abilities(
 			_ => {}
 		}
 
-		if state.trigger_if_just_pressed(Pause).is_ok() {
-			pause_events.send(PauseMenuAction::ShowOrHide)
-		}
+		// if state.trigger_if_just_pressed(Pause).is_ok() {
+		// 	pause_events.send(PauseMenuAction::ShowOrHide)
+		// }
 
-		for (mut arm, mut rvel, mut spewer) in &mut arm_q {
+		for mut rvel in &mut arms_q {
+			**rvel = **rvel + (rvel.quiescent - **rvel) * t.delta_seconds();
+		}
+		for (i, (mut arm, mut spewer)) in arm_q.iter_mut().enumerate() {
+			let resting = Quat::from_rotation_z(i as f32 * FRAC_PI_3 * 2.0) * Vec3::X * 2.0;
 			// TODO: Filter by player
-			arm.translation = arm
-				.translation
-				.lerp(arm.translation.normalize() * 2.0, t.delta_seconds() * 2.0);
+			arm.translation = arm.translation.lerp(resting, t.delta_seconds() * 2.0);
 			arm.scale = arm.scale.lerp(Vec3::ONE, t.delta_seconds() * 2.0);
-			**rvel = **rvel + (rvel.quiescent - **rvel) * t.delta_seconds();
 			spewer.interval = Duration::from_secs_f32(
 				spewer.interval.as_secs_f32().lerp(0.001, t.delta_seconds()),
 			);
@@ -153,53 +164,96 @@ pub fn abilities(
 	}
 }
 
-#[derive(Component, Resource, Reflect, Default, Debug, Clone)]
-struct InputStorageTime(Timer);
+#[derive(Component, Resource, Reflect, Default, Debug, Clone, Deref, DerefMut)]
+pub struct InputStorageTimer(Timer);
 
-fn jump(
+pub fn jump(
 	mut q: Query<(
 		AbilityState<PlayerAction>,
 		&mut CtrlVel,
-		&mut InputStorageTime,
+		&mut InputStorageTimer,
 	)>,
 	t: Res<Time>,
 ) {
 	for (mut state, mut vel, mut storage) in q.iter_mut() {
-		storage.0.tick(t.delta());
-		let triggered = if storage.0.finished() {
-			if state.action_state.just_pressed(PlayerAction::Jump) {
-				if state.trigger(PlayerAction::Jump).is_ok() {
-					true
+		storage.tick(t.delta());
+		let triggered = if state
+			.cooldowns
+			.get(PlayerAction::Jump)
+			.as_ref()
+			.unwrap()
+			.ready()
+			.is_ok()
+		{
+			if storage.finished() {
+				// No storage timer is set right now
+				if state.action_state.just_pressed(PlayerAction::Jump) {
+					match state.trigger(PlayerAction::Jump) {
+						Ok(()) => true,
+						Err(CannotUseAbility::OnCooldown) => false, // Debounce
+						Err(CannotUseAbility::NoCharges) => {
+							// Couldn't trigger right now, keep trying over next few frames
+							storage.reset();
+							false
+						}
+						Err(e) => {
+							bevy::log::error!("Not sure how to handle {e:?}");
+							false
+						}
+					}
 				} else {
-					storage.0.reset();
 					false
 				}
 			} else {
-				false
+				// Keep trying until storage timer runs out
+				state.trigger(PlayerAction::Jump).is_ok()
 			}
 		} else {
-			state.trigger(PlayerAction::Jump).is_ok()
+			false
 		};
 
 		if triggered {
+			let dur = storage.duration();
+			storage.tick(dur); // tick makes sure it finishes, unlike set_elapsed
+				   // FIXME: Debouncing isn't working for some reason
+			let cd_triggered = state
+				.cooldowns
+				.get_mut(PlayerAction::Jump)
+				.as_mut()
+				.unwrap()
+				.trigger()
+				.is_ok();
+			if !cd_triggered {
+				bevy::log::error!("How did we trigger Jump if the cooldown hadn't elapsed???");
+			}
 			vel.linvel.z = JUMP_VEL
 		}
 	}
 }
 
 pub fn look_input(
-	mut player_q: Query<(&mut CtrlVel, &BelongsToPlayer)>,
+	mut player_q: Query<(&mut CtrlVel, &BelongsToPlayer, &LookSensitivity)>,
 	mut camera_pivot_q: Query<
 		(&mut Transform, &mut CameraVertSlider, &BelongsToPlayer),
 		ERef<CamPivot>,
 	>,
 	kb: Res<Input<KeyCode>>,
+	mut mouse: EventReader<MouseMotion>,
+	windows: Query<&Window>,
 	t: Res<Time>,
 ) {
-	for (mut vel, player_id) in player_q.iter_mut() {
+	for (mut vel, player_id, sens) in player_q.iter_mut() {
 		let delta = (TAU / 0.5/* seconds to max angvel */) * t.delta_seconds();
 
-		let mut x_input = false;
+		let mouse = if windows.single().cursor.grab_mode == CursorGrabMode::Locked {
+			mouse
+				.read()
+				.fold(Vec2::ZERO, |acc, delta| acc + delta.delta * **sens)
+		} else {
+			Vec2::ZERO
+		};
+
+		let mut x_input = mouse.x.abs() > 0.0;
 		if kb.pressed(KeyCode::Left) {
 			x_input = true;
 			vel.angvel.z = (-TAU).max(vel.angvel.z - delta);
@@ -208,7 +262,9 @@ pub fn look_input(
 			x_input = true;
 			vel.angvel.z = TAU.min(vel.angvel.z + delta);
 		}
-		if !x_input {
+		if x_input {
+			vel.angvel.z += mouse.x;
+		} else {
 			vel.angvel.z *= 0.8
 		}
 
@@ -222,8 +278,11 @@ pub fn look_input(
 		if kb.pressed(KeyCode::Down) {
 			slider.0 = (slider.0 + delta * 0.1).min(1.0);
 		}
+		if mouse.y.abs() > 0.0 {
+			slider.0 = (slider.0 + mouse.y * 0.1).clamp(0.0, 1.0);
+		}
 
-		let angle = (-PI) + ((PI * 0.9) * slider.0);
+		let angle = (-PI).lerp(-PI * 0.1, slider.0);
 		xform.rotation = xform.rotation.slerp(Quat::from_rotation_x(angle), delta);
 	}
 }
@@ -261,3 +320,20 @@ pub fn movement_input(mut q: Query<&mut CtrlVel>, kb: Res<Input<KeyCode>>, t: Re
 		}
 	}
 }
+fn grab_mouse(
+	mut windows: Query<&mut Window>,
+	mouse: Res<Input<MouseButton>>,
+	key: Res<Input<KeyCode>>,
+) {
+	let mut window = windows.single_mut();
+
+	if mouse.just_pressed(MouseButton::Left) {
+		window.cursor.visible = false;
+		window.cursor.grab_mode = CursorGrabMode::Locked;
+	}
+
+	if key.just_pressed(KeyCode::Escape) {
+		window.cursor.visible = true;
+		window.cursor.grab_mode = CursorGrabMode::None;
+	}
+}
diff --git a/rs/src/player/prefs.rs b/rs/src/player/prefs.rs
index 50de4ce..929ef3e 100644
--- a/rs/src/player/prefs.rs
+++ b/rs/src/player/prefs.rs
@@ -11,6 +11,7 @@ pub struct PlayerPrefs {
 	pub invert_camera: InvertCamera,
 	pub fov: Fov,
 	pub input_map: InputMap<PlayerAction>,
+	pub sens: LookSensitivity,
 }
 
 impl<'w> From<PlayerPrefsQuery<'w>> for PlayerPrefs {
@@ -19,6 +20,7 @@ impl<'w> From<PlayerPrefsQuery<'w>> for PlayerPrefs {
 			invert_camera: *value.invert_camera,
 			fov: *value.fov,
 			input_map: value.input_map.clone(),
+			sens: *value.sens,
 		}
 	}
 }
@@ -29,6 +31,7 @@ pub struct PlayerPrefsQuery<'w> {
 	pub invert_camera: &'w mut InvertCamera,
 	pub fov: &'w mut Fov,
 	pub input_map: &'w mut InputMap<PlayerAction>,
+	pub sens: &'w mut LookSensitivity,
 }
 
 impl Default for PlayerPrefs {
@@ -42,6 +45,7 @@ impl Default for PlayerPrefs {
 				(KeyCode::E, AoE),
 				(KeyCode::Escape, Pause),
 			]),
+			sens: default(),
 		}
 	}
 }
@@ -67,3 +71,12 @@ impl Default for Fov {
 		Self(90.0)
 	}
 }
+
+#[derive(Component, Debug, Clone, Copy, PartialEq, Deref, DerefMut, Serialize, Deserialize)]
+pub struct LookSensitivity(Vec2);
+
+impl Default for LookSensitivity {
+	fn default() -> Self {
+		Self(Vec2::new(-0.005, -0.005))
+	}
+}
diff --git a/rs/src/settings.rs b/rs/src/settings.rs
index af43876..f69d945 100644
--- a/rs/src/settings.rs
+++ b/rs/src/settings.rs
@@ -1,5 +1,4 @@
-use bevy::core_pipeline::fxaa::Fxaa;
-use bevy::prelude::*;
+use bevy::{core_pipeline::fxaa::Fxaa, prelude::*};
 use bevy_pkv::PkvStore;
 use serde::{Deserialize, Serialize};
 
diff --git a/rs/src/terrain.rs b/rs/src/terrain.rs
deleted file mode 100644
index 68d76de..0000000
--- a/rs/src/terrain.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use crate::util::{Factory, Spawnable};
-use bevy::ecs::system::{EntityCommands, SystemParamItem};
-use bevy::{
-	prelude::*,
-	render::mesh::{PrimitiveTopology, VertexAttributeValues::Float32x3},
-};
-use bevy_rapier3d::{parry::shape::SharedShape, prelude::*};
-use noise::{Fbm, NoiseFn, Value};
-use rapier3d::{
-	geometry::HeightField,
-	na::{DMatrix, Vector3},
-};
-use std::{f32::consts::*, sync::Arc};
-
-pub fn plugin(app: &mut App) -> &mut App {
-	app.add_systems(Startup, setup)
-		.add_systems(PostStartup, spawn_boxes)
-}
-
-pub fn setup(
-	mut cmds: Commands,
-	mut materials: ResMut<Assets<StandardMaterial>>,
-	mut meshes: ResMut<Assets<Mesh>>,
-) {
-	let material = materials.add(StandardMaterial {
-		base_color: Color::rgb(0.072, 0.072, 0.072),
-		reflectance: 0.1,
-		perceptual_roughness: 0.0,
-		..default()
-	});
-
-	let noise = Fbm::<Value>::default();
-
-	let r = 48;
-	let d = r * 2;
-	let (columns, rows) = (d, d);
-
-	let heights = (0..(rows * columns))
-		.map(|i: usize| {
-			let col = i % d;
-			let row = i / d;
-
-			let r = r as f32 - 2.0;
-			let x = (col as f32 - 1.0) - r;
-			let y = (row as f32 - 1.0) - r;
-
-			let bowl = ((r * r) - (x * x) - (y * y)).sqrt() / r;
-
-			let bowl = if bowl.is_finite() { bowl } else { 0.0 };
-
-			noise.get([row as f64 * 0.2, (i % rows) as f64 * 0.2]) as f32 * 0.3 - (bowl * 20.0)
-		}) // scale to -1.0..=1.0
-		.collect();
-
-	let heights = HeightField::new(
-		DMatrix::from_vec(rows, columns, heights),
-		Vector3::new(1024.0, 24.0, 1024.0),
-	);
-	let tris = heights.triangles();
-
-	let mut mesh = Mesh::new(PrimitiveTopology::TriangleList);
-	let vertices = tris
-		.flat_map(|pos| {
-			[
-				[pos.a.x, pos.a.y, pos.a.z],
-				[pos.b.x, pos.b.y, pos.b.z],
-				[pos.c.x, pos.c.y, pos.c.z],
-			]
-		})
-		.collect();
-	mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, Float32x3(vertices));
-	mesh.compute_flat_normals();
-	let mesh = meshes.add(mesh);
-
-	let heights = Arc::new(heights);
-	cmds.spawn((
-		RigidBody::Fixed,
-		Collider::from(SharedShape(heights.clone())),
-		PbrBundle {
-			mesh,
-			transform: Transform {
-				translation: Vec3::new(0.0, 0.0, 256.0),
-				rotation: Quat::from_rotation_x(FRAC_PI_2),
-				..default()
-			},
-			material: material.clone(),
-			..default()
-		},
-		Ground { heights },
-	));
-
-	let mesh = Mesh::from(shape::Cube { size: 64.0 });
-	let collider = Collider::cuboid(32.0, 32.0, 32.0);
-	let mesh = meshes.add(mesh);
-
-	cmds.insert_resource(TerrainTemplate {
-		mesh,
-		material,
-		collider,
-	});
-}
-
-pub fn spawn_boxes(mut factory: Factory<TerrainObject>) {
-	factory.spawn(Transform::from_translation(Vec3::new(0.0, 0.0, -48.0)));
-	factory.spawn(Transform {
-		translation: Vec3::new(-40.0, -8.0, -44.0),
-		rotation: Quat::from_euler(EulerRot::ZXY, 0.0, 0.0, -FRAC_PI_3),
-		..default()
-	});
-	factory.spawn(Transform {
-		translation: Vec3::new(42.0, 24.0, -36.0),
-		rotation: Quat::from_rotation_y(FRAC_PI_4),
-		..default()
-	});
-	factory.spawn(Transform::from_translation(Vec3::new(-32.0, 42.0, -44.0)));
-	factory.spawn(Transform::from_translation(Vec3::new(-64.0, 72.0, -32.0)));
-	factory.spawn(Transform::from_translation(Vec3::new(-96.0, 0.0, -64.0)));
-	factory.spawn(Transform {
-		translation: Vec3::new(-24.0, 96.0, 16.0),
-		rotation: Quat::from_rotation_x(FRAC_PI_3),
-		..default()
-	});
-}
-
-/// Share mesh, material, and collider amongst multiple `TerrainObjects`
-#[derive(Resource, Clone)]
-pub struct TerrainTemplate {
-	pub mesh: Handle<Mesh>,
-	pub material: Handle<StandardMaterial>,
-	pub collider: Collider,
-}
-
-impl Spawnable for TerrainObject {
-	type Params = Res<'static, TerrainTemplate>;
-	type InstanceData = Transform;
-
-	fn spawn<'w, 's, 'a>(
-		cmds: &'a mut Commands<'w, 's>,
-		params: &mut SystemParamItem<'w, 's, Self::Params>,
-		transform: Transform,
-	) -> EntityCommands<'w, 's, 'a> {
-		cmds.spawn(TerrainObject {
-			mat_mesh_bundle: PbrBundle {
-				mesh: params.mesh.clone(),
-				material: params.material.clone(),
-				transform,
-				..default()
-			},
-			collider: params.collider.clone(),
-			..default()
-		})
-	}
-}
-
-#[derive(Bundle)]
-pub struct TerrainObject {
-	pub mat_mesh_bundle: PbrBundle,
-	pub rigid_body: RigidBody,
-	pub collider: Collider,
-	pub restitution: Restitution,
-	pub friction: Friction,
-	pub ccd: Ccd,
-}
-
-impl Default for TerrainObject {
-	fn default() -> Self {
-		Self {
-			mat_mesh_bundle: PbrBundle::default(),
-			rigid_body: RigidBody::Fixed,
-			collider: Collider::default(),
-			restitution: Restitution::new(0.5),
-			friction: Friction::new(0.01),
-			ccd: Ccd::disabled(),
-		}
-	}
-}
-
-#[derive(Component, Debug, Clone)]
-pub struct Ground {
-	pub heights: Arc<HeightField>,
-}
diff --git a/rs/src/tests.rs b/rs/src/tests.rs
index 89f267b..80d4e06 100644
--- a/rs/src/tests.rs
+++ b/rs/src/tests.rs
@@ -1,10 +1,11 @@
-use crate::util::FnPluginExt;
-use bevy::utils::HashMap;
-use bevy::{app::AppExit, prelude::*};
+use crate::{util::FnPluginExt, DT};
+use bevy::{app::AppExit, prelude::*, utils::HashMap};
 use bevy_rapier3d::prelude::*;
 use colored::Colorize;
-use std::fmt::Formatter;
-use std::{error::Error, fmt::Display};
+use std::{
+	error::Error,
+	fmt::{Display, Formatter},
+};
 
 #[derive(Event)]
 pub struct TestEvent {
@@ -44,12 +45,16 @@ pub fn app() -> App {
 	app.add_plugins(DefaultPlugins);
 	#[cfg(not(feature = "vis_test"))]
 	app.add_plugins(MinimalPlugins)
-		.add_plugin(bevy::log::LogPlugin::default());
+		.add_plugins(bevy::log::LogPlugin::default());
 
 	app.add_event::<TestEvent>()
 		.insert_resource(RunningTests::default())
 		.insert_resource(RapierConfiguration {
 			gravity: Vect::NEG_Z * 9.81,
+			timestep_mode: TimestepMode::Fixed {
+				dt: DT,
+				substeps: 1,
+			},
 			..default()
 		})
 		.add_plugins(RapierPhysicsPlugin::<()>::default())
@@ -58,7 +63,8 @@ pub fn app() -> App {
 		.add_systems(Update, check_test_results);
 
 	app.fn_plugin(app_started)
-		.fn_plugin(slope_angles::angle_stability);
+		.fn_plugin(slope_angles::angle_stability)
+		.add_systems(Startup, crate::offloading::tests::spawning);
 
 	app
 }
@@ -127,8 +133,10 @@ pub mod slope_angles {
 	use super::*;
 	use crate::tests::slope_angles::Error::{AngleChanged, ShouldClimb};
 	use bevy::core_pipeline::clear_color::ClearColorConfig;
-	use std::f32::consts::{FRAC_PI_3, TAU};
-	use std::time::Duration;
+	use std::{
+		f32::consts::{FRAC_PI_3, TAU},
+		time::Duration,
+	};
 
 	const CLIMB: f32 = FRAC_PI_3;
 	const SLIDE: f32 = FRAC_PI_3;
@@ -265,12 +273,14 @@ pub mod slope_angles {
 	) {
 		let Ok(out) = q.get_single() else { return };
 
-		let Some((id, angle)) = out.collisions.first().map(|col| {
-			(
-				col.entity,
-				rapier3d::math::Vector::from(col.toi.normal1)
-					.angle(&rapier3d::math::Vector::from(Vec3::Z)),
-			)
+		let Some((id, angle)) = out.collisions.first().and_then(|col| {
+			col.toi.details.as_ref().map(|details| {
+				(
+					col.entity,
+					rapier3d::math::Vector::from(details.normal1)
+						.angle(&rapier3d::math::Vector::from(Vec3::Z)),
+				)
+			})
 		}) else {
 			return;
 		};
@@ -278,11 +288,11 @@ pub mod slope_angles {
 		if out.effective_translation.length() < 1.0e-3 {
 			if angle < CLIMB - 1.0e-4 {
 				warn!("{:?}", ShouldClimb { angle });
-				// // FIXME: Too flaky
-				// events.send(TestEvent {
-				// 	name: "slope_angles::angle_stability",
-				// 	status: TestStatus::Failed(ShouldClimb { angle }.into()),
-				// })
+			// // FIXME: Too flaky
+			// events.send(TestEvent {
+			// 	name: "slope_angles::angle_stability",
+			// 	status: TestStatus::Failed(ShouldClimb { angle }.into()),
+			// })
 			} else {
 				tracker.stuck_time += t.delta();
 				if tracker.stuck_time > Duration::from_secs(3) {
diff --git a/rs/src/ui.rs b/rs/src/ui.rs
index 64783c3..43cdb03 100644
--- a/rs/src/ui.rs
+++ b/rs/src/ui.rs
@@ -3,10 +3,11 @@ use bevy::prelude::*;
 use enum_components::EnumComponent;
 
 pub mod game_ui;
-pub mod pause_menu;
+// pub mod pause_menu;
 
 pub fn plugin(app: &mut App) -> &mut App {
-	app.fn_plugin(game_ui::plugin).fn_plugin(pause_menu::plugin)
+	app.fn_plugin(game_ui::plugin)
+	// .fn_plugin(pause_menu::plugin)
 }
 
 #[derive(Debug, EnumComponent)]
diff --git a/rs/src/util.rs b/rs/src/util.rs
index d17aab7..f0f4f97 100644
--- a/rs/src/util.rs
+++ b/rs/src/util.rs
@@ -1,6 +1,11 @@
-use bevy::ecs::event::Event;
-use bevy::ecs::system::{EntityCommands, StaticSystemParam, SystemParam, SystemParamItem};
-use bevy::prelude::*;
+use bevy::{
+	ecs::{
+		event::Event,
+		system::{EntityCommands, StaticSystemParam, SystemParam, SystemParamItem},
+	},
+	prelude::*,
+};
+use std::ops::{Add, Mul, Sub};
 
 #[inline(always)]
 pub fn quantize<const BITS: u32>(value: f32) -> f32 {
@@ -57,12 +62,28 @@ pub fn consume_spawn_events<T: Spawnable>(
 	}
 }
 
-pub trait Lerp {
-	fn lerp(self, rhs: Self, t: f32) -> Self;
+pub trait Lerp<R, T>
+where
+	Self: Clone,
+	R: Sub<Self>,
+	<R as Sub<Self>>::Output: Mul<T>,
+	<<R as Sub<Self>>::Output as Mul<T>>::Output: Add<Self>,
+{
+	#[inline(always)]
+	fn lerp(
+		self,
+		rhs: R,
+		t: T,
+	) -> <<<R as Sub<Self>>::Output as Mul<T>>::Output as Add<Self>>::Output {
+		((rhs - self.clone()) * t) + self
+	}
 }
 
-impl Lerp for f32 {
-	fn lerp(self, rhs: Self, t: f32) -> Self {
-		((rhs - self) * t) + self
-	}
+impl<This, R, T> Lerp<R, T> for This
+where
+	This: Clone,
+	R: Sub<This>,
+	<R as Sub<This>>::Output: Mul<T>,
+	<<R as Sub<This>>::Output as Mul<T>>::Output: Add<This>,
+{
 }
diff --git a/rs/tools/editor/Cargo.toml b/rs/tools/editor/Cargo.toml
index eab042e..c53315c 100644
--- a/rs/tools/editor/Cargo.toml
+++ b/rs/tools/editor/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 game = { package = "sond-has-dylib", path = "../../game-dylib" }
 
-bevy = { workspace = true }
+bevy = { workspace = true, features = ["file_watcher"] }
 
 async-process = "1.6.0"
 futures-lite = "1.12.0"
\ No newline at end of file
diff --git a/rs/tools/editor/src/main.rs b/rs/tools/editor/src/main.rs
index 291c036..4104c8b 100644
--- a/rs/tools/editor/src/main.rs
+++ b/rs/tools/editor/src/main.rs
@@ -1,17 +1,11 @@
 use async_process::{Child, Command, Stdio};
-use bevy::asset::ChangeWatcher;
-use bevy::prelude::*;
-use bevy::tasks::IoTaskPool;
+use bevy::{prelude::*, tasks::IoTaskPool};
 use futures_lite::{io::BufReader, AsyncBufReadExt, StreamExt};
-use std::time::Duration;
 
 #[bevy_main]
 fn main() {
 	App::new()
-		.add_plugins(DefaultPlugins.set(AssetPlugin {
-			watch_for_changes: ChangeWatcher::with_delay(Duration::from_secs(1)),
-			..default()
-		}))
+		.add_plugins(DefaultPlugins)
 		.add_event::<RunGameEvent>()
 		.insert_resource(RunningGame::default())
 		.add_systems(Startup, setup)
@@ -42,7 +36,7 @@ pub struct RunGameEvent;
 pub struct RunningGame(pub Option<Child>);
 
 fn run_game(mut events: EventReader<RunGameEvent>, mut game: ResMut<RunningGame>) {
-	for _event in events.iter() {
+	for _event in events.read() {
 		if game.0.is_some() {
 			warn!("Game is already running");
 			continue;
diff --git a/sond-bevy-enum-components b/sond-bevy-enum-components
index 2e88378..abec9ec 160000
--- a/sond-bevy-enum-components
+++ b/sond-bevy-enum-components
@@ -1 +1 @@
-Subproject commit 2e8837809ae60b372bef4f793b645576406ba1f5
+Subproject commit abec9eca22410d7422a57244d44c2bacb67303e9
diff --git a/sond-bevy-particles b/sond-bevy-particles
index 3693cc5..6690319 160000
--- a/sond-bevy-particles
+++ b/sond-bevy-particles
@@ -1 +1 @@
-Subproject commit 3693cc5e0c90629662f3d86001d8dfd9574e7ca5
+Subproject commit 6690319e44d0ccc52516279f571b47ce14b70323