diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml
index f7680063..bc4f2498 100644
--- a/.github/workflows/release-plz.yml
+++ b/.github/workflows/release-plz.yml
@@ -60,7 +60,7 @@ jobs:
     needs: [release-plz-release]
     permissions:
       contents: write
-    if: ${{ contains(needs.release-plz-release.outputs.releases, '"package_name":"vantablock-client"') }}
+    if: ${{ contains(needs.release-plz-release.outputs.releases, '"package_name":"vantablock-runner"') }}
     strategy:
       fail-fast: false
       matrix:
@@ -87,46 +87,68 @@ jobs:
         with:
           tool: cargo-packager
 
-      - name: Build and Package
+      - name: Build and Package Game
         run: |
-          cargo build -p client --profile distribution --features distribution
-          cargo packager -p client --profile distribution
+          cargo build -p vantablock-runner --bin game --profile distribution --features distribution
+          cargo packager -p vantablock-runner --bin game --profile distribution
 
-      - name: Extract Client Release Tag
-        id: client_tag
+      - name: Build and Package Server
         shell: bash
         run: |
-          # extract tag from package_name='client' to append release assets to
-          TAG=$(echo '${{ needs.release-plz-release.outputs.releases }}' | jq -r '.[] | select(.package_name == "vantablock-client") | .tag')
+          cargo build -p vantablock-runner --bin server --profile distribution
+
+          # Create server archive
+          mkdir -p target/distribution/server
+          if [[ "${{ matrix.os }}" == "windows-latest" ]]; then
+            cp target/distribution/server.exe target/distribution/server/VantablockServer.exe
+            cd target/distribution/server
+            7z a ../VantablockServer-windows-x86_64.zip VantablockServer.exe
+          else
+            cp target/distribution/server target/distribution/server/VantablockServer
+            cd target/distribution/server
+            tar -czf ../VantablockServer-${{ matrix.os == 'macos-latest' && 'macos' || 'linux' }}-x86_64.tar.gz VantablockServer
+          fi
+
+      - name: Extract Release Tag
+        id: release_tag
+        shell: bash
+        run: |
+          TAG=$(echo '${{ needs.release-plz-release.outputs.releases }}' | jq -r '.[] | select(.package_name == "vantablock-runner") | .tag')
           if [ -z "$TAG" ] || [ "$TAG" == "null" ]; then
-            echo "Error: Could not find tag for client package."
+            echo "Error: Could not find tag for runner package."
             exit 1
           fi
           echo "tag=$TAG" >> $GITHUB_OUTPUT
 
-      - name: Rename client assets to Vantablock
+      - name: Rename and Filter assets
         shell: bash
         run: |
           cd target/distribution/ || exit 0
 
-          # loop through all files starting with "client" and change to "Vantablock"
-          for file in client*; do
+          # Rename game assets
+          for file in game*; do
             if [[ -f "$file" ]]; then
-              mv "$file" "${file/client/Vantablock}"
+              mv "$file" "${file/game/Vantablock}"
             fi
           done
 
+          # Remove non-functional Windows exe (we want the installer)
+          if [[ "${{ matrix.os }}" == "windows-latest" ]]; then
+            rm -f Vantablock.exe
+          fi
+
       - name: Upload Release Assets
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ steps.client_tag.outputs.tag }}
+          tag_name: ${{ steps.release_tag.outputs.tag }}
           files: |
             target/distribution/Vantablock*.dmg
+            target/distribution/Vantablock*.msi
             target/distribution/Vantablock*.exe
-            target/distribution/Vantablock*.AppImage
-            target/distribution/Vantablock*.tar.gz
-            target/distribution/Vantablock*.pkg
             target/distribution/Vantablock*.deb
+            target/distribution/Vantablock*.AppImage
+            target/distribution/VantablockServer*.tar.gz
+            target/distribution/VantablockServer*.zip
           fail_on_unmatched_files: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index af8023ce..368a8186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@
 .direnv
 
 # project specific
-/target
-.dev_data
+target
+vantadev
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7b7a1d2b..403bb330 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,8 +1,15 @@
 {
   "nixEnvSelector.nixFile": "${workspaceFolder}/flake.nix",
   "nixEnvSelector.useFlakes": true,
-  "rust-analyzer.cargo.features": ["tracy"],
+
+  "rust-analyzer.cargo.features": ["tracy", "dev"],
   "rust-analyzer.cargo.allFeatures": false,
   "rust-analyzer.procMacro.enable": true,
-  "rust-analyzer.check.command": "clippy"
+  "rust-analyzer.check.command": "clippy",
+
+  "rust-analyzer.check.extraArgs": ["--target-dir", "target/analyzer"],
+  "rust-analyzer.checkOnSave": false,
+  "rust-analyzer.lru.capacity": 256,
+  "rust-analyzer.inlayHints.enable": false,
+  "rust-analyzer.cargo.extraArgs": ["-j", "4"]
 }
diff --git a/Cargo.lock b/Cargo.lock
index 065794bb..03a9afe4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,6 +23,10 @@ name = "accesskit"
 version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99"
+dependencies = [
+ "enumn",
+ "serde",
+]
 
 [[package]]
 name = "accesskit_consumer"
@@ -81,6 +85,109 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aeronet_io"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d50ca460ea143f90a3c1ecf36709b9cbb49752d5ddfbf2d67623b465fbfb81"
+dependencies = [
+ "anyhow",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bytes",
+ "derive_more",
+ "log",
+]
+
+[[package]]
+name = "aeronet_steam"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c9fea14c3de9d1f8c4cb7bdd8be3e304ae4a45be9f3a8c02008b033165df976"
+dependencies = [
+ "aeronet_io",
+ "anyhow",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "blocking",
+ "bytes",
+ "derive_more",
+ "oneshot",
+ "steamworks",
+ "sync_wrapper",
+ "tracing",
+]
+
+[[package]]
+name = "aeronet_websocket"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab40ded6412a153f6e189620251f44cb74dc43a218eddea9f4fe4ba55a72e763"
+dependencies = [
+ "aeronet_io",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bytes",
+ "cfg-if",
+ "derive_more",
+ "futures",
+ "js-sys",
+ "rcgen",
+ "rustls",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls",
+ "tokio-tungstenite",
+ "tracing",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "aeronet_webtransport"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af4243f8320cca7bf4ce0e1e41aea4553007279685e181e3d566325260a49822"
+dependencies = [
+ "aeronet_io",
+ "base64",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bytes",
+ "cfg-if",
+ "derive_more",
+ "futures",
+ "gloo-timers",
+ "js-sys",
+ "spki",
+ "tokio",
+ "tracing",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wtransport",
+ "x509-cert",
+ "xwt-core",
+ "xwt-web",
+ "xwt-wtransport",
+]
+
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -103,6 +210,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
 [[package]]
 name = "alsa"
 version = "0.9.1"
@@ -110,7 +223,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
 dependencies = [
  "alsa-sys",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "libc",
 ]
@@ -132,7 +245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
 dependencies = [
  "android-properties",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cc",
  "jni 0.22.4",
  "libc",
@@ -239,6 +352,45 @@ dependencies = [
  "libloading",
 ]
 
+[[package]]
+name = "asn1-rs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60"
+dependencies = [
+ "asn1-rs-derive",
+ "asn1-rs-impl",
+ "displaydoc",
+ "nom",
+ "num-traits",
+ "rusticata-macros",
+ "thiserror 2.0.18",
+ "time",
+]
+
+[[package]]
+name = "asn1-rs-derive"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "asn1-rs-impl"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "assert_type_match"
 version = "0.1.1"
@@ -348,9 +500,9 @@ dependencies = [
 
 [[package]]
 name = "atomicow"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52e8890bb9844440d0c412fa74b67fd2f14e85248b6e00708059b6da9e5f8bf"
+checksum = "301801c08259e328a1c7da556608c0c22687708831b22024dbd3a57ea741e6de"
 dependencies = [
  "portable-atomic",
  "portable-atomic-util",
@@ -362,12 +514,103 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
+[[package]]
+name = "avian2d"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "060ae40aced85ed01296f556ed1909fcafe81a5e5059889bed126339ccd55b43"
+dependencies = [
+ "approx",
+ "arrayvec",
+ "avian_derive",
+ "bevy",
+ "bevy_heavy",
+ "bevy_math",
+ "bevy_transform_interpolation",
+ "bitflags 2.11.1",
+ "derive_more",
+ "disqualified",
+ "glam_matrix_extras",
+ "itertools 0.13.0",
+ "slab",
+ "smallvec",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "avian3d"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b82608b43397affac139547dfa9beb3208034c53e1a3cfe5d4079db1af362104"
+dependencies = [
+ "approx",
+ "avian_derive",
+ "bevy",
+ "bevy_heavy",
+ "bevy_math",
+ "bevy_transform_interpolation",
+ "bitflags 2.11.1",
+ "derive_more",
+ "disqualified",
+ "glam_matrix_extras",
+ "itertools 0.13.0",
+ "slab",
+ "smallvec",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "avian_derive"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12b257f601a1535e0d4a7a7796f535e3a13de62fd422b16dff7c14d27f0d4048"
+dependencies = [
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "aws-lc-rs"
+version = "1.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec6fb3fe69024a75fa7e1bfb48aa6cf59706a101658ea01bfd33b2b248a038f"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f50037ee5e1e41e7b8f9d161680a725bd1626cb6f8c7e901f91f942850852fe7"
+dependencies = [
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
+[[package]]
+name = "az"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be5eb007b7cacc6c660343e96f650fedf4b5a77512399eb952ca6642cf8d13f7"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64ct"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
+
 [[package]]
 name = "beef"
 version = "0.5.2"
@@ -394,6 +637,7 @@ dependencies = [
  "bevy_derive",
  "bevy_ecs",
  "bevy_reflect",
+ "serde",
 ]
 
 [[package]]
@@ -515,7 +759,7 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "blake3",
  "crossbeam-channel",
  "derive_more",
@@ -632,7 +876,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "nonmax",
  "radsort",
  "smallvec",
@@ -711,7 +955,7 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bumpalo",
  "concurrent-queue",
  "derive_more",
@@ -748,6 +992,32 @@ dependencies = [
  "encase_derive_impl",
 ]
 
+[[package]]
+name = "bevy_enhanced_input"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5e4981e85546349e7ccce7e68aaf9c36e6eed556f7f29087dee184ee7941fb9"
+dependencies = [
+ "bevy",
+ "bevy_enhanced_input_macros",
+ "bitflags 2.11.1",
+ "log",
+ "serde",
+ "smallvec",
+ "variadics_please",
+]
+
+[[package]]
+name = "bevy_enhanced_input_macros"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4680cc23f335f1b768caf91a94b1aa1d786149788644043fe8d49e5708b5cbcc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "bevy_feathers"
 version = "0.18.1"
@@ -886,6 +1156,17 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "bevy_heavy"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc496d1d43b890896cf561d8ce3dcf7b7b8e4c03c4e837a49a83a530abccbc5e"
+dependencies = [
+ "bevy_math",
+ "bevy_reflect",
+ "glam_matrix_extras",
+]
+
 [[package]]
 name = "bevy_image"
 version = "0.18.1"
@@ -900,7 +1181,7 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "futures-lite",
  "guillotiere",
@@ -928,6 +1209,7 @@ dependencies = [
  "bevy_reflect",
  "derive_more",
  "log",
+ "serde",
  "smol_str",
  "thiserror 2.0.18",
 ]
@@ -942,6 +1224,7 @@ dependencies = [
  "bevy_ecs",
  "bevy_input",
  "bevy_math",
+ "bevy_picking",
  "bevy_reflect",
  "bevy_window",
  "log",
@@ -981,6 +1264,7 @@ dependencies = [
  "bevy_math",
  "bevy_mesh",
  "bevy_pbr",
+ "bevy_picking",
  "bevy_platform",
  "bevy_post_process",
  "bevy_ptr",
@@ -1066,7 +1350,7 @@ dependencies = [
  "glam",
  "itertools 0.14.0",
  "libm",
- "rand 0.9.2",
+ "rand 0.9.4",
  "rand_distr",
  "serde",
  "thiserror 2.0.18",
@@ -1089,10 +1373,11 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_transform",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "derive_more",
  "hexasphere",
+ "serde",
  "thiserror 2.0.18",
  "tracing",
  "wgpu-types",
@@ -1129,7 +1414,7 @@ dependencies = [
  "bevy_shader",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "derive_more",
  "fixedbitset",
@@ -1205,7 +1490,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "nonmax",
  "radsort",
  "smallvec",
@@ -1289,7 +1574,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "derive_more",
  "downcast-rs 2.0.2",
@@ -1411,7 +1696,7 @@ dependencies = [
  "bevy_text",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "derive_more",
  "fixedbitset",
@@ -1524,6 +1809,15 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
+[[package]]
+name = "bevy_transform_interpolation"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88545c8b0fa8f3502b9a439c71fa6b596ee9e808bfb16f27a51c8c6f7405a657"
+dependencies = [
+ "bevy",
+]
+
 [[package]]
 name = "bevy_ui"
 version = "0.18.1"
@@ -1551,6 +1845,7 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "derive_more",
+ "serde",
  "smallvec",
  "taffy",
  "thiserror 2.0.18",
@@ -1673,13 +1968,23 @@ dependencies = [
  "winit",
 ]
 
+[[package]]
+name = "bincode"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
+dependencies = [
+ "serde",
+ "unty",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -1714,9 +2019,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 dependencies = [
  "bytemuck",
  "serde_core",
@@ -1724,9 +2029,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.8.4"
+version = "1.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e"
+checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -1825,6 +2130,10 @@ name = "bytes"
 version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+dependencies = [
+ "portable-atomic",
+ "serde",
+]
 
 [[package]]
 name = "calloop"
@@ -1832,7 +2141,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "log",
  "polling",
  "rustix 0.38.44",
@@ -1860,9 +2169,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.59"
+version = "1.2.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283"
+checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1897,6 +2206,43 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chacha20"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures 0.2.17",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
+[[package]]
+name = "chrono"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "ciborium"
 version = "0.2.2"
@@ -1924,6 +2270,17 @@ dependencies = [
  "half",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+ "zeroize",
+]
+
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -1937,9 +2294,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.6.0"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
  "clap_builder",
 ]
@@ -1960,6 +2317,15 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
 
+[[package]]
+name = "cmake"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "codespan-reporting"
 version = "0.12.0"
@@ -2007,6 +2373,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
 
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
 [[package]]
 name = "const_panic"
 version = "0.2.15"
@@ -2102,7 +2474,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -2142,7 +2514,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4cadaea21e24c49c0c82116f2b465ae6a49d63c90e428b0f8d9ae1f638ac91f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "fontdb",
  "harfrust",
  "linebender_resource_handle",
@@ -2321,6 +2693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
@@ -2342,16 +2715,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
 
 [[package]]
-name = "dasp_sample"
+name = "dashmap"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "dasp_sample"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
 [[package]]
 name = "data-encoding"
-version = "2.10.0"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
+
+[[package]]
+name = "der"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid",
+ "der_derive",
+ "flagset",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "der-parser"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6"
+dependencies = [
+ "asn1-rs",
+ "displaydoc",
+ "nom",
+ "num-bigint",
+ "num-traits",
+ "rusticata-macros",
+]
+
+[[package]]
+name = "der_derive"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
+checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "deranged"
@@ -2428,12 +2853,23 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.4",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "disqualified"
 version = "1.0.0"
@@ -2476,6 +2912,30 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+
+[[package]]
+name = "dyn-eq"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c2d035d21af5cde1a6f5c7b444a5bf963520a9f142e5d06931178433d7d5388"
+
+[[package]]
+name = "dyn-hash"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fdab65db9274e0168143841eb8f864a0a21f8b1b8d2ba6812bbe6024346e99e"
+
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -2522,6 +2982,35 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "enum_dispatch"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "enumn"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -2609,12 +3098,31 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
+[[package]]
+name = "fixed"
+version = "1.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9af2cbf772fa6d1c11358f92ef554cb6b386201210bcf0e91fb7fba8a907fb40"
+dependencies = [
+ "az",
+ "bytemuck",
+ "half",
+ "serde",
+ "typenum",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
+[[package]]
+name = "flagset"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
+
 [[package]]
 name = "flate2"
 version = "1.1.9"
@@ -2654,9 +3162,9 @@ dependencies = [
 
 [[package]]
 name = "font-types"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d9237c6d82152100c691fb77ea18037b402bcc7257d2c876a4ffac81bc22a1c"
+checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7"
 dependencies = [
  "bytemuck",
 ]
@@ -2711,6 +3219,21 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
 
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -2720,6 +3243,21 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "futures"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-channel"
 version = "0.3.32"
@@ -2727,6 +3265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
+ "futures-sink",
 ]
 
 [[package]]
@@ -2735,6 +3274,17 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
+[[package]]
+name = "futures-executor"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.32"
@@ -2765,21 +3315,37 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "futures-sink"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+
 [[package]]
 name = "futures-task"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
+[[package]]
+name = "futures-timer"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+
 [[package]]
 name = "futures-util"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
+ "futures-channel",
  "futures-core",
+ "futures-io",
  "futures-macro",
+ "futures-sink",
  "futures-task",
+ "memchr",
  "pin-project-lite",
  "slab",
 ]
@@ -2826,8 +3392,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -2837,9 +3405,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 5.3.0",
  "wasip2",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -2906,19 +3476,42 @@ version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"
 dependencies = [
+ "approx",
  "bytemuck",
  "encase",
  "libm",
- "rand 0.9.2",
+ "rand 0.9.4",
  "serde_core",
 ]
 
+[[package]]
+name = "glam_matrix_extras"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4664468a60479272b880a8bfc00ad2915229b93d2b2d585556fb33f9ba80e72"
+dependencies = [
+ "bevy_reflect",
+ "glam",
+]
+
 [[package]]
 name = "glob"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "glow"
 version = "0.16.0"
@@ -2976,13 +3569,36 @@ dependencies = [
  "gl_generator",
 ]
 
+[[package]]
+name = "governor"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9efcab3c1958580ff1f25a2a41be1668f7603d849bb63af523b208a3cc1223b8"
+dependencies = [
+ "cfg-if",
+ "dashmap",
+ "futures-sink",
+ "futures-timer",
+ "futures-util",
+ "getrandom 0.3.4",
+ "hashbrown 0.16.1",
+ "nonzero_ext",
+ "parking_lot",
+ "portable-atomic",
+ "quanta",
+ "rand 0.9.4",
+ "smallvec",
+ "spinning_top",
+ "web-time",
+]
+
 [[package]]
 name = "gpu-alloc"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "gpu-alloc-types",
 ]
 
@@ -2992,7 +3608,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -3013,7 +3629,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -3024,14 +3640,14 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
 name = "grid"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e2d4c0a8296178d8802098410ca05d86b17a10bb5ab559b3fb404c1f948220"
+checksum = "b40ca9252762c466af32d0b1002e91e4e1bc5398f77455e55474deb466355ff5"
 
 [[package]]
 name = "guillotiere"
@@ -3061,7 +3677,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0caaee032384c10dd597af4579c67dee16650d862a9ccbe1233ff1a379abc07"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "core_maths",
  "read-fonts 0.36.0",
@@ -3077,6 +3693,12 @@ dependencies = [
  "byteorder",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
 [[package]]
 name = "hashbrown"
 version = "0.15.5"
@@ -3092,12 +3714,19 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
+ "allocator-api2",
  "equivalent",
  "foldhash 0.2.0",
  "serde",
  "serde_core",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
+
 [[package]]
 name = "heapless"
 version = "0.9.2"
@@ -3139,114 +3768,272 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
 [[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
-[[package]]
-name = "image"
-version = "0.25.10"
+name = "httlib-huffman"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
-dependencies = [
- "bytemuck",
- "byteorder-lite",
- "moxcms",
- "num-traits",
- "png",
-]
+checksum = "1a9fcbcc408c5526c3ab80d534e5c86e7967c1fb7aa0a8c76abd1edc27deb877"
 
 [[package]]
-name = "indexmap"
-version = "2.13.1"
+name = "http"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
 dependencies = [
- "equivalent",
- "hashbrown 0.16.1",
- "serde",
- "serde_core",
+ "bytes",
+ "itoa",
 ]
 
 [[package]]
-name = "inflections"
-version = "1.1.1"
+name = "httparse"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
-name = "inotify"
-version = "0.11.1"
+name = "iana-time-zone"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
- "bitflags 2.11.0",
- "inotify-sys",
- "libc",
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core 0.62.2",
 ]
 
 [[package]]
-name = "inotify-sys"
-version = "0.1.5"
+name = "iana-time-zone-haiku"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "libc",
+ "cc",
 ]
 
 [[package]]
-name = "inventory"
-version = "0.3.24"
+name = "icu_collections"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
- "rustversion",
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
 ]
 
 [[package]]
-name = "is-terminal"
-version = "0.4.17"
+name = "icu_locale_core"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.61.2",
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.10.5"
+name = "icu_normalizer"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
- "either",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.13.0"
+name = "icu_normalizer_data"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
-name = "itertools"
-version = "0.14.0"
+name = "icu_properties"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
- "either",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.18"
+name = "icu_properties_data"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "image"
+version = "0.25.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+ "png",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.17.0",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "inflections"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
+
+[[package]]
+name = "inotify"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
+dependencies = [
+ "bitflags 2.11.1",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "inventory"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jni"
@@ -3334,9 +4121,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.94"
+version = "0.3.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
+checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -3396,7 +4183,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff7f53bdf698e7aa7ec916411bbdc8078135da11b66db5182675b2227f6c0d07"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -3436,6 +4223,34 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "leafwing-input-manager"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed83d1d7334e742aab3409782cdbb2bc96cc017df9ff342dd5aeb80eed1b784"
+dependencies = [
+ "bevy",
+ "dyn-clone",
+ "dyn-eq",
+ "dyn-hash",
+ "itertools 0.14.0",
+ "leafwing_input_manager_macros",
+ "serde",
+ "serde_flexitos",
+]
+
+[[package]]
+name = "leafwing_input_manager_macros"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2226cb83129176a6c634f2ce0828c2c29896ea0898fc198636f98696b8056890"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "leb128fmt"
 version = "0.1.0"
@@ -3484,72 +4299,719 @@ dependencies = [
 ]
 
 [[package]]
-name = "lexical-util"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2604dd126bb14f13fb5d1bd6a66155079cb9fa655b37f875b3a742c705dbed17"
-
-[[package]]
-name = "lexical-write-float"
-version = "1.0.6"
+name = "lexical-util"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2604dd126bb14f13fb5d1bd6a66155079cb9fa655b37f875b3a742c705dbed17"
+
+[[package]]
+name = "lexical-write-float"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50c438c87c013188d415fbabbb1dceb44249ab81664efbd31b14ae55dabb6361"
+dependencies = [
+ "lexical-util",
+ "lexical-write-integer",
+]
+
+[[package]]
+name = "lexical-write-integer"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "409851a618475d2d5796377cad353802345cba92c867d9fbcde9cf4eac4e14df"
+dependencies = [
+ "lexical-util",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.186"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "libloading"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+dependencies = [
+ "cfg-if",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
+
+[[package]]
+name = "libredox"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
+dependencies = [
+ "bitflags 2.11.1",
+ "libc",
+ "plain",
+ "redox_syscall 0.7.4",
+]
+
+[[package]]
+name = "libudev-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "lightyear"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be51d4b8fe01a81efe7b0e53f1d5577719a507ca3bbd40cadcbf3ccaea82030d"
+dependencies = [
+ "aeronet_io",
+ "bevy_app",
+ "bevy_ecs",
+ "console_error_panic_hook",
+ "document-features",
+ "lightyear_aeronet",
+ "lightyear_avian2d",
+ "lightyear_avian3d",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_crossbeam",
+ "lightyear_frame_interpolation",
+ "lightyear_inputs",
+ "lightyear_inputs_bei",
+ "lightyear_inputs_leafwing",
+ "lightyear_inputs_native",
+ "lightyear_interpolation",
+ "lightyear_link",
+ "lightyear_messages",
+ "lightyear_metrics",
+ "lightyear_netcode",
+ "lightyear_prediction",
+ "lightyear_raw_connection",
+ "lightyear_replication",
+ "lightyear_serde",
+ "lightyear_steam",
+ "lightyear_sync",
+ "lightyear_transport",
+ "lightyear_udp",
+ "lightyear_ui",
+ "lightyear_utils",
+ "lightyear_web",
+ "lightyear_websocket",
+ "lightyear_webtransport",
+ "serde",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_aeronet"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a8e7f2b66a63bba410403708bf9c98a7c8e0834a0a069db010e63e669e6735b"
+dependencies = [
+ "aeronet_io",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "lightyear_core",
+ "lightyear_link",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_avian2d"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3229fb076a2750bcf41037c6af553a8cb1dc59e3cdd1f7c8e0d6ae7cd855dc03"
+dependencies = [
+ "avian2d",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+ "lightyear_core",
+ "lightyear_frame_interpolation",
+ "lightyear_interpolation",
+ "lightyear_link",
+ "lightyear_prediction",
+ "lightyear_replication",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_avian3d"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca582724703dccafe64991bbe0d480e616de7e1056b07cd9c6862a48196b9ce0"
+dependencies = [
+ "avian3d",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+ "lightyear_core",
+ "lightyear_frame_interpolation",
+ "lightyear_interpolation",
+ "lightyear_link",
+ "lightyear_prediction",
+ "lightyear_replication",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_connection"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad7fa5c7b928074895a56e96d0154e78cbc4e751f37e1a9b0b5fda469eb28c74"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bytes",
+ "lightyear_core",
+ "lightyear_link",
+ "lightyear_serde",
+ "serde",
+ "smallvec",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_core"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a310d13cb0059fd20f59ec60b24056403ffc2388daabbc663c8eb1d4a08ddf4"
+dependencies = [
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_time",
+ "chrono",
+ "fixed",
+ "lightyear_serde",
+ "lightyear_utils",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_crossbeam"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9b353e8b692034c99e6f9a89cc3c95ec4f7d123b32622228ccf680b849855fd"
+dependencies = [
+ "aeronet_io",
+ "bevy_app",
+ "bevy_ecs",
+ "bytes",
+ "crossbeam-channel",
+ "lightyear_core",
+ "lightyear_link",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_frame_interpolation"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66ce32814bfcd07d1b694443dd988d3e842976e87223ec48fc18283e8e0046ab"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_interpolation",
+ "lightyear_replication",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_inputs"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4bbfad8e59fbd0d569a2e359be47a7a1b28fc8e494ae124eb2b5efbec54b8e2"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_utils",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_interpolation",
+ "lightyear_link",
+ "lightyear_messages",
+ "lightyear_prediction",
+ "lightyear_replication",
+ "lightyear_sync",
+ "lightyear_transport",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_inputs_bei"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2266633e2eeebfe5fcd5d3cea8984bc26b24b13942fd9c1aa9123da4de6c1a02"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_enhanced_input",
+ "bevy_reflect",
+ "bevy_utils",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_inputs",
+ "lightyear_link",
+ "lightyear_messages",
+ "lightyear_replication",
+ "lightyear_serde",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_inputs_leafwing"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2cfbd794d8a42f06796acc6b8d4274d3fb53cd58f480881d2dd59176f076e49"
+dependencies = [
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_math",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_utils",
+ "leafwing-input-manager",
+ "lightyear_core",
+ "lightyear_inputs",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_inputs_native"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c992924e07b463528f34987fbd6b2248f37a66cfd41757dd9b9f8b5085765cdc"
+dependencies = [
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_reflect",
+ "lightyear_core",
+ "lightyear_inputs",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_interpolation"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4545cb52f0232da161dd93836e5b4f23816850330ef322ba6bd3abba2a20f21"
+dependencies = [
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_time",
+ "bevy_utils",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_messages",
+ "lightyear_replication",
+ "lightyear_serde",
+ "lightyear_sync",
+ "lightyear_utils",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_link"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ede74a86374f21606be56aaf1c1bf9dd333f473866bd780ab449653f0caca24"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
+ "bytes",
+ "lightyear_core",
+ "lightyear_utils",
+ "rand 0.9.4",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_messages"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1141fb3d9895f5c9e8aa5d723d9b9bf9db800fd044ba8c8b542ac660beeab47"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
+ "bytes",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_link",
+ "lightyear_serde",
+ "lightyear_transport",
+ "lightyear_utils",
+ "serde",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_metrics"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d3264ac1729043c949bf2c9526bfa712a1c7e683e4e0034ce7cac0f233c19db"
+dependencies = [
+ "bevy_app",
+ "bevy_color",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_text",
+ "bevy_time",
+ "bevy_ui",
+ "bevy_utils",
+ "metrics",
+ "metrics-util",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_netcode"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db834d08f6826a2c25c9a355a33bb0db036da2da98b5f43b3982e6b5c41a0f4e"
+dependencies = [
+ "aeronet_io",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_time",
+ "bytes",
+ "chacha20poly1305",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_link",
+ "lightyear_serde",
+ "lightyear_transport",
+ "lightyear_utils",
+ "no_std_io2",
+ "rand 0.9.4",
+ "thiserror 2.0.18",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "lightyear_prediction"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3ddda7d875590a2f91c082dd339507b79eb3221661f50fca18e6c2fdafbcc6c"
+dependencies = [
+ "bevy_app",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_time",
+ "bevy_utils",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_frame_interpolation",
+ "lightyear_interpolation",
+ "lightyear_messages",
+ "lightyear_replication",
+ "lightyear_sync",
+ "lightyear_utils",
+ "parking_lot",
+ "seahash",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_raw_connection"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "631b5527b4f11d1e199f823ecdcd02585136fc55dd3261d5280e03bbcc29cdd3"
+dependencies = [
+ "aeronet_io",
+ "bevy_app",
+ "bevy_ecs",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_link",
+ "lightyear_transport",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_replication"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a451536b73e618035472548e8d7f1af51e193649f556318f7836ddc70e6f73d2"
+dependencies = [
+ "avian2d",
+ "avian3d",
+ "bevy_app",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_platform",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+ "bytes",
+ "dashmap",
+ "indexmap",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_link",
+ "lightyear_messages",
+ "lightyear_serde",
+ "lightyear_sync",
+ "lightyear_transport",
+ "lightyear_utils",
+ "seahash",
+ "serde",
+ "smallvec",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_serde"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c00dfe55ea4ba8413424616564b36c64d404fe9f5c68e4d71c4a97193da3d6e"
+dependencies = [
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_utils",
+ "bincode",
+ "bytes",
+ "no_std_io2",
+ "serde",
+ "thiserror 2.0.18",
+ "tracing",
+ "variadics_please",
+]
+
+[[package]]
+name = "lightyear_steam"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b513c7aaeeaee3fbfe82e4ab7698cc3360d42526d167054af357920a166566"
+dependencies = [
+ "aeronet_io",
+ "aeronet_steam",
+ "bevy_app",
+ "bevy_ecs",
+ "lightyear_aeronet",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_link",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_sync"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "834af4e025c9d7954c9684d82255e5ed639e0ce4482e3c674582687ce1f2dbfd"
+dependencies = [
+ "bevy_app",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_time",
+ "bevy_utils",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_link",
+ "lightyear_messages",
+ "lightyear_serde",
+ "lightyear_transport",
+ "lightyear_utils",
+ "serde",
+ "tracing",
+]
+
+[[package]]
+name = "lightyear_transport"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c438c87c013188d415fbabbb1dceb44249ab81664efbd31b14ae55dabb6361"
+checksum = "272b66fae233f66887cbef40c30d2a7673d299d327a9fdd2becbd3b2ae59336b"
 dependencies = [
- "lexical-util",
- "lexical-write-integer",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_time",
+ "bevy_utils",
+ "bytes",
+ "crossbeam-channel",
+ "enum_dispatch",
+ "governor",
+ "indexmap",
+ "lightyear_connection",
+ "lightyear_core",
+ "lightyear_link",
+ "lightyear_serde",
+ "lightyear_utils",
+ "nonzero_ext",
+ "ringbuffer",
+ "serde",
+ "thiserror 2.0.18",
+ "tracing",
 ]
 
 [[package]]
-name = "lexical-write-integer"
-version = "1.0.6"
+name = "lightyear_udp"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "409851a618475d2d5796377cad353802345cba92c867d9fbcde9cf4eac4e14df"
+checksum = "367cdb2e11ac6448bec036a26ce1aa7a97a695e1a50a28e2d3d4e3f8ae34c670"
 dependencies = [
- "lexical-util",
+ "aeronet_io",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_platform",
+ "bytes",
+ "lightyear_core",
+ "lightyear_link",
+ "thiserror 2.0.18",
+ "tracing",
 ]
 
 [[package]]
-name = "libc"
-version = "0.2.184"
+name = "lightyear_ui"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+checksum = "bd20cb05463553dd19006a2e318b86b2afb6db8e9e8e46931fc6592d8069e3c2"
+dependencies = [
+ "bevy_app",
+ "bevy_color",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_text",
+ "bevy_time",
+ "bevy_ui",
+ "bevy_utils",
+ "lightyear_metrics",
+ "metrics",
+ "metrics-util",
+ "tracing",
+]
 
 [[package]]
-name = "libloading"
-version = "0.8.9"
+name = "lightyear_utils"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+checksum = "b9a54a63441f9001dc834fc8e6b4bb23eeb8f6b2ef28db8c65b4bfbf9496b139"
 dependencies = [
- "cfg-if",
- "windows-link 0.2.1",
+ "bevy_ecs",
+ "bevy_platform",
+ "bevy_reflect",
+ "bevy_utils",
+ "hashbrown 0.16.1",
+ "paste",
+ "seahash",
+ "tracing",
 ]
 
 [[package]]
-name = "libm"
-version = "0.2.16"
+name = "lightyear_web"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
+checksum = "72450d46e6c5052c174e3723e14fd78726ffca7e00e64b6f9342cdd642621eb6"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_winit",
+ "wasm-bindgen",
+ "web-sys",
+]
 
 [[package]]
-name = "libredox"
-version = "0.1.15"
+name = "lightyear_websocket"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08"
+checksum = "c3e5ee75b46e0be8f9e746f1b53464376715d400fbddb4a3faf8fb348eec2919"
 dependencies = [
- "bitflags 2.11.0",
- "libc",
- "plain",
- "redox_syscall 0.7.3",
+ "aeronet_io",
+ "aeronet_websocket",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "lightyear_aeronet",
+ "lightyear_link",
+ "thiserror 2.0.18",
+ "tracing",
 ]
 
 [[package]]
-name = "libudev-sys"
-version = "0.1.4"
+name = "lightyear_webtransport"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+checksum = "8c100a3f88ced77327f04ab3e583ecca627e53d93031c5aaf7c2260d6c9faf25"
 dependencies = [
- "libc",
- "pkg-config",
+ "aeronet_io",
+ "aeronet_webtransport",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "lightyear_aeronet",
+ "lightyear_link",
+ "thiserror 2.0.18",
+ "tracing",
 ]
 
 [[package]]
@@ -3570,6 +5032,12 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
 [[package]]
 name = "litrs"
 version = "1.0.0"
@@ -3638,6 +5106,12 @@ dependencies = [
  "tracing-subscriber",
 ]
 
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
 [[package]]
 name = "mach2"
 version = "0.4.3"
@@ -3686,7 +5160,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block",
  "core-graphics-types 0.2.0",
  "foreign-types",
@@ -3695,6 +5169,36 @@ dependencies = [
  "paste",
 ]
 
+[[package]]
+name = "metrics"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
+[[package]]
+name = "metrics-util"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdfb1365fea27e6dd9dc1dbc19f570198bc86914533ad639dae939635f096be4"
+dependencies = [
+ "aho-corasick",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "hashbrown 0.16.1",
+ "indexmap",
+ "metrics",
+ "ordered-float",
+ "quanta",
+ "radix_trie",
+ "rand 0.9.4",
+ "rand_xoshiro",
+ "sketches-ddsketch",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -3741,7 +5245,7 @@ checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8"
 dependencies = [
  "arrayvec",
  "bit-set",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
@@ -3783,7 +5287,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "jni-sys 0.3.1",
  "log",
  "ndk-sys 0.5.0+25.2.9519653",
@@ -3797,7 +5301,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "jni-sys 0.3.1",
  "log",
  "ndk-sys 0.6.0+11769913",
@@ -3836,13 +5340,22 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "nix"
 version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -3854,12 +5367,21 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "cfg_aliases",
  "libc",
 ]
 
+[[package]]
+name = "no_std_io2"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b51ed7824b6e07d354605f4abb3d9d300350701299da96642ee084f5ce631550"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "noise"
 version = "0.9.0"
@@ -3867,7 +5389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6da45c8333f2e152fc665d78a380be060eb84fad8ca4c9f7ac8ca29216cff0cc"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand 0.8.6",
  "rand_xorshift",
 ]
 
@@ -3887,13 +5409,19 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
 
+[[package]]
+name = "nonzero_ext"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
+
 [[package]]
 name = "notify"
 version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -3924,7 +5452,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -3945,6 +5473,16 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.2.1"
@@ -3962,6 +5500,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -4043,7 +5590,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -4059,7 +5606,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -4083,7 +5630,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -4095,7 +5642,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -4134,7 +5681,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "dispatch",
  "libc",
@@ -4147,7 +5694,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "libc",
  "objc2-core-foundation",
 ]
@@ -4170,7 +5717,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -4182,7 +5729,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -4205,7 +5752,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit",
@@ -4237,7 +5784,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -4267,6 +5814,12 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "octets"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8311fa8ab7a57759b4ff1f851a3048d9ef0effaa0130726426b742d26d8a88e7"
+
 [[package]]
 name = "offset-allocator"
 version = "0.2.0"
@@ -4277,18 +5830,45 @@ dependencies = [
  "nonmax",
 ]
 
+[[package]]
+name = "oid-registry"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7"
+dependencies = [
+ "asn1-rs",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
+[[package]]
+name = "oneshot"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "269bca4c2591a28585d6bf10d9ed0332b7d76900a1b02bec41bdc3a2cdcda107"
+
 [[package]]
 name = "oorandom"
 version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
+[[package]]
+name = "openssl-probe"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -4297,9 +5877,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "orbclient"
-version = "0.3.51"
+version = "0.3.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6"
+checksum = "12c6933ddbbd16539a7672e697bb8d41ac3a4e99ac43eeb40c07236bd7fcb2dd"
 dependencies = [
  "libc",
  "libredox",
@@ -4358,6 +5938,31 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "pastey"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec"
+
+[[package]]
+name = "pem"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
+dependencies = [
+ "base64",
+ "serde_core",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -4435,9 +6040,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
 
 [[package]]
 name = "plain"
@@ -4479,7 +6084,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -4500,6 +6105,17 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures 0.2.17",
+ "opaque-debug",
+ "universal-hash",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.13.1"
@@ -4508,13 +6124,22 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
 [[package]]
 name = "portable-atomic-util"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
 dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -4570,6 +6195,28 @@ dependencies = [
  "toml_edit 0.25.11+spec-1.1.0",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -4587,17 +6234,87 @@ checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
 
 [[package]]
 name = "pxfm"
-version = "0.1.28"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
+
+[[package]]
+name = "quanta"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.39.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.1.2",
+ "rustls",
+ "socket2 0.6.3",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
+dependencies = [
+ "bytes",
+ "getrandom 0.3.4",
+ "lru-slab",
+ "rand 0.9.4",
+ "ring",
+ "rustc-hash 2.1.2",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.18",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
 
 [[package]]
-name = "quick-xml"
-version = "0.39.2"
+name = "quinn-udp"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
- "memchr",
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2 0.6.3",
+ "tracing",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4621,6 +6338,16 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
 [[package]]
 name = "radsort"
 version = "0.1.1"
@@ -4629,18 +6356,18 @@ checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22"
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
 dependencies = [
  "rand_chacha",
  "rand_core 0.9.5",
@@ -4661,6 +6388,9 @@ name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
+]
 
 [[package]]
 name = "rand_core"
@@ -4678,7 +6408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
 dependencies = [
  "num-traits",
- "rand 0.9.2",
+ "rand 0.9.4",
 ]
 
 [[package]]
@@ -4690,6 +6420,15 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand_xoshiro"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41"
+dependencies = [
+ "rand_core 0.9.5",
+]
+
 [[package]]
 name = "range-alloc"
 version = "0.1.5"
@@ -4702,6 +6441,15 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68"
 
+[[package]]
+name = "raw-cpuid"
+version = "11.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
+dependencies = [
+ "bitflags 2.11.1",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -4710,9 +6458,9 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
 [[package]]
 name = "rayon"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -4728,6 +6476,19 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "rcgen"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
+dependencies = [
+ "pem",
+ "ring",
+ "rustls-pki-types",
+ "time",
+ "yasna",
+]
+
 [[package]]
 name = "read-fonts"
 version = "0.36.0"
@@ -4746,7 +6507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
 dependencies = [
  "bytemuck",
- "font-types 0.11.2",
+ "font-types 0.11.3",
 ]
 
 [[package]]
@@ -4770,16 +6531,16 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
+checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
 ]
 
 [[package]]
@@ -4828,6 +6589,26 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.17",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ringbuffer"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57b0b88a509053cbfd535726dcaaceee631313cef981266119527a1d110f6d2b"
+
 [[package]]
 name = "rodio"
 version = "0.20.1"
@@ -4844,7 +6625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468"
 dependencies = [
  "base64",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "serde",
  "serde_derive",
  "unicode-ident",
@@ -4856,7 +6637,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4147b952f3f819eca0e99527022f7d6a8d05f111aeb0a62960c74eb283bec8fc"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "once_cell",
  "serde",
  "serde_derive",
@@ -4891,13 +6672,22 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rusticata-macros"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "rustix"
 version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -4910,13 +6700,72 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c2c118cb077cca2822033836dfb1b975355dfb784b5e8da48f7b6c5db74e60e"
+dependencies = [
+ "aws-lc-rs",
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
+dependencies = [
+ "web-time",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
+dependencies = [
+ "aws-lc-rs",
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -4941,6 +6790,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -4966,6 +6824,35 @@ dependencies = [
  "tiny-skia",
 ]
 
+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
+[[package]]
+name = "security-framework"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
+dependencies = [
+ "bitflags 2.11.1",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "self_cell"
 version = "1.2.2"
@@ -5014,6 +6901,16 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_flexitos"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3323d093d7597660758b742dd7a1525539613f6182b306a4e1dd6e01a89bada9"
+dependencies = [
+ "erased-serde",
+ "serde",
+]
+
 [[package]]
 name = "serde_json"
 version = "1.0.149"
@@ -5027,11 +6924,33 @@ dependencies = [
  "zmij",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.2.17",
+ "digest",
+]
+
 [[package]]
 name = "sha3"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874"
 dependencies = [
  "digest",
  "keccak",
@@ -5080,6 +6999,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
 
+[[package]]
+name = "sketches-ddsketch"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c6f73aeb92d671e0cc4dca167e59b2deb6387c375391bc99ee743f326994a2b"
+
 [[package]]
 name = "skrifa"
 version = "0.39.0"
@@ -5120,6 +7045,9 @@ name = "smallvec"
 version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -5127,7 +7055,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
@@ -5155,6 +7083,26 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "socket2"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "spin"
 version = "0.10.0"
@@ -5164,13 +7112,33 @@ dependencies = [
  "portable-atomic",
 ]
 
+[[package]]
+name = "spinning_top"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "spirv"
 version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+ "sha2",
 ]
 
 [[package]]
@@ -5194,6 +7162,24 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "steamworks"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "722f54c70818b8debdc25b18618b77a0a69fa280012c29e7904d32f9136299fc"
+dependencies = [
+ "bitflags 2.11.1",
+ "paste",
+ "steamworks-sys",
+ "thiserror 2.0.18",
+]
+
+[[package]]
+name = "steamworks-sys"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42862065c9e685d08cc3d9f6c609d4b46bd9684ec7e9420688eb979213469582"
+
 [[package]]
 name = "strict-num"
 version = "0.1.1"
@@ -5212,6 +7198,12 @@ dependencies = [
  "precomputed-hash",
 ]
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
 [[package]]
 name = "svg_fmt"
 version = "0.4.5"
@@ -5240,6 +7232,23 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "sys-locale"
 version = "0.3.2"
@@ -5401,29 +7410,112 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinytemplate"
-version = "1.2.1"
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tls_codec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de2e01245e2bb89d6f05801c564fa27624dbd7b1846859876c7dad82e90bf6b"
+dependencies = [
+ "tls_codec_derive",
+ "zeroize",
+]
+
+[[package]]
+name = "tls_codec_derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio"
+version = "1.52.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2 0.6.3",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
 dependencies = [
- "serde",
- "serde_json",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.11.0"
+name = "tokio-rustls"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
- "tinyvec_macros",
+ "rustls",
+ "tokio",
 ]
 
 [[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
+name = "tokio-tungstenite"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
+dependencies = [
+ "futures-util",
+ "log",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tungstenite",
+]
 
 [[package]]
 name = "tokrepr"
@@ -5487,7 +7579,7 @@ dependencies = [
  "indexmap",
  "toml_datetime 1.1.1+spec-1.1.0",
  "toml_parser",
- "winnow 1.0.1",
+ "winnow 1.0.2",
 ]
 
 [[package]]
@@ -5496,7 +7588,7 @@ version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 1.0.1",
+ "winnow 1.0.2",
 ]
 
 [[package]]
@@ -5625,6 +7717,25 @@ dependencies = [
  "core_maths",
 ]
 
+[[package]]
+name = "tungstenite"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
+dependencies = [
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.9.4",
+ "rustls",
+ "rustls-pki-types",
+ "sha1",
+ "thiserror 2.0.18",
+ "utf-8",
+]
+
 [[package]]
 name = "twox-hash"
 version = "2.1.2"
@@ -5639,15 +7750,15 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
 
 [[package]]
 name = "typenum"
-version = "1.19.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
 
 [[package]]
 name = "typewit"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc19094686c694eb41b3b99dcc2f2975d4b078512fa22ae6c63f7ca318bdcff7"
+checksum = "214ca0b2191785cbc06209b9ca1861e048e39b5ba33574b3cedd58363d5bb5f6"
 
 [[package]]
 name = "unicode-bidi"
@@ -5691,11 +7802,57 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "unty"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "uuid"
-version = "1.23.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
 dependencies = [
  "getrandom 0.4.2",
  "js-sys",
@@ -5722,9 +7879,11 @@ dependencies = [
  "futures-lite",
  "glob",
  "image",
+ "leafwing-input-manager",
+ "lightyear",
  "noise",
  "offset-allocator",
- "rand 0.9.2",
+ "rand 0.9.4",
  "ron 0.11.0",
  "serde",
  "sysinfo",
@@ -5736,6 +7895,21 @@ dependencies = [
  "vantablock-shared",
  "vantablock-utils",
  "wesl",
+ "zstd",
+]
+
+[[package]]
+name = "vantablock-runner"
+version = "0.0.1"
+dependencies = [
+ "bevy",
+ "crossbeam-channel",
+ "lightyear",
+ "tracing",
+ "vantablock-client",
+ "vantablock-server",
+ "vantablock-shared",
+ "vantablock-utils",
 ]
 
 [[package]]
@@ -5743,10 +7917,15 @@ name = "vantablock-server"
 version = "0.0.1"
 dependencies = [
  "bevy",
+ "criterion",
+ "crossbeam",
+ "lightyear",
+ "noise",
  "tracing",
  "tracing-subscriber",
  "vantablock-shared",
  "vantablock-utils",
+ "zstd",
 ]
 
 [[package]]
@@ -5758,19 +7937,21 @@ dependencies = [
  "crossbeam",
  "derive_more",
  "futures-lite",
+ "leafwing-input-manager",
+ "lightyear",
  "noise",
- "rand 0.9.2",
+ "rand 0.9.4",
  "ron 0.11.0",
  "serde",
  "tracing",
  "vantablock-utils",
+ "zstd",
 ]
 
 [[package]]
 name = "vantablock-utils"
 version = "0.0.1"
 dependencies = [
- "bevy",
  "directories",
  "sysinfo",
  "time",
@@ -5821,11 +8002,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.57.1",
 ]
 
 [[package]]
@@ -5834,14 +8015,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen 0.51.0",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
+checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5852,9 +8033,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.67"
+version = "0.4.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
+checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5862,9 +8043,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
+checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5872,9 +8053,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
+checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -5885,9 +8066,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.117"
+version = "0.2.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
+checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129"
 dependencies = [
  "unicode-ident",
 ]
@@ -5920,7 +8101,7 @@ version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "hashbrown 0.15.5",
  "indexmap",
  "semver",
@@ -5946,7 +8127,7 @@ version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
@@ -5958,7 +8139,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cursor-icon",
  "wayland-backend",
 ]
@@ -5980,7 +8161,7 @@ version = "0.32.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -5992,7 +8173,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6005,7 +8186,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -6036,12 +8217,37 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.94"
+version = "0.3.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-sys-async-io"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65a1ea96a932ec2252276bc517eb4fccaebc0ecfea2faa49e242de769d188409"
+dependencies = [
+ "js-sys",
+ "tokio",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "web-sys-stream-utils"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
+checksum = "90a913a6d558dbf153010d8add2f27bf5964427aa395299b57a7680a5e971cc7"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
 ]
 
 [[package]]
@@ -6054,6 +8260,19 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-wt-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2793e7e95a0f1564bf1e029e4f8ff397b95998fe03fa7f9dd72682f127473c68"
+dependencies = [
+ "js-sys",
+ "pastey",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "wesl"
 version = "0.2.0"
@@ -6090,7 +8309,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77"
 dependencies = [
  "arrayvec",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "cfg-if",
  "cfg_aliases",
  "document-features",
@@ -6119,7 +8338,7 @@ dependencies = [
  "arrayvec",
  "bit-set",
  "bit-vec",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "cfg_aliases",
  "document-features",
@@ -6179,7 +8398,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block",
  "bytemuck",
  "cfg-if",
@@ -6224,7 +8443,7 @@ version = "27.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "bytemuck",
  "js-sys",
  "log",
@@ -6813,7 +9032,7 @@ dependencies = [
  "ahash",
  "android-activity",
  "atomic-waker",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "block2 0.5.1",
  "bytemuck",
  "calloop",
@@ -6867,9 +9086,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5"
+checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0"
 dependencies = [
  "memchr",
 ]
@@ -6883,6 +9102,12 @@ dependencies = [
  "wit-bindgen-rust-macro",
 ]
 
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
 [[package]]
 name = "wit-bindgen-core"
 version = "0.51.0"
@@ -6932,7 +9157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "indexmap",
  "log",
  "serde",
@@ -6962,6 +9187,49 @@ dependencies = [
  "wasmparser",
 ]
 
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "wtransport"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e5e745c8789c20095c9061d292098d4106660efe2d172efd8ae7a369fe28e3e"
+dependencies = [
+ "bytes",
+ "pem",
+ "quinn",
+ "rcgen",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "sha2",
+ "socket2 0.5.10",
+ "thiserror 2.0.18",
+ "time",
+ "tokio",
+ "tracing",
+ "url",
+ "wtransport-proto",
+ "x509-parser",
+]
+
+[[package]]
+name = "wtransport-proto"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a09d89a8dba201c2439d9d5eca55a0faa08909d69da50decdb5ec00be0ac504"
+dependencies = [
+ "httlib-huffman",
+ "octets",
+ "thiserror 2.0.18",
+ "url",
+]
+
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -6994,6 +9262,35 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
 
+[[package]]
+name = "x509-cert"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94"
+dependencies = [
+ "const-oid",
+ "der",
+ "spki",
+ "tls_codec",
+]
+
+[[package]]
+name = "x509-parser"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4569f339c0c402346d4a75a9e39cf8dad310e287eef1ff56d4c68e5067f53460"
+dependencies = [
+ "asn1-rs",
+ "data-encoding",
+ "der-parser",
+ "lazy_static",
+ "nom",
+ "oid-registry",
+ "rusticata-macros",
+ "thiserror 2.0.18",
+ "time",
+]
+
 [[package]]
 name = "xcursor"
 version = "0.3.10"
@@ -7006,7 +9303,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.11.1",
  "dlib",
  "log",
  "once_cell",
@@ -7025,12 +9322,79 @@ version = "0.8.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
 
+[[package]]
+name = "xwt-core"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "647e17b66bd49bfebe8fe73d327358432f298bb41227600f47fb07fa4f7c1eef"
+
+[[package]]
+name = "xwt-web"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f80997b90d89451537f2866130f52b1e4be4d29cfadf9183081b24542f1abdf0"
+dependencies = [
+ "js-sys",
+ "thiserror 2.0.18",
+ "tokio",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "web-sys-async-io",
+ "web-sys-stream-utils",
+ "web-wt-sys",
+ "xwt-core",
+]
+
+[[package]]
+name = "xwt-wtransport"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8623c2ddff8a7321feb12b484094be0341a9203dc46eb4060fc2e852841d8786"
+dependencies = [
+ "thiserror 2.0.18",
+ "wtransport",
+ "xwt-core",
+]
+
+[[package]]
+name = "yasna"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+dependencies = [
+ "time",
+]
+
 [[package]]
 name = "yazi"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
 
+[[package]]
+name = "yoke"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zeno"
 version = "0.3.3"
@@ -7057,8 +9421,110 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "zerofrom"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zmij"
 version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.16+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 5b738dbd..9211277f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,11 @@
 [workspace]
-members = ["crates/shared", "crates/client", "crates/server", "crates/utils"]
+members = [
+  "crates/client",
+  "crates/runner",
+  "crates/server",
+  "crates/shared",
+  "crates/utils",
+]
 resolver = "3"
 
 [workspace.package]
@@ -9,6 +15,7 @@ publish = false
 
 [workspace.lints.clippy]
 type_complexity = "allow"
+too_many_arguments = "allow"
 
 # INFO: --------------------------
 #         release profiles
@@ -41,11 +48,16 @@ debug = false
 # ------------------------------
 
 [workspace.dependencies]
-# crate deps
-utils = { path = "./crates/utils", package = "vantablock-utils" }
+# other crates
+client = { path = "./crates/client", package = "vantablock-client" }
+server = { path = "./crates/server", package = "vantablock-server" }
 shared = { path = "./crates/shared", package = "vantablock-shared" }
+utils = { path = "./crates/utils", package = "vantablock-utils" }
 
-# logging/error handling deps
+# development deps
+criterion = { version = "0.5", features = ["html_reports"] }
+
+# core logging/error handling deps
 time = { version = "0.3.43", features = ["formatting", "macros"] }
 tracing = { version = "0.1.41", features = ["release_max_level_info"] }
 tracing-subscriber = { version = "0.3.20", features = [
@@ -58,31 +70,34 @@ tracing-tracy = "=0.11.4"
 
 # graphics deps
 wesl = "0.2.0"                                                               # shader compliation from WESL to WGSL
-image = { version = "0.25.6", default-features = false, features = ["png"] }
-bytemuck = { version = "1.13", features = ["derive"] }                       # gpu friendly data
 offset-allocator = "0.2.0"                                                   # gpu buffer allocation
+bytemuck = { version = "1.13", features = ["derive"] }                       # gpu friendly data
+image = { version = "0.25.6", default-features = false, features = ["png"] }
 
-# simulation related deps
+# game dependencies
 bevy = { version = "0.18.1", default-features = false, features = [
-  "default_app",      # core app/ecs/etc
-  "default_platform", # core OS features, windowing, input, etc
-  "3d_bevy_render",
-  "ui_bevy_render",
-  "bevy_asset",
   "bevy_state",
 ] }
-futures-lite = "2.6.1" # future utils
-
-# util deps
-sysinfo = { version = "0.37.2", default-features = false, features = [
-  "system",
+leafwing-input-manager = "0.20.0"
+lightyear = { version = "0.26.4", default-features = false, features = [
+  "replication", # allows replicating components between server and client
+  "leafwing",    # leafwing input support with built-in rollback
+  "crossbeam",   # enables crossbeam as an IO layer (for client as the host on same machine)
+  "netcode",     # needed to manage distinct conns
+  "udp",         # needed for dedicated/lan
 ] }
+
+# general utilities
+futures-lite = "2.6.1" # future utils
 derive_more = { version = "2.0.1", features = ["deref", "deref_mut"] }
 serde = { version = "1.0.228", features = ["derive"] } # serializing
 rand = "0.9.2" # rng
 ron = "0.11.0" # parsing RON files
+zstd = "0.13"
 noise = { version = "0.9.0", default-features = false } # gen random noise
 crossbeam = "0.8.4" # thread comms
 glob = "0.3.3" # reading dirs
 directories = "6.0" # platform-specific dirs
-criterion = { version = "0.5", features = ["html_reports"] }
+sysinfo = { version = "0.37.2", default-features = false, features = [
+  "system",
+] }
diff --git a/assets/client/shader/ui/common.wesl b/assets/client/shader/ui/common.wesl
deleted file mode 100644
index 4b05d24e..00000000
--- a/assets/client/shader/ui/common.wesl
+++ /dev/null
@@ -1,17 +0,0 @@
-// per-view data
-@group(0) @binding(0)
-var<uniform> ortho_projection: mat4x4<f32>;
-
-// per-material data
-struct Material {
-    color: vec4<f32>,
-};
-@group(1) @binding(0)
-var<uniform> material: Material;
-
-// per-object data
-struct Object {
-    model: mat4x4<f32>,
-};
-@group(2) @binding(0)
-var<storage, read> objects: array<Object>;
diff --git a/assets/client/shader/ui/main_frag.wesl b/assets/client/shader/ui/main_frag.wesl
deleted file mode 100644
index f8582ba4..00000000
--- a/assets/client/shader/ui/main_frag.wesl
+++ /dev/null
@@ -1,6 +0,0 @@
-import package::ui::common::{material, Material};
-
-@fragment
-fn fs_main() -> @location(0) vec4<f32> {
-    return material.color;
-}
\ No newline at end of file
diff --git a/assets/client/shader/ui/main_vert.wesl b/assets/client/shader/ui/main_vert.wesl
deleted file mode 100644
index fece7619..00000000
--- a/assets/client/shader/ui/main_vert.wesl
+++ /dev/null
@@ -1,19 +0,0 @@
-import package::ui::common::{ortho_projection, Object, objects, material, Material};
-
-struct VertexOutput {
-    @builtin(position) clip_position: vec4<f32>,
-};
-
-@vertex
-fn vs_main(
-    @location(0) position: vec2<f32>,
-    @builtin(instance_index) instance_index: u32,
-) -> VertexOutput {
-    var out: VertexOutput;
-
-    // scale model matrix (screen space) by the orthographic projection to get clip space
-    let model = objects[instance_index].model;
-    out.clip_position = ortho_projection * model * vec4<f32>(position, 0.0, 1.0);
-
-    return out;
-}
diff --git a/assets/client/shader/world/lib/vertex_pulling.wesl b/assets/client/shader/world/lib/vertex_pulling.wesl
index 4ee9c93e..b31e327d 100644
--- a/assets/client/shader/world/lib/vertex_pulling.wesl
+++ b/assets/client/shader/world/lib/vertex_pulling.wesl
@@ -11,10 +11,10 @@ const QUAD_UVS: array<vec2<f32>, 6> = array<vec2<f32>, 6>(
     vec2<f32>(1.0, 0.0), // top-right
     vec2<f32>(1.0, 0.0), // top-right
     vec2<f32>(0.0, 0.0), // top-left
-    vec2<f32>(0.0, 1.0)  // bottom-left
+    vec2<f32>(0.0, 1.0)// bottom-left
 );
 
-/// A lookup table for the 6 potential normal vectors of a voxel.
+/// A lookup table for the 6 potential normal vectors of a block.
 const CUBE_NORMALS: array<vec3<f32>, 6> = array<vec3<f32>, 6>(
     vec3<f32>(0.0, 1.0, 0.0),  // top face
     vec3<f32>(0.0, -1.0, 0.0), // bottom
@@ -24,7 +24,7 @@ const CUBE_NORMALS: array<vec3<f32>, 6> = array<vec3<f32>, 6>(
     vec3<f32>(0.0, 0.0, -1.0), // back
 );
 
-/// A lookup table for the relative position of the 8 vertices of a voxel.
+/// A lookup table for the relative position of the 8 vertices of a block.
 const CUBE_VERTICES: array<vec3<f32>, 8> = array<vec3<f32>, 8>(
     vec3<f32>(0.0, 0.0, 0.0), vec3<f32>(1.0, 0.0, 0.0),
     vec3<f32>(1.0, 1.0, 0.0), vec3<f32>(0.0, 1.0, 0.0),
@@ -56,10 +56,9 @@ const AO_VALUES: array<f32, 4> = array<f32, 4>(
 /// Indices: 0=BottomLeft, 1=TopLeft, 2=BottomRight, 3=TopRight
 const QUAD_VERTEX_TO_CORNER: array<u32, 6> = array<u32, 6>(
     0u, 1u, 2u, // triangle 1
-    2u, 3u, 0u  // triangle 2
+    2u, 3u, 0u// triangle 2
 );
 
-
 // INFO: ---------------
 //         utils
 // ---------------------
@@ -79,12 +78,12 @@ fn pull_global_vertex_position(
     return vec3<f32>(face_pos) + corner_offset + chunk_world_pos;
 }
 
-/// Gets the UVs for a voxel given the vertex indice in the face quad.
-fn get_voxel_uv(vert_idx_in_quad: u32) -> vec2<f32> {
+/// Gets the UVs for a block given the vertex indice in the face quad.
+fn get_block_uv(vert_idx_in_quad: u32) -> vec2<f32> {
     return QUAD_UVS[vert_idx_in_quad];
 }
 
-/// Gets the UVs for a voxel given the vertex indice in the face quad.
+/// Gets the UVs for a block given the vertex indice in the face quad.
 fn get_ao_color(ao_vec: vec4<f32>, vert_idx_in_quad: u32) -> vec3<f32> {
     let corner_idx = QUAD_VERTEX_TO_CORNER[vert_idx_in_quad];
     let raw_level = u32(ao_vec[corner_idx]);
@@ -93,6 +92,6 @@ fn get_ao_color(ao_vec: vec4<f32>, vert_idx_in_quad: u32) -> vec3<f32> {
 }
 
 /// Gets the normal vector given the normal index from the unpacked vertex.
-fn get_voxel_normal(normal_idx: u32) -> vec3<f32> {
+fn get_block_normal(normal_idx: u32) -> vec3<f32> {
     return CUBE_NORMALS[normal_idx];
 }
diff --git a/assets/client/shader/world/main_passes/lib/environment_uniform.wesl b/assets/client/shader/world/main_passes/lib/environment_uniform.wesl
index ed6ba2c3..578cb842 100644
--- a/assets/client/shader/world/main_passes/lib/environment_uniform.wesl
+++ b/assets/client/shader/world/main_passes/lib/environment_uniform.wesl
@@ -16,13 +16,13 @@ fn calculate_sky_color(
 		/// environment parameters
     env: EnvironmentUniform
 ) -> vec3<f32> {
-		// convert to [0.0, 1.0] range
+    // convert to [0.0, 1.0] range
     let vertical_gradient = (dir.y + 1.0) * 0.5;
 
-		// apply gradient curve
+    // apply gradient curve
     let eased_gradient = pow(vertical_gradient, 0.90);
 
-		// interpolate
+    // interpolate
     let sky_color = mix(env.horizon_color, env.zenith_color, eased_gradient);
     return sky_color;
 }
diff --git a/assets/client/shader/world/main_passes/opaque/main_vert.wesl b/assets/client/shader/world/main_passes/opaque/main_vert.wesl
index f449e052..5e778835 100644
--- a/assets/client/shader/world/main_passes/opaque/main_vert.wesl
+++ b/assets/client/shader/world/main_passes/opaque/main_vert.wesl
@@ -5,8 +5,8 @@ import package::world::main_passes::{
 import package::world::lib::{
   vertex_pulling::{
     pull_global_vertex_position,
-    get_voxel_uv,
-    get_voxel_normal,
+    get_block_uv,
+    get_block_normal,
 		get_ao_color,
   },
   face_unpacking::{unpack_face}
@@ -58,9 +58,9 @@ fn vs_main(
     out.clip_position = camera.view_proj * vec4<f32>(world_pos_vec3, 1.0);
     out.clip_pos_for_fog = out.clip_position;
 
-    out.normal = get_voxel_normal(face.normal_index);
+    out.normal = get_block_normal(face.normal_index);
     out.color = get_ao_color(face.ao_levels, vert_idx_in_quad);
-    out.tex_coords = get_voxel_uv(vert_idx_in_quad);
+    out.tex_coords = get_block_uv(vert_idx_in_quad);
     out.texture_index = face.texture_id;
 
     return out;
diff --git a/assets/client/shader/world/main_passes/skybox/main_vert.wesl b/assets/client/shader/world/main_passes/skybox/main_vert.wesl
index 80f14735..676de387 100644
--- a/assets/client/shader/world/main_passes/skybox/main_vert.wesl
+++ b/assets/client/shader/world/main_passes/skybox/main_vert.wesl
@@ -24,7 +24,7 @@ fn vs_main(
 
     let pos = vertices[in_vertex_index];
 
-    // the full screen quad is at the maximum distance (0.0 for inverse z)
+    // the full screen quad is at the maximum distance (z=0.0 for inverse z)
     out.clip_position = vec4<f32>(pos, 0.0, 1.0);
     out.clip_pos_for_unproject = out.clip_position;
 
diff --git a/assets/client/shader/world/main_passes/transparent/main_frag.wesl b/assets/client/shader/world/main_passes/transparent/main_frag.wesl
index bfb7b9f6..0d531cc1 100644
--- a/assets/client/shader/world/main_passes/transparent/main_frag.wesl
+++ b/assets/client/shader/world/main_passes/transparent/main_frag.wesl
@@ -20,7 +20,7 @@ fn fs_main(
 
     let texture_color: vec4<f32> = textureSample(texture_array, texture_sampler, tex_coords, texture_index);
     if texture_color.a < 0.01 {
-      discard;
+        discard;
     }
 
     // INFO: -------------
diff --git a/assets/client/shader/world/main_passes/transparent/main_vert.wesl b/assets/client/shader/world/main_passes/transparent/main_vert.wesl
index 1ac3f384..7d03849b 100644
--- a/assets/client/shader/world/main_passes/transparent/main_vert.wesl
+++ b/assets/client/shader/world/main_passes/transparent/main_vert.wesl
@@ -5,8 +5,8 @@ import package::world::main_passes::{
 import package::world::lib::{
   vertex_pulling::{
     pull_global_vertex_position,
-    get_voxel_uv,
-    get_voxel_normal
+    get_block_uv,
+    get_block_normal
   },
   face_unpacking::{unpack_face}
 };
@@ -53,7 +53,7 @@ fn vs_main(
 
     var final_pos = world_pos_vec3;
     let wobble = sin((world_pos_vec3.x + world_pos_vec3.z) * 23.0 + environment.time) * 0.05;
-    final_pos.y += wobble - 0.05; // offset to ensure vertices below voxels next to it
+    final_pos.y += wobble - 0.05; // offset to ensure vertices below blocks next to it
 
     // INFO: -------------------------
     //         output for frag
@@ -65,11 +65,10 @@ fn vs_main(
     out.clip_position = camera.view_proj * vec4<f32>(final_pos, 1.0);
     out.clip_pos_for_fog = out.clip_position;
 
-    out.normal = get_voxel_normal(face.normal_index);
+    out.normal = get_block_normal(face.normal_index);
     out.color = vec3<f32>(1.0, 1.0, 1.0);
-    out.tex_coords = get_voxel_uv(vert_idx_in_quad);
+    out.tex_coords = get_block_uv(vert_idx_in_quad);
     out.texture_index = face.texture_id;
 
     return out;
 }
-
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 001ef2eb..f1e7c69f 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -4,32 +4,20 @@ description = "client for vantablock"
 version.workspace = true
 edition.workspace = true
 publish.workspace = true
-default-run = "client"
-
-[lints]
-workspace = true
-
-[package.metadata.packager]
-product-name = "Vantablock"
-identifier = "com.masoniis.vantablock"
-resources = ["../../assets", "../../readme.md"]
-icons = ["../../assets/client/icon.png"]
-binaries = [{ path = "client", main = true }]
 
 [lib]
 name = "client"
 path = "src/lib.rs"
 
-[[bin]]
-name = "client"
-path = "src/main.rs"
+[lints]
+workspace = true
 
 [[bench]]
-name = "generation_benchmarks"
+name = "meshing_benchmarks"
 harness = false
 
 [features]
-dev = ["bevy/dev"]
+dev = ["bevy/dev", "bevy/bevy_dev_tools"]
 tracy = ["dep:tracy-client", "dep:tracing-tracy"]
 distribution = ["tracing/release_max_level_error"]
 
@@ -74,7 +62,20 @@ offset-allocator = { workspace = true } # gpu buffer allocation
 #         simulation logic
 # --------------------------------
 
-bevy = { workspace = true }
+bevy = { workspace = true, features = [
+  "default_app",      # core app (input, window, state, etc)
+  "default_platform", # core OS features, windowing, input, etc
+  "3d_bevy_render",   # bevy 3d render pass/graph and subapp
+  "ui_bevy_render",   # additional bevy ui render support
+  "bevy_asset",       # asset management
+  "bevy_state",       # state machines
+] }
+leafwing-input-manager = { workspace = true }
+lightyear = { workspace = true, features = [
+  "client",        # lightyear client core (plugin, etc)
+  "interpolation", # smoothing intended for more pleasing visuals
+  "prediction",    # for local predictions agaisnt server to get snappy feedback
+] }
 futures-lite = { workspace = true } # future utils
 
 # INFO: ---------------
@@ -86,6 +87,7 @@ derive_more = { workspace = true }
 serde = { workspace = true }       # serializing
 rand = { workspace = true }        # rng
 ron = { workspace = true }         # parsing RON files
+zstd = { workspace = true }
 noise = { workspace = true }       # gen random noise
 crossbeam = { workspace = true }   # thread comms
 glob = { workspace = true }        # reading dirs
diff --git a/crates/client/benches/generation_benchmarks.rs b/crates/client/benches/generation_benchmarks.rs
deleted file mode 100644
index 32b56e36..00000000
--- a/crates/client/benches/generation_benchmarks.rs
+++ /dev/null
@@ -1,236 +0,0 @@
-use bevy::ecs::prelude::World;
-use client::prelude::*;
-use client::render::chunk::meshing::build_chunk_mesh;
-use client::render::{block::BlockRenderDataRegistry, texture::VoxelTextureProcessor};
-use client::settings::ClientSettings;
-use criterion::{Criterion, criterion_group, criterion_main};
-use shared::simulation::{
-    biome::biome_registry::BiomeRegistryResource,
-    block::{BlockRegistry, SOLID_BLOCK_ID},
-    chunk::{
-        ChunkDataOption, NeighborLODs, PaddedChunk,
-        components::{ChunkBlocksComponent, ChunkCoord},
-        thread_buffer_pool::acquire_buffer,
-        types::ChunkLod,
-    },
-    terrain::{
-        BasicBiomeGenerator, BiomeGenerator, BiomeMapComponent, BiomeResultBuilder,
-        ClimateGenerator, ClimateNoiseGenerator, PaintResultBuilder, ShapeResultBuilder,
-        SimpleSurfacePainter, SinwaveShaper, TerrainPainter, TerrainShaper,
-    },
-};
-use utils::PersistentPaths;
-
-const CLIMATE_NOISE_SEED: u32 = 42;
-
-/// Each bench in this benchmark builds off the previous (conceptually speaking).
-fn bench_chunk_generation(c: &mut Criterion) {
-    let mut group = c.benchmark_group("Chunk generation");
-
-    // INFO: ---------------
-    //         setup
-    // ---------------------
-
-    let persistent_paths = PersistentPaths::resolve();
-    let block_registry = BlockRegistry::load_from_disk(&persistent_paths);
-
-    let mut world = World::new();
-    world.insert_resource(persistent_paths.clone());
-    world.insert_resource(block_registry.clone());
-    world.init_resource::<BiomeRegistryResource>();
-
-    let biome_registry = world.resource::<BiomeRegistryResource>().clone();
-
-    let origin_chunk_coord = ChunkCoord {
-        pos: IVec3::new(0, 0, 0),
-    };
-
-    // INFO: --------------------------
-    //         climate benching
-    // --------------------------------
-
-    let climate_noise_generator = ClimateNoiseGenerator::new(CLIMATE_NOISE_SEED);
-    group.bench_function("climate_noise", |b| {
-        b.iter(|| {
-            climate_noise_generator.generate(origin_chunk_coord.clone());
-        })
-    });
-
-    // INFO: ------------------------
-    //         biome benching
-    // ------------------------------
-
-    let biome_generator = BasicBiomeGenerator;
-    let origin_noise = climate_noise_generator.generate(origin_chunk_coord.clone());
-
-    group.bench_function("biome_mapping", |b| {
-        b.iter(|| {
-            // setup
-            let biome_map = BiomeMapComponent::new_empty(ChunkLod(0));
-            let builder = BiomeResultBuilder::new(biome_map, origin_chunk_coord.clone());
-
-            // chunk gen
-            biome_generator.generate_biome_chunk(builder, &origin_noise, &biome_registry);
-        })
-    });
-
-    // INFO: --------------------------------
-    //         sinwave shape benching
-    // --------------------------------------
-
-    let sinwave_shaper = SinwaveShaper::new();
-    group.bench_function("sinwave_shaping", |b| {
-        b.iter(|| {
-            let clim_map = climate_noise_generator.generate(origin_chunk_coord.clone());
-            let chunk_blocks = ChunkBlocksComponent::new_uniform_empty(ChunkLod(0));
-            let shaper = ShapeResultBuilder::new(chunk_blocks, origin_chunk_coord.clone());
-
-            sinwave_shaper.shape_terrain_chunk(&clim_map, shaper)
-        })
-    });
-
-    // INFO: ------------------------
-    //         paint benching
-    // ------------------------------
-
-    let surface_painter = SimpleSurfacePainter::new();
-    group.bench_function("painting", |b| {
-        b.iter(|| {
-            let biome_map = BiomeMapComponent::new_empty(ChunkLod(0));
-
-            let blocks = ChunkBlocksComponent::new_uniform_solid(ChunkLod(0));
-            let painter =
-                PaintResultBuilder::new(blocks, origin_chunk_coord.clone(), block_registry.clone());
-
-            surface_painter.paint_terrain_chunk(
-                painter,
-                &biome_map,
-                &block_registry,
-                &biome_registry,
-            );
-        })
-    });
-
-    group.finish();
-}
-
-fn bench_chunk_meshing(c: &mut Criterion) {
-    let mut group = c.benchmark_group("Chunk meshing");
-
-    // INFO: ---------------
-    //         setup
-    // ---------------------
-
-    let persistent_paths = PersistentPaths::resolve();
-    let client_settings = ClientSettings::load_or_create(&persistent_paths);
-
-    // meshing requires textures to resolve
-    let (_texture_array, texture_registry) = VoxelTextureProcessor::new(
-        persistent_paths.assets_dir.clone(),
-        &client_settings.texture_pack,
-    )
-    .load_and_stitch()
-    .expect("Failed to load and stitch textures");
-
-    let block_registry = BlockRegistry::load_from_disk(&persistent_paths);
-    let render_registry = BlockRenderDataRegistry::load_from_disk(
-        &persistent_paths,
-        &block_registry,
-        &texture_registry,
-    );
-
-    // INFO: ---------------------------------
-    //         dense meshing benchmark
-    // ---------------------------------------
-
-    let mut dense_chunks: [[[ChunkDataOption; 3]; 3]; 3] = Default::default();
-    let solid_chunk =
-        ChunkDataOption::Generated(ChunkBlocksComponent::new_uniform_solid(ChunkLod(0)));
-
-    #[allow(clippy::needless_range_loop)]
-    for x in 0..3 {
-        for y in 0..3 {
-            for z in 0..3 {
-                if x == 1 && y == 1 && z == 1 {
-                    continue;
-                }
-                dense_chunks[x][y][z] = solid_chunk.clone();
-            }
-        }
-    }
-
-    // default to water for more complex meshing with transparency
-    let mut center_chunk = ChunkBlocksComponent::new_uniform(
-        ChunkLod(0),
-        block_registry.get_block_id_by_name("water").unwrap(),
-    );
-    let size = center_chunk.size();
-    let mut writer = center_chunk.get_writer();
-    // create a y=x "slope" chunk
-    for x in 0..size {
-        for y in 0..=x {
-            for z in 0..size {
-                writer.set_data(x, y, z, SOLID_BLOCK_ID);
-            }
-        }
-    }
-    dense_chunks[1][1][1] = ChunkDataOption::Generated(center_chunk);
-
-    let dense_neighbor_lods = NeighborLODs::default();
-    let texture_lut = render_registry.get_texture_lut();
-
-    group.bench_function("dense meshing", |b| {
-        b.iter(|| {
-            let buffer = acquire_buffer();
-            let dense_padded_chunk =
-                PaddedChunk::new(&dense_chunks, ChunkLod(0), dense_neighbor_lods, buffer);
-            build_chunk_mesh(
-                "bench_chunk_dense",
-                &dense_padded_chunk,
-                &block_registry,
-                &render_registry,
-                texture_lut,
-            )
-        })
-    });
-
-    // INFO: --------------------------------
-    //         hull meshing benchmark
-    // --------------------------------------
-
-    let mut hull_chunks: [[[ChunkDataOption; 3]; 3]; 3] = Default::default();
-    let empty_chunk =
-        ChunkDataOption::Generated(ChunkBlocksComponent::new_uniform_empty(ChunkLod(0)));
-
-    #[allow(clippy::needless_range_loop)]
-    for x in 0..3 {
-        for y in 0..3 {
-            for z in 0..3 {
-                hull_chunks[x][y][z] = empty_chunk.clone();
-            }
-        }
-    }
-
-    hull_chunks[1][1][1] =
-        ChunkDataOption::Generated(ChunkBlocksComponent::new_uniform_solid(ChunkLod(0)));
-
-    let hull_neighbor_lods = NeighborLODs::default();
-
-    group.bench_function("hull meshing", |b| {
-        b.iter(|| {
-            let buffer = acquire_buffer();
-            let hull_padded_chunk =
-                PaddedChunk::new(&hull_chunks, ChunkLod(0), hull_neighbor_lods, buffer);
-            build_chunk_mesh(
-                "bench_chunk_hull",
-                &hull_padded_chunk,
-                &block_registry,
-                &render_registry,
-                texture_lut,
-            )
-        })
-    });
-}
-
-criterion_group!(benches, bench_chunk_generation, bench_chunk_meshing);
-criterion_main!(benches);
diff --git a/crates/client/benches/meshing_benchmarks.rs b/crates/client/benches/meshing_benchmarks.rs
new file mode 100644
index 00000000..b8750704
--- /dev/null
+++ b/crates/client/benches/meshing_benchmarks.rs
@@ -0,0 +1,133 @@
+use client::render::chunk::meshing::build_chunk_mesh;
+use client::render::{block::BlockRenderDataRegistry, texture::BlockTextureProcessor};
+use client::settings::ClientSettings;
+use criterion::{Criterion, criterion_group, criterion_main};
+use shared::world::{
+    block::{BlockRegistry, SOLID_BLOCK_ID},
+    chunk::{
+        ChunkDataOption, NeighborLODs, PaddedChunk, components::ChunkBlocksComponent,
+        thread_buffer_pool::acquire_buffer, types::ChunkLod,
+    },
+};
+use utils::PersistentPaths;
+
+fn bench_chunk_meshing(c: &mut Criterion) {
+    let mut group = c.benchmark_group("Chunk meshing");
+
+    // INFO: ---------------
+    //         setup
+    // ---------------------
+
+    let persistent_paths = PersistentPaths::resolve_client();
+    let client_settings = ClientSettings::load_or_create(&persistent_paths);
+
+    // meshing requires textures to resolve
+    let (_texture_array, texture_registry) = BlockTextureProcessor::new(
+        persistent_paths.assets_dir.clone(),
+        &client_settings.texture_pack,
+    )
+    .load_and_stitch()
+    .expect("Failed to load and stitch textures");
+
+    let block_registry = BlockRegistry::load_from_disk(&persistent_paths);
+    let render_registry = BlockRenderDataRegistry::load_from_disk(
+        &persistent_paths,
+        &block_registry,
+        &texture_registry,
+    );
+
+    // INFO: ---------------------------------
+    //         dense meshing benchmark
+    // ---------------------------------------
+
+    let mut dense_chunks: [[[ChunkDataOption; 3]; 3]; 3] = Default::default();
+    let solid_chunk =
+        ChunkDataOption::Generated(ChunkBlocksComponent::new_uniform_solid(ChunkLod(0)));
+
+    #[allow(clippy::needless_range_loop)]
+    for x in 0..3 {
+        for y in 0..3 {
+            for z in 0..3 {
+                if x == 1 && y == 1 && z == 1 {
+                    continue;
+                }
+                dense_chunks[x][y][z] = solid_chunk.clone();
+            }
+        }
+    }
+
+    // default to water for more complex meshing with transparency
+    let mut center_chunk = ChunkBlocksComponent::new_uniform(
+        ChunkLod(0),
+        block_registry.get_block_id_by_name("water").unwrap(),
+    );
+    let size = center_chunk.size();
+    let mut writer = center_chunk.get_writer();
+    // create a y=x "slope" chunk
+    for x in 0..size {
+        for y in 0..=x {
+            for z in 0..size {
+                writer.set_data(x, y, z, SOLID_BLOCK_ID);
+            }
+        }
+    }
+    dense_chunks[1][1][1] = ChunkDataOption::Generated(center_chunk);
+
+    let dense_neighbor_lods = NeighborLODs::default();
+    let texture_lut = render_registry.get_texture_lut();
+
+    group.bench_function("dense meshing", |b| {
+        b.iter(|| {
+            let buffer = acquire_buffer();
+            let dense_padded_chunk =
+                PaddedChunk::new(&dense_chunks, ChunkLod(0), dense_neighbor_lods, buffer);
+            build_chunk_mesh(
+                "bench_chunk_dense",
+                &dense_padded_chunk,
+                &block_registry,
+                &render_registry,
+                texture_lut,
+            )
+        })
+    });
+
+    // INFO: --------------------------------
+    //         hull meshing benchmark
+    // --------------------------------------
+
+    let mut hull_chunks: [[[ChunkDataOption; 3]; 3]; 3] = Default::default();
+    let empty_chunk =
+        ChunkDataOption::Generated(ChunkBlocksComponent::new_uniform_empty(ChunkLod(0)));
+
+    #[allow(clippy::needless_range_loop)]
+    for x in 0..3 {
+        for y in 0..3 {
+            for z in 0..3 {
+                hull_chunks[x][y][z] = empty_chunk.clone();
+            }
+        }
+    }
+
+    hull_chunks[1][1][1] =
+        ChunkDataOption::Generated(ChunkBlocksComponent::new_uniform_solid(ChunkLod(0)));
+
+    let hull_neighbor_lods = NeighborLODs::default();
+
+    group.bench_function("hull meshing", |b| {
+        b.iter(|| {
+            let buffer = acquire_buffer();
+            let hull_padded_chunk =
+                PaddedChunk::new(&hull_chunks, ChunkLod(0), hull_neighbor_lods, buffer);
+            build_chunk_mesh(
+                "bench_chunk_hull",
+                &hull_padded_chunk,
+                &block_registry,
+                &render_registry,
+                texture_lut,
+            )
+        })
+    });
+}
+
+criterion_group!(benches, bench_chunk_meshing);
+criterion_main!(benches);
diff --git a/crates/client/build.rs b/crates/client/build.rs
index 50b17e99..7ebf223c 100644
--- a/crates/client/build.rs
+++ b/crates/client/build.rs
@@ -71,8 +71,4 @@ fn main() {
         &"package::world::shadow::main_vert".parse().unwrap(),
         "shadow_vert",
     );
-
-    // UI shaders
-    compiler.build_artifact(&"package::ui::main_vert".parse().unwrap(), "ui_vert");
-    compiler.build_artifact(&"package::ui::main_frag".parse().unwrap(), "ui_frag");
 }
diff --git a/crates/client/readme.md b/crates/client/readme.md
new file mode 100644
index 00000000..4e118ce0
--- /dev/null
+++ b/crates/client/readme.md
@@ -0,0 +1,9 @@
+# Vantablock Client (`vantablock-client`)
+
+The `vantablock-client` crate contains the graphical client for the Vantablock voxel engine. It is completely isolated from the authoritative server logic, communicating exclusively via the network protocol defined in the `shared` crate.
+
+## Features Flags
+
+- `dev`: Enables Bevy dev tools.
+- `tracy`: Enables Tracy profiling for client-side performance tuning.
+- `distribution`: Trims logging for release builds.
diff --git a/crates/client/src/input/input_maps.rs b/crates/client/src/input/input_maps.rs
new file mode 100644
index 00000000..0abef905
--- /dev/null
+++ b/crates/client/src/input/input_maps.rs
@@ -0,0 +1,60 @@
+use crate::input::local_actions::ClientAction;
+use bevy::prelude::{KeyCode, MouseButton};
+use leafwing_input_manager::prelude::{InputMap, MouseMove};
+use shared::player::PlayerAction;
+
+/// Provides the default input mapping for the game.
+pub fn get_default_player_action_input_map() -> InputMap<PlayerAction> {
+    let mut input_map = InputMap::default();
+
+    // movement
+    input_map.insert(PlayerAction::MoveForward, KeyCode::KeyW);
+    input_map.insert(PlayerAction::MoveBackward, KeyCode::KeyS);
+    input_map.insert(PlayerAction::MoveLeft, KeyCode::KeyA);
+    input_map.insert(PlayerAction::MoveRight, KeyCode::KeyD);
+    input_map.insert(PlayerAction::MoveFaster, KeyCode::ShiftLeft);
+
+    // core player actions
+    input_map.insert(PlayerAction::PrimaryInteract, MouseButton::Left);
+    input_map.insert(PlayerAction::SecondaryInteract, MouseButton::Right);
+
+    // game time control
+    input_map.insert(PlayerAction::JumpGameTimeForward, KeyCode::ArrowRight);
+    input_map.insert(PlayerAction::JumpGameTimeBackward, KeyCode::ArrowLeft);
+    input_map.insert(PlayerAction::PauseGameTime, KeyCode::Space);
+
+    input_map
+}
+
+/// Provides the default local input mapping for the game.
+pub fn get_default_client_action_input_map() -> InputMap<ClientAction> {
+    let mut input_map = InputMap::default();
+
+    // orientation
+    input_map.insert_dual_axis(ClientAction::Look, MouseMove::default());
+
+    // misc
+    input_map.insert(ClientAction::TogglePause, KeyCode::Escape);
+
+    // debug/analysis tools
+    input_map.insert(ClientAction::ToggleDiagnostics, KeyCode::F1);
+    input_map.insert(ClientAction::ToggleDiagnostics, KeyCode::KeyU);
+    input_map.insert(ClientAction::ToggleDebugMenu, KeyCode::F3);
+    input_map.insert(ClientAction::ToggleOpaqueWireframeMode, KeyCode::F2);
+    input_map.insert(ClientAction::ToggleOpaqueWireframeMode, KeyCode::KeyO);
+    input_map.insert(ClientAction::ToggleChunkBorders, KeyCode::KeyB);
+
+    // showcase actions
+    input_map.insert(ClientAction::Showcase0, KeyCode::Digit0);
+    input_map.insert(ClientAction::Showcase1, KeyCode::Digit1);
+    input_map.insert(ClientAction::Showcase2, KeyCode::Digit2);
+    input_map.insert(ClientAction::Showcase3, KeyCode::Digit3);
+    input_map.insert(ClientAction::Showcase4, KeyCode::Digit4);
+    input_map.insert(ClientAction::Showcase5, KeyCode::Digit5);
+    input_map.insert(ClientAction::Showcase6, KeyCode::Digit6);
+    input_map.insert(ClientAction::Showcase7, KeyCode::Digit7);
+    input_map.insert(ClientAction::Showcase8, KeyCode::Digit8);
+    input_map.insert(ClientAction::Showcase9, KeyCode::Digit9);
+
+    input_map
+}
diff --git a/crates/client/src/input/local_actions.rs b/crates/client/src/input/local_actions.rs
new file mode 100644
index 00000000..f655eec4
--- /dev/null
+++ b/crates/client/src/input/local_actions.rs
@@ -0,0 +1,31 @@
+use bevy::prelude::Reflect;
+use leafwing_input_manager::Actionlike;
+
+/// Actions that are local to the client and do not affect the server's state or the player/character.
+///
+/// These are typically used for UI toggles, debug views, etc.
+#[derive(Actionlike, PartialEq, Eq, Clone, Copy, Hash, Debug, Reflect)]
+pub enum ClientAction {
+    // continuous inputs
+    #[actionlike(DualAxis)]
+    Look,
+
+    // random stuff
+    ToggleDiagnostics,
+    ToggleDebugMenu,
+    ToggleOpaqueWireframeMode,
+    ToggleChunkBorders,
+    TogglePause,
+
+    // showcase actions
+    Showcase0,
+    Showcase1,
+    Showcase2,
+    Showcase3,
+    Showcase4,
+    Showcase5,
+    Showcase6,
+    Showcase7,
+    Showcase8,
+    Showcase9,
+}
diff --git a/crates/client/src/input/mod.rs b/crates/client/src/input/mod.rs
index bb7b0a44..cae78f80 100644
--- a/crates/client/src/input/mod.rs
+++ b/crates/client/src/input/mod.rs
@@ -1,74 +1,91 @@
+pub mod input_maps;
+pub mod local_actions;
+pub mod resources;
 pub mod systems;
 
 // INFO: -----------------------------
 //         input module plugin
 // -----------------------------------
 
-use crate::input::systems::{
-    toggle_chunk_borders::ChunkBoundsToggle, toggle_chunk_borders_system, toggle_cursor_system,
-    toggle_opaque_wireframe::OpaqueWireframeMode, toggle_opaque_wireframe_mode_system,
+use crate::{
+    input::{
+        input_maps::get_default_client_action_input_map,
+        local_actions::ClientAction,
+        resources::CursorMovement,
+        systems::{
+            lock_cursor_system, toggle_chunk_borders::ChunkBoundsToggle,
+            toggle_chunk_borders_system, toggle_opaque_wireframe::OpaqueRenderMode,
+            toggle_opaque_wireframe_mode_system, toggle_pause_system, unlock_cursor_system,
+        },
+    },
+    lifecycle::state::{ClientLifecycleState, InGameState},
 };
-use bevy::app::{App, Plugin, PreUpdate, Update};
-use bevy::ecs::{schedule::IntoScheduleConfigs, system::Res};
-use shared::simulation::input::resources::{
-    ActionStateResource, CursorMovement, InputActionMapResource,
+use bevy::{
+    app::{App, Plugin, PreUpdate, Update},
+    prelude::{IntoScheduleConfigs, OnEnter, OnExit, SystemCondition, in_state},
+    render::extract_resource::ExtractResourcePlugin,
+};
+use leafwing_input_manager::{
+    common_conditions::action_just_pressed, plugin::InputManagerPlugin, prelude::ActionState,
 };
-use systems::processing;
 
-pub struct InputModulePlugin;
+pub struct ClientInputPlugin;
 
-impl Plugin for InputModulePlugin {
+impl Plugin for ClientInputPlugin {
     fn build(&self, app: &mut App) {
-        // resources
-        app.insert_resource(InputActionMapResource::default())
-            .insert_resource(ActionStateResource::default());
+        // leafwing input manager for local actions
+        app.add_plugins(InputManagerPlugin::<ClientAction>::default());
+        app.init_resource::<ActionState<ClientAction>>()
+            .insert_resource(get_default_client_action_input_map());
 
+        // INFO: ------------------------------------
+        //         resources & render plugins
+        // ------------------------------------------
         app.insert_resource(CursorMovement::default());
+        app.insert_resource(OpaqueRenderMode::default());
+        app.insert_resource(ChunkBoundsToggle::default());
+        app.add_plugins(ExtractResourcePlugin::<ChunkBoundsToggle>::default());
+
+        // INFO: --------------------------------------------
+        //         state-transition cursor management
+        // --------------------------------------------------
+
+        // cursor management based on game state
+        app.add_systems(OnEnter(InGameState::Playing), lock_cursor_system)
+            .add_systems(OnExit(InGameState::Playing), unlock_cursor_system)
+            .add_systems(
+                OnEnter(ClientLifecycleState::MainMenu),
+                unlock_cursor_system,
+            );
 
-        // schedules
+        // INFO: ---------------------------------------
+        //         general keybind-based actions
+        // ---------------------------------------------
+
+        // ensure device events (mouse movement) are only processed in-game
         app.add_systems(
             PreUpdate,
-            (
-                processing::device_events_system,
-                processing::update_action_state_system.after(processing::device_events_system),
-            ),
+            systems::processing::device_events_system
+                .run_if(in_state(ClientLifecycleState::InGame)),
         );
 
-        // INFO: -------------------------------------
-        //         keybind-based actions below
-        // -------------------------------------------
-
-        // set desired cursor state on pause action
+        // inputs that only run if in game state
         app.add_systems(
             Update,
-            toggle_cursor_system.run_if(|action_state: Res<ActionStateResource>| {
-                action_state
-                    .just_happened(shared::simulation::input::types::SimulationAction::TogglePause)
-            }),
-        );
-
-        // toggle opaque wireframe mode
-        app.insert_resource(OpaqueWireframeMode::default())
-            .add_systems(
-                Update,
-                toggle_opaque_wireframe_mode_system.run_if(
-                    |action_state: Res<ActionStateResource>| {
-                        action_state.just_happened(
-                    shared::simulation::input::types::SimulationAction::ToggleOpaqueWireframeMode,
-                )
-                    },
+            (
+                // set desired cursor state on pause action
+                toggle_pause_system.run_if(
+                    action_just_pressed(ClientAction::TogglePause)
+                        .and(in_state(InGameState::Playing).or(in_state(InGameState::Paused))),
                 ),
-            );
-
-        // toggle chunk borders
-        app.insert_resource(ChunkBoundsToggle::default())
-            .add_systems(
-                Update,
-                toggle_chunk_borders_system.run_if(|action_state: Res<ActionStateResource>| {
-                    action_state.just_happened(
-                        shared::simulation::input::types::SimulationAction::ToggleChunkBorders,
-                    )
-                }),
-            );
+                // toggle opaque wireframe mode
+                toggle_opaque_wireframe_mode_system
+                    .run_if(action_just_pressed(ClientAction::ToggleOpaqueWireframeMode)),
+                // toggle chunk borders
+                toggle_chunk_borders_system
+                    .run_if(action_just_pressed(ClientAction::ToggleChunkBorders)),
+            )
+                .run_if(in_state(ClientLifecycleState::InGame)),
+        );
     }
 }
diff --git a/crates/client/src/input/resources/cursor_movement.rs b/crates/client/src/input/resources/cursor_movement.rs
new file mode 100644
index 00000000..4b9b4e0d
--- /dev/null
+++ b/crates/client/src/input/resources/cursor_movement.rs
@@ -0,0 +1,25 @@
+use bevy::ecs::prelude::Resource;
+use bevy::math::Vec2;
+
+#[derive(Debug, Resource, Default)]
+pub struct CursorMovement {
+    /// mouse delta
+    pub delta: Vec2,
+    /// scroll delta
+    pub scroll_delta: Vec2,
+}
+
+impl CursorMovement {
+    pub fn reset_deltas(&mut self) {
+        self.delta = Vec2::ZERO;
+        self.scroll_delta = Vec2::ZERO;
+    }
+
+    pub fn adjust_mouse_delta(&mut self, delta: Vec2) {
+        self.delta += delta;
+    }
+
+    pub fn adjust_scroll_delta(&mut self, delta: Vec2) {
+        self.scroll_delta += delta;
+    }
+}
diff --git a/crates/client/src/input/resources/mod.rs b/crates/client/src/input/resources/mod.rs
new file mode 100644
index 00000000..3514192f
--- /dev/null
+++ b/crates/client/src/input/resources/mod.rs
@@ -0,0 +1,3 @@
+pub mod cursor_movement;
+
+pub use cursor_movement::CursorMovement;
diff --git a/crates/client/src/input/systems/extra_binds/mod.rs b/crates/client/src/input/systems/extra_binds/mod.rs
index 56577a69..855caa82 100644
--- a/crates/client/src/input/systems/extra_binds/mod.rs
+++ b/crates/client/src/input/systems/extra_binds/mod.rs
@@ -1,7 +1,9 @@
 pub mod toggle_chunk_borders;
 pub mod toggle_cursor;
 pub mod toggle_opaque_wireframe;
+pub mod toggle_pause;
 
 pub use toggle_chunk_borders::toggle_chunk_borders_system;
-pub use toggle_cursor::toggle_cursor_system;
+pub use toggle_cursor::{lock_cursor_system, unlock_cursor_system};
 pub use toggle_opaque_wireframe::toggle_opaque_wireframe_mode_system;
+pub use toggle_pause::toggle_pause_system;
diff --git a/crates/client/src/input/systems/extra_binds/toggle_chunk_borders.rs b/crates/client/src/input/systems/extra_binds/toggle_chunk_borders.rs
index 15c33ec9..0f36cffb 100644
--- a/crates/client/src/input/systems/extra_binds/toggle_chunk_borders.rs
+++ b/crates/client/src/input/systems/extra_binds/toggle_chunk_borders.rs
@@ -1,7 +1,10 @@
 use crate::prelude::*;
-use bevy::ecs::{resource::Resource, system::ResMut};
+use bevy::{
+    ecs::{resource::Resource, system::ResMut},
+    render::extract_resource::ExtractResource,
+};
 
-#[derive(Resource, Default)]
+#[derive(Resource, ExtractResource, Default, Clone)]
 pub struct ChunkBoundsToggle {
     pub enabled: bool,
 }
diff --git a/crates/client/src/input/systems/extra_binds/toggle_cursor.rs b/crates/client/src/input/systems/extra_binds/toggle_cursor.rs
index f424912e..0966b603 100644
--- a/crates/client/src/input/systems/extra_binds/toggle_cursor.rs
+++ b/crates/client/src/input/systems/extra_binds/toggle_cursor.rs
@@ -1,18 +1,22 @@
 use bevy::prelude::*;
 use bevy::window::{CursorGrabMode, CursorOptions, PrimaryWindow};
 
-/// Toggles the OS cursor visibility and lock state on the primary window.
-pub fn toggle_cursor_system(mut cursor_query: Query<&mut CursorOptions, With<PrimaryWindow>>) {
+/// Locks the OS cursor and hides it.
+pub fn lock_cursor_system(mut cursor_query: Query<&mut CursorOptions, With<PrimaryWindow>>) {
     let Ok(mut cursor) = cursor_query.single_mut() else {
         return;
     };
 
-    // toggle visibiility
-    cursor.visible = !cursor.visible;
+    cursor.visible = false;
+    cursor.grab_mode = CursorGrabMode::Locked;
+}
+
+/// Unlocks the OS cursor and shows it.
+pub fn unlock_cursor_system(mut cursor_query: Query<&mut CursorOptions, With<PrimaryWindow>>) {
+    let Ok(mut cursor) = cursor_query.single_mut() else {
+        return;
+    };
 
-    if cursor.visible {
-        cursor.grab_mode = CursorGrabMode::None;
-    } else {
-        cursor.grab_mode = CursorGrabMode::Locked;
-    }
+    cursor.visible = true;
+    cursor.grab_mode = CursorGrabMode::None;
 }
diff --git a/crates/client/src/input/systems/extra_binds/toggle_opaque_wireframe.rs b/crates/client/src/input/systems/extra_binds/toggle_opaque_wireframe.rs
index bccc6469..26c9d7e5 100644
--- a/crates/client/src/input/systems/extra_binds/toggle_opaque_wireframe.rs
+++ b/crates/client/src/input/systems/extra_binds/toggle_opaque_wireframe.rs
@@ -1,13 +1,28 @@
 use crate::prelude::*;
-use bevy::ecs::{resource::Resource, system::ResMut};
+use bevy::{
+    ecs::{resource::Resource, system::ResMut},
+    render::extract_resource::ExtractResource,
+};
 
-#[derive(Resource, Default)]
-pub struct OpaqueWireframeMode {
-    pub enabled: bool,
+/// A resource that defines the current opaque rendering polygon mode
+#[derive(Resource, ExtractResource, Default, Debug, PartialEq, Eq, Hash, Clone, Copy)]
+pub enum OpaqueRenderMode {
+    #[default]
+    Fill,
+    Wireframe,
+}
+
+impl OpaqueRenderMode {
+    pub fn next(self) -> Self {
+        match self {
+            Self::Fill => Self::Wireframe,
+            Self::Wireframe => Self::Fill,
+        }
+    }
 }
 
 /// Toggle opaque wireframe mode on or off.
-pub fn toggle_opaque_wireframe_mode_system(mut mode: ResMut<OpaqueWireframeMode>) {
-    info!("Toggling opaque wireframe mode: {}", !mode.enabled);
-    mode.enabled = !mode.enabled;
+pub fn toggle_opaque_wireframe_mode_system(mut mode: ResMut<OpaqueRenderMode>) {
+    *mode = mode.next();
+    info!("Toggling opaque wireframe mode: {:?}", *mode);
 }
diff --git a/crates/client/src/input/systems/extra_binds/toggle_pause.rs b/crates/client/src/input/systems/extra_binds/toggle_pause.rs
new file mode 100644
index 00000000..5948ebfa
--- /dev/null
+++ b/crates/client/src/input/systems/extra_binds/toggle_pause.rs
@@ -0,0 +1,17 @@
+use crate::lifecycle::state::InGameState;
+use bevy::prelude::*;
+
+pub fn toggle_pause_system(
+    current_state: Res<State<InGameState>>,
+    mut next_state: ResMut<NextState<InGameState>>,
+) {
+    match current_state.get() {
+        InGameState::Playing => {
+            next_state.set(InGameState::Paused);
+        }
+        InGameState::Paused => {
+            next_state.set(InGameState::Playing);
+        }
+        _ => {}
+    }
+}
diff --git a/crates/client/src/input/systems/processing/action_mapper.rs b/crates/client/src/input/systems/processing/action_mapper.rs
deleted file mode 100644
index 99692866..00000000
--- a/crates/client/src/input/systems/processing/action_mapper.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use bevy::ecs::system::{Res, ResMut};
-use bevy::prelude::{ButtonInput, KeyCode, MouseButton};
-use shared::simulation::input::resources::{
-    InputActionMapResource, action::ActionStateResource, input_action_map::Input,
-};
-use tracing::instrument;
-
-/// A system that translates the raw state from Bevy's native input resources into abstract,
-/// game-specific actions based on the current `InputActionMapResource`.
-#[instrument(skip_all)]
-pub fn update_action_state_system(
-    keyboard_input: Res<ButtonInput<KeyCode>>,
-    mouse_input: Res<ButtonInput<MouseButton>>,
-    action_map: Res<InputActionMapResource>,
-    mut action_state: ResMut<ActionStateResource>,
-) {
-    // INFO: -----------------------------------------
-    //         Update the actions
-    // -----------------------------------------------
-
-    // We clear the state of "one-shot" actions (just pressed/just released)
-    // before we update them again.
-    action_state.clear();
-
-    // We iterate through every bound action and update its state based on whether
-    // the associated key is pressed, was just pressed, or was just released.
-    for (input, action) in action_map.iter() {
-        let is_down = match input {
-            Input::Key(code) => keyboard_input.pressed(*code),
-            Input::MouseButton(button) => mouse_input.pressed(*button),
-        };
-
-        let just_pressed = match input {
-            Input::Key(code) => keyboard_input.just_pressed(*code),
-            Input::MouseButton(button) => mouse_input.just_pressed(*button),
-        };
-
-        let just_released = match input {
-            Input::Key(code) => keyboard_input.just_released(*code),
-            Input::MouseButton(button) => mouse_input.just_released(*button),
-        };
-
-        // update state
-        if is_down {
-            action_state.hold(*action);
-        }
-
-        if just_pressed {
-            action_state.press(*action);
-        }
-
-        if just_released {
-            action_state.release(*action);
-        }
-    }
-}
diff --git a/crates/client/src/input/systems/processing/device_events.rs b/crates/client/src/input/systems/processing/device_events.rs
index b5e34474..b4427c46 100644
--- a/crates/client/src/input/systems/processing/device_events.rs
+++ b/crates/client/src/input/systems/processing/device_events.rs
@@ -1,7 +1,7 @@
+use crate::input::resources::CursorMovement;
 use crate::prelude::*;
 use bevy::ecs::prelude::{MessageReader, ResMut};
 use bevy::input::mouse::{MouseMotion, MouseScrollUnit, MouseWheel};
-use shared::simulation::input::resources::CursorMovement;
 use tracing::instrument;
 
 /// A system to handle Bevy's native mouse motion and wheel events,
@@ -10,14 +10,14 @@ use tracing::instrument;
 pub fn device_events_system(
     mut motion_events: MessageReader<MouseMotion>,
     mut wheel_events: MessageReader<MouseWheel>,
-    // State to modify (output)
+    // state to modify (output)
     mut movement: ResMut<CursorMovement>,
 ) {
-    // Clear previous stale state (without this mouse movement would "accumulate")
+    // clear previous stale state
     movement.reset_deltas();
 
     for event in motion_events.read() {
-        movement.adjust_mouse_delta(event.delta.into());
+        movement.adjust_mouse_delta(event.delta);
     }
 
     for event in wheel_events.read() {
diff --git a/crates/client/src/input/systems/processing/mod.rs b/crates/client/src/input/systems/processing/mod.rs
index d15cc06a..78ab4652 100644
--- a/crates/client/src/input/systems/processing/mod.rs
+++ b/crates/client/src/input/systems/processing/mod.rs
@@ -1,5 +1,3 @@
-pub mod action_mapper;
 pub mod device_events;
 
-pub use action_mapper::update_action_state_system;
 pub use device_events::device_events_system;
diff --git a/crates/client/src/lib.rs b/crates/client/src/lib.rs
index c161cd04..7e076a13 100644
--- a/crates/client/src/lib.rs
+++ b/crates/client/src/lib.rs
@@ -1,11 +1,13 @@
+//! # The Vantablock Client Library
+
 pub mod input;
-pub mod load;
+pub mod lifecycle;
+pub mod network;
 pub mod player;
 pub mod prelude;
 pub mod render;
 pub mod settings;
 pub mod showcase;
-pub mod state;
 pub mod ui;
 
 pub use prelude::*;
@@ -14,21 +16,117 @@ pub use prelude::*;
 //         client plugin group
 // -----------------------------------
 
-use bevy::app::PluginGroupBuilder;
-use bevy::prelude::PluginGroup;
+#[cfg(feature = "dev")]
+use bevy::dev_tools::fps_overlay::{FpsOverlayConfig, FpsOverlayPlugin};
+use bevy::{
+    MinimalPlugins,
+    asset::AssetApp,
+    image::Image,
+    input::InputPlugin,
+    log::LogPlugin,
+    prelude::{AssetPlugin, DefaultPlugins, Window, WindowPlugin, default},
+    state::app::StatesPlugin,
+    window::WindowResolution,
+};
 
-/// A group containing all client-side plugins.
-pub struct ClientPlugins;
+/// A plugin group containing client-side core plugins.
+///
+/// Notably, this excludes high level bevy plugins meaning
+/// that no windows will be spawned, etc. Good for testing.
+pub struct CoreClientLogicPlugins;
 
-impl PluginGroup for ClientPlugins {
+impl PluginGroup for CoreClientLogicPlugins {
     fn build(self) -> PluginGroupBuilder {
         PluginGroupBuilder::start::<Self>()
-            .add(state::ClientLifecyclePlugin)
-            .add(load::ClientLoadPlugin)
-            .add(input::InputModulePlugin)
+            // internal crate plugins
+            .add(settings::ClientSettingsPlugin)
+            .add(input::ClientInputPlugin)
+            .add_group(lifecycle::LifecyclePlugins)
+            .add_group(network::ClientNetworkPlugins)
             .add(player::PlayerPlugin)
             .add(showcase::ShowcasePlugin)
-            .add(ui::VantablockUiPlugin)
+    }
+}
+
+/// The complete plugin group for the playable game client.
+pub struct DefaultClientPlugins;
+
+impl PluginGroup for DefaultClientPlugins {
+    fn build(self) -> PluginGroupBuilder {
+        let persistent_paths = utils::PersistentPaths::resolve_client();
+        let asset_path = persistent_paths.assets_dir.to_string_lossy().to_string();
+
+        #[allow(unused_mut)]
+        let mut builder = PluginGroupBuilder::start::<Self>()
+            // bevy default setup
+            .add_group(
+                DefaultPlugins
+                    .set(WindowPlugin {
+                        primary_window: Some(Window {
+                            title: format!("Vantablock v{}", env!("CARGO_PKG_VERSION")),
+                            resolution: WindowResolution::new(1280, 720),
+                            visible: false,
+                            ..default()
+                        }),
+                        ..default()
+                    })
+                    .set(AssetPlugin {
+                        file_path: asset_path,
+                        ..default()
+                    })
+                    .disable::<LogPlugin>(),
+            )
+            // external crate plugins
+            .add_group(shared::SharedPlugins)
+            // rendering plugins, these depend on bevy render app existing
+            // so they can't be a part of the core plugin set
             .add(render::VantablockRenderPlugin)
+            .add(ui::VantablockUiPlugin)
+            // core client
+            .add_group(CoreClientLogicPlugins);
+
+        #[cfg(feature = "dev")]
+        {
+            builder = builder.add(FpsOverlayPlugin {
+                config: FpsOverlayConfig { ..default() },
+            });
+        }
+
+        builder
+    }
+}
+
+/// The lightweight plugin group for headless integration testing.
+pub struct HeadlessClientPlugins;
+
+impl PluginGroup for HeadlessClientPlugins {
+    fn build(self) -> PluginGroupBuilder {
+        let persistent_paths = utils::PersistentPaths::resolve_client();
+        let asset_path = persistent_paths.assets_dir.to_string_lossy().to_string();
+
+        PluginGroupBuilder::start::<Self>()
+            // bevy minimal setup
+            .add_group(MinimalPlugins)
+            // extra bevy plugins not included in minimal
+            .add(AssetPlugin {
+                file_path: asset_path,
+                ..default()
+            })
+            .add(StatesPlugin)
+            .add(InputPlugin)
+            // ensure basic assets are registered
+            .add(AssetRegistrationPlugin)
+            // external crate plugins
+            .add_group(shared::SharedPlugins)
+            // core client
+            .add_group(CoreClientLogicPlugins)
+    }
+}
+
+struct AssetRegistrationPlugin;
+
+impl Plugin for AssetRegistrationPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_asset::<Image>();
     }
 }
diff --git a/crates/client/src/lifecycle/load/chunk_loading.rs b/crates/client/src/lifecycle/load/chunk_loading.rs
new file mode 100644
index 00000000..c22c0100
--- /dev/null
+++ b/crates/client/src/lifecycle/load/chunk_loading.rs
@@ -0,0 +1,78 @@
+use crate::{
+    prelude::*,
+    render::chunk::manager::{ClientChunkManager, ClientChunkState},
+};
+use bevy::{
+    ecs::prelude::*,
+    math::IVec3,
+    prelude::{Camera, Camera3d},
+};
+use shared::world::chunk::{ChunkCoord, LOAD_DISTANCE, WORLD_MAX_Y_CHUNK, WORLD_MIN_Y_CHUNK};
+use std::collections::HashSet;
+
+/// A system that determines which chunks should be loaded based on camera position.
+/// This system manages chunk lifecycle transitions from Unloaded to AwaitingData.
+#[instrument(skip_all)]
+pub fn manage_distance_based_chunk_loading_targets_system(
+    // input
+    camera_query: Query<(&Camera, &ChunkCoord), With<Camera3d>>,
+
+    // output
+    mut chunk_manager: ResMut<ClientChunkManager>,
+    mut commands: Commands,
+) {
+    let mut active_camera_chunk_pos = None;
+    for (camera, chunk_coord) in camera_query.iter() {
+        if camera.is_active {
+            active_camera_chunk_pos = Some(chunk_coord.pos);
+            break;
+        }
+    }
+
+    let Some(camera_chunk_pos) = active_camera_chunk_pos else {
+        return;
+    };
+
+    let mut desired_load_chunks = HashSet::new();
+
+    for y in WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK {
+        for z in -LOAD_DISTANCE..=LOAD_DISTANCE {
+            for x in -LOAD_DISTANCE..=LOAD_DISTANCE {
+                let coord = IVec3::new(camera_chunk_pos.x + x, y, camera_chunk_pos.z + z);
+                desired_load_chunks.insert(coord);
+            }
+        }
+    }
+
+    // handle unloading
+    let mut coords_to_remove = Vec::new();
+    for (coord, state) in chunk_manager.chunk_states.iter() {
+        if !desired_load_chunks.contains(coord) {
+            // chunk is outside load distance, unload it completely
+            match state {
+                ClientChunkState::AwaitingData => {
+                    // nothing to despawn
+                }
+                ClientChunkState::DataReady { entity }
+                | ClientChunkState::NeedsMeshing { entity }
+                | ClientChunkState::Meshing { entity }
+                | ClientChunkState::MeshComplete { entity } => {
+                    debug!(target:"chunk_loading", "Unloading chunk at {:?} (Entity: {:?})", coord, entity);
+                    commands.entity(*entity).despawn();
+                }
+            }
+            coords_to_remove.push(*coord);
+        }
+    }
+
+    for coord in coords_to_remove {
+        chunk_manager.mark_as_unloaded(coord);
+    }
+
+    // identify new chunks to load
+    for coord in desired_load_chunks {
+        if !chunk_manager.is_chunk_present_or_loading(coord) {
+            chunk_manager.mark_as_awaiting_data(coord);
+        }
+    }
+}
diff --git a/crates/client/src/lifecycle/load/mod.rs b/crates/client/src/lifecycle/load/mod.rs
new file mode 100644
index 00000000..cfd1dc06
--- /dev/null
+++ b/crates/client/src/lifecycle/load/mod.rs
@@ -0,0 +1,54 @@
+pub mod chunk_loading;
+pub mod phases;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::lifecycle::ClientLifecycleState;
+use bevy::prelude::*;
+use chunk_loading::manage_distance_based_chunk_loading_targets_system;
+pub use phases::*;
+use shared::{
+    lifecycle::{
+        load::{kickoff_loading_phase, loading_dag_is_complete, nuke_loading_dag},
+        state::transition_to,
+    },
+    world::chunk::ChunkCoord,
+};
+
+/// Plugin responsible for managing client-side asset and registry loading.
+pub struct ClientLoadPlugin;
+
+impl Plugin for ClientLoadPlugin {
+    fn build(&self, app: &mut App) {
+        // kickoff client launch loading phase when launching
+        app.add_systems(
+            OnEnter(ClientLifecycleState::Launching),
+            kickoff_loading_phase::<ClientLaunchLoadingPhase>,
+        );
+
+        // transition to main menu when client launch tasks are complete
+        app.add_systems(
+            Update,
+            transition_to(ClientLifecycleState::MainMenu)
+                .run_if(in_state(ClientLifecycleState::Launching))
+                .run_if(loading_dag_is_complete::<ClientLaunchLoadingPhase>),
+        );
+
+        // cleanup
+        app.add_systems(
+            OnExit(ClientLifecycleState::Launching),
+            nuke_loading_dag::<ClientLaunchLoadingPhase>,
+        );
+
+        app.add_systems(
+            PreUpdate,
+            manage_distance_based_chunk_loading_targets_system.run_if(
+                |q: Query<(&Camera, &ChunkCoord), (With<Camera3d>, Changed<ChunkCoord>)>| {
+                    q.iter().any(|(c, _)| c.is_active)
+                },
+            ),
+        );
+    }
+}
diff --git a/crates/client/src/lifecycle/load/phases.rs b/crates/client/src/lifecycle/load/phases.rs
new file mode 100644
index 00000000..42ce7d4f
--- /dev/null
+++ b/crates/client/src/lifecycle/load/phases.rs
@@ -0,0 +1,11 @@
+use shared::lifecycle::load::LoadingDagPhase;
+
+/// Marker for the client launch loading phase.
+///
+/// This loading phase handles the transition from `ClientLifecycleState::Launching`
+/// to `ClientLifecycleState::MainMenu`.
+pub struct ClientLaunchLoadingPhase;
+
+impl LoadingDagPhase for ClientLaunchLoadingPhase {
+    const PHASE_NAME: &'static str = "ClientLaunchLoading";
+}
diff --git a/crates/client/src/lifecycle/mod.rs b/crates/client/src/lifecycle/mod.rs
new file mode 100644
index 00000000..bbecb978
--- /dev/null
+++ b/crates/client/src/lifecycle/mod.rs
@@ -0,0 +1,25 @@
+pub mod load;
+pub mod scheduling;
+pub mod state;
+
+pub use load::*;
+pub use scheduling::*;
+pub use state::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::{app::PluginGroupBuilder, prelude::PluginGroup};
+
+/// A plugin group containing client lifecycle stuff.
+pub struct LifecyclePlugins;
+
+impl PluginGroup for LifecyclePlugins {
+    fn build(self) -> PluginGroupBuilder {
+        PluginGroupBuilder::start::<Self>()
+            .add(ClientLoadPlugin)
+            .add(ClientSchedulingPlugin)
+            .add(ClientStatePlugin)
+    }
+}
diff --git a/crates/client/src/lifecycle/scheduling/mod.rs b/crates/client/src/lifecycle/scheduling/mod.rs
new file mode 100644
index 00000000..6d537b62
--- /dev/null
+++ b/crates/client/src/lifecycle/scheduling/mod.rs
@@ -0,0 +1,21 @@
+pub mod sets;
+
+pub use sets::RenderPrepSet;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::lifecycle::state::ClientLifecycleState;
+use bevy::prelude::*;
+
+pub struct ClientSchedulingPlugin;
+
+impl Plugin for ClientSchedulingPlugin {
+    fn build(&self, app: &mut App) {
+        app.configure_sets(
+            PostUpdate,
+            RenderPrepSet.run_if(in_state(ClientLifecycleState::InGame)),
+        );
+    }
+}
diff --git a/crates/client/src/lifecycle/scheduling/sets.rs b/crates/client/src/lifecycle/scheduling/sets.rs
new file mode 100644
index 00000000..49d1aba5
--- /dev/null
+++ b/crates/client/src/lifecycle/scheduling/sets.rs
@@ -0,0 +1,6 @@
+use bevy::ecs::prelude::SystemSet;
+
+/// Systems that prepare data for the render world.
+/// These typically run at the very end of Bevy's native `PostUpdate` schedule.
+#[derive(SystemSet, Debug, Hash, PartialEq, Eq, Clone)]
+pub struct RenderPrepSet;
diff --git a/crates/client/src/lifecycle/state/enums.rs b/crates/client/src/lifecycle/state/enums.rs
new file mode 100644
index 00000000..d7e25c83
--- /dev/null
+++ b/crates/client/src/lifecycle/state/enums.rs
@@ -0,0 +1,51 @@
+use bevy::prelude::{StateSet, SubStates};
+use shared::lifecycle::state::AppState;
+
+/// High-level client state.
+/// Sub-state of `AppState::Running`.
+#[derive(SubStates, Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+#[source(AppState = AppState::Running)]
+pub enum ClientLifecycleState {
+    /// Initial asset loading, shader compilation, and warmup.
+    #[default]
+    Launching,
+    /// User is in the main menu.
+    MainMenu,
+    /// A world session is active (local or remote).
+    InGame,
+    /// Terminal state for fatal errors/disconnects to clean up the session.
+    Error,
+}
+
+/// Detailed session lifecycle.
+/// Sub-state of `ClientState::InGame`.
+#[derive(SubStates, Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+#[source(ClientLifecycleState = ClientLifecycleState::InGame)]
+pub enum InGameState {
+    /// Establishing network connection or initializing local server.
+    #[default]
+    Connecting,
+    /// Receiving initial chunks and generating block meshes.
+    WorldLoading,
+    /// Active gameplay.
+    Playing,
+    /// Logic/Physics paused (single-player).
+    Paused,
+    /// Tearing down the world, closing sockets, and clearing VRAM.
+    Disconnecting,
+}
+
+/// Tracks the network topology and authority level of the active session.
+/// Sub-state of `ClientState::InGame`.
+#[derive(SubStates, Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+#[source(ClientLifecycleState = ClientLifecycleState::InGame)]
+pub enum SessionTopology {
+    /// The client is running a local background server (Singleplayer).
+    /// The client has Host authority to pause the game, run server commands, etc.
+    #[default]
+    Internal,
+
+    /// The client is connected to a remote dedicated server (Multiplayer).
+    /// The client has standard permissions and cannot pause the simulation.
+    External,
+}
diff --git a/crates/client/src/lifecycle/state/mod.rs b/crates/client/src/lifecycle/state/mod.rs
new file mode 100644
index 00000000..83bfd974
--- /dev/null
+++ b/crates/client/src/lifecycle/state/mod.rs
@@ -0,0 +1,47 @@
+mod enums;
+
+pub use enums::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::{prelude::*, state::app::AppExtStates, window::PrimaryWindow};
+use shared::{FixedUpdateSet, lifecycle::state::AppState};
+
+pub struct ClientStatePlugin;
+
+impl Plugin for ClientStatePlugin {
+    fn build(&self, app: &mut App) {
+        app.add_sub_state::<ClientLifecycleState>()
+            .add_sub_state::<InGameState>()
+            .add_sub_state::<SessionTopology>();
+
+        // INFO: -----------------------
+        //         async loading
+        // -----------------------------
+
+        // load cleanup to run after transitions
+        // (handled automatically by Bevy despawn_recursive now)
+
+        // configure system sets to be state-bound
+        app.configure_sets(
+            FixedUpdate,
+            (FixedUpdateSet::PreUpdate, FixedUpdateSet::MainLogic)
+                .run_if(in_state(ClientLifecycleState::InGame)),
+        );
+
+        // INFO: ---------------------------
+        //         state transitions
+        // ---------------------------------
+
+        app.add_systems(
+            OnExit(AppState::StartingUp),
+            |mut window: Query<&mut Window, With<PrimaryWindow>>| {
+                if let Ok(mut win) = window.single_mut() {
+                    win.visible = true;
+                }
+            },
+        );
+    }
+}
diff --git a/crates/client/src/load/mod.rs b/crates/client/src/load/mod.rs
deleted file mode 100644
index 6121e987..00000000
--- a/crates/client/src/load/mod.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-pub mod registries;
-
-use crate::load::registries::start_async_registry_initialization;
-use bevy::app::{App, Plugin, Startup};
-
-/// Plugin responsible for managing client-side asset and registry loading.
-pub struct ClientLoadPlugin;
-
-impl Plugin for ClientLoadPlugin {
-    fn build(&self, app: &mut App) {
-        // start background registry initialization
-        app.add_systems(Startup, start_async_registry_initialization);
-    }
-}
diff --git a/crates/client/src/load/registries.rs b/crates/client/src/load/registries.rs
deleted file mode 100644
index a265446d..00000000
--- a/crates/client/src/load/registries.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use crate::prelude::*;
-use crate::render::{
-    block::BlockRenderDataRegistry,
-    texture::{BlockTextureArray, VoxelTextureProcessor},
-};
-use bevy::{
-    asset::Assets,
-    prelude::{Commands, Image, Res, World},
-    tasks::AsyncComputeTaskPool,
-};
-use crossbeam::channel::unbounded;
-use shared::{
-    load::{SimulationWorldLoadingTaskComponent, TaskResultCallback},
-    simulation::block::BlockRegistry,
-};
-use utils::PersistentPaths;
-
-/// A system that starts the asynchronous initialization of texture and block registries
-pub fn start_async_registry_initialization(
-    mut commands: Commands,
-    client_settings: Res<ClientSettings>,
-    persistent_paths: Res<PersistentPaths>,
-) {
-    info!("Starting asynchronous simulation registry initialization...");
-
-    let (sender, _receiver) = unbounded();
-    let receiver = _receiver;
-    let settings = client_settings.clone();
-    let paths = persistent_paths.clone();
-
-    AsyncComputeTaskPool::get()
-        .spawn(async move {
-            info!("Initializing simulation registries in background...");
-
-            // texture stitching
-            let (texture_array_image, texture_registry) =
-                VoxelTextureProcessor::new(paths.assets_dir.clone(), &settings.texture_pack)
-                    .load_and_stitch()
-                    .expect("Failed to load and stitch textures");
-
-            // independent simulation block loading
-            let block_registry = BlockRegistry::load_from_disk(&paths);
-
-            // independent client render block loading (resolves IDs via simulation registry)
-            let render_registry =
-                BlockRenderDataRegistry::load_from_disk(&paths, &block_registry, &texture_registry);
-
-            // prepare callback to apply results on main thread
-            let callback: TaskResultCallback = Box::new(move |commands: &mut Commands| {
-                info!("Applying simulation registry results to the world.");
-
-                // access world via commands to insert resources
-                commands.queue(move |world: &mut World| {
-                    let mut image_assets = world.resource_mut::<Assets<Image>>();
-                    let texture_handle = image_assets.add(texture_array_image);
-
-                    // insert all registries
-                    world.insert_resource(texture_registry);
-                    world.insert_resource(block_registry);
-                    world.insert_resource(render_registry);
-
-                    // insert texture array handle
-                    world.insert_resource(BlockTextureArray {
-                        handle: texture_handle,
-                    });
-                });
-
-                info!("Simulation registries initialized successfully.");
-            });
-
-            sender
-                .send(callback)
-                .expect("Failed to send registry task result");
-        })
-        .detach();
-
-    // register this as a loading task so the game waits for it
-    commands.spawn(SimulationWorldLoadingTaskComponent { receiver });
-}
diff --git a/crates/client/src/main.rs b/crates/client/src/main.rs
deleted file mode 100644
index 3840ddfa..00000000
--- a/crates/client/src/main.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-use bevy::{
-    app::{App, FixedUpdate, PostUpdate},
-    log::LogPlugin,
-    prelude::{
-        AssetPlugin, ClearColor, Color, DefaultPlugins, IntoScheduleConfigs, PluginGroup, Window,
-        WindowPlugin, default, info,
-    },
-    window::WindowResolution,
-};
-use client::prelude::*;
-use shared::{
-    load::LoadingTracker,
-    simulation::scheduling::{FixedUpdateSet, RenderPrepSet},
-};
-use utils::PersistentPaths;
-
-#[instrument(skip_all, fields(name = "main"))]
-fn main() {
-    attach_logger();
-
-    // setup default bevy app
-    let mut app = App::new();
-
-    // resolve platform paths
-    let persistent_paths = PersistentPaths::resolve();
-
-    // config of default bevy plugins
-    app.add_plugins(
-        DefaultPlugins
-            .set(WindowPlugin {
-                primary_window: Some(Window {
-                    title: format!("Vantablock v{}", env!("CARGO_PKG_VERSION")),
-                    resolution: WindowResolution::new(1280, 720),
-                    visible: false,
-                    ..default()
-                }),
-                ..default()
-            })
-            .set(AssetPlugin {
-                file_path: persistent_paths.assets_dir.to_string_lossy().to_string(),
-                ..default()
-            })
-            .disable::<LogPlugin>(),
-    );
-
-    // red clear color to prevent white screen flash
-    app.insert_resource(ClearColor(Color::linear_rgb(1.0, 0.0, 0.0)));
-
-    // load config & loading trackers into main world
-    app.insert_resource(ClientSettings::load_or_create(&persistent_paths));
-    app.insert_resource(persistent_paths);
-    app.insert_resource(LoadingTracker::default());
-
-    // configure schedule sets
-    app.configure_sets(
-        FixedUpdate,
-        (FixedUpdateSet::PreUpdate, FixedUpdateSet::MainLogic).chain(),
-    );
-
-    app.configure_sets(PostUpdate, RenderPrepSet);
-
-    // initialize simulation and renderer
-    app.add_plugins((shared::SharedPlugins, client::ClientPlugins));
-
-    app.run();
-    info!("App exited safely!");
-}
diff --git a/crates/client/src/network/connection/initiate.rs b/crates/client/src/network/connection/initiate.rs
new file mode 100644
index 00000000..de76df30
--- /dev/null
+++ b/crates/client/src/network/connection/initiate.rs
@@ -0,0 +1,75 @@
+use crate::lifecycle::{ClientLifecycleState, InGameState, SessionTopology};
+use crate::network::connection::{ConnectType, InitiateConnection, RequestSingleplayerSession};
+use bevy::prelude::*;
+use lightyear::{netcode::Key, prelude::client::*, prelude::*};
+use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
+
+/// Sets up a basic client.
+///
+/// https://cbournhonesque.github.io/lightyear/book/tutorial/build_client_server.html#client
+pub fn on_initiate_connection(
+    trigger: On<InitiateConnection>,
+    mut commands: Commands,
+    mut next_client_state: ResMut<NextState<ClientLifecycleState>>,
+    mut next_in_game_state: ResMut<NextState<InGameState>>,
+    mut next_session_topology: ResMut<NextState<SessionTopology>>,
+) {
+    let event = trigger.event();
+
+    // handle session topology and singleplayer requests
+    match event.connect_type {
+        ConnectType::Singleplayer => {
+            next_session_topology.set(SessionTopology::Internal);
+            commands.trigger(RequestSingleplayerSession);
+        }
+        ConnectType::Multiplayer => {
+            next_session_topology.set(SessionTopology::External);
+        }
+    }
+
+    let server_addr: SocketAddr = match event.server_addr.parse() {
+        Ok(addr) => addr,
+        Err(e) => {
+            error!(
+                "Failed to parse server address '{}': {}. Aborting connection.",
+                event.server_addr, e
+            );
+            return;
+        }
+    };
+
+    let client_addr = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0));
+
+    info!("Connecting client to {}", server_addr);
+
+    // netcode auth
+    let client_id = rand::random::<u64>();
+    let auth = Authentication::Manual {
+        server_addr,
+        client_id,
+        private_key: Key::default(),
+        protocol_id: 0,
+    };
+
+    // main client ent
+    let client_entity = commands
+        .spawn((
+            LocalAddr(client_addr),
+            PeerAddr(server_addr),
+            Link::new(None),
+            ReplicationReceiver::default(),
+            NetcodeClient::new(auth, NetcodeConfig::default())
+                .expect("CRITICAL: Failed to create NetcodeClient!"),
+            UdpIo::default(),
+        ))
+        .id();
+
+    // trigger connection
+    commands.trigger(Connect {
+        entity: client_entity,
+    });
+
+    // transition to game state
+    next_client_state.set(ClientLifecycleState::InGame);
+    next_in_game_state.set(InGameState::Connecting);
+}
diff --git a/crates/client/src/network/connection/mod.rs b/crates/client/src/network/connection/mod.rs
new file mode 100644
index 00000000..a4922013
--- /dev/null
+++ b/crates/client/src/network/connection/mod.rs
@@ -0,0 +1,22 @@
+mod initiate;
+pub mod resources;
+mod session;
+
+pub use resources::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::app::{App, Plugin, Update};
+
+pub(crate) struct NetworkConnectionPlugin;
+
+impl Plugin for NetworkConnectionPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_observer(initiate::on_initiate_connection);
+
+        app.add_systems(Update, session::handle_disconnections)
+            .add_observer(session::handle_connections);
+    }
+}
diff --git a/crates/client/src/network/connection/resources.rs b/crates/client/src/network/connection/resources.rs
new file mode 100644
index 00000000..cfe22801
--- /dev/null
+++ b/crates/client/src/network/connection/resources.rs
@@ -0,0 +1,24 @@
+use bevy::prelude::*;
+
+#[derive(Event, Debug, Clone)]
+pub struct NetworkErrorEvent {
+    pub reason: String,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ConnectType {
+    Singleplayer,
+    Multiplayer,
+}
+
+/// An event to initiate a connection to a specific server address.
+#[derive(Event, Debug)]
+pub struct InitiateConnection {
+    pub connect_type: ConnectType,
+    pub server_addr: String,
+}
+
+/// Triggered by the client to request a local singleplayer server.
+/// Handled by the runner (orchestrator) to spin up a background server.
+#[derive(Event, Debug, Clone)]
+pub struct RequestSingleplayerSession;
diff --git a/crates/client/src/network/connection/session.rs b/crates/client/src/network/connection/session.rs
new file mode 100644
index 00000000..e23fc25c
--- /dev/null
+++ b/crates/client/src/network/connection/session.rs
@@ -0,0 +1,57 @@
+use crate::{
+    lifecycle::{ClientLifecycleState, InGameState},
+    network::connection::NetworkErrorEvent,
+};
+use bevy::prelude::*;
+use lightyear::prelude::{Connected, Connecting, Disconnected};
+
+pub fn handle_connections(
+    trigger: On<Add, Connected>,
+    mut next_in_game_state: ResMut<NextState<InGameState>>,
+) {
+    let server_entity = trigger.entity;
+
+    // lightyear automatically adds message receiver and stuff on connection
+    // so currently no need to do that here
+
+    info!(
+        "Client listening for messages from server! (entity {:?})",
+        server_entity
+    );
+
+    // TODO: eventually will enter world loading state here, but for now
+    // we just enter the raw world and wait for data as we play
+    next_in_game_state.set(InGameState::Playing);
+}
+
+pub fn handle_disconnections(
+    // listen for entities that lost their active states
+    mut removed_connecting: RemovedComponents<Connecting>,
+    mut removed_connected: RemovedComponents<Connected>,
+    // query to see if they were given the Disconnected state
+    disconnected_query: Query<&Disconnected>,
+    mut next_client_state: ResMut<NextState<ClientLifecycleState>>,
+    mut commands: Commands,
+) {
+    // did any entity stop connecting OR stop being connected this frame?
+    for entity in removed_connecting.read().chain(removed_connected.read()) {
+        // if the entity still exists and now has the Disconnected component,
+        // a genuine network failure or drop occurred.
+        if let Ok(disconnected) = disconnected_query.get(entity) {
+            let reason_str = disconnected
+                .reason
+                .as_deref()
+                .unwrap_or("Graceful or Unknown");
+
+            info!(
+                "Client actively disconnected from server! Showing error screen. (Reason: {})",
+                reason_str
+            );
+
+            next_client_state.set(ClientLifecycleState::Error);
+            commands.trigger(NetworkErrorEvent {
+                reason: reason_str.to_string(),
+            });
+        }
+    }
+}
diff --git a/crates/client/src/network/graphics/mod.rs b/crates/client/src/network/graphics/mod.rs
new file mode 100644
index 00000000..50af755b
--- /dev/null
+++ b/crates/client/src/network/graphics/mod.rs
@@ -0,0 +1,21 @@
+pub mod smoothing;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::app::{App, Plugin, Update};
+
+pub struct NetworkGraphicsPlugin;
+
+impl Plugin for NetworkGraphicsPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(
+            Update,
+            (
+                smoothing::update_logical_position_smoothing,
+                smoothing::update_player_look_smoothing,
+            ),
+        );
+    }
+}
diff --git a/crates/client/src/network/graphics/smoothing.rs b/crates/client/src/network/graphics/smoothing.rs
new file mode 100644
index 00000000..c1233bcc
--- /dev/null
+++ b/crates/client/src/network/graphics/smoothing.rs
@@ -0,0 +1,24 @@
+use bevy::prelude::*;
+use shared::player::components::{LogicalPosition, PlayerLook};
+
+/// Smoothly interpolates the visual Transform to match the LogicalPosition.
+pub fn update_logical_position_smoothing(
+    time: Res<Time>,
+    mut query: Query<(&LogicalPosition, &mut Transform)>,
+) {
+    // stiff spring for snappy but smooth camera follow
+    let spring_stiffness = 25.0;
+
+    for (logical_pos, mut transform) in query.iter_mut() {
+        transform.translation = transform
+            .translation
+            .lerp(logical_pos.0, time.delta_secs() * spring_stiffness);
+    }
+}
+
+/// Snaps the visual Transform rotation to match the PlayerLook.
+pub fn update_player_look_smoothing(mut query: Query<(&PlayerLook, &mut Transform)>) {
+    for (look, mut transform) in query.iter_mut() {
+        transform.rotation = Quat::from_euler(EulerRot::YXZ, look.yaw, look.pitch, 0.0);
+    }
+}
diff --git a/crates/client/src/network/mod.rs b/crates/client/src/network/mod.rs
new file mode 100644
index 00000000..9e0dacca
--- /dev/null
+++ b/crates/client/src/network/mod.rs
@@ -0,0 +1,33 @@
+pub mod connection;
+pub mod graphics;
+pub mod receive;
+pub mod send;
+
+pub use receive::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::{app::PluginGroupBuilder, prelude::*};
+use lightyear::prelude::client as lightyear_client;
+use shared::network::{NETWORK_TICK_DURATION, SharedNetworkPlugin};
+use std::time::Duration;
+
+pub struct ClientNetworkPlugins;
+
+impl PluginGroup for ClientNetworkPlugins {
+    fn build(self) -> PluginGroupBuilder {
+        PluginGroupBuilder::start::<Self>()
+            // lightyear plugin group and interpolation
+            .add_group(lightyear_client::ClientPlugins {
+                tick_duration: Duration::from_secs_f64(NETWORK_TICK_DURATION),
+            })
+            .add(SharedNetworkPlugin)
+            // client specific networking plugins
+            .add(connection::NetworkConnectionPlugin)
+            .add(graphics::NetworkGraphicsPlugin)
+            .add(receive::NetworkReceivePlugin)
+            .add(send::NetworkSendPlugin)
+    }
+}
diff --git a/crates/client/src/network/receive/demultiplex.rs b/crates/client/src/network/receive/demultiplex.rs
new file mode 100644
index 00000000..b3188934
--- /dev/null
+++ b/crates/client/src/network/receive/demultiplex.rs
@@ -0,0 +1,33 @@
+use crate::network::InboundCompressedChunkMessage;
+use bevy::{ecs::message::MessageWriter, prelude::*};
+use lightyear::prelude::MessageReceiver;
+use shared::network::protocol::ServerMessage;
+
+/// Network demultiplexer, translates a `ServerMessage` into a local ecs message
+/// to be consumed directly by other systems.
+///
+/// While it produces a decent amount of boiler plate since we need a client
+/// ECS event for each enum variant of the incoming server message, this is
+/// worth for efficiency (iterating demuiltiplexed data).
+pub fn translate_server_network_messages(
+    // incoming network messages
+    mut query: Query<&mut MessageReceiver<ServerMessage>>,
+    // outgoing ECS messages
+    mut ev_chunk: MessageWriter<InboundCompressedChunkMessage>,
+) {
+    for mut receiver in query.iter_mut() {
+        for message in receiver.receive() {
+            match message {
+                ServerMessage::ChunkData { coord, data } => {
+                    ev_chunk.write(InboundCompressedChunkMessage { coord, data });
+                }
+                ServerMessage::SyncTime { game_time, tick } => {
+                    info!("SyncTime received: game_time={}, tick={}", game_time, tick);
+                }
+                _ => {
+                    warn!("Unhandled message received: {:?}", message);
+                }
+            }
+        }
+    }
+}
diff --git a/crates/client/src/network/receive/ecs_messages.rs b/crates/client/src/network/receive/ecs_messages.rs
new file mode 100644
index 00000000..24b9f8ee
--- /dev/null
+++ b/crates/client/src/network/receive/ecs_messages.rs
@@ -0,0 +1,14 @@
+//! Defines the local ecs messages for demultiplexed network messages
+//!
+//! For the most part, these messages are simply duplicated structurs
+//! of the original network messages our client receives.
+
+use bevy::ecs::message::Message;
+use bevy::prelude::*;
+use shared::world::chunk::ChunkCoord;
+
+#[derive(Message)]
+pub struct InboundCompressedChunkMessage {
+    pub coord: ChunkCoord,
+    pub data: Vec<u8>,
+}
diff --git a/crates/client/src/network/receive/mod.rs b/crates/client/src/network/receive/mod.rs
new file mode 100644
index 00000000..3ffa78a2
--- /dev/null
+++ b/crates/client/src/network/receive/mod.rs
@@ -0,0 +1,20 @@
+mod demultiplex;
+mod ecs_messages;
+
+pub use ecs_messages::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::app::{App, Plugin, Update};
+
+pub struct NetworkReceivePlugin;
+
+impl Plugin for NetworkReceivePlugin {
+    fn build(&self, app: &mut App) {
+        app.add_message::<InboundCompressedChunkMessage>();
+
+        app.add_systems(Update, demultiplex::translate_server_network_messages);
+    }
+}
diff --git a/crates/client/src/network/send/mod.rs b/crates/client/src/network/send/mod.rs
new file mode 100644
index 00000000..8e60080c
--- /dev/null
+++ b/crates/client/src/network/send/mod.rs
@@ -0,0 +1,11 @@
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::app::{App, Plugin};
+
+pub struct NetworkSendPlugin;
+
+impl Plugin for NetworkSendPlugin {
+    fn build(&self, _app: &mut App) {}
+}
diff --git a/crates/client/src/player/camera/mod.rs b/crates/client/src/player/camera/mod.rs
index 70cb9ae0..3544058f 100644
--- a/crates/client/src/player/camera/mod.rs
+++ b/crates/client/src/player/camera/mod.rs
@@ -6,21 +6,20 @@ pub use movement::*;
 //         camera plugin
 // -----------------------------
 
-use crate::state::ClientAppState;
-use bevy::prelude::{App, IntoScheduleConfigs, Plugin, Startup, Update, in_state};
-use shared::simulation::player::initialize_camera::spawn_camera_system;
+use bevy::prelude::{App, IntoScheduleConfigs, Plugin, Update, in_state};
+use shared::lifecycle::state::AppState;
 
 pub struct CameraPlugin;
 
 impl Plugin for CameraPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(Startup, spawn_camera_system);
-
         app.add_systems(
             Update,
-            (camera_movement_system, update_camera_chunk_chord_system)
-                .chain()
-                .run_if(in_state(ClientAppState::Running)),
+            (
+                camera_movement_system,
+                local_camera_look_system,
+            )
+                .run_if(in_state(AppState::Running)),
         );
     }
 }
diff --git a/crates/client/src/player/camera/movement.rs b/crates/client/src/player/camera/movement.rs
index fcf1c7c9..cef65481 100644
--- a/crates/client/src/player/camera/movement.rs
+++ b/crates/client/src/player/camera/movement.rs
@@ -1,122 +1,77 @@
-use bevy::{
-    ecs::prelude::*,
-    input::mouse::{MouseMotion, MouseWheel},
-    math::EulerRot,
-    prelude::{Camera, Camera3d, Projection, Quat, Transform},
+use crate::{
+    input::local_actions::ClientAction,
+    player::LocalPlayer,
 };
-use shared::simulation::{
-    chunk::ChunkCoord,
-    input::{resources::ActionStateResource, types::SimulationAction},
-    time::FrameClock,
+use bevy::{
+    ecs::relationship::Relationship,
+    input::mouse::MouseWheel,
+    prelude::*,
 };
-use tracing::{debug, instrument, warn};
+use leafwing_input_manager::prelude::ActionState;
+use shared::player::components::PlayerLook;
+use tracing::instrument;
 
 /// The distance the near plane is set to for the camera frustum.
 pub const CAMERA_NEAR_PLANE: f32 = 1.0;
-const MOVEMENT_SPEED: f32 = 16.0;
 const MOUSE_SENSITIVITY: f32 = 0.1;
 
-/// A system that updates the active camera's position and orientation based on user input.
-#[instrument(skip_all)]
-#[allow(clippy::too_many_arguments)]
-pub fn camera_movement_system(
-    // input
-    mut mouse_motion: MessageReader<MouseMotion>,
-    mut mouse_wheel: MessageReader<MouseWheel>,
-    action_state: Res<ActionStateResource>,
-    time: Res<FrameClock>,
-
-    // output
-    mut camera_query: Query<(&mut Transform, &Camera, &mut Projection), With<Camera3d>>,
+/// A system that handles player rotation in Update for maximum smoothness.
+///
+/// This system updates the authoritative `PlayerLook` component on the local player.
+/// Since `PlayerLook` is registered for prediction, these changes are replicated
+/// to the server.
+pub fn local_camera_look_system(
+    mut player_query: Query<(&ActionState<ClientAction>, &mut PlayerLook), With<LocalPlayer>>,
 ) {
-    for (mut transform, camera, mut projection) in camera_query.iter_mut() {
-        if !camera.is_active {
-            continue;
-        }
-
-        // update position based on input
-        let velocity = MOVEMENT_SPEED * time.delta.as_secs_f32();
-        let front = transform.forward();
-        let mut multiplier = 1.0;
+    let Ok((action_state, mut look)) = player_query.single_mut() else {
+        return;
+    };
 
-        if action_state.is_ongoing(SimulationAction::MoveFaster) {
-            multiplier = 2.5;
-        }
-        if action_state.is_ongoing(SimulationAction::MoveForward) {
-            transform.translation += front * velocity * multiplier;
-        }
-        if action_state.is_ongoing(SimulationAction::MoveBackward) {
-            transform.translation -= front * velocity * multiplier;
-        }
-        let right = transform.right();
-        if action_state.is_ongoing(SimulationAction::MoveLeft) {
-            transform.translation -= right * velocity * multiplier;
-        }
-        if action_state.is_ongoing(SimulationAction::MoveRight) {
-            transform.translation += right * velocity * multiplier;
-        }
-
-        // update rotation using native Bevy mouse motion events
-        let mut xoffset = 0.0;
-        let mut yoffset = 0.0;
-        for ev in mouse_motion.read() {
-            xoffset += ev.delta.x;
-            yoffset += ev.delta.y;
-        }
+    let look_delta = action_state.axis_pair(&ClientAction::Look);
 
-        xoffset *= MOUSE_SENSITIVITY;
-        yoffset *= MOUSE_SENSITIVITY;
-
-        // extract current yaw and pitch to prevent roll (gimbal lock handling)
-        let (mut yaw, mut pitch, _) = transform.rotation.to_euler(EulerRot::YXZ);
-
-        yaw -= xoffset.to_radians();
-        pitch -= yoffset.to_radians();
+    if look_delta.x != 0.0 || look_delta.y != 0.0 {
+        look.yaw -= (look_delta.x * MOUSE_SENSITIVITY).to_radians();
+        look.pitch -= (look_delta.y * MOUSE_SENSITIVITY).to_radians();
 
         // clamp pitch to avoid flipping
-        pitch = pitch.clamp(-89.0f32.to_radians(), 89.0f32.to_radians());
-
-        // apply constrained rotation
-        transform.rotation = Quat::from_euler(EulerRot::YXZ, yaw, pitch, 0.0);
-
-        // handle zoom using native Bevy mouse wheel events
-        let mut yoffset_scroll = 0.0;
-        for ev in mouse_wheel.read() {
-            yoffset_scroll += ev.y;
-        }
-
-        if let Projection::Perspective(ref mut perspective) = *projection
-            && yoffset_scroll != 0.0
-        {
-            // zoom in the old system was FOV in degrees, between 1 and 45
-            // here we map it to radians
-            let mut current_fov_deg = perspective.fov.to_degrees();
-            current_fov_deg -= yoffset_scroll;
-            current_fov_deg = current_fov_deg.clamp(1.0, 45.0);
-            perspective.fov = current_fov_deg.to_radians();
-        }
+        look.pitch = look.pitch.clamp(-89.0f32.to_radians(), 89.0f32.to_radians());
     }
 }
 
-/// A system to that updates the active camera's chunk chord based on its position.
+/// A system that handles the 3rd person zoom. Rotation and Position is updated via the
+/// shared movement system and visual smoothing.
 #[instrument(skip_all)]
-pub fn update_camera_chunk_chord_system(
-    mut camera_query: Query<(&Transform, &Camera, &mut ChunkCoord), With<Camera3d>>,
+#[allow(clippy::too_many_arguments)]
+pub fn camera_movement_system(
+    // input
+    mut mouse_wheel: MessageReader<MouseWheel>,
+
+    // output
+    mut player_query: Query<Entity, With<LocalPlayer>>,
+    mut camera_query: Query<(&Camera, &mut Projection, &ChildOf), With<Camera3d>>,
 ) {
-    for (transform, camera, mut vicinity) in camera_query.iter_mut() {
-        if !camera.is_active {
-            continue;
-        }
+    if player_query.is_empty() {
+        return;
+    }
+    let player_entity = player_query.single_mut().unwrap();
+
+    // handle zoom using native Bevy mouse wheel events
+    let mut yoffset_scroll = 0.0;
+    for ev in mouse_wheel.read() {
+        yoffset_scroll += ev.y;
+    }
 
-        // update chunk chord if it is different
-        let new_chunk_pos = ChunkCoord::world_to_chunk_pos(transform.translation);
-        if new_chunk_pos != vicinity.pos {
-            debug!(
-                target: "camera_chunk",
-                "Camera crossed chunk boundary. Old: {:?}, New: {:?}",
-                vicinity.pos, new_chunk_pos
-            );
-            vicinity.pos = new_chunk_pos;
+    if yoffset_scroll != 0.0 {
+        for (camera, mut projection, parent) in camera_query.iter_mut() {
+            if camera.is_active
+                && parent.get() == player_entity
+                && let Projection::Perspective(ref mut perspective) = *projection
+            {
+                let mut current_fov_deg = perspective.fov.to_degrees();
+                current_fov_deg -= yoffset_scroll;
+                current_fov_deg = current_fov_deg.clamp(1.0, 45.0);
+                perspective.fov = current_fov_deg.to_radians();
+            }
         }
     }
 }
diff --git a/crates/client/src/player/components.rs b/crates/client/src/player/components.rs
new file mode 100644
index 00000000..9657a91b
--- /dev/null
+++ b/crates/client/src/player/components.rs
@@ -0,0 +1,10 @@
+use bevy::prelude::Component;
+
+/// A client-only marker indicating that this player entity belongs to the local user.
+/// Used for camera tracking and local input gathering. Do NOT network this.
+#[derive(Component)]
+pub struct LocalPlayer;
+
+/// Marker for the local player's camera.
+#[derive(Component)]
+pub struct LocalPlayerCamera;
diff --git a/crates/client/src/player/events.rs b/crates/client/src/player/events.rs
new file mode 100644
index 00000000..4519d383
--- /dev/null
+++ b/crates/client/src/player/events.rs
@@ -0,0 +1,18 @@
+use bevy::ecs::prelude::Message;
+use shared::prelude::IVec3;
+
+/// An event that is sent when a block should be broken.
+#[derive(Message, Clone)]
+pub struct BreakBlockEvent {
+    /// The world position of the block to break.
+    pub world_pos: IVec3,
+}
+
+/// An event that is sent when a block should be placed.
+#[derive(Message, Clone)]
+pub struct PlaceBlockEvent {
+    /// The world position to place a block.
+    pub target_pos: IVec3,
+    /// The ID of the block to place.
+    pub block_id: u8,
+}
diff --git a/crates/client/src/player/mod.rs b/crates/client/src/player/mod.rs
index 07ff20f4..d02ff635 100644
--- a/crates/client/src/player/mod.rs
+++ b/crates/client/src/player/mod.rs
@@ -1,20 +1,56 @@
 pub mod camera;
+pub mod components;
+pub mod events;
+pub mod replicated_player;
+mod systems;
+pub mod targeted_block;
 
 pub use camera::*;
+pub use components::*;
+pub use events::*;
+pub use targeted_block::TargetedBlock;
 
 // INFO: -----------------------
 //         player plugin
 // -----------------------------
 
-use bevy::app::{App, Plugin};
+use crate::lifecycle::ClientLifecycleState;
+use bevy::prelude::*;
+use leafwing_input_manager::common_conditions::action_just_pressed;
+use shared::player::PlayerAction;
+use systems::*;
 
 pub struct PlayerPlugin;
 
 impl Plugin for PlayerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins((
-            CameraPlugin,
-            shared::simulation::player::actions::ActionPlugin,
-        ));
+        app.init_resource::<TargetedBlock>();
+
+        app.add_plugins(CameraPlugin);
+
+        // register local block events
+        app.init_resource::<Messages<BreakBlockEvent>>();
+        app.init_resource::<Messages<PlaceBlockEvent>>();
+
+        app.add_systems(
+            PostUpdate,
+            update_target_block::update_targeted_block_system
+                .run_if(in_state(ClientLifecycleState::InGame)),
+        );
+
+        app.add_systems(
+            Update,
+            (
+                setup_replicated_players::dress_replicated_players_system,
+                block_actions::break_targeted_block_system
+                    .run_if(action_just_pressed(PlayerAction::PrimaryInteract)),
+                block_actions::place_targeted_block_system
+                    .run_if(action_just_pressed(PlayerAction::SecondaryInteract)),
+                block_actions::handle_break_block_events_system,
+                block_actions::handle_place_block_events_system,
+                block_actions::handle_incoming_block_updates,
+            )
+                .run_if(in_state(ClientLifecycleState::InGame)),
+        );
     }
 }
diff --git a/crates/client/src/player/replicated_player.rs b/crates/client/src/player/replicated_player.rs
new file mode 100644
index 00000000..7fd728d5
--- /dev/null
+++ b/crates/client/src/player/replicated_player.rs
@@ -0,0 +1,52 @@
+use crate::{
+    input::{
+        input_maps::{get_default_client_action_input_map, get_default_player_action_input_map},
+        local_actions::ClientAction,
+    },
+    player::components::{LocalPlayer, LocalPlayerCamera},
+};
+use bevy::prelude::*;
+use leafwing_input_manager::prelude::ActionState;
+use shared::{
+    player::components::{LogicalPosition, PlayerLook},
+    player::PlayerAction,
+    world::chunk::ChunkCoord,
+};
+
+/// Attaches all local-only components and children to the local player entity.
+pub fn dress_local_player(entity: Entity, spawn_pos: Vec3, commands: &mut Commands) {
+    commands
+        .entity(entity)
+        .insert((
+            LocalPlayer,
+            ActionState::<PlayerAction>::default(),
+            get_default_player_action_input_map(),
+            ActionState::<ClientAction>::default(),
+            get_default_client_action_input_map(),
+            PlayerLook::default(),
+            LogicalPosition(spawn_pos),
+            Transform::from_translation(spawn_pos),
+            ChunkCoord {
+                pos: ChunkCoord::world_to_chunk_pos(spawn_pos),
+            },
+        ))
+        .with_children(|parent| {
+            // TODO: need a proper transition from dressing the local player to actually rendering the world,
+            // that way we can seamless delete the 2D main menu camera and enable the 3d render camera with no
+            // gap
+            parent.spawn((
+                Camera3d::default(),
+                LocalPlayerCamera,
+                Projection::Perspective(PerspectiveProjection {
+                    fov: 45.0f32.to_radians(),
+                    near: 0.1,
+                    far: f32::INFINITY,
+                    ..Default::default()
+                }),
+                Transform::from_xyz(0.0, 1.6, 0.0),
+                ChunkCoord {
+                    pos: ChunkCoord::world_to_chunk_pos(spawn_pos + Vec3::new(0.0, 1.6, 0.0)),
+                },
+            ));
+        });
+}
diff --git a/crates/client/src/player/systems/block_actions.rs b/crates/client/src/player/systems/block_actions.rs
new file mode 100644
index 00000000..a0111e75
--- /dev/null
+++ b/crates/client/src/player/systems/block_actions.rs
@@ -0,0 +1,229 @@
+use crate::player::{BreakBlockEvent, LocalPlayer, PlaceBlockEvent, TargetedBlock};
+use bevy::ecs::prelude::*;
+use lightyear::prelude::{MessageReceiver, MessageSender};
+use shared::{
+    network::protocol::{BlockUpdates, ClientMessage, ServerMessage},
+    prelude::IVec3,
+    world::block::block_registry::AIR_BLOCK_ID,
+    world::chunk::{
+        CHUNK_SIDE_LENGTH,
+        components::{ChunkBlocksComponent, ChunkCoord, ChunkMeshDirty},
+    },
+};
+use std::collections::HashMap;
+
+/// Fires a `BreakBlockEvent` for the currently targeted block and sends a
+/// `ClientMessage::BreakBlock` to the server.
+pub fn break_targeted_block_system(
+    targeted_block: Res<TargetedBlock>,
+    mut break_block_writer: MessageWriter<BreakBlockEvent>,
+    mut sender_query: Query<&mut MessageSender<ClientMessage>, With<LocalPlayer>>,
+) {
+    if let Some(block_pos) = targeted_block.position {
+        // send local event for instant Client-Side Prediction (CSP)
+        break_block_writer.write(BreakBlockEvent {
+            world_pos: block_pos,
+        });
+
+        // send networked intent to the server
+        if let Ok(mut sender) = sender_query.single_mut() {
+            sender.send::<BlockUpdates>(ClientMessage::BreakBlock {
+                position: block_pos,
+            });
+        }
+    }
+}
+
+/// Listens for `ServerMessage::BlockUpdate` from the server (representing other players' actions or server-side changes)
+/// and translates them into local block events.
+pub fn handle_incoming_block_updates(
+    mut query: Query<&mut MessageReceiver<ServerMessage>, With<LocalPlayer>>,
+    mut break_block_writer: MessageWriter<BreakBlockEvent>,
+    mut place_block_writer: MessageWriter<PlaceBlockEvent>,
+) {
+    for mut receiver in query.iter_mut() {
+        for message in receiver.receive() {
+            if let ServerMessage::BlockUpdate { position, block_id } = message {
+                if block_id == AIR_BLOCK_ID {
+                    break_block_writer.write(BreakBlockEvent {
+                        world_pos: position,
+                    });
+                } else {
+                    place_block_writer.write(PlaceBlockEvent {
+                        target_pos: position,
+                        block_id,
+                    });
+                }
+            }
+        }
+    }
+}
+
+/// A system that handles the `BreakBlockEvent` by mutating local chunk data
+/// and marking chunks as dirty for remeshing.
+pub fn handle_break_block_events_system(
+    // input
+    mut events: MessageReader<BreakBlockEvent>,
+    chunk_query: Query<(&ChunkCoord, Entity)>,
+
+    // output
+    mut blocks_query: Query<&mut ChunkBlocksComponent>,
+    mut commands: Commands,
+) {
+    if events.is_empty() {
+        return;
+    }
+
+    // build a temporary map for lookups
+    let mut entity_map = HashMap::new();
+    for (coord, entity) in chunk_query.iter() {
+        entity_map.insert(coord.pos, entity);
+    }
+
+    for event in events.read() {
+        let chunk_pos = ChunkCoord::world_to_chunk_pos(event.world_pos.as_vec3());
+
+        if let Some(&entity) = entity_map.get(&chunk_pos)
+            && let Ok(mut chunk_blocks) = blocks_query.get_mut(entity)
+        {
+            let local_pos = event.world_pos - (chunk_pos * CHUNK_SIDE_LENGTH as i32);
+
+            let mut writer = chunk_blocks.get_writer();
+            writer.set_data(
+                local_pos.x as usize,
+                local_pos.y as usize,
+                local_pos.z as usize,
+                AIR_BLOCK_ID,
+            );
+
+            // mark the primary chunk as dirty
+            commands.entity(entity).insert(ChunkMeshDirty);
+
+            // mark any neighbors as dirty if we are on the edge
+            let max_idx = (CHUNK_SIDE_LENGTH - 1) as i32;
+            let mut neighbor_coords_to_dirty = Vec::with_capacity(3);
+
+            if local_pos.x == 0 {
+                neighbor_coords_to_dirty.push(chunk_pos - IVec3::X);
+            } else if local_pos.x == max_idx {
+                neighbor_coords_to_dirty.push(chunk_pos + IVec3::X);
+            }
+
+            if local_pos.y == 0 {
+                neighbor_coords_to_dirty.push(chunk_pos - IVec3::Y);
+            } else if local_pos.y == max_idx {
+                neighbor_coords_to_dirty.push(chunk_pos + IVec3::Y);
+            }
+
+            if local_pos.z == 0 {
+                neighbor_coords_to_dirty.push(chunk_pos - IVec3::Z);
+            } else if local_pos.z == max_idx {
+                neighbor_coords_to_dirty.push(chunk_pos + IVec3::Z);
+            }
+
+            for neighbor_coord in neighbor_coords_to_dirty {
+                if let Some(&neighbor_entity) = entity_map.get(&neighbor_coord) {
+                    commands.entity(neighbor_entity).insert(ChunkMeshDirty);
+                }
+            }
+        }
+    }
+}
+
+/// Fires a `PlaceBlockEvent` for the currently targeted block and sends a
+/// `ClientMessage::PlaceBlock` to the server.
+pub fn place_targeted_block_system(
+    targeted_block: Res<TargetedBlock>,
+    mut place_block_writer: MessageWriter<PlaceBlockEvent>,
+    mut sender_query: Query<&mut MessageSender<ClientMessage>, With<LocalPlayer>>,
+) {
+    if let (Some(block_pos), Some(normal)) = (targeted_block.position, targeted_block.normal) {
+        let target_pos = block_pos + normal;
+        let block_id = 1;
+
+        // send local event for CSP
+        place_block_writer.write(PlaceBlockEvent {
+            target_pos,
+            block_id,
+        });
+
+        // send networked intent to the server
+        if let Ok(mut sender) = sender_query.single_mut() {
+            sender.send::<BlockUpdates>(ClientMessage::PlaceBlock {
+                position: target_pos,
+                block_id,
+            });
+        }
+    }
+}
+
+/// A system that handles the `PlaceBlockEvent` by mutating local chunk data
+/// and marking chunks as dirty for remeshing.
+pub fn handle_place_block_events_system(
+    // input
+    mut events: MessageReader<PlaceBlockEvent>,
+    chunk_query: Query<(&ChunkCoord, Entity)>,
+
+    // output
+    mut blocks_query: Query<&mut ChunkBlocksComponent>,
+    mut commands: Commands,
+) {
+    if events.is_empty() {
+        return;
+    }
+
+    // build a temporary map for lookups
+    let mut entity_map = HashMap::new();
+    for (coord, entity) in chunk_query.iter() {
+        entity_map.insert(coord.pos, entity);
+    }
+
+    for event in events.read() {
+        let chunk_pos = ChunkCoord::world_to_chunk_pos(event.target_pos.as_vec3());
+
+        if let Some(&entity) = entity_map.get(&chunk_pos)
+            && let Ok(mut chunk_blocks) = blocks_query.get_mut(entity)
+        {
+            let local_pos = event.target_pos - (chunk_pos * CHUNK_SIDE_LENGTH as i32);
+
+            let mut writer = chunk_blocks.get_writer();
+            writer.set_data(
+                local_pos.x as usize,
+                local_pos.y as usize,
+                local_pos.z as usize,
+                event.block_id,
+            );
+
+            // mark primary chunk as dirty
+            commands.entity(entity).insert(ChunkMeshDirty);
+
+            // mark any neighbors as dirty if we are on the edge
+            let max_idx = (CHUNK_SIDE_LENGTH - 1) as i32;
+            let mut neighbor_coords_to_dirty = Vec::with_capacity(3);
+
+            if local_pos.x == 0 {
+                neighbor_coords_to_dirty.push(chunk_pos - IVec3::X);
+            } else if local_pos.x == max_idx {
+                neighbor_coords_to_dirty.push(chunk_pos + IVec3::X);
+            }
+
+            if local_pos.y == 0 {
+                neighbor_coords_to_dirty.push(chunk_pos - IVec3::Y);
+            } else if local_pos.y == max_idx {
+                neighbor_coords_to_dirty.push(chunk_pos + IVec3::Y);
+            }
+
+            if local_pos.z == 0 {
+                neighbor_coords_to_dirty.push(chunk_pos - IVec3::Z);
+            } else if local_pos.z == max_idx {
+                neighbor_coords_to_dirty.push(chunk_pos + IVec3::Z);
+            }
+
+            for neighbor_coord in neighbor_coords_to_dirty {
+                if let Some(&neighbor_entity) = entity_map.get(&neighbor_coord) {
+                    commands.entity(neighbor_entity).insert(ChunkMeshDirty);
+                }
+            }
+        }
+    }
+}
diff --git a/crates/client/src/player/systems/mod.rs b/crates/client/src/player/systems/mod.rs
new file mode 100644
index 00000000..a7c9dee8
--- /dev/null
+++ b/crates/client/src/player/systems/mod.rs
@@ -0,0 +1,3 @@
+pub(super) mod block_actions;
+pub(super) mod setup_replicated_players;
+pub(super) mod update_target_block;
diff --git a/crates/client/src/player/systems/setup_replicated_players.rs b/crates/client/src/player/systems/setup_replicated_players.rs
new file mode 100644
index 00000000..b478ef5f
--- /dev/null
+++ b/crates/client/src/player/systems/setup_replicated_players.rs
@@ -0,0 +1,36 @@
+use crate::player::replicated_player::dress_local_player;
+use bevy::prelude::*;
+use lightyear::prelude::client::*;
+use shared::player::components::{LogicalPosition, NetworkPlayer, PlayerOwner};
+
+/// A system that watches for new replicated players in the ECS world and dresses them with
+/// the extra necessary components.
+pub fn dress_replicated_players_system(
+    mut commands: Commands,
+    // query for newly replicated players that haven't been dressed yet.
+    new_players: Query<(Entity, &PlayerOwner, &LogicalPosition), Added<NetworkPlayer>>,
+    // get the local client's connection info to verify ownership
+    netcode_client: Query<&NetcodeClient>,
+) {
+    let Some(client) = netcode_client.iter().next() else {
+        return;
+    };
+
+    let local_client_id = client.id();
+
+    for (entity, owner, logical_pos) in new_players.iter() {
+        let spawn_pos = logical_pos.0;
+
+        if owner.0 == local_client_id {
+            info!("This is the LOCAL player! Dressing entity {:?}...", entity);
+            dress_local_player(entity, spawn_pos, &mut commands);
+        } else {
+            info!("This is a REMOTE player! Dressing entity {:?}...", entity);
+            // remote players still need a Transform for the smoothing/interpolation systems to work
+            commands
+                .entity(entity)
+                .insert(Transform::from_translation(spawn_pos));
+            // TODO: dress_remote_player(entity, &mut commands);
+        }
+    }
+}
diff --git a/crates/shared/src/simulation/player/actions/voxel/update_target_voxel.rs b/crates/client/src/player/systems/update_target_block.rs
similarity index 52%
rename from crates/shared/src/simulation/player/actions/voxel/update_target_voxel.rs
rename to crates/client/src/player/systems/update_target_block.rs
index 29168ffc..e527e2ba 100644
--- a/crates/shared/src/simulation/player/actions/voxel/update_target_voxel.rs
+++ b/crates/client/src/player/systems/update_target_block.rs
@@ -1,12 +1,14 @@
+use crate::player::{LocalPlayer, TargetedBlock};
 use crate::prelude::*;
-use crate::simulation::chunk::{ChunkCoord, ChunkState, chunk_blocks::ChunkView};
-use crate::simulation::{
-    block::{TargetedBlock, block_registry::AIR_BLOCK_ID},
-    chunk::{ChunkBlocksComponent, ChunkStateManager},
+use crate::render::chunk::manager::ClientChunkManager;
+use bevy::{
+    ecs::relationship::Relationship,
+    prelude::{Camera, Camera3d, ChildOf, Entity, GlobalTransform, Query, Res, ResMut, With},
+};
+use shared::{
+    world::chunk::{ChunkCoord, chunk_blocks::ChunkView},
+    world::{block::block_registry::AIR_BLOCK_ID, chunk::ChunkBlocksComponent},
 };
-use bevy::ecs::prelude::{Query, Res, ResMut, With};
-use bevy::prelude::{Camera, Camera3d};
-use bevy::transform::components::Transform;
 
 /// Max raycast traverse distance in blocks
 const RAYCAST_MAX_DIST: f32 = 8.0;
@@ -17,16 +19,22 @@ const RAYCAST_STEP: f32 = 0.1;
 #[instrument(skip_all)]
 pub fn update_targeted_block_system(
     // input
-    camera_query: Query<(&Transform, &Camera), With<Camera3d>>,
-    chunk_manager: Res<ChunkStateManager>,
+    camera_query: Query<(&GlobalTransform, &Camera, &ChildOf), With<Camera3d>>,
+    player_query: Query<Entity, With<LocalPlayer>>,
+    chunk_manager: Res<ClientChunkManager>,
     chunks_query: Query<&ChunkBlocksComponent>,
 
     // output
     mut targeted_block: ResMut<TargetedBlock>,
 ) {
+    if player_query.is_empty() {
+        return;
+    }
+    let local_player_entity = player_query.single().unwrap();
+
     let mut active_transform = None;
-    for (transform, camera) in camera_query.iter() {
-        if camera.is_active {
+    for (transform, camera, parent) in camera_query.iter() {
+        if camera.is_active && parent.get() == local_player_entity {
             active_transform = Some(transform);
             break;
         }
@@ -36,8 +44,8 @@ pub fn update_targeted_block_system(
         return;
     };
 
-    // simple voxel raycast
-    let mut last_voxel_pos = None;
+    // simple block raycast
+    let mut last_block_pos = None;
 
     let mut target_pos = None;
     let mut target_normal = None;
@@ -46,27 +54,27 @@ pub fn update_targeted_block_system(
 
     for i in 0..steps {
         let dist = i as f32 * RAYCAST_STEP;
-        let current_pos = transform.translation + transform.forward() * dist;
-        let current_voxel_pos = current_pos.floor().as_ivec3();
+        let current_pos = transform.translation() + transform.forward() * dist;
+        let current_block_pos = current_pos.floor().as_ivec3();
 
-        // skip if we're still in the same voxel
-        if Some(current_voxel_pos) == last_voxel_pos {
+        // skip if we're still in the same block
+        if Some(current_block_pos) == last_block_pos {
             continue;
         }
 
-        // get block for current voxel
-        let block_id = get_block_at_world_pos(current_voxel_pos, &chunk_manager, &chunks_query);
+        // get block for current block
+        let block_id = get_block_at_world_pos(current_block_pos, &chunk_manager, &chunks_query);
 
         // check if we hit something
         if block_id != Some(AIR_BLOCK_ID) && block_id.is_some() {
-            target_pos = Some(current_voxel_pos);
-            if let Some(last_pos) = last_voxel_pos {
-                target_normal = Some(last_pos - current_voxel_pos);
+            target_pos = Some(current_block_pos);
+            if let Some(last_pos) = last_block_pos {
+                target_normal = Some(last_pos - current_block_pos);
             }
             break;
         }
 
-        last_voxel_pos = Some(current_voxel_pos);
+        last_block_pos = Some(current_block_pos);
     }
 
     targeted_block.position = target_pos;
@@ -76,16 +84,15 @@ pub fn update_targeted_block_system(
 /// Helper function to get a block from world coordinates
 fn get_block_at_world_pos(
     world_pos: IVec3,
-    manager: &Res<ChunkStateManager>,
+    manager: &Res<ClientChunkManager>,
     chunks_query: &Query<&ChunkBlocksComponent>,
 ) -> Option<u8> {
     let (chunk_coord, local_pos) = ChunkCoord::world_to_chunk_and_local_pos(world_pos);
 
-    // only get if chunk loaded
-    let chunk_state = manager.get_state(chunk_coord)?;
-    if let ChunkState::Loaded {
-        entity: Some(actual_entity),
-    } = chunk_state
+    // only get if chunk has data
+    let state = manager.get_state(chunk_coord)?;
+    if state.is_generated()
+        && let Some(actual_entity) = state.entity()
         && let Ok(chunk_blocks) = chunks_query.get(actual_entity)
     {
         return Some(match chunk_blocks.get_view() {
diff --git a/crates/shared/src/simulation/block/targeted_block.rs b/crates/client/src/player/targeted_block.rs
similarity index 76%
rename from crates/shared/src/simulation/block/targeted_block.rs
rename to crates/client/src/player/targeted_block.rs
index c68dae09..4677a725 100644
--- a/crates/shared/src/simulation/block/targeted_block.rs
+++ b/crates/client/src/player/targeted_block.rs
@@ -2,7 +2,7 @@ use crate::prelude::*;
 use bevy::ecs::prelude::*;
 use bevy::render::extract_resource::ExtractResource;
 
-#[derive(Resource, Clone, Default, ExtractResource)]
+#[derive(Resource, ExtractResource, Clone, Default, Debug)]
 pub struct TargetedBlock {
     pub position: Option<IVec3>,
     pub normal: Option<IVec3>,
diff --git a/crates/client/src/prelude.rs b/crates/client/src/prelude.rs
index 368f6759..a3d3a220 100644
--- a/crates/client/src/prelude.rs
+++ b/crates/client/src/prelude.rs
@@ -4,7 +4,7 @@
 // INFO: -----------------------
 //         crate imports
 // -----------------------------
-pub use crate::render::scheduling::*;
+pub use crate::lifecycle::RenderPrepSet;
 pub use crate::settings::ClientSettings;
 pub use utils::*;
 
@@ -12,11 +12,13 @@ pub use utils::*;
 //         useful utils
 // ----------------------------
 
+pub use bevy::app::{App, Plugin, PluginGroup, PluginGroupBuilder};
 pub use bevy::math::{
     FloatExt, IVec2, IVec3, IVec4, Mat3, Mat4, Quat, Vec2, Vec3, Vec4, Vec4Swizzles, vec2, vec3,
     vec4,
 };
 pub use derive_more::{Deref, DerefMut};
+pub use lightyear::prelude::client as lightyear_client;
 pub use std::f32::consts::{FRAC_PI_2, PI};
 pub use std::sync::Arc;
 pub use tracing::{debug, error, info, info_span, instrument, trace, warn};
diff --git a/crates/client/src/render/block/mod.rs b/crates/client/src/render/block/mod.rs
index 98daeada..ac72ff8c 100644
--- a/crates/client/src/render/block/mod.rs
+++ b/crates/client/src/render/block/mod.rs
@@ -1,53 +1,27 @@
-use shared::simulation::block::texture_registry::TextureId;
+pub mod registry;
+pub mod render_data;
 
-/// Optimized hot block data required for meshing and rendering.
-#[derive(Debug, Clone)]
-pub struct BlockRenderData<T = TextureId> {
-    pub textures: BlockFaceTextures<T>,
-    pub is_transparent: bool,
-}
+pub use registry::BlockRenderDataRegistry;
 
-/// The textures associated with each face of a particular block type.
-#[derive(Debug, Clone)]
-pub struct BlockFaceTextures<T> {
-    pub top: T,
-    pub bottom: T,
-    pub front: T,
-    pub back: T,
-    pub right: T,
-    pub left: T,
-}
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
 
-impl<T: Clone> BlockFaceTextures<T> {
-    pub fn map<U, F>(self, mut f: F) -> BlockFaceTextures<U>
-    where
-        F: FnMut(T) -> U,
-    {
-        BlockFaceTextures {
-            top: f(self.top.clone()),
-            bottom: f(self.bottom.clone()),
-            front: f(self.front.clone()),
-            back: f(self.back.clone()),
-            right: f(self.right.clone()),
-            left: f(self.left.clone()),
-        }
-    }
+use crate::render::texture::block::block_texture_registry::LoadTextures;
+use bevy::prelude::*;
+use registry::{LoadRenderRegistry, handle_render_registry};
+pub use render_data::{BlockFaceTextures, BlockRenderData};
+use shared::lifecycle::load::{LoadBiomes, LoadBlocks};
+use shared::{AppStartupLoadingPhase, LoadingAppExt};
 
-    #[inline(always)]
-    pub fn get(&self, face_index: usize) -> T {
-        match face_index {
-            0 => self.top.clone(),
-            1 => self.bottom.clone(),
-            2 => self.left.clone(),
-            3 => self.right.clone(),
-            4 => self.front.clone(),
-            _ => self.back.clone(),
-        }
+pub struct BlockRenderPlugin;
+
+impl Plugin for BlockRenderPlugin {
+    fn build(&self, app: &mut App) {
+        app.configure_loading_phase::<AppStartupLoadingPhase>()
+            .add_node(LoadRenderRegistry, handle_render_registry)
+            .add_dependency(LoadRenderRegistry, LoadBlocks)
+            .add_dependency(LoadRenderRegistry, LoadTextures)
+            .add_dependency(LoadRenderRegistry, LoadBiomes);
     }
 }
-
-pub mod plugin;
-pub mod registry;
-
-pub use plugin::BlockRenderPlugin;
-pub use registry::BlockRenderDataRegistry;
diff --git a/crates/client/src/render/block/plugin.rs b/crates/client/src/render/block/plugin.rs
deleted file mode 100644
index 058a6ab2..00000000
--- a/crates/client/src/render/block/plugin.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use bevy::app::{App, Plugin};
-
-pub struct BlockRenderPlugin;
-
-impl Plugin for BlockRenderPlugin {
-    fn build(&self, _app: &mut App) {
-        // block-specific render setup
-    }
-}
diff --git a/crates/client/src/render/block/registry.rs b/crates/client/src/render/block/registry.rs
index e12e6565..c0e1d6ef 100644
--- a/crates/client/src/render/block/registry.rs
+++ b/crates/client/src/render/block/registry.rs
@@ -1,12 +1,19 @@
 use super::{BlockFaceTextures, BlockRenderData};
 use crate::prelude::*;
+use crate::render::texture::{TextureId, TextureRegistryResource};
+use bevy::ecs::world::CommandQueue;
 use bevy::prelude::*;
-use shared::simulation::block::texture_registry::{TextureId, TextureRegistryResource};
-use shared::simulation::block::{
+use bevy::tasks::AsyncComputeTaskPool;
+use shared::lifecycle::PersistentPathsResource;
+use shared::lifecycle::load::{LoadingTaskComponent, NodeCompleted, StartNode};
+use shared::world::block::{
     AIR_BLOCK_ID, BlockId, BlockRegistry, SOLID_BLOCK_ID, load_block_from_str,
 };
 use std::sync::Arc;
-use utils::PersistentPaths;
+
+/// Marker node for loading client-specific render data for blocks.
+#[derive(Component)]
+pub struct LoadRenderRegistry;
 
 /// Client-only visual mapping data for blocks.
 #[derive(Resource, Clone, Default)]
@@ -165,3 +172,35 @@ impl BlockRenderDataRegistry {
         }
     }
 }
+
+/// An asynchronous loading observer for the render registry.
+///
+/// This is triggered when the render registry loading node is ready to begin.
+pub fn handle_render_registry(
+    trigger: On<StartNode>,
+    mut commands: Commands,
+    persistent_paths: Res<PersistentPathsResource>,
+    block_registry: Res<BlockRegistry>,
+    texture_registry: Res<TextureRegistryResource>,
+) {
+    let paths = persistent_paths.0.clone();
+    let blocks = block_registry.clone();
+    let textures = texture_registry.clone();
+    let node_entity = trigger.0.entity();
+
+    let task = AsyncComputeTaskPool::get().spawn(async move {
+        let render_registry = BlockRenderDataRegistry::load_from_disk(&paths, &blocks, &textures);
+
+        let mut queue = CommandQueue::default();
+        queue.push(move |world: &mut World| {
+            world.insert_resource(render_registry);
+            world.trigger(NodeCompleted::of::<LoadRenderRegistry>());
+        });
+        queue
+    });
+
+    // Spawn the task as a child of the node entity
+    commands.entity(node_entity).with_children(|parent| {
+        parent.spawn(LoadingTaskComponent(task));
+    });
+}
diff --git a/crates/client/src/render/block/render_data.rs b/crates/client/src/render/block/render_data.rs
new file mode 100644
index 00000000..9eb9f971
--- /dev/null
+++ b/crates/client/src/render/block/render_data.rs
@@ -0,0 +1,47 @@
+use crate::render::texture::TextureId;
+
+/// Optimized hot block data required for meshing and rendering.
+#[derive(Debug, Clone)]
+pub struct BlockRenderData<T = TextureId> {
+    pub textures: BlockFaceTextures<T>,
+    pub is_transparent: bool,
+}
+
+/// The textures associated with each face of a particular block type.
+#[derive(Debug, Clone)]
+pub struct BlockFaceTextures<T> {
+    pub top: T,
+    pub bottom: T,
+    pub front: T,
+    pub back: T,
+    pub right: T,
+    pub left: T,
+}
+
+impl<T: Clone> BlockFaceTextures<T> {
+    pub fn map<U, F>(self, mut f: F) -> BlockFaceTextures<U>
+    where
+        F: FnMut(T) -> U,
+    {
+        BlockFaceTextures {
+            top: f(self.top.clone()),
+            bottom: f(self.bottom.clone()),
+            front: f(self.front.clone()),
+            back: f(self.back.clone()),
+            right: f(self.right.clone()),
+            left: f(self.left.clone()),
+        }
+    }
+
+    #[inline(always)]
+    pub fn get(&self, face_index: usize) -> T {
+        match face_index {
+            0 => self.top.clone(),
+            1 => self.bottom.clone(),
+            2 => self.left.clone(),
+            3 => self.right.clone(),
+            4 => self.front.clone(),
+            _ => self.back.clone(),
+        }
+    }
+}
diff --git a/crates/client/src/render/chunk/asset.rs b/crates/client/src/render/chunk/asset.rs
index 0655f82b..a7efa3c3 100644
--- a/crates/client/src/render/chunk/asset.rs
+++ b/crates/client/src/render/chunk/asset.rs
@@ -1,15 +1,14 @@
 use crate::render::chunk::meshing::packed_face::PackedFace;
-use bevy::asset::Asset;
-use bevy::reflect::Reflect;
+use bevy::{asset::Asset, reflect::Reflect};
 use std::sync::Arc;
 
 // INFO: -----------------------------
 //         types and resources
 // -----------------------------------
 
-/// A 3D voxel-based mesh asset consisting of packed face data.
+/// A 3D block-based mesh asset consisting of packed face data.
 #[derive(Asset, Reflect, Clone, Debug, PartialEq, Eq, Hash)]
-pub struct VoxelMeshAsset {
+pub struct BlockMeshAsset {
     pub name: String,
-    pub faces: Arc<Vec<PackedFace>>,
+    pub faces: Arc<[PackedFace]>,
 }
diff --git a/crates/client/src/render/chunk/components.rs b/crates/client/src/render/chunk/components.rs
index d29f6e14..623a235f 100644
--- a/crates/client/src/render/chunk/components.rs
+++ b/crates/client/src/render/chunk/components.rs
@@ -1,27 +1,27 @@
-use crate::render::chunk::asset::VoxelMeshAsset;
+use crate::render::chunk::asset::BlockMeshAsset;
 use bevy::asset::Handle;
 use bevy::ecs::prelude::Component;
 
 #[derive(Component, Debug)]
 pub struct OpaqueMeshComponent {
-    pub mesh_handle: Handle<VoxelMeshAsset>,
+    pub mesh_handle: Handle<BlockMeshAsset>,
 }
 
 impl OpaqueMeshComponent {
     /// Creates a new opaque-rendered mesh from raw vertex and index data.
-    pub fn new(mesh_handle: Handle<VoxelMeshAsset>) -> Self {
+    pub fn new(mesh_handle: Handle<BlockMeshAsset>) -> Self {
         Self { mesh_handle }
     }
 }
 
 #[derive(Component, Debug)]
 pub struct TransparentMeshComponent {
-    pub mesh_handle: Handle<VoxelMeshAsset>,
+    pub mesh_handle: Handle<BlockMeshAsset>,
 }
 
 impl TransparentMeshComponent {
     /// Creates a new transparent-rendered mesh from raw vertex and index data.
-    pub fn new(mesh_handle: Handle<VoxelMeshAsset>) -> Self {
+    pub fn new(mesh_handle: Handle<BlockMeshAsset>) -> Self {
         Self { mesh_handle }
     }
 }
diff --git a/crates/client/src/render/chunk/manager.rs b/crates/client/src/render/chunk/manager.rs
new file mode 100644
index 00000000..045fb8f3
--- /dev/null
+++ b/crates/client/src/render/chunk/manager.rs
@@ -0,0 +1,136 @@
+use bevy::ecs::prelude::*;
+use bevy::math::IVec3;
+use std::collections::HashMap;
+
+/// Represents the various states a chunk can be in during the client-side visual lifecycle.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ClientChunkState {
+    /// Chunk data is requested from server
+    AwaitingData,
+    /// Chunk data is received but not yet queued for meshing
+    DataReady { entity: Entity },
+    /// Chunk data is received, awaiting a mesh slot
+    NeedsMeshing { entity: Entity },
+    /// Chunk is currently undergoing meshing
+    Meshing { entity: Entity },
+    /// Chunk has completed its meshing pass (may or may not have produced a visible mesh).
+    /// The entity contains the authoritative block data.
+    MeshComplete { entity: Entity },
+}
+
+impl ClientChunkState {
+    /// Returns the Entity associated with this chunk state, if it exists.
+    pub fn entity(&self) -> Option<Entity> {
+        match *self {
+            ClientChunkState::AwaitingData => None,
+            ClientChunkState::DataReady { entity } => Some(entity),
+            ClientChunkState::NeedsMeshing { entity } => Some(entity),
+            ClientChunkState::Meshing { entity } => Some(entity),
+            ClientChunkState::MeshComplete { entity } => Some(entity),
+        }
+    }
+
+    /// Returns true if the chunk has data (is at least DataReady).
+    pub fn is_generated(&self) -> bool {
+        !matches!(self, ClientChunkState::AwaitingData)
+    }
+}
+
+/// Resource tracking the visual lifecycle (meshing/rendering) of all active chunks on the client.
+#[derive(Resource, Default, Debug)]
+pub struct ClientChunkManager {
+    /// Map tracking the state of all non-unloaded chunks.
+    pub chunk_states: HashMap<IVec3, ClientChunkState>,
+}
+
+impl ClientChunkManager {
+    /// Gets the current state of a chunk, if tracked.
+    pub fn get_state(&self, coord: IVec3) -> Option<ClientChunkState> {
+        self.chunk_states.get(&coord).copied()
+    }
+
+    /// Gets the Entity for a chunk, if that chunk is tracked and has an entity.
+    pub fn get_entity(&self, coord: IVec3) -> Option<Entity> {
+        self.chunk_states
+            .get(&coord)
+            .and_then(|state| state.entity())
+    }
+
+    /// Checks if a chunk exists in any loading or rendered state.
+    pub fn is_chunk_present_or_loading(&self, coord: IVec3) -> bool {
+        self.chunk_states.contains_key(&coord)
+    }
+
+    /// Marks that a chunk is requested from the server but data hasn't arrived.
+    pub fn mark_as_awaiting_data(&mut self, coord: IVec3) {
+        self.chunk_states
+            .insert(coord, ClientChunkState::AwaitingData);
+    }
+
+    /// Marks that a chunk has received data but is not yet queued for meshing.
+    pub fn mark_as_data_ready(&mut self, coord: IVec3, entity: Entity) {
+        self.chunk_states
+            .insert(coord, ClientChunkState::DataReady { entity });
+    }
+
+    /// Marks that a chunk has received data and is queued to be meshed.
+    pub fn mark_as_needs_meshing(&mut self, coord: IVec3, entity: Entity) {
+        self.chunk_states
+            .insert(coord, ClientChunkState::NeedsMeshing { entity });
+    }
+
+    /// Marks that a chunk has started the meshing process.
+    pub fn mark_as_meshing(&mut self, coord: IVec3, entity: Entity) {
+        self.chunk_states
+            .insert(coord, ClientChunkState::Meshing { entity });
+    }
+
+    /// Marks that a chunk has completed its meshing pass.
+    pub fn mark_as_mesh_complete(&mut self, coord: IVec3, entity: Entity) {
+        self.chunk_states
+            .insert(coord, ClientChunkState::MeshComplete { entity });
+    }
+
+    /// Called when a chunk is unloaded, removing it from tracking.
+    pub fn mark_as_unloaded(&mut self, coord: IVec3) {
+        self.chunk_states.remove(&coord);
+    }
+
+    /// An iterator over all chunks needing meshing.
+    ///
+    /// Useful for throttling the number of meshing tasks started per frame.
+    pub fn iter_needs_meshing(&self) -> impl Iterator<Item = &IVec3> {
+        self.chunk_states.iter().filter_map(|(coord, state)| {
+            if matches!(state, ClientChunkState::NeedsMeshing { .. }) {
+                Some(coord)
+            } else {
+                None
+            }
+        })
+    }
+
+    /// Returns an iterator over all *existing* neighbors of a chunk.
+    pub fn iter_neighbors(&self, coord: IVec3) -> impl Iterator<Item = NeighborInfo> + '_ {
+        shared::world::chunk::NEIGHBOR_OFFSETS
+            .into_iter()
+            .filter_map(move |offset| {
+                let neighbor_coord = coord + offset;
+                self.get_state(neighbor_coord)
+                    .and_then(|state| state.entity().map(|entity| (state, entity)))
+                    .map(|(state, entity)| NeighborInfo {
+                        offset,
+                        coord: neighbor_coord,
+                        state,
+                        entity,
+                    })
+            })
+    }
+}
+
+/// Holds information about a chunk's existing neighbor on the client.
+pub struct NeighborInfo {
+    pub offset: IVec3,
+    pub coord: IVec3,
+    pub state: ClientChunkState,
+    pub entity: Entity,
+}
diff --git a/crates/client/src/render/chunk/meshing/common.rs b/crates/client/src/render/chunk/meshing/common.rs
index 4151b3f1..a0513297 100644
--- a/crates/client/src/render/chunk/meshing/common.rs
+++ b/crates/client/src/render/chunk/meshing/common.rs
@@ -1,12 +1,27 @@
-use super::{OpaqueMeshData, TransparentMeshData};
-use crate::prelude::*;
-use crate::render::chunk::meshing::packed_face::PackedFace;
-use shared::simulation::{
-    block::{BlockId, BlockRegistry, texture_registry::TextureId},
-    chunk::{NeighborLODs, PaddedChunk, types::ChunkLod},
+use super::{OpaqueMeshData, PackedFace, TransparentMeshData};
+use crate::{prelude::*, render::texture::TextureId};
+use shared::world::{
+    block::{BlockId, BlockRegistry},
+    chunk::{CHUNK_SIDE_LENGTH, NeighborLODs, PaddedChunk, types::ChunkLod},
 };
+use std::cell::RefCell;
 use std::sync::Arc;
 
+// INFO: -----------------------------
+//         thread buffer pooll
+// -----------------------------------
+
+/// The maximum number of faces a solid chunk hull can have.
+const INITIAL_FACE_CAPACITY: usize = CHUNK_SIDE_LENGTH * CHUNK_SIDE_LENGTH * 6;
+
+thread_local! {
+    /// Thread-local buffer for opaque faces to avoid allocations in the meshing loop.
+    pub static OPAQUE_FACE_BUFFER: RefCell<Vec<PackedFace>> = RefCell::new(Vec::with_capacity(INITIAL_FACE_CAPACITY));
+
+    /// Thread-local buffer for transparent faces to avoid allocations in the meshing loop.
+    pub static TRANSPARENT_FACE_BUFFER: RefCell<Vec<PackedFace>> = RefCell::new(Vec::with_capacity(INITIAL_FACE_CAPACITY / 4));
+}
+
 // INFO: -----------------------
 //         lookup tables
 // -----------------------------
@@ -103,7 +118,7 @@ impl From<u8> for AoLevel {
     }
 }
 
-/// Represents the 6 cardinal directions (normals) for a voxel face.
+/// Represents the 6 cardinal directions (normals) for a block face.
 #[repr(u8)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum FaceSide {
@@ -236,13 +251,13 @@ pub fn calculate_ao_levels_for_face(
 #[instrument(skip_all)]
 pub fn build_mesh_assets(
     name: &str,
-    opaque_faces: Vec<PackedFace>,
-    transparent_faces: Vec<PackedFace>,
+    opaque_faces: &[PackedFace],
+    transparent_faces: &[PackedFace],
 ) -> (Option<OpaqueMeshData>, Option<TransparentMeshData>) {
     let opaque = if !opaque_faces.is_empty() {
         Some(OpaqueMeshData {
             name: name.to_string(),
-            faces: Arc::new(opaque_faces),
+            faces: Arc::from(opaque_faces),
         })
     } else {
         None
@@ -250,7 +265,7 @@ pub fn build_mesh_assets(
     let trans = if !transparent_faces.is_empty() {
         Some(TransparentMeshData {
             name: format!("{}_trans", name),
-            faces: Arc::new(transparent_faces),
+            faces: Arc::from(transparent_faces),
         })
     } else {
         None
@@ -258,6 +273,10 @@ pub fn build_mesh_assets(
     (opaque, trans)
 }
 
+/// Shared context for chunk meshing algorithms.
+///
+/// Contains references to registries and chunk data needed to calculate
+/// face geometry, ambient occlusion, and texture mapping.
 pub struct MesherContext<'a, R> {
     pub padded_chunk: &'a PaddedChunk,
     pub block_registry: &'a BlockRegistry,
diff --git a/crates/client/src/render/chunk/meshing/dense.rs b/crates/client/src/render/chunk/meshing/dense.rs
index 1f46fa55..2bb3c56d 100644
--- a/crates/client/src/render/chunk/meshing/dense.rs
+++ b/crates/client/src/render/chunk/meshing/dense.rs
@@ -1,6 +1,6 @@
 use super::{OpaqueMeshData, TransparentMeshData, common::*};
 use crate::prelude::*;
-use shared::simulation::{
+use shared::world::{
     block::{BlockRegistry, block_registry::AIR_BLOCK_ID},
     chunk::{CHUNK_SIDE_LENGTH, PaddedChunk},
 };
@@ -14,75 +14,82 @@ pub fn build_dense_mesh<R>(
     render_registry: &R,
     texture_lut: &[[u32; 6]],
 ) -> (Option<OpaqueMeshData>, Option<TransparentMeshData>) {
-    // TODO: using a buffer pool is probably better than this alloc guesswork
-    // even though we ultimately need a personal copy of the data at the end
-    let mut opaque_faces = Vec::with_capacity(20_000);
-    let mut transparent_faces = Vec::with_capacity(5_000);
+    OPAQUE_FACE_BUFFER.with(|opaque_buffer_ref| {
+        TRANSPARENT_FACE_BUFFER.with(|transparent_buffer_ref| {
+            let mut opaque_faces = opaque_buffer_ref.borrow_mut();
+            let mut transparent_faces = transparent_buffer_ref.borrow_mut();
 
-    let ctx = MesherContext {
-        padded_chunk,
-        block_registry,
-        render_registry,
-        center_lod: padded_chunk.center_lod(),
-        neighbor_lods: padded_chunk.neighbor_lods(),
-        chunk_size: padded_chunk.get_size(),
-        scale: (CHUNK_SIDE_LENGTH / padded_chunk.get_size()) as f32,
-    };
+            opaque_faces.clear();
+            transparent_faces.clear();
 
-    let transparency_lut = block_registry.get_transparency_lut();
+            let ctx = MesherContext {
+                padded_chunk,
+                block_registry,
+                render_registry,
+                center_lod: padded_chunk.center_lod(),
+                neighbor_lods: padded_chunk.neighbor_lods(),
+                chunk_size: padded_chunk.get_size(),
+                scale: (CHUNK_SIDE_LENGTH / padded_chunk.get_size()) as f32,
+            };
 
-    let size = ctx.chunk_size;
+            let transparency_lut = block_registry.get_transparency_lut();
+            let size = ctx.chunk_size;
 
-    for x in 0..size {
-        for z in 0..size {
-            for y in 0..size {
-                let pos = IVec3::new(x as i32, y as i32, z as i32);
-                let current_block_id = padded_chunk.get_block(pos.x, pos.y, pos.z);
+            for x in 0..size {
+                for z in 0..size {
+                    for y in 0..size {
+                        let pos = IVec3::new(x as i32, y as i32, z as i32);
+                        let current_block_id = padded_chunk.get_block(pos.x, pos.y, pos.z);
 
-                if current_block_id == AIR_BLOCK_ID {
-                    continue;
-                }
+                        if current_block_id == AIR_BLOCK_ID {
+                            continue;
+                        }
 
-                let is_current_transparent = transparency_lut[current_block_id as usize];
+                        let is_current_transparent = transparency_lut[current_block_id as usize];
 
-                let out_faces = if is_current_transparent {
-                    &mut transparent_faces
-                } else {
-                    &mut opaque_faces
-                };
+                        let out_faces = if is_current_transparent {
+                            &mut *transparent_faces
+                        } else {
+                            &mut *opaque_faces
+                        };
 
-                // iterate each face checking and generating face verts
-                for &face_side in &FaceSide::ALL {
-                    let face_i = face_side as usize;
-                    let offset = NEIGHBOR_OFFSETS[face_i];
-                    let neighbor_pos = pos + offset;
+                        // iterate each face checking and generating face verts
+                        for &face_side in &FaceSide::ALL {
+                            let face_i = face_side as usize;
+                            let offset = NEIGHBOR_OFFSETS[face_i];
+                            let neighbor_pos = pos + offset;
 
-                    let neighbor_id =
-                        padded_chunk.get_block(neighbor_pos.x, neighbor_pos.y, neighbor_pos.z);
+                            let neighbor_id = padded_chunk.get_block(
+                                neighbor_pos.x,
+                                neighbor_pos.y,
+                                neighbor_pos.z,
+                            );
 
-                    let is_neighbor_transparent = transparency_lut[neighbor_id as usize];
+                            let is_neighbor_transparent = transparency_lut[neighbor_id as usize];
 
-                    if should_render_face(
-                        current_block_id,
-                        is_current_transparent,
-                        neighbor_id,
-                        is_neighbor_transparent,
-                    ) {
-                        let tex_id = texture_lut[current_block_id as usize][face_i];
+                            if should_render_face(
+                                current_block_id,
+                                is_current_transparent,
+                                neighbor_id,
+                                is_neighbor_transparent,
+                            ) {
+                                let tex_id = texture_lut[current_block_id as usize][face_i];
 
-                        let ao = calculate_ao_levels_for_face(
-                            pos,
-                            face_side,
-                            padded_chunk,
-                            transparency_lut,
-                        );
+                                let ao = calculate_ao_levels_for_face(
+                                    pos,
+                                    face_side,
+                                    padded_chunk,
+                                    transparency_lut,
+                                );
 
-                        ctx.push_face(face_side, pos, tex_id, ao, out_faces);
+                                ctx.push_face(face_side, pos, tex_id, ao, out_faces);
+                            }
+                        }
                     }
                 }
             }
-        }
-    }
 
-    build_mesh_assets(name, opaque_faces, transparent_faces)
+            build_mesh_assets(name, &opaque_faces, &transparent_faces)
+        })
+    })
 }
diff --git a/crates/client/src/render/chunk/meshing/hull.rs b/crates/client/src/render/chunk/meshing/hull.rs
index f2834e91..1a1d55dc 100644
--- a/crates/client/src/render/chunk/meshing/hull.rs
+++ b/crates/client/src/render/chunk/meshing/hull.rs
@@ -1,6 +1,6 @@
 use super::{OpaqueMeshData, TransparentMeshData, common::*};
 use crate::prelude::*;
-use shared::simulation::{
+use shared::world::{
     block::{BlockRegistry, block_registry::BlockId},
     chunk::{CHUNK_SIDE_LENGTH, PaddedChunk},
 };
@@ -17,87 +17,100 @@ pub fn build_hull_mesh<R>(
     block_id: BlockId,
     texture_lut: &[[u32; 6]],
 ) -> (Option<OpaqueMeshData>, Option<TransparentMeshData>) {
-    let mut faces = Vec::with_capacity(4096);
+    let transparency_lut = block_registry.get_transparency_lut();
+    let is_trans = transparency_lut[block_id as usize];
 
-    let ctx = MesherContext {
-        padded_chunk,
-        block_registry,
-        render_registry,
-        center_lod: padded_chunk.center_lod(),
-        neighbor_lods: padded_chunk.neighbor_lods(),
-        chunk_size: padded_chunk.get_size(),
-        scale: CHUNK_SIDE_LENGTH as f32 / padded_chunk.get_size() as f32,
+    // use the appropriate thread-local buffer
+    let buffer_id = if is_trans {
+        &TRANSPARENT_FACE_BUFFER
+    } else {
+        &OPAQUE_FACE_BUFFER
     };
 
-    let transparency_lut = block_registry.get_transparency_lut();
+    buffer_id.with(|buffer_ref| {
+        let mut faces = buffer_ref.borrow_mut();
+        faces.clear();
 
-    let is_trans = transparency_lut[block_id as usize];
-    let size = ctx.chunk_size;
+        let ctx = MesherContext {
+            padded_chunk,
+            block_registry,
+            render_registry,
+            center_lod: padded_chunk.center_lod(),
+            neighbor_lods: padded_chunk.neighbor_lods(),
+            chunk_size: padded_chunk.get_size(),
+            scale: CHUNK_SIDE_LENGTH as f32 / padded_chunk.get_size() as f32,
+        };
 
-    // 3. OPTIMIZATION: Direct array index for texture ID (No matching/branching)
-    let tex_id = texture_lut[block_id as usize];
+        let size = ctx.chunk_size;
+        let tex_id = texture_lut[block_id as usize];
 
-    macro_rules! mesh_plane {
-        ($face_idx:expr, $u_range:expr, $v_range:expr, $pos_fn:expr) => {
-            let offset = NEIGHBOR_OFFSETS[$face_idx];
+        // a macro to iterate a face plane of the chunk cube
+        macro_rules! mesh_plane {
+            ($face_idx:expr, $u_range:expr, $v_range:expr, $pos_fn:expr) => {
+                let offset = NEIGHBOR_OFFSETS[$face_idx];
 
-            if !ctx
-                .padded_chunk
-                .is_neighbor_fully_opaque(offset, ctx.block_registry)
-            {
-                for u in $u_range {
-                    for v in $v_range {
-                        let pos = $pos_fn(u, v);
+                if !ctx
+                    .padded_chunk
+                    .is_neighbor_fully_opaque(offset, ctx.block_registry)
+                {
+                    for u in $u_range {
+                        for v in $v_range {
+                            let pos = $pos_fn(u, v);
 
-                        let neighbor_pos = pos + offset;
-                        let neighbor_id = ctx.padded_chunk.get_block(
-                            neighbor_pos.x,
-                            neighbor_pos.y,
-                            neighbor_pos.z,
-                        );
+                            let neighbor_pos = pos + offset;
+                            let neighbor_id = ctx.padded_chunk.get_block(
+                                neighbor_pos.x,
+                                neighbor_pos.y,
+                                neighbor_pos.z,
+                            );
 
-                        let is_neighbor_trans = transparency_lut[neighbor_id as usize];
+                            let is_neighbor_trans = transparency_lut[neighbor_id as usize];
 
-                        if should_render_face(block_id, is_trans, neighbor_id, is_neighbor_trans) {
-                            let ao = calculate_ao_levels_for_face(
-                                pos,
-                                FaceSide::ALL[$face_idx],
-                                ctx.padded_chunk,
-                                transparency_lut,
-                            );
+                            if should_render_face(
+                                block_id,
+                                is_trans,
+                                neighbor_id,
+                                is_neighbor_trans,
+                            ) {
+                                let ao = calculate_ao_levels_for_face(
+                                    pos,
+                                    FaceSide::ALL[$face_idx],
+                                    ctx.padded_chunk,
+                                    transparency_lut,
+                                );
 
-                            ctx.push_face(
-                                FaceSide::ALL[$face_idx],
-                                pos,
-                                tex_id[$face_idx],
-                                ao,
-                                &mut faces,
-                            );
+                                ctx.push_face(
+                                    FaceSide::ALL[$face_idx],
+                                    pos,
+                                    tex_id[$face_idx],
+                                    ao,
+                                    &mut faces,
+                                );
+                            }
                         }
                     }
                 }
-            }
-        };
-    }
+            };
+        }
 
-    #[rustfmt::skip]
-    mesh_plane!(0, 0..size, 0..size, |x, z| IVec3::new(x as i32, (size - 1) as i32, z as i32));
-    #[rustfmt::skip]
-    mesh_plane!(1, 0..size, 0..size, |x, z| IVec3::new(x as i32, 0, z as i32));
-    #[rustfmt::skip]
-    mesh_plane!(2, 0..size, 0..size, |y, z| IVec3::new(0, y as i32, z as i32));
-    #[rustfmt::skip]
-    mesh_plane!(3, 0..size, 0..size, |y, z| IVec3::new((size - 1) as i32, y as i32, z as i32));
-    #[rustfmt::skip]
-    mesh_plane!(4, 0..size, 0..size, |x, y| IVec3::new(x as i32, y as i32, (size - 1) as i32));
-    #[rustfmt::skip]
-    mesh_plane!(5, 0..size, 0..size, |x, y| IVec3::new(x as i32, y as i32, 0));
-
-    let (opaque_faces, transparent_faces) = if is_trans {
-        (Vec::new(), faces)
-    } else {
-        (faces, Vec::new())
-    };
+        // run macro for each face plane
+        #[rustfmt::skip]
+        mesh_plane!(0, 0..size, 0..size, |x, z| IVec3::new(x as i32, (size - 1) as i32, z as i32));
+        #[rustfmt::skip]
+        mesh_plane!(1, 0..size, 0..size, |x, z| IVec3::new(x as i32, 0, z as i32));
+        #[rustfmt::skip]
+        mesh_plane!(2, 0..size, 0..size, |y, z| IVec3::new(0, y as i32, z as i32));
+        #[rustfmt::skip]
+        mesh_plane!(3, 0..size, 0..size, |y, z| IVec3::new((size - 1) as i32, y as i32, z as i32));
+        #[rustfmt::skip]
+        mesh_plane!(4, 0..size, 0..size, |x, y| IVec3::new(x as i32, y as i32, (size - 1) as i32));
+        #[rustfmt::skip]
+        mesh_plane!(5, 0..size, 0..size, |x, y| IVec3::new(x as i32, y as i32, 0));
 
-    build_mesh_assets(name, opaque_faces, transparent_faces)
+        if is_trans {
+            build_mesh_assets(name, &[], &faces)
+        } else {
+            build_mesh_assets(name, &faces, &[])
+        }
+    })
 }
diff --git a/crates/client/src/render/chunk/meshing/mod.rs b/crates/client/src/render/chunk/meshing/mod.rs
index a52b288e..63c231ef 100644
--- a/crates/client/src/render/chunk/meshing/mod.rs
+++ b/crates/client/src/render/chunk/meshing/mod.rs
@@ -3,13 +3,15 @@ pub mod dense;
 pub mod hull;
 pub mod packed_face;
 
+pub use packed_face::PackedFace;
+
 // INFO: --------------------------------
 //         public mesh entrypoint
 // --------------------------------------
 
 use crate::prelude::*;
-use crate::render::chunk::asset::VoxelMeshAsset;
-use shared::simulation::{
+use crate::render::chunk::asset::BlockMeshAsset;
+use shared::world::{
     block::{
         BlockRegistry,
         block_registry::{AIR_BLOCK_ID, BlockId},
@@ -18,8 +20,8 @@ use shared::simulation::{
 };
 
 // convenience mesh types
-pub type OpaqueMeshData = VoxelMeshAsset;
-pub type TransparentMeshData = VoxelMeshAsset;
+pub type OpaqueMeshData = BlockMeshAsset;
+pub type TransparentMeshData = BlockMeshAsset;
 
 /// Main chunk meshing entry point: Build a mesh for a single chunk.
 #[instrument(skip_all, fields(chunk = %name))]
diff --git a/crates/client/src/render/chunk/meshing/packed_face.rs b/crates/client/src/render/chunk/meshing/packed_face.rs
index 4370e1c5..6a8d6036 100644
--- a/crates/client/src/render/chunk/meshing/packed_face.rs
+++ b/crates/client/src/render/chunk/meshing/packed_face.rs
@@ -1,7 +1,7 @@
 use crate::render::chunk::meshing::common::{AoLevel, FaceSide};
 use bevy::reflect::Reflect;
 
-/// A struct representing a single voxel face in the world
+/// A struct representing a single block face in the world
 #[repr(transparent)]
 #[derive(
     Debug,
diff --git a/crates/client/src/render/chunk/mod.rs b/crates/client/src/render/chunk/mod.rs
index ca2a6846..7edc6e35 100644
--- a/crates/client/src/render/chunk/mod.rs
+++ b/crates/client/src/render/chunk/mod.rs
@@ -1,25 +1,39 @@
 pub mod asset;
 pub mod components;
+pub mod manager;
 pub mod meshing;
 pub mod tasks;
 
-pub use asset::VoxelMeshAsset;
+pub use asset::BlockMeshAsset;
 pub use components::{OpaqueMeshComponent, TransparentMeshComponent};
-pub use shared::simulation::chunk::ChunkMeshDirty;
-
-use crate::prelude::*;
-use bevy::app::{App, FixedUpdate, Plugin, PreUpdate};
-use bevy::asset::AssetApp;
-use bevy::ecs::prelude::*;
-use bevy::prelude::{Camera, Camera3d};
-use shared::simulation::chunk::{ChunkCoord, ChunkStateManager};
-use shared::simulation::scheduling::FixedUpdateSet;
+pub use manager::{ClientChunkManager, ClientChunkState};
+pub use shared::world::chunk::ChunkMeshDirty;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::render::chunk::tasks::{
+    apply_decompressed_chunk_data_system, decompress_chunk_data_system,
+    decompression::DecompressedChunkMessage, manage_distance_based_chunk_meshing_targets_system,
+    poll_decompression_tasks_system, promote_newly_generated_chunks_system,
+};
+use bevy::{
+    app::{App, FixedUpdate, Plugin, PreUpdate, Update},
+    asset::AssetApp,
+    ecs::prelude::*,
+    prelude::{Camera, Camera3d},
+};
+use shared::{FixedUpdateSet, world::chunk::ChunkCoord};
 
 pub struct ChunkMeshingPlugin;
 
 impl Plugin for ChunkMeshingPlugin {
     fn build(&self, app: &mut App) {
-        app.init_asset::<VoxelMeshAsset>();
+        app.init_asset::<BlockMeshAsset>();
+        app.init_resource::<ClientChunkManager>();
+
+        app.add_message::<DecompressedChunkMessage>();
 
         app.add_systems(
             PreUpdate,
@@ -32,128 +46,23 @@ impl Plugin for ChunkMeshingPlugin {
 
         app.add_systems(PreUpdate, promote_newly_generated_chunks_system);
 
+        app.add_systems(
+            Update,
+            (
+                decompress_chunk_data_system,
+                poll_decompression_tasks_system,
+            ),
+        );
+
         app.add_systems(
             FixedUpdate,
             (
-                tasks::meshgen::start_meshing::handle_dirty_chunks_system,
-                tasks::meshgen::systems::start_pending_meshing_tasks_system,
-                tasks::meshgen::systems::poll_chunk_meshing_tasks,
+                apply_decompressed_chunk_data_system,
+                tasks::start_meshing::handle_dirty_chunks_system,
+                tasks::systems::start_pending_meshing_tasks_system,
+                tasks::systems::poll_chunk_meshing_tasks,
             )
                 .in_set(FixedUpdateSet::MainLogic),
         );
     }
 }
-
-/// A system that watches for newly generated chunks and promotes them to meshing if in range.
-pub fn promote_newly_generated_chunks_system(
-    // input
-    new_data_query: Query<
-        (
-            Entity,
-            &shared::simulation::chunk::ChunkBlocksComponent,
-            &ChunkCoord,
-        ),
-        Added<shared::simulation::chunk::ChunkBlocksComponent>,
-    >,
-    camera_query: Query<(&Camera, &ChunkCoord), With<Camera3d>>,
-
-    // output
-    mut chunk_manager: ResMut<ChunkStateManager>,
-    mut commands: Commands,
-) {
-    let mut active_camera_chunk_pos = None;
-    for (camera, chunk_coord) in camera_query.iter() {
-        if camera.is_active {
-            active_camera_chunk_pos = Some(chunk_coord.pos);
-            break;
-        }
-    }
-
-    let Some(camera_chunk_pos) = active_camera_chunk_pos else {
-        return;
-    };
-
-    use shared::simulation::chunk::{
-        ChunkState, RENDER_DISTANCE, WORLD_MAX_Y_CHUNK, WORLD_MIN_Y_CHUNK,
-    };
-    use tasks::meshgen::{CheckForMeshing, WantsMeshing};
-
-    for (entity, _, coord) in new_data_query.iter() {
-        let dx = coord.pos.x - camera_chunk_pos.x;
-        let dy = coord.pos.y;
-        let dz = coord.pos.z - camera_chunk_pos.z;
-
-        let is_in_range = dx.abs() <= RENDER_DISTANCE
-            && (WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK).contains(&dy)
-            && dz.abs() <= RENDER_DISTANCE;
-
-        if is_in_range {
-            trace!(target: "chunk_loading", "Newly generated chunk at {} is in range, promoting to WantsMeshing", coord.pos);
-            commands
-                .entity(entity)
-                .insert((WantsMeshing, CheckForMeshing));
-            chunk_manager.mark_as_needs_meshing(coord.pos, entity);
-        } else {
-            chunk_manager.mark_as_data_ready(coord.pos, entity);
-        }
-
-        // notify neighbors
-        for neighbor in chunk_manager.iter_neighbors(coord.pos) {
-            if let ChunkState::WantsMeshing { .. } = neighbor.state {
-                commands.entity(neighbor.entity).insert(CheckForMeshing);
-            }
-        }
-    }
-}
-
-/// Determines chunks to promote to meshing based on the camera position and render distance.
-#[instrument(skip_all)]
-pub fn manage_distance_based_chunk_meshing_targets_system(
-    // Input
-    camera_query: Query<(&Camera, &ChunkCoord), With<Camera3d>>,
-
-    // Output
-    mut chunk_manager: ResMut<ChunkStateManager>,
-    mut commands: Commands,
-) {
-    let mut active_camera_chunk_pos = None;
-    for (camera, chunk_coord) in camera_query.iter() {
-        if camera.is_active {
-            active_camera_chunk_pos = Some(chunk_coord.pos);
-            break;
-        }
-    }
-
-    let Some(camera_chunk_pos) = active_camera_chunk_pos else {
-        return;
-    };
-
-    use crate::render::chunk::tasks::meshgen::{CheckForMeshing, WantsMeshing};
-    use shared::simulation::chunk::{
-        ChunkState, RENDER_DISTANCE, WORLD_MAX_Y_CHUNK, WORLD_MIN_Y_CHUNK,
-    };
-    use std::collections::HashSet;
-
-    let mut desired_mesh_chunks = HashSet::new();
-
-    for y in WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK {
-        for z in -RENDER_DISTANCE..=RENDER_DISTANCE {
-            for x in -RENDER_DISTANCE..=RENDER_DISTANCE {
-                let coord = IVec3::new(camera_chunk_pos.x + x, y, camera_chunk_pos.z + z);
-                desired_mesh_chunks.insert(coord);
-            }
-        }
-    }
-
-    for (coord, state) in chunk_manager.chunk_states.iter_mut() {
-        if desired_mesh_chunks.contains(coord)
-            && let ChunkState::DataReady { entity } = state
-        {
-            debug!(target:"chunk_meshing", "Promoting chunk {:?} to WantsMeshing", coord);
-            commands
-                .entity(*entity)
-                .insert((WantsMeshing, CheckForMeshing));
-            *state = ChunkState::WantsMeshing { entity: *entity };
-        }
-    }
-}
diff --git a/crates/client/src/render/chunk/tasks/meshgen/components.rs b/crates/client/src/render/chunk/tasks/components.rs
similarity index 73%
rename from crates/client/src/render/chunk/tasks/meshgen/components.rs
rename to crates/client/src/render/chunk/tasks/components.rs
index bdeb40f4..15f73c72 100644
--- a/crates/client/src/render/chunk/tasks/meshgen/components.rs
+++ b/crates/client/src/render/chunk/tasks/components.rs
@@ -1,6 +1,8 @@
 use crate::render::chunk::meshing::{OpaqueMeshData, TransparentMeshData};
 use bevy::ecs::prelude::Component;
+use bevy::tasks::Task;
 use crossbeam::channel::Receiver;
+use shared::world::chunk::ChunkCoord;
 
 /// Marks a chunk meshing task in the simulation world that returns a MeshComponent.
 #[derive(Component)]
@@ -8,8 +10,12 @@ pub struct ChunkMeshingTaskComponent {
     pub receiver: Receiver<(Option<OpaqueMeshData>, Option<TransparentMeshData>)>,
 }
 
-/// A signal marking that chunks should be checked for meshing. This check is a necessary
-/// optimization as chunks require all neighbors to be generated before they mesh.
+/// Marks a chunk decompression task.
+#[derive(Component)]
+pub struct DecompressionTask(pub Task<(ChunkCoord, Vec<u8>)>);
+
+/// A signal marking that chunks should be checked for meshing. This check is necessary
+/// as chunks require all neighbors to be generated before they mesh.
 #[derive(Component)]
 pub struct CheckForMeshing;
 
diff --git a/crates/client/src/render/chunk/tasks/decompression.rs b/crates/client/src/render/chunk/tasks/decompression.rs
new file mode 100644
index 00000000..76d32783
--- /dev/null
+++ b/crates/client/src/render/chunk/tasks/decompression.rs
@@ -0,0 +1,89 @@
+use crate::{
+    network::InboundCompressedChunkMessage,
+    render::{
+        chunk::manager::{ClientChunkManager, ClientChunkState},
+        chunk::tasks::components::DecompressionTask,
+    },
+};
+use bevy::{prelude::*, tasks::AsyncComputeTaskPool};
+use futures_lite::future;
+use shared::world::chunk::{ChunkBlocksComponent, ChunkCoord, ChunkLod};
+
+#[derive(Message)]
+pub struct DecompressedChunkMessage {
+    pub coord: ChunkCoord,
+    pub data: Vec<u8>,
+}
+
+pub fn decompress_chunk_data_system(
+    mut commands: Commands,
+    mut ev_compressed: MessageReader<InboundCompressedChunkMessage>,
+) {
+    let thread_pool = AsyncComputeTaskPool::get();
+
+    for event in ev_compressed.read() {
+        let coord = event.coord.clone();
+        let data = event.data.clone();
+
+        let task = thread_pool.spawn(async move {
+            match zstd::decode_all(&data[..]) {
+                Ok(decompressed) => (coord, decompressed),
+                Err(e) => {
+                    error!("Failed to decompress chunk data for {:?}: {}", coord, e);
+                    (coord, Vec::new())
+                }
+            }
+        });
+
+        commands.spawn(DecompressionTask(task));
+    }
+}
+
+pub fn poll_decompression_tasks_system(
+    mut commands: Commands,
+    mut tasks: Query<(Entity, &mut DecompressionTask)>,
+    mut ev_decompressed: MessageWriter<DecompressedChunkMessage>,
+) {
+    for (entity, mut task) in tasks.iter_mut() {
+        if let Some((coord, data)) = future::block_on(future::poll_once(&mut task.0)) {
+            if !data.is_empty() {
+                ev_decompressed.write(DecompressedChunkMessage { coord, data });
+            }
+            commands.entity(entity).despawn();
+        }
+    }
+}
+
+pub fn apply_decompressed_chunk_data_system(
+    mut ev_chunk: MessageReader<DecompressedChunkMessage>,
+    mut chunk_manager: ResMut<ClientChunkManager>,
+    mut commands: Commands,
+) {
+    for event in ev_chunk.read() {
+        let coord = event.coord.pos;
+        let data = &event.data;
+
+        let state = chunk_manager.get_state(coord);
+        match state {
+            Some(ClientChunkState::AwaitingData) => {
+                trace!(target: "client_network", "Applying decompressed chunk data for {:?}", coord);
+
+                let blocks = ChunkBlocksComponent::from_vec(ChunkLod(0), data.clone());
+
+                // spawn the entity now that we have data
+                let entity = commands.spawn((ChunkCoord { pos: coord }, blocks)).id();
+
+                chunk_manager.mark_as_data_ready(coord, entity);
+            }
+            Some(_) => {
+                debug!(
+                    "Received chunk data for chunk at {:?} but it's already in state {:?}",
+                    coord, state
+                );
+            }
+            None => {
+                warn!("Received chunk data for untracked chunk at {:?}", coord);
+            }
+        }
+    }
+}
diff --git a/crates/client/src/render/chunk/tasks/meshgen/mod.rs b/crates/client/src/render/chunk/tasks/meshgen/mod.rs
deleted file mode 100644
index e6e8eb5b..00000000
--- a/crates/client/src/render/chunk/tasks/meshgen/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod components;
-pub mod start_meshing;
-pub mod systems;
-
-pub use components::{CheckForMeshing, ChunkMeshingTaskComponent, WantsMeshing};
-pub use start_meshing::handle_dirty_chunks_system;
-pub use systems::{poll_chunk_meshing_tasks, start_pending_meshing_tasks_system};
diff --git a/crates/client/src/render/chunk/tasks/mod.rs b/crates/client/src/render/chunk/tasks/mod.rs
index eb38bd6e..1c45aafa 100644
--- a/crates/client/src/render/chunk/tasks/mod.rs
+++ b/crates/client/src/render/chunk/tasks/mod.rs
@@ -1 +1,15 @@
-pub mod meshgen;
+pub mod components;
+pub mod decompression;
+pub mod start_meshing;
+pub mod systems;
+
+pub use components::{CheckForMeshing, ChunkMeshingTaskComponent, DecompressionTask, WantsMeshing};
+pub use decompression::{
+    apply_decompressed_chunk_data_system, decompress_chunk_data_system,
+    poll_decompression_tasks_system,
+};
+pub use start_meshing::handle_dirty_chunks_system;
+pub use systems::{
+    manage_distance_based_chunk_meshing_targets_system, poll_chunk_meshing_tasks,
+    promote_newly_generated_chunks_system, start_pending_meshing_tasks_system,
+};
diff --git a/crates/client/src/render/chunk/tasks/meshgen/start_meshing.rs b/crates/client/src/render/chunk/tasks/start_meshing.rs
similarity index 75%
rename from crates/client/src/render/chunk/tasks/meshgen/start_meshing.rs
rename to crates/client/src/render/chunk/tasks/start_meshing.rs
index 2f4d9b1e..aa1a3dce 100644
--- a/crates/client/src/render/chunk/tasks/meshgen/start_meshing.rs
+++ b/crates/client/src/render/chunk/tasks/start_meshing.rs
@@ -1,7 +1,8 @@
 use crate::prelude::*;
-use crate::render::chunk::tasks::meshgen::{CheckForMeshing, WantsMeshing};
+use crate::render::chunk::manager::ClientChunkManager;
+use crate::render::chunk::tasks::{CheckForMeshing, WantsMeshing};
 use bevy::ecs::prelude::*;
-use shared::simulation::chunk::{ChunkCoord, ChunkMeshDirty, ChunkStateManager};
+use shared::world::chunk::{ChunkCoord, ChunkMeshDirty};
 
 /// A system that detects chunks marked as dirty and prepares them for re-meshing.
 pub fn handle_dirty_chunks_system(
@@ -10,7 +11,7 @@ pub fn handle_dirty_chunks_system(
 
     // output
     mut commands: Commands,
-    mut chunk_manager: ResMut<ChunkStateManager>,
+    mut chunk_manager: ResMut<ClientChunkManager>,
 ) {
     for (entity, coord) in dirty_chunks_query.iter() {
         trace!(
diff --git a/crates/client/src/render/chunk/tasks/meshgen/systems.rs b/crates/client/src/render/chunk/tasks/systems.rs
similarity index 70%
rename from crates/client/src/render/chunk/tasks/meshgen/systems.rs
rename to crates/client/src/render/chunk/tasks/systems.rs
index 0c288852..c1bc73b0 100644
--- a/crates/client/src/render/chunk/tasks/meshgen/systems.rs
+++ b/crates/client/src/render/chunk/tasks/systems.rs
@@ -1,20 +1,20 @@
 use crate::prelude::*;
-use crate::render::block::BlockRenderDataRegistry;
-use crate::render::chunk::{
-    OpaqueMeshComponent, TransparentMeshComponent, VoxelMeshAsset,
-    meshing::build_chunk_mesh,
-    tasks::meshgen::{CheckForMeshing, WantsMeshing, components::ChunkMeshingTaskComponent},
+use crate::render::{
+    block::BlockRenderDataRegistry,
+    chunk::{
+        BlockMeshAsset, ClientChunkManager, ClientChunkState, OpaqueMeshComponent,
+        TransparentMeshComponent,
+        meshing::build_chunk_mesh,
+        tasks::{CheckForMeshing, WantsMeshing, components::ChunkMeshingTaskComponent},
+    },
 };
-use bevy::asset::Assets;
-use bevy::ecs::prelude::*;
-use bevy::tasks::AsyncComputeTaskPool;
+use bevy::{asset::Assets, ecs::prelude::*, prelude::*, tasks::AsyncComputeTaskPool};
 use crossbeam::channel::{TryRecvError, unbounded};
-use shared::simulation::chunk::TransformComponent;
-use shared::simulation::{
+use shared::world::{
     block::BlockRegistry,
     chunk::{
-        CHUNK_SIDE_LENGTH, ChunkBlocksComponent, ChunkCoord, ChunkState, ChunkStateManager,
-        chunk_state_manager::NEIGHBOR_OFFSETS,
+        CHUNK_SIDE_LENGTH, ChunkBlocksComponent, ChunkCoord, NEIGHBOR_OFFSETS, RENDER_DISTANCE,
+        WORLD_MAX_Y_CHUNK, WORLD_MIN_Y_CHUNK,
         common::{
             chunk_scaling::{downsample_chunk, upsample_chunk},
             padded_chunk_view::{ChunkDataOption, NeighborLODs, PaddedChunk},
@@ -22,6 +22,13 @@ use shared::simulation::{
         },
     },
 };
+use std::collections::HashSet;
+
+/// Determines if a coord is in bounds
+pub fn is_in_bounds(coord: IVec3) -> bool {
+    let pos_y = coord.y;
+    (WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK).contains(&pos_y)
+}
 
 /// Queries for chunks needing meshing and starts a limited number of tasks per frame.
 #[instrument(skip_all)]
@@ -39,14 +46,14 @@ pub fn start_pending_meshing_tasks_system(
 
     // Resources needed to start meshing
     mut commands: Commands,
-    mut chunk_manager: ResMut<ChunkStateManager>,
+    mut chunk_manager: ResMut<ClientChunkManager>,
     block_registry: Res<BlockRegistry>,
     render_registry: Res<BlockRenderDataRegistry>,
 ) {
     'chunk_loop: for (entity, chunk_comp, chunk_coord) in pending_chunks_query.iter_mut() {
         // check for cancellation
         match chunk_manager.get_state(chunk_coord.pos) {
-            Some(ChunkState::WantsMeshing {
+            Some(ClientChunkState::NeedsMeshing {
                 entity: state_entity,
             }) if state_entity == entity => {
                 // state is correct, proceed to start meshing
@@ -74,14 +81,11 @@ pub fn start_pending_meshing_tasks_system(
         let get_neighbor = |offset: IVec3| -> NeighborStatus {
             let neighbor_coord = chunk_coord.pos + offset;
 
-            if !ChunkStateManager::is_in_bounds(neighbor_coord) {
+            if !is_in_bounds(neighbor_coord) {
                 return NeighborStatus::Ready(ChunkDataOption::OutOfBounds);
             }
 
             match chunk_manager.get_state(neighbor_coord) {
-                Some(ChunkState::Loaded { entity: None }) => {
-                    NeighborStatus::Ready(ChunkDataOption::Empty)
-                }
                 Some(state) if state.is_generated() => {
                     let entity = state.entity().expect("Expected entity for generated chunk");
                     match all_generated_chunks.get(entity) {
@@ -206,8 +210,8 @@ pub fn poll_chunk_meshing_tasks(
 
     // output
     mut commands: Commands,
-    mut chunk_manager: ResMut<ChunkStateManager>,
-    mut mesh_assets: ResMut<Assets<VoxelMeshAsset>>,
+    mut chunk_manager: ResMut<ClientChunkManager>,
+    mut mesh_assets: ResMut<Assets<BlockMeshAsset>>,
 ) {
     // poll all mesh task
     for (entity, meshing_task_component, coord) in tasks_query.iter_mut() {
@@ -217,8 +221,8 @@ pub fn poll_chunk_meshing_tasks(
 
                 match current_state {
                     Some(
-                        ChunkState::Meshing { entity: gen_entity }
-                        | ChunkState::WantsMeshing { entity: gen_entity },
+                        ClientChunkState::Meshing { entity: gen_entity }
+                        | ClientChunkState::NeedsMeshing { entity: gen_entity },
                     ) if gen_entity == entity => {
                         trace!(target : "chunk_loading","Chunk meshing finished for {:?}", coord);
 
@@ -262,29 +266,29 @@ pub fn poll_chunk_meshing_tasks(
                                 commands.entity(entity).insert(transparent_mesh);
                             }
                             (None, None) => {
+                                // chunk has no visual meshes, still need to mark it as mesh complete
                                 commands
                                     .entity(entity)
                                     .remove::<ChunkMeshingTaskComponent>();
-                                chunk_manager.mark_as_loaded(coord.pos, entity);
-                                continue; // continue to avoid adding transform component
+                                chunk_manager.mark_as_mesh_complete(coord.pos, entity);
+                                continue; // continue to prevent transform from being added
                             }
                         }
 
                         // insert to world
                         commands
                             .entity(entity)
-                            .insert(TransformComponent {
-                                position: Vec3::new(
+                            .insert((
+                                Transform::from_translation(Vec3::new(
                                     (coord.x * CHUNK_SIDE_LENGTH as i32) as f32,
                                     (coord.y * CHUNK_SIDE_LENGTH as i32) as f32,
                                     (coord.z * CHUNK_SIDE_LENGTH as i32) as f32,
-                                ),
-                                rotation: Quat::IDENTITY,
-                                scale: Vec3::ONE,
-                            })
+                                )),
+                                Visibility::default(),
+                            ))
                             .remove::<ChunkMeshingTaskComponent>();
 
-                        chunk_manager.mark_as_loaded(coord.pos, entity);
+                        chunk_manager.mark_as_mesh_complete(coord.pos, entity);
                     }
                     Some(_) => {
                         error!(
@@ -328,3 +332,104 @@ pub fn poll_chunk_meshing_tasks(
         }
     }
 }
+
+/// A system that watches for newly generated chunks and promotes them to meshing if in range.
+pub fn promote_newly_generated_chunks_system(
+    // input
+    new_data_query: Query<
+        (Entity, &ChunkBlocksComponent, &ChunkCoord),
+        Added<ChunkBlocksComponent>,
+    >,
+    camera_query: Query<(&Camera, &ChunkCoord), With<Camera3d>>,
+
+    // output
+    mut chunk_manager: ResMut<ClientChunkManager>,
+    mut commands: Commands,
+) {
+    let mut active_camera_chunk_pos = None;
+    for (camera, chunk_coord) in camera_query.iter() {
+        if camera.is_active {
+            active_camera_chunk_pos = Some(chunk_coord.pos);
+            break;
+        }
+    }
+
+    let Some(camera_chunk_pos) = active_camera_chunk_pos else {
+        return;
+    };
+
+    for (entity, _, coord) in new_data_query.iter() {
+        let dx = coord.pos.x - camera_chunk_pos.x;
+        let dy = coord.pos.y;
+        let dz = coord.pos.z - camera_chunk_pos.z;
+
+        let is_in_range = dx.abs() <= RENDER_DISTANCE
+            && (WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK).contains(&dy)
+            && dz.abs() <= RENDER_DISTANCE;
+
+        if is_in_range {
+            trace!(target: "chunk_loading", "Newly generated chunk at {} is in range, promoting to WantsMeshing", coord.pos);
+            commands
+                .entity(entity)
+                .insert((WantsMeshing, CheckForMeshing));
+            chunk_manager.mark_as_needs_meshing(coord.pos, entity);
+        } else {
+            chunk_manager.mark_as_data_ready(coord.pos, entity);
+        }
+
+        // notify neighbors that they might need to re-mesh now that we have data
+        for neighbor in chunk_manager.iter_neighbors(coord.pos) {
+            if let ClientChunkState::NeedsMeshing { .. } | ClientChunkState::MeshComplete { .. } =
+                neighbor.state
+            {
+                commands.entity(neighbor.entity).insert(CheckForMeshing);
+            }
+        }
+    }
+}
+
+/// Determines chunks to promote to meshing based on the camera position and render distance.
+#[instrument(skip_all)]
+pub fn manage_distance_based_chunk_meshing_targets_system(
+    // input
+    camera_query: Query<(&Camera, &ChunkCoord), With<Camera3d>>,
+
+    // output
+    mut chunk_manager: ResMut<ClientChunkManager>,
+    mut commands: Commands,
+) {
+    let mut active_camera_chunk_pos = None;
+    for (camera, chunk_coord) in camera_query.iter() {
+        if camera.is_active {
+            active_camera_chunk_pos = Some(chunk_coord.pos);
+            break;
+        }
+    }
+
+    let Some(camera_chunk_pos) = active_camera_chunk_pos else {
+        return;
+    };
+
+    let mut desired_mesh_chunks = HashSet::new();
+
+    for y in WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK {
+        for z in -RENDER_DISTANCE..=RENDER_DISTANCE {
+            for x in -RENDER_DISTANCE..=RENDER_DISTANCE {
+                let coord = IVec3::new(camera_chunk_pos.x + x, y, camera_chunk_pos.z + z);
+                desired_mesh_chunks.insert(coord);
+            }
+        }
+    }
+
+    for (coord, state) in chunk_manager.chunk_states.iter_mut() {
+        if desired_mesh_chunks.contains(coord)
+            && let ClientChunkState::DataReady { entity } = state
+        {
+            debug!(target:"chunk_meshing", "Promoting chunk {:?} to WantsMeshing", coord);
+            commands
+                .entity(*entity)
+                .insert((WantsMeshing, CheckForMeshing));
+            *state = ClientChunkState::NeedsMeshing { entity: *entity };
+        }
+    }
+}
diff --git a/crates/client/src/render/data/voxel_meshes.rs b/crates/client/src/render/data/block_meshes.rs
similarity index 52%
rename from crates/client/src/render/data/voxel_meshes.rs
rename to crates/client/src/render/data/block_meshes.rs
index 618d25cb..842494a2 100644
--- a/crates/client/src/render/data/voxel_meshes.rs
+++ b/crates/client/src/render/data/block_meshes.rs
@@ -1,5 +1,8 @@
-use crate::render::chunk::{OpaqueMeshComponent, TransparentMeshComponent, VoxelMeshAsset};
-use crate::{prelude::*, render::types::VoxelMesh};
+use crate::{
+    prelude::*,
+    render::chunk::{BlockMeshAsset, OpaqueMeshComponent, TransparentMeshComponent},
+    render::resources::world_uniforms::BlockMesh,
+};
 use bevy::{
     asset::{AssetEvent, AssetId, Assets},
     ecs::{
@@ -8,36 +11,36 @@ use bevy::{
     },
     platform::collections::HashMap,
     render::Extract,
+    transform::components::Transform,
 };
-use shared::simulation::chunk::TransformComponent;
 
 #[derive(Resource, Default)]
 pub struct RenderMeshStorageResource {
-    pub meshes: HashMap<AssetId<VoxelMeshAsset>, Arc<VoxelMesh>>,
+    pub meshes: HashMap<AssetId<BlockMeshAsset>, Arc<BlockMesh>>,
 }
 
 #[derive(Resource, Default)]
 pub struct MeshesToUploadQueue {
-    pub queue: Vec<(AssetId<VoxelMeshAsset>, VoxelMeshAsset, Vec3)>,
-    pub removals: Vec<AssetId<VoxelMeshAsset>>,
+    pub additions: Vec<(AssetId<BlockMeshAsset>, BlockMeshAsset, Vec3)>,
+    pub removals: Vec<AssetId<BlockMeshAsset>>,
 }
 
-/// A system that extracts `VoxelMeshAsset` modifications from the simulation world
+/// A system that extracts `BlockMeshAsset` modifications from the simulation world
 /// and queues them for GPU upload in the render world.
 #[instrument(skip_all)]
-pub fn extract_modified_voxel_meshes(
+pub fn extract_modified_block_meshes(
     // input
-    mut events: Extract<MessageReader<AssetEvent<VoxelMeshAsset>>>,
-    assets: Extract<Res<Assets<VoxelMeshAsset>>>,
+    mut events: Extract<MessageReader<AssetEvent<BlockMeshAsset>>>,
+    assets: Extract<Res<Assets<BlockMeshAsset>>>,
     opaque_meshes: Extract<
         Query<
-            (&OpaqueMeshComponent, &TransformComponent),
+            (&OpaqueMeshComponent, &Transform),
             Or<(Added<OpaqueMeshComponent>, Changed<OpaqueMeshComponent>)>,
         >,
     >,
     transparent_meshes: Extract<
         Query<
-            (&TransparentMeshComponent, &TransformComponent),
+            (&TransparentMeshComponent, &Transform),
             Or<(
                 Added<TransparentMeshComponent>,
                 Changed<TransparentMeshComponent>,
@@ -47,24 +50,28 @@ pub fn extract_modified_voxel_meshes(
     // output
     mut upload_queue: ResMut<MeshesToUploadQueue>,
 ) {
-    // 1. Process mesh additions and modifications via component change detection
+    // process mesh additions and modifications via component change detection
     for (mesh, transform) in opaque_meshes.iter() {
         if let Some(asset) = assets.get(&mesh.mesh_handle) {
-            upload_queue
-                .queue
-                .push((mesh.mesh_handle.id(), asset.clone(), transform.position));
+            upload_queue.additions.push((
+                mesh.mesh_handle.id(),
+                asset.clone(),
+                transform.translation,
+            ));
         }
     }
 
     for (mesh, transform) in transparent_meshes.iter() {
         if let Some(asset) = assets.get(&mesh.mesh_handle) {
-            upload_queue
-                .queue
-                .push((mesh.mesh_handle.id(), asset.clone(), transform.position));
+            upload_queue.additions.push((
+                mesh.mesh_handle.id(),
+                asset.clone(),
+                transform.translation,
+            ));
         }
     }
 
-    // 2. Process events strictly for asset removals
+    // process events for asset removals
     for event in events.read() {
         if let AssetEvent::Removed { id } = event {
             upload_queue.removals.push(*id);
diff --git a/crates/client/src/render/data/camera_phases.rs b/crates/client/src/render/data/camera_phases.rs
index 5d0d72ad..49447014 100644
--- a/crates/client/src/render/data/camera_phases.rs
+++ b/crates/client/src/render/data/camera_phases.rs
@@ -1,6 +1,6 @@
-use crate::render::pipeline::main_passes::{
-    bounding_box_pass::queue::BoundingBoxPhase, opaque_pass::queue::Opaque3dRenderPhase,
-    transparent_pass::queue::Transparent3dRenderPhase,
+use crate::render::passes::{
+    bounding_box::queue::BoundingBoxPhase, opaque::queue::Opaque3dRenderPhase,
+    transparent::queue::Transparent3dRenderPhase,
 };
 use bevy::prelude::*;
 use bevy::render::Extract;
diff --git a/crates/client/src/render/data/mod.rs b/crates/client/src/render/data/mod.rs
index e296aff3..61decc44 100644
--- a/crates/client/src/render/data/mod.rs
+++ b/crates/client/src/render/data/mod.rs
@@ -1,19 +1,19 @@
+pub mod block_meshes;
 pub mod camera_phases;
 pub mod sun;
 pub mod time;
-pub mod voxel_meshes;
 
+pub use block_meshes::{MeshesToUploadQueue, RenderMeshStorageResource};
 pub use sun::ExtractedSun;
 pub use time::RenderTimeResource;
-pub use voxel_meshes::{MeshesToUploadQueue, RenderMeshStorageResource};
 
 // INFO: ---------------------------
 //         plugin definition
 // ---------------------------------
 
 use bevy::prelude::{App, ExtractSchedule, Plugin};
+use block_meshes::extract_modified_block_meshes;
 use camera_phases::extract_custom_camera_phases_system;
-use voxel_meshes::extract_modified_voxel_meshes;
 
 /// A plugin that manages the extraction of simulation-level data to the render world.
 pub struct SimulationExtractionPlugin;
@@ -23,7 +23,7 @@ impl Plugin for SimulationExtractionPlugin {
         app.add_systems(
             ExtractSchedule,
             (
-                extract_modified_voxel_meshes,
+                extract_modified_block_meshes,
                 extract_custom_camera_phases_system,
             ),
         );
diff --git a/crates/client/src/render/data/sun.rs b/crates/client/src/render/data/sun.rs
index 75ac7900..94dc9092 100644
--- a/crates/client/src/render/data/sun.rs
+++ b/crates/client/src/render/data/sun.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;
 use bevy::ecs::prelude::Resource;
 use bevy::render::extract_resource::ExtractResource;
-use shared::simulation::time::world_clock::WorldClockResource;
+use shared::time::WorldClockResource;
 
 /// Controls where the sun/sky starts LERPing to the horizon
 const SUN_HEIGHT_DAY: f32 = 0.2;
diff --git a/crates/client/src/render/data/time.rs b/crates/client/src/render/data/time.rs
index c2b3bbcf..6d007067 100644
--- a/crates/client/src/render/data/time.rs
+++ b/crates/client/src/render/data/time.rs
@@ -1,6 +1,6 @@
 use bevy::ecs::prelude::Resource;
 use bevy::render::extract_resource::ExtractResource;
-use shared::simulation::time::FrameClock;
+use shared::time::FrameClock;
 
 #[derive(Resource, Debug, Default, Clone)]
 pub struct RenderTimeResource {
diff --git a/crates/client/src/render/mod.rs b/crates/client/src/render/mod.rs
index 7a8c4530..e5b3d019 100644
--- a/crates/client/src/render/mod.rs
+++ b/crates/client/src/render/mod.rs
@@ -1,27 +1,29 @@
 pub mod block;
 pub mod chunk;
 pub mod data;
-pub mod pipeline;
+pub mod passes;
+pub mod resources;
 pub mod scheduling;
+pub mod shaders;
 pub mod texture;
 pub mod types;
 
 pub use data::*;
+pub use scheduling::VantablockNode;
 
 // INFO: --------------------------------
 //         render world interface
 // --------------------------------------
 
+use crate::input::systems::toggle_chunk_borders::ChunkBoundsToggle;
+use crate::input::systems::toggle_opaque_wireframe::OpaqueRenderMode;
+use crate::player::TargetedBlock;
 use crate::prelude::*;
 use crate::render::{
     chunk::{OpaqueMeshComponent, TransparentMeshComponent},
-    pipeline::{
-        RenderGraphEdgesPlugin, WorldRenderPassesPlugin,
-        main_passes::{
-            bounding_box_pass::extract::WireframeToggleState,
-            opaque_pass::{extract::extract_opaque_meshes, startup::OpaqueRenderMode},
-            transparent_pass::extract::extract_transparent_meshes,
-        },
+    passes::{
+        RenderGraphEdgesPlugin, WorldRenderPassesPlugin, opaque::extract::extract_opaque_meshes,
+        transparent::extract::extract_transparent_meshes,
     },
     texture::BlockTextureArray,
 };
@@ -33,14 +35,16 @@ use bevy::{
         sync_world::SyncToRenderWorld,
     },
 };
-use shared::simulation::block::TargetedBlock;
+#[cfg(feature = "dev")]
+use bevy::{camera::ClearColor, color::Color};
 
-/// Plugin responsible for attaching our custom render logic to Bevy's native RenderApp
+/// Plugin responsible for attaching custom render logic to Bevy's native RenderApp
 pub struct VantablockRenderPlugin;
 
 impl Plugin for VantablockRenderPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins(pipeline::shader_registry::VantablockShaderPlugin);
+        app.add_plugins(shaders::VantablockShaderPlugin);
+        app.add_plugins(texture::BlockTexturePlugin);
         app.add_plugins(block::BlockRenderPlugin);
         app.add_plugins(chunk::ChunkMeshingPlugin);
 
@@ -51,13 +55,13 @@ impl Plugin for VantablockRenderPlugin {
             ExtractResourcePlugin::<RenderTimeResource>::default(),
             ExtractResourcePlugin::<OpaqueRenderMode>::default(),
             ExtractResourcePlugin::<TargetedBlock>::default(),
-        ));
-
-        app.add_plugins((
-            ExtractResourcePlugin::<WireframeToggleState>::default(),
             ExtractResourcePlugin::<BlockTextureArray>::default(),
         ));
 
+        // red clear color for dev testing
+        #[cfg(feature = "dev")]
+        app.insert_resource(ClearColor(Color::linear_rgb(1.0, 0.0, 0.0)));
+
         // INFO: ------------------------------------
         //         main world synchronization
         // ------------------------------------------
@@ -94,6 +98,7 @@ impl Plugin for VantablockRenderPlugin {
 pub fn pre_setup_render_sub_app(sub_app: &mut SubApp) {
     // resources for rendering
     sub_app
+        .init_resource::<ChunkBoundsToggle>()
         .init_resource::<RenderTimeResource>()
         .init_resource::<RenderMeshStorageResource>()
         .init_resource::<MeshesToUploadQueue>();
diff --git a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/gpu_resources/mod.rs b/crates/client/src/render/passes/bounding_box/gpu_resources/mod.rs
similarity index 100%
rename from crates/client/src/render/pipeline/main_passes/bounding_box_pass/gpu_resources/mod.rs
rename to crates/client/src/render/passes/bounding_box/gpu_resources/mod.rs
diff --git a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/gpu_resources/object_binding.rs b/crates/client/src/render/passes/bounding_box/gpu_resources/object_binding.rs
similarity index 100%
rename from crates/client/src/render/pipeline/main_passes/bounding_box_pass/gpu_resources/object_binding.rs
rename to crates/client/src/render/passes/bounding_box/gpu_resources/object_binding.rs
diff --git a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/gpu_resources/unit_cube_mesh.rs b/crates/client/src/render/passes/bounding_box/gpu_resources/unit_cube_mesh.rs
similarity index 100%
rename from crates/client/src/render/pipeline/main_passes/bounding_box_pass/gpu_resources/unit_cube_mesh.rs
rename to crates/client/src/render/passes/bounding_box/gpu_resources/unit_cube_mesh.rs
diff --git a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/gpu_resources/wireframe_pipeline.rs b/crates/client/src/render/passes/bounding_box/gpu_resources/wireframe_pipeline.rs
similarity index 88%
rename from crates/client/src/render/pipeline/main_passes/bounding_box_pass/gpu_resources/wireframe_pipeline.rs
rename to crates/client/src/render/passes/bounding_box/gpu_resources/wireframe_pipeline.rs
index 4e78beda..ce7cb671 100644
--- a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/gpu_resources/wireframe_pipeline.rs
+++ b/crates/client/src/render/passes/bounding_box/gpu_resources/wireframe_pipeline.rs
@@ -1,11 +1,8 @@
-use crate::render::pipeline::main_passes::bounding_box_pass::WireframeObjectBindGroupLayout;
-use crate::render::pipeline::main_passes::shared_resources::{
-    CentralCameraViewBindGroupLayout, EnvironmentBindGroupLayout, MAIN_DEPTH_FORMAT,
-};
-use crate::render::pipeline::shader_registry::{
-    WIREFRAME_FRAG_SHADER_HANDLE, WIREFRAME_VERT_SHADER_HANDLE,
-};
+use crate::render::passes::bounding_box::WireframeObjectBindGroupLayout;
+use crate::render::resources::{CentralCameraViewBindGroupLayout, EnvironmentBindGroupLayout};
+use crate::render::shaders::{WIREFRAME_FRAG_SHADER_HANDLE, WIREFRAME_VERT_SHADER_HANDLE};
 use crate::render::types::WireframeVertex;
+use bevy::core_pipeline::core_3d;
 use bevy::ecs::prelude::*;
 use bevy::render::render_resource::*;
 use bevy::render::view::ViewTarget;
@@ -73,7 +70,7 @@ impl SpecializedRenderPipeline for WireframePipeline {
                 })],
             }),
             depth_stencil: Some(DepthStencilState {
-                format: MAIN_DEPTH_FORMAT,
+                format: core_3d::CORE_3D_DEPTH_FORMAT,
                 depth_write_enabled: false,
                 depth_compare: CompareFunction::GreaterEqual,
                 stencil: StencilState::default(),
diff --git a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/mod.rs b/crates/client/src/render/passes/bounding_box/mod.rs
similarity index 65%
rename from crates/client/src/render/pipeline/main_passes/bounding_box_pass/mod.rs
rename to crates/client/src/render/passes/bounding_box/mod.rs
index 1c02ce27..f3bcfcd1 100644
--- a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/mod.rs
+++ b/crates/client/src/render/passes/bounding_box/mod.rs
@@ -1,4 +1,3 @@
-pub mod extract;
 pub mod gpu_resources;
 pub mod queue;
 pub mod render;
@@ -9,15 +8,15 @@ pub use render::BoundingBoxNode;
 //         plugin definition
 // ---------------------------------
 
-use crate::{
-    VantablockNode, render::pipeline::main_passes::bounding_box_pass::queue::queue_wireframe_system,
-};
-use bevy::core_pipeline::core_3d;
-use bevy::prelude::{App, IntoScheduleConfigs, Plugin};
-use bevy::render::{
-    render_graph::{RenderGraphExt, ViewNodeRunner},
-    render_resource::SpecializedRenderPipelines,
-    {Render, RenderSystems},
+use crate::render::{VantablockNode, passes::bounding_box::queue::queue_wireframe_system};
+use bevy::{
+    core_pipeline::core_3d,
+    prelude::{App, IntoScheduleConfigs, Plugin},
+    render::{
+        render_graph::{RenderGraphExt, ViewNodeRunner},
+        render_resource::SpecializedRenderPipelines,
+        {Render, RenderSystems},
+    },
 };
 use gpu_resources::{
     UnitCubeMesh, WireframeObjectBuffer, WireframePipeline,
@@ -28,16 +27,10 @@ pub struct WireframeRenderPassPlugin;
 
 impl Plugin for WireframeRenderPassPlugin {
     fn build(&self, app: &mut App) {
-        // INFO: ---------------
-        //         queue
-        // ---------------------
-
+        // queue
         app.add_systems(Render, queue_wireframe_system.in_set(RenderSystems::Queue));
 
-        // INFO: ----------------------------------
-        //         render graph integration
-        // ----------------------------------------
-
+        // render graph node
         app.add_render_graph_node::<ViewNodeRunner<BoundingBoxNode>>(
             core_3d::graph::Core3d,
             VantablockNode::BoundingBoxPass,
diff --git a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/queue.rs b/crates/client/src/render/passes/bounding_box/queue.rs
similarity index 86%
rename from crates/client/src/render/pipeline/main_passes/bounding_box_pass/queue.rs
rename to crates/client/src/render/passes/bounding_box/queue.rs
index 575a2257..3f9ced01 100644
--- a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/queue.rs
+++ b/crates/client/src/render/passes/bounding_box/queue.rs
@@ -1,14 +1,10 @@
+use crate::player::TargetedBlock;
 use crate::{
+    input::systems::toggle_chunk_borders::ChunkBoundsToggle,
     prelude::*,
-    render::{
-        pipeline::main_passes::bounding_box_pass::{
-            extract::WireframeToggleState,
-            gpu_resources::{
-                WireframeObjectBuffer, WireframeObjectData,
-                object_binding::WireframeObjectBindGroupLayout, wireframe_pipeline::*,
-            },
-        },
-        types::RenderTransformComponent,
+    render::passes::bounding_box::gpu_resources::{
+        WireframeObjectBuffer, WireframeObjectData, object_binding::WireframeObjectBindGroupLayout,
+        wireframe_pipeline::*,
     },
 };
 use bevy::{
@@ -21,11 +17,9 @@ use bevy::{
         renderer::{RenderDevice, RenderQueue},
         view::{ExtractedView, Msaa},
     },
+    transform::components::GlobalTransform,
 };
-use shared::simulation::{
-    block::TargetedBlock,
-    chunk::consts::{CHUNK_DEPTH, CHUNK_HEIGHT, CHUNK_WIDTH},
-};
+use shared::world::chunk::consts::{CHUNK_DEPTH, CHUNK_HEIGHT, CHUNK_WIDTH};
 
 #[derive(Component, Default, Debug)]
 pub struct BoundingBoxPhase {
@@ -39,8 +33,8 @@ pub fn queue_wireframe_system(
     queue: Res<RenderQueue>,
     device: Res<RenderDevice>,
     object_layout: Res<WireframeObjectBindGroupLayout>,
-    chunk_query: Query<&RenderTransformComponent>,
-    active_bounds: Res<WireframeToggleState>,
+    chunk_query: Query<&GlobalTransform>,
+    active_bounds: Res<ChunkBoundsToggle>,
     targeted_block: Res<TargetedBlock>,
     pipeline_cache: Res<PipelineCache>,
     mut specialized_pipelines: ResMut<SpecializedRenderPipelines<WireframePipeline>>,
@@ -83,7 +77,7 @@ pub fn queue_wireframe_system(
         ));
 
         for transform in chunk_query.iter() {
-            let model_matrix = transform.transform * translation_matrix * scale_matrix;
+            let model_matrix = transform.to_matrix() * translation_matrix * scale_matrix;
 
             wireframe_buffer.objects.push(WireframeObjectData {
                 model_matrix: model_matrix.to_cols_array(),
diff --git a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/render.rs b/crates/client/src/render/passes/bounding_box/render.rs
similarity index 95%
rename from crates/client/src/render/pipeline/main_passes/bounding_box_pass/render.rs
rename to crates/client/src/render/passes/bounding_box/render.rs
index c365042d..d4b9a0aa 100644
--- a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/render.rs
+++ b/crates/client/src/render/passes/bounding_box/render.rs
@@ -1,8 +1,8 @@
 use super::gpu_resources::{UnitCubeMesh, WireframeObjectBuffer};
 use crate::prelude::*;
-use crate::render::pipeline::main_passes::{
-    bounding_box_pass::queue::BoundingBoxPhase,
-    shared_resources::{CentralCameraViewUniform, EnvironmentUniforms},
+use crate::render::{
+    passes::bounding_box::queue::BoundingBoxPhase,
+    resources::{CentralCameraViewUniform, EnvironmentUniforms},
 };
 use bevy::ecs::prelude::*;
 use bevy::ecs::query::QueryItem;
diff --git a/crates/client/src/render/passes/mod.rs b/crates/client/src/render/passes/mod.rs
new file mode 100644
index 00000000..acaacf12
--- /dev/null
+++ b/crates/client/src/render/passes/mod.rs
@@ -0,0 +1,125 @@
+pub mod bounding_box;
+pub mod opaque;
+pub mod shadow;
+pub mod transparent;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::render::{
+    VantablockNode,
+    passes::{
+        bounding_box::WireframeRenderPassPlugin, opaque::OpaqueRenderPassPlugin,
+        shadow::ShadowRenderPassPlugin, transparent::TransparentRenderPassPlugin,
+    },
+    resources::{
+        CentralCameraViewBindGroupLayout, CentralCameraViewUniform, EnvironmentBindGroupLayout,
+        EnvironmentUniforms, TextureArrayBindGroupLayout, prepare_texture_array_system,
+        update_camera_view_buffer_system, update_environment_uniform_buffer_system,
+        world_uniforms::{ChunkStorageBindGroupLayout, ChunkStorageManager},
+    },
+};
+use bevy::prelude::IntoScheduleConfigs;
+use bevy::{
+    app::{App, Plugin},
+    render::{Render, RenderSystems, render_graph::RenderGraphExt},
+};
+
+/// A plugin that sets up all the necessary resources and render
+/// passes used in the rendering pipeline.
+pub struct WorldRenderPassesPlugin;
+
+impl Plugin for WorldRenderPassesPlugin {
+    fn build(&self, app: &mut App) {
+        // renderpass plugins
+        app.add_plugins((ShadowRenderPassPlugin, PlayerCentricRenderPassPlugin));
+    }
+
+    fn finish(&self, app: &mut App) {
+        // shared world uniform resources
+        app.init_resource::<ChunkStorageBindGroupLayout>();
+        app.init_resource::<ChunkStorageManager>();
+    }
+}
+
+/// A plugin responsible ONLY for wiring the edges between nodes in the render graph.
+/// This must be added AFTER all pass plugins to ensure all nodes exist.
+pub struct RenderGraphEdgesPlugin;
+
+impl Plugin for RenderGraphEdgesPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_render_graph_edges(
+            bevy::core_pipeline::core_3d::graph::Core3d,
+            (
+                bevy::core_pipeline::core_3d::graph::Node3d::StartMainPass,
+                VantablockNode::ShadowPass,
+                bevy::core_pipeline::core_3d::graph::Node3d::MainOpaquePass,
+            ),
+        );
+
+        app.add_render_graph_edges(
+            bevy::core_pipeline::core_3d::graph::Core3d,
+            (
+                bevy::core_pipeline::core_3d::graph::Node3d::MainOpaquePass,
+                VantablockNode::OpaquePass,
+                VantablockNode::TransparentPass,
+                bevy::core_pipeline::core_3d::graph::Node3d::MainTransparentPass,
+            ),
+        );
+
+        app.add_render_graph_edges(
+            bevy::core_pipeline::core_3d::graph::Core3d,
+            (
+                bevy::core_pipeline::core_3d::graph::Node3d::MainTransparentPass,
+                VantablockNode::BoundingBoxPass,
+                bevy::core_pipeline::core_3d::graph::Node3d::EndMainPass,
+            ),
+        );
+    }
+}
+
+/// A plugin that sets up all the necessary resources and render
+/// passes used in the rendering pipeline.
+pub struct PlayerCentricRenderPassPlugin;
+
+impl Plugin for PlayerCentricRenderPassPlugin {
+    fn build(&self, app: &mut App) {
+        // INFO: -----------------------------------------
+        //         prepare (also shared resources)
+        // -----------------------------------------------
+
+        app.add_systems(
+            Render,
+            (
+                update_camera_view_buffer_system,
+                update_environment_uniform_buffer_system,
+                prepare_texture_array_system,
+            )
+                .in_set(RenderSystems::Prepare),
+        );
+
+        // INFO: --------------------------------------
+        //         subplugins for render passes
+        // --------------------------------------------
+
+        app.add_plugins((
+            TransparentRenderPassPlugin,
+            OpaqueRenderPassPlugin,
+            WireframeRenderPassPlugin,
+        ));
+    }
+
+    fn finish(&self, app: &mut App) {
+        // INFO: ----------------------------------------------------
+        //         startup (shared resources for main passes)
+        // ----------------------------------------------------------
+
+        app.init_resource::<CentralCameraViewBindGroupLayout>();
+        app.init_resource::<EnvironmentBindGroupLayout>();
+        app.init_resource::<EnvironmentUniforms>();
+        app.init_resource::<TextureArrayBindGroupLayout>();
+
+        app.init_resource::<CentralCameraViewUniform>();
+    }
+}
diff --git a/crates/client/src/render/pipeline/main_passes/opaque_pass/extract.rs b/crates/client/src/render/passes/opaque/mesh/extract.rs
similarity index 55%
rename from crates/client/src/render/pipeline/main_passes/opaque_pass/extract.rs
rename to crates/client/src/render/passes/opaque/mesh/extract.rs
index cbc69bdd..321eca5f 100644
--- a/crates/client/src/render/pipeline/main_passes/opaque_pass/extract.rs
+++ b/crates/client/src/render/passes/opaque/mesh/extract.rs
@@ -1,39 +1,35 @@
+use crate::render::chunk::BlockMeshAsset;
 use crate::render::chunk::OpaqueMeshComponent;
-use crate::render::chunk::VoxelMeshAsset;
-use crate::render::types::RenderTransformComponent;
-use bevy::asset::Handle;
-use bevy::ecs::prelude::*;
-use bevy::render::Extract;
-use bevy::render::sync_world::RenderEntity;
-use shared::simulation::chunk::TransformComponent;
+use bevy::{
+    asset::Handle, ecs::prelude::*, render::Extract, render::sync_world::RenderEntity,
+    transform::components::GlobalTransform,
+};
 
-// INFO: --------------------------------
-//         RenderWorld components
-// --------------------------------------
+// INFO: -------------------------------
+//         render app components
+// -------------------------------------
 
 /// A component in the render world holding the extracted mesh handle.
 #[derive(Component, Clone)]
 pub struct OpaqueRenderMeshComponent {
-    pub mesh_handle: Handle<VoxelMeshAsset>,
+    pub mesh_handle: Handle<BlockMeshAsset>,
 }
 
 // INFO: -----------------------------------
-//         SimWorld extraction logic
+//         main app extraction logic
 // -----------------------------------------
 
 /// A system that extracts opaque meshes from the simulation world into the render world.
 pub fn extract_opaque_meshes(
     mut commands: Commands,
-    query: Extract<Query<(&RenderEntity, &OpaqueMeshComponent, &TransformComponent)>>,
+    query: Extract<Query<(&RenderEntity, &OpaqueMeshComponent, &GlobalTransform)>>,
 ) {
     for (render_entity, mesh, transform) in query.iter() {
         commands.entity(render_entity.id()).insert((
             OpaqueRenderMeshComponent {
                 mesh_handle: mesh.mesh_handle.clone(),
             },
-            RenderTransformComponent {
-                transform: transform.to_matrix(),
-            },
+            *transform,
         ));
     }
 }
diff --git a/crates/client/src/render/passes/opaque/mesh/mod.rs b/crates/client/src/render/passes/opaque/mesh/mod.rs
new file mode 100644
index 00000000..df4cec93
--- /dev/null
+++ b/crates/client/src/render/passes/opaque/mesh/mod.rs
@@ -0,0 +1,3 @@
+pub mod extract;
+pub mod pipeline;
+pub mod queue;
diff --git a/crates/client/src/render/passes/opaque/mesh/pipeline.rs b/crates/client/src/render/passes/opaque/mesh/pipeline.rs
new file mode 100644
index 00000000..8d537540
--- /dev/null
+++ b/crates/client/src/render/passes/opaque/mesh/pipeline.rs
@@ -0,0 +1,123 @@
+use crate::{
+    input::systems::toggle_opaque_wireframe::OpaqueRenderMode,
+    prelude::*,
+    render::{
+        resources::{
+            CentralCameraViewBindGroupLayout, EnvironmentBindGroupLayout,
+            TextureArrayBindGroupLayout, world_uniforms::ChunkStorageBindGroupLayout,
+        },
+        shaders::{OPAQUE_FRAG_SHADER_HANDLE, OPAQUE_VERT_SHADER_HANDLE},
+    },
+};
+use bevy::{
+    core_pipeline::core_3d::{self},
+    ecs::prelude::*,
+    render::{render_resource::*, view::ViewTarget},
+};
+
+/// A key that uniquely identifies a specialized world opaque pipeline.
+#[derive(Clone, Copy, PartialEq, Eq, Hash)]
+pub struct Opaque3dPipelineKey {
+    pub msaa_samples: u32,
+    pub hdr: bool,
+    pub mode: OpaqueRenderMode,
+}
+
+/// A resource that holds all the layouts and handles needed to specialize world opaque pipelines.
+#[derive(Resource)]
+pub struct Opaque3dPipeline {
+    pub view_layout: BindGroupLayoutDescriptor,
+    pub environment_layout: BindGroupLayoutDescriptor,
+    pub texture_layout: BindGroupLayoutDescriptor,
+    pub chunk_storage_layout: BindGroupLayoutDescriptor,
+}
+
+impl FromWorld for Opaque3dPipeline {
+    #[instrument(skip_all)]
+    fn from_world(world: &mut World) -> Self {
+        let view_layout = world.resource::<CentralCameraViewBindGroupLayout>();
+        let environment_layout = world.resource::<EnvironmentBindGroupLayout>();
+        let texture_layout = world.resource::<TextureArrayBindGroupLayout>();
+        let chunk_storage_layout = world.resource::<ChunkStorageBindGroupLayout>();
+
+        Self {
+            view_layout: view_layout.descriptor.clone(),
+            environment_layout: environment_layout.descriptor.clone(),
+            texture_layout: texture_layout.descriptor.clone(),
+            chunk_storage_layout: chunk_storage_layout.descriptor.clone(),
+        }
+    }
+}
+
+impl SpecializedRenderPipeline for Opaque3dPipeline {
+    type Key = Opaque3dPipelineKey;
+
+    fn specialize(&self, key: Self::Key) -> RenderPipelineDescriptor {
+        let format = if key.hdr {
+            ViewTarget::TEXTURE_FORMAT_HDR
+        } else {
+            TextureFormat::Rgba8UnormSrgb
+        };
+
+        let fragment_target = [Some(ColorTargetState {
+            format,
+            blend: Some(BlendState::REPLACE),
+            write_mask: ColorWrites::ALL,
+        })];
+
+        let depth_stencil = Some(DepthStencilState {
+            format: core_3d::CORE_3D_DEPTH_FORMAT,
+            depth_write_enabled: true,
+            depth_compare: CompareFunction::GreaterEqual,
+            stencil: StencilState::default(),
+            bias: DepthBiasState::default(),
+        });
+
+        let polygon_mode = match key.mode {
+            OpaqueRenderMode::Fill => PolygonMode::Fill,
+            OpaqueRenderMode::Wireframe => PolygonMode::Line,
+        };
+
+        let label = match key.mode {
+            OpaqueRenderMode::Fill => "World Opaque Pipeline",
+            OpaqueRenderMode::Wireframe => "Wireframe World Opaque Pipeline",
+        };
+
+        RenderPipelineDescriptor {
+            label: Some(label.into()),
+            layout: vec![
+                self.view_layout.clone(),
+                self.environment_layout.clone(),
+                self.texture_layout.clone(),
+                self.chunk_storage_layout.clone(),
+            ],
+            push_constant_ranges: vec![],
+            vertex: VertexState {
+                shader: OPAQUE_VERT_SHADER_HANDLE,
+                shader_defs: vec![],
+                entry_point: Some("vs_main".into()),
+                buffers: vec![],
+            },
+            fragment: Some(FragmentState {
+                shader: OPAQUE_FRAG_SHADER_HANDLE,
+                shader_defs: vec![],
+                entry_point: Some("fs_main".into()),
+                targets: fragment_target.to_vec(),
+            }),
+            primitive: PrimitiveState {
+                topology: PrimitiveTopology::TriangleList,
+                front_face: FrontFace::Ccw,
+                polygon_mode,
+                cull_mode: Some(Face::Back),
+                ..Default::default()
+            },
+            depth_stencil,
+            multisample: MultisampleState {
+                count: key.msaa_samples,
+                mask: !0,
+                alpha_to_coverage_enabled: false,
+            },
+            zero_initialize_workgroup_memory: true,
+        }
+    }
+}
diff --git a/crates/client/src/render/pipeline/main_passes/opaque_pass/queue.rs b/crates/client/src/render/passes/opaque/mesh/queue.rs
similarity index 63%
rename from crates/client/src/render/pipeline/main_passes/opaque_pass/queue.rs
rename to crates/client/src/render/passes/opaque/mesh/queue.rs
index c8c3cade..93749a51 100644
--- a/crates/client/src/render/pipeline/main_passes/opaque_pass/queue.rs
+++ b/crates/client/src/render/passes/opaque/mesh/queue.rs
@@ -1,16 +1,18 @@
-use crate::prelude::*;
-use crate::render::{
-    pipeline::main_passes::opaque_pass::extract::OpaqueRenderMeshComponent,
-    pipeline::main_passes::opaque_pass::startup::{
-        OpaquePipelineKey, OpaquePipelines, OpaqueRenderMode,
+use crate::{
+    input::systems::toggle_opaque_wireframe::OpaqueRenderMode,
+    prelude::*,
+    render::passes::opaque::{
+        extract::OpaqueRenderMeshComponent,
+        pipeline::{Opaque3dPipeline, Opaque3dPipelineKey},
+        skybox::{OpaqueSkyboxPipeline, OpaqueSkyboxPipelineKey},
     },
-    types::RenderTransformComponent,
 };
-use bevy::ecs::prelude::*;
-use bevy::render::render_resource::{
-    CachedRenderPipelineId, PipelineCache, SpecializedRenderPipelines,
+use bevy::{
+    ecs::prelude::*,
+    render::render_resource::{CachedRenderPipelineId, PipelineCache, SpecializedRenderPipelines},
+    render::view::{ExtractedView, Msaa},
+    transform::components::GlobalTransform,
 };
-use bevy::render::view::{ExtractedView, Msaa};
 
 #[derive(Debug)]
 pub struct PhaseItem {
@@ -39,46 +41,45 @@ struct SortableOpaqueItem {
 pub fn queue_opaque_system(
     // input
     mut views_query: Query<(&ExtractedView, &Msaa, &mut Opaque3dRenderPhase)>,
-    meshes_query: Query<(
-        Entity,
-        &OpaqueRenderMeshComponent,
-        &RenderTransformComponent,
-    )>,
+    meshes_query: Query<(Entity, &OpaqueRenderMeshComponent, &GlobalTransform)>,
     render_mode: Res<OpaqueRenderMode>,
     pipeline_cache: Res<PipelineCache>,
-    mut specialized_pipelines: ResMut<SpecializedRenderPipelines<OpaquePipelines>>,
-    opaque_pipelines: Res<OpaquePipelines>,
+    mut specialized_world_pipelines: ResMut<SpecializedRenderPipelines<Opaque3dPipeline>>,
+    world_pipelines: Res<Opaque3dPipeline>,
+    mut specialized_skybox_pipelines: ResMut<SpecializedRenderPipelines<OpaqueSkyboxPipeline>>,
+    skybox_pipelines: Res<OpaqueSkyboxPipeline>,
 ) {
     for (extracted_view, msaa, mut opaque_phase) in views_query.iter_mut() {
         opaque_phase.items.clear();
 
         // specialize pipelines for this view's MSAA and HDR settings
-        let mesh_key = OpaquePipelineKey {
+        let mesh_key = Opaque3dPipelineKey {
             msaa_samples: msaa.samples(),
             hdr: extracted_view.hdr,
             mode: *render_mode,
-            is_skybox: false,
         };
-        opaque_phase.mesh_pipeline_id =
-            Some(specialized_pipelines.specialize(&pipeline_cache, &opaque_pipelines, mesh_key));
+        opaque_phase.mesh_pipeline_id = Some(specialized_world_pipelines.specialize(
+            &pipeline_cache,
+            &world_pipelines,
+            mesh_key,
+        ));
 
-        let skybox_key = OpaquePipelineKey {
+        let skybox_key = OpaqueSkyboxPipelineKey {
             msaa_samples: msaa.samples(),
             hdr: extracted_view.hdr,
-            mode: *render_mode,
-            is_skybox: true,
         };
-        opaque_phase.skybox_pipeline_id =
-            Some(specialized_pipelines.specialize(&pipeline_cache, &opaque_pipelines, skybox_key));
+        opaque_phase.skybox_pipeline_id = Some(specialized_skybox_pipelines.specialize(
+            &pipeline_cache,
+            &skybox_pipelines,
+            skybox_key,
+        ));
 
         // collect sortable items for the render pass
         let camera_position = extracted_view.world_from_view.translation();
         let mut sortable_items: Vec<SortableOpaqueItem> =
             Vec::with_capacity(meshes_query.iter().len());
         for (entity, _mesh, transform) in meshes_query.iter() {
-            // TODO: Frustum culling here
-
-            let object_position = transform.transform.w_axis.truncate();
+            let object_position = transform.translation();
             let distance_from_camera = (object_position - camera_position).length_squared();
 
             sortable_items.push(SortableOpaqueItem {
diff --git a/crates/client/src/render/pipeline/main_passes/opaque_pass/mod.rs b/crates/client/src/render/passes/opaque/mod.rs
similarity index 54%
rename from crates/client/src/render/pipeline/main_passes/opaque_pass/mod.rs
rename to crates/client/src/render/passes/opaque/mod.rs
index b5982ff2..87cf478b 100644
--- a/crates/client/src/render/pipeline/main_passes/opaque_pass/mod.rs
+++ b/crates/client/src/render/passes/opaque/mod.rs
@@ -1,37 +1,33 @@
-pub mod extract;
-pub mod prepare;
-pub mod queue;
+pub mod mesh;
 pub mod render;
-pub mod startup;
+pub mod skybox;
 
-pub use render::OpaquePassRenderNode;
+pub use mesh::*;
 
 // INFO: ---------------------------
 //         plugin definition
 // ---------------------------------
 
-use crate::VantablockNode;
-use bevy::prelude::{App, IntoScheduleConfigs, Plugin};
-use bevy::render::{
-    render_graph::{RenderGraphExt, ViewNodeRunner},
-    render_resource::SpecializedRenderPipelines,
-    {Render, RenderSystems},
+use crate::render::{
+    VantablockNode,
+    passes::opaque::{
+        mesh::pipeline::Opaque3dPipeline, render::OpaquePassRenderNode,
+        skybox::OpaqueSkyboxPipeline,
+    },
+};
+use bevy::{
+    prelude::{App, IntoScheduleConfigs, Plugin},
+    render::{
+        render_graph::{RenderGraphExt, ViewNodeRunner},
+        render_resource::SpecializedRenderPipelines,
+        {Render, RenderSystems},
+    },
 };
-use startup::OpaquePipelines;
 
 pub struct OpaqueRenderPassPlugin;
 
 impl Plugin for OpaqueRenderPassPlugin {
     fn build(&self, app: &mut App) {
-        // INFO: -----------------
-        //         prepare
-        // -----------------------
-
-        app.add_systems(
-            Render,
-            prepare::prepare_opaque_meshes_system.in_set(RenderSystems::Prepare),
-        );
-
         // INFO: ---------------
         //         queue
         // ---------------------
@@ -53,10 +49,12 @@ impl Plugin for OpaqueRenderPassPlugin {
 
     fn finish(&self, app: &mut App) {
         // INFO: -----------------
-        //         Startup
+        //         startup
         // -----------------------
 
-        app.init_resource::<OpaquePipelines>();
-        app.init_resource::<SpecializedRenderPipelines<OpaquePipelines>>();
+        app.init_resource::<Opaque3dPipeline>();
+        app.init_resource::<SpecializedRenderPipelines<Opaque3dPipeline>>();
+        app.init_resource::<OpaqueSkyboxPipeline>();
+        app.init_resource::<SpecializedRenderPipelines<OpaqueSkyboxPipeline>>();
     }
 }
diff --git a/crates/client/src/render/pipeline/main_passes/opaque_pass/render.rs b/crates/client/src/render/passes/opaque/render.rs
similarity index 84%
rename from crates/client/src/render/pipeline/main_passes/opaque_pass/render.rs
rename to crates/client/src/render/passes/opaque/render.rs
index 62ac3571..22a42c9f 100644
--- a/crates/client/src/render/pipeline/main_passes/opaque_pass/render.rs
+++ b/crates/client/src/render/passes/opaque/render.rs
@@ -1,22 +1,25 @@
 use crate::prelude::*;
-use crate::render::pipeline::gpu_resources::world_uniforms::ChunkStorageManager;
-use crate::render::pipeline::main_passes::shared_resources::TextureArrayUniforms;
 use crate::render::{
     data::RenderMeshStorageResource,
-    pipeline::main_passes::{
-        opaque_pass::{extract::OpaqueRenderMeshComponent, queue::Opaque3dRenderPhase},
-        shared_resources::{CentralCameraViewUniform, EnvironmentUniforms},
+    passes::opaque::{extract::OpaqueRenderMeshComponent, queue::Opaque3dRenderPhase},
+    resources::{
+        CentralCameraViewUniform, EnvironmentUniforms, TextureArrayUniforms,
+        world_uniforms::ChunkStorageManager,
     },
 };
-use bevy::ecs::prelude::*;
-use bevy::ecs::query::QueryItem;
-use bevy::render::render_graph::{NodeRunError, RenderGraphContext, ViewNode};
-use bevy::render::render_resource::{
-    LoadOp, Operations, PipelineCache, RenderPassDepthStencilAttachment, RenderPassDescriptor,
-    StoreOp,
+use bevy::{
+    ecs::prelude::*,
+    ecs::query::QueryItem,
+    render::{
+        render_graph::{NodeRunError, RenderGraphContext, ViewNode},
+        render_resource::{
+            LoadOp, Operations, PipelineCache, RenderPassDepthStencilAttachment,
+            RenderPassDescriptor, StoreOp,
+        },
+        renderer::RenderContext,
+        view::{ViewDepthTexture, ViewTarget},
+    },
 };
-use bevy::render::renderer::RenderContext;
-use bevy::render::view::{ViewDepthTexture, ViewTarget};
 
 #[derive(Default)]
 pub struct OpaquePassRenderNode;
@@ -28,7 +31,7 @@ impl ViewNode for OpaquePassRenderNode {
         &'static ViewDepthTexture,
     );
 
-    #[instrument(skip_all, name = "opaque_pass_render_node")]
+    #[instrument(skip_all, name = "opaque_render_node")]
     fn run(
         &self,
         _graph: &mut RenderGraphContext,
@@ -93,14 +96,6 @@ impl ViewNode for OpaquePassRenderNode {
                     occlusion_query_set: None,
                 });
 
-        // INFO: -------------------------
-        //         skybox pipeline
-        // -------------------------------
-        render_pass.set_pipeline(skybox_pipeline.unwrap());
-        render_pass.set_bind_group(0, &view_buffer.bind_group, &[]);
-        render_pass.set_bind_group(1, &skybox_params.bind_group, &[]);
-        render_pass.draw(0..6, 0..1);
-
         // INFO: -----------------------------------------
         //         mesh pipeline: iterate and draw
         // -----------------------------------------------
@@ -123,6 +118,15 @@ impl ViewNode for OpaquePassRenderNode {
             }
         }
 
+        // INFO: -------------------------
+        //         skybox pipeline
+        // -------------------------------
+        // runs after opaque, filling in empty pixels where depth = 0.0 still
+        render_pass.set_pipeline(skybox_pipeline.unwrap());
+        render_pass.set_bind_group(0, &view_buffer.bind_group, &[]);
+        render_pass.set_bind_group(1, &skybox_params.bind_group, &[]);
+        render_pass.draw(0..6, 0..1);
+
         Ok(())
     }
 }
diff --git a/crates/client/src/render/passes/opaque/skybox.rs b/crates/client/src/render/passes/opaque/skybox.rs
new file mode 100644
index 00000000..f36a7ae8
--- /dev/null
+++ b/crates/client/src/render/passes/opaque/skybox.rs
@@ -0,0 +1,93 @@
+use crate::render::resources::{CentralCameraViewBindGroupLayout, EnvironmentBindGroupLayout};
+use crate::render::shaders::{SKYBOX_FRAG_SHADER_HANDLE, SKYBOX_VERT_SHADER_HANDLE};
+use bevy::{
+    core_pipeline::core_3d,
+    ecs::prelude::*,
+    render::{render_resource::*, view::ViewTarget},
+};
+use tracing::instrument;
+
+/// A key that uniquely identifies a specialized skybox pipeline.
+#[derive(Clone, Copy, PartialEq, Eq, Hash)]
+pub struct OpaqueSkyboxPipelineKey {
+    pub msaa_samples: u32,
+    pub hdr: bool,
+}
+
+/// A resource that holds all the layouts and handles needed to specialize skybox pipelines.
+#[derive(Resource)]
+pub struct OpaqueSkyboxPipeline {
+    pub view_layout: BindGroupLayoutDescriptor,
+    pub environment_layout: BindGroupLayoutDescriptor,
+}
+
+impl FromWorld for OpaqueSkyboxPipeline {
+    #[instrument(skip_all)]
+    fn from_world(world: &mut World) -> Self {
+        let view_layout = world.resource::<CentralCameraViewBindGroupLayout>();
+        let environment_layout = world.resource::<EnvironmentBindGroupLayout>();
+
+        Self {
+            view_layout: view_layout.descriptor.clone(),
+            environment_layout: environment_layout.descriptor.clone(),
+        }
+    }
+}
+
+impl SpecializedRenderPipeline for OpaqueSkyboxPipeline {
+    type Key = OpaqueSkyboxPipelineKey;
+
+    fn specialize(&self, key: Self::Key) -> RenderPipelineDescriptor {
+        let format = if key.hdr {
+            ViewTarget::TEXTURE_FORMAT_HDR
+        } else {
+            TextureFormat::Rgba8UnormSrgb
+        };
+
+        let fragment_target = [Some(ColorTargetState {
+            format,
+            blend: Some(BlendState::REPLACE),
+            write_mask: ColorWrites::ALL,
+        })];
+
+        let depth_stencil = Some(DepthStencilState {
+            format: core_3d::CORE_3D_DEPTH_FORMAT,
+            depth_write_enabled: false,
+            depth_compare: CompareFunction::Equal,
+            stencil: StencilState::default(),
+            bias: DepthBiasState::default(),
+        });
+
+        RenderPipelineDescriptor {
+            label: Some("Skybox Pipeline".into()),
+            layout: vec![self.view_layout.clone(), self.environment_layout.clone()],
+            push_constant_ranges: vec![],
+            vertex: VertexState {
+                shader: SKYBOX_VERT_SHADER_HANDLE,
+                shader_defs: vec![],
+                entry_point: Some("vs_main".into()),
+                buffers: vec![],
+            },
+            fragment: Some(FragmentState {
+                shader: SKYBOX_FRAG_SHADER_HANDLE,
+                shader_defs: vec![],
+                entry_point: Some("fs_main".into()),
+                targets: fragment_target.to_vec(),
+            }),
+            primitive: PrimitiveState {
+                topology: PrimitiveTopology::TriangleList,
+                front_face: FrontFace::Ccw,
+                polygon_mode: PolygonMode::Fill,
+                cull_mode: None,
+                ..Default::default()
+            },
+            depth_stencil,
+            multisample: MultisampleState {
+                count: key.msaa_samples,
+                mask: !0,
+                alpha_to_coverage_enabled: false,
+            },
+            zero_initialize_workgroup_memory: true,
+        }
+    }
+}
diff --git a/crates/client/src/render/pipeline/shadow_pass/gpu_resources/mod.rs b/crates/client/src/render/passes/shadow/gpu_resources/mod.rs
similarity index 100%
rename from crates/client/src/render/pipeline/shadow_pass/gpu_resources/mod.rs
rename to crates/client/src/render/passes/shadow/gpu_resources/mod.rs
diff --git a/crates/client/src/render/pipeline/shadow_pass/gpu_resources/shadow_pipeline.rs b/crates/client/src/render/passes/shadow/gpu_resources/shadow_pipeline.rs
similarity index 85%
rename from crates/client/src/render/pipeline/shadow_pass/gpu_resources/shadow_pipeline.rs
rename to crates/client/src/render/passes/shadow/gpu_resources/shadow_pipeline.rs
index e3f5b4df..e391aa94 100644
--- a/crates/client/src/render/pipeline/shadow_pass/gpu_resources/shadow_pipeline.rs
+++ b/crates/client/src/render/passes/shadow/gpu_resources/shadow_pipeline.rs
@@ -1,7 +1,7 @@
 use super::shadow_view_uniform::ShadowViewBindGroupLayout;
-use crate::render::pipeline::gpu_resources::world_uniforms::ChunkStorageBindGroupLayout;
-use crate::render::pipeline::shader_registry::SHADOW_VERT_SHADER_HANDLE;
-use crate::render::pipeline::shadow_pass::gpu_resources::SHADOW_DEPTH_FORMAT;
+use crate::render::passes::shadow::gpu_resources::SHADOW_DEPTH_FORMAT;
+use crate::render::resources::world_uniforms::ChunkStorageBindGroupLayout;
+use crate::render::shaders::SHADOW_VERT_SHADER_HANDLE;
 use bevy::ecs::prelude::*;
 use bevy::mesh::PrimitiveTopology;
 use bevy::render::render_resource::{
@@ -21,7 +21,7 @@ impl FromWorld for ShadowPassPipeline {
         let view_layout = world.resource::<ShadowViewBindGroupLayout>();
         let chunk_layout = world.resource::<ChunkStorageBindGroupLayout>();
 
-        let shadow_pass_depth_stencil = Some(DepthStencilState {
+        let shadow_depth_stencil = Some(DepthStencilState {
             format: SHADOW_DEPTH_FORMAT,
             depth_write_enabled: true,
             depth_compare: CompareFunction::Less,
@@ -50,7 +50,7 @@ impl FromWorld for ShadowPassPipeline {
                 cull_mode: Some(Face::Front),
                 ..Default::default()
             },
-            depth_stencil: shadow_pass_depth_stencil,
+            depth_stencil: shadow_depth_stencil,
             multisample: MultisampleState::default(),
             zero_initialize_workgroup_memory: true,
         };
diff --git a/crates/client/src/render/pipeline/shadow_pass/gpu_resources/shadow_texture.rs b/crates/client/src/render/passes/shadow/gpu_resources/shadow_texture.rs
similarity index 100%
rename from crates/client/src/render/pipeline/shadow_pass/gpu_resources/shadow_texture.rs
rename to crates/client/src/render/passes/shadow/gpu_resources/shadow_texture.rs
diff --git a/crates/client/src/render/pipeline/shadow_pass/gpu_resources/shadow_view_uniform.rs b/crates/client/src/render/passes/shadow/gpu_resources/shadow_view_uniform.rs
similarity index 100%
rename from crates/client/src/render/pipeline/shadow_pass/gpu_resources/shadow_view_uniform.rs
rename to crates/client/src/render/passes/shadow/gpu_resources/shadow_view_uniform.rs
diff --git a/crates/client/src/render/pipeline/shadow_pass/mod.rs b/crates/client/src/render/passes/shadow/mod.rs
similarity index 90%
rename from crates/client/src/render/pipeline/shadow_pass/mod.rs
rename to crates/client/src/render/passes/shadow/mod.rs
index ee84d78c..596c1769 100644
--- a/crates/client/src/render/pipeline/shadow_pass/mod.rs
+++ b/crates/client/src/render/passes/shadow/mod.rs
@@ -6,8 +6,8 @@ pub mod render;
 //         plugin definition
 // ---------------------------------
 
-use crate::render::pipeline::shadow_pass::prepare::update_shadow_view_buffer_system;
-use crate::render::pipeline::shadow_pass::render::ShadowRenderPassNode;
+use crate::render::passes::shadow::prepare::update_shadow_view_buffer_system;
+use crate::render::passes::shadow::render::ShadowRenderPassNode;
 use crate::render::scheduling::VantablockNode;
 use bevy::app::{App, Plugin};
 use bevy::prelude::IntoScheduleConfigs;
diff --git a/crates/client/src/render/pipeline/shadow_pass/prepare.rs b/crates/client/src/render/passes/shadow/prepare.rs
similarity index 95%
rename from crates/client/src/render/pipeline/shadow_pass/prepare.rs
rename to crates/client/src/render/passes/shadow/prepare.rs
index 0d19d4cb..ec293d9e 100644
--- a/crates/client/src/render/pipeline/shadow_pass/prepare.rs
+++ b/crates/client/src/render/passes/shadow/prepare.rs
@@ -1,9 +1,9 @@
 use crate::player::CAMERA_NEAR_PLANE;
 use crate::prelude::*;
 use crate::render::data::ExtractedSun;
-use crate::render::pipeline::main_passes::opaque_pass::queue::Opaque3dRenderPhase;
-use crate::render::pipeline::shadow_pass::gpu_resources::SHADOW_MAP_RESOLUTION;
-use crate::render::pipeline::shadow_pass::gpu_resources::{ShadowViewBuffer, ShadowViewData};
+use crate::render::passes::opaque::queue::Opaque3dRenderPhase;
+use crate::render::passes::shadow::gpu_resources::SHADOW_MAP_RESOLUTION;
+use crate::render::passes::shadow::gpu_resources::{ShadowViewBuffer, ShadowViewData};
 use bevy::ecs::prelude::*;
 use bevy::math::Vec4Swizzles;
 use bevy::render::renderer::RenderQueue;
diff --git a/crates/client/src/render/pipeline/shadow_pass/render.rs b/crates/client/src/render/passes/shadow/render.rs
similarity index 91%
rename from crates/client/src/render/pipeline/shadow_pass/render.rs
rename to crates/client/src/render/passes/shadow/render.rs
index 71c9a56a..afc07042 100644
--- a/crates/client/src/render/pipeline/shadow_pass/render.rs
+++ b/crates/client/src/render/passes/shadow/render.rs
@@ -1,11 +1,9 @@
 use crate::prelude::*;
-use crate::render::pipeline::gpu_resources::world_uniforms::ChunkStorageManager;
+use crate::render::resources::world_uniforms::ChunkStorageManager;
 use crate::render::{
     data::RenderMeshStorageResource,
-    pipeline::main_passes::opaque_pass::{
-        extract::OpaqueRenderMeshComponent, queue::Opaque3dRenderPhase,
-    },
-    pipeline::shadow_pass::gpu_resources::{
+    passes::opaque::{extract::OpaqueRenderMeshComponent, queue::Opaque3dRenderPhase},
+    passes::shadow::gpu_resources::{
         ShadowDepthTextureResource, ShadowPassPipeline, ShadowViewBuffer,
     },
 };
@@ -24,7 +22,7 @@ pub struct ShadowRenderPassNode;
 impl ViewNode for ShadowRenderPassNode {
     type ViewQuery = &'static Opaque3dRenderPhase;
 
-    #[instrument(skip_all, name = "shadow_pass_render_node")]
+    #[instrument(skip_all, name = "shadow_render_node")]
     fn run(
         &self,
         _graph: &mut RenderGraphContext,
diff --git a/crates/client/src/render/pipeline/main_passes/transparent_pass/extract.rs b/crates/client/src/render/passes/transparent/extract.rs
similarity index 65%
rename from crates/client/src/render/pipeline/main_passes/transparent_pass/extract.rs
rename to crates/client/src/render/passes/transparent/extract.rs
index 0be3a008..4ac10412 100644
--- a/crates/client/src/render/pipeline/main_passes/transparent_pass/extract.rs
+++ b/crates/client/src/render/passes/transparent/extract.rs
@@ -1,10 +1,9 @@
-use crate::render::chunk::{TransparentMeshComponent, VoxelMeshAsset};
-use crate::render::types::RenderTransformComponent;
+use crate::render::chunk::{BlockMeshAsset, TransparentMeshComponent};
 use bevy::asset::Handle;
 use bevy::ecs::prelude::*;
 use bevy::render::Extract;
 use bevy::render::sync_world::RenderEntity;
-use shared::simulation::chunk::TransformComponent;
+use bevy::transform::components::GlobalTransform;
 
 // INFO: -------------------------------
 //         render app components
@@ -13,7 +12,7 @@ use shared::simulation::chunk::TransformComponent;
 /// A component in the render world holding the extracted mesh handle.
 #[derive(Component, Clone)]
 pub struct TransparentRenderMeshComponent {
-    pub mesh_handle: Handle<VoxelMeshAsset>,
+    pub mesh_handle: Handle<BlockMeshAsset>,
 }
 
 // INFO: -----------------------------------
@@ -23,22 +22,14 @@ pub struct TransparentRenderMeshComponent {
 /// A system that extracts transparent meshes from the simulation world into the render world.
 pub fn extract_transparent_meshes(
     mut commands: Commands,
-    query: Extract<
-        Query<(
-            &RenderEntity,
-            &TransparentMeshComponent,
-            &TransformComponent,
-        )>,
-    >,
+    query: Extract<Query<(&RenderEntity, &TransparentMeshComponent, &GlobalTransform)>>,
 ) {
     for (render_entity, mesh, transform) in query.iter() {
         commands.entity(render_entity.id()).insert((
             TransparentRenderMeshComponent {
                 mesh_handle: mesh.mesh_handle.clone(),
             },
-            RenderTransformComponent {
-                transform: transform.to_matrix(),
-            },
+            *transform,
         ));
     }
 }
diff --git a/crates/client/src/render/pipeline/main_passes/transparent_pass/mod.rs b/crates/client/src/render/passes/transparent/mod.rs
similarity index 87%
rename from crates/client/src/render/pipeline/main_passes/transparent_pass/mod.rs
rename to crates/client/src/render/passes/transparent/mod.rs
index 300533df..10d98ef9 100644
--- a/crates/client/src/render/pipeline/main_passes/transparent_pass/mod.rs
+++ b/crates/client/src/render/passes/transparent/mod.rs
@@ -12,17 +12,19 @@ use startup::TransparentPipeline;
 // ---------------------------------
 
 use crate::{
-    VantablockNode,
-    render::pipeline::main_passes::transparent_pass::{
+    render::VantablockNode,
+    render::passes::transparent::{
         prepare::prepare_transparent_meshes_system, queue::queue_and_prepare_transparent_system,
     },
 };
 use bevy::prelude::IntoScheduleConfigs;
 use bevy::{
     app::{App, Plugin},
-    render::render_graph::{RenderGraphExt, ViewNodeRunner},
-    render::render_resource::SpecializedRenderPipelines,
-    render::{Render, RenderSystems},
+    render::{
+        Render, RenderSystems,
+        render_graph::{RenderGraphExt, ViewNodeRunner},
+        render_resource::SpecializedRenderPipelines,
+    },
 };
 
 pub struct TransparentRenderPassPlugin;
diff --git a/crates/client/src/render/pipeline/main_passes/transparent_pass/prepare.rs b/crates/client/src/render/passes/transparent/prepare.rs
similarity index 81%
rename from crates/client/src/render/pipeline/main_passes/transparent_pass/prepare.rs
rename to crates/client/src/render/passes/transparent/prepare.rs
index bdb5f8a9..25a72fa8 100644
--- a/crates/client/src/render/pipeline/main_passes/transparent_pass/prepare.rs
+++ b/crates/client/src/render/passes/transparent/prepare.rs
@@ -1,6 +1,4 @@
-use crate::render::pipeline::gpu_resources::world_uniforms::{
-    ChunkStorageBindGroupLayout, ChunkStorageManager,
-};
+use crate::render::resources::world_uniforms::{ChunkStorageBindGroupLayout, ChunkStorageManager};
 use crate::{
     prelude::*,
     render::data::{MeshesToUploadQueue, RenderMeshStorageResource},
@@ -10,7 +8,7 @@ use bevy::render::renderer::{RenderDevice, RenderQueue};
 use std::sync::Arc;
 
 /// A system that processes the `MeshesToUploadQueue` and uploads new or modified
-/// voxel meshes to the global GPU storage buffer.
+/// block meshes to the global GPU storage buffer.
 #[instrument(skip_all)]
 pub fn prepare_transparent_meshes_system(
     device: Res<RenderDevice>,
@@ -29,21 +27,21 @@ pub fn prepare_transparent_meshes_system(
     }
 
     // handle uploads (Added/Modified)
-    for (id, mesh, world_pos) in meshes_to_upload.queue.drain(..) {
+    for (id, mesh, world_pos) in meshes_to_upload.additions.drain(..) {
         // if it already exists, free the old allocation first
         if let Some(old_mesh_handle) = gpu_mesh_storage.meshes.remove(&id) {
             chunk_memory_manager.free_chunk(*old_mesh_handle);
         }
 
         // allocate and upload to global SSBO
-        if let Some(voxel_mesh) = chunk_memory_manager.allocate_chunk(
+        if let Some(block_mesh) = chunk_memory_manager.allocate_chunk(
             &device,
             &queue,
             &layout,
             &mesh.faces,
             world_pos.into(),
         ) {
-            gpu_mesh_storage.meshes.insert(id, Arc::new(voxel_mesh));
+            gpu_mesh_storage.meshes.insert(id, Arc::new(block_mesh));
             debug!(
                 target: "gpu_mesh_upload",
                 "Uploaded mesh {:?} to global SSBO at pos {:?}", id, world_pos
diff --git a/crates/client/src/render/pipeline/main_passes/transparent_pass/queue.rs b/crates/client/src/render/passes/transparent/queue.rs
similarity index 80%
rename from crates/client/src/render/pipeline/main_passes/transparent_pass/queue.rs
rename to crates/client/src/render/passes/transparent/queue.rs
index e9844c7e..34ea4573 100644
--- a/crates/client/src/render/pipeline/main_passes/transparent_pass/queue.rs
+++ b/crates/client/src/render/passes/transparent/queue.rs
@@ -1,14 +1,12 @@
 use crate::prelude::*;
-use crate::render::pipeline::main_passes::transparent_pass::extract::TransparentRenderMeshComponent;
-use crate::render::pipeline::main_passes::transparent_pass::startup::{
-    TransparentPipeline, TransparentPipelineKey,
-};
-use crate::render::types::RenderTransformComponent;
+use crate::render::passes::transparent::extract::TransparentRenderMeshComponent;
+use crate::render::passes::transparent::startup::{TransparentPipeline, TransparentPipelineKey};
 use bevy::ecs::prelude::*;
 use bevy::render::render_resource::{
     CachedRenderPipelineId, PipelineCache, SpecializedRenderPipelines,
 };
 use bevy::render::view::{ExtractedView, Msaa};
+use bevy::transform::components::GlobalTransform;
 
 #[derive(Debug)]
 pub struct PhaseItem {
@@ -30,11 +28,7 @@ pub struct Transparent3dRenderPhase {
 pub fn queue_and_prepare_transparent_system(
     // input
     mut views_query: Query<(&ExtractedView, &Msaa, &mut Transparent3dRenderPhase)>,
-    meshes_query: Query<(
-        Entity,
-        &TransparentRenderMeshComponent,
-        &RenderTransformComponent,
-    )>,
+    meshes_query: Query<(Entity, &TransparentRenderMeshComponent, &GlobalTransform)>,
     pipeline_cache: Res<PipelineCache>,
     mut specialized_pipelines: ResMut<SpecializedRenderPipelines<TransparentPipeline>>,
     transparent_pipeline: Res<TransparentPipeline>,
@@ -55,9 +49,7 @@ pub fn queue_and_prepare_transparent_system(
         // collect sortable items for the render pass
         let mut sortable_items: Vec<PhaseItem> = Vec::with_capacity(meshes_query.iter().len());
         for (entity, _mesh, transform) in meshes_query.iter() {
-            // TODO: frustum culling here using view.frustum or Bevy's ViewVisibility
-
-            let object_position = transform.transform.w_axis.truncate();
+            let object_position = transform.translation();
             let distance_from_camera = (object_position - camera_position).length_squared();
 
             sortable_items.push(PhaseItem {
diff --git a/crates/client/src/render/pipeline/main_passes/transparent_pass/render.rs b/crates/client/src/render/passes/transparent/render.rs
similarity index 81%
rename from crates/client/src/render/pipeline/main_passes/transparent_pass/render.rs
rename to crates/client/src/render/passes/transparent/render.rs
index 6a8d4819..536fb5c6 100644
--- a/crates/client/src/render/pipeline/main_passes/transparent_pass/render.rs
+++ b/crates/client/src/render/passes/transparent/render.rs
@@ -1,24 +1,24 @@
 use crate::prelude::*;
-use crate::render::pipeline::gpu_resources::world_uniforms::ChunkStorageManager;
-use crate::render::pipeline::main_passes::shared_resources::TextureArrayUniforms;
 use crate::render::{
     data::RenderMeshStorageResource,
-    pipeline::main_passes::{
-        shared_resources::{CentralCameraViewUniform, EnvironmentUniforms},
-        transparent_pass::{
-            extract::TransparentRenderMeshComponent, queue::Transparent3dRenderPhase,
-        },
+    passes::transparent::{
+        extract::TransparentRenderMeshComponent, queue::Transparent3dRenderPhase,
     },
+    resources::TextureArrayUniforms,
+    resources::world_uniforms::ChunkStorageManager,
+    resources::{CentralCameraViewUniform, EnvironmentUniforms},
 };
-use bevy::ecs::prelude::*;
 use bevy::ecs::query::QueryItem;
-use bevy::render::render_graph::{NodeRunError, RenderGraphContext, ViewNode};
-use bevy::render::render_resource::{
-    LoadOp, Operations, PipelineCache, RenderPassDepthStencilAttachment, RenderPassDescriptor,
-    StoreOp,
+use bevy::{
+    ecs::prelude::*,
+    render::render_graph::{NodeRunError, RenderGraphContext, ViewNode},
+    render::render_resource::{
+        LoadOp, Operations, PipelineCache, RenderPassDepthStencilAttachment, RenderPassDescriptor,
+        StoreOp,
+    },
+    render::renderer::RenderContext,
+    render::view::{ViewDepthTexture, ViewTarget},
 };
-use bevy::render::renderer::RenderContext;
-use bevy::render::view::{ViewDepthTexture, ViewTarget};
 
 #[derive(Default)]
 pub struct TransparentPassRenderNode;
@@ -30,7 +30,7 @@ impl ViewNode for TransparentPassRenderNode {
         &'static ViewDepthTexture,
     );
 
-    #[instrument(skip_all, name = "transparent_pass_render_node")]
+    #[instrument(skip_all, name = "transparent_render_node")]
     fn run(
         &self,
         _graph: &mut RenderGraphContext,
diff --git a/crates/client/src/render/pipeline/main_passes/transparent_pass/startup.rs b/crates/client/src/render/passes/transparent/startup.rs
similarity index 69%
rename from crates/client/src/render/pipeline/main_passes/transparent_pass/startup.rs
rename to crates/client/src/render/passes/transparent/startup.rs
index 4ae58049..86ec6c71 100644
--- a/crates/client/src/render/pipeline/main_passes/transparent_pass/startup.rs
+++ b/crates/client/src/render/passes/transparent/startup.rs
@@ -1,12 +1,14 @@
-use super::super::shared_resources::{
-    CentralCameraViewBindGroupLayout, EnvironmentBindGroupLayout, MAIN_DEPTH_FORMAT,
-    TextureArrayBindGroupLayout,
+use crate::render::{
+    resources::world_uniforms::ChunkStorageBindGroupLayout,
+    resources::{
+        CentralCameraViewBindGroupLayout, EnvironmentBindGroupLayout, TextureArrayBindGroupLayout,
+    },
+    shaders::{TRANSPARENT_FRAG_SHADER_HANDLE, TRANSPARENT_VERT_SHADER_HANDLE},
 };
-use crate::render::pipeline::{
-    gpu_resources::world_uniforms::ChunkStorageBindGroupLayout,
-    shader_registry::{TRANSPARENT_FRAG_SHADER_HANDLE, TRANSPARENT_VERT_SHADER_HANDLE},
+use bevy::{
+    core_pipeline::core_3d,
+    prelude::{FromWorld, Resource, World},
 };
-use bevy::prelude::{FromWorld, Resource, World};
 use bevy::{render::render_resource::*, render::view::ViewTarget};
 
 // INFO: -------------------
@@ -19,13 +21,12 @@ pub struct TransparentPipelineKey {
     pub hdr: bool,
 }
 
-// TODO: we should storethe actual layouts, NOT the descriptors
 #[derive(Resource)]
 pub struct TransparentPipeline {
-    pub view_layout: BindGroupLayoutDescriptor,
-    pub environment_layout: BindGroupLayoutDescriptor,
-    pub texture_layout: BindGroupLayoutDescriptor,
-    pub chunk_storage_layout: BindGroupLayoutDescriptor,
+    pub view_layout_descriptor: BindGroupLayoutDescriptor,
+    pub environment_layout_descriptor: BindGroupLayoutDescriptor,
+    pub texture_layout_descriptor: BindGroupLayoutDescriptor,
+    pub chunk_storage_layout_descriptor: BindGroupLayoutDescriptor,
 }
 
 impl FromWorld for TransparentPipeline {
@@ -37,10 +38,10 @@ impl FromWorld for TransparentPipeline {
         let chunk_storage_layout = world.resource::<ChunkStorageBindGroupLayout>();
 
         Self {
-            view_layout: view_layout.descriptor.clone(),
-            environment_layout: environment_layout.descriptor.clone(),
-            texture_layout: texture_layout.descriptor.clone(),
-            chunk_storage_layout: chunk_storage_layout.descriptor.clone(),
+            view_layout_descriptor: view_layout.descriptor.clone(),
+            environment_layout_descriptor: environment_layout.descriptor.clone(),
+            texture_layout_descriptor: texture_layout.descriptor.clone(),
+            chunk_storage_layout_descriptor: chunk_storage_layout.descriptor.clone(),
         }
     }
 }
@@ -58,10 +59,10 @@ impl SpecializedRenderPipeline for TransparentPipeline {
         RenderPipelineDescriptor {
             label: Some("Transparent Render Pipeline".into()),
             layout: vec![
-                self.view_layout.clone(),
-                self.environment_layout.clone(),
-                self.texture_layout.clone(),
-                self.chunk_storage_layout.clone(),
+                self.view_layout_descriptor.clone(),
+                self.environment_layout_descriptor.clone(),
+                self.texture_layout_descriptor.clone(),
+                self.chunk_storage_layout_descriptor.clone(),
             ],
             push_constant_ranges: vec![],
             vertex: VertexState {
@@ -81,7 +82,7 @@ impl SpecializedRenderPipeline for TransparentPipeline {
                 })],
             }),
             depth_stencil: Some(DepthStencilState {
-                format: MAIN_DEPTH_FORMAT,
+                format: core_3d::CORE_3D_DEPTH_FORMAT,
                 depth_write_enabled: false, // transparent objects don't write depth
                 depth_compare: CompareFunction::GreaterEqual,
                 stencil: StencilState::default(),
diff --git a/crates/client/src/render/pipeline/gpu_resources/mod.rs b/crates/client/src/render/pipeline/gpu_resources/mod.rs
deleted file mode 100644
index 0d344447..00000000
--- a/crates/client/src/render/pipeline/gpu_resources/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod world_uniforms;
-
-pub use world_uniforms::{
-    ChunkRenderData, ChunkStorageBindGroupLayout, ChunkStorageManager, VoxelMesh,
-};
diff --git a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/extract.rs b/crates/client/src/render/pipeline/main_passes/bounding_box_pass/extract.rs
deleted file mode 100644
index 0fb208ca..00000000
--- a/crates/client/src/render/pipeline/main_passes/bounding_box_pass/extract.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use crate::input::systems::toggle_chunk_borders::ChunkBoundsToggle;
-use bevy::ecs::resource::Resource;
-use bevy::render::extract_resource::ExtractResource;
-
-#[derive(Resource, Debug, PartialEq, Eq, Clone)]
-pub struct WireframeToggleState {
-    pub enabled: bool,
-}
-
-impl ExtractResource for WireframeToggleState {
-    type Source = ChunkBoundsToggle;
-
-    fn extract_resource(source: &Self::Source) -> Self {
-        Self {
-            enabled: source.enabled,
-        }
-    }
-}
diff --git a/crates/client/src/render/pipeline/main_passes/mod.rs b/crates/client/src/render/pipeline/main_passes/mod.rs
deleted file mode 100644
index 70e81716..00000000
--- a/crates/client/src/render/pipeline/main_passes/mod.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-pub mod bounding_box_pass;
-pub mod opaque_pass;
-pub mod shared_resources;
-pub mod transparent_pass;
-
-use shared_resources::{
-    CentralCameraViewBindGroupLayout, EnvironmentBindGroupLayout, TextureArrayBindGroupLayout,
-};
-pub use shared_resources::{CentralCameraViewUniform, EnvironmentUniforms, MAIN_DEPTH_FORMAT};
-
-// INFO: ---------------------------
-//         plugin definition
-// ---------------------------------
-
-use crate::render::pipeline::main_passes::{
-    bounding_box_pass::WireframeRenderPassPlugin,
-    opaque_pass::OpaqueRenderPassPlugin,
-    shared_resources::{
-        update_camera_view_buffer_system, update_environment_uniform_buffer_system,
-    },
-    transparent_pass::TransparentRenderPassPlugin,
-};
-use bevy::app::{App, Plugin};
-use bevy::prelude::IntoScheduleConfigs;
-use bevy::render::{Render, RenderSystems};
-
-/// A plugin that sets up all the necessary resources and render
-/// passes used in the rendering pipeline.
-pub struct PlayerCentricRenderPassPlugin;
-
-impl Plugin for PlayerCentricRenderPassPlugin {
-    fn build(&self, app: &mut App) {
-        // INFO: -----------------------------------------
-        //         prepare (also shared resources)
-        // -----------------------------------------------
-
-        app.add_systems(
-            Render,
-            (
-                update_camera_view_buffer_system,
-                update_environment_uniform_buffer_system,
-                shared_resources::prepare_texture_array_system,
-            )
-                .in_set(RenderSystems::Prepare),
-        );
-
-        // INFO: --------------------------------------
-        //         subplugins for render passes
-        // --------------------------------------------
-
-        app.add_plugins((
-            TransparentRenderPassPlugin,
-            OpaqueRenderPassPlugin,
-            WireframeRenderPassPlugin,
-        ));
-    }
-
-    fn finish(&self, app: &mut App) {
-        // INFO: ----------------------------------------------------
-        //         startup (shared resources for main passes)
-        // ----------------------------------------------------------
-
-        app.init_resource::<CentralCameraViewBindGroupLayout>();
-        app.init_resource::<EnvironmentBindGroupLayout>();
-        app.init_resource::<EnvironmentUniforms>();
-        app.init_resource::<TextureArrayBindGroupLayout>();
-
-        app.init_resource::<CentralCameraViewUniform>();
-    }
-}
diff --git a/crates/client/src/render/pipeline/main_passes/opaque_pass/prepare.rs b/crates/client/src/render/pipeline/main_passes/opaque_pass/prepare.rs
deleted file mode 100644
index 8c72262b..00000000
--- a/crates/client/src/render/pipeline/main_passes/opaque_pass/prepare.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use crate::prelude::*;
-
-/// A system that no longer needs to do anything because mesh uploads are
-/// handled once per frame by the shared `MeshesToUploadQueue` in the
-/// transparent pass (or any pass that runs first).
-///
-/// Since the SSBO and `RenderMeshStorageResource` are shared, processing the
-/// queue once is sufficient.
-#[instrument(skip_all)]
-pub fn prepare_opaque_meshes_system() {}
-
-/// Removed in favor of handling removals in the main prepare system.
-pub fn delete_gpu_buffers_system() {}
diff --git a/crates/client/src/render/pipeline/main_passes/opaque_pass/startup/mod.rs b/crates/client/src/render/pipeline/main_passes/opaque_pass/startup/mod.rs
deleted file mode 100644
index 4f3822ef..00000000
--- a/crates/client/src/render/pipeline/main_passes/opaque_pass/startup/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod setup_pipelines;
-
-pub use setup_pipelines::*;
diff --git a/crates/client/src/render/pipeline/main_passes/opaque_pass/startup/setup_pipelines.rs b/crates/client/src/render/pipeline/main_passes/opaque_pass/startup/setup_pipelines.rs
deleted file mode 100644
index 2bd1d363..00000000
--- a/crates/client/src/render/pipeline/main_passes/opaque_pass/startup/setup_pipelines.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use crate::input::systems::toggle_opaque_wireframe::OpaqueWireframeMode;
-use crate::render::pipeline::{
-    gpu_resources::world_uniforms::ChunkStorageBindGroupLayout,
-    main_passes::shared_resources::{
-        CentralCameraViewBindGroupLayout, EnvironmentBindGroupLayout, MAIN_DEPTH_FORMAT,
-        TextureArrayBindGroupLayout,
-    },
-    shader_registry::{
-        OPAQUE_FRAG_SHADER_HANDLE, OPAQUE_VERT_SHADER_HANDLE, SKYBOX_FRAG_SHADER_HANDLE,
-        SKYBOX_VERT_SHADER_HANDLE,
-    },
-};
-use bevy::{
-    ecs::prelude::*,
-    render::{extract_resource::ExtractResource, render_resource::*, view::ViewTarget},
-};
-use tracing::instrument;
-
-/// A resource that defines the current opaque render mode
-#[derive(Resource, Default, Debug, PartialEq, Eq, Hash, Clone, Copy)]
-pub enum OpaqueRenderMode {
-    #[default]
-    Fill,
-    Wireframe,
-}
-
-impl ExtractResource for OpaqueRenderMode {
-    type Source = OpaqueWireframeMode;
-
-    fn extract_resource(source: &Self::Source) -> Self {
-        if source.enabled {
-            OpaqueRenderMode::Wireframe
-        } else {
-            OpaqueRenderMode::Fill
-        }
-    }
-}
-
-/// A key that uniquely identifies a specialized opaque pipeline.
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
-pub struct OpaquePipelineKey {
-    pub msaa_samples: u32,
-    pub hdr: bool,
-    pub mode: OpaqueRenderMode,
-    pub is_skybox: bool,
-}
-
-/// A resource that holds all the layouts and handles needed to specialize opaque pipelines.
-#[derive(Resource)]
-pub struct OpaquePipelines {
-    pub view_layout: BindGroupLayoutDescriptor,
-    pub environment_layout: BindGroupLayoutDescriptor,
-    pub texture_layout: BindGroupLayoutDescriptor,
-    pub chunk_storage_layout: BindGroupLayoutDescriptor,
-}
-
-impl FromWorld for OpaquePipelines {
-    #[instrument(skip_all)]
-    fn from_world(world: &mut World) -> Self {
-        let view_layout = world.resource::<CentralCameraViewBindGroupLayout>();
-        let environment_layout = world.resource::<EnvironmentBindGroupLayout>();
-        let texture_layout = world.resource::<TextureArrayBindGroupLayout>();
-        let chunk_storage_layout = world.resource::<ChunkStorageBindGroupLayout>();
-
-        Self {
-            view_layout: view_layout.descriptor.clone(),
-            environment_layout: environment_layout.descriptor.clone(),
-            texture_layout: texture_layout.descriptor.clone(),
-            chunk_storage_layout: chunk_storage_layout.descriptor.clone(),
-        }
-    }
-}
-
-impl SpecializedRenderPipeline for OpaquePipelines {
-    type Key = OpaquePipelineKey;
-
-    fn specialize(&self, key: Self::Key) -> RenderPipelineDescriptor {
-        let format = if key.hdr {
-            ViewTarget::TEXTURE_FORMAT_HDR
-        } else {
-            TextureFormat::Rgba8UnormSrgb
-        };
-
-        let fragment_target = [Some(ColorTargetState {
-            format,
-            blend: Some(BlendState::REPLACE),
-            write_mask: ColorWrites::ALL,
-        })];
-
-        if key.is_skybox {
-            let depth_stencil = Some(DepthStencilState {
-                format: MAIN_DEPTH_FORMAT,
-                depth_write_enabled: false,
-                depth_compare: CompareFunction::GreaterEqual,
-                stencil: StencilState::default(),
-                bias: DepthBiasState::default(),
-            });
-
-            RenderPipelineDescriptor {
-                label: Some("Skybox Opaque Pipeline".into()),
-                layout: vec![self.view_layout.clone(), self.environment_layout.clone()],
-                push_constant_ranges: vec![],
-                vertex: VertexState {
-                    shader: SKYBOX_VERT_SHADER_HANDLE,
-                    shader_defs: vec![],
-                    entry_point: Some("vs_main".into()),
-                    buffers: vec![],
-                },
-                fragment: Some(FragmentState {
-                    shader: SKYBOX_FRAG_SHADER_HANDLE,
-                    shader_defs: vec![],
-                    entry_point: Some("fs_main".into()),
-                    targets: fragment_target.to_vec(),
-                }),
-                primitive: PrimitiveState {
-                    topology: PrimitiveTopology::TriangleList,
-                    front_face: FrontFace::Ccw,
-                    polygon_mode: PolygonMode::Fill,
-                    cull_mode: None,
-                    ..Default::default()
-                },
-                depth_stencil,
-                multisample: MultisampleState {
-                    count: key.msaa_samples,
-                    mask: !0,
-                    alpha_to_coverage_enabled: false,
-                },
-                zero_initialize_workgroup_memory: true,
-            }
-        } else {
-            let depth_stencil = Some(DepthStencilState {
-                format: MAIN_DEPTH_FORMAT,
-                depth_write_enabled: true,
-                depth_compare: CompareFunction::GreaterEqual,
-                stencil: StencilState::default(),
-                bias: DepthBiasState::default(),
-            });
-
-            let polygon_mode = match key.mode {
-                OpaqueRenderMode::Fill => PolygonMode::Fill,
-                OpaqueRenderMode::Wireframe => PolygonMode::Line,
-            };
-
-            let label = match key.mode {
-                OpaqueRenderMode::Fill => "Opaque Pipeline",
-                OpaqueRenderMode::Wireframe => "Wireframe Opaque Pipeline",
-            };
-
-            RenderPipelineDescriptor {
-                label: Some(label.into()),
-                layout: vec![
-                    self.view_layout.clone(),
-                    self.environment_layout.clone(),
-                    self.texture_layout.clone(),
-                    self.chunk_storage_layout.clone(),
-                ],
-                push_constant_ranges: vec![],
-                vertex: VertexState {
-                    shader: OPAQUE_VERT_SHADER_HANDLE,
-                    shader_defs: vec![],
-                    entry_point: Some("vs_main".into()),
-                    buffers: vec![],
-                },
-                fragment: Some(FragmentState {
-                    shader: OPAQUE_FRAG_SHADER_HANDLE,
-                    shader_defs: vec![],
-                    entry_point: Some("fs_main".into()),
-                    targets: fragment_target.to_vec(),
-                }),
-                primitive: PrimitiveState {
-                    topology: PrimitiveTopology::TriangleList,
-                    front_face: FrontFace::Ccw,
-                    polygon_mode,
-                    cull_mode: Some(Face::Back),
-                    ..Default::default()
-                },
-                depth_stencil,
-                multisample: MultisampleState {
-                    count: key.msaa_samples,
-                    mask: !0,
-                    alpha_to_coverage_enabled: false,
-                },
-                zero_initialize_workgroup_memory: true,
-            }
-        }
-    }
-}
diff --git a/crates/client/src/render/pipeline/mod.rs b/crates/client/src/render/pipeline/mod.rs
deleted file mode 100644
index 608eaf54..00000000
--- a/crates/client/src/render/pipeline/mod.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-pub mod gpu_resources;
-pub mod main_passes;
-pub mod shader_registry;
-pub mod shadow_pass;
-
-pub use gpu_resources::*;
-pub use main_passes::*;
-pub use shader_registry::*;
-pub use shadow_pass::*;
-
-// INFO: ---------------------------
-//         plugin definition
-// ---------------------------------
-
-use crate::VantablockNode;
-use bevy::{
-    app::{App, Plugin},
-    render::render_graph::RenderGraphExt,
-};
-
-/// A plugin that sets up all the necessary resources and render
-/// passes used in the rendering pipeline.
-pub struct WorldRenderPassesPlugin;
-
-impl Plugin for WorldRenderPassesPlugin {
-    fn build(&self, app: &mut App) {
-        // renderpass plugins
-        app.add_plugins((ShadowRenderPassPlugin, PlayerCentricRenderPassPlugin));
-    }
-
-    fn finish(&self, app: &mut App) {
-        // shared world uniform resources
-        app.init_resource::<gpu_resources::ChunkStorageBindGroupLayout>();
-        app.init_resource::<gpu_resources::ChunkStorageManager>();
-    }
-}
-
-/// A plugin responsible ONLY for wiring the edges between nodes in the render graph.
-/// This must be added AFTER all pass plugins to ensure all nodes exist.
-pub struct RenderGraphEdgesPlugin;
-
-impl Plugin for RenderGraphEdgesPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_render_graph_edges(
-            bevy::core_pipeline::core_3d::graph::Core3d,
-            (
-                bevy::core_pipeline::core_3d::graph::Node3d::StartMainPass,
-                VantablockNode::ShadowPass,
-                bevy::core_pipeline::core_3d::graph::Node3d::MainOpaquePass,
-            ),
-        );
-
-        app.add_render_graph_edges(
-            bevy::core_pipeline::core_3d::graph::Core3d,
-            (
-                bevy::core_pipeline::core_3d::graph::Node3d::MainOpaquePass,
-                VantablockNode::OpaquePass,
-                VantablockNode::TransparentPass,
-                bevy::core_pipeline::core_3d::graph::Node3d::MainTransparentPass,
-            ),
-        );
-
-        app.add_render_graph_edges(
-            bevy::core_pipeline::core_3d::graph::Core3d,
-            (
-                bevy::core_pipeline::core_3d::graph::Node3d::MainTransparentPass,
-                VantablockNode::BoundingBoxPass,
-                bevy::core_pipeline::core_3d::graph::Node3d::EndMainPass,
-            ),
-        );
-    }
-}
diff --git a/crates/client/src/render/pipeline/main_passes/shared_resources/environment_uniform.rs b/crates/client/src/render/resources/environment_uniform.rs
similarity index 100%
rename from crates/client/src/render/pipeline/main_passes/shared_resources/environment_uniform.rs
rename to crates/client/src/render/resources/environment_uniform.rs
diff --git a/crates/client/src/render/pipeline/main_passes/shared_resources/mod.rs b/crates/client/src/render/resources/mod.rs
similarity index 78%
rename from crates/client/src/render/pipeline/main_passes/shared_resources/mod.rs
rename to crates/client/src/render/resources/mod.rs
index a9fa1a40..b75cbb8f 100644
--- a/crates/client/src/render/pipeline/main_passes/shared_resources/mod.rs
+++ b/crates/client/src/render/resources/mod.rs
@@ -1,10 +1,7 @@
 pub mod environment_uniform;
 pub mod tex_array_uniforms;
 pub mod view_uniforms;
-
-use bevy::render::render_resource::TextureFormat;
-
-pub const MAIN_DEPTH_FORMAT: TextureFormat = TextureFormat::Depth32Float;
+pub mod world_uniforms;
 
 pub use environment_uniform::{
     EnvironmentBindGroupLayout, EnvironmentUniforms, update_environment_uniform_buffer_system,
diff --git a/crates/client/src/render/pipeline/main_passes/shared_resources/tex_array_uniforms.rs b/crates/client/src/render/resources/tex_array_uniforms.rs
similarity index 99%
rename from crates/client/src/render/pipeline/main_passes/shared_resources/tex_array_uniforms.rs
rename to crates/client/src/render/resources/tex_array_uniforms.rs
index 8e167148..c7a1a60e 100644
--- a/crates/client/src/render/pipeline/main_passes/shared_resources/tex_array_uniforms.rs
+++ b/crates/client/src/render/resources/tex_array_uniforms.rs
@@ -58,7 +58,7 @@ impl FromWorld for TextureArrayBindGroupLayout {
     }
 }
 
-/// A resource owning the GPU data for the texture array for all voxel textures.
+/// A resource owning the GPU data for the texture array for all block textures.
 #[derive(Resource)]
 pub struct TextureArrayUniforms {
     pub bind_group: BindGroup,
diff --git a/crates/client/src/render/pipeline/main_passes/shared_resources/view_uniforms.rs b/crates/client/src/render/resources/view_uniforms.rs
similarity index 93%
rename from crates/client/src/render/pipeline/main_passes/shared_resources/view_uniforms.rs
rename to crates/client/src/render/resources/view_uniforms.rs
index 3b24400e..52b424cc 100644
--- a/crates/client/src/render/pipeline/main_passes/shared_resources/view_uniforms.rs
+++ b/crates/client/src/render/resources/view_uniforms.rs
@@ -1,16 +1,18 @@
 use crate::prelude::*;
-use crate::render::pipeline::main_passes::opaque_pass::queue::Opaque3dRenderPhase;
-use crate::render::pipeline::shadow_pass::gpu_resources::{
-    ShadowDepthTextureResource, ShadowViewBuffer,
+use crate::render::passes::{
+    opaque::queue::Opaque3dRenderPhase,
+    shadow::gpu_resources::{ShadowDepthTextureResource, ShadowViewBuffer},
 };
 use bevy::ecs::prelude::*;
-use bevy::render::render_resource::{
-    BindGroup, BindGroupEntry, BindingResource, Buffer, BufferDescriptor, BufferUsages,
+use bevy::render::{
+    render_resource::{
+        BindGroup, BindGroupEntry, BindingResource, Buffer, BufferDescriptor, BufferUsages,
+    },
+    renderer::{RenderDevice, RenderQueue},
+    view::ExtractedView,
 };
-use bevy::render::renderer::{RenderDevice, RenderQueue};
-use bevy::render::view::ExtractedView;
 use bytemuck::{Pod, Zeroable};
-use shared::simulation::chunk::{CHUNK_SIDE_LENGTH, RENDER_DISTANCE};
+use shared::world::chunk::{CHUNK_SIDE_LENGTH, RENDER_DISTANCE};
 
 // INFO: ---------------------------------
 //         uniform data definition
diff --git a/crates/client/src/render/pipeline/gpu_resources/world_uniforms.rs b/crates/client/src/render/resources/world_uniforms.rs
similarity index 95%
rename from crates/client/src/render/pipeline/gpu_resources/world_uniforms.rs
rename to crates/client/src/render/resources/world_uniforms.rs
index b184dc5b..0ef645d8 100644
--- a/crates/client/src/render/pipeline/gpu_resources/world_uniforms.rs
+++ b/crates/client/src/render/resources/world_uniforms.rs
@@ -30,9 +30,9 @@ pub struct ChunkRenderData {
     pub start_index: u32,
 }
 
-/// A voxel mesh handle holding the GPU allocation and index.
+/// A block mesh handle holding the GPU allocation and index.
 #[derive(Clone, Copy)]
-pub struct VoxelMesh {
+pub struct BlockMesh {
     /// Handle for the geometry (face) buffer
     pub geometry_allocation: Allocation,
     /// Handle for metadata buffer (instance index)
@@ -150,7 +150,7 @@ impl FromWorld for ChunkStorageManager {
         let layout = world.resource::<ChunkStorageBindGroupLayout>();
 
         let face_buffer = device.create_buffer(&BufferDescriptor {
-            label: Some("Global Voxel SSBO"),
+            label: Some("Global Block SSBO"),
             size: INITIAL_PHYSICAL_SIZE,
             usage: BufferUsages::STORAGE | BufferUsages::COPY_DST | BufferUsages::COPY_SRC,
             mapped_at_creation: false,
@@ -164,7 +164,7 @@ impl FromWorld for ChunkStorageManager {
         });
 
         let bind_group = device.create_bind_group(
-            Some("Global Voxel Bind Group"),
+            Some("Global Block Bind Group"),
             &layout.layout,
             &[
                 BindGroupEntry {
@@ -222,7 +222,7 @@ impl ChunkStorageManager {
             new_size = max_buffer_size;
             if required_end_byte > max_buffer_size {
                 panic!(
-                    "Voxel geometry exceeded GPU hardware limit of {} bytes!",
+                    "Block geometry exceeded GPU hardware limit of {} bytes!",
                     max_buffer_size
                 );
             }
@@ -230,13 +230,13 @@ impl ChunkStorageManager {
 
         debug!(
             target : "gpu_memory",
-            "Resizing voxel geometry buffer to {} MB",
+            "Resizing block geometry buffer to {} MB",
             new_size / 1024 / 1024
         );
 
         // new buffer
         let new_buffer = device.create_buffer(&BufferDescriptor {
-            label: Some("Global Voxel SSBO (Resized)"),
+            label: Some("Global Block SSBO (Resized)"),
             size: new_size,
             usage: BufferUsages::STORAGE | BufferUsages::COPY_DST | BufferUsages::COPY_SRC,
             mapped_at_creation: false,
@@ -255,7 +255,7 @@ impl ChunkStorageManager {
         // replace buffer and rebuild bind group
         self.face_buffer = new_buffer;
         self.bind_group = device.create_bind_group(
-            Some("Global Voxel Bind Group"),
+            Some("Global Block Bind Group"),
             &layout.layout,
             &[
                 BindGroupEntry {
@@ -278,7 +278,7 @@ impl ChunkStorageManager {
         layout: &ChunkStorageBindGroupLayout,
         faces: &[PackedFace],
         world_pos: [f32; 3],
-    ) -> Option<VoxelMesh> {
+    ) -> Option<BlockMesh> {
         if faces.is_empty() {
             return None;
         }
@@ -320,7 +320,7 @@ impl ChunkStorageManager {
             bytemuck::bytes_of(&meta_data),
         );
 
-        Some(VoxelMesh {
+        Some(BlockMesh {
             geometry_allocation,
             slot_index,
             face_count: faces.len() as u32,
@@ -328,7 +328,7 @@ impl ChunkStorageManager {
     }
 
     /// Frees all resources associated with the chunk handle.
-    pub fn free_chunk(&mut self, mesh: VoxelMesh) {
+    pub fn free_chunk(&mut self, mesh: BlockMesh) {
         self.geometry_allocator.free(mesh.geometry_allocation);
         self.slot_allocator.free(mesh.slot_index);
     }
diff --git a/crates/client/src/render/pipeline/shader_registry.rs b/crates/client/src/render/shaders.rs
similarity index 100%
rename from crates/client/src/render/pipeline/shader_registry.rs
rename to crates/client/src/render/shaders.rs
diff --git a/crates/client/src/render/texture/voxel_texture_processor.rs b/crates/client/src/render/texture/block/block_texture_processor.rs
similarity index 92%
rename from crates/client/src/render/texture/voxel_texture_processor.rs
rename to crates/client/src/render/texture/block/block_texture_processor.rs
index de6d3231..3023e200 100644
--- a/crates/client/src/render/texture/voxel_texture_processor.rs
+++ b/crates/client/src/render/texture/block/block_texture_processor.rs
@@ -1,3 +1,4 @@
+use super::block_texture_registry::{TextureId, TextureRegistryResource};
 use crate::prelude::*;
 use crate::render::texture::error::TextureLoadError;
 use bevy::asset::RenderAssetUsages;
@@ -6,17 +7,16 @@ use bevy::render::render_resource::{
     Extent3d, TextureDimension, TextureFormat, TextureViewDescriptor, TextureViewDimension,
 };
 use image::RgbaImage;
-use shared::simulation::block::texture_registry::{TextureId, TextureRegistryResource};
 use std::collections::HashMap;
 use std::path::PathBuf;
 
-/// A utility for loading voxel texture folders and generating resources from them
-pub struct VoxelTextureProcessor {
+/// A utility for loading block texture folders and generating resources from them
+pub struct BlockTextureProcessor {
     base_path: PathBuf,
     texture_pack: String,
 }
 
-impl VoxelTextureProcessor {
+impl BlockTextureProcessor {
     pub fn new(assets_dir: PathBuf, texture_pack: &str) -> Self {
         Self {
             base_path: assets_dir.join("client/texture"),
@@ -48,7 +48,7 @@ impl VoxelTextureProcessor {
         // Use the paths to load pixels
         let mut images = Vec::with_capacity(paths.len() + 1);
 
-        // load/generate first image to get dimensions of all voxel textures
+        // load/generate first image to get dimensions of all block textures
         let first_pixels = if let Some(first_path) = paths.first() {
             image::open(first_path)
                 .map_err(|e| TextureLoadError::ImageError(first_path.display().to_string(), e))?
@@ -99,7 +99,7 @@ impl VoxelTextureProcessor {
         );
 
         texture_array.texture_view_descriptor = Some(TextureViewDescriptor {
-            label: Some("Voxel Texture Array View"),
+            label: Some("Block Texture Array View"),
             dimension: Some(TextureViewDimension::D2Array),
             ..Default::default()
         });
@@ -134,7 +134,7 @@ fn generate_missing_texture_image(width: u32, height: u32) -> RgbaImage {
         for x in 0..width {
             let checker_x = x / checker_size;
             let checker_y = y / checker_size;
-            let is_even = (checker_x + checker_y) % 2 == 0;
+            let is_even = (checker_x + checker_y).is_multiple_of(2);
 
             // defaults to transparent so that it works for both opaque and transparency
             let color = if is_even {
diff --git a/crates/client/src/render/texture/block/block_texture_registry.rs b/crates/client/src/render/texture/block/block_texture_registry.rs
new file mode 100644
index 00000000..843f14d2
--- /dev/null
+++ b/crates/client/src/render/texture/block/block_texture_registry.rs
@@ -0,0 +1,117 @@
+use crate::prelude::*;
+use crate::render::texture::block::block_texture_processor::BlockTextureProcessor;
+use bevy::asset::{Assets, Handle};
+use bevy::ecs::prelude::*;
+use bevy::ecs::resource::Resource;
+use bevy::ecs::world::CommandQueue;
+use bevy::prelude::Image;
+use bevy::render::extract_resource::ExtractResource;
+use bevy::tasks::AsyncComputeTaskPool;
+use shared::lifecycle::PersistentPathsResource;
+use shared::lifecycle::load::{LoadingTaskComponent, NodeCompleted, StartNode};
+use std::{collections::HashMap, sync::Arc};
+
+/// Marker node for loading and stitching block textures.
+#[derive(Component)]
+pub struct LoadTextures;
+
+/// A numeric ID for a texture, representing its index in the texture array.
+pub type TextureId = u32;
+
+pub type TextureLoadError = String;
+
+/// A resource holding the handle to the stitched block texture array.
+#[derive(Resource, Clone, Debug, ExtractResource)]
+pub struct BlockTextureArray {
+    pub handle: Handle<Image>,
+}
+
+/// A registry for looking up texture indices from a texture name.
+#[derive(Resource, Clone)]
+pub struct TextureRegistryResource {
+    /// Maps the texture name to its TextureId (index) in the GPU texture array.
+    name_to_id: Arc<HashMap<String, TextureId>>,
+
+    /// The index of the fallback "missing texture" pattern.
+    missing_texture_id: TextureId,
+}
+
+impl TextureRegistryResource {
+    /// Creates a new texture registry from a pre-populated map.
+    pub fn new(map: HashMap<String, TextureId>) -> Result<Self, TextureLoadError> {
+        let missing_texture_id = *map.get("missing").expect("Missing texture not in map");
+
+        Ok(Self {
+            name_to_id: Arc::new(map),
+            missing_texture_id,
+        })
+    }
+
+    /// Gets the texture ID for a given name, returning the missing texture ID if not found.
+    pub fn get_id(&self, name: &str) -> TextureId {
+        self.name_to_id
+            .get(name)
+            .copied()
+            .unwrap_or(self.missing_texture_id)
+    }
+
+    /// Returns the missing texture ID.
+    pub fn missing_texture(&self) -> TextureId {
+        self.missing_texture_id
+    }
+
+    /// Returns true if the registry contains a texture with the given name.
+    pub fn contains(&self, name: &str) -> bool {
+        self.name_to_id.contains_key(name)
+    }
+
+    /// Returns the total number of textures in the registry.
+    pub fn len(&self) -> usize {
+        self.name_to_id.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.name_to_id.is_empty()
+    }
+}
+
+/// An asynchronous loading observer for the texture registry.
+///
+/// This is triggered when the texture stitching node is ready to begin.
+pub fn handle_texture_stitching(
+    trigger: On<StartNode>,
+    mut commands: Commands,
+    client_settings: Res<ClientSettings>,
+    persistent_paths: Res<PersistentPathsResource>,
+) {
+    let settings = client_settings.clone();
+    let paths = persistent_paths.0.clone();
+    let node_entity = trigger.0.entity();
+
+    let task = AsyncComputeTaskPool::get().spawn(async move {
+        let (texture_array_image, texture_registry) =
+            BlockTextureProcessor::new(paths.assets_dir.clone(), &settings.texture_pack)
+                .load_and_stitch()
+                .expect("Failed to load and stitch block textures!");
+
+        let mut queue = CommandQueue::default();
+        queue.push(move |world: &mut World| {
+            let mut image_assets = world.resource_mut::<Assets<Image>>();
+            let texture_handle = image_assets.add(texture_array_image);
+
+            world.insert_resource(texture_registry);
+            world.insert_resource(BlockTextureArray {
+                handle: texture_handle,
+            });
+
+            // Signal that this node is finished
+            world.trigger(NodeCompleted::of::<LoadTextures>());
+        });
+        queue
+    });
+
+    // Spawn the task as a child of the node entity
+    commands.entity(node_entity).with_children(|parent| {
+        parent.spawn(LoadingTaskComponent(task));
+    });
+}
diff --git a/crates/client/src/render/texture/block/mod.rs b/crates/client/src/render/texture/block/mod.rs
new file mode 100644
index 00000000..e43315ea
--- /dev/null
+++ b/crates/client/src/render/texture/block/mod.rs
@@ -0,0 +1,22 @@
+pub mod block_texture_processor;
+pub mod block_texture_registry;
+
+pub use block_texture_processor::BlockTextureProcessor;
+pub use block_texture_registry::{BlockTextureArray, TextureId, TextureRegistryResource};
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::{prelude::*, render::texture::block::block_texture_registry::handle_texture_stitching};
+use block_texture_registry::LoadTextures;
+use shared::{AppStartupLoadingPhase, LoadingAppExt};
+
+pub struct BlockTexturePlugin;
+
+impl Plugin for BlockTexturePlugin {
+    fn build(&self, app: &mut App) {
+        app.configure_loading_phase::<AppStartupLoadingPhase>()
+            .add_node(LoadTextures, handle_texture_stitching);
+    }
+}
diff --git a/crates/client/src/render/texture/mod.rs b/crates/client/src/render/texture/mod.rs
index 957acc12..ebc25e27 100644
--- a/crates/client/src/render/texture/mod.rs
+++ b/crates/client/src/render/texture/mod.rs
@@ -1,6 +1,9 @@
+pub mod block;
 pub mod error;
-pub mod voxel_texture_processor;
 
+pub use block::{
+    BlockTexturePlugin,
+    block_texture_processor::BlockTextureProcessor,
+    block_texture_registry::{BlockTextureArray, TextureId, TextureRegistryResource},
+};
 pub use error::TextureLoadError;
-pub use shared::simulation::block::texture_registry::{BlockTextureArray, TextureRegistryResource};
-pub use voxel_texture_processor::VoxelTextureProcessor;
diff --git a/crates/client/src/render/types/mod.rs b/crates/client/src/render/types/mod.rs
index a55ea1cc..670583a0 100644
--- a/crates/client/src/render/types/mod.rs
+++ b/crates/client/src/render/types/mod.rs
@@ -1,14 +1,3 @@
-mod wireframe_vertex;
+pub mod wireframe_vertex;
 
-pub use crate::render::chunk::meshing::packed_face::PackedFace;
-pub use crate::render::pipeline::VoxelMesh;
 pub use wireframe_vertex::WireframeVertex;
-
-use bevy::ecs::component::Component;
-use bevy::math::Mat4;
-
-/// A component representing a transform on a mesh in the render world.
-#[derive(Component, Clone)]
-pub struct RenderTransformComponent {
-    pub transform: Mat4,
-}
diff --git a/crates/client/src/settings.rs b/crates/client/src/settings.rs
index 82ba1b20..9fc5890e 100644
--- a/crates/client/src/settings.rs
+++ b/crates/client/src/settings.rs
@@ -1,5 +1,9 @@
-use bevy::ecs::prelude::Resource;
+use bevy::{
+    app::{App, Plugin},
+    ecs::prelude::Resource,
+};
 use serde::{Deserialize, Serialize};
+use shared::lifecycle::PersistentPathsResource;
 use std::fs;
 use tracing::{info, warn};
 use utils::PersistentPaths;
@@ -58,3 +62,19 @@ impl ClientSettings {
         default_config
     }
 }
+
+/// A plugin that automatically loads or creates the [`ClientSettings`] resource.
+pub struct ClientSettingsPlugin;
+
+impl Plugin for ClientSettingsPlugin {
+    fn build(&self, app: &mut App) {
+        // if paths isn't already there, this will trigger the resolve (via PathsPlugin being added before this)
+        let paths = app
+            .world()
+            .get_resource::<PersistentPathsResource>()
+            .map(|r| r.0.clone())
+            .unwrap_or_else(PersistentPaths::resolve_client);
+
+        app.insert_resource(ClientSettings::load_or_create(&paths));
+    }
+}
diff --git a/crates/client/src/showcase/mod.rs b/crates/client/src/showcase/mod.rs
index c105ec21..2b2afcc0 100644
--- a/crates/client/src/showcase/mod.rs
+++ b/crates/client/src/showcase/mod.rs
@@ -1,9 +1,8 @@
 pub mod systems;
 
-use bevy::app::{App, Plugin, Startup, Update};
-use bevy::ecs::prelude::{IntoScheduleConfigs, Res};
-use shared::simulation::input::resources::ActionStateResource;
-use shared::simulation::input::types::SimulationAction;
+use crate::input::local_actions::ClientAction;
+use bevy::prelude::*;
+use leafwing_input_manager::prelude::ActionState;
 use systems::{apply_default_showcase_system, apply_showcase_system};
 
 pub struct ShowcasePlugin;
@@ -14,17 +13,24 @@ impl Plugin for ShowcasePlugin {
 
         app.add_systems(
             Update,
-            apply_showcase_system.run_if(|action_state: Res<ActionStateResource>| {
-                action_state.just_happened(SimulationAction::Showcase0)
-                    || action_state.just_happened(SimulationAction::Showcase1)
-                    || action_state.just_happened(SimulationAction::Showcase2)
-                    || action_state.just_happened(SimulationAction::Showcase3)
-                    || action_state.just_happened(SimulationAction::Showcase4)
-                    || action_state.just_happened(SimulationAction::Showcase5)
-                    || action_state.just_happened(SimulationAction::Showcase6)
-                    || action_state.just_happened(SimulationAction::Showcase7)
-                    || action_state.just_happened(SimulationAction::Showcase8)
-                    || action_state.just_happened(SimulationAction::Showcase9)
+            apply_showcase_system.run_if(|query: Query<&ActionState<ClientAction>>| {
+                let Some(action_state) = query.iter().next() else {
+                    return false;
+                };
+                [
+                    ClientAction::Showcase0,
+                    ClientAction::Showcase1,
+                    ClientAction::Showcase2,
+                    ClientAction::Showcase3,
+                    ClientAction::Showcase4,
+                    ClientAction::Showcase5,
+                    ClientAction::Showcase6,
+                    ClientAction::Showcase7,
+                    ClientAction::Showcase8,
+                    ClientAction::Showcase9,
+                ]
+                .iter()
+                .any(|a| action_state.just_pressed(a))
             }),
         );
     }
diff --git a/crates/client/src/showcase/systems.rs b/crates/client/src/showcase/systems.rs
index 1f90b679..f8e9e44b 100644
--- a/crates/client/src/showcase/systems.rs
+++ b/crates/client/src/showcase/systems.rs
@@ -1,14 +1,13 @@
+use crate::input::local_actions::ClientAction;
 use bevy::ecs::prelude::*;
 use bevy::math::{Quat, Vec3};
 use bevy::prelude::{Camera, Camera3d, Projection, Transform};
-use shared::simulation::input::resources::ActionStateResource;
-use shared::simulation::input::types::SimulationAction;
-use shared::simulation::terrain::{ActiveTerrainGenerator, TerrainGeneratorLibrary};
-use shared::simulation::time::{WorldClockResource, world_clock::SECONDS_IN_A_DAY};
+use leafwing_input_manager::prelude::ActionState;
+use shared::time::{SECONDS_IN_A_DAY, WorldClockResource};
 use std::time::Duration;
 
 struct Showcase {
-    generator_idx: usize,
+    _generator_idx: usize,
     time_of_day: f32,
     position: Vec3,
     yaw: f32,
@@ -18,7 +17,7 @@ struct Showcase {
 const SHOWCASES: &[Showcase] = &[
     Showcase {
         // basic flat area for introduction
-        generator_idx: 0,
+        _generator_idx: 0,
         time_of_day: 0.25, // showcase sun shining from left
         position: Vec3::new(0.0, 68.5, 0.0),
         yaw: 85.0,
@@ -26,7 +25,7 @@ const SHOWCASES: &[Showcase] = &[
     },
     Showcase {
         // sinwave with vertex waving and shadows
-        generator_idx: 1,
+        _generator_idx: 1,
         time_of_day: 0.3, // showcase sun shining from left
         position: Vec3::new(-661.0, 68.5, 175.0),
         yaw: 85.0,
@@ -34,7 +33,7 @@ const SHOWCASES: &[Showcase] = &[
     },
     Showcase {
         // realistic terrain gen with horizon
-        generator_idx: 2,  // realistic terrain
+        _generator_idx: 2, // realistic terrain
         time_of_day: 0.73, // sunset
         position: Vec3::new(939.0, 71.2, 1218.0),
         yaw: -169.0,
@@ -42,7 +41,7 @@ const SHOWCASES: &[Showcase] = &[
     },
     Showcase {
         // showcase 3d simplex noise to feature 3d terrain
-        generator_idx: 4, // 3d simplex
+        _generator_idx: 4, // 3d simplex
         time_of_day: 0.25,
         position: Vec3::new(1425.0, 73.0, 1984.0),
         yaw: 48.0,
@@ -50,7 +49,7 @@ const SHOWCASES: &[Showcase] = &[
     },
     Showcase {
         // cool bump thing
-        generator_idx: 3,
+        _generator_idx: 3,
         time_of_day: 0.223,
         position: Vec3::new(3696.0, 105.0, 474.0),
         yaw: 0.0,
@@ -58,7 +57,7 @@ const SHOWCASES: &[Showcase] = &[
     },
     Showcase {
         // beach scenery
-        generator_idx: 3,
+        _generator_idx: 3,
         time_of_day: 0.25,
         position: Vec3::new(37239.0, 75.1, -2423.0),
         yaw: 30.0,
@@ -66,7 +65,7 @@ const SHOWCASES: &[Showcase] = &[
     },
     Showcase {
         // badlands
-        generator_idx: 3,
+        _generator_idx: 3,
         time_of_day: 0.25,
         position: Vec3::new(38250.0, 136.5, 416.6),
         yaw: -197.0,
@@ -75,25 +74,41 @@ const SHOWCASES: &[Showcase] = &[
 ];
 
 pub fn apply_showcase_system(
-    action_state: Res<ActionStateResource>,
-    mut active_cam_q: Query<(&mut Transform, &Camera, &mut Projection), With<Camera3d>>,
-    mut active_generator: ResMut<ActiveTerrainGenerator>,
-    terrain_gen_lib: Res<TerrainGeneratorLibrary>,
+    mut active_cam_q: Query<
+        (
+            &mut Transform,
+            &Camera,
+            &mut Projection,
+            &ActionState<ClientAction>,
+        ),
+        With<Camera3d>,
+    >,
+    // mut active_generator: ResMut<ActiveTerrainGenerator>,
+    // terrain_gen_lib: Res<TerrainGeneratorLibrary>,
     mut world_clock: ResMut<WorldClockResource>,
 ) {
-    let showcase_idx = if action_state.just_happened(SimulationAction::Showcase0) {
+    let (mut transform, camera, _, action_state) = match active_cam_q.iter_mut().next() {
+        Some(q) => q,
+        None => return,
+    };
+
+    if !camera.is_active {
+        return;
+    }
+
+    let showcase_idx = if action_state.just_pressed(&ClientAction::Showcase0) {
         0
-    } else if action_state.just_happened(SimulationAction::Showcase1) {
+    } else if action_state.just_pressed(&ClientAction::Showcase1) {
         1
-    } else if action_state.just_happened(SimulationAction::Showcase2) {
+    } else if action_state.just_pressed(&ClientAction::Showcase2) {
         2
-    } else if action_state.just_happened(SimulationAction::Showcase3) {
+    } else if action_state.just_pressed(&ClientAction::Showcase3) {
         3
-    } else if action_state.just_happened(SimulationAction::Showcase4) {
+    } else if action_state.just_pressed(&ClientAction::Showcase4) {
         4
-    } else if action_state.just_happened(SimulationAction::Showcase5) {
+    } else if action_state.just_pressed(&ClientAction::Showcase5) {
         5
-    } else if action_state.just_happened(SimulationAction::Showcase6) {
+    } else if action_state.just_pressed(&ClientAction::Showcase6) {
         6
     } else {
         return;
@@ -101,42 +116,31 @@ pub fn apply_showcase_system(
 
     let showcase = &SHOWCASES[showcase_idx];
 
-    // set shaper
-    if let Some(generator) = terrain_gen_lib.generators.get(showcase.generator_idx) {
-        active_generator.0 = generator.clone();
-    }
-
     // set time of day
     world_clock.time_of_day = Duration::from_secs_f32(SECONDS_IN_A_DAY * showcase.time_of_day);
 
     // set camera position and rotation
-    for (mut transform, camera, _) in active_cam_q.iter_mut() {
-        if !camera.is_active {
-            continue;
-        }
+    transform.translation = showcase.position;
 
-        transform.translation = showcase.position;
-
-        // map yaw/pitch to Bevy rotation
-        // yaw -90 in old system was looking at -Z (Bevy default)
-        let yaw_rad = (showcase.yaw + 90.0).to_radians();
-        let pitch_rad = showcase.pitch.to_radians();
-        transform.rotation = Quat::from_rotation_y(-yaw_rad) * Quat::from_rotation_x(pitch_rad);
-    }
+    // map yaw/pitch to Bevy rotation
+    // yaw -90 in old system was looking at -Z (Bevy default)
+    let yaw_rad = (showcase.yaw + 90.0).to_radians();
+    let pitch_rad = showcase.pitch.to_radians();
+    transform.rotation = Quat::from_rotation_y(-yaw_rad) * Quat::from_rotation_x(pitch_rad);
 }
 
 pub fn apply_default_showcase_system(
     mut active_cam_q: Query<(&mut Transform, &Camera, &mut Projection), With<Camera3d>>,
-    mut active_generator: ResMut<ActiveTerrainGenerator>,
-    terrain_gen_lib: Res<TerrainGeneratorLibrary>,
+    // mut active_generator: ResMut<ActiveTerrainGenerator>,
+    // terrain_gen_lib: Res<TerrainGeneratorLibrary>,
     mut world_clock: ResMut<WorldClockResource>,
 ) {
     let showcase = &SHOWCASES[1];
 
     // set shaper
-    if let Some(generator) = terrain_gen_lib.generators.get(showcase.generator_idx) {
-        active_generator.0 = generator.clone();
-    }
+    // if let Some(generator) = terrain_gen_lib.generators.get(showcase.generator_idx) {
+    //     active_generator.0 = generator.clone();
+    // }
 
     // set time of day
     world_clock.time_of_day = Duration::from_secs_f32(SECONDS_IN_A_DAY * showcase.time_of_day);
diff --git a/crates/client/src/state/enums.rs b/crates/client/src/state/enums.rs
deleted file mode 100644
index 0af1a53e..00000000
--- a/crates/client/src/state/enums.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use bevy::prelude::{Resource, StateSet, States, SubStates};
-use bevy::render::extract_resource::ExtractResource;
-
-/// The state of the overall client app runtime.
-///
-/// This represents the wrapping program itself, unrelated to game logic.
-#[derive(States, Resource, Debug, Clone, Copy, PartialEq, Eq, Hash, Default, ExtractResource)]
-pub enum ClientAppState {
-    /// The client is loading up essential data. The app loop has not started.
-    #[default]
-    StartingUp,
-    /// The main application loop is active and executing.
-    Running,
-    /// The application is performing cleanup operations before process termination.
-    ShuttingDown,
-}
-
-/// A sub-state of `ClientAppState::Running`.
-///
-/// Represents the game state and lifecycle.
-#[derive(SubStates, Resource, Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
-#[source(ClientAppState = ClientAppState::Running)]
-pub enum ClientGameState {
-    /// The user is navigating the main menu UI.
-    #[default]
-    MainMenu,
-    /// The client is attempting to establish a connection to a server or load into a world.
-    Connecting,
-    /// The client is actively connected and in a game session.
-    Playing,
-}
diff --git a/crates/client/src/state/lifecycle.rs b/crates/client/src/state/lifecycle.rs
deleted file mode 100644
index 9e228c33..00000000
--- a/crates/client/src/state/lifecycle.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use crate::state::enums::{ClientAppState, ClientGameState};
-use bevy::prelude::*;
-use bevy::window::PrimaryWindow;
-use shared::{
-    FixedUpdateSet, RenderPrepSet,
-    load::{
-        LoadingTracker, OnLoadComplete, master_finalize_loading_system,
-        reset_loading_tracker_system,
-    },
-};
-
-pub struct ClientLifecyclePlugin;
-
-impl Plugin for ClientLifecyclePlugin {
-    fn build(&self, app: &mut App) {
-        // load cleanup to run after transitions
-        app.add_systems(
-            OnExit(ClientAppState::StartingUp),
-            reset_loading_tracker_system,
-        );
-
-        // configure system sets to be state-bound
-        app.configure_sets(
-            FixedUpdate,
-            (FixedUpdateSet::PreUpdate, FixedUpdateSet::MainLogic).run_if(
-                in_state(ClientGameState::Playing).or(in_state(ClientGameState::Connecting)),
-            ),
-        );
-
-        app.configure_sets(
-            PostUpdate,
-            RenderPrepSet.run_if(
-                in_state(ClientGameState::Playing).or(in_state(ClientGameState::Connecting)),
-            ),
-        );
-
-        // INFO: ---------------------------
-        //         state transitions
-        // ---------------------------------
-        app.init_state::<ClientAppState>()
-            .add_sub_state::<ClientGameState>();
-
-        app.add_systems(
-            Update,
-            (
-                master_finalize_loading_system::<ClientAppState>,
-                master_finalize_loading_system::<ClientGameState>,
-                show_window_when_ready,
-            )
-                .run_if(in_state(ClientAppState::StartingUp)),
-        );
-
-        // initial startup loading state should take us from loading
-        // to running/playing once they finish.
-        app.insert_resource(OnLoadComplete::new(ClientAppState::Running))
-            .insert_resource(OnLoadComplete::new(ClientGameState::Playing));
-    }
-}
-
-/// A system that makes the window visible once the loading tracker reports readiness.
-fn show_window_when_ready(
-    mut query: Query<&mut Window, With<PrimaryWindow>>,
-    loading_tracker: Res<LoadingTracker>,
-) {
-    if loading_tracker.is_ready()
-        && let Ok(mut window) = query.single_mut()
-    {
-        window.visible = true;
-    }
-}
diff --git a/crates/client/src/state/mod.rs b/crates/client/src/state/mod.rs
deleted file mode 100644
index 1e806cc7..00000000
--- a/crates/client/src/state/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod enums;
-pub mod lifecycle;
-
-pub use enums::*;
-pub use lifecycle::*;
diff --git a/crates/client/src/ui/mod.rs b/crates/client/src/ui/mod.rs
index cc8e464e..beef8454 100644
--- a/crates/client/src/ui/mod.rs
+++ b/crates/client/src/ui/mod.rs
@@ -1,34 +1,37 @@
-use crate::state::ClientAppState;
-use bevy::prelude::*;
-use shared::state::SimulationState;
+//! # Vantablock UI Library
+//!
+//! This module is for reusable ui stuff and general screens. Other UI may exist within modules
+//! that are more relevant to them (like inventory and crosshair).
 
+mod screens;
 pub mod systems;
+mod widgets;
 
 // INFO: -------------------
 //         ui plugin
 // -------------------------
 
+use crate::lifecycle::state::ClientLifecycleState;
+use bevy::prelude::*;
+
 pub struct VantablockUiPlugin;
 
 impl Plugin for VantablockUiPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(
-            OnEnter(ClientAppState::Running),
-            systems::spawning::spawn_ui_system,
-        )
-        .add_systems(
-            OnExit(ClientAppState::Running),
-            systems::spawning::despawn_ui_system,
-        );
+        // screen plugins
+        app.add_plugins((
+            screens::LaunchingClientScreenPlugin,
+            screens::main_menu::MainMenuUiPlugin,
+            screens::connecting::ConnectingUiPlugin,
+            screens::settings::SettingsUiPlugin,
+            screens::disconnected::DisconnectedUiPlugin,
+            screens::debug_menu::DebugMenuPlugin,
+        ));
 
-        // starting up ui
+        // game ui
         app.add_systems(
-            OnEnter(SimulationState::Loading),
-            systems::starting_up_ui::spawn_starting_up_ui,
-        )
-        .add_systems(
-            OnExit(SimulationState::Loading),
-            systems::starting_up_ui::despawn_starting_up_ui,
+            OnEnter(ClientLifecycleState::InGame),
+            systems::despawn_menu_camera_system,
         );
     }
 }
diff --git a/crates/client/src/ui/screens/connecting.rs b/crates/client/src/ui/screens/connecting.rs
new file mode 100644
index 00000000..d60359a8
--- /dev/null
+++ b/crates/client/src/ui/screens/connecting.rs
@@ -0,0 +1,74 @@
+use crate::lifecycle::state::InGameState;
+use bevy::prelude::*;
+
+#[derive(Component)]
+pub struct ConnectingUiRoot;
+
+pub struct ConnectingUiPlugin;
+
+impl Plugin for ConnectingUiPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(OnEnter(InGameState::Connecting), spawn_connecting_ui);
+    }
+}
+
+pub fn spawn_connecting_ui(mut commands: Commands, asset_server: Res<AssetServer>) {
+    info!("Spawning Connecting UI...");
+
+    let font = asset_server.load("client/font/Recursive_variable.ttf");
+
+    commands
+        .spawn((
+            Node {
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                display: Display::Flex,
+                align_items: AlignItems::Center,
+                justify_content: JustifyContent::Center,
+                ..Default::default()
+            },
+            ConnectingUiRoot,
+            DespawnOnExit(InGameState::Connecting),
+        ))
+        .with_children(|parent| {
+            parent
+                .spawn((
+                    Node {
+                        width: Val::Px(400.0),
+                        height: Val::Px(150.0),
+                        padding: UiRect::all(Val::Px(20.0)),
+                        flex_direction: FlexDirection::Column,
+                        align_items: AlignItems::Center,
+                        justify_content: JustifyContent::Center,
+                        ..Default::default()
+                    },
+                    BackgroundColor(Color::LinearRgba(LinearRgba::new(0.05, 0.05, 0.05, 0.8))),
+                    Outline::new(Val::Px(2.0), Val::Px(0.0), Color::WHITE),
+                ))
+                .with_children(|parent| {
+                    parent.spawn((
+                        Text::new("Connecting..."),
+                        TextFont {
+                            font: font.clone(),
+                            font_size: 32.0,
+                            ..Default::default()
+                        },
+                        TextColor(Color::WHITE),
+                    ));
+
+                    parent.spawn((
+                        Text::new("Establishing connection..."),
+                        TextFont {
+                            font: font.clone(),
+                            font_size: 16.0,
+                            ..Default::default()
+                        },
+                        TextColor(Color::srgb(0.7, 0.7, 0.7)),
+                        Node {
+                            margin: UiRect::top(Val::Px(10.0)),
+                            ..Default::default()
+                        },
+                    ));
+                });
+        });
+}
diff --git a/crates/client/src/ui/screens/debug_menu.rs b/crates/client/src/ui/screens/debug_menu.rs
new file mode 100644
index 00000000..975bfac9
--- /dev/null
+++ b/crates/client/src/ui/screens/debug_menu.rs
@@ -0,0 +1,157 @@
+use crate::{
+    input::local_actions::ClientAction,
+    render::chunk::manager::{ClientChunkManager, ClientChunkState},
+};
+use bevy::{
+    diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin},
+    prelude::*,
+};
+use leafwing_input_manager::prelude::ActionState;
+use shared::{
+    player::components::{LogicalPosition, PlayerLook},
+    world::chunk::components::ChunkCoord,
+};
+
+#[derive(Component)]
+pub struct DebugMenuRoot;
+
+#[derive(Component)]
+pub struct DebugMenuText;
+
+#[derive(Resource, Default)]
+pub struct DebugMenuState {
+    pub visible: bool,
+}
+
+pub struct DebugMenuPlugin;
+
+impl Plugin for DebugMenuPlugin {
+    fn build(&self, app: &mut App) {
+        if !app.is_plugin_added::<FrameTimeDiagnosticsPlugin>() {
+            app.add_plugins(FrameTimeDiagnosticsPlugin::default());
+        }
+
+        app.init_resource::<DebugMenuState>().add_systems(
+            Update,
+            (
+                toggle_debug_menu_system,
+                update_debug_menu_system.run_if(|state: Res<DebugMenuState>| state.visible),
+            ),
+        );
+    }
+}
+
+fn toggle_debug_menu_system(
+    mut debug_state: ResMut<DebugMenuState>,
+    action_query: Query<&ActionState<ClientAction>>,
+    mut commands: Commands,
+    root_query: Query<Entity, With<DebugMenuRoot>>,
+    asset_server: Res<AssetServer>,
+) {
+    let mut just_pressed = false;
+    for action_state in action_query.iter() {
+        if action_state.just_pressed(&ClientAction::ToggleDebugMenu) {
+            just_pressed = true;
+            break;
+        }
+    }
+
+    if just_pressed {
+        debug_state.visible = !debug_state.visible;
+
+        if debug_state.visible {
+            // Spawn UI
+            commands
+                .spawn((
+                    Node {
+                        position_type: PositionType::Absolute,
+                        top: Val::Px(10.0),
+                        left: Val::Px(10.0),
+                        flex_direction: FlexDirection::Column,
+                        padding: UiRect::all(Val::Px(5.0)),
+                        ..default()
+                    },
+                    BackgroundColor(Color::srgba(0.0, 0.0, 0.0, 0.5)),
+                    DebugMenuRoot,
+                ))
+                .with_children(|parent| {
+                    parent.spawn((
+                        Text::new(""),
+                        TextFont {
+                            font: asset_server.load("client/font/Recursive_variable.ttf"),
+                            font_size: 16.0,
+                            ..default()
+                        },
+                        TextColor(Color::WHITE),
+                        DebugMenuText,
+                    ));
+                });
+        } else {
+            // Despawn UI
+            for entity in root_query.iter() {
+                commands.entity(entity).despawn();
+            }
+        }
+    }
+}
+
+fn update_debug_menu_system(
+    diagnostics: Res<DiagnosticsStore>,
+    player_query: Query<(&LogicalPosition, &ChunkCoord, &PlayerLook)>,
+    chunk_manager: Res<ClientChunkManager>,
+    mut text_query: Query<&mut Text, With<DebugMenuText>>,
+) {
+    let fps = diagnostics
+        .get(&FrameTimeDiagnosticsPlugin::FPS)
+        .and_then(|diag| diag.smoothed())
+        .unwrap_or(0.0);
+
+    let (pos, coord, look) = if let Ok((pos, coord, look)) = player_query.single() {
+        (pos.0, coord.pos, Some(look))
+    } else {
+        (Vec3::ZERO, IVec3::ZERO, None)
+    };
+
+    let mut text_content = format!(
+        "FPS: {:.1}\n\
+        Pos: {:.2}, {:.2}, {:.2}\n\
+        Chunk: {} {} {}\n",
+        fps, pos.x, pos.y, pos.z, coord.x, coord.y, coord.z,
+    );
+
+    if let Some(look) = look {
+        text_content.push_str(&format!(
+            "Facing: Yaw {:.1}, Pitch {:.1}\n",
+            look.yaw.to_degrees(),
+            look.pitch.to_degrees()
+        ));
+    }
+
+    text_content.push_str(&format!(
+        "Chunks Loaded: {}\n\
+        Render Distance: {}\n",
+        chunk_manager.chunk_states.len(),
+        shared::world::chunk::RENDER_DISTANCE,
+    ));
+
+    // count meshing chunks
+    let meshing_count = chunk_manager
+        .chunk_states
+        .values()
+        .filter(|s| matches!(s, ClientChunkState::Meshing { .. }))
+        .count();
+    let needs_meshing_count = chunk_manager
+        .chunk_states
+        .values()
+        .filter(|s| matches!(s, ClientChunkState::NeedsMeshing { .. }))
+        .count();
+
+    text_content.push_str(&format!(
+        "Meshing: {} (Queue: {})\n",
+        meshing_count, needs_meshing_count
+    ));
+
+    for mut text in text_query.iter_mut() {
+        **text = text_content.clone();
+    }
+}
diff --git a/crates/client/src/ui/screens/disconnected.rs b/crates/client/src/ui/screens/disconnected.rs
new file mode 100644
index 00000000..67979861
--- /dev/null
+++ b/crates/client/src/ui/screens/disconnected.rs
@@ -0,0 +1,146 @@
+use crate::{
+    lifecycle::state::ClientLifecycleState, network::connection::NetworkErrorEvent,
+    ui::systems::spawn_menu_camera_system,
+};
+use bevy::prelude::*;
+
+#[derive(Component)]
+pub struct DisconnectedUiRoot;
+
+#[derive(Component)]
+pub struct RetryButton;
+
+pub struct DisconnectedUiPlugin;
+
+impl Plugin for DisconnectedUiPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_observer(spawn_disconnected_ui)
+            .add_systems(
+                OnEnter(ClientLifecycleState::Error),
+                spawn_menu_camera_system,
+            )
+            .add_systems(
+                Update,
+                disconnected_ui_button_interaction_system
+                    .run_if(in_state(ClientLifecycleState::Error)),
+            );
+    }
+}
+
+pub fn spawn_disconnected_ui(
+    trigger: On<NetworkErrorEvent>,
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+) {
+    let event = trigger.event();
+    let reason_text = event.reason.clone();
+
+    info!("Spawning Disconnected UI (Reason: {})...", reason_text);
+
+    let font = asset_server.load("client/font/Recursive_variable.ttf");
+
+    commands
+        .spawn((
+            Node {
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                display: Display::Flex,
+                align_items: AlignItems::Center,
+                justify_content: JustifyContent::Center,
+                ..Default::default()
+            },
+            DisconnectedUiRoot,
+            DespawnOnExit(ClientLifecycleState::Error),
+        ))
+        .with_children(|parent| {
+            parent
+                .spawn((
+                    Node {
+                        width: Val::Px(500.0),
+                        height: Val::Px(250.0),
+                        padding: UiRect::all(Val::Px(20.0)),
+                        flex_direction: FlexDirection::Column,
+                        align_items: AlignItems::Center,
+                        justify_content: JustifyContent::Center,
+                        ..Default::default()
+                    },
+                    BackgroundColor(Color::LinearRgba(LinearRgba::new(0.1, 0.02, 0.02, 0.9))),
+                    Outline::new(Val::Px(2.0), Val::Px(0.0), Color::srgb(1.0, 0.3, 0.3)),
+                ))
+                .with_children(|parent| {
+                    parent.spawn((
+                        Text::new("DISCONNECTED"),
+                        TextFont {
+                            font: font.clone(),
+                            font_size: 48.0,
+                            ..Default::default()
+                        },
+                        TextColor(Color::srgb(1.0, 0.2, 0.2)),
+                    ));
+
+                    parent.spawn((
+                        Text::new(reason_text.clone()),
+                        TextFont {
+                            font: font.clone(),
+                            font_size: 18.0,
+                            ..Default::default()
+                        },
+                        TextColor(Color::WHITE),
+                        Node {
+                            margin: UiRect::vertical(Val::Px(20.0)),
+                            ..Default::default()
+                        },
+                    ));
+
+                    // retry button (back to main menu)
+                    parent
+                        .spawn((
+                            Button,
+                            Node {
+                                width: Val::Px(200.0),
+                                height: Val::Px(50.0),
+                                border: UiRect::all(Val::Px(2.0)),
+                                justify_content: JustifyContent::Center,
+                                align_items: AlignItems::Center,
+                                ..Default::default()
+                            },
+                            BorderColor::all(Color::WHITE),
+                            BackgroundColor(Color::LinearRgba(LinearRgba::new(0.2, 0.2, 0.2, 0.9))),
+                            RetryButton,
+                        ))
+                        .with_children(|parent| {
+                            parent.spawn((
+                                Text::new("BACK TO MENU"),
+                                TextFont {
+                                    font: font.clone(),
+                                    font_size: 24.0,
+                                    ..Default::default()
+                                },
+                                TextColor(Color::WHITE),
+                            ));
+                        });
+                });
+        });
+}
+
+pub fn disconnected_ui_button_interaction_system(
+    mut interaction_query: Query<
+        (&Interaction, &mut BackgroundColor),
+        (Changed<Interaction>, With<Button>, With<RetryButton>),
+    >,
+    mut next_client_state: ResMut<NextState<ClientLifecycleState>>,
+) {
+    for (interaction, mut color) in interaction_query.iter_mut() {
+        match *interaction {
+            Interaction::Pressed => {
+                next_client_state.set(ClientLifecycleState::MainMenu);
+            }
+            Interaction::Hovered => {
+                *color = BackgroundColor(Color::LinearRgba(LinearRgba::new(0.3, 0.3, 0.3, 0.9)));
+            }
+            Interaction::None => {
+                *color = BackgroundColor(Color::LinearRgba(LinearRgba::new(0.2, 0.2, 0.2, 0.9)));
+            }
+        }
+    }
+}
diff --git a/crates/client/src/ui/systems/starting_up_ui.rs b/crates/client/src/ui/screens/launching_client.rs
similarity index 62%
rename from crates/client/src/ui/systems/starting_up_ui.rs
rename to crates/client/src/ui/screens/launching_client.rs
index c49b794a..b4b43fae 100644
--- a/crates/client/src/ui/systems/starting_up_ui.rs
+++ b/crates/client/src/ui/screens/launching_client.rs
@@ -1,10 +1,28 @@
+use crate::{lifecycle::ClientLifecycleState, ui::systems::spawn_menu_camera_system};
 use bevy::prelude::*;
 
-#[derive(Component)]
-pub struct StartingUpUiRoot;
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
 
-pub fn spawn_starting_up_ui(mut commands: Commands, asset_server: Res<AssetServer>) {
-    info!("Spawning StartingUp UI...");
+pub struct LaunchingClientScreenPlugin;
+
+impl Plugin for LaunchingClientScreenPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(
+            OnEnter(ClientLifecycleState::Launching),
+            (spawn_menu_camera_system, spawn_launching_client_screen),
+        );
+    }
+}
+
+// INFO: ------------------------------
+//         interface definition
+// ------------------------------------
+
+/// A UI intended to appear for the duration of the `ClientState::Loading` state.
+fn spawn_launching_client_screen(mut commands: Commands, asset_server: Res<AssetServer>) {
+    info!("Spawning Launching UI...");
 
     let font = asset_server.load("client/font/Recursive_variable.ttf");
 
@@ -18,7 +36,7 @@ pub fn spawn_starting_up_ui(mut commands: Commands, asset_server: Res<AssetServe
                 justify_content: JustifyContent::Center,
                 ..Default::default()
             },
-            StartingUpUiRoot,
+            DespawnOnExit(ClientLifecycleState::Launching),
         ))
         .with_children(|parent| {
             parent
@@ -36,7 +54,7 @@ pub fn spawn_starting_up_ui(mut commands: Commands, asset_server: Res<AssetServe
                 ))
                 .with_children(|parent| {
                     parent.spawn((
-                        Text::new("StartingUp..."),
+                        Text::new("Launching..."),
                         TextFont {
                             font: font.clone(),
                             font_size: 32.0,
@@ -47,13 +65,3 @@ pub fn spawn_starting_up_ui(mut commands: Commands, asset_server: Res<AssetServe
                 });
         });
 }
-
-pub fn despawn_starting_up_ui(
-    mut commands: Commands,
-    query: Query<Entity, With<StartingUpUiRoot>>,
-) {
-    info!("Despawning StartingUp UI...");
-    for entity in query.iter() {
-        commands.entity(entity).despawn();
-    }
-}
diff --git a/crates/client/src/ui/screens/main_menu.rs b/crates/client/src/ui/screens/main_menu.rs
new file mode 100644
index 00000000..f4c83d55
--- /dev/null
+++ b/crates/client/src/ui/screens/main_menu.rs
@@ -0,0 +1,248 @@
+use crate::{
+    lifecycle::state::ClientLifecycleState,
+    network::connection::{ConnectType, InitiateConnection},
+    ui::systems::spawn_menu_camera_system,
+};
+use bevy::input::keyboard::{Key, KeyboardInput};
+use bevy::prelude::*;
+use shared::network::DEFAULT_LOCAL_SERVER_ADDR;
+
+#[derive(Component)]
+pub struct MainMenuUiRoot;
+
+#[derive(Component)]
+pub enum MainMenuButtonAction {
+    Singleplayer,
+    Multiplayer,
+}
+
+#[derive(Component)]
+pub struct ServerAddrInput;
+
+pub struct MainMenuUiPlugin;
+
+impl Plugin for MainMenuUiPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(
+            OnEnter(ClientLifecycleState::MainMenu),
+            (spawn_menu_camera_system, spawn_main_menu),
+        )
+        .add_systems(
+            Update,
+            (
+                main_menu_button_interaction_system,
+                main_menu_text_input_system,
+            )
+                .run_if(in_state(ClientLifecycleState::MainMenu)),
+        );
+    }
+}
+
+pub fn spawn_main_menu(mut commands: Commands, asset_server: Res<AssetServer>) {
+    info!("Spawning Main Menu UI...");
+
+    let font = asset_server.load("client/font/Recursive_variable.ttf");
+
+    commands
+        .spawn((
+            Node {
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                display: Display::Flex,
+                flex_direction: FlexDirection::Column,
+                align_items: AlignItems::Center,
+                justify_content: JustifyContent::Center,
+                ..Default::default()
+            },
+            MainMenuUiRoot,
+            DespawnOnExit(ClientLifecycleState::MainMenu),
+        ))
+        .with_children(|parent| {
+            // title
+            parent.spawn((
+                Text::new("VANTABLOCK"),
+                TextFont {
+                    font: font.clone(),
+                    font_size: 72.0,
+                    ..Default::default()
+                },
+                TextColor(Color::WHITE),
+                Node {
+                    margin: UiRect::bottom(Val::Px(40.0)),
+                    ..Default::default()
+                },
+            ));
+
+            // singleplayer button
+            spawn_button(
+                parent,
+                font.clone(),
+                "SINGLEPLAYER",
+                MainMenuButtonAction::Singleplayer,
+            );
+
+            // spacer
+            parent.spawn(Node {
+                height: Val::Px(20.0),
+                ..default()
+            });
+
+            // multiplayer button
+            spawn_button(
+                parent,
+                font.clone(),
+                "MULTIPLAYER",
+                MainMenuButtonAction::Multiplayer,
+            );
+
+            // server address input label
+            parent.spawn((
+                Text::new("Server Address:"),
+                TextFont {
+                    font: font.clone(),
+                    font_size: 20.0,
+                    ..Default::default()
+                },
+                TextColor(Color::srgb(0.5, 0.5, 0.5)),
+                Node {
+                    margin: UiRect::top(Val::Px(20.0)),
+                    ..Default::default()
+                },
+            ));
+
+            // input box
+            parent
+                .spawn((
+                    Node {
+                        width: Val::Px(300.0),
+                        height: Val::Px(40.0),
+                        border: UiRect::all(Val::Px(2.0)),
+                        justify_content: JustifyContent::Center,
+                        align_items: AlignItems::Center,
+                        margin: UiRect::top(Val::Px(5.0)),
+                        ..Default::default()
+                    },
+                    BorderColor::all(Color::srgb(0.5, 0.5, 0.5)),
+                    BackgroundColor(Color::BLACK),
+                ))
+                .with_children(|parent| {
+                    parent.spawn((
+                        Text::new(DEFAULT_LOCAL_SERVER_ADDR),
+                        TextFont {
+                            font: font.clone(),
+                            font_size: 24.0,
+                            ..Default::default()
+                        },
+                        TextColor(Color::WHITE),
+                        ServerAddrInput,
+                    ));
+                });
+        });
+}
+
+fn spawn_button(
+    parent: &mut ChildSpawnerCommands,
+    font: Handle<Font>,
+    label: &str,
+    action: MainMenuButtonAction,
+) {
+    parent
+        .spawn((
+            Button,
+            Node {
+                width: Val::Px(300.0),
+                height: Val::Px(65.0),
+                border: UiRect::all(Val::Px(2.0)),
+                justify_content: JustifyContent::Center,
+                align_items: AlignItems::Center,
+                ..Default::default()
+            },
+            BorderColor::all(Color::WHITE),
+            BackgroundColor(Color::LinearRgba(LinearRgba::new(0.1, 0.1, 0.1, 0.9))),
+            action,
+        ))
+        .with_children(|parent| {
+            parent.spawn((
+                Text::new(label),
+                TextFont {
+                    font,
+                    font_size: 32.0,
+                    ..Default::default()
+                },
+                TextColor(Color::WHITE),
+            ));
+        });
+}
+
+pub fn main_menu_button_interaction_system(
+    mut interaction_query: Query<
+        (
+            &Interaction,
+            &mut BackgroundColor,
+            &mut BorderColor,
+            &MainMenuButtonAction,
+        ),
+        (Changed<Interaction>, With<Button>),
+    >,
+    mut commands: Commands,
+    server_addr_query: Query<&Text, With<ServerAddrInput>>,
+) {
+    for (interaction, mut color, mut border_color, action) in interaction_query.iter_mut() {
+        match *interaction {
+            Interaction::Pressed => {
+                *color = BackgroundColor(Color::LinearRgba(LinearRgba::new(0.3, 0.3, 0.3, 1.0)));
+                *border_color = BorderColor::all(Color::WHITE);
+
+                let server_addr = server_addr_query.single().unwrap().0.clone();
+
+                match action {
+                    MainMenuButtonAction::Singleplayer => {
+                        commands.trigger(InitiateConnection {
+                            connect_type: ConnectType::Singleplayer,
+                            server_addr,
+                        });
+                    }
+                    MainMenuButtonAction::Multiplayer => {
+                        commands.trigger(InitiateConnection {
+                            connect_type: ConnectType::Multiplayer,
+                            server_addr,
+                        });
+                    }
+                }
+            }
+            Interaction::Hovered => {
+                *color = BackgroundColor(Color::LinearRgba(LinearRgba::new(0.2, 0.2, 0.2, 0.9)));
+                *border_color = BorderColor::all(Color::WHITE);
+            }
+            Interaction::None => {
+                *color = BackgroundColor(Color::LinearRgba(LinearRgba::new(0.1, 0.1, 0.1, 0.9)));
+                *border_color = BorderColor::all(Color::WHITE);
+            }
+        }
+    }
+}
+
+pub fn main_menu_text_input_system(
+    mut char_evr: MessageReader<KeyboardInput>,
+    mut query: Query<&mut Text, With<ServerAddrInput>>,
+) {
+    let Ok(mut text) = query.single_mut() else {
+        return;
+    };
+
+    for event in char_evr.read() {
+        if !event.state.is_pressed() {
+            continue;
+        }
+
+        match &event.logical_key {
+            Key::Character(c) => {
+                text.0.push_str(c.as_str());
+            }
+            Key::Backspace => {
+                text.0.pop();
+            }
+            _ => {}
+        }
+    }
+}
diff --git a/crates/client/src/ui/screens/mod.rs b/crates/client/src/ui/screens/mod.rs
new file mode 100644
index 00000000..918836fa
--- /dev/null
+++ b/crates/client/src/ui/screens/mod.rs
@@ -0,0 +1,8 @@
+pub mod connecting;
+pub mod debug_menu;
+pub mod disconnected;
+mod launching_client;
+pub mod main_menu;
+pub mod settings;
+
+pub use launching_client::LaunchingClientScreenPlugin;
diff --git a/crates/client/src/ui/screens/settings.rs b/crates/client/src/ui/screens/settings.rs
new file mode 100644
index 00000000..b6663df7
--- /dev/null
+++ b/crates/client/src/ui/screens/settings.rs
@@ -0,0 +1,156 @@
+use crate::lifecycle::state::{ClientLifecycleState, InGameState};
+use bevy::prelude::*;
+use lightyear::prelude::client::{Disconnect, NetcodeClient};
+
+#[derive(Component)]
+pub struct SettingsUiRoot;
+
+#[derive(Component)]
+pub enum SettingsButtonAction {
+    Resume,
+    Disconnect,
+}
+
+pub struct SettingsUiPlugin;
+
+impl Plugin for SettingsUiPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(OnEnter(InGameState::Paused), spawn_settings_ui)
+            .add_systems(
+                Update,
+                settings_button_interaction_system.run_if(in_state(InGameState::Paused)),
+            );
+    }
+}
+
+pub fn spawn_settings_ui(mut commands: Commands, asset_server: Res<AssetServer>) {
+    info!("Spawning Settings UI...");
+
+    let font = asset_server.load("client/font/Recursive_variable.ttf");
+
+    commands
+        .spawn((
+            Node {
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                display: Display::Flex,
+                flex_direction: FlexDirection::Column,
+                align_items: AlignItems::Center,
+                justify_content: JustifyContent::Center,
+                ..Default::default()
+            },
+            BackgroundColor(Color::LinearRgba(LinearRgba::new(0.0, 0.0, 0.0, 0.5))),
+            SettingsUiRoot,
+            DespawnOnExit(InGameState::Paused),
+        ))
+        .with_children(|parent| {
+            parent.spawn((
+                Text::new("PAUSED"),
+                TextFont {
+                    font: font.clone(),
+                    font_size: 64.0,
+                    ..Default::default()
+                },
+                TextColor(Color::WHITE),
+                Node {
+                    margin: UiRect::bottom(Val::Px(40.0)),
+                    ..Default::default()
+                },
+            ));
+
+            spawn_button(parent, font.clone(), "RESUME", SettingsButtonAction::Resume);
+
+            parent.spawn(Node {
+                height: Val::Px(20.0),
+                ..default()
+            });
+
+            spawn_button(
+                parent,
+                font.clone(),
+                "DISCONNECT",
+                SettingsButtonAction::Disconnect,
+            );
+        });
+}
+
+fn spawn_button(
+    parent: &mut ChildSpawnerCommands,
+    font: Handle<Font>,
+    label: &str,
+    action: SettingsButtonAction,
+) {
+    parent
+        .spawn((
+            Button,
+            Node {
+                width: Val::Px(300.0),
+                height: Val::Px(65.0),
+                border: UiRect::all(Val::Px(2.0)),
+                justify_content: JustifyContent::Center,
+                align_items: AlignItems::Center,
+                ..Default::default()
+            },
+            BorderColor::all(Color::WHITE),
+            BackgroundColor(Color::LinearRgba(LinearRgba::new(0.1, 0.1, 0.1, 0.9))),
+            action,
+        ))
+        .with_children(|parent| {
+            parent.spawn((
+                Text::new(label),
+                TextFont {
+                    font,
+                    font_size: 32.0,
+                    ..Default::default()
+                },
+                TextColor(Color::WHITE),
+            ));
+        });
+}
+
+pub fn settings_button_interaction_system(
+    mut interaction_query: Query<
+        (
+            &Interaction,
+            &mut BackgroundColor,
+            &mut BorderColor,
+            &SettingsButtonAction,
+        ),
+        (Changed<Interaction>, With<Button>),
+    >,
+    mut next_in_game_state: ResMut<NextState<InGameState>>,
+    mut next_client_state: ResMut<NextState<ClientLifecycleState>>,
+    mut commands: Commands,
+    client_query: Query<Entity, With<NetcodeClient>>,
+) {
+    for (interaction, mut color, mut border_color, action) in interaction_query.iter_mut() {
+        match *interaction {
+            Interaction::Pressed => {
+                *color = BackgroundColor(Color::LinearRgba(LinearRgba::new(0.3, 0.3, 0.3, 1.0)));
+                *border_color = BorderColor::all(Color::WHITE);
+
+                match action {
+                    SettingsButtonAction::Resume => {
+                        next_in_game_state.set(InGameState::Playing);
+                    }
+                    SettingsButtonAction::Disconnect => {
+                        // trigger lightyear disconnect
+                        for entity in client_query.iter() {
+                            commands.trigger(Disconnect { entity });
+                        }
+
+                        next_client_state.set(ClientLifecycleState::MainMenu);
+                    }
+                }
+            }
+            Interaction::Hovered => {
+                *color = BackgroundColor(Color::LinearRgba(LinearRgba::new(0.2, 0.2, 0.2, 0.9)));
+                *border_color = BorderColor::all(Color::WHITE);
+            }
+            Interaction::None => {
+                *color = BackgroundColor(Color::LinearRgba(LinearRgba::new(0.1, 0.1, 0.1, 0.9)));
+                *border_color = BorderColor::all(Color::WHITE);
+            }
+        }
+    }
+}
diff --git a/crates/client/src/ui/systems/camera.rs b/crates/client/src/ui/systems/camera.rs
new file mode 100644
index 00000000..8a150330
--- /dev/null
+++ b/crates/client/src/ui/systems/camera.rs
@@ -0,0 +1,31 @@
+use bevy::prelude::*;
+
+/// Marker for the temporary main menu camera.
+#[derive(Component)]
+pub struct MainMenuCamera;
+
+/// A system that spawns a temporary camera for the lobby/menu.
+/// This camera will be despawned once the authoritative player entity is received.
+pub fn spawn_menu_camera_system(
+    mut commands: Commands,
+    query: Query<Entity, With<MainMenuCamera>>,
+) {
+    if !query.is_empty() {
+        return;
+    }
+
+    info!("Spawning 2d menu camera.");
+
+    commands.spawn((MainMenuCamera, Camera2d));
+}
+
+/// A system that despawns the temporary lobby camera.
+pub fn despawn_menu_camera_system(
+    mut commands: Commands,
+    query: Query<Entity, With<MainMenuCamera>>,
+) {
+    for entity in query.iter() {
+        info!("Despawning 2d menu camera.");
+        commands.entity(entity).despawn();
+    }
+}
diff --git a/crates/client/src/ui/systems/mod.rs b/crates/client/src/ui/systems/mod.rs
index e9a1a377..68bffd7d 100644
--- a/crates/client/src/ui/systems/mod.rs
+++ b/crates/client/src/ui/systems/mod.rs
@@ -1,2 +1,3 @@
-pub mod spawning;
-pub mod starting_up_ui;
+mod camera;
+
+pub use camera::*;
diff --git a/crates/client/src/ui/systems/spawning.rs b/crates/client/src/ui/systems/spawning.rs
deleted file mode 100644
index 057e9332..00000000
--- a/crates/client/src/ui/systems/spawning.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use bevy::prelude::*;
-
-// INFO: -----------------------
-//         ui components
-// -----------------------------
-
-#[derive(Component)]
-pub struct VantablockUiRoot;
-
-// INFO: -----------------------------
-//         ui spawning systems
-// -----------------------------------
-
-pub fn spawn_ui_system(mut commands: Commands, _asset_server: ResMut<AssetServer>) {
-    info!("Spawning Vantablock UI...");
-
-    // let font = asset_server.load("client/font/Recursive_variable.ttf");
-
-    // root node
-    commands
-        .spawn((
-            Node {
-                width: Val::Percent(100.0),
-                height: Val::Percent(100.0),
-                display: Display::Flex,
-                align_items: AlignItems::Center,
-                justify_content: JustifyContent::Center,
-                ..Default::default()
-            },
-            VantablockUiRoot,
-        ))
-        .with_children(|parent| {
-            // hotbar-like container at the bottom
-            parent.spawn((
-                Node {
-                    position_type: PositionType::Absolute,
-                    bottom: Val::Px(20.0),
-                    width: Val::Percent(50.0),
-                    height: Val::Px(60.0),
-                    display: Display::Flex,
-                    justify_content: JustifyContent::SpaceEvenly,
-                    align_items: AlignItems::Center,
-                    ..Default::default()
-                },
-                BackgroundColor(Color::LinearRgba(LinearRgba::new(0.0, 0.0, 0.0, 0.3))),
-            ));
-        });
-}
-
-pub fn despawn_ui_system(mut commands: Commands, query: Query<Entity, With<VantablockUiRoot>>) {
-    info!("Despawning Vantablock UI...");
-    for entity in query.iter() {
-        commands.entity(entity).despawn();
-    }
-}
diff --git a/crates/client/src/ui/widgets/mod.rs b/crates/client/src/ui/widgets/mod.rs
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/crates/client/src/ui/widgets/mod.rs
@@ -0,0 +1 @@
+
diff --git a/crates/client/tools/texture_processor.rs b/crates/client/tools/texture_processor.rs
index c75f329b..f3d9bafb 100644
--- a/crates/client/tools/texture_processor.rs
+++ b/crates/client/tools/texture_processor.rs
@@ -1,11 +1,11 @@
 use image::{ImageBuffer, Rgba};
 
 fn main() {
-    // Tint grass textures
+    // tint grass textures
     tint_image("assets/client/texture/faithful/grass_top.png");
     tint_image("assets/client/texture/rhinestone/grass_top.png");
 
-    // Generate transparent water texture
+    // generate transparent water texture
     create_transparent_water("assets/client/texture/faithful/water.png");
     create_transparent_water("assets/client/texture/rhinestone/water.png");
 }
diff --git a/crates/runner/Cargo.toml b/crates/runner/Cargo.toml
new file mode 100644
index 00000000..c0658877
--- /dev/null
+++ b/crates/runner/Cargo.toml
@@ -0,0 +1,61 @@
+[package]
+name = "vantablock-runner"
+description = "binaries for vantablock"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+default-run = "vantablock"
+
+[package.metadata.packager]
+product-name = "Vantablock"
+identifier = "com.masoniis.vantablock"
+resources = ["../../assets", "../../readme.md"]
+icons = ["../../assets/client/icon.png"]
+binaries = [{ path = "client", main = true }]
+
+[lib]
+name = "vantablock_runner"
+path = "src/lib.rs"
+
+[[bin]]
+name = "vantablock"
+path = "src/bin/client.rs"
+required-features = ["client"]
+
+[[bin]]
+name = "vantablock-server"
+path = "src/bin/server.rs"
+required-features = ["server"]
+
+[features]
+# binary features
+default = ["client"]
+# for the client (hosting capability as well)
+client = [
+  "dep:client",
+  "dep:server",
+  "bevy/default_platform",
+  "bevy/3d_bevy_render",
+  "bevy/ui_bevy_render",
+]
+# for hosting a headless dedicated server
+server = ["dep:server"]
+
+# development features
+dev = ["client?/dev"]
+tracy = ["client?/tracy"]
+distribution = ["client?/distribution"]
+
+
+[dependencies]
+client = { workspace = true, optional = true }
+server = { workspace = true, optional = true }
+shared = { workspace = true }
+utils = { workspace = true }
+
+bevy = { workspace = true, features = ["bevy_asset"] }
+tracing = { workspace = true }
+
+[dev-dependencies]
+lightyear = { workspace = true }
+crossbeam-channel = "0.5"
diff --git a/crates/runner/readme.md b/crates/runner/readme.md
new file mode 100644
index 00000000..2f57f62a
--- /dev/null
+++ b/crates/runner/readme.md
@@ -0,0 +1,8 @@
+# Vantablock Runner (`vantablock-runner`)
+
+The `vantablock-runner` crate contains the actual executable entry points (`binaries`) for the Vantablock engine. Instead of putting binary targets in the `client` or `server` crates, this orchestration crate composes the workspace together based on the desired build target.
+
+## Binaries
+
+- **`vantablock`** (`src/bin/client.rs`): The standard game client executable. When run, this orchestrates the local player experience. It requires the `client` feature.
+- **`vantablock-server`** (`src/bin/server.rs`): The headless dedicated server executable. It requires the `server` feature and completely omits all graphics libraries (like `winit` or `wgpu`) to ensure it can compile and run on lightweight Linux server environments.
diff --git a/crates/runner/src/bin/client.rs b/crates/runner/src/bin/client.rs
new file mode 100644
index 00000000..14cad487
--- /dev/null
+++ b/crates/runner/src/bin/client.rs
@@ -0,0 +1,34 @@
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+use bevy::{
+    app::{App, PostUpdate},
+    prelude::info,
+};
+use client::{lifecycle::scheduling::RenderPrepSet, prelude::*};
+use vantablock_runner::orchestrator::OrchestratorPlugin;
+
+/// The main entrypoint for the entire game.
+#[instrument(skip_all, fields(name = "main"))]
+fn main() {
+    utils::set_runtime_context_client();
+    utils::attach_logger();
+
+    info!("Building client app...");
+
+    let mut app = App::new();
+
+    // config of default plugins
+    app.add_plugins(client::DefaultClientPlugins);
+
+    // the orchestrator will handle spinning up a background server if requested
+    app.add_plugins(OrchestratorPlugin);
+
+    // set ordering
+    app.configure_sets(PostUpdate, RenderPrepSet);
+
+    info!("App built! Running the event loop.");
+
+    app.run();
+
+    info!("App exited safely!");
+}
diff --git a/crates/runner/src/bin/server.rs b/crates/runner/src/bin/server.rs
new file mode 100644
index 00000000..56aeb6e0
--- /dev/null
+++ b/crates/runner/src/bin/server.rs
@@ -0,0 +1,25 @@
+use bevy::prelude::App;
+use server::DefaultServerPlugins;
+use tracing::info;
+
+/// This is the entrypoint for a dedicated server. The server logic is also used
+/// for a client running singleplayer, though not through the main entrypoint.
+fn main() {
+    // initialize logging
+    utils::set_runtime_context_server();
+    utils::attach_logger();
+
+    info!("Building server app...");
+
+    // setup server app
+    let mut app = App::new();
+
+    // server app only has server plugins, running headless with no client
+    app.add_plugins(DefaultServerPlugins);
+
+    info!("App built! Running the event loop.");
+
+    app.run();
+
+    info!("App exited safely!");
+}
diff --git a/crates/runner/src/lib.rs b/crates/runner/src/lib.rs
new file mode 100644
index 00000000..7b535983
--- /dev/null
+++ b/crates/runner/src/lib.rs
@@ -0,0 +1 @@
+pub mod orchestrator;
diff --git a/crates/runner/src/orchestrator.rs b/crates/runner/src/orchestrator.rs
new file mode 100644
index 00000000..d99a0782
--- /dev/null
+++ b/crates/runner/src/orchestrator.rs
@@ -0,0 +1,67 @@
+use bevy::prelude::*;
+use server::{DefaultServerPlugins, lifecycle::state::ServerState};
+use std::{
+    sync::Arc,
+    sync::atomic::{AtomicBool, Ordering},
+    thread,
+};
+use tracing::info;
+
+#[cfg(feature = "client")]
+use client::network::connection::RequestSingleplayerSession;
+
+pub struct OrchestratorPlugin;
+
+impl Plugin for OrchestratorPlugin {
+    fn build(&self, app: &mut App) {
+        #[cfg(feature = "client")]
+        app.add_observer(handle_request_singleplayer);
+    }
+}
+
+/// Resource inserted into the Main (Client) App to watch for the server
+#[derive(Resource)]
+pub struct LocalServerFlag(pub Arc<AtomicBool>);
+
+/// Resource inserted into the Background Server App so it knows how to notify the client
+#[derive(Resource)]
+struct ServerReadyNotifier(Arc<AtomicBool>);
+
+#[cfg(feature = "client")]
+fn handle_request_singleplayer(_trigger: On<RequestSingleplayerSession>, mut commands: Commands) {
+    info!("Orchestrator: Received RequestSingleplayerSession. Starting background server...");
+
+    // create the thread-safe flag
+    let server_is_ready = Arc::new(AtomicBool::new(false));
+    let flag_for_server = Arc::clone(&server_is_ready);
+
+    // insert the flag into the Main App (so the Client can poll it)
+    commands.insert_resource(LocalServerFlag(server_is_ready));
+
+    // spawn the background server
+    thread::spawn(move || {
+        utils::set_runtime_context_server();
+
+        let mut app = App::new();
+        app.add_plugins(DefaultServerPlugins);
+
+        // pass the server's half of the flag into its ECS
+        app.insert_resource(ServerReadyNotifier(flag_for_server));
+
+        // tell the server to flip the flag the exact moment it enters NetworkingMode::Active
+        app.add_systems(OnEnter(ServerState::Running), notify_client_ready);
+
+        info!("Background Server: Booting...");
+
+        app.run();
+    });
+}
+
+/// System that runs exactly once on the background thread when the port is successfully bound
+fn notify_client_ready(notifier: Option<Res<ServerReadyNotifier>>) {
+    if let Some(flag) = notifier {
+        info!("Background Server: Port is open and active! Notifying orchestrator...");
+        // flip the switch!
+        flag.0.store(true, Ordering::Relaxed);
+    }
+}
diff --git a/crates/runner/tests/common/crossbeam_test_environment.rs b/crates/runner/tests/common/crossbeam_test_environment.rs
new file mode 100644
index 00000000..d1b0a531
--- /dev/null
+++ b/crates/runner/tests/common/crossbeam_test_environment.rs
@@ -0,0 +1,114 @@
+use ::{
+    client::network::ClientNetworkPlugins, server::network::ServerNetworkPlugin,
+    shared::network::SharedNetworkPlugin,
+};
+use bevy::prelude::*;
+use lightyear::crossbeam::CrossbeamIo;
+use lightyear::prelude::client::{Client, Connect};
+use lightyear::prelude::server::{Server, Start};
+use lightyear::prelude::*;
+use std::time::{Duration, Instant};
+
+pub struct CrossbeamClientServerTestEnvironment {
+    pub server_app: App,
+    pub client_app: App,
+}
+
+impl Default for CrossbeamClientServerTestEnvironment {
+    fn default() -> Self {
+        utils::attach_logger();
+
+        let mut server_app = App::new();
+        let mut client_app = App::new();
+
+        // minimal bevy plugins + states
+        server_app.add_plugins((MinimalPlugins, bevy::state::app::StatesPlugin));
+        client_app.add_plugins((MinimalPlugins, bevy::state::app::StatesPlugin));
+
+        // networking setup
+        server_app.add_plugins(SharedNetworkPlugin);
+        server_app.add_plugins(ServerNetworkPlugin);
+
+        // client networking setup (ClientNetworkPlugins includes SharedNetworkPlugin)
+        client_app.add_plugins(ClientNetworkPlugins);
+
+        // setup crossbeam connection
+        setup_crossbeam_connection(&mut server_app, &mut client_app);
+
+        Self {
+            server_app,
+            client_app,
+        }
+    }
+}
+
+impl CrossbeamClientServerTestEnvironment {
+    /// Helper to tick both apps
+    pub fn step(&mut self) {
+        let delta = Duration::from_secs_f32(1.0 / 60.0);
+
+        // manually advance time so lightyear can progress its state machine
+        for app in [&mut self.server_app, &mut self.client_app] {
+            let mut time = app.world_mut().resource_mut::<Time>();
+            time.advance_by(delta);
+        }
+
+        self.server_app.update();
+        self.client_app.update();
+    }
+
+    /// Steps the environment until a condition is met, or panics if it times out.
+    pub fn wait_until<F>(&mut self, mut condition: F, timeout: Duration)
+    where
+        F: FnMut(&mut Self) -> bool,
+    {
+        let start = Instant::now();
+
+        while !condition(self) {
+            if start.elapsed() > timeout {
+                panic!("wait_until timed out after {:?}", timeout);
+            }
+
+            // step both apps
+            self.step();
+
+            // wait in between
+            std::thread::sleep(Duration::from_millis(2));
+        }
+    }
+}
+
+/// Links a Server App and a Client App via Crossbeam.
+fn setup_crossbeam_connection(server_app: &mut App, client_app: &mut App) -> (Entity, Entity) {
+    let (server_io, client_io) = CrossbeamIo::new_pair();
+
+    // setup server
+    let server_entity = server_app
+        .world_mut()
+        .spawn((
+            Server::default(),
+            Link::default(),
+            server_io, // server crossbeam io
+        ))
+        .id();
+
+    server_app.world_mut().trigger(Start {
+        entity: server_entity,
+    });
+
+    // setup client
+    let client_entity = client_app
+        .world_mut()
+        .spawn((
+            Client::default(),
+            Link::default(),
+            client_io, // client crossbeam io
+        ))
+        .id();
+
+    client_app.world_mut().trigger(Connect {
+        entity: client_entity,
+    });
+
+    (server_entity, client_entity)
+}
diff --git a/crates/runner/tests/common/local_udp_test_environment.rs b/crates/runner/tests/common/local_udp_test_environment.rs
new file mode 100644
index 00000000..0ace3234
--- /dev/null
+++ b/crates/runner/tests/common/local_udp_test_environment.rs
@@ -0,0 +1,86 @@
+use bevy::prelude::*;
+use shared::network::DEFAULT_LOCAL_SERVER_ADDR;
+use std::time::{Duration, Instant};
+use {
+    client::network::{
+        ClientNetworkPlugins,
+        connection::{ConnectType, InitiateConnection},
+    },
+    server::network::ServerNetworkPlugin,
+};
+
+pub struct UdpClientServerTestEnvironment {
+    pub server_app: App,
+    pub client_app: App,
+}
+
+impl Default for UdpClientServerTestEnvironment {
+    fn default() -> Self {
+        utils::attach_logger();
+
+        let mut server_app = App::new();
+        let mut client_app = App::new();
+
+        // minimal bevy plugins + states
+        server_app.add_plugins((MinimalPlugins, bevy::state::app::StatesPlugin));
+        client_app.add_plugins((MinimalPlugins, bevy::state::app::StatesPlugin));
+
+        // networking setup
+        server_app.add_plugins(ServerNetworkPlugin);
+        client_app.add_plugins(ClientNetworkPlugins);
+
+        // start udp server
+        // server_app
+        //     .world_mut()
+        //     .run_system_once(start_udp_server)
+        //     .expect("Failed to run start_udp_server system");
+
+        // setup client
+        client_app.world_mut().trigger(InitiateConnection {
+            connect_type: ConnectType::Multiplayer,
+            server_addr: DEFAULT_LOCAL_SERVER_ADDR.to_string(),
+        });
+
+        Self {
+            server_app,
+            client_app,
+        }
+    }
+}
+
+impl UdpClientServerTestEnvironment {
+    /// Helper to tick both apps
+    pub fn step(&mut self) {
+        use std::time::Duration;
+        let delta = Duration::from_secs_f32(1.0 / 60.0);
+
+        // manually advance time so lightyear can progress its state machine
+        for app in [&mut self.server_app, &mut self.client_app] {
+            let mut time = app.world_mut().resource_mut::<Time>();
+            time.advance_by(delta);
+        }
+
+        self.server_app.update();
+        self.client_app.update();
+    }
+
+    /// Steps the environment until a condition is met, or panics if it times out.
+    pub fn wait_until<F>(&mut self, mut condition: F, timeout: Duration)
+    where
+        F: FnMut(&mut Self) -> bool,
+    {
+        let start = Instant::now();
+
+        while !condition(self) {
+            if start.elapsed() > timeout {
+                panic!("wait_until timed out after {:?}", timeout);
+            }
+
+            // step both apps
+            self.step();
+
+            // wait in between
+            std::thread::sleep(Duration::from_millis(2));
+        }
+    }
+}
diff --git a/crates/runner/tests/common/mod.rs b/crates/runner/tests/common/mod.rs
new file mode 100644
index 00000000..acfe4e48
--- /dev/null
+++ b/crates/runner/tests/common/mod.rs
@@ -0,0 +1,5 @@
+pub mod crossbeam_test_environment;
+pub mod local_udp_test_environment;
+
+pub use crossbeam_test_environment::CrossbeamClientServerTestEnvironment;
+pub use local_udp_test_environment::UdpClientServerTestEnvironment;
diff --git a/crates/runner/tests/integration/local_crossbeam.rs b/crates/runner/tests/integration/local_crossbeam.rs
new file mode 100644
index 00000000..287e81af
--- /dev/null
+++ b/crates/runner/tests/integration/local_crossbeam.rs
@@ -0,0 +1,14 @@
+use crate::common::CrossbeamClientServerTestEnvironment;
+use std::time::Duration;
+
+#[test]
+#[ignore]
+fn empty() {
+    let mut env = CrossbeamClientServerTestEnvironment::default();
+
+    // empty test for now
+
+    env.wait_until(|_e| true, Duration::from_secs(5));
+
+    env.step();
+}
diff --git a/crates/runner/tests/integration/local_udp.rs b/crates/runner/tests/integration/local_udp.rs
new file mode 100644
index 00000000..3bd229bb
--- /dev/null
+++ b/crates/runner/tests/integration/local_udp.rs
@@ -0,0 +1,93 @@
+use crate::common::UdpClientServerTestEnvironment;
+use bevy::ecs::system::RunSystemOnce;
+use bevy::prelude::*;
+use lightyear::prelude::*;
+use shared::network::{ChatAndSystem, ServerMessage};
+use std::time::Duration;
+
+#[test]
+#[ignore]
+fn sending_a_message() {
+    let mut env = UdpClientServerTestEnvironment::default();
+
+    // wait for connection to be established
+    env.wait_until(
+        |e| {
+            let mut query = e.server_app.world_mut().query::<&Connected>();
+            query.iter(e.server_app.world()).next().is_some()
+        },
+        Duration::from_secs(5),
+    );
+
+    env.step();
+
+    // ensure client has a receiver before sending server message
+    env.client_app
+        .world_mut()
+        .run_system_once(
+            |mut receiver_query: Query<&mut MessageReceiver<ServerMessage>>| {
+                receiver_query
+                    .single_mut()
+                    .expect("Client should have a receiver but it doesn't!");
+                info!("Client receiver exists!")
+            },
+        )
+        .unwrap();
+
+    // server send message
+    env.server_app
+        .world_mut()
+        .run_system_once(
+            |mut sender_query: Query<(Entity, &mut MessageSender<ServerMessage>)>| {
+                for (entity, _) in sender_query.iter() {
+                    info!("Server MessageSender entity: {:?}", entity);
+                }
+
+                let test_msg = ServerMessage::SyncTime {
+                    game_time: 42.0,
+                    tick: 0,
+                };
+
+                let (entity, mut sender) = sender_query
+                    .single_mut()
+                    .expect("Server should have exactly one sender but it doesn't!");
+
+                info!(
+                    "Sending test message from server via entity {:?}...",
+                    entity
+                );
+                sender.send::<ChatAndSystem>(test_msg.clone());
+                info!("Message sent (queued)");
+            },
+        )
+        .unwrap();
+
+    env.step();
+
+    // client receive message
+    env.wait_until(
+        |e| {
+            let mut query = e
+                .client_app
+                .world_mut()
+                .query::<&mut MessageReceiver<ServerMessage>>();
+
+            // iter_mut requires passing the world in dynamically
+            let mut found = false;
+            for mut receiver in query.iter_mut(e.client_app.world_mut()) {
+                info_once!("Checking client receiver for messages...");
+                for message in receiver.receive() {
+                    info_once!("Message received: {:?}", message);
+                    if let ServerMessage::SyncTime { game_time, tick } = message {
+                        assert_eq!(game_time, 42.0);
+                        assert_eq!(tick, 0);
+                        found = true;
+                    }
+                }
+            }
+
+            found
+        },
+        Duration::from_secs(2),
+    );
+}
diff --git a/crates/runner/tests/integration_tests.rs b/crates/runner/tests/integration_tests.rs
new file mode 100644
index 00000000..751310aa
--- /dev/null
+++ b/crates/runner/tests/integration_tests.rs
@@ -0,0 +1,5 @@
+mod common;
+mod integration {
+    mod local_crossbeam;
+    mod local_udp;
+}
diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml
index 23cc330a..810b5f13 100644
--- a/crates/server/Cargo.toml
+++ b/crates/server/Cargo.toml
@@ -3,22 +3,25 @@ name = "vantablock-server"
 version.workspace = true
 edition.workspace = true
 publish.workspace = true
-default-run = "server"
-
-[lints]
-workspace = true
 
 [lib]
 name = "server"
 path = "src/lib.rs"
 
-[[bin]]
-name = "server"
-path = "src/main.rs"
+[[bench]]
+name = "generation_benchmarks"
+harness = false
+
+[lints]
+workspace = true
+
+[dev-dependencies]
+criterion = { workspace = true }
 
 [dependencies]
 utils = { workspace = true }
 shared = { workspace = true }
+zstd = { workspace = true }
 
 # INFO: --------------------------------
 #         logging/error handling
@@ -31,4 +34,13 @@ tracing-subscriber = { workspace = true }
 #         simulation logic
 # --------------------------------
 
-bevy = { workspace = true }
+bevy = { workspace = true, features = [
+  "bevy_asset", # asset management
+  "bevy_state", # state machines
+] }
+crossbeam = { workspace = true }
+noise = { workspace = true }
+lightyear = { workspace = true, features = [
+  # extends default lightyear features in workspace
+  "server", # server plugins
+] }
diff --git a/crates/server/benches/generation_benchmarks.rs b/crates/server/benches/generation_benchmarks.rs
new file mode 100644
index 00000000..bdea7c75
--- /dev/null
+++ b/crates/server/benches/generation_benchmarks.rs
@@ -0,0 +1,118 @@
+use bevy::ecs::prelude::World;
+use criterion::{Criterion, criterion_group, criterion_main};
+use server::{
+    prelude::*,
+    world::terrain::{
+        BasicBiomeGenerator, BiomeGenerator, BiomeMapComponent, BiomeResultBuilder,
+        ClimateGenerator, ClimateNoiseGenerator, PaintResultBuilder, ShapeResultBuilder,
+        SimpleSurfacePainter, SinwaveShaper, TerrainPainter, TerrainShaper,
+    },
+};
+use shared::{
+    lifecycle::PersistentPathsResource,
+    world::{
+        biome::biome_registry::BiomeRegistryResource,
+        block::BlockRegistry,
+        chunk::{
+            components::{ChunkBlocksComponent, ChunkCoord},
+            types::ChunkLod,
+        },
+    },
+};
+use utils::PersistentPaths;
+
+const CLIMATE_NOISE_SEED: u32 = 42;
+
+/// Each bench in this benchmark builds off the previous (conceptually speaking).
+fn bench_chunk_generation(c: &mut Criterion) {
+    let mut group = c.benchmark_group("Chunk generation");
+
+    // INFO: ---------------
+    //         setup
+    // ---------------------
+
+    let persistent_paths = PersistentPaths::resolve_client();
+    let block_registry = BlockRegistry::load_from_disk(&persistent_paths);
+
+    let mut world = World::new();
+    world.insert_resource(PersistentPathsResource(persistent_paths.clone()));
+    world.insert_resource(block_registry.clone());
+    world.insert_resource(BiomeRegistryResource::load_from_disk(&persistent_paths));
+
+    let biome_registry = world.resource::<BiomeRegistryResource>().clone();
+
+    let origin_chunk_coord = ChunkCoord {
+        pos: IVec3::new(0, 0, 0),
+    };
+
+    // INFO: --------------------------
+    //         climate benching
+    // --------------------------------
+
+    let climate_noise_generator = ClimateNoiseGenerator::new(CLIMATE_NOISE_SEED);
+    group.bench_function("climate_noise", |b| {
+        b.iter(|| {
+            climate_noise_generator.generate(origin_chunk_coord.clone());
+        })
+    });
+
+    // INFO: ------------------------
+    //         biome benching
+    // ------------------------------
+
+    let biome_generator = BasicBiomeGenerator;
+    let origin_noise = climate_noise_generator.generate(origin_chunk_coord.clone());
+
+    group.bench_function("biome_mapping", |b| {
+        b.iter(|| {
+            // setup
+            let biome_map = BiomeMapComponent::new_empty(ChunkLod(0));
+            let builder = BiomeResultBuilder::new(biome_map, origin_chunk_coord.clone());
+
+            // chunk gen
+            biome_generator.generate_biome_chunk(builder, &origin_noise, &biome_registry);
+        })
+    });
+
+    // INFO: --------------------------------
+    //         sinwave shape benching
+    // --------------------------------------
+
+    let sinwave_shaper = SinwaveShaper::default();
+    group.bench_function("sinwave_shaping", |b| {
+        b.iter(|| {
+            let clim_map = climate_noise_generator.generate(origin_chunk_coord.clone());
+            let chunk_blocks = ChunkBlocksComponent::new_uniform_empty(ChunkLod(0));
+            let shaper = ShapeResultBuilder::new(chunk_blocks, origin_chunk_coord.clone());
+
+            sinwave_shaper.shape_terrain_chunk(&clim_map, shaper)
+        })
+    });
+
+    // INFO: ------------------------
+    //         paint benching
+    // ------------------------------
+
+    let surface_painter = SimpleSurfacePainter;
+    group.bench_function("painting", |b| {
+        b.iter(|| {
+            let biome_map = BiomeMapComponent::new_empty(ChunkLod(0));
+
+            let blocks = ChunkBlocksComponent::new_uniform_solid(ChunkLod(0));
+            let painter =
+                PaintResultBuilder::new(blocks, origin_chunk_coord.clone(), block_registry.clone());
+
+            surface_painter.paint_terrain_chunk(
+                painter,
+                &biome_map,
+                &block_registry,
+                &biome_registry,
+            );
+        })
+    });
+
+    group.finish();
+}
+
+criterion_group!(benches, bench_chunk_generation);
+criterion_main!(benches);
diff --git a/crates/server/readme.md b/crates/server/readme.md
new file mode 100644
index 00000000..b0bfb814
--- /dev/null
+++ b/crates/server/readme.md
@@ -0,0 +1,7 @@
+# Vantablock Server (`vantablock-server`)
+
+The `vantablock-server` crate acts as the authoritative, headless multiplayer server for the game.
+
+## Testing
+
+This crate includes benchmarking (`generation_benchmarks`) to track and optimize the performance of the multinoise terrain generation.
diff --git a/crates/server/src/lib.rs b/crates/server/src/lib.rs
index 32ac51af..2d25dfba 100644
--- a/crates/server/src/lib.rs
+++ b/crates/server/src/lib.rs
@@ -1,14 +1,59 @@
-pub mod state;
+//! # The Vantablock Server Library
 
-use bevy::app::PluginGroupBuilder;
-use bevy::prelude::PluginGroup;
+pub mod lifecycle;
+pub mod network;
+pub mod prelude;
+pub mod world;
+
+pub use prelude::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::{
+    MinimalPlugins, app::ScheduleRunnerPlugin, asset::AssetPlugin, prelude::default,
+    state::app::StatesPlugin,
+};
 use shared::SharedPlugins;
+use std::time::Duration;
 
 /// Server-side simulation and orchestration plugins.
-pub struct ServerPlugins;
+pub struct ServerCoreLogicPlugins;
 
-impl PluginGroup for ServerPlugins {
+impl PluginGroup for ServerCoreLogicPlugins {
     fn build(self) -> PluginGroupBuilder {
-        PluginGroupBuilder::start::<Self>().add_group(SharedPlugins)
+        PluginGroupBuilder::start::<Self>()
+            .add_group(lifecycle::ServerLifecyclePlugins)
+            .add(network::ServerNetworkPlugin)
+            .add(world::WorldPlugin)
+    }
+}
+
+/// A plugin group containing server related plugins that
+/// are intended for a fully-fledged dedicated server.
+pub struct DefaultServerPlugins;
+
+impl PluginGroup for DefaultServerPlugins {
+    fn build(self) -> PluginGroupBuilder {
+        let persistent_paths = utils::PersistentPaths::resolve_client();
+        let asset_path = persistent_paths.assets_dir.to_string_lossy().to_string();
+
+        PluginGroupBuilder::start::<Self>()
+            // bevy minimal setup
+            .add_group(
+                MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(Duration::from_secs_f64(
+                    1.0 / 60.0,
+                ))),
+            )
+            .add(StatesPlugin)
+            .add(AssetPlugin {
+                file_path: asset_path,
+                ..default()
+            })
+            // shared plugin setup
+            .add_group(SharedPlugins)
+            // server core
+            .add_group(ServerCoreLogicPlugins)
     }
 }
diff --git a/crates/server/src/lifecycle/load.rs b/crates/server/src/lifecycle/load.rs
new file mode 100644
index 00000000..310e5166
--- /dev/null
+++ b/crates/server/src/lifecycle/load.rs
@@ -0,0 +1,21 @@
+use crate::lifecycle::state::ServerState;
+use bevy::prelude::*;
+use shared::lifecycle::state::AppState;
+
+pub struct ServerLoadPlugin;
+
+impl Plugin for ServerLoadPlugin {
+    fn build(&self, app: &mut App) {
+        // handle transition to running state when server initialization is done
+        app.add_systems(
+            Update,
+            (transition_to_running.run_if(in_state(AppState::Running)),)
+                .chain()
+                .run_if(in_state(ServerState::Initializing)),
+        );
+    }
+}
+
+fn transition_to_running(mut server_state: ResMut<NextState<ServerState>>) {
+    server_state.set(ServerState::Running);
+}
diff --git a/crates/server/src/lifecycle/mod.rs b/crates/server/src/lifecycle/mod.rs
new file mode 100644
index 00000000..ed010385
--- /dev/null
+++ b/crates/server/src/lifecycle/mod.rs
@@ -0,0 +1,20 @@
+pub mod load;
+pub mod state;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::app::PluginGroupBuilder;
+use bevy::prelude::PluginGroup;
+
+/// A plugin group containing shared lifecycle stuff.
+pub struct ServerLifecyclePlugins;
+
+impl PluginGroup for ServerLifecyclePlugins {
+    fn build(self) -> PluginGroupBuilder {
+        PluginGroupBuilder::start::<Self>()
+            .add(state::StatePlugin)
+            .add(load::ServerLoadPlugin)
+    }
+}
diff --git a/crates/server/src/lifecycle/state.rs b/crates/server/src/lifecycle/state.rs
new file mode 100644
index 00000000..b43c7bda
--- /dev/null
+++ b/crates/server/src/lifecycle/state.rs
@@ -0,0 +1,41 @@
+use bevy::prelude::{AppExtStates, StateSet, SubStates};
+use shared::lifecycle::state::AppState;
+
+/// Detailed lifecycle state of the dedicated or local background server.
+///
+/// Substate of `AppState::Running`.
+#[derive(SubStates, Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+#[source(AppState = AppState::Running)]
+pub enum ServerState {
+    #[default]
+    /// The server is loading data (biomes, blocks) and other tasks needed to be
+    /// finished before a user connects.
+    ///
+    /// The network port is **closed** during this phase to prevent clients from
+    /// joining an uninitialized world.
+    Initializing,
+
+    /// The server is fully booted.
+    /// Entering this state binds the UDP socket, starts accepting client connections,
+    /// and begins ticking the main game simulation.
+    Running,
+
+    /// The server has received a shutdown signal.
+    /// New connections are rejected, existing players are gracefully kicked,
+    /// and chunk data is safely flushed to the database.
+    Terminating,
+}
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::prelude::{App, Plugin};
+
+pub struct StatePlugin;
+
+impl Plugin for StatePlugin {
+    fn build(&self, app: &mut App) {
+        app.add_sub_state::<ServerState>();
+    }
+}
diff --git a/crates/server/src/main.rs b/crates/server/src/main.rs
deleted file mode 100644
index 86f707b1..00000000
--- a/crates/server/src/main.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use bevy::{
-    MinimalPlugins,
-    app::{App, ScheduleRunnerPlugin},
-    asset::AssetPlugin,
-    prelude::{PluginGroup, default, info},
-};
-use server::ServerPlugins;
-use shared::load::LoadingTracker;
-use std::time::Duration;
-use utils::PersistentPaths;
-
-fn main() {
-    // setup headless bevy app
-    let mut app = App::new();
-
-    // Resolve platform paths and initialize application paths
-    let persistent_paths = PersistentPaths::resolve();
-
-    app.add_plugins(
-        MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(Duration::from_secs_f64(
-            1.0 / 60.0,
-        ))),
-    );
-
-    // AssetServer is required for registry logic to function in a standardized way.
-    app.add_plugins(AssetPlugin {
-        file_path: "assets".to_string(),
-        ..default()
-    });
-
-    // load config & loading trackers into main world
-    app.insert_resource(persistent_paths);
-    app.insert_resource(LoadingTracker::default());
-
-    // add server-side and shared plugins
-    app.add_plugins(ServerPlugins);
-
-    info!("Server started successfully!");
-    app.run();
-}
diff --git a/crates/server/src/network/connection/listener.rs b/crates/server/src/network/connection/listener.rs
new file mode 100644
index 00000000..cf6d2ed6
--- /dev/null
+++ b/crates/server/src/network/connection/listener.rs
@@ -0,0 +1,32 @@
+use bevy::prelude::*;
+use lightyear::{prelude::server::*, prelude::*};
+use shared::network::DEFAULT_SERVER_PORT;
+use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
+use tracing::info;
+
+/// Starts a udp server listening on an available local addr
+///
+/// https://cbournhonesque.github.io/lightyear/book/tutorial/build_client_server.html#server
+pub fn start_udp_server(mut commands: Commands) {
+    let server_addr = SocketAddr::V4(SocketAddrV4::new(
+        Ipv4Addr::UNSPECIFIED,
+        DEFAULT_SERVER_PORT,
+    ));
+
+    info!("Starting server listening on {}...", server_addr);
+
+    let server_entity = commands
+        .spawn((
+            Server::default(),
+            Link::default(),
+            NetcodeServer::new(NetcodeConfig::default()),
+            LocalAddr(server_addr),
+            ServerUdpIo::default(),
+        ))
+        .id();
+
+    // start listening
+    commands.trigger(Start {
+        entity: server_entity,
+    });
+}
diff --git a/crates/server/src/network/connection/mod.rs b/crates/server/src/network/connection/mod.rs
new file mode 100644
index 00000000..a9cd7c3f
--- /dev/null
+++ b/crates/server/src/network/connection/mod.rs
@@ -0,0 +1,25 @@
+mod listener;
+mod session;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::lifecycle::state::ServerState;
+use bevy::{
+    app::{App, Plugin},
+    state::state::OnExit,
+};
+
+pub struct ServerConnectionPlugin;
+
+impl Plugin for ServerConnectionPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(
+            OnExit(ServerState::Initializing),
+            listener::start_udp_server,
+        )
+        .add_observer(session::on_client_connect)
+        .add_observer(session::on_client_disconnect);
+    }
+}
diff --git a/crates/server/src/network/connection/session.rs b/crates/server/src/network/connection/session.rs
new file mode 100644
index 00000000..599c617a
--- /dev/null
+++ b/crates/server/src/network/connection/session.rs
@@ -0,0 +1,70 @@
+use crate::{network::types::ClientConnection, world::chunk_loading::ClientChunkTracker};
+use bevy::prelude::*;
+use lightyear::prelude::*;
+use shared::{
+    network::ServerMessage,
+    player::components::{LogicalPosition, NetworkPlayer, PlayerLook, PlayerOwner},
+};
+use std::time::Duration;
+use tracing::{error, info};
+
+pub fn on_client_connect(
+    trigger: On<Add, Connected>,
+    mut commands: Commands,
+    client_ids: Query<&RemoteId>,
+) {
+    let client_entity = trigger.entity;
+
+    info!("Client connected with entity: {:?}", client_entity);
+
+    let spawn_pos = Vec3::new(0.0, 120.0, 60.0);
+
+    let Ok(remote_id) = client_ids.get(client_entity) else {
+        error!(
+            "Could not find RemoteId for client entity {:?}",
+            client_entity
+        );
+        return;
+    };
+    let client_id = **remote_id;
+
+    // ensure client entity has MessageSender and ReplicationSender
+    commands
+        .entity(client_entity)
+        .insert(ReplicationSender::new(
+            Duration::from_millis(100),
+            SendUpdatesMode::SinceLastAck,
+            false,
+        ))
+        .insert(MessageSender::<ServerMessage>::default());
+
+    let client_player_entity = commands
+        .spawn((
+            NetworkPlayer,
+            PlayerOwner(client_id),
+            PlayerLook::default(),
+            LogicalPosition(spawn_pos),
+            ClientConnection { client_entity },
+            ClientChunkTracker::default(),
+            Replicate::to_clients(NetworkTarget::All),
+        ))
+        .id();
+
+    info!("Player ent spawned {:?}", client_player_entity);
+}
+
+pub fn on_client_disconnect(
+    trigger: On<Remove, Connected>,
+    mut commands: Commands,
+    player_query: Query<(Entity, &ClientConnection)>,
+) {
+    let client_entity = trigger.entity;
+    info!("Client disconnected: {:?}", client_entity);
+
+    for (player_entity, connection) in player_query.iter() {
+        if connection.client_entity == client_entity {
+            info!("Cleaning up player entity {:?}", player_entity);
+            commands.entity(player_entity).despawn();
+        }
+    }
+}
diff --git a/crates/server/src/network/mod.rs b/crates/server/src/network/mod.rs
new file mode 100644
index 00000000..12873c8b
--- /dev/null
+++ b/crates/server/src/network/mod.rs
@@ -0,0 +1,37 @@
+pub mod connection;
+pub mod receive;
+pub mod send;
+pub mod types;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::prelude::*;
+use lightyear::prelude::server::ServerPlugins;
+use shared::network::{NETWORK_TICK_DURATION, SharedNetworkPlugin};
+use std::time::Duration;
+
+use types::MessageTimer;
+
+pub struct ServerNetworkPlugin;
+
+impl Plugin for ServerNetworkPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins((
+            // lightyear plugins
+            ServerPlugins {
+                tick_duration: Duration::from_secs_f64(NETWORK_TICK_DURATION),
+            },
+            // network sub-plugins
+            connection::ServerConnectionPlugin,
+            receive::ServerIngressPlugin,
+            send::ServerEgressPlugin,
+        ));
+
+        // (protocol) must be added AFTER lightyear plugin
+        app.add_plugins(SharedNetworkPlugin);
+
+        app.insert_resource(MessageTimer(Timer::from_seconds(1.0, TimerMode::Repeating)));
+    }
+}
diff --git a/crates/server/src/network/receive/block_actions.rs b/crates/server/src/network/receive/block_actions.rs
new file mode 100644
index 00000000..ad617858
--- /dev/null
+++ b/crates/server/src/network/receive/block_actions.rs
@@ -0,0 +1,76 @@
+use crate::{
+    network::receive::ecs_messages::{InboundBreakBlockMessage, InboundPlaceBlockMessage},
+    world::chunk::ChunkMap,
+};
+use bevy::prelude::*;
+use lightyear::prelude::*;
+use shared::{
+    network::protocol::{BlockUpdates, ServerMessage},
+    world::block::block_registry::AIR_BLOCK_ID,
+    world::chunk::CHUNK_SIDE_LENGTH,
+    world::chunk::components::{ChunkBlocksComponent, ChunkCoord},
+};
+
+/// Handles requests from clients to modify blocks (break or place).
+///
+/// This system updates the authoritative server state and broadcasts the change
+/// to all other connected clients as a `ServerMessage::BlockUpdate`.
+pub fn handle_client_block_requests(
+    mut ev_break: MessageReader<InboundBreakBlockMessage>,
+    mut ev_place: MessageReader<InboundPlaceBlockMessage>,
+    chunk_map: Res<ChunkMap>,
+    mut blocks_query: Query<&mut ChunkBlocksComponent>,
+    mut sender: ServerMultiMessageSender,
+    server: Option<Single<&Server>>,
+    player_query: Query<&RemoteId>,
+) {
+    let Some(server) = server else { return };
+
+    let mut process_request = |player_entity: Entity, world_pos: IVec3, block_id: u8| {
+        let Ok(remote_id) = player_query.get(player_entity) else {
+            return;
+        };
+
+        let chunk_pos = ChunkCoord::world_to_chunk_pos(world_pos.as_vec3());
+
+        if let Some(entity) = chunk_map.get_chunk(chunk_pos)
+            && let Ok(mut chunk_blocks) = blocks_query.get_mut(entity)
+        {
+            let local_pos = world_pos - (chunk_pos * CHUNK_SIDE_LENGTH as i32);
+
+            info!("Updating server block state at chunk {:?} local {:?}", chunk_pos, local_pos);
+
+            let mut writer = chunk_blocks.get_writer();
+            writer.set_data(
+                local_pos.x as usize,
+                local_pos.y as usize,
+                local_pos.z as usize,
+                block_id,
+            );
+
+            // broadcast state change to all other clients.
+            let update_message = ServerMessage::BlockUpdate {
+                position: world_pos,
+                block_id,
+            };
+
+            let _ = sender.send::<_, BlockUpdates>(
+                &update_message,
+                *server,
+                &NetworkTarget::AllExcept(vec![**remote_id]),
+            );
+        } else {
+            warn!("Could not find chunk or blocks for position {:?}", world_pos);
+        }
+    };
+
+    for ev in ev_break.read() {
+        info!("Server received BreakBlock at {:?} from player {:?}", ev.position, ev.player);
+        process_request(ev.player, ev.position, AIR_BLOCK_ID);
+    }
+
+    for ev in ev_place.read() {
+        info!("Server received PlaceBlock at {:?} (id: {}) from player {:?}", ev.position, ev.block_id, ev.player);
+        process_request(ev.player, ev.position, ev.block_id);
+    }
+}
diff --git a/crates/server/src/network/receive/demultiplex.rs b/crates/server/src/network/receive/demultiplex.rs
new file mode 100644
index 00000000..edb7a037
--- /dev/null
+++ b/crates/server/src/network/receive/demultiplex.rs
@@ -0,0 +1,42 @@
+use crate::network::receive::ecs_messages::*;
+use bevy::{ecs::message::MessageWriter, prelude::*};
+use lightyear::prelude::MessageReceiver;
+use shared::network::protocol::ClientMessage;
+
+/// Network demultiplexer, translates a `ClientMessage` into a local ecs message
+///
+/// This system listens for incoming client messages and dispatches a corresponding
+/// ECS message for each enum variant of the incoming client message. This is
+/// necessary to allow multiple systems to react to specific client messages.
+pub fn translate_client_network_messages(
+    // incoming network messages
+    mut query: Query<(Entity, &mut MessageReceiver<ClientMessage>)>,
+    // outgoing ECS messages
+    mut ev_request_chunk: MessageWriter<InboundRequestChunkMessage>,
+    mut ev_break_block: MessageWriter<InboundBreakBlockMessage>,
+    mut ev_place_block: MessageWriter<InboundPlaceBlockMessage>,
+) {
+    for (player, mut receiver) in query.iter_mut() {
+        for message in receiver.receive() {
+            match message {
+                ClientMessage::RequestChunk(coord) => {
+                    ev_request_chunk.write(InboundRequestChunkMessage { player, coord });
+                }
+                ClientMessage::BreakBlock { position } => {
+                    ev_break_block.write(InboundBreakBlockMessage { player, position });
+                }
+                ClientMessage::PlaceBlock { position, block_id } => {
+                    ev_place_block.write(InboundPlaceBlockMessage {
+                        player,
+                        position,
+                        block_id,
+                    });
+                }
+                ClientMessage::RequestTimeJump { amount: _ } => {
+                    // TODO: implement time jump handling
+                    warn!("RequestTimeJump received but not yet implemented");
+                }
+            }
+        }
+    }
+}
diff --git a/crates/server/src/network/receive/ecs_messages.rs b/crates/server/src/network/receive/ecs_messages.rs
new file mode 100644
index 00000000..5b9f4fec
--- /dev/null
+++ b/crates/server/src/network/receive/ecs_messages.rs
@@ -0,0 +1,27 @@
+//! Defines local ECS messages for demultiplexed network messages received from clients.
+//! These messages are dispatched by the network demultiplexer to allow multiple systems
+//! to react to specific client messages without all of them needing to read from the
+//! `MessageReceiver<ClientMessage>` directly.
+
+use bevy::ecs::message::Message;
+use shared::world::chunk::ChunkCoord;
+use bevy::prelude::*;
+
+#[derive(Message, Clone)]
+pub struct InboundRequestChunkMessage {
+    pub player: Entity,
+    pub coord: ChunkCoord,
+}
+
+#[derive(Message, Clone)]
+pub struct InboundBreakBlockMessage {
+    pub player: Entity,
+    pub position: IVec3,
+}
+
+#[derive(Message, Clone)]
+pub struct InboundPlaceBlockMessage {
+    pub player: Entity,
+    pub position: IVec3,
+    pub block_id: u8,
+}
diff --git a/crates/server/src/network/receive/mod.rs b/crates/server/src/network/receive/mod.rs
new file mode 100644
index 00000000..ebf9ad17
--- /dev/null
+++ b/crates/server/src/network/receive/mod.rs
@@ -0,0 +1,30 @@
+pub mod block_actions;
+pub mod demultiplex;
+pub mod ecs_messages;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::app::{App, Plugin, Update};
+use bevy::prelude::*;
+use ecs_messages::*;
+
+pub struct ServerIngressPlugin;
+
+impl Plugin for ServerIngressPlugin {
+    fn build(&self, app: &mut App) {
+        // register local ecs messages
+        app.add_message::<InboundRequestChunkMessage>()
+            .add_message::<InboundBreakBlockMessage>()
+            .add_message::<InboundPlaceBlockMessage>();
+
+        app.add_systems(
+            Update,
+            (
+                demultiplex::translate_client_network_messages,
+                block_actions::handle_client_block_requests,
+            ).chain(),
+        );
+    }
+}
diff --git a/crates/server/src/network/send/mod.rs b/crates/server/src/network/send/mod.rs
new file mode 100644
index 00000000..4c31485e
--- /dev/null
+++ b/crates/server/src/network/send/mod.rs
@@ -0,0 +1,15 @@
+mod sync_time;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::app::{App, Plugin, Update};
+
+pub struct ServerEgressPlugin;
+
+impl Plugin for ServerEgressPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Update, sync_time::send_sync_time);
+    }
+}
diff --git a/crates/server/src/network/send/sync_time.rs b/crates/server/src/network/send/sync_time.rs
new file mode 100644
index 00000000..ebcababc
--- /dev/null
+++ b/crates/server/src/network/send/sync_time.rs
@@ -0,0 +1,29 @@
+use crate::network::types::MessageTimer;
+use bevy::prelude::*;
+use lightyear::{prelude::server::*, prelude::*};
+use shared::network::{ChatAndSystem, ServerMessage};
+use tracing::{error, info};
+
+/// Sends the periodic sync timer to all clients
+pub fn send_sync_time(
+    mut timer: ResMut<MessageTimer>,
+    time: Res<Time>,
+    mut sender: ServerMultiMessageSender,
+    server: Option<Single<&Server>>,
+) {
+    timer.0.tick(time.delta());
+    if timer.0.just_finished()
+        && let Some(server) = server
+    {
+        let message = ServerMessage::SyncTime {
+            game_time: time.elapsed_secs(),
+            tick: 0, // placeholder
+        };
+        info!("Sending periodic SyncTime message: {:?}", message);
+        if let Err(e) =
+            sender.send::<_, ChatAndSystem>(&message, server.into_inner(), &NetworkTarget::All)
+        {
+            error!("Failed to send SyncTime message: {:?}", e);
+        }
+    }
+}
diff --git a/crates/server/src/network/types.rs b/crates/server/src/network/types.rs
new file mode 100644
index 00000000..7120b7a7
--- /dev/null
+++ b/crates/server/src/network/types.rs
@@ -0,0 +1,9 @@
+use bevy::prelude::*;
+
+#[derive(Component)]
+pub struct ClientConnection {
+    pub client_entity: Entity,
+}
+
+#[derive(Resource)]
+pub struct MessageTimer(pub Timer);
diff --git a/crates/server/src/prelude.rs b/crates/server/src/prelude.rs
new file mode 100644
index 00000000..8322ce50
--- /dev/null
+++ b/crates/server/src/prelude.rs
@@ -0,0 +1,19 @@
+//! Prelude is to be reserved for imports that get used across many
+//! files. For this project, that mostly includes things that are used
+//! at a system ecs module level (eg plugin) as there will be many modules.
+
+// INFO: -----------------------
+//         crate imports
+// -----------------------------
+
+// INFO: ----------------------
+//         useful utils
+// ----------------------------
+pub use bevy::app::{App, Plugin, PluginGroup, PluginGroupBuilder};
+pub use bevy::math::{
+    FloatExt, IVec2, IVec3, IVec4, Mat3, Mat4, Quat, Vec2, Vec3, Vec4, Vec4Swizzles, vec2, vec3,
+    vec4,
+};
+pub use std::f32::consts::{FRAC_PI_2, PI};
+pub use std::sync::Arc;
+pub use tracing::{debug, error, info, info_span, instrument, trace, warn};
diff --git a/crates/server/src/state.rs b/crates/server/src/state.rs
deleted file mode 100644
index 69daa08b..00000000
--- a/crates/server/src/state.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use bevy::prelude::{Resource, States};
-
-#[derive(States, Resource, Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
-pub enum ServerAppState {
-    #[default]
-    Initializing, // Loading server config, binding ports
-    GeneratingSpawn, // Generating initial chunks before allowing players
-    Running,         // Accepting connections, ticking simulation
-    ShuttingDown,    // Saving chunks, kicking players gracefully
-}
diff --git a/crates/server/src/world/chunk/chunk_map.rs b/crates/server/src/world/chunk/chunk_map.rs
new file mode 100644
index 00000000..90c7abcb
--- /dev/null
+++ b/crates/server/src/world/chunk/chunk_map.rs
@@ -0,0 +1,35 @@
+use bevy::ecs::prelude::*;
+use bevy::math::IVec3;
+use std::collections::HashMap;
+
+/// Resource tracking the entities associated with active chunk coordinates.
+///
+/// This map only handles spatial lookup (coord -> Entity).
+/// The actual state of the chunk is handled via marker components (NeedsGenerating, Generating, ActiveChunk, EmptyChunk).
+#[derive(Resource, Default, Debug)]
+pub struct ChunkMap {
+    /// Map tracking the entities of all non-unloaded chunks.
+    pub chunks: HashMap<IVec3, Entity>,
+}
+
+impl ChunkMap {
+    /// Gets the Entity for a chunk, if that chunk is tracked.
+    pub fn get_chunk(&self, coord: IVec3) -> Option<Entity> {
+        self.chunks.get(&coord).copied()
+    }
+
+    /// Checks if a chunk is registered in the map.
+    pub fn is_chunk_present(&self, coord: IVec3) -> bool {
+        self.chunks.contains_key(&coord)
+    }
+
+    /// Registers a new chunk entity at the given coordinate.
+    pub fn register_chunk(&mut self, coord: IVec3, entity: Entity) {
+        self.chunks.insert(coord, entity);
+    }
+
+    /// Unregisters a chunk, removing it from spatial tracking.
+    pub fn unregister_chunk(&mut self, coord: IVec3) {
+        self.chunks.remove(&coord);
+    }
+}
diff --git a/crates/server/src/world/chunk/components.rs b/crates/server/src/world/chunk/components.rs
new file mode 100644
index 00000000..6280ef12
--- /dev/null
+++ b/crates/server/src/world/chunk/components.rs
@@ -0,0 +1,25 @@
+use crate::world::terrain::BiomeMapComponent;
+use bevy::prelude::*;
+use shared::world::chunk::{ChunkBlocksComponent, ChunkMetadata};
+
+/// Marker component for chunks that are registered but haven't started generation.
+#[derive(Component, Default, Debug)]
+pub struct NeedsGenerating;
+
+/// Marker component for chunks that are currently being generated.
+#[derive(Component, Default, Debug)]
+pub struct Generating;
+
+/// Marker component for chunks that are fully generated and active in the world.
+#[derive(Component, Default, Debug)]
+pub struct ActiveChunk;
+
+/// Marker component for chunks that are generated/loaded but contain no data (e.g., all air).
+#[derive(Component, Default, Debug)]
+pub struct EmptyChunk;
+
+pub struct GeneratedChunkComponentBundle {
+    pub chunk_blocks: Option<ChunkBlocksComponent>,
+    pub chunk_metadata: Option<ChunkMetadata>,
+    pub biome_map: BiomeMapComponent,
+}
diff --git a/crates/server/src/world/chunk/mod.rs b/crates/server/src/world/chunk/mod.rs
new file mode 100644
index 00000000..18dc75b2
--- /dev/null
+++ b/crates/server/src/world/chunk/mod.rs
@@ -0,0 +1,32 @@
+pub mod chunk_map;
+pub mod components;
+
+pub use chunk_map::ChunkMap;
+pub use components::GeneratedChunkComponentBundle;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+mod tasks;
+
+use crate::lifecycle::state::ServerState;
+use bevy::prelude::*;
+
+pub(crate) struct ChunkPlugin;
+
+impl Plugin for ChunkPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<ChunkMap>();
+
+        // chunk task generation logic
+        app.add_systems(
+            FixedUpdate,
+            (
+                tasks::start_pending_generation_tasks_system,
+                tasks::poll_chunk_generation_tasks,
+            )
+                .run_if(in_state(ServerState::Running)),
+        );
+    }
+}
diff --git a/crates/shared/src/simulation/chunk/tasks/datagen/components.rs b/crates/server/src/world/chunk/tasks/components.rs
similarity index 52%
rename from crates/shared/src/simulation/chunk/tasks/datagen/components.rs
rename to crates/server/src/world/chunk/tasks/components.rs
index 26ded900..c9729a1f 100644
--- a/crates/shared/src/simulation/chunk/tasks/datagen/components.rs
+++ b/crates/server/src/world/chunk/tasks/components.rs
@@ -1,4 +1,4 @@
-use crate::simulation::chunk::{ChunkLod, components::GeneratedChunkComponentBundle};
+use crate::world::chunk::components::GeneratedChunkComponentBundle;
 use bevy::ecs::prelude::Component;
 use crossbeam::channel::Receiver;
 
@@ -7,9 +7,3 @@ use crossbeam::channel::Receiver;
 pub struct ChunkGenerationTaskComponent {
     pub receiver: Receiver<GeneratedChunkComponentBundle>,
 }
-
-/// Marks that a chunk needs to have its data generated by the terrain generator.
-#[derive(Component)]
-pub struct NeedsGenerating {
-    pub lod: ChunkLod,
-}
diff --git a/crates/server/src/world/chunk/tasks/mod.rs b/crates/server/src/world/chunk/tasks/mod.rs
new file mode 100644
index 00000000..05daff90
--- /dev/null
+++ b/crates/server/src/world/chunk/tasks/mod.rs
@@ -0,0 +1,7 @@
+mod components;
+mod poll_generation;
+mod start_generation;
+
+use components::ChunkGenerationTaskComponent;
+pub(super) use poll_generation::poll_chunk_generation_tasks;
+pub(super) use start_generation::start_pending_generation_tasks_system;
diff --git a/crates/server/src/world/chunk/tasks/poll_generation.rs b/crates/server/src/world/chunk/tasks/poll_generation.rs
new file mode 100644
index 00000000..8f0001fa
--- /dev/null
+++ b/crates/server/src/world/chunk/tasks/poll_generation.rs
@@ -0,0 +1,66 @@
+use super::ChunkGenerationTaskComponent;
+use crate::{
+    prelude::*,
+    world::chunk::chunk_map::ChunkMap,
+    world::chunk::components::{ActiveChunk, EmptyChunk, Generating},
+};
+use bevy::ecs::prelude::*;
+use crossbeam::channel::TryRecvError;
+use shared::world::chunk::ChunkCoord;
+
+/// Polls chunk generation tasks, adds generated components, and marks chunks as `Active`.
+#[instrument(skip_all)]
+pub fn poll_chunk_generation_tasks(
+    // input
+    mut tasks_query: Query<
+        (Entity, &mut ChunkGenerationTaskComponent, &ChunkCoord),
+        With<Generating>,
+    >,
+
+    // output
+    mut commands: Commands,
+    mut chunk_manager: ResMut<ChunkMap>,
+) {
+    // poll all generation tasks
+    for (entity, generation_task_component, coord) in tasks_query.iter_mut() {
+        match generation_task_component.receiver.try_recv() {
+            Ok(gen_bundle) => {
+                if let Some(chunk_blocks) = gen_bundle.chunk_blocks {
+                    trace!(
+                        target: "chunk_loading",
+                        "Chunk generation finished for {}. Marking as Active.",
+                        coord
+                    );
+                    commands
+                        .entity(entity)
+                        .insert((chunk_blocks, gen_bundle.biome_map, ActiveChunk))
+                        .remove::<ChunkGenerationTaskComponent>()
+                        .remove::<Generating>();
+                } else {
+                    trace!(
+                        target: "chunk_loading",
+                        "Chunk generation finished for {} but chunk is empty. Marking as Active (Empty).",
+                        coord
+                    );
+                    commands
+                        .entity(entity)
+                        .insert(EmptyChunk)
+                        .remove::<ChunkGenerationTaskComponent>()
+                        .remove::<Generating>();
+                }
+            }
+            Err(TryRecvError::Empty) => {
+                // task still running
+            }
+            Err(TryRecvError::Disconnected) => {
+                warn!(
+                    target: "chunk_loading",
+                    "Chunk generation task for {} failed (channel disconnected). Despawning entity.",
+                    coord
+                );
+                commands.entity(entity).despawn();
+                chunk_manager.unregister_chunk(coord.pos);
+            }
+        }
+    }
+}
diff --git a/crates/shared/src/simulation/chunk/tasks/datagen/start_generation.rs b/crates/server/src/world/chunk/tasks/start_generation.rs
similarity index 63%
rename from crates/shared/src/simulation/chunk/tasks/datagen/start_generation.rs
rename to crates/server/src/world/chunk/tasks/start_generation.rs
index 232fb980..323b1b92 100644
--- a/crates/shared/src/simulation/chunk/tasks/datagen/start_generation.rs
+++ b/crates/server/src/world/chunk/tasks/start_generation.rs
@@ -1,23 +1,27 @@
-use crate::prelude::*;
-use crate::simulation::{
-    biome::BiomeRegistryResource,
-    block::BlockRegistry,
-    chunk::{
-        ChunkBlocksComponent, ChunkCoord, ChunkGenerationTaskComponent, ChunkState,
-        ChunkStateManager, NeedsGenerating, components::GeneratedChunkComponentBundle,
-    },
-    terrain::{
-        ActiveBiomeGenerator, ActiveClimateGenerator, ActiveTerrainGenerator, ActiveTerrainPainter,
-        BiomeMapComponent,
-        generators::{
-            biome::BiomeResultBuilder, painting::PaintResultBuilder, shaping::ChunkUniformity,
-            shaping::ShapeResultBuilder,
+use crate::{
+    prelude::*,
+    world::{
+        chunk::components::{
+            ActiveChunk, GeneratedChunkComponentBundle, Generating, NeedsGenerating,
+        },
+        chunk::tasks::components::ChunkGenerationTaskComponent,
+        terrain::{
+            ActiveBiomeGenerator, ActiveClimateGenerator, ActiveTerrainGenerator,
+            ActiveTerrainPainter, BiomeMapComponent,
+            generators::{
+                biome::BiomeResultBuilder, painting::PaintResultBuilder, shaping::ChunkUniformity,
+                shaping::ShapeResultBuilder,
+            },
         },
     },
 };
-use bevy::ecs::prelude::*;
-use bevy::tasks::AsyncComputeTaskPool;
+use bevy::{ecs::prelude::*, tasks::AsyncComputeTaskPool};
 use crossbeam::channel::unbounded;
+use shared::world::{
+    biome::BiomeRegistryResource,
+    block::BlockRegistry,
+    chunk::{ChunkBlocksComponent, ChunkCoord, ChunkLod},
+};
 
 /// Queries for entities needing generation and starts a limited number per frame.
 #[instrument(skip_all)]
@@ -25,13 +29,12 @@ use crossbeam::channel::unbounded;
 pub fn start_pending_generation_tasks_system(
     // input
     mut pending_chunks_query: Query<
-        (Entity, &NeedsGenerating, &ChunkCoord),
-        Without<ChunkGenerationTaskComponent>,
+        (Entity, &ChunkLod, &ChunkCoord),
+        (With<NeedsGenerating>, Without<ChunkGenerationTaskComponent>),
     >,
 
     // output
     mut commands: Commands,
-    mut chunk_manager: ResMut<ChunkStateManager>,
     block_registry: Res<BlockRegistry>,
     biome_registry: Res<BiomeRegistryResource>,
     biome_generator: Res<ActiveBiomeGenerator>,
@@ -39,36 +42,20 @@ pub fn start_pending_generation_tasks_system(
     terrain_painter: Res<ActiveTerrainPainter>,
     climate_generator: Res<ActiveClimateGenerator>,
 ) {
-    for (entity, needs_generating, coord) in pending_chunks_query.iter_mut() {
-        // check for cancellation
-        match chunk_manager.get_state(coord.pos) {
-            Some(ChunkState::NeedsGenerating {
-                entity: state_entity,
-            }) if state_entity == entity => {
-                // state is correct, proceed to start generation
-            }
-            _ => {
-                debug!(
-                    target : "chunk_loading",
-                    "Entity {:?} NeedsGenerating for chunk {} found, but manager state ({:?}) doesn't match NeedsGenerating({:?}). Assuming cancelled/stale.",
-                    entity, coord, chunk_manager.get_state(coord.pos), entity
-                );
-                continue;
-            }
-        }
+    const MAX_CHUNKS_PER_FRAME: usize = 4;
 
-        let lod = needs_generating.lod;
+    for (entity, lod_comp, coord) in pending_chunks_query.iter_mut().take(MAX_CHUNKS_PER_FRAME) {
+        let lod = *lod_comp;
 
         // check if the chunk is empty according to the terrain generator
         match terrain_generator.0.determine_chunk_uniformity(coord.pos) {
             ChunkUniformity::Empty => {
-                trace!(
-                    target: "chunk_loading",
-                    "Chunk {} is empty according to terrain generator. Skipping generation.",
-                    coord
-                );
-                commands.entity(entity).despawn();
-                chunk_manager.mark_as_loaded_but_empty(coord.pos);
+                let chunk_blocks = ChunkBlocksComponent::new_uniform_empty(lod);
+
+                commands
+                    .entity(entity)
+                    .insert((chunk_blocks, ActiveChunk))
+                    .remove::<NeedsGenerating>();
                 continue;
             }
             ChunkUniformity::Solid => {
@@ -86,10 +73,8 @@ pub fn start_pending_generation_tasks_system(
 
                 commands
                     .entity(entity)
-                    .insert(ChunkGenerationTaskComponent { receiver })
+                    .insert((ChunkGenerationTaskComponent { receiver }, Generating))
                     .remove::<NeedsGenerating>();
-
-                chunk_manager.mark_as_generating(coord.pos, entity);
                 continue;
             }
             _ => {}
@@ -108,12 +93,6 @@ pub fn start_pending_generation_tasks_system(
 
         AsyncComputeTaskPool::get()
             .spawn(async move {
-                // for testing, override the chunk lod
-                // let mut lod = ChunkLod(0);
-                // if coord_clone.z >= 5 && (coord_clone.x == 0 || coord_clone.x == 1) {
-                //     lod = ChunkLod(3);
-                // }
-
                 // INFO: biome gen
                 let climate_map = climate_gen.generate(coord_clone.clone());
                 let biome_map = BiomeMapComponent::new_empty(lod);
@@ -162,9 +141,7 @@ pub fn start_pending_generation_tasks_system(
 
         commands
             .entity(entity)
-            .insert(ChunkGenerationTaskComponent { receiver })
+            .insert((ChunkGenerationTaskComponent { receiver }, Generating))
             .remove::<NeedsGenerating>();
-
-        chunk_manager.mark_as_generating(coord.pos, entity);
     }
 }
diff --git a/crates/server/src/world/chunk_loading.rs b/crates/server/src/world/chunk_loading.rs
new file mode 100644
index 00000000..96ec3240
--- /dev/null
+++ b/crates/server/src/world/chunk_loading.rs
@@ -0,0 +1,219 @@
+use crate::network::types::ClientConnection;
+use crate::prelude::*;
+use crate::world::chunk::chunk_map::ChunkMap;
+use crate::world::chunk::components::{ActiveChunk, NeedsGenerating};
+use bevy::prelude::*;
+use lightyear::prelude::MessageSender;
+use shared::network::ChunkData;
+use shared::network::protocol::ServerMessage;
+use shared::player::components::LogicalPosition;
+use shared::world::chunk::{
+    ChunkBlocksComponent, ChunkCoord, ChunkLod, LOAD_DISTANCE, WORLD_MAX_Y_CHUNK, WORLD_MIN_Y_CHUNK,
+};
+use std::collections::HashSet;
+
+/// Tracks which chunks have been sent to a specific client.
+#[derive(Component, Default)]
+pub struct ClientChunkTracker {
+    pub sent_chunks: HashSet<IVec3>,
+}
+
+/// Determines which chunks each player needs and starts loading them.
+pub fn manage_player_chunk_loading_system(
+    // input
+    player_query: Query<(&LogicalPosition, Entity), With<ClientConnection>>,
+
+    // output
+    mut chunk_manager: ResMut<ChunkMap>,
+    mut commands: Commands,
+) {
+    for (position, player_ent) in player_query.iter() {
+        trace!(target:"server_chunk_loading", "Processing player {:?} at {:?}", player_ent, position.0);
+        let player_pos = position.0;
+        let player_chunk_pos = ChunkCoord::world_to_chunk_pos(player_pos);
+
+        let mut chunks_spurred_this_frame = 0;
+        const MAX_CHUNKS_SPURRED_PER_FRAME: usize = 32;
+
+        // determine desired chunks
+        for y in WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK {
+            for z in -LOAD_DISTANCE..=LOAD_DISTANCE {
+                for x in -LOAD_DISTANCE..=LOAD_DISTANCE {
+                    if chunks_spurred_this_frame >= MAX_CHUNKS_SPURRED_PER_FRAME {
+                        break;
+                    }
+
+                    let coord = IVec3::new(player_chunk_pos.x + x, y, player_chunk_pos.z + z);
+
+                    if !chunk_manager.is_chunk_present(coord) {
+                        trace!(target:"server_chunk_loading","Server: Marking chunk needs-generation at {:?}", coord);
+                        let ent = commands
+                            .spawn((NeedsGenerating, ChunkLod(0), ChunkCoord { pos: coord }))
+                            .id();
+                        chunk_manager.register_chunk(coord, ent);
+                        chunks_spurred_this_frame += 1;
+                    }
+                }
+                if chunks_spurred_this_frame >= MAX_CHUNKS_SPURRED_PER_FRAME {
+                    break;
+                }
+            }
+            if chunks_spurred_this_frame >= MAX_CHUNKS_SPURRED_PER_FRAME {
+                break;
+            }
+        }
+    }
+}
+
+/// Sends generated chunk data to clients that need it.
+pub fn sync_chunk_data_to_clients_system(
+    // input
+    mut client_query: Query<(&LogicalPosition, &ClientConnection, &mut ClientChunkTracker)>,
+    chunk_query: Query<(&ChunkCoord, &ChunkBlocksComponent), With<ActiveChunk>>,
+    chunk_manager: Res<ChunkMap>,
+    mut sender_query: Query<&mut MessageSender<ServerMessage>>,
+) {
+    for (position, connection, mut tracker) in client_query.iter_mut() {
+        let Ok(mut sender) = sender_query.get_mut(connection.client_entity) else {
+            warn!("No MessageSender for client {:?}", connection.client_entity);
+            continue;
+        };
+
+        let player_pos = position.0;
+        let player_chunk_pos = ChunkCoord::world_to_chunk_pos(player_pos);
+
+        let mut chunks_sent_this_frame = 0;
+        const MAX_CHUNKS_SENT_PER_FRAME: usize = 4;
+
+        // find chunks within load distance that haven't been sent yet
+        for y in WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK {
+            for z in -LOAD_DISTANCE..=LOAD_DISTANCE {
+                for x in -LOAD_DISTANCE..=LOAD_DISTANCE {
+                    if chunks_sent_this_frame >= MAX_CHUNKS_SENT_PER_FRAME {
+                        break;
+                    }
+
+                    let coord = IVec3::new(player_chunk_pos.x + x, y, player_chunk_pos.z + z);
+
+                    if tracker.sent_chunks.contains(&coord) {
+                        continue;
+                    }
+
+                    // Look up the Entity from ChunkMap::get_chunk(coord)
+                    if let Some(chunk_ent) = chunk_manager.get_chunk(coord) {
+                        // Query that Entity in the ECS to see if it has the ActiveChunk component
+                        if let Ok((_coord, blocks)) = chunk_query.get(chunk_ent) {
+                            let data = extract_block_data(blocks);
+                            let original_len = data.len();
+
+                            // compress the data using zstd
+                            let compressed_data = match zstd::encode_all(&data[..], 3) {
+                                Ok(compressed) => compressed,
+                                Err(e) => {
+                                    error!("Failed to compress chunk data for {:?}: {}", coord, e);
+                                    data
+                                }
+                            };
+
+                            trace!(target:"server_chunk_loading", "Sending chunk {:?} to client {:?} (compressed: {} -> {} bytes)", coord, connection.client_entity, original_len, compressed_data.len());
+                            sender.send::<ChunkData>(ServerMessage::ChunkData {
+                                coord: ChunkCoord { pos: coord },
+                                data: compressed_data,
+                            });
+
+                            tracker.sent_chunks.insert(coord);
+                            chunks_sent_this_frame += 1;
+                        }
+                    }
+                }
+                if chunks_sent_this_frame >= MAX_CHUNKS_SENT_PER_FRAME {
+                    break;
+                }
+            }
+            if chunks_sent_this_frame >= MAX_CHUNKS_SENT_PER_FRAME {
+                break;
+            }
+        }
+    }
+}
+
+fn extract_block_data(blocks: &ChunkBlocksComponent) -> Vec<u8> {
+    let view = blocks.get_view();
+    let size = blocks.size();
+    let mut data = Vec::with_capacity(size * size * size);
+
+    match view {
+        shared::world::chunk::ChunkView::Uniform(block_id) => {
+            data.resize(size * size * size, block_id);
+        }
+        shared::world::chunk::ChunkView::Dense(volume_view) => {
+            // Optimally structured loop (X, Z, Y)
+            for x in 0..size {
+                for z in 0..size {
+                    for y in 0..size {
+                        data.push(volume_view.get_data(x, y, z));
+                    }
+                }
+            }
+        }
+    }
+    data
+}
+
+// INFO: ---------------
+//         tests
+// ---------------------
+
+#[cfg(test)]
+mod tests {
+    use crate::network::types::ClientConnection;
+    use crate::prelude::*;
+    use crate::world::{
+        chunk::chunk_map::ChunkMap,
+        chunk::components::NeedsGenerating,
+        chunk_loading::{ClientChunkTracker, manage_player_chunk_loading_system},
+    };
+    use bevy::prelude::*;
+    use shared::world::chunk::ChunkCoord;
+
+    #[test]
+    fn test_manage_player_chunk_loading() {
+        let mut app = App::new();
+
+        // add minimal resources
+        app.insert_resource(ChunkMap::default());
+
+        // add the system
+        app.add_systems(Update, manage_player_chunk_loading_system);
+
+        // spawn a player
+        let client_entity = app.world_mut().spawn_empty().id();
+        app.world_mut().spawn((
+            Transform::from_xyz(0.0, 32.0, 0.0),
+            shared::player::components::LogicalPosition(Vec3::new(0.0, 32.0, 0.0)),
+            ClientConnection { client_entity },
+            ClientChunkTracker::default(),
+        ));
+
+        // run enough times to ensure the chunk is loaded (due to per-frame quota)
+        for _ in 0..200 {
+            app.update();
+        }
+
+        // check if chunks were requested
+        let chunk_manager = app.world().resource::<ChunkMap>();
+        assert!(
+            !chunk_manager.chunks.is_empty(),
+            "Chunk map should not be empty after player spawn"
+        );
+
+        // verify we have a chunk at (0, 1, 0) - player is at Y=32 which is chunk Y=1
+        let player_chunk_coord = IVec3::new(0, 1, 0);
+        assert!(chunk_manager.is_chunk_present(player_chunk_coord));
+
+        // verify the entity has NeedsGenerating
+        let entity = chunk_manager.get_chunk(player_chunk_coord).unwrap();
+        assert!(app.world().get::<NeedsGenerating>(entity).is_some());
+        assert!(app.world().get::<ChunkCoord>(entity).is_some());
+    }
+}
diff --git a/crates/server/src/world/mod.rs b/crates/server/src/world/mod.rs
new file mode 100644
index 00000000..4f59ed4c
--- /dev/null
+++ b/crates/server/src/world/mod.rs
@@ -0,0 +1,29 @@
+pub mod chunk;
+pub mod chunk_loading;
+pub mod terrain;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::lifecycle::state::ServerState;
+use bevy::prelude::*;
+use chunk_loading::{manage_player_chunk_loading_system, sync_chunk_data_to_clients_system};
+use terrain::TerrainGenerationPlugin;
+
+pub(crate) struct WorldPlugin;
+
+impl Plugin for WorldPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins((TerrainGenerationPlugin, chunk::ChunkPlugin));
+
+        app.add_systems(
+            Update,
+            (
+                manage_player_chunk_loading_system,
+                sync_chunk_data_to_clients_system,
+            )
+                .run_if(in_state(ServerState::Running)),
+        );
+    }
+}
diff --git a/crates/shared/src/simulation/terrain/components/biome_map.rs b/crates/server/src/world/terrain/components/biome_map.rs
similarity index 56%
rename from crates/shared/src/simulation/terrain/components/biome_map.rs
rename to crates/server/src/world/terrain/components/biome_map.rs
index 076e1244..46ff9f70 100644
--- a/crates/shared/src/simulation/terrain/components/biome_map.rs
+++ b/crates/server/src/world/terrain/components/biome_map.rs
@@ -1,7 +1,6 @@
-use crate::prelude::*;
-use crate::simulation::biome::biome_registry::BiomeId;
-use crate::simulation::chunk::types::{ChunkLod, ChunkVolumeData};
-use bevy::ecs::prelude::Component;
+use bevy::prelude::{Component, Deref, DerefMut};
+use shared::world::biome::biome_registry::BiomeId;
+use shared::world::chunk::types::{ChunkLod, ChunkVolumeData};
 
 #[derive(Component, Clone, Deref, DerefMut)]
 pub struct BiomeMapComponent(pub ChunkVolumeData<BiomeId>);
diff --git a/crates/shared/src/simulation/terrain/components/height_maps.rs b/crates/server/src/world/terrain/components/height_maps.rs
similarity index 94%
rename from crates/shared/src/simulation/terrain/components/height_maps.rs
rename to crates/server/src/world/terrain/components/height_maps.rs
index 13277f90..d3f390e8 100644
--- a/crates/shared/src/simulation/terrain/components/height_maps.rs
+++ b/crates/server/src/world/terrain/components/height_maps.rs
@@ -1,6 +1,6 @@
 use bevy::ecs::prelude::Component;
 
-use crate::simulation::chunk::CHUNK_AREA;
+use shared::world::chunk::CHUNK_AREA;
 
 /// Heightmap of the highest non-transparent block.
 ///
diff --git a/crates/shared/src/simulation/terrain/components/mod.rs b/crates/server/src/world/terrain/components/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/components/mod.rs
rename to crates/server/src/world/terrain/components/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/biome/basic_biomes.rs b/crates/server/src/world/terrain/generators/biome/basic_biomes.rs
similarity index 87%
rename from crates/shared/src/simulation/terrain/generators/biome/basic_biomes.rs
rename to crates/server/src/world/terrain/generators/biome/basic_biomes.rs
index 07c522fb..40d77670 100644
--- a/crates/shared/src/simulation/terrain/generators/biome/basic_biomes.rs
+++ b/crates/server/src/world/terrain/generators/biome/basic_biomes.rs
@@ -1,11 +1,9 @@
 use crate::prelude::*;
-use crate::simulation::{
-    biome::BiomeRegistryResource,
-    terrain::{
-        climate::ClimateMapComponent,
-        generators::biome::{BiomeGenerator, BiomeResultBuilder},
-    },
+use crate::world::terrain::{
+    climate::ClimateMapComponent,
+    generators::biome::{BiomeGenerator, BiomeResultBuilder},
 };
+use shared::world::biome::BiomeRegistryResource;
 
 // A default implementation
 #[derive(Debug, Default)]
diff --git a/crates/shared/src/simulation/terrain/generators/biome/lib/gentrait.rs b/crates/server/src/world/terrain/generators/biome/lib/gentrait.rs
similarity index 95%
rename from crates/shared/src/simulation/terrain/generators/biome/lib/gentrait.rs
rename to crates/server/src/world/terrain/generators/biome/lib/gentrait.rs
index a154750f..8600f295 100644
--- a/crates/shared/src/simulation/terrain/generators/biome/lib/gentrait.rs
+++ b/crates/server/src/world/terrain/generators/biome/lib/gentrait.rs
@@ -1,9 +1,9 @@
 use crate::prelude::*;
-use crate::simulation::terrain::climate::ClimateMapComponent;
-use crate::simulation::{
+use crate::world::terrain::BiomeMapComponent;
+use crate::world::terrain::climate::ClimateMapComponent;
+use shared::world::{
     biome::{BiomeId, BiomeRegistryResource},
     chunk::{ChunkCoord, VolumeDataWriter},
-    terrain::BiomeMapComponent,
 };
 use std::fmt::Debug;
 
diff --git a/crates/shared/src/simulation/terrain/generators/biome/lib/mod.rs b/crates/server/src/world/terrain/generators/biome/lib/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/generators/biome/lib/mod.rs
rename to crates/server/src/world/terrain/generators/biome/lib/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/biome/mod.rs b/crates/server/src/world/terrain/generators/biome/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/generators/biome/mod.rs
rename to crates/server/src/world/terrain/generators/biome/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/biome/multinoise_biomes.rs b/crates/server/src/world/terrain/generators/biome/multinoise_biomes.rs
similarity index 95%
rename from crates/shared/src/simulation/terrain/generators/biome/multinoise_biomes.rs
rename to crates/server/src/world/terrain/generators/biome/multinoise_biomes.rs
index d37149da..6f5d5f98 100644
--- a/crates/shared/src/simulation/terrain/generators/biome/multinoise_biomes.rs
+++ b/crates/server/src/world/terrain/generators/biome/multinoise_biomes.rs
@@ -1,11 +1,9 @@
 use crate::prelude::*;
-use crate::simulation::{
-    biome::BiomeRegistryResource,
-    terrain::{
-        climate::{ClimateData, ClimateMapComponent},
-        generators::biome::{BiomeGenerator, BiomeResultBuilder},
-    },
+use crate::world::terrain::{
+    climate::{ClimateData, ClimateMapComponent},
+    generators::biome::{BiomeGenerator, BiomeResultBuilder},
 };
+use shared::world::biome::BiomeRegistryResource;
 
 #[derive(Debug, Default)]
 pub struct MultiNoiseBiomeGenerator;
diff --git a/crates/shared/src/simulation/terrain/generators/climate/climate_noise_gen.rs b/crates/server/src/world/terrain/generators/climate/climate_noise_gen.rs
similarity index 66%
rename from crates/shared/src/simulation/terrain/generators/climate/climate_noise_gen.rs
rename to crates/server/src/world/terrain/generators/climate/climate_noise_gen.rs
index 9ab8f1ed..b6101565 100644
--- a/crates/shared/src/simulation/terrain/generators/climate/climate_noise_gen.rs
+++ b/crates/server/src/world/terrain/generators/climate/climate_noise_gen.rs
@@ -1,13 +1,11 @@
 use super::climate_buffer_pool::CLIMATE_BUFFERS;
-use crate::simulation::{
-    chunk::{ChunkCoord, ChunkLod},
-    terrain::{
-        ClimateGenerator,
-        climate::{ClimateData, ClimateMapComponent},
-    },
+use crate::world::terrain::{
+    ClimateGenerator,
+    climate::{ClimateData, ClimateMapComponent},
 };
 use bevy::ecs::prelude::Resource;
 use noise::MultiFractal;
+use shared::world::chunk::{ChunkCoord, ChunkLod};
 
 #[derive(Resource)]
 pub struct ClimateNoiseGenerator {
@@ -22,7 +20,6 @@ impl ClimateNoiseGenerator {
     pub fn new(seed: u32) -> Self {
         use noise::{Fbm, OpenSimplex};
 
-        // TODO: Tune noise parameters
         Self {
             temperature_noise: Fbm::<OpenSimplex>::new(seed).set_frequency(0.005),
             precipitation_noise: Fbm::<OpenSimplex>::new(seed + 1).set_frequency(0.005),
@@ -48,15 +45,19 @@ impl ClimateNoiseGenerator {
     /// Orchestrates the filling of all 5 climate buffers
     fn orchestrate_fill(
         &self,
-        buffers: &mut super::climate_buffer_pool::ClimateBufferPool,
+        temp: &mut [f32],
+        precip: &mut [f32],
+        cont: &mut [f32],
+        erosion: &mut [f32],
+        weird: &mut [f32],
         base_x: i32,
         base_z: i32,
         size: usize,
     ) {
-        let area = size * size;
+        let chunk_area = size * size;
 
         // calculate coordinates
-        let mut coords = vec![[0.0; 2]; area];
+        let mut coords = vec![[0.0; 2]; chunk_area];
         for x in 0..size {
             for z in 0..size {
                 let idx = x * size + z;
@@ -66,27 +67,11 @@ impl ClimateNoiseGenerator {
             }
         }
 
-        self.generate_single_map(
-            &coords,
-            buffers.temperature.as_mut_slice(),
-            &self.temperature_noise,
-        );
-        self.generate_single_map(
-            &coords,
-            buffers.precipitation.as_mut_slice(),
-            &self.precipitation_noise,
-        );
-        self.generate_single_map(
-            &coords,
-            buffers.continentalness.as_mut_slice(),
-            &self.continental_noise,
-        );
-        self.generate_single_map(&coords, buffers.erosion.as_mut_slice(), &self.erosion_noise);
-        self.generate_single_map(
-            &coords,
-            buffers.weirdness.as_mut_slice(),
-            &self.weirdness_noise,
-        );
+        self.generate_single_map(&coords, temp, &self.temperature_noise);
+        self.generate_single_map(&coords, precip, &self.precipitation_noise);
+        self.generate_single_map(&coords, cont, &self.continental_noise);
+        self.generate_single_map(&coords, erosion, &self.erosion_noise);
+        self.generate_single_map(&coords, weird, &self.weirdness_noise);
     }
 }
 
@@ -99,21 +84,17 @@ impl ClimateGenerator for ClimateNoiseGenerator {
 
         CLIMATE_BUFFERS.with(|pool| {
             let mut buffers = pool.borrow_mut();
-            buffers.prepare(size);
+            let (temp, precip, cont, erosion, weird) = buffers.get_slices(size);
 
             // fill all buffers
-            self.orchestrate_fill(&mut buffers, base_pos.x, base_pos.z, size);
+            self.orchestrate_fill(
+                temp, precip, cont, erosion, weird, base_pos.x, base_pos.z, size,
+            );
 
             let mut writer = climate_map.get_data_writer();
             let area = size * size;
 
             // read results and populate into ClimateData
-            let temp = buffers.temperature.as_slice();
-            let precip = buffers.precipitation.as_slice();
-            let cont = buffers.continentalness.as_slice();
-            let erosion = buffers.erosion.as_slice();
-            let weird = buffers.weirdness.as_slice();
-
             for i in 0..area {
                 let climate_data = ClimateData {
                     temperature: temp[i],
diff --git a/crates/server/src/world/terrain/generators/climate/lib/climate_buffer_pool.rs b/crates/server/src/world/terrain/generators/climate/lib/climate_buffer_pool.rs
new file mode 100644
index 00000000..27de5d5a
--- /dev/null
+++ b/crates/server/src/world/terrain/generators/climate/lib/climate_buffer_pool.rs
@@ -0,0 +1,52 @@
+use shared::world::chunk::CHUNK_SIDE_LENGTH;
+use std::cell::RefCell;
+
+const MAX_BUFFER_LEN: usize = CHUNK_SIDE_LENGTH * CHUNK_SIDE_LENGTH;
+
+/// A thread-local pool of buffers to prevent re-allocating buffers every chunk.
+pub struct ClimateBufferPool {
+    pub temperature: Vec<f32>,
+    pub precipitation: Vec<f32>,
+    pub continentalness: Vec<f32>,
+    pub erosion: Vec<f32>,
+    pub weirdness: Vec<f32>,
+}
+
+impl Default for ClimateBufferPool {
+    fn default() -> Self {
+        Self {
+            temperature: vec![0.0; MAX_BUFFER_LEN],
+            precipitation: vec![0.0; MAX_BUFFER_LEN],
+            continentalness: vec![0.0; MAX_BUFFER_LEN],
+            erosion: vec![0.0; MAX_BUFFER_LEN],
+            weirdness: vec![0.0; MAX_BUFFER_LEN],
+        }
+    }
+}
+
+impl ClimateBufferPool {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Returns mutable sub-slices of the exact requested length from the pre-allocated buffers.
+    pub fn get_slices(
+        &mut self,
+        size: usize,
+    ) -> (&mut [f32], &mut [f32], &mut [f32], &mut [f32], &mut [f32]) {
+        let len = size * size;
+        debug_assert!(len <= MAX_BUFFER_LEN);
+
+        (
+            &mut self.temperature[..len],
+            &mut self.precipitation[..len],
+            &mut self.continentalness[..len],
+            &mut self.erosion[..len],
+            &mut self.weirdness[..len],
+        )
+    }
+}
+
+thread_local! {
+    pub static CLIMATE_BUFFERS: RefCell<ClimateBufferPool> = RefCell::new(ClimateBufferPool::new());
+}
diff --git a/crates/shared/src/simulation/terrain/generators/climate/lib/climate_map_component.rs b/crates/server/src/world/terrain/generators/climate/lib/climate_map_component.rs
similarity index 89%
rename from crates/shared/src/simulation/terrain/generators/climate/lib/climate_map_component.rs
rename to crates/server/src/world/terrain/generators/climate/lib/climate_map_component.rs
index 8bd519bf..3a8154f0 100644
--- a/crates/shared/src/simulation/terrain/generators/climate/lib/climate_map_component.rs
+++ b/crates/server/src/world/terrain/generators/climate/lib/climate_map_component.rs
@@ -1,6 +1,5 @@
-use crate::prelude::*;
-use crate::simulation::chunk::{ChunkColumnData, types::ChunkLod};
-use bevy::ecs::component::Component;
+use bevy::prelude::{Component, Deref, DerefMut};
+use shared::world::chunk::{ChunkColumnData, types::ChunkLod};
 
 // INFO: --------------------------------
 //         Biome gen climate data
diff --git a/crates/shared/src/simulation/terrain/generators/climate/lib/gentrait.rs b/crates/server/src/world/terrain/generators/climate/lib/gentrait.rs
similarity index 52%
rename from crates/shared/src/simulation/terrain/generators/climate/lib/gentrait.rs
rename to crates/server/src/world/terrain/generators/climate/lib/gentrait.rs
index 2ca16b6e..41fd4d1c 100644
--- a/crates/shared/src/simulation/terrain/generators/climate/lib/gentrait.rs
+++ b/crates/server/src/world/terrain/generators/climate/lib/gentrait.rs
@@ -1,4 +1,5 @@
-use crate::simulation::{chunk::ChunkCoord, terrain::climate::ClimateMapComponent};
+use crate::world::terrain::climate::ClimateMapComponent;
+use shared::world::chunk::ChunkCoord;
 
 pub trait ClimateGenerator {
     fn generate(&self, chunk_coord: ChunkCoord) -> ClimateMapComponent;
diff --git a/crates/shared/src/simulation/terrain/generators/climate/lib/mod.rs b/crates/server/src/world/terrain/generators/climate/lib/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/generators/climate/lib/mod.rs
rename to crates/server/src/world/terrain/generators/climate/lib/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/climate/mod.rs b/crates/server/src/world/terrain/generators/climate/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/generators/climate/mod.rs
rename to crates/server/src/world/terrain/generators/climate/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/mod.rs b/crates/server/src/world/terrain/generators/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/generators/mod.rs
rename to crates/server/src/world/terrain/generators/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/painting/lib/gentrait.rs b/crates/server/src/world/terrain/generators/painting/lib/gentrait.rs
similarity index 98%
rename from crates/shared/src/simulation/terrain/generators/painting/lib/gentrait.rs
rename to crates/server/src/world/terrain/generators/painting/lib/gentrait.rs
index dd280349..22a9b82c 100644
--- a/crates/shared/src/simulation/terrain/generators/painting/lib/gentrait.rs
+++ b/crates/server/src/world/terrain/generators/painting/lib/gentrait.rs
@@ -1,9 +1,9 @@
 use crate::prelude::*;
-use crate::simulation::{
+use crate::world::terrain::BiomeMapComponent;
+use shared::world::{
     biome::BiomeRegistryResource,
     block::{BlockId, BlockRegistry},
     chunk::{ChunkBlocksComponent, ChunkCoord, ChunkMetadata, VolumeDataWriter},
-    terrain::BiomeMapComponent,
 };
 use std::fmt::Debug;
 
diff --git a/crates/shared/src/simulation/terrain/generators/painting/lib/mod.rs b/crates/server/src/world/terrain/generators/painting/lib/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/generators/painting/lib/mod.rs
rename to crates/server/src/world/terrain/generators/painting/lib/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/painting/mod.rs b/crates/server/src/world/terrain/generators/painting/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/generators/painting/mod.rs
rename to crates/server/src/world/terrain/generators/painting/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/painting/simple_surface_painter.rs b/crates/server/src/world/terrain/generators/painting/simple_surface_painter.rs
similarity index 91%
rename from crates/shared/src/simulation/terrain/generators/painting/simple_surface_painter.rs
rename to crates/server/src/world/terrain/generators/painting/simple_surface_painter.rs
index 623fc679..b4796498 100644
--- a/crates/shared/src/simulation/terrain/generators/painting/simple_surface_painter.rs
+++ b/crates/server/src/world/terrain/generators/painting/simple_surface_painter.rs
@@ -1,9 +1,9 @@
 use crate::prelude::*;
-use crate::simulation::biome::BiomeRegistryResource;
-use crate::simulation::block::BlockRegistry;
-use crate::simulation::terrain::BiomeMapComponent;
-use crate::simulation::terrain::generators::painting::{PaintResultBuilder, TerrainPainter};
-use crate::simulation::terrain::shaping::realistic_shaper::REALISTIC_SEA_LEVEL;
+use crate::world::terrain::BiomeMapComponent;
+use crate::world::terrain::generators::painting::{PaintResultBuilder, TerrainPainter};
+use crate::world::terrain::shaping::realistic_shaper::REALISTIC_SEA_LEVEL;
+use shared::world::biome::BiomeRegistryResource;
+use shared::world::block::BlockRegistry;
 
 #[derive(Debug, Clone)]
 pub struct SimpleSurfacePainter;
diff --git a/crates/shared/src/simulation/terrain/generators/shaping/lib/gentrait.rs b/crates/server/src/world/terrain/generators/shaping/lib/gentrait.rs
similarity index 98%
rename from crates/shared/src/simulation/terrain/generators/shaping/lib/gentrait.rs
rename to crates/server/src/world/terrain/generators/shaping/lib/gentrait.rs
index 937bad09..483f72cb 100644
--- a/crates/shared/src/simulation/terrain/generators/shaping/lib/gentrait.rs
+++ b/crates/server/src/world/terrain/generators/shaping/lib/gentrait.rs
@@ -1,6 +1,6 @@
 use crate::prelude::*;
-use crate::simulation::terrain::climate::ClimateMapComponent;
-use crate::simulation::{
+use crate::world::terrain::climate::ClimateMapComponent;
+use shared::world::{
     block::{BlockId, SOLID_BLOCK_ID},
     chunk::{ChunkBlocksComponent, ChunkCoord, VolumeDataWriter},
 };
diff --git a/crates/shared/src/simulation/terrain/generators/shaping/lib/mod.rs b/crates/server/src/world/terrain/generators/shaping/lib/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/generators/shaping/lib/mod.rs
rename to crates/server/src/world/terrain/generators/shaping/lib/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/shaping/mod.rs b/crates/server/src/world/terrain/generators/shaping/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/generators/shaping/mod.rs
rename to crates/server/src/world/terrain/generators/shaping/mod.rs
diff --git a/crates/shared/src/simulation/terrain/generators/shaping/noisy_shaper.rs b/crates/server/src/world/terrain/generators/shaping/noisy_shaper.rs
similarity index 93%
rename from crates/shared/src/simulation/terrain/generators/shaping/noisy_shaper.rs
rename to crates/server/src/world/terrain/generators/shaping/noisy_shaper.rs
index 63b1014b..bb6cfe54 100644
--- a/crates/shared/src/simulation/terrain/generators/shaping/noisy_shaper.rs
+++ b/crates/server/src/world/terrain/generators/shaping/noisy_shaper.rs
@@ -1,11 +1,11 @@
 use super::realistic_shaper::REALISTIC_SEA_LEVEL;
 use crate::prelude::*;
-use crate::simulation::chunk::CHUNK_SIDE_LENGTH;
-use crate::simulation::terrain::climate::ClimateMapComponent;
-use crate::simulation::terrain::generators::shaping::{
+use crate::world::terrain::climate::ClimateMapComponent;
+use crate::world::terrain::generators::shaping::{
     ChunkUniformity, ShapeResultBuilder, TerrainShaper,
 };
 use noise::{Fbm, MultiFractal, NoiseFn, Perlin};
+use shared::world::chunk::CHUNK_SIDE_LENGTH;
 
 #[derive(Debug, Clone)]
 pub struct NoisyShaper {
diff --git a/crates/shared/src/simulation/terrain/generators/shaping/realistic_shaper.rs b/crates/server/src/world/terrain/generators/shaping/realistic_shaper.rs
similarity index 94%
rename from crates/shared/src/simulation/terrain/generators/shaping/realistic_shaper.rs
rename to crates/server/src/world/terrain/generators/shaping/realistic_shaper.rs
index 16b74a77..43ee560d 100644
--- a/crates/shared/src/simulation/terrain/generators/shaping/realistic_shaper.rs
+++ b/crates/server/src/world/terrain/generators/shaping/realistic_shaper.rs
@@ -1,10 +1,10 @@
 use crate::prelude::*;
-use crate::simulation::chunk::CHUNK_SIDE_LENGTH;
-use crate::simulation::terrain::climate::ClimateMapComponent;
-use crate::simulation::terrain::generators::shaping::{
+use crate::world::terrain::climate::ClimateMapComponent;
+use crate::world::terrain::generators::shaping::{
     ChunkUniformity, ShapeResultBuilder, TerrainShaper,
 };
 use noise::{NoiseFn, Simplex};
+use shared::world::chunk::CHUNK_SIDE_LENGTH;
 
 pub const REALISTIC_SEA_LEVEL: f64 = 64.0;
 
@@ -97,7 +97,7 @@ impl TerrainShaper for RealisticShaper {
                 )
             };
 
-            // density is positive (solid) if this voxel's world height is below the target height
+            // density is positive (solid) if this block's world height is below the target height
             //
             // The division by 40 is arbitrary, but the more we divide by, the more impact the noise
             // function has. The less we divide by, the more impact target height has. Should probably
diff --git a/crates/shared/src/simulation/terrain/generators/shaping/simplex3d_shaper.rs b/crates/server/src/world/terrain/generators/shaping/simplex3d_shaper.rs
similarity index 93%
rename from crates/shared/src/simulation/terrain/generators/shaping/simplex3d_shaper.rs
rename to crates/server/src/world/terrain/generators/shaping/simplex3d_shaper.rs
index 1e4ad036..896dd968 100644
--- a/crates/shared/src/simulation/terrain/generators/shaping/simplex3d_shaper.rs
+++ b/crates/server/src/world/terrain/generators/shaping/simplex3d_shaper.rs
@@ -1,10 +1,10 @@
 use crate::prelude::*;
-use crate::simulation::chunk::CHUNK_SIDE_LENGTH;
-use crate::simulation::terrain::climate::ClimateMapComponent;
-use crate::simulation::terrain::generators::shaping::{
+use crate::world::terrain::climate::ClimateMapComponent;
+use crate::world::terrain::generators::shaping::{
     ChunkUniformity, ShapeResultBuilder, TerrainShaper,
 };
 use noise::{NoiseFn, Simplex};
+use shared::world::chunk::CHUNK_SIDE_LENGTH;
 
 /// Generates volumetric 3D terrain using Simplex noise.
 #[derive(Debug, Clone)]
diff --git a/crates/shared/src/simulation/terrain/generators/shaping/sinwave_shaper.rs b/crates/server/src/world/terrain/generators/shaping/sinwave_shaper.rs
similarity index 91%
rename from crates/shared/src/simulation/terrain/generators/shaping/sinwave_shaper.rs
rename to crates/server/src/world/terrain/generators/shaping/sinwave_shaper.rs
index c71802f2..373ec48b 100644
--- a/crates/shared/src/simulation/terrain/generators/shaping/sinwave_shaper.rs
+++ b/crates/server/src/world/terrain/generators/shaping/sinwave_shaper.rs
@@ -1,10 +1,10 @@
 use super::realistic_shaper::REALISTIC_SEA_LEVEL;
 use crate::prelude::*;
-use crate::simulation::terrain::climate::ClimateMapComponent;
-use crate::simulation::{
-    chunk::CHUNK_SIDE_LENGTH,
-    terrain::generators::shaping::{ChunkUniformity, ShapeResultBuilder, TerrainShaper},
+use crate::world::terrain::climate::ClimateMapComponent;
+use crate::world::terrain::generators::shaping::{
+    ChunkUniformity, ShapeResultBuilder, TerrainShaper,
 };
+use shared::world::chunk::CHUNK_SIDE_LENGTH;
 
 /// Generates a simple, rolling terrain using two sine waves.
 #[derive(Debug, Clone)]
diff --git a/crates/shared/src/simulation/terrain/generators/shaping/superflat_shaper.rs b/crates/server/src/world/terrain/generators/shaping/superflat_shaper.rs
similarity index 87%
rename from crates/shared/src/simulation/terrain/generators/shaping/superflat_shaper.rs
rename to crates/server/src/world/terrain/generators/shaping/superflat_shaper.rs
index 0e8eac5b..4045ec12 100644
--- a/crates/shared/src/simulation/terrain/generators/shaping/superflat_shaper.rs
+++ b/crates/server/src/world/terrain/generators/shaping/superflat_shaper.rs
@@ -1,9 +1,9 @@
 use crate::prelude::*;
-use crate::simulation::{
-    chunk::CHUNK_SIDE_LENGTH,
-    terrain::climate::ClimateMapComponent,
-    terrain::generators::shaping::{ChunkUniformity, ShapeResultBuilder, TerrainShaper},
+use crate::world::terrain::climate::ClimateMapComponent;
+use crate::world::terrain::generators::shaping::{
+    ChunkUniformity, ShapeResultBuilder, TerrainShaper,
 };
+use shared::world::chunk::CHUNK_SIDE_LENGTH;
 
 use super::realistic_shaper::REALISTIC_SEA_LEVEL;
 
diff --git a/crates/shared/src/simulation/terrain/mod.rs b/crates/server/src/world/terrain/mod.rs
similarity index 59%
rename from crates/shared/src/simulation/terrain/mod.rs
rename to crates/server/src/world/terrain/mod.rs
index 8ff4d11a..e9ad65a2 100644
--- a/crates/shared/src/simulation/terrain/mod.rs
+++ b/crates/server/src/world/terrain/mod.rs
@@ -11,10 +11,7 @@ pub use public::*;
 //         terrain gen plugin
 // ----------------------------------
 
-use crate::simulation::input::resources::ActionStateResource;
-use crate::simulation::input::types::SimulationAction;
-use bevy::app::{App, Plugin, Update};
-use bevy::ecs::prelude::{IntoScheduleConfigs, Res};
+use bevy::app::{App, Plugin};
 pub use systems::{TerrainGeneratorLibrary, cycle_active_generator};
 
 pub struct TerrainGenerationPlugin;
@@ -27,16 +24,5 @@ impl Plugin for TerrainGenerationPlugin {
             .insert_resource(ActiveTerrainGenerator::default())
             .insert_resource(ActiveTerrainPainter::default())
             .init_resource::<TerrainGeneratorLibrary>();
-
-        // INFO: -------------------------------
-        //         keybind-based actions
-        // -------------------------------------
-
-        app.add_systems(
-            Update,
-            cycle_active_generator.run_if(|action_state: Res<ActionStateResource>| {
-                action_state.just_happened(SimulationAction::CycleActiveTerrainGenerator)
-            }),
-        );
     }
 }
diff --git a/crates/shared/src/simulation/terrain/public/active_biome.rs b/crates/server/src/world/terrain/public/active_biome.rs
similarity index 92%
rename from crates/shared/src/simulation/terrain/public/active_biome.rs
rename to crates/server/src/world/terrain/public/active_biome.rs
index e9136836..6370ebb1 100644
--- a/crates/shared/src/simulation/terrain/public/active_biome.rs
+++ b/crates/server/src/world/terrain/public/active_biome.rs
@@ -1,4 +1,4 @@
-use crate::simulation::terrain::{
+use crate::world::terrain::{
     biome::MultiNoiseBiomeGenerator, generators::biome::lib::BiomeGenerator,
 };
 use bevy::ecs::prelude::Resource;
diff --git a/crates/shared/src/simulation/terrain/public/active_climate.rs b/crates/server/src/world/terrain/public/active_climate.rs
similarity index 86%
rename from crates/shared/src/simulation/terrain/public/active_climate.rs
rename to crates/server/src/world/terrain/public/active_climate.rs
index 76d34ab1..2355034d 100644
--- a/crates/shared/src/simulation/terrain/public/active_climate.rs
+++ b/crates/server/src/world/terrain/public/active_climate.rs
@@ -1,4 +1,4 @@
-use crate::simulation::terrain::generators::climate::{
+use crate::world::terrain::generators::climate::{
     climate_noise_gen::ClimateNoiseGenerator, lib::ClimateGenerator,
 };
 use bevy::ecs::prelude::Resource;
diff --git a/crates/shared/src/simulation/terrain/public/active_painting.rs b/crates/server/src/world/terrain/public/active_painting.rs
similarity index 88%
rename from crates/shared/src/simulation/terrain/public/active_painting.rs
rename to crates/server/src/world/terrain/public/active_painting.rs
index d070abc1..7fd2bb1b 100644
--- a/crates/shared/src/simulation/terrain/public/active_painting.rs
+++ b/crates/server/src/world/terrain/public/active_painting.rs
@@ -1,4 +1,4 @@
-use crate::simulation::terrain::generators::painting::{
+use crate::world::terrain::generators::painting::{
     lib::TerrainPainter, simple_surface_painter::SimpleSurfacePainter,
 };
 use bevy::ecs::prelude::Resource;
diff --git a/crates/shared/src/simulation/terrain/public/active_shaping.rs b/crates/server/src/world/terrain/public/active_shaping.rs
similarity index 65%
rename from crates/shared/src/simulation/terrain/public/active_shaping.rs
rename to crates/server/src/world/terrain/public/active_shaping.rs
index 5e8b6db4..b3a9801e 100644
--- a/crates/shared/src/simulation/terrain/public/active_shaping.rs
+++ b/crates/server/src/world/terrain/public/active_shaping.rs
@@ -1,4 +1,4 @@
-use crate::simulation::terrain::{SinwaveShaper, generators::shaping::lib::TerrainShaper};
+use crate::world::terrain::{SinwaveShaper, generators::shaping::lib::TerrainShaper};
 use bevy::ecs::prelude::Resource;
 use std::sync::Arc;
 
@@ -8,6 +8,6 @@ pub struct ActiveTerrainGenerator(pub Arc<dyn TerrainShaper + Send + Sync>);
 
 impl Default for ActiveTerrainGenerator {
     fn default() -> Self {
-        ActiveTerrainGenerator(Arc::new(SinwaveShaper::new()))
+        ActiveTerrainGenerator(Arc::new(SinwaveShaper::default()))
     }
 }
diff --git a/crates/shared/src/simulation/terrain/public/mod.rs b/crates/server/src/world/terrain/public/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/public/mod.rs
rename to crates/server/src/world/terrain/public/mod.rs
diff --git a/crates/shared/src/simulation/terrain/systems/cycle_active_generator.rs b/crates/server/src/world/terrain/systems/cycle_active_generator.rs
similarity index 87%
rename from crates/shared/src/simulation/terrain/systems/cycle_active_generator.rs
rename to crates/server/src/world/terrain/systems/cycle_active_generator.rs
index 5f93ef3b..98ab52b6 100644
--- a/crates/shared/src/simulation/terrain/systems/cycle_active_generator.rs
+++ b/crates/server/src/world/terrain/systems/cycle_active_generator.rs
@@ -1,6 +1,6 @@
 use crate::prelude::*;
-use crate::simulation::terrain::shaping::{RealisticShaper, SimplexShaper};
-use crate::simulation::terrain::{
+use crate::world::terrain::shaping::{RealisticShaper, SimplexShaper};
+use crate::world::terrain::{
     ActiveTerrainGenerator, NoisyShaper, SinwaveShaper, SuperflatShaper, TerrainShaper,
 };
 use bevy::ecs::{
@@ -19,8 +19,8 @@ impl FromWorld for TerrainGeneratorLibrary {
     fn from_world(_world: &mut World) -> Self {
         Self {
             generators: vec![
-                Arc::new(SuperflatShaper::new()),
-                Arc::new(SinwaveShaper::new()),
+                Arc::new(SuperflatShaper::default()),
+                Arc::new(SinwaveShaper::default()),
                 Arc::new(NoisyShaper::new()),
                 Arc::new(RealisticShaper::new()),
                 Arc::new(SimplexShaper::new()),
diff --git a/crates/shared/src/simulation/terrain/systems/mod.rs b/crates/server/src/world/terrain/systems/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/terrain/systems/mod.rs
rename to crates/server/src/world/terrain/systems/mod.rs
diff --git a/crates/server/tests/network_sync.rs b/crates/server/tests/network_sync.rs
new file mode 100644
index 00000000..df2197c5
--- /dev/null
+++ b/crates/server/tests/network_sync.rs
@@ -0,0 +1,63 @@
+use bevy::prelude::*;
+use lightyear::prelude::MessageSender;
+use server::network::types::ClientConnection;
+use server::world::chunk::chunk_map::ChunkMap;
+use server::world::chunk::components::ActiveChunk;
+use server::world::chunk_loading::{ClientChunkTracker, sync_chunk_data_to_clients_system};
+use shared::network::protocol::ServerMessage;
+use shared::world::chunk::{ChunkBlocksComponent, ChunkCoord, ChunkLod};
+
+#[test]
+fn test_chunk_data_sync_to_client() {
+    let mut app = App::new();
+
+    // add resources
+    app.insert_resource(ChunkMap::default());
+
+    // spawn server-side player entity
+    let client_entity = app
+        .world_mut()
+        .spawn(MessageSender::<ServerMessage>::default())
+        .id();
+    let player_entity = app
+        .world_mut()
+        .spawn((
+            ClientConnection { client_entity },
+            ClientChunkTracker::default(),
+            shared::player::components::LogicalPosition(Vec3::ZERO),
+            Transform::from_xyz(0.0, 0.0, 0.0),
+        ))
+        .id();
+
+    // spawn a generated chunk
+    let coord = IVec3::new(0, 0, 0);
+    let chunk_blocks = ChunkBlocksComponent::new_uniform_empty(ChunkLod(0));
+    let chunk_entity = app
+        .world_mut()
+        .spawn((ChunkCoord { pos: coord }, chunk_blocks, ActiveChunk))
+        .id();
+
+    // register it in the manager
+    app.world_mut()
+        .resource_mut::<ChunkMap>()
+        .register_chunk(coord, chunk_entity);
+
+    // run the sync system
+    // we need to use a manual system call or add it to a schedule
+    let mut schedule = Schedule::default();
+    schedule.add_systems(sync_chunk_data_to_clients_system);
+    schedule.run(app.world_mut());
+
+    // verify that the tracker was updated
+    let tracker = app
+        .world()
+        .get::<ClientChunkTracker>(player_entity)
+        .unwrap();
+    assert!(
+        tracker.sent_chunks.contains(&coord),
+        "Chunk should be marked as sent in tracker"
+    );
+
+    // verify that a message was "sent" (MessageSender is just a component we can check if it has messages,
+    // but Lightyear's MessageSender doesn't store them in a way that's easy to check without full setup)
+}
diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml
index d9f784ab..798e6977 100644
--- a/crates/shared/Cargo.toml
+++ b/crates/shared/Cargo.toml
@@ -32,6 +32,12 @@ bytemuck = { workspace = true } # gpu friendly data
 # --------------------------------
 
 bevy = { workspace = true }
+leafwing-input-manager = { workspace = true }
+lightyear = { workspace = true, features = [
+  # shared needs these for protocol definitions
+  "interpolation", # smoothing intended for more pleasing visuals
+  "prediction",    # for local predictions agaisnt server to get snappy feedback
+] }
 futures-lite = { workspace = true } # future utils
 
 # INFO: ---------------
@@ -44,3 +50,4 @@ noise = { workspace = true }       # gen random noise
 crossbeam = { workspace = true }   # thread comms
 rand = { workspace = true }        # rng
 ron = { workspace = true }         # parsing RON files
+zstd = { workspace = true }
diff --git a/crates/shared/readme.md b/crates/shared/readme.md
new file mode 100644
index 00000000..8129c18d
--- /dev/null
+++ b/crates/shared/readme.md
@@ -0,0 +1,3 @@
+# Vantablock Shared (`vantablock-shared`)
+
+The `vantablock-shared` crate is the foundational bridge between the `client` and `server` crates. It holds all common knowledge, ensuring the client and server remain perfectly synced on game rules.
diff --git a/crates/shared/src/lib.rs b/crates/shared/src/lib.rs
index 5b588118..ef73c545 100644
--- a/crates/shared/src/lib.rs
+++ b/crates/shared/src/lib.rs
@@ -1,7 +1,11 @@
-pub mod load;
+//! # The Vantablock Shared Library
+
+pub mod lifecycle;
+pub mod network;
+pub mod player;
 pub mod prelude;
-pub mod simulation;
-pub mod state;
+pub mod time;
+pub mod world;
 
 pub use prelude::*;
 
@@ -18,12 +22,9 @@ pub struct SharedPlugins;
 impl PluginGroup for SharedPlugins {
     fn build(self) -> PluginGroupBuilder {
         PluginGroupBuilder::start::<Self>()
-            .add(state::SimulationLifecyclePlugin)
-            .add(simulation::asset::AssetPlugin)
-            .add(simulation::biome::BiomePlugin)
-            .add(simulation::block::BlockPlugin)
-            .add(simulation::chunk::ChunkLoadingPlugin)
-            .add(simulation::terrain::TerrainGenerationPlugin)
-            .add(simulation::time::TimeControlPlugin)
+            .add_group(lifecycle::SharedLifecyclePlugins)
+            .add_group(world::WorldPlugins)
+            .add(time::TimeControlPlugin)
+            .add(player::SharedPlayerPlugin)
     }
 }
diff --git a/crates/shared/src/lifecycle/load/dag/components.rs b/crates/shared/src/lifecycle/load/dag/components.rs
new file mode 100644
index 00000000..8adb3247
--- /dev/null
+++ b/crates/shared/src/lifecycle/load/dag/components.rs
@@ -0,0 +1,45 @@
+use bevy::ecs::world::CommandQueue;
+use bevy::prelude::*;
+use bevy::tasks::Task;
+use std::any::TypeId;
+
+#[derive(Component)]
+pub struct LoadingTaskComponent(pub Task<CommandQueue>);
+
+/// A trait that defines the requirements for a type to be used as a marker
+/// for a specific loading phase (e.g., SimulationPhase, AppStartupLoadingPhase).
+pub trait LoadingDagPhase: Send + Sync + 'static {
+    /// A human-readable name for this loading phase, used in logs and debugging.
+    const PHASE_NAME: &'static str;
+}
+
+/// Triggered when a loading phase node is ready to begin its task.
+///
+/// This is triggered on the entity representing the node.
+#[derive(EntityEvent, Debug, Clone, Copy, PartialEq, Eq, Hash, Reflect)]
+pub struct StartNode(pub Entity);
+
+/// Triggered when a loading phase node has successfully completed its task.
+#[derive(Event, Debug, Clone, Reflect)]
+pub struct NodeCompleted {
+    pub node_type: TypeId,
+    pub node_name: String,
+}
+
+impl NodeCompleted {
+    /// Helper method to construct a NodeCompleted event for a specific type.
+    pub fn of<T: 'static>() -> Self {
+        Self {
+            node_type: TypeId::of::<T>(),
+            node_name: std::any::type_name::<T>()
+                .split("::")
+                .last()
+                .unwrap_or("Unknown")
+                .to_string(),
+        }
+    }
+}
+
+/// Triggered when an entire loading phase has completed all its nodes.
+#[derive(Event, Debug, Clone, Copy, Reflect)]
+pub struct PhaseFinished<P: LoadingDagPhase>(pub std::marker::PhantomData<P>);
diff --git a/crates/shared/src/lifecycle/load/dag/mod.rs b/crates/shared/src/lifecycle/load/dag/mod.rs
new file mode 100644
index 00000000..f81a7a04
--- /dev/null
+++ b/crates/shared/src/lifecycle/load/dag/mod.rs
@@ -0,0 +1,65 @@
+//! # Async Loading DAG
+//!
+//! A unified, type-safe Directed Acyclic Graph (DAG) system for managing complex,
+//! multi-stage loading sequences in Bevy.
+//!
+//! This system allows you to define loading "phases" using marker structs, where each
+//! task (node) is also represented by a unique component type. Dependencies between
+//! tasks are explicitly defined using these types, and the system automatically
+//! orchestrates the execution, ensuring tasks only start when their requirements are met.
+//!
+//! ## Core Concepts
+//!
+//! - **Phase Markers:** Simple structs (e.g., `SimulationPhase`) that implement `LoadingDagPhase`.
+//! - **Nodes:** Marker component types (e.g., `LoadBlocks`) that represent a distinct task.
+//!   Each node is spawned as a dedicated ECS entity when registered.
+//! - **Dependencies:** Explicitly map which node types must finish before others can start.
+//! - **Targeted Observers:** Loading tasks are implemented as Bevy Observers listening for
+//!   `StartNode`. The DAG triggers these observers on the specific entity associated
+//!   with that node type.
+//! - **Task Lifecycle:** Nodes move from `Pending` -> `Started` -> `Completed`.
+//!
+//! ## Manual Polling
+//!
+//! **Important:** The system does not automatically poll tasks. You must manually add the
+//! `poll_tasks::<P>` system to the appropriate schedule (e.g., `Update`) during your loading
+//! states to ensure that `LoadingTaskComponent` results are processed and nodes are marked as finished.
+//!
+//! ## Example
+//!
+//! ```rust
+//! # use bevy::prelude::*;
+//! # use shared::lifecycle::load::*;
+//! # #[derive(States, Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
+//! # enum MyState { #[default] Loading }
+//! # fn handle_assets(_: On<StartNode>) {}
+//! # fn handle_registry(_: On<StartNode>) {}
+//!
+//! pub struct MyPhase;
+//! impl LoadingDagPhase for MyPhase { const PHASE_NAME: &'static str = "MyPhase"; }
+//!
+//! #[derive(Component)] pub struct LoadAssets;
+//! #[derive(Component)] pub struct LoadRegistry;
+//!
+//! fn setup(mut app: &mut App) {
+//!     app.configure_loading_phase::<MyPhase>()
+//!         .add_node(LoadAssets, handle_assets)
+//!         .add_node(LoadRegistry, handle_registry)
+//!         // Registry depends on Assets
+//!         .add_dependency(LoadRegistry, LoadAssets);
+//!
+//!     // Kickoff the loading phase
+//!     app.add_systems(OnEnter(MyState::Loading), kickoff_loading_phase::<MyPhase>);
+//!
+//!     // IMPORTANT: You must manually register the polling system if your loading tasks are asynchronous
+//!     app.add_systems(Update, poll_tasks::<MyPhase>.run_if(in_state(MyState::Loading)));
+//! }
+//! ```
+
+mod components;
+mod resource;
+mod systems;
+
+pub use components::*;
+pub use resource::*;
+pub use systems::*;
diff --git a/crates/shared/src/lifecycle/load/dag/resource.rs b/crates/shared/src/lifecycle/load/dag/resource.rs
new file mode 100644
index 00000000..ecccdaf7
--- /dev/null
+++ b/crates/shared/src/lifecycle/load/dag/resource.rs
@@ -0,0 +1,117 @@
+use super::components::{LoadingDagPhase, StartNode};
+use bevy::prelude::*;
+use std::any::TypeId;
+use std::collections::HashMap;
+use std::marker::PhantomData;
+
+/// A resource that tracks the dependency graph for a specific loading phase.
+///
+/// This resource manages which phase nodes have started and finished, and maps node types
+/// to their dedicated ECS entities for targeted triggers.
+#[derive(Resource)]
+pub struct LoadingDag<P: LoadingDagPhase> {
+    /// Mapping of node types to their required dependencies.
+    pub dependencies: HashMap<TypeId, Vec<TypeId>>,
+    /// List of node types that have already been triggered to start.
+    pub started_nodes: Vec<TypeId>,
+    /// List of node types that have successfully completed their tasks.
+    pub completed_nodes: Vec<TypeId>,
+    /// Mapping of node types to their dedicated ECS entities for targeted observers.
+    pub node_entities: HashMap<TypeId, Entity>,
+    _marker: PhantomData<P>,
+}
+
+impl<P: LoadingDagPhase> Default for LoadingDag<P> {
+    fn default() -> Self {
+        Self {
+            dependencies: HashMap::new(),
+            started_nodes: Vec::new(),
+            completed_nodes: Vec::new(),
+            node_entities: HashMap::new(),
+            _marker: PhantomData,
+        }
+    }
+}
+
+/// A helper struct that wraps the Bevy `App` and carries the Phase marker type.
+///
+/// This allows for a fluent API where the phase type is specified once.
+pub struct LoadingPhaseProxy<'a, P: LoadingDagPhase> {
+    app: &'a mut App,
+    _marker: PhantomData<P>,
+}
+
+impl<'a, P: LoadingDagPhase> LoadingPhaseProxy<'a, P> {
+    /// Adds an asynchronous loading node to this loading phase.
+    pub fn add_node<Node: Component + 'static, M>(
+        &mut self,
+        node: Node,
+        system: impl IntoSystem<On<'static, 'static, StartNode>, (), M> + Send + 'static,
+    ) -> &mut Self {
+        self.init_node_dag();
+
+        let node_type = TypeId::of::<Node>();
+
+        // spawn a dedicated entity for this node
+        let node_entity = self.app.world_mut().spawn(node).id();
+
+        // attach the observer specifically to this entity
+        self.app.world_mut().entity_mut(node_entity).observe(system);
+
+        // register the entity in the DAG
+        let mut dag = self.app.world_mut().resource_mut::<LoadingDag<P>>();
+        dag.node_entities.insert(node_type, node_entity);
+
+        // ensure the node exists in dependencies map even if it has no deps yet
+        dag.dependencies.entry(node_type).or_default();
+
+        self
+    }
+
+    /// Adds a dependency between two loading nodes within this phase.
+    ///
+    /// The `Dependent` node will wait until the `Dependency` node has completed.
+    pub fn add_dependency<Dependent: 'static, Dependency: 'static>(
+        &mut self,
+        _dependent: Dependent,
+        _dependency: Dependency,
+    ) -> &mut Self {
+        self.init_node_dag();
+
+        let dependent_type = TypeId::of::<Dependent>();
+        let dependency_type = TypeId::of::<Dependency>();
+
+        let mut dag = self.app.world_mut().resource_mut::<LoadingDag<P>>();
+        dag.dependencies
+            .entry(dependent_type)
+            .or_default()
+            .push(dependency_type);
+
+        self
+    }
+
+    /// Ensures the DAG resource and coordinator are initialized for this phase type.
+    fn init_node_dag(&mut self) {
+        if !self.app.world().contains_resource::<LoadingDag<P>>() {
+            self.app.init_resource::<LoadingDag<P>>();
+            // register the coordinator that evaluates what to start next
+            self.app
+                .add_observer(super::systems::evaluate_dag_dependencies::<P>);
+        }
+    }
+}
+
+/// Extension trait for the Bevy App to provide a fluent API for configuring asynchronous loading phases.
+pub trait LoadingAppExt {
+    /// Enters a loading phase context to register nodes and dependencies for a specific phase marker type.
+    fn configure_loading_phase<P: LoadingDagPhase>(&mut self) -> LoadingPhaseProxy<'_, P>;
+}
+
+impl LoadingAppExt for App {
+    fn configure_loading_phase<P: LoadingDagPhase>(&mut self) -> LoadingPhaseProxy<'_, P> {
+        LoadingPhaseProxy {
+            app: self,
+            _marker: PhantomData,
+        }
+    }
+}
diff --git a/crates/shared/src/lifecycle/load/dag/systems.rs b/crates/shared/src/lifecycle/load/dag/systems.rs
new file mode 100644
index 00000000..e9cfb841
--- /dev/null
+++ b/crates/shared/src/lifecycle/load/dag/systems.rs
@@ -0,0 +1,203 @@
+use crate::lifecycle::load::dag::{
+    components::{LoadingDagPhase, LoadingTaskComponent, NodeCompleted, PhaseFinished, StartNode},
+    resource::LoadingDag,
+};
+use bevy::{
+    prelude::*,
+    tasks::{block_on, poll_once},
+};
+
+/// A generic system that automatically identifies and kicks off all root nodes
+/// (those with no dependencies) for a specific loading phase.
+pub fn kickoff_loading_phase<P: LoadingDagPhase>(
+    dag: Option<ResMut<LoadingDag<P>>>,
+    mut commands: Commands,
+) {
+    let Some(mut dag) = dag else {
+        warn!(
+            "[{}] Phase is not configured (no tasks registered). Transitioning immediately.",
+            P::PHASE_NAME
+        );
+        commands.trigger(PhaseFinished::<P>(std::marker::PhantomData));
+        return;
+    };
+
+    if !dag.started_nodes.is_empty() {
+        warn!(
+            "[{}] Started nodes is not empty but kickoff was called!",
+            P::PHASE_NAME
+        );
+    }
+
+    if !dag.completed_nodes.is_empty() {
+        warn!(
+            "[{}] Completed nodes is not empty but kickoff was called!",
+            P::PHASE_NAME
+        );
+    }
+
+    if dag.dependencies.is_empty() {
+        warn!(
+            "[{}] Phase is empty! Transitioning immediately.",
+            P::PHASE_NAME
+        );
+        commands.trigger(PhaseFinished::<P>(std::marker::PhantomData));
+        return;
+    }
+
+    info!("[{}] Kicking off loading phase DAG...", P::PHASE_NAME);
+
+    let mut nodes_to_start = Vec::new();
+
+    for (node, deps) in &dag.dependencies {
+        // a phase node is a root if its dependency list is empty
+        if deps.is_empty() {
+            nodes_to_start.push(*node);
+        }
+    }
+
+    for node in nodes_to_start {
+        dag.started_nodes.push(node);
+        // trigger targeted observer for this specific phase node entity
+        if let Some(entity) = dag.node_entities.get(&node) {
+            commands.entity(*entity).trigger(StartNode);
+        } else {
+            warn!(
+                "[{}] Attempted to start node '{:?}' without a registered entity",
+                P::PHASE_NAME,
+                node
+            );
+        }
+    }
+}
+
+/// Coordinator observer that evaluates dependencies whenever a phase node finishes.
+///
+/// This system listens for `NodeCompleted` globally and triggers the next ready phase nodes.
+pub fn evaluate_dag_dependencies<P: LoadingDagPhase>(
+    event: On<NodeCompleted>,
+    mut commands: Commands,
+    mut dag: ResMut<LoadingDag<P>>,
+) {
+    let finished_node = event.event().node_type;
+
+    // we only care about nodes that are part of THIS DAG
+    if !dag.dependencies.contains_key(&finished_node) {
+        return;
+    }
+
+    if !dag.started_nodes.contains(&finished_node) {
+        warn!(
+            "Dag node completed but hasn't started. This likely means the node was duplicated accross multiple loading DAGs which is not an advised pattern. Ignoring the completion..."
+        );
+        return;
+    }
+
+    if !dag.completed_nodes.contains(&finished_node) {
+        dag.completed_nodes.push(finished_node);
+
+        // calculate and log progress
+        let completed = dag.completed_nodes.len();
+        let total = dag.dependencies.len();
+
+        info!(
+            "[{}] Progress: {}/{} (Finished {})",
+            P::PHASE_NAME,
+            completed,
+            total,
+            event.event().node_name,
+        );
+
+        // check if the entire phase is complete
+        if completed == total && total > 0 {
+            info!("[{}] Phase complete!", P::PHASE_NAME);
+            commands.trigger(PhaseFinished::<P>(std::marker::PhantomData));
+        }
+    }
+
+    // find phase nodes that have all their dependencies met and haven't started yet
+    let mut nodes_to_start = Vec::new();
+
+    for (node, deps) in &dag.dependencies {
+        if dag.started_nodes.contains(node) {
+            continue;
+        }
+
+        let all_deps_met = deps.iter().all(|dep| dag.completed_nodes.contains(dep));
+        if all_deps_met {
+            nodes_to_start.push(*node);
+        }
+    }
+
+    // trigger StartNode for each ready phase node
+    for node in nodes_to_start {
+        dag.started_nodes.push(node);
+
+        // trigger targeted
+        if let Some(entity) = dag.node_entities.get(&node) {
+            commands.entity(*entity).trigger(StartNode);
+        }
+    }
+}
+
+/// Generic cleanup system that clears the temporary state of the dag (completed and started nodes).
+///
+/// Enables reuse of the loading phase by resetting its state to the original form.
+pub fn reset_loading_dag_state<P: LoadingDagPhase>(dag: Option<ResMut<LoadingDag<P>>>) {
+    let Some(mut dag) = dag else {
+        return;
+    };
+
+    dag.started_nodes.clear();
+    dag.completed_nodes.clear();
+
+    info!(
+        "[{}] Loading DAG state reset. Ready for reuse.",
+        P::PHASE_NAME
+    );
+}
+
+/// System that destroys the dag preventing it from ever being usable again. Only use this for
+/// loading dags that will never be used again. Useful for clearing up the resources and memory.
+pub fn nuke_loading_dag<P: LoadingDagPhase>(
+    mut commands: Commands,
+    dag: Option<Res<LoadingDag<P>>>,
+) {
+    let Some(dag) = dag else {
+        return;
+    };
+
+    for entity in dag.node_entities.values() {
+        commands.entity(*entity).despawn();
+    }
+
+    commands.remove_resource::<LoadingDag<P>>();
+
+    info!(
+        "[{}] Loading DAG has been nuked and removed from memory.",
+        P::PHASE_NAME
+    );
+}
+
+/// A global polling system that checks if any loading tasks have finished.
+///
+/// When a loading task finishes, this system applies the tasks' returned commands and despawns
+/// the task entity.
+pub fn poll_all_loading_tasks(
+    mut tasks: Query<(Entity, &mut LoadingTaskComponent)>,
+    mut commands: Commands,
+) {
+    for (entity, mut task) in &mut tasks {
+        if let Some(mut queue) = block_on(poll_once(&mut task.0)) {
+            commands.append(&mut queue);
+            // use try_despawn to avoid crashing if the entity was already despawned
+            // by another system or a previous command in this turn
+            commands.entity(entity).try_despawn();
+        }
+    }
+}
+
+/// Returns true if the DAG for the specified phase type is complete.
+pub fn loading_dag_is_complete<P: LoadingDagPhase>(dag: Option<Res<LoadingDag<P>>>) -> bool {
+    dag.is_none_or(|d| d.completed_nodes.len() == d.dependencies.len())
+}
diff --git a/crates/shared/src/lifecycle/load/mod.rs b/crates/shared/src/lifecycle/load/mod.rs
new file mode 100644
index 00000000..6f9cfbf8
--- /dev/null
+++ b/crates/shared/src/lifecycle/load/mod.rs
@@ -0,0 +1,47 @@
+// A module for handling everything related to the completion of asynchronous tasks.
+//
+// This logic ties into the state machine, enabling generic state transitions based on when a set of
+// tasks complete.
+
+mod dag;
+mod phases;
+mod tasks;
+
+pub use dag::*;
+pub use phases::*;
+pub use tasks::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::{lifecycle::state::AppState, transition_to};
+use bevy::prelude::*;
+
+/// A plugin that manages the transition from `AppState::StartingUp` to `AppState::Running`
+/// based on the completion of the `AppStartupLoadingPhase` DAG.
+pub struct StartupLoadPlugin;
+
+impl Plugin for StartupLoadPlugin {
+    fn build(&self, app: &mut App) {
+        // kickoff the app startup loading phase when starting up
+        app.add_systems(
+            OnEnter(AppState::StartingUp),
+            kickoff_loading_phase::<AppStartupLoadingPhase>,
+        );
+
+        // handle transition to running state when app startup is done
+        app.add_systems(
+            Update,
+            (transition_to(AppState::Running))
+                .run_if(loading_dag_is_complete::<AppStartupLoadingPhase>)
+                .run_if(in_state(AppState::StartingUp)),
+        );
+
+        // cleanup when leaving starting up state
+        app.add_systems(
+            OnExit(AppState::StartingUp),
+            nuke_loading_dag::<AppStartupLoadingPhase>,
+        );
+    }
+}
diff --git a/crates/shared/src/lifecycle/load/phases.rs b/crates/shared/src/lifecycle/load/phases.rs
new file mode 100644
index 00000000..201fb9a3
--- /dev/null
+++ b/crates/shared/src/lifecycle/load/phases.rs
@@ -0,0 +1,24 @@
+use crate::lifecycle::load::LoadingDagPhase;
+use bevy::prelude::*;
+
+/// Marker for the app startup loading phase.
+///
+/// This loading phase exists to handle the transition from the
+/// `AppState::StartingUp` state to the `AppState::Running` state.
+///
+/// Anything loaded during this phase will stall the app from running
+/// until loading is complete. This means is is crucial to ensure that
+/// the only tasks assigned here are necessary startup tasks!
+pub struct AppStartupLoadingPhase;
+
+impl LoadingDagPhase for AppStartupLoadingPhase {
+    const PHASE_NAME: &'static str = "AppStartupLoading";
+}
+
+/// Marker node for loading block definitions.
+#[derive(Component)]
+pub struct LoadBlocks;
+
+/// Marker node for loading biome definitions.
+#[derive(Component)]
+pub struct LoadBiomes;
diff --git a/crates/shared/src/lifecycle/load/tasks/fake_work_system.rs b/crates/shared/src/lifecycle/load/tasks/fake_work_system.rs
new file mode 100644
index 00000000..4a8e3df6
--- /dev/null
+++ b/crates/shared/src/lifecycle/load/tasks/fake_work_system.rs
@@ -0,0 +1,27 @@
+use crate::prelude::*;
+use bevy::{
+    ecs::world::{CommandQueue, World},
+    tasks::{AsyncComputeTaskPool, Task},
+};
+use rand::random_range;
+use std::{thread, time::Duration};
+
+#[instrument(skip_all)]
+pub fn start_fake_work_system() -> Task<CommandQueue> {
+    AsyncComputeTaskPool::get().spawn(async move {
+        const WORK_DURATION: u64 = 3;
+        for i in 1..=WORK_DURATION {
+            info!("[BACKGROUND] Fake working... step {}/{}", i, WORK_DURATION);
+
+            let sleep_time = random_range(0.25..0.75);
+            thread::sleep(Duration::from_secs_f32(sleep_time));
+        }
+        info!("[BACKGROUND] Fake work finished!");
+
+        let mut queue = CommandQueue::default();
+        queue.push(move |_world: &mut World| {
+            info!("[MAIN THREAD] Applying fake work result to the world.");
+        });
+        queue
+    })
+}
diff --git a/crates/shared/src/lifecycle/load/tasks/mod.rs b/crates/shared/src/lifecycle/load/tasks/mod.rs
new file mode 100644
index 00000000..b8b6f53c
--- /dev/null
+++ b/crates/shared/src/lifecycle/load/tasks/mod.rs
@@ -0,0 +1,8 @@
+//! This module contains generic loading tasks that do not belong to any other specific module.
+//!
+//! These tasks typically represent miscellaneous work or utilities (like the `fake_work_system`)
+//! that are orchestrated by the higher-level loading framework.
+
+pub mod fake_work_system;
+
+pub use fake_work_system::*;
diff --git a/crates/shared/src/lifecycle/mod.rs b/crates/shared/src/lifecycle/mod.rs
new file mode 100644
index 00000000..811613b5
--- /dev/null
+++ b/crates/shared/src/lifecycle/mod.rs
@@ -0,0 +1,28 @@
+pub mod load;
+mod paths;
+pub mod scheduling;
+pub mod state;
+
+pub use load::*;
+pub use paths::{PathsPlugin, PersistentPathsResource};
+pub use scheduling::*;
+pub use state::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::{app::PluginGroupBuilder, prelude::PluginGroup};
+
+/// A plugin group containing shared lifecycle stuff.
+pub struct SharedLifecyclePlugins;
+
+impl PluginGroup for SharedLifecyclePlugins {
+    fn build(self) -> PluginGroupBuilder {
+        PluginGroupBuilder::start::<Self>()
+            .add(paths::PathsPlugin)
+            .add(scheduling::SharedSchedulingPlugin)
+            .add(state::StatePlugin)
+            .add(load::StartupLoadPlugin)
+    }
+}
diff --git a/crates/shared/src/lifecycle/paths.rs b/crates/shared/src/lifecycle/paths.rs
new file mode 100644
index 00000000..fc355050
--- /dev/null
+++ b/crates/shared/src/lifecycle/paths.rs
@@ -0,0 +1,17 @@
+use bevy::prelude::{App, Plugin, Resource};
+use utils::PersistentPaths;
+
+/// A wrapper to implement the Bevy [`Resource`] trait for [`PersistentPaths`].
+#[derive(Resource, Clone, Debug, derive_more::Deref, derive_more::DerefMut)]
+pub struct PersistentPathsResource(pub PersistentPaths);
+
+/// A plugin that initializes and inserts the [`PersistentPathsResource`].
+pub struct PathsPlugin;
+
+impl Plugin for PathsPlugin {
+    fn build(&self, app: &mut App) {
+        if !app.world().contains_resource::<PersistentPathsResource>() {
+            app.insert_resource(PersistentPathsResource(PersistentPaths::resolve_client()));
+        }
+    }
+}
diff --git a/crates/shared/src/lifecycle/scheduling/mod.rs b/crates/shared/src/lifecycle/scheduling/mod.rs
new file mode 100644
index 00000000..58641ee8
--- /dev/null
+++ b/crates/shared/src/lifecycle/scheduling/mod.rs
@@ -0,0 +1,20 @@
+pub mod sets;
+
+pub use sets::FixedUpdateSet;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::prelude::*;
+
+pub struct SharedSchedulingPlugin;
+
+impl Plugin for SharedSchedulingPlugin {
+    fn build(&self, app: &mut App) {
+        app.configure_sets(
+            FixedUpdate,
+            (FixedUpdateSet::PreUpdate, FixedUpdateSet::MainLogic).chain(),
+        );
+    }
+}
diff --git a/crates/shared/src/simulation/scheduling.rs b/crates/shared/src/lifecycle/scheduling/sets.rs
similarity index 65%
rename from crates/shared/src/simulation/scheduling.rs
rename to crates/shared/src/lifecycle/scheduling/sets.rs
index 6757f961..2f9a6195 100644
--- a/crates/shared/src/simulation/scheduling.rs
+++ b/crates/shared/src/lifecycle/scheduling/sets.rs
@@ -9,8 +9,3 @@ pub enum FixedUpdateSet {
     /// The main sim logic: player movement, AI, block breaking, etc.
     MainLogic,
 }
-
-/// Systems that prepare data for the render world.
-/// These typically run at the very end of Bevy's native `PostUpdate` schedule.
-#[derive(SystemSet, Debug, Hash, PartialEq, Eq, Clone)]
-pub struct RenderPrepSet;
diff --git a/crates/shared/src/lifecycle/state/enums.rs b/crates/shared/src/lifecycle/state/enums.rs
new file mode 100644
index 00000000..2aeadd93
--- /dev/null
+++ b/crates/shared/src/lifecycle/state/enums.rs
@@ -0,0 +1,22 @@
+use bevy::prelude::States;
+
+/// The current state of the highest level application lifecycle.
+#[derive(States, Default, Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum AppState {
+    #[default]
+    /// The app is loading up essential data. The run loop has not started.
+    ///
+    /// The only work done during this phase should be work required for the window
+    /// to render a startup/loading screen. Any non-essential work done during this
+    /// state is just extra time spent hiding the main window/gui.
+    StartingUp,
+    /// The main application loop is active and executing.
+    ///
+    /// This is where the entire app logic is executed.
+    Running,
+    /// The application is performing cleanup operations before process termination.
+    ///
+    /// This is the final state of the app. Any essential saving or final actions must
+    /// be done during this state, as it is their last chance.
+    ShuttingDown,
+}
diff --git a/crates/shared/src/lifecycle/state/mod.rs b/crates/shared/src/lifecycle/state/mod.rs
new file mode 100644
index 00000000..b4d72d72
--- /dev/null
+++ b/crates/shared/src/lifecycle/state/mod.rs
@@ -0,0 +1,24 @@
+mod enums;
+mod systems;
+
+pub use enums::AppState;
+pub use systems::transition_to;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::load::poll_all_loading_tasks;
+use bevy::{
+    prelude::{App, Plugin, Update},
+    state::app::AppExtStates,
+};
+
+pub struct StatePlugin;
+
+impl Plugin for StatePlugin {
+    fn build(&self, app: &mut App) {
+        app.init_state::<AppState>()
+            .add_systems(Update, poll_all_loading_tasks);
+    }
+}
diff --git a/crates/shared/src/lifecycle/state/systems.rs b/crates/shared/src/lifecycle/state/systems.rs
new file mode 100644
index 00000000..a89a79fc
--- /dev/null
+++ b/crates/shared/src/lifecycle/state/systems.rs
@@ -0,0 +1,10 @@
+use bevy::{prelude::*, state::state::FreelyMutableState};
+
+/// A generic system that unconditionally transitions to the target state.
+pub fn transition_to<S: States + Copy + FreelyMutableState>(
+    target_state: S,
+) -> impl FnMut(ResMut<NextState<S>>) {
+    move |mut next_state| {
+        next_state.set(target_state);
+    }
+}
diff --git a/crates/shared/src/load/components/loading_task.rs b/crates/shared/src/load/components/loading_task.rs
deleted file mode 100644
index b43f34cf..00000000
--- a/crates/shared/src/load/components/loading_task.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use bevy::ecs::prelude::*;
-use crossbeam::channel::Receiver;
-
-pub type TaskResultCallback = Box<dyn FnOnce(&mut Commands) + Send>;
-
-#[derive(Component)]
-pub struct SimulationWorldLoadingTaskComponent {
-    pub receiver: Receiver<TaskResultCallback>,
-}
-
-#[derive(Component)]
-pub struct RenderWorldLoadingTaskComponent {
-    pub receiver: Receiver<TaskResultCallback>,
-}
diff --git a/crates/shared/src/load/components/mod.rs b/crates/shared/src/load/components/mod.rs
deleted file mode 100644
index 630468fb..00000000
--- a/crates/shared/src/load/components/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod loading_task;
-
-pub use loading_task::{
-    RenderWorldLoadingTaskComponent, SimulationWorldLoadingTaskComponent, TaskResultCallback,
-};
diff --git a/crates/shared/src/load/mod.rs b/crates/shared/src/load/mod.rs
deleted file mode 100644
index 4fd069e5..00000000
--- a/crates/shared/src/load/mod.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Async loading is a module for handling everything related to the completion of asynchronous tasks.
-//
-// This logic ties into the state machine, enabling generic state transitions based on when a set of
-// tasks complete.
-
-pub mod components;
-pub mod resources;
-pub mod systems;
-
-pub use components::*;
-pub use resources::*;
-pub use systems::*;
diff --git a/crates/shared/src/load/resources/load_tracking.rs b/crates/shared/src/load/resources/load_tracking.rs
deleted file mode 100644
index 85c248cc..00000000
--- a/crates/shared/src/load/resources/load_tracking.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use bevy::ecs::resource::Resource;
-use std::sync::{Arc, Mutex};
-
-/// Loading tracker is a NonSend Resource that the outer app loop orchestrates
-/// to enable both worlds to perform loading tasks in parallel before a state
-/// transition occurs.
-#[derive(Default)]
-struct LoadingTrackerInner {
-    pub is_simulation_ready: bool,
-}
-
-#[derive(Resource, Clone, Default)]
-pub struct LoadingTracker {
-    inner: Arc<Mutex<LoadingTrackerInner>>,
-}
-
-impl LoadingTracker {
-    /// Returns true only if all worlds have reported that they are ready.
-    pub fn is_ready(&self) -> bool {
-        let guard = self.inner.lock().unwrap();
-        guard.is_simulation_ready
-    }
-
-    /// Resets the tracker to its initial state.
-    pub fn reset(&self) {
-        let mut guard = self.inner.lock().unwrap();
-        guard.is_simulation_ready = false;
-    }
-
-    pub fn set_simulation_ready(&self, is_ready: bool) {
-        self.inner.lock().unwrap().is_simulation_ready = is_ready;
-    }
-}
diff --git a/crates/shared/src/load/resources/mod.rs b/crates/shared/src/load/resources/mod.rs
deleted file mode 100644
index 61600fc4..00000000
--- a/crates/shared/src/load/resources/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod load_tracking;
-pub mod on_load_complete;
-
-pub use load_tracking::LoadingTracker;
-pub use on_load_complete::OnLoadComplete;
diff --git a/crates/shared/src/load/resources/on_load_complete.rs b/crates/shared/src/load/resources/on_load_complete.rs
deleted file mode 100644
index bac411fd..00000000
--- a/crates/shared/src/load/resources/on_load_complete.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use bevy::ecs::prelude::*;
-use bevy::state::state::States;
-use std::marker::PhantomData;
-
-/// A temporary resource that tells the master finalizer system which state
-/// to transition to when the current loading process is complete.
-///
-/// It is generic over the state machine it should operate on (e.g., AppState).
-#[derive(Resource, Debug)]
-pub struct OnLoadComplete<S: States> {
-    /// The destination state for the transition.
-    pub destination: S,
-    /// A marker to make the compiler happy with the generic type `S`.
-    _marker: PhantomData<S>,
-}
-
-impl<S: States> OnLoadComplete<S> {
-    pub fn new(destination: S) -> Self {
-        Self {
-            destination,
-            _marker: PhantomData,
-        }
-    }
-}
diff --git a/crates/shared/src/load/systems/async_task_poller.rs b/crates/shared/src/load/systems/async_task_poller.rs
deleted file mode 100644
index 5dd7338e..00000000
--- a/crates/shared/src/load/systems/async_task_poller.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use crate::{
-    load::{LoadingTracker, SimulationWorldLoadingTaskComponent},
-    prelude::*,
-};
-use bevy::ecs::prelude::*;
-use crossbeam::channel::TryRecvError;
-
-/// Polls simulation-specific tasks and updates the shared `LoadingTracker`.
-#[instrument(skip_all)]
-pub fn poll_simulation_loading_tasks(
-    // input
-    mut tasks: Query<(Entity, &mut SimulationWorldLoadingTaskComponent)>,
-
-    // output
-    mut commands: Commands,
-    loading_tracker: Option<Res<LoadingTracker>>,
-) {
-    let Some(loading_tracker) = loading_tracker else {
-        return;
-    };
-
-    let mut remaining_tasks = 0;
-
-    for (entity, task) in &mut tasks {
-        match task.receiver.try_recv() {
-            Ok(callback) => {
-                callback(&mut commands);
-                commands.entity(entity).despawn();
-            }
-            Err(TryRecvError::Empty) => {
-                remaining_tasks += 1;
-            }
-            Err(TryRecvError::Disconnected) => {
-                // This could happen if a thread panicked or dropped the sender.
-                // It shouldn't happen during normal execution.
-                warn!("Simulation task failed: Channel disconnected!");
-                commands.entity(entity).despawn();
-            }
-        }
-    }
-
-    if remaining_tasks == 0 {
-        loading_tracker.set_simulation_ready(true);
-    } else {
-        loading_tracker.set_simulation_ready(false);
-    }
-}
diff --git a/crates/shared/src/load/systems/fake_work_system.rs b/crates/shared/src/load/systems/fake_work_system.rs
deleted file mode 100644
index f117899b..00000000
--- a/crates/shared/src/load/systems/fake_work_system.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use crate::{
-    load::{SimulationWorldLoadingTaskComponent, TaskResultCallback},
-    prelude::*,
-};
-use bevy::ecs::system::Commands;
-use bevy::tasks::AsyncComputeTaskPool;
-use crossbeam::channel::{Receiver, Sender, unbounded};
-use rand::random_range;
-use std::{thread, time::Duration};
-
-#[instrument(skip_all)]
-pub fn start_fake_work_system(mut commands: Commands) {
-    let (sender, receiver): (Sender<TaskResultCallback>, Receiver<TaskResultCallback>) =
-        unbounded();
-
-    let entity = commands.spawn_empty().id();
-    AsyncComputeTaskPool::get()
-        .spawn(async move {
-            const WORK_DURATION: u64 = 5;
-            for i in 1..=WORK_DURATION {
-                info!(
-                    "[BACKGROUND {}] Fake working... step {}/{}",
-                    entity, i, WORK_DURATION
-                );
-
-                let sleep_time = random_range(0.75..1.5);
-                thread::sleep(Duration::from_secs_f32(sleep_time));
-            }
-            info!("[BACKGROUND {}] Fake work finished!", entity);
-
-            let callback: TaskResultCallback = Box::new(move |_: &mut Commands| {
-                info!(
-                    "[MAIN THREAD {}] Applying fake work result to the world.",
-                    entity
-                );
-            });
-
-            sender.send(callback).expect("Failed to send task result");
-        })
-        .detach();
-
-    commands
-        .entity(entity)
-        .insert(SimulationWorldLoadingTaskComponent { receiver });
-}
diff --git a/crates/shared/src/load/systems/master_loading_finalizer.rs b/crates/shared/src/load/systems/master_loading_finalizer.rs
deleted file mode 100644
index fab59d4f..00000000
--- a/crates/shared/src/load/systems/master_loading_finalizer.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use crate::{
-    load::{LoadingTracker, OnLoadComplete},
-    prelude::*,
-};
-use bevy::ecs::prelude::*;
-use bevy::prelude::{NextState, States};
-use bevy::state::state::FreelyMutableState;
-
-/// The master system that runs in the simulation world. It checks the shared
-/// LoadingTracker and the OnLoadComplete resource to make the final decision
-/// on when to transition the app's state.
-#[instrument(skip_all)]
-pub fn master_finalize_loading_system<T: States + FreelyMutableState + Copy>(
-    // Input
-    loading_tracker: Option<Res<LoadingTracker>>,
-    on_complete: Option<Res<OnLoadComplete<T>>>,
-
-    // Output (set the next state)
-    mut next_state: ResMut<NextState<T>>,
-) {
-    let Some(loading_tracker) = loading_tracker else {
-        return;
-    };
-
-    // if we have both the tracker and the "what to do next" instruction
-    if let Some(on_complete) = on_complete
-        && loading_tracker.is_ready()
-    {
-        info!(
-            "Loading is done. Transitioning to {:?}.",
-            on_complete.destination
-        );
-
-        // set the next state
-        next_state.set(on_complete.destination);
-    }
-}
diff --git a/crates/shared/src/load/systems/mod.rs b/crates/shared/src/load/systems/mod.rs
deleted file mode 100644
index 77b8a161..00000000
--- a/crates/shared/src/load/systems/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod async_task_poller;
-pub mod fake_work_system;
-pub mod master_loading_finalizer;
-pub mod reset_loader_tracker;
-
-pub use async_task_poller::poll_simulation_loading_tasks;
-pub use fake_work_system::start_fake_work_system;
-pub use master_loading_finalizer::master_finalize_loading_system;
-pub use reset_loader_tracker::reset_loading_tracker_system;
diff --git a/crates/shared/src/load/systems/reset_loader_tracker.rs b/crates/shared/src/load/systems/reset_loader_tracker.rs
deleted file mode 100644
index 7796e404..00000000
--- a/crates/shared/src/load/systems/reset_loader_tracker.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use crate::load::LoadingTracker;
-use crate::prelude::*;
-use bevy::ecs::prelude::*;
-
-#[instrument(skip_all)]
-pub fn reset_loading_tracker_system(loading_tracker: Option<Res<LoadingTracker>>) {
-    let Some(loading_tracker) = loading_tracker else {
-        return;
-    };
-
-    info!("Resetting loading tracker...");
-    loading_tracker.reset();
-}
diff --git a/crates/shared/src/network/consts.rs b/crates/shared/src/network/consts.rs
new file mode 100644
index 00000000..2b6fb8f5
--- /dev/null
+++ b/crates/shared/src/network/consts.rs
@@ -0,0 +1,8 @@
+use crate::time::TICKS_PER_SECOND;
+
+// address
+pub const DEFAULT_SERVER_PORT: u16 = 5000;
+pub const DEFAULT_LOCAL_SERVER_ADDR: &str = "127.0.0.1:5000";
+
+// network config
+pub const NETWORK_TICK_DURATION: f64 = 1.0 / TICKS_PER_SECOND;
diff --git a/crates/shared/src/network/mod.rs b/crates/shared/src/network/mod.rs
new file mode 100644
index 00000000..41598918
--- /dev/null
+++ b/crates/shared/src/network/mod.rs
@@ -0,0 +1,22 @@
+pub mod consts;
+pub mod protocol;
+
+pub use consts::*;
+pub use protocol::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::prelude::*;
+
+pub struct SharedNetworkPlugin;
+
+/// A plugin that defines sets up the shared network stuff
+impl Plugin for SharedNetworkPlugin {
+    fn build(&self, app: &mut App) {
+        // the protocol must be added after the lightyear `ClientPlugins`
+        // https://docs.rs/lightyear/0.26.4/lightyear/prelude/client/struct.ClientPlugins.html
+        app.add_plugins(NetworkProtocolPlugins);
+    }
+}
diff --git a/crates/shared/src/network/protocol/channels.rs b/crates/shared/src/network/protocol/channels.rs
new file mode 100644
index 00000000..df8e1b6b
--- /dev/null
+++ b/crates/shared/src/network/protocol/channels.rs
@@ -0,0 +1,91 @@
+use bevy::prelude::*;
+use lightyear::prelude::{
+    AppChannelExt, ChannelMode, ChannelSettings, NetworkDirection, ReliableSettings,
+};
+
+/// High-frequency input stream for player movement and orientation.
+///
+/// **Mode:** `SequencedUnreliable`
+/// - Unreliable because dropped packets don't matter as a newer one is coming next tick.
+/// - Sequenced because older out-of-order packets should be discarded to prevent "jitter".
+///
+/// **Direction:** `ClientToServer`
+pub struct PlayerMovement;
+
+/// Requests for block destruction/placement and the resulting state updates.
+///
+/// **Mode:** `OrderedReliable`
+/// - Reliable because a dropped packet would leave a "ghost block" (desync).
+/// - Ordered because mining block A then placing block B in the same spot must resolve in that exact sequence.
+///
+/// **Direction:** `Bidirectional` (Requests C->S, Updates S->C)
+pub struct BlockUpdates;
+
+/// Massive terrain payloads for world generation and chunk loading.
+///
+/// **Mode:** `UnorderedReliable`
+/// - Reliable because missing chunk data leaves a hole in the world.
+/// - Unordered because Chunk A arriving before Chunk B doesn't break simulation and prevents head-of-line blocking.
+///
+/// **Direction:** `ServerToClient`
+pub struct ChunkData;
+
+/// Spawning and despawning of players, dropped items, or mobs.
+///
+/// **Mode:** `OrderedReliable`
+/// - Reliable because ghost entities or missing spawns break the game state.
+/// - Ordered to ensure spawn events precede any updates for that entity.
+///
+/// **Direction:** `ServerToClient`
+pub struct EntityLifecycle;
+
+/// Text chat and critical server system broadcasts.
+///
+/// **Mode:** `OrderedReliable`
+/// - Reliable to ensure messages are not lost.
+/// - Ordered so that conversations and system logs make sense.
+///
+/// **Direction:** `Bidirectional`
+pub struct ChatAndSystem;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+/// This plugin defines the network routing "pipes" (channels) that messages are sent down.
+/// Each channel is configured with specific delivery guarantees suited for its data type.
+pub struct NetChannelsPlugin;
+
+impl Plugin for NetChannelsPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_channel::<PlayerMovement>(ChannelSettings {
+            mode: ChannelMode::SequencedUnreliable,
+            ..default()
+        })
+        .add_direction(NetworkDirection::ClientToServer);
+
+        app.add_channel::<BlockUpdates>(ChannelSettings {
+            mode: ChannelMode::OrderedReliable(ReliableSettings { ..default() }),
+            ..default()
+        })
+        .add_direction(NetworkDirection::Bidirectional);
+
+        app.add_channel::<ChunkData>(ChannelSettings {
+            mode: ChannelMode::UnorderedReliable(ReliableSettings { ..default() }),
+            ..default()
+        })
+        .add_direction(NetworkDirection::ServerToClient);
+
+        app.add_channel::<EntityLifecycle>(ChannelSettings {
+            mode: ChannelMode::OrderedReliable(ReliableSettings { ..default() }),
+            ..default()
+        })
+        .add_direction(NetworkDirection::ServerToClient);
+
+        app.add_channel::<ChatAndSystem>(ChannelSettings {
+            mode: ChannelMode::OrderedReliable(ReliableSettings { ..default() }),
+            ..default()
+        })
+        .add_direction(NetworkDirection::Bidirectional);
+    }
+}
diff --git a/crates/shared/src/network/protocol/components.rs b/crates/shared/src/network/protocol/components.rs
new file mode 100644
index 00000000..29f9a33d
--- /dev/null
+++ b/crates/shared/src/network/protocol/components.rs
@@ -0,0 +1,26 @@
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use crate::player::components::{LogicalPosition, NetworkPlayer, PlayerLook, PlayerOwner};
+use bevy::prelude::*;
+use lightyear::prelude::{
+    AppComponentExt, InterpolationRegistrationExt, PredictionRegistrationExt,
+};
+
+pub struct NetComponentsPlugin;
+
+impl Plugin for NetComponentsPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_component::<NetworkPlayer>();
+        app.register_component::<PlayerOwner>();
+
+        app.register_component::<PlayerLook>()
+            .add_prediction()
+            .add_linear_interpolation();
+
+        app.register_component::<LogicalPosition>()
+            .add_prediction()
+            .add_linear_interpolation();
+    }
+}
diff --git a/crates/shared/src/network/protocol/messages.rs b/crates/shared/src/network/protocol/messages.rs
new file mode 100644
index 00000000..0d0f50ec
--- /dev/null
+++ b/crates/shared/src/network/protocol/messages.rs
@@ -0,0 +1,53 @@
+use crate::world::chunk::ChunkCoord;
+use bevy::prelude::*;
+use lightyear::prelude::*;
+use serde::{Deserialize, Serialize};
+
+/// A protocol defining all the direct client messages that a client communicates
+/// to the server. Note that this only defines the boundaries for message comms
+/// while the client also has other means of communication like replication.
+#[derive(Message, Serialize, Deserialize, Debug, Clone, PartialEq)]
+pub enum ClientMessage {
+    /// A request for the server to send block data for a specific chunk.
+    RequestChunk(ChunkCoord),
+    /// Updates the server on the player's current view orientation/camera state.
+    /// Necessary for authoritative targeting or raycasting calculations.
+    UpdateView { forward: Vec3 },
+    /// Intent to break a block at the specified position.
+    BreakBlock { position: IVec3 },
+    /// Intent to place a block at the specified position.
+    PlaceBlock { position: IVec3, block_id: u8 },
+    /// Request the server to jump the game time by a specific amount.
+    RequestTimeJump { amount: f32 },
+}
+
+/// A protocol defining all the direct server messages that a server communicates
+/// to its clients. Note that this only defines the boundaries for message comms
+/// while the server also has other means of communication like replication.
+#[derive(Message, Serialize, Deserialize, Debug, Clone, PartialEq)]
+pub enum ServerMessage {
+    /// Direct block update for a specific world position. Represents generalized state change broadcast.
+    BlockUpdate { position: IVec3, block_id: u8 },
+    /// Bulk data for a chunk, typically compressed or encoded from ChunkVolumeData.
+    ChunkData {
+        coord: ChunkCoord,
+        data: Vec<u8>, // u8 matches BlockId
+    },
+    /// Synchronizes the authoritative game time across all clients.
+    SyncTime { game_time: f32, tick: u64 },
+}
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+pub struct NetMessagesPlugin;
+
+impl Plugin for NetMessagesPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_message::<ClientMessage>()
+            .add_direction(NetworkDirection::ClientToServer);
+        app.register_message::<ServerMessage>()
+            .add_direction(NetworkDirection::ServerToClient);
+    }
+}
diff --git a/crates/shared/src/network/protocol/mod.rs b/crates/shared/src/network/protocol/mod.rs
new file mode 100644
index 00000000..f5d5c032
--- /dev/null
+++ b/crates/shared/src/network/protocol/mod.rs
@@ -0,0 +1,31 @@
+pub mod channels;
+pub mod components;
+pub mod messages;
+
+pub use channels::*;
+pub use components::NetComponentsPlugin;
+pub use messages::{ClientMessage, NetMessagesPlugin, ServerMessage};
+
+// INFO: ---------------------------------
+//         plugin group definition
+// ---------------------------------------
+
+use bevy::{app::PluginGroupBuilder, prelude::*};
+
+pub struct NetworkProtocolPlugins;
+
+/// A plugin group that defines the shared client-server networking protocols.
+///
+/// This includes channels, messages, and networked components.
+///
+/// WARN: Because this group registers the lightyear protocol, it must be
+/// added AFTER the lightyear plugin groups for client/server.
+/// - See: https://docs.rs/lightyear/0.26.4/lightyear/prelude/client/struct.ClientPlugins.html
+impl PluginGroup for NetworkProtocolPlugins {
+    fn build(self) -> PluginGroupBuilder {
+        PluginGroupBuilder::start::<Self>()
+            .add(NetChannelsPlugin)
+            .add(NetMessagesPlugin)
+            .add(NetComponentsPlugin)
+    }
+}
diff --git a/crates/shared/src/player/components.rs b/crates/shared/src/player/components.rs
new file mode 100644
index 00000000..fa2d0da3
--- /dev/null
+++ b/crates/shared/src/player/components.rs
@@ -0,0 +1,70 @@
+use bevy::prelude::*;
+use lightyear::prelude::PeerId;
+use serde::{Deserialize, Serialize};
+use std::f32::consts::{PI, TAU};
+
+/// A unique identifier for a player.
+///
+/// This ID is assigned by the server and used to uniquely identify players across the network.
+#[derive(Component, Serialize, Deserialize, Clone, Debug, PartialEq)]
+pub struct PlayerId(pub u64);
+
+/// Replicated component that identifies which client owns this player entity.
+#[derive(Component, Serialize, Deserialize, Clone, Debug, PartialEq)]
+pub struct PlayerOwner(pub PeerId);
+
+/// Marker component for an entity that represents a player in the network.
+///
+/// **Authoritative Replication:** This component is managed and synchronized by the server.
+/// Clients MUST NOT spawn entities with this component locally. They are spawned automatically
+/// on the client via network replication when the server informs the client of a player's presence.
+#[derive(Component, Serialize, Deserialize, Clone, Debug, PartialEq, Reflect, Default)]
+pub struct NetworkPlayer;
+
+/// The authoritative position of an entity within the fixed-step simulation.
+///
+/// This serves as the "source of truth" for physics and logic. On the client,
+/// Bevy's native `Transform` is smoothly interpolated to chase this value
+/// to provide high-framerate visual continuity.
+#[derive(Component, Serialize, Deserialize, Clone, Debug, PartialEq, Reflect, Default)]
+pub struct LogicalPosition(pub Vec3);
+
+impl Ease for LogicalPosition {
+    fn interpolating_curve_unbounded(start: Self, end: Self) -> impl Curve<Self> {
+        FunctionCurve::new(Interval::EVERYWHERE, move |t| Self(start.0.lerp(end.0, t)))
+    }
+}
+
+/// Represents the orientation of a player's view.
+///
+/// This is replicated from server to clients, while each individual
+/// client updates it thorugh the `PlayerAction` messages.
+#[derive(Component, Serialize, Deserialize, Clone, Debug, PartialEq, Reflect, Default)]
+pub struct PlayerLook {
+    /// Horizontal rotation (around the Y axis) in radians.
+    pub yaw: f32,
+    /// Vertical rotation (around the X axis) in radians.
+    pub pitch: f32,
+}
+
+impl Ease for PlayerLook {
+    fn interpolating_curve_unbounded(start: Self, end: Self) -> impl Curve<Self> {
+        // raw difference
+        let delta_pitch = end.pitch - start.pitch;
+        let mut delta_yaw = end.yaw - start.yaw;
+
+        // wrap the yaw to find the shortest rotation path [-PI, PI]
+        while delta_yaw > PI {
+            delta_yaw -= TAU;
+        }
+        while delta_yaw < -PI {
+            delta_yaw += TAU;
+        }
+
+        // final function curve
+        FunctionCurve::new(Interval::EVERYWHERE, move |t| Self {
+            yaw: start.yaw + delta_yaw * t,
+            pitch: start.pitch + delta_pitch * t,
+        })
+    }
+}
diff --git a/crates/shared/src/player/mod.rs b/crates/shared/src/player/mod.rs
new file mode 100644
index 00000000..9bc5c405
--- /dev/null
+++ b/crates/shared/src/player/mod.rs
@@ -0,0 +1,32 @@
+pub mod components;
+pub mod movement;
+mod player_action;
+
+pub use components::*;
+pub use player_action::PlayerAction;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::prelude::*;
+use leafwing_input_manager::prelude::ActionState;
+use lightyear::prelude::input::leafwing::InputPlugin;
+use movement::shared_player_movement_system;
+
+/// A plugin that handles shared player logic.
+pub struct SharedPlayerPlugin;
+
+impl Plugin for SharedPlayerPlugin {
+    fn build(&self, app: &mut App) {
+        // handle leafwing inputs via lightyear
+        app.add_plugins(InputPlugin::<PlayerAction>::default());
+
+        // NOTE: this resource only exists as a sink, without it
+        // leafwing will complain when no players exist since there
+        // is no action states to  handle
+        app.init_resource::<ActionState<PlayerAction>>();
+
+        app.add_systems(FixedUpdate, shared_player_movement_system);
+    }
+}
diff --git a/crates/shared/src/player/movement.rs b/crates/shared/src/player/movement.rs
new file mode 100644
index 00000000..dcc63515
--- /dev/null
+++ b/crates/shared/src/player/movement.rs
@@ -0,0 +1,54 @@
+use crate::player::{
+    components::{LogicalPosition, NetworkPlayer, PlayerLook},
+    PlayerAction,
+};
+use bevy::prelude::*;
+use leafwing_input_manager::prelude::ActionState;
+
+/// A movement system shared by the client and server that updates the `LogicalPosition`
+/// of a player based on their `PlayerAction` and `PlayerLook` states.
+///
+/// The server uses this to authoritatively move the networked player entity, while the
+/// client uses it to make movement predictions.
+pub fn shared_player_movement_system(
+    time: Res<Time<Fixed>>,
+    mut query: Query<
+        (
+            &ActionState<PlayerAction>,
+            &PlayerLook,
+            &mut LogicalPosition,
+        ),
+        With<NetworkPlayer>,
+    >,
+) {
+    let delta = time.delta_secs();
+    let move_speed = 20.0;
+
+    for (action_state, look, mut position) in query.iter_mut() {
+        let mut move_dir = Vec3::ZERO;
+
+        // calculate front vector based on yaw and pitch (for vertical movement)
+        let forward = Quat::from_euler(EulerRot::YXZ, look.yaw, look.pitch, 0.0) * -Vec3::Z;
+        // calculate right vector based on yaw only (for horizontal strafing)
+        let right = Quat::from_rotation_y(look.yaw) * Vec3::X;
+
+        if action_state.pressed(&PlayerAction::MoveForward) {
+            move_dir += forward;
+        }
+        if action_state.pressed(&PlayerAction::MoveBackward) {
+            move_dir -= forward;
+        }
+        if action_state.pressed(&PlayerAction::MoveLeft) {
+            move_dir -= right;
+        }
+        if action_state.pressed(&PlayerAction::MoveRight) {
+            move_dir += right;
+        }
+
+        if move_dir != Vec3::ZERO {
+            move_dir = move_dir.normalize();
+            position.0 += move_dir * move_speed * delta;
+        }
+    }
+}
+
diff --git a/crates/shared/src/player/player_action.rs b/crates/shared/src/player/player_action.rs
new file mode 100644
index 00000000..53422e59
--- /dev/null
+++ b/crates/shared/src/player/player_action.rs
@@ -0,0 +1,31 @@
+use bevy::prelude::Reflect;
+use leafwing_input_manager::Actionlike;
+use serde::{Deserialize, Serialize};
+
+/// Actions that are sent over the network from the client to the server.
+/// These actions represent the authoritative state changes requested by the player.
+#[derive(Actionlike, PartialEq, Eq, Clone, Copy, Hash, Debug, Reflect, Serialize, Deserialize)]
+pub enum PlayerAction {
+    /// Move the player forward.
+    MoveForward,
+    /// Move the player backward.
+    MoveBackward,
+    /// Move the player to the left.
+    MoveLeft,
+    /// Move the player to the right.
+    MoveRight,
+    /// Sprint or move at a faster pace.
+    MoveFaster,
+
+    /// Primary interaction intent (e.g., breaking a block).
+    PrimaryInteract,
+    /// Secondary interaction intent (e.g., placing a block).
+    SecondaryInteract,
+
+    /// Request to jump the game time forward.
+    JumpGameTimeForward,
+    /// Request to jump the game time backward.
+    JumpGameTimeBackward,
+    /// Request to toggle game time pausing.
+    PauseGameTime,
+}
diff --git a/crates/shared/src/prelude.rs b/crates/shared/src/prelude.rs
index fe63bbd1..4948f030 100644
--- a/crates/shared/src/prelude.rs
+++ b/crates/shared/src/prelude.rs
@@ -2,7 +2,7 @@
 //         crate imports
 // -----------------------------
 
-pub use crate::simulation::scheduling::*;
+pub use crate::lifecycle::*;
 pub use utils::*;
 
 // INFO: -------------------------------
diff --git a/crates/shared/src/simulation/asset/mod.rs b/crates/shared/src/simulation/asset/mod.rs
deleted file mode 100644
index c8f9e174..00000000
--- a/crates/shared/src/simulation/asset/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// INFO: ----------------------
-//         asset plugin
-// ----------------------------
-
-use bevy::app::{App, Plugin};
-
-pub struct AssetPlugin;
-
-impl Plugin for AssetPlugin {
-    fn build(&self, _app: &mut App) {
-        // register our custom asset types with Bevy's native asset system
-    }
-}
diff --git a/crates/shared/src/simulation/biome/mod.rs b/crates/shared/src/simulation/biome/mod.rs
deleted file mode 100644
index 44d56e7c..00000000
--- a/crates/shared/src/simulation/biome/mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-pub mod biome_definition;
-pub mod biome_registry;
-
-pub use biome_definition::BiomeDefinition;
-pub use biome_registry::{BiomeId, BiomeRegistryResource};
-
-// INFO: ----------------------
-//         Biome plugin
-// ----------------------------
-
-use crate::simulation::biome::biome_registry::initialize_biome_registry_system;
-use bevy::app::{App, Plugin, Startup};
-
-pub struct BiomePlugin;
-
-impl Plugin for BiomePlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<BiomeRegistryResource>();
-
-        app.add_systems(Startup, initialize_biome_registry_system);
-    }
-}
diff --git a/crates/shared/src/simulation/block/texture_registry.rs b/crates/shared/src/simulation/block/texture_registry.rs
deleted file mode 100644
index 5a24d8ed..00000000
--- a/crates/shared/src/simulation/block/texture_registry.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use bevy::asset::Handle;
-use bevy::ecs::resource::Resource;
-use bevy::prelude::Image;
-use bevy::render::extract_resource::ExtractResource;
-use std::{collections::HashMap, sync::Arc};
-
-/// A numeric ID for a texture, representing its index in the texture array.
-pub type TextureId = u32;
-
-pub type TextureLoadError = String;
-
-/// A resource holding the handle to the stitched voxel texture array.
-#[derive(Resource, Clone, Debug, ExtractResource)]
-pub struct BlockTextureArray {
-    pub handle: Handle<Image>,
-}
-
-/// A registry for looking up texture indices from a texture name.
-#[derive(Resource, Clone)]
-pub struct TextureRegistryResource {
-    /// Maps the texture name to its TextureId (index) in the GPU texture array.
-    name_to_id: Arc<HashMap<String, TextureId>>,
-
-    /// The index of the fallback "missing texture" pattern.
-    missing_texture_id: TextureId,
-}
-
-impl TextureRegistryResource {
-    /// Creates a new texture registry from a pre-populated map.
-    pub fn new(map: HashMap<String, TextureId>) -> Result<Self, TextureLoadError> {
-        let missing_texture_id = *map.get("missing").expect("Missing texture not in map");
-
-        Ok(Self {
-            name_to_id: Arc::new(map),
-            missing_texture_id,
-        })
-    }
-
-    /// Gets the texture ID for a given name, returning the missing texture ID if not found.
-    pub fn get_id(&self, name: &str) -> TextureId {
-        self.name_to_id
-            .get(name)
-            .copied()
-            .unwrap_or(self.missing_texture_id)
-    }
-
-    /// Returns the missing texture ID.
-    pub fn missing_texture(&self) -> TextureId {
-        self.missing_texture_id
-    }
-
-    /// Returns true if the registry contains a texture with the given name.
-    pub fn contains(&self, name: &str) -> bool {
-        self.name_to_id.contains_key(name)
-    }
-
-    /// Returns the total number of textures in the registry.
-    pub fn len(&self) -> usize {
-        self.name_to_id.len()
-    }
-
-    /// Returns true if the registry contains no textures.
-    pub fn is_empty(&self) -> bool {
-        self.name_to_id.is_empty()
-    }
-}
diff --git a/crates/shared/src/simulation/chunk/components/transform.rs b/crates/shared/src/simulation/chunk/components/transform.rs
deleted file mode 100644
index d3faaa5d..00000000
--- a/crates/shared/src/simulation/chunk/components/transform.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use bevy::ecs::prelude::Component;
-use bevy::math::{Mat4, Quat, Vec3};
-
-#[derive(Component, Debug)]
-pub struct TransformComponent {
-    pub position: Vec3,
-    pub rotation: Quat,
-    pub scale: Vec3,
-}
-
-impl Default for TransformComponent {
-    fn default() -> Self {
-        Self {
-            position: Vec3::ZERO,
-            rotation: Quat::IDENTITY,
-            scale: Vec3::ONE,
-        }
-    }
-}
-
-impl TransformComponent {
-    pub fn to_matrix(&self) -> Mat4 {
-        Mat4::from_scale_rotation_translation(self.scale, self.rotation, self.position)
-    }
-}
diff --git a/crates/shared/src/simulation/chunk/mod.rs b/crates/shared/src/simulation/chunk/mod.rs
deleted file mode 100644
index 9118ea71..00000000
--- a/crates/shared/src/simulation/chunk/mod.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-pub mod common;
-pub mod components;
-pub mod consts;
-pub mod tasks;
-pub mod types;
-
-pub use common::*;
-pub use components::*;
-pub use consts::*;
-pub use tasks::*;
-pub use types::*;
-
-// INFO: ------------------------------
-//         chunk loading plugin
-// ------------------------------------
-
-use crate::simulation::scheduling::FixedUpdateSet;
-use bevy::app::{App, FixedUpdate, Plugin, PreUpdate};
-use bevy::ecs::prelude::*;
-use bevy::prelude::{Camera, Camera3d};
-
-pub struct ChunkLoadingPlugin;
-
-impl Plugin for ChunkLoadingPlugin {
-    fn build(&self, app: &mut App) {
-        app.insert_resource(ChunkStateManager::default());
-
-        app.add_systems(
-            PreUpdate,
-            (manage_distance_based_chunk_loading_targets_system).run_if(
-                |q: Query<(&Camera, &ChunkCoord), (With<Camera3d>, Changed<ChunkCoord>)>| {
-                    q.iter().any(|(c, _)| c.is_active)
-                },
-            ),
-        );
-
-        app.add_systems(
-            FixedUpdate,
-            (
-                start_pending_generation_tasks_system,
-                poll_chunk_generation_tasks,
-            )
-                .in_set(FixedUpdateSet::MainLogic),
-        );
-    }
-}
diff --git a/crates/shared/src/simulation/chunk/tasks/chunk_state_manager.rs b/crates/shared/src/simulation/chunk/tasks/chunk_state_manager.rs
deleted file mode 100644
index 62881ace..00000000
--- a/crates/shared/src/simulation/chunk/tasks/chunk_state_manager.rs
+++ /dev/null
@@ -1,231 +0,0 @@
-use bevy::ecs::prelude::*;
-use bevy::math::IVec3;
-use std::collections::HashMap;
-
-use crate::simulation::chunk::{WORLD_MAX_Y_CHUNK, WORLD_MIN_Y_CHUNK};
-
-/// Represents the various states a chunk can be in during loading and generation.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ChunkState {
-    /// Entity that can be acquired for generation
-    NeedsGenerating { entity: Entity },
-    /// Entity holds the generation Task component
-    Generating { entity: Entity },
-    /// Entity holds the generated data but is not queued for meshing
-    ///
-    /// This exists so that chunks can remain stagnant and hold data without
-    /// being queued for meshing. Important for the "generation buffer" ring
-    /// that extends past the mesh render distance (`LOAD_DISTANCE` const).
-    DataReady { entity: Entity },
-    /// Entity is awaiting a mesh slot
-    WantsMeshing { entity: Entity },
-    /// Entity holds the meshing Task component
-    Meshing { entity: Entity },
-    /// Entity is the final, rendered chunk
-    Loaded { entity: Option<Entity> },
-}
-
-impl ChunkState {
-    /// Returns the Entity associated with this chunk state.
-    pub fn entity(&self) -> Option<Entity> {
-        match *self {
-            ChunkState::NeedsGenerating { entity } => Some(entity),
-            ChunkState::Generating { entity } => Some(entity),
-            ChunkState::DataReady { entity } => Some(entity),
-            ChunkState::WantsMeshing { entity } => Some(entity),
-            ChunkState::Meshing { entity } => Some(entity),
-            ChunkState::Loaded { entity } => entity,
-        }
-    }
-
-    /// Returns true if the chunk has been generated (at least DataReady).
-    pub fn is_generated(&self) -> bool {
-        matches!(
-            *self,
-            ChunkState::DataReady { .. }
-                | ChunkState::WantsMeshing { .. }
-                | ChunkState::Meshing { .. }
-                | ChunkState::Loaded { .. }
-        )
-    }
-}
-
-/// Offsets to find the 26 direct neighbors of a chunk.
-///
-/// If you imagine a chunk as the center of a 3x3 grid, then
-/// this returns every offset in the grid except the 0-offset
-/// which is the center chunk.
-pub const NEIGHBOR_OFFSETS: [IVec3; 26] = {
-    let mut offsets = [IVec3::ZERO; 26];
-
-    let mut index = 0;
-    let mut x = -1;
-    while x <= 1 {
-        let mut y = -1;
-        while y <= 1 {
-            let mut z = -1;
-            while z <= 1 {
-                if x != 0 || y != 0 || z != 0 {
-                    offsets[index] = IVec3::new(x, y, z);
-                    index += 1;
-                }
-                z += 1;
-            }
-            y += 1;
-        }
-        x += 1;
-    }
-
-    offsets
-};
-
-/// Holds information about a chunk's existing neighbor.
-pub struct NeighborInfo {
-    pub offset: IVec3,
-    pub coord: IVec3,
-    pub state: ChunkState,
-    pub entity: Entity,
-}
-
-#[derive(Resource, Default, Debug)]
-pub struct ChunkStateManager {
-    /// Map tracking the state of all non-unloaded chunks.
-    pub chunk_states: HashMap<IVec3, ChunkState>,
-}
-
-impl ChunkStateManager {
-    /// Gets the current state of a chunk, if tracked.
-    pub fn get_state(&self, coord: IVec3) -> Option<ChunkState> {
-        self.chunk_states.get(&coord).copied()
-    }
-
-    /// Gets the Entity for a chunk, if that chunk is tracked.
-    pub fn get_entity(&self, coord: IVec3) -> Option<Entity> {
-        self.chunk_states.get(&coord).map(|state| state.entity())?
-    }
-
-    /// Checks if a chunk exists in any loading or loaded state.
-    pub fn is_chunk_present_or_loading(&self, coord: IVec3) -> bool {
-        self.chunk_states.contains_key(&coord)
-    }
-
-    /// Marks that a chunk is requested to be loaded.
-    pub fn mark_as_needs_generating(&mut self, coord: IVec3, needs_generation_task_entity: Entity) {
-        self.chunk_states.insert(
-            coord,
-            ChunkState::NeedsGenerating {
-                entity: needs_generation_task_entity,
-            },
-        );
-    }
-
-    /// Marks that a chunk is currently undergoing generation.
-    pub fn mark_as_generating(&mut self, coord: IVec3, generation_task_entity: Entity) {
-        self.chunk_states.insert(
-            coord,
-            ChunkState::Generating {
-                entity: generation_task_entity,
-            },
-        );
-    }
-
-    /// Called once a chunk's data is generated but not queued for meshing.
-    pub fn mark_as_data_ready(&mut self, coord: IVec3, data_ready_entity: Entity) {
-        self.chunk_states.insert(
-            coord,
-            ChunkState::DataReady {
-                entity: data_ready_entity,
-            },
-        );
-    }
-
-    /// Called once a chunk's data is generated and is queued to be meshed.
-    pub fn mark_as_needs_meshing(&mut self, coord: IVec3, needs_meshing_entity: Entity) {
-        self.chunk_states.insert(
-            coord,
-            ChunkState::WantsMeshing {
-                entity: needs_meshing_entity,
-            },
-        );
-    }
-
-    /// Called once a chunk starts meshing.
-    pub fn mark_as_meshing(&mut self, coord: IVec3, meshing_task_entity: Entity) {
-        self.chunk_states.insert(
-            coord,
-            ChunkState::Meshing {
-                entity: meshing_task_entity,
-            },
-        );
-    }
-
-    /// Called once a chunk has finished meshing and is fully loaded.
-    pub fn mark_as_loaded(&mut self, coord: IVec3, final_chunk_entity: Entity) {
-        self.chunk_states.insert(
-            coord,
-            ChunkState::Loaded {
-                entity: Some(final_chunk_entity),
-            },
-        );
-    }
-
-    /// Called once a chunk has finished meshing and is fully loaded.
-    ///
-    /// Passing no entity means the chunk is empty and does not need to be rendered.
-    pub fn mark_as_loaded_but_empty(&mut self, coord: IVec3) {
-        self.chunk_states
-            .insert(coord, ChunkState::Loaded { entity: None });
-    }
-
-    /// Called when a chunk is unloaded, removing it from tracking.
-    pub fn mark_as_unloaded(&mut self, coord: IVec3) {
-        self.chunk_states.remove(&coord);
-    }
-
-    // INFO: -------------------------------
-    //         util instance methods
-    // -------------------------------------
-
-    /// A help to iterate over all chunks needing meshing.
-    ///
-    /// Necessary to prevent throttling by only meshing a few
-    /// chunks per frame/tick.
-    pub fn iter_needs_meshing(&self) -> impl Iterator<Item = &IVec3> {
-        self.chunk_states.iter().filter_map(|(coord, state)| {
-            if matches!(state, ChunkState::WantsMeshing { .. }) {
-                Some(coord)
-            } else {
-                None
-            }
-        })
-    }
-
-    /// Returns an iterator over all *existing* neighbors of a chunk.
-    ///
-    /// A chunk neighbor is defined as ALL 26 other chunks in the 3x3
-    /// cube that the chunk is the center of. Note that this only will
-    /// yield neighbors currently tracked with an entity.
-    pub fn iter_neighbors(&self, coord: IVec3) -> impl Iterator<Item = NeighborInfo> + '_ {
-        NEIGHBOR_OFFSETS.into_iter().filter_map(move |offset| {
-            let neighbor_coord = coord + offset;
-            self.get_state(neighbor_coord)
-                .and_then(|state| state.entity().map(|entity| (state, entity)))
-                .map(|(state, entity)| NeighborInfo {
-                    offset,
-                    coord: neighbor_coord,
-                    state,
-                    entity,
-                })
-        })
-    }
-
-    // INFO: -----------------------------
-    //         static util methods
-    // -----------------------------------
-
-    /// Determines if a coord is in bounds
-    pub fn is_in_bounds(coord: IVec3) -> bool {
-        let pos_y = coord.y;
-        (WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK).contains(&pos_y)
-    }
-}
diff --git a/crates/shared/src/simulation/chunk/tasks/datagen/mod.rs b/crates/shared/src/simulation/chunk/tasks/datagen/mod.rs
deleted file mode 100644
index e9cadf2b..00000000
--- a/crates/shared/src/simulation/chunk/tasks/datagen/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#[path = "components.rs"]
-pub mod gentask_components;
-pub mod poll_generation;
-pub mod start_generation;
-
-pub use gentask_components::{ChunkGenerationTaskComponent, NeedsGenerating};
-pub use poll_generation::poll_chunk_generation_tasks;
-pub use start_generation::start_pending_generation_tasks_system;
diff --git a/crates/shared/src/simulation/chunk/tasks/datagen/poll_generation.rs b/crates/shared/src/simulation/chunk/tasks/datagen/poll_generation.rs
deleted file mode 100644
index f47d0d4f..00000000
--- a/crates/shared/src/simulation/chunk/tasks/datagen/poll_generation.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use crate::prelude::*;
-use crate::simulation::chunk::{
-    ChunkCoord, ChunkGenerationTaskComponent, ChunkState, ChunkStateManager,
-};
-use bevy::ecs::prelude::*;
-use crossbeam::channel::TryRecvError;
-
-/// Polls chunk generation tasks, adds generated components, and marks chunks as `DataReady`.
-#[instrument(skip_all)]
-pub fn poll_chunk_generation_tasks(
-    // Input
-    mut tasks_query: Query<(Entity, &mut ChunkGenerationTaskComponent, &ChunkCoord)>,
-
-    // Output
-    mut commands: Commands,
-    mut chunk_manager: ResMut<ChunkStateManager>,
-) {
-    // poll all generation tasks
-    for (entity, generation_task_component, coord) in tasks_query.iter_mut() {
-        match generation_task_component.receiver.try_recv() {
-            Ok(gen_bundle) => {
-                let current_state = chunk_manager.get_state(coord.pos);
-                match current_state {
-                    Some(ChunkState::Generating { entity: gen_entity }) if gen_entity == entity => {
-                        if let Some(chunk_blocks) = gen_bundle.chunk_blocks {
-                            trace!(
-                                target: "chunk_loading",
-                                "Chunk generation finished for {}. Marking as DataReady.",
-                                coord
-                            );
-                            commands
-                                .entity(entity)
-                                .insert((chunk_blocks, gen_bundle.biome_map))
-                                .remove::<ChunkGenerationTaskComponent>();
-                            chunk_manager.mark_as_data_ready(coord.pos, entity);
-                        } else {
-                            trace!(
-                                target: "chunk_loading",
-                                "Chunk generation finished for {} but chunk is empty. Marking as Loaded(None).",
-                                coord
-                            );
-                            commands.entity(entity).despawn();
-                            chunk_manager.mark_as_loaded_but_empty(coord.pos);
-                        }
-
-                        // Neighbors that may be waiting for this chunk will be handled by client-side meshing logic.
-                    }
-                    Some(_) => {
-                        error!(
-                            "Chunk generation task for {} completed, but manager state changed unexpectedly to {:?}.",
-                            coord, current_state
-                        );
-                    }
-                    None => {
-                        debug!(target: "chunk_loading", "Generation completed for unloaded chunk {}, cleaning up", coord);
-                        commands
-                            .entity(entity)
-                            .remove::<ChunkGenerationTaskComponent>();
-                    }
-                }
-            }
-            Err(TryRecvError::Empty) => {
-                // task still running
-            }
-            Err(TryRecvError::Disconnected) => {
-                warn!(
-                    target: "chunk_loading",
-                    "Chunk generation task for {} failed (channel disconnected). Despawning entity.",
-                    coord
-                );
-                commands.entity(entity).despawn();
-                chunk_manager.mark_as_unloaded(coord.pos);
-            }
-        }
-    }
-}
diff --git a/crates/shared/src/simulation/chunk/tasks/manage_load_targets.rs b/crates/shared/src/simulation/chunk/tasks/manage_load_targets.rs
deleted file mode 100644
index 6c36bb17..00000000
--- a/crates/shared/src/simulation/chunk/tasks/manage_load_targets.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use crate::prelude::*;
-use crate::simulation::chunk::{
-    ChunkCoord, ChunkLod, ChunkState, ChunkStateManager, LOAD_DISTANCE, NeedsGenerating,
-    WORLD_MAX_Y_CHUNK, WORLD_MIN_Y_CHUNK,
-};
-use bevy::ecs::prelude::*;
-use bevy::math::IVec3;
-use bevy::prelude::{Camera, Camera3d};
-use std::collections::HashSet;
-
-/// Determines chunks to unload/load based on the camera position and loading distance.
-///
-/// Only needs to run when the camera has entered a new chunk.
-#[instrument(skip_all)]
-pub fn manage_distance_based_chunk_loading_targets_system(
-    // Input
-    camera_query: Query<(&Camera, &ChunkCoord), With<Camera3d>>,
-
-    // Output
-    mut chunk_manager: ResMut<ChunkStateManager>, // for marking loaded/unloaded
-    mut commands: Commands,                       // for spawning chunk entities
-) {
-    let mut active_camera_chunk_pos = None;
-    for (camera, chunk_coord) in camera_query.iter() {
-        if camera.is_active {
-            active_camera_chunk_pos = Some(chunk_coord.pos);
-            break;
-        }
-    }
-
-    let Some(camera_chunk_pos) = active_camera_chunk_pos else {
-        return;
-    };
-
-    // desired chunks based on camera location for loading
-    let mut desired_load_chunks = HashSet::new();
-
-    for y in WORLD_MIN_Y_CHUNK..=WORLD_MAX_Y_CHUNK {
-        for z in -LOAD_DISTANCE..=LOAD_DISTANCE {
-            for x in -LOAD_DISTANCE..=LOAD_DISTANCE {
-                let coord = IVec3::new(camera_chunk_pos.x + x, y, camera_chunk_pos.z + z);
-                desired_load_chunks.insert(coord);
-            }
-        }
-    }
-
-    // INFO: --------------------------------
-    //         unload/cancel chunking
-    // --------------------------------------
-
-    let mut coords_to_remove = Vec::new();
-
-    for (coord, state) in chunk_manager.chunk_states.iter_mut() {
-        if !desired_load_chunks.contains(coord) {
-            // chunk is outside load distance, unload it completely
-            match state {
-                ChunkState::NeedsGenerating { entity, .. }
-                | ChunkState::Generating { entity }
-                | ChunkState::DataReady { entity }
-                | ChunkState::WantsMeshing { entity }
-                | ChunkState::Meshing { entity }
-                | ChunkState::Loaded {
-                    entity: Some(entity),
-                } => {
-                    debug!(target:"chunk_loading", "Unloading chunk at {:?} (Entity: {:?})", coord, entity);
-                    commands.entity(*entity).despawn();
-                }
-                ChunkState::Loaded { entity: None } => {
-                    // already unloaded, nothing to despawn
-                    debug!(target:"chunk_loading", "Marking chunk at {:?} as unloaded (was already unloaded)", coord);
-                }
-            }
-            coords_to_remove.push(*coord);
-        }
-    }
-
-    // remove the unloaded/cancelled chunks from the manager
-    for coord in coords_to_remove {
-        chunk_manager.mark_as_unloaded(coord);
-    }
-
-    // INFO: --------------------------------------------
-    //         load new chunks (start generation)
-    // --------------------------------------------------
-
-    // if any desired chunks are not currently loaded or loading, spawn a new chunk entity and mark it as needs-generation
-    for coord in desired_load_chunks {
-        if !chunk_manager.is_chunk_present_or_loading(coord) {
-            debug!(target:"chunk_loading","Marking chunk needs-generation at {:?}", coord);
-            let ent = commands
-                .spawn((
-                    NeedsGenerating { lod: ChunkLod(0) },
-                    ChunkCoord { pos: coord },
-                ))
-                .id();
-            chunk_manager.mark_as_needs_generating(coord, ent);
-        }
-    }
-}
diff --git a/crates/shared/src/simulation/chunk/tasks/mod.rs b/crates/shared/src/simulation/chunk/tasks/mod.rs
deleted file mode 100644
index 350d14fe..00000000
--- a/crates/shared/src/simulation/chunk/tasks/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod datagen;
-
-pub mod chunk_state_manager;
-pub mod manage_load_targets;
-
-pub use datagen::*;
-
-pub use chunk_state_manager::{ChunkState, ChunkStateManager};
-pub use manage_load_targets::manage_distance_based_chunk_loading_targets_system;
diff --git a/crates/shared/src/simulation/input/mod.rs b/crates/shared/src/simulation/input/mod.rs
deleted file mode 100644
index 356088fb..00000000
--- a/crates/shared/src/simulation/input/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod resources;
-pub mod types;
diff --git a/crates/shared/src/simulation/input/resources/action.rs b/crates/shared/src/simulation/input/resources/action.rs
deleted file mode 100644
index 9a594803..00000000
--- a/crates/shared/src/simulation/input/resources/action.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use crate::simulation::input::types::simulation_action::SimulationAction;
-use bevy::ecs::prelude::Resource;
-use std::collections::HashSet;
-
-/// A resource for central mapping of input to actions
-///
-/// This abstracts away *why* an action occurred and allows systems
-/// to react to the event itself (as opposed to reacting to a key).
-#[derive(Debug, Resource, Default)]
-pub struct ActionStateResource {
-    /// Actions that just happened in this frame.
-    just_happened: HashSet<SimulationAction>,
-
-    /// Actions that happened in a previous frame but are still ongoing.
-    ongoing: HashSet<SimulationAction>,
-
-    /// Actions that ended or were released this frame.
-    ended: HashSet<SimulationAction>,
-}
-
-impl ActionStateResource {
-    // INFO: ---------------------------
-    //        State manipulation
-    // ---------------------------------
-
-    /// Clears the `just_happened` and `ended` sets.
-    pub fn clear(&mut self) {
-        self.just_happened.clear();
-        self.ended.clear();
-    }
-
-    /// Marks an action as pressed.
-    pub fn press(&mut self, action: SimulationAction) {
-        self.just_happened.insert(action);
-    }
-
-    /// Marks an action as held.
-    pub fn hold(&mut self, action: SimulationAction) {
-        self.ongoing.insert(action);
-    }
-
-    /// Marks an action as released.
-    pub fn release(&mut self, action: SimulationAction) {
-        if self.ongoing.remove(&action) {
-            self.ended.insert(action);
-        }
-    }
-
-    // INFO: -----------------------
-    //        State checking
-    // -----------------------------
-
-    /// Was the key associated with this action just pressed this frame?
-    pub fn just_happened(&self, action: SimulationAction) -> bool {
-        self.just_happened.contains(&action)
-    }
-
-    /// Is the key associated with this action being held?
-    pub fn is_ongoing(&self, action: SimulationAction) -> bool {
-        self.ongoing.contains(&action)
-    }
-
-    /// Was the key associated with this action just released?
-    pub fn just_ended(&self, action: SimulationAction) -> bool {
-        self.ended.contains(&action)
-    }
-}
diff --git a/crates/shared/src/simulation/input/resources/cursor_movement.rs b/crates/shared/src/simulation/input/resources/cursor_movement.rs
deleted file mode 100644
index 1784236f..00000000
--- a/crates/shared/src/simulation/input/resources/cursor_movement.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use bevy::ecs::prelude::Resource;
-use bevy::math::{DVec2, Vec2};
-
-#[derive(Debug, Resource, Default)]
-pub struct CursorMovement {
-    mouse_delta: DVec2,
-    scroll_delta: Vec2,
-}
-
-impl CursorMovement {
-    pub fn adjust_mouse_delta(&mut self, delta: DVec2) {
-        self.mouse_delta += delta;
-    }
-
-    pub fn adjust_scroll_delta(&mut self, delta: Vec2) {
-        self.scroll_delta += delta;
-    }
-
-    pub fn reset_deltas(&mut self) {
-        self.mouse_delta = DVec2::ZERO;
-        self.scroll_delta = Vec2::ZERO;
-    }
-
-    pub fn get_mouse_delta(&self) -> DVec2 {
-        self.mouse_delta
-    }
-
-    pub fn get_scroll_delta(&self) -> Vec2 {
-        self.scroll_delta
-    }
-}
diff --git a/crates/shared/src/simulation/input/resources/input_action_map.rs b/crates/shared/src/simulation/input/resources/input_action_map.rs
deleted file mode 100644
index 605e4f48..00000000
--- a/crates/shared/src/simulation/input/resources/input_action_map.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use crate::simulation::input::types::simulation_action::SimulationAction;
-use bevy::ecs::prelude::Resource;
-use bevy::prelude::{KeyCode, MouseButton};
-use std::collections::hash_map::{HashMap, Iter};
-
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)]
-pub enum Input {
-    Key(KeyCode),
-    MouseButton(MouseButton),
-}
-
-/// A map from input keys to an action. Set as a resource
-/// which means it can be configured by systems at runtime.
-#[derive(Debug, Resource)]
-pub struct InputActionMapResource {
-    bindings: HashMap<Input, SimulationAction>,
-}
-
-impl InputActionMapResource {
-    /// Gets the game action associated with a given input, if one exists.
-    pub fn get_action(&self, input: &Input) -> Option<&SimulationAction> {
-        self.bindings.get(input)
-    }
-
-    /// Provides an iterator over all the currently configured input bindings.
-    pub fn iter<'a>(&'a self) -> Iter<'a, Input, SimulationAction> {
-        self.bindings.iter()
-    }
-}
-
-impl Default for InputActionMapResource {
-    fn default() -> Self {
-        Self {
-            bindings: HashMap::from([
-                // Core player movement
-                (Input::Key(KeyCode::KeyW), SimulationAction::MoveForward),
-                (Input::Key(KeyCode::KeyS), SimulationAction::MoveBackward),
-                (Input::Key(KeyCode::KeyA), SimulationAction::MoveLeft),
-                (Input::Key(KeyCode::KeyD), SimulationAction::MoveRight),
-                (Input::Key(KeyCode::ShiftLeft), SimulationAction::MoveFaster),
-                // Core player actions
-                (
-                    Input::MouseButton(MouseButton::Left),
-                    SimulationAction::BreakVoxel,
-                ),
-                (
-                    Input::MouseButton(MouseButton::Right),
-                    SimulationAction::PlaceVoxel,
-                ),
-                // Terrain gen
-                (
-                    Input::Key(KeyCode::KeyT),
-                    SimulationAction::CycleActiveTerrainGenerator,
-                ),
-                // Game time control
-                (
-                    Input::Key(KeyCode::ArrowRight),
-                    SimulationAction::JumpGameTimeForward,
-                ),
-                (
-                    Input::Key(KeyCode::ArrowLeft),
-                    SimulationAction::JumpGameTimeBackward,
-                ),
-                (Input::Key(KeyCode::Space), SimulationAction::PauseGameTime),
-                // Misc
-                (Input::Key(KeyCode::Escape), SimulationAction::TogglePause),
-                // Debug/analysis tools
-                (Input::Key(KeyCode::F1), SimulationAction::ToggleDiagnostics),
-                (
-                    Input::Key(KeyCode::KeyU),
-                    SimulationAction::ToggleDiagnostics,
-                ),
-                (
-                    Input::Key(KeyCode::F2),
-                    SimulationAction::ToggleOpaqueWireframeMode,
-                ),
-                (
-                    Input::Key(KeyCode::KeyO),
-                    SimulationAction::ToggleOpaqueWireframeMode,
-                ),
-                (
-                    Input::Key(KeyCode::F3),
-                    SimulationAction::ToggleChunkBorders,
-                ),
-                (
-                    Input::Key(KeyCode::KeyB),
-                    SimulationAction::ToggleChunkBorders,
-                ),
-                // Showcase actions
-                (Input::Key(KeyCode::Digit0), SimulationAction::Showcase0),
-                (Input::Key(KeyCode::Digit1), SimulationAction::Showcase1),
-                (Input::Key(KeyCode::Digit2), SimulationAction::Showcase2),
-                (Input::Key(KeyCode::Digit3), SimulationAction::Showcase3),
-                (Input::Key(KeyCode::Digit4), SimulationAction::Showcase4),
-                (Input::Key(KeyCode::Digit5), SimulationAction::Showcase5),
-                (Input::Key(KeyCode::Digit6), SimulationAction::Showcase6),
-                (Input::Key(KeyCode::Digit7), SimulationAction::Showcase7),
-                (Input::Key(KeyCode::Digit8), SimulationAction::Showcase8),
-                (Input::Key(KeyCode::Digit9), SimulationAction::Showcase9),
-            ]),
-        }
-    }
-}
diff --git a/crates/shared/src/simulation/input/resources/mod.rs b/crates/shared/src/simulation/input/resources/mod.rs
deleted file mode 100644
index 07f8dfa4..00000000
--- a/crates/shared/src/simulation/input/resources/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod action;
-pub mod cursor_movement;
-pub mod input_action_map;
-
-pub use action::ActionStateResource;
-pub use cursor_movement::CursorMovement;
-pub use input_action_map::{Input, InputActionMapResource};
diff --git a/crates/shared/src/simulation/input/types/mod.rs b/crates/shared/src/simulation/input/types/mod.rs
deleted file mode 100644
index fd4acfdb..00000000
--- a/crates/shared/src/simulation/input/types/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod simulation_action;
-pub use simulation_action::SimulationAction;
diff --git a/crates/shared/src/simulation/input/types/simulation_action.rs b/crates/shared/src/simulation/input/types/simulation_action.rs
deleted file mode 100644
index 723fe2c4..00000000
--- a/crates/shared/src/simulation/input/types/simulation_action.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-/// Defines
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)]
-pub enum SimulationAction {
-    // Core player movement
-    MoveForward,
-    MoveBackward,
-    MoveLeft,
-    MoveRight,
-    MoveFaster,
-
-    // Core player interaction
-    BreakVoxel,
-    PlaceVoxel,
-
-    // Terrain interactions
-    CycleActiveTerrainGenerator,
-
-    // Time control interactions
-    JumpGameTimeForward,
-    JumpGameTimeBackward,
-    PauseGameTime,
-
-    // Misc
-    ToggleDiagnostics,
-    ToggleOpaqueWireframeMode,
-    ToggleChunkBorders,
-    TogglePause,
-
-    // Showcase actions
-    Showcase1,
-    Showcase2,
-    Showcase3,
-    Showcase4,
-    Showcase5,
-    Showcase6,
-    Showcase7,
-    Showcase8,
-    Showcase9,
-    Showcase0, // personal reset to flat
-}
diff --git a/crates/shared/src/simulation/mod.rs b/crates/shared/src/simulation/mod.rs
deleted file mode 100644
index 1b818490..00000000
--- a/crates/shared/src/simulation/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod asset;
-pub mod biome;
-pub mod block;
-pub mod chunk;
-pub mod input;
-pub mod player;
-pub mod scheduling;
-pub mod terrain;
-pub mod time;
diff --git a/crates/shared/src/simulation/player/actions/mod.rs b/crates/shared/src/simulation/player/actions/mod.rs
deleted file mode 100644
index bb400f1d..00000000
--- a/crates/shared/src/simulation/player/actions/mod.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-pub mod voxel;
-
-pub use voxel::*;
-
-// INFO: -------------------------------
-//         actions module plugin
-// -------------------------------------
-
-use crate::simulation::{
-    input::resources::ActionStateResource, input::types::simulation_action::SimulationAction,
-};
-use bevy::app::{App, FixedUpdate, Plugin, Update};
-use bevy::ecs::{message::Messages, schedule::IntoScheduleConfigs, system::Res};
-
-pub struct ActionPlugin;
-
-impl Plugin for ActionPlugin {
-    fn build(&self, app: &mut App) {
-        // update targeted block
-        app.add_systems(
-            FixedUpdate,
-            voxel::update_target_voxel::update_targeted_block_system,
-        );
-
-        // break voxel on click
-        app.init_resource::<Messages<voxel::break_targeted_voxel::BreakVoxelEvent>>()
-            .add_systems(
-                Update,
-                (
-                    voxel::break_targeted_voxel::handle_break_voxel_events_system,
-                    voxel::break_targeted_voxel::break_targeted_voxel_system.run_if(
-                        |action_state: Res<ActionStateResource>| {
-                            action_state.just_happened(SimulationAction::BreakVoxel)
-                        },
-                    ),
-                ),
-            );
-
-        // add voxel on right click
-        app.init_resource::<Messages<voxel::place_voxel_at_target::PlaceVoxelEvent>>()
-            .add_systems(
-                Update,
-                (
-                    voxel::place_voxel_at_target::handle_place_voxel_events_system,
-                    voxel::place_voxel_at_target::place_targeted_voxel_system.run_if(
-                        |action_state: Res<ActionStateResource>| {
-                            action_state.just_happened(SimulationAction::PlaceVoxel)
-                        },
-                    ),
-                ),
-            );
-    }
-}
diff --git a/crates/shared/src/simulation/player/actions/voxel/break_targeted_voxel.rs b/crates/shared/src/simulation/player/actions/voxel/break_targeted_voxel.rs
deleted file mode 100644
index e1b22286..00000000
--- a/crates/shared/src/simulation/player/actions/voxel/break_targeted_voxel.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use crate::prelude::*;
-use crate::simulation::block::TargetedBlock;
-use crate::simulation::chunk::ChunkStateManager;
-use crate::simulation::{
-    block::block_registry::AIR_BLOCK_ID,
-    chunk::{
-        CHUNK_SIDE_LENGTH,
-        components::{ChunkBlocksComponent, ChunkCoord, ChunkMeshDirty},
-    },
-};
-use bevy::ecs::prelude::{Commands, Message, MessageReader, Query};
-use bevy::ecs::prelude::{MessageWriter, Res};
-
-/// An event that is sent when a voxel should be broken.
-#[derive(Message, Clone)]
-pub struct BreakVoxelEvent {
-    /// The world position of the voxel to break.
-    pub world_pos: IVec3,
-}
-
-/// Fires a `BreakVoxelEvent` for the currently targeted block.
-pub fn break_targeted_voxel_system(
-    targeted_block: Res<TargetedBlock>,
-    mut break_voxel_writer: MessageWriter<BreakVoxelEvent>,
-) {
-    if let Some(voxel_pos) = targeted_block.position {
-        break_voxel_writer.write(BreakVoxelEvent {
-            world_pos: voxel_pos,
-        });
-    }
-}
-
-/// A system that handles the `BreakVoxelEvent`.
-pub fn handle_break_voxel_events_system(
-    // input
-    mut events: MessageReader<BreakVoxelEvent>,
-    chunk_manager: Res<ChunkStateManager>,
-
-    // output
-    mut chunks: Query<&mut ChunkBlocksComponent>,
-    mut commands: Commands,
-) {
-    for event in events.read() {
-        let chunk_pos = ChunkCoord::world_to_chunk_pos(event.world_pos.as_vec3());
-
-        if let Some(entity) = chunk_manager.get_entity(chunk_pos)
-            && let Ok(mut chunk_blocks) = chunks.get_mut(entity)
-        {
-            let local_pos = event.world_pos - (chunk_pos * CHUNK_SIDE_LENGTH as i32);
-
-            let mut writer = chunk_blocks.get_writer();
-            writer.set_data(
-                local_pos.x as usize,
-                local_pos.y as usize,
-                local_pos.z as usize,
-                AIR_BLOCK_ID,
-            );
-
-            // mark the primary chunk as dirty
-            commands.entity(entity).insert(ChunkMeshDirty);
-
-            // mark any neighbors as dirty if we are on the edge
-            let max_idx = (CHUNK_SIDE_LENGTH - 1) as i32;
-            let mut neighbor_coords_to_dirty = Vec::with_capacity(3);
-
-            if local_pos.x == 0 {
-                neighbor_coords_to_dirty.push(chunk_pos - IVec3::X);
-            } else if local_pos.x == max_idx {
-                neighbor_coords_to_dirty.push(chunk_pos + IVec3::X);
-            }
-
-            if local_pos.y == 0 {
-                neighbor_coords_to_dirty.push(chunk_pos - IVec3::Y);
-            } else if local_pos.y == max_idx {
-                neighbor_coords_to_dirty.push(chunk_pos + IVec3::Y);
-            }
-
-            if local_pos.z == 0 {
-                neighbor_coords_to_dirty.push(chunk_pos - IVec3::Z);
-            } else if local_pos.z == max_idx {
-                neighbor_coords_to_dirty.push(chunk_pos + IVec3::Z);
-            }
-
-            for neighbor_coord in neighbor_coords_to_dirty {
-                if let Some(neighbor_entity) = chunk_manager.get_entity(neighbor_coord) {
-                    commands.entity(neighbor_entity).insert(ChunkMeshDirty);
-                }
-            }
-        }
-    }
-}
diff --git a/crates/shared/src/simulation/player/actions/voxel/mod.rs b/crates/shared/src/simulation/player/actions/voxel/mod.rs
deleted file mode 100644
index f41e86e4..00000000
--- a/crates/shared/src/simulation/player/actions/voxel/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod break_targeted_voxel;
-pub mod place_voxel_at_target;
-pub mod update_target_voxel;
-
-pub use break_targeted_voxel::break_targeted_voxel_system;
-pub use update_target_voxel::update_targeted_block_system;
diff --git a/crates/shared/src/simulation/player/actions/voxel/place_voxel_at_target.rs b/crates/shared/src/simulation/player/actions/voxel/place_voxel_at_target.rs
deleted file mode 100644
index 409d671a..00000000
--- a/crates/shared/src/simulation/player/actions/voxel/place_voxel_at_target.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use crate::prelude::*;
-use crate::simulation::block::TargetedBlock;
-use crate::simulation::chunk::ChunkStateManager;
-use crate::simulation::{
-    block::block_registry::SOLID_BLOCK_ID,
-    chunk::{
-        CHUNK_SIDE_LENGTH,
-        components::{ChunkBlocksComponent, ChunkCoord, ChunkMeshDirty},
-    },
-};
-use bevy::ecs::prelude::{Commands, Message, MessageReader, Query};
-use bevy::ecs::prelude::{MessageWriter, Res};
-
-/// An event that is sent when a voxel should be placed.
-#[derive(Message, Clone)]
-pub struct PlaceVoxelEvent {
-    /// The world position to place a voxel.
-    pub target_pos: IVec3,
-}
-
-/// Fires a `PlaceVoxelEvent` for the currently targeted block.
-pub fn place_targeted_voxel_system(
-    targeted_block: Res<TargetedBlock>,
-    mut place_voxel_writer: MessageWriter<PlaceVoxelEvent>,
-) {
-    if let (Some(voxel_pos), Some(normal)) = (targeted_block.position, targeted_block.normal) {
-        place_voxel_writer.write(PlaceVoxelEvent {
-            target_pos: voxel_pos + normal,
-        });
-    }
-}
-
-/// A system that handles the `PlaceVoxelEvent`.
-pub fn handle_place_voxel_events_system(
-    // input
-    mut events: MessageReader<PlaceVoxelEvent>,
-    chunk_manager: Res<ChunkStateManager>,
-
-    // output
-    mut chunks: Query<&mut ChunkBlocksComponent>,
-    mut commands: Commands,
-) {
-    for event in events.read() {
-        let new_block_pos = event.target_pos;
-        let chunk_pos = ChunkCoord::world_to_chunk_pos(new_block_pos.as_vec3());
-
-        if let Some(entity) = chunk_manager.get_entity(chunk_pos)
-            && let Ok(mut chunk_blocks) = chunks.get_mut(entity)
-        {
-            let local_pos = new_block_pos - (chunk_pos * CHUNK_SIDE_LENGTH as i32);
-
-            let mut writer = chunk_blocks.get_writer();
-            writer.set_data(
-                local_pos.x as usize,
-                local_pos.y as usize,
-                local_pos.z as usize,
-                SOLID_BLOCK_ID,
-            );
-
-            // mark primary chunk as dirty
-            commands.entity(entity).insert(ChunkMeshDirty);
-
-            // mark any neighbors as dirty if relevant
-            let max_idx = (CHUNK_SIDE_LENGTH - 1) as i32;
-            let mut neighbor_coords_to_dirty = Vec::with_capacity(3);
-
-            if local_pos.x == 0 {
-                neighbor_coords_to_dirty.push(chunk_pos - IVec3::X);
-            } else if local_pos.x == max_idx {
-                neighbor_coords_to_dirty.push(chunk_pos + IVec3::X);
-            }
-
-            if local_pos.y == 0 {
-                neighbor_coords_to_dirty.push(chunk_pos - IVec3::Y);
-            } else if local_pos.y == max_idx {
-                neighbor_coords_to_dirty.push(chunk_pos + IVec3::Y);
-            }
-
-            if local_pos.z == 0 {
-                neighbor_coords_to_dirty.push(chunk_pos - IVec3::Z);
-            } else if local_pos.z == max_idx {
-                neighbor_coords_to_dirty.push(chunk_pos + IVec3::Z);
-            }
-
-            for neighbor_coord in neighbor_coords_to_dirty {
-                if let Some(neighbor_entity) = chunk_manager.get_entity(neighbor_coord) {
-                    commands.entity(neighbor_entity).insert(ChunkMeshDirty);
-                }
-            }
-        }
-    }
-}
diff --git a/crates/shared/src/simulation/player/initialize_camera.rs b/crates/shared/src/simulation/player/initialize_camera.rs
deleted file mode 100644
index 8790c828..00000000
--- a/crates/shared/src/simulation/player/initialize_camera.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use crate::{
-    prelude::*,
-    simulation::chunk::{CHUNK_SIDE_LENGTH, ChunkCoord},
-};
-use bevy::ecs::prelude::*;
-use bevy::prelude::{Camera3d, PerspectiveProjection, Projection, Transform, Vec3};
-
-const DEFAULT_CAMERA_STARTING_X: f32 = (CHUNK_SIDE_LENGTH / 2) as f32;
-const DEFAULT_CAMERA_STARTING_Y: f32 = 64.0;
-const DEFAULT_CAMERA_STARTING_Z: f32 = (CHUNK_SIDE_LENGTH / 2) as f32;
-
-/// A system that spawns the initial player camera.
-pub fn spawn_camera_system(mut commands: Commands) {
-    info!("Spawning default graphics camera.");
-
-    let start_position = Vec3::new(
-        DEFAULT_CAMERA_STARTING_X,
-        DEFAULT_CAMERA_STARTING_Y,
-        DEFAULT_CAMERA_STARTING_Z,
-    );
-
-    let start_chunk = ChunkCoord::world_to_chunk_pos(start_position);
-
-    commands.spawn((
-        Camera3d::default(),
-        Projection::Perspective(PerspectiveProjection {
-            fov: 45.0f32.to_radians(),
-            near: 1.0,
-            far: f32::INFINITY,
-            ..Default::default()
-        }),
-        Transform::from_translation(start_position),
-        ChunkCoord { pos: start_chunk },
-    ));
-}
diff --git a/crates/shared/src/simulation/player/mod.rs b/crates/shared/src/simulation/player/mod.rs
deleted file mode 100644
index 63992b62..00000000
--- a/crates/shared/src/simulation/player/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod actions;
-pub mod initialize_camera;
diff --git a/crates/shared/src/simulation/terrain/generators/climate/lib/climate_buffer_pool.rs b/crates/shared/src/simulation/terrain/generators/climate/lib/climate_buffer_pool.rs
deleted file mode 100644
index 502898d1..00000000
--- a/crates/shared/src/simulation/terrain/generators/climate/lib/climate_buffer_pool.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use crate::simulation::chunk::CHUNK_SIDE_LENGTH;
-use std::cell::RefCell;
-
-/// A thread-local pool of buffers to prevent re-allocating buffers every chunk.
-pub struct ClimateBufferPool {
-    pub temperature: Vec<f32>,
-    pub precipitation: Vec<f32>,
-    pub continentalness: Vec<f32>,
-    pub erosion: Vec<f32>,
-    pub weirdness: Vec<f32>,
-}
-
-impl Default for ClimateBufferPool {
-    fn default() -> Self {
-        let cap = CHUNK_SIDE_LENGTH * CHUNK_SIDE_LENGTH;
-        Self {
-            temperature: vec![0.0; cap],
-            precipitation: vec![0.0; cap],
-            continentalness: vec![0.0; cap],
-            erosion: vec![0.0; cap],
-            weirdness: vec![0.0; cap],
-        }
-    }
-}
-
-impl ClimateBufferPool {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Resizes buffers if needed (e.g. LOD change) without re-allocating if capacity allows.
-    pub fn prepare(&mut self, size: usize) {
-        let len = size * size;
-        // TODO: perhaps use less safe set_len for speed gains instead of resize
-        if self.temperature.len() < len {
-            self.temperature.resize(len, 0.0);
-            self.precipitation.resize(len, 0.0);
-            self.continentalness.resize(len, 0.0);
-            self.erosion.resize(len, 0.0);
-            self.weirdness.resize(len, 0.0);
-        }
-    }
-}
-
-thread_local! {
-    pub static CLIMATE_BUFFERS: RefCell<ClimateBufferPool> = RefCell::new(ClimateBufferPool::new());
-}
diff --git a/crates/shared/src/simulation/time/mod.rs b/crates/shared/src/simulation/time/mod.rs
deleted file mode 100644
index 21bf85e1..00000000
--- a/crates/shared/src/simulation/time/mod.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-pub mod frame_clock;
-pub mod simulation_tick;
-pub mod world_clock;
-
-pub use frame_clock::FrameClock;
-pub use world_clock::WorldClockResource;
-use world_clock::{jump_world_clock_backwards_system, jump_world_clock_forward_system};
-
-// INFO: ---------------------
-//         Time plugin
-// ---------------------------
-
-use crate::simulation::{
-    input::{resources::ActionStateResource, types::simulation_action::SimulationAction},
-    time::{
-        frame_clock::update_frame_clock_system, simulation_tick::SimulationTick,
-        simulation_tick::run_fixed_update_schedule, world_clock::update_world_clock_system,
-    },
-};
-use crate::state::SimulationState;
-use bevy::{
-    app::{App, FixedUpdate, Plugin, PreUpdate, Update},
-    ecs::prelude::*,
-    state::condition::in_state,
-};
-
-pub struct TimeControlPlugin;
-
-impl Plugin for TimeControlPlugin {
-    fn build(&self, app: &mut App) {
-        // Maintain a clock that tracks frame time and provides timing info
-        app.insert_resource(FrameClock::default()).add_systems(
-            PreUpdate,
-            (update_frame_clock_system).run_if(in_state(SimulationState::Running)),
-        );
-
-        // Trigger the simulation ticks when appropriate
-        app.insert_resource(SimulationTick::default()).add_systems(
-            Update,
-            run_fixed_update_schedule.run_if(in_state(SimulationState::Running)),
-        );
-
-        // Maintain world clock that depends on ticks rather that frames
-        app.insert_resource(WorldClockResource::default())
-            .add_systems(FixedUpdate, update_world_clock_system);
-
-        // controls for world clock
-        app.add_systems(
-            Update,
-            (
-                jump_world_clock_backwards_system.run_if(
-                    |action_state: Res<ActionStateResource>| {
-                        action_state.just_happened(SimulationAction::JumpGameTimeBackward)
-                    },
-                ),
-                jump_world_clock_forward_system.run_if(|action_state: Res<ActionStateResource>| {
-                    action_state.just_happened(SimulationAction::JumpGameTimeForward)
-                }),
-            ),
-        );
-    }
-}
diff --git a/crates/shared/src/simulation/time/simulation_tick.rs b/crates/shared/src/simulation/time/simulation_tick.rs
deleted file mode 100644
index 7a71c305..00000000
--- a/crates/shared/src/simulation/time/simulation_tick.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use crate::{prelude::*, simulation::time::FrameClock};
-use bevy::app::FixedUpdate;
-use bevy::ecs::prelude::*;
-use std::time::Duration;
-
-#[derive(Resource, Debug)]
-pub struct SimulationTick {
-    pub tick: u64,
-
-    pub tick_rate: f32,
-    pub tick_duration: Duration,
-}
-
-impl Default for SimulationTick {
-    fn default() -> Self {
-        let tick_rate = 16.0;
-        let tick_duration = Duration::from_secs_f32(1.0 / tick_rate);
-        SimulationTick {
-            tick: 0,
-            tick_rate,
-            tick_duration,
-        }
-    }
-}
-
-/// An exclusive system that updates the simulation tick and runs
-/// the fixed update schedule if a tick has come.
-#[instrument(skip_all)]
-pub fn run_fixed_update_schedule(world: &mut World) {
-    let tick_duration = world.resource::<SimulationTick>().tick_duration;
-
-    while world.resource::<FrameClock>().accumulator >= tick_duration {
-        world
-            .resource_mut::<FrameClock>()
-            .decrement_accumulator_tick(tick_duration);
-
-        world.resource_mut::<SimulationTick>().tick += 1;
-
-        world.run_schedule(FixedUpdate);
-    }
-
-    // calculate interpolation alpha after processing fixed updates
-    let mut frame_clock = world.resource_mut::<FrameClock>();
-    let alpha = frame_clock.accumulator.as_secs_f32() / tick_duration.as_secs_f32();
-    frame_clock.alpha = alpha;
-}
diff --git a/crates/shared/src/state/enums.rs b/crates/shared/src/state/enums.rs
deleted file mode 100644
index 95803130..00000000
--- a/crates/shared/src/state/enums.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use bevy::prelude::{Resource, States};
-
-/// A state representing whether the server simulation is currently loading, paused or executing.
-#[derive(States, Resource, Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
-pub enum SimulationState {
-    #[default]
-    Loading,
-    Running,
-    Paused,
-}
diff --git a/crates/shared/src/state/lifecycle.rs b/crates/shared/src/state/lifecycle.rs
deleted file mode 100644
index a9660004..00000000
--- a/crates/shared/src/state/lifecycle.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::load::{
-    OnLoadComplete, master_finalize_loading_system, poll_simulation_loading_tasks,
-    reset_loading_tracker_system, start_fake_work_system,
-};
-use crate::state::SimulationState;
-use bevy::prelude::{
-    App, AppExtStates, IntoScheduleConfigs, OnExit, Plugin, Startup, Update, in_state,
-};
-
-pub struct SimulationLifecyclePlugin;
-
-/// A plugin for the simulation world that sets up the necessary
-/// systems for handling the application lifecycle. This primarily
-/// involves orchestration of loading tasks and state transitions.
-impl Plugin for SimulationLifecyclePlugin {
-    fn build(&self, app: &mut App) {
-        // INFO: -----------------------
-        //         async loading
-        // -----------------------------
-
-        // polling systems and tracking load state
-        app.add_systems(
-            Update,
-            (poll_simulation_loading_tasks.run_if(in_state(SimulationState::Loading)),),
-        );
-
-        // load cleanup to run after transitions
-        app.add_systems(
-            OnExit(SimulationState::Loading),
-            reset_loading_tracker_system,
-        );
-
-        // systems to ensure rigidity
-        app.add_systems(Startup, start_fake_work_system);
-
-        // INFO: ---------------------------
-        //         state transitions
-        // ---------------------------------
-        app.init_state::<SimulationState>();
-
-        app.add_systems(
-            Update,
-            (master_finalize_loading_system::<SimulationState>,)
-                .run_if(in_state(SimulationState::Loading)),
-        );
-
-        // initial startup loading state should take us from loading
-        // to running/playing once they finish.
-        app.insert_resource(OnLoadComplete::new(SimulationState::Running));
-    }
-}
diff --git a/crates/shared/src/state/mod.rs b/crates/shared/src/state/mod.rs
deleted file mode 100644
index a3166d1c..00000000
--- a/crates/shared/src/state/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod enums;
-pub mod lifecycle;
-
-pub use enums::SimulationState;
-pub use lifecycle::SimulationLifecyclePlugin;
diff --git a/crates/shared/src/simulation/time/frame_clock.rs b/crates/shared/src/time/frame_clock.rs
similarity index 98%
rename from crates/shared/src/simulation/time/frame_clock.rs
rename to crates/shared/src/time/frame_clock.rs
index f94bb50f..8ba4e2f1 100644
--- a/crates/shared/src/simulation/time/frame_clock.rs
+++ b/crates/shared/src/time/frame_clock.rs
@@ -5,7 +5,7 @@ use std::time::{Duration, Instant};
 const FPS_SMOOTHING_FACTOR: f32 = 0.025;
 
 // INFO: ------------------------
-//         Clock resource
+//         clock resource
 // ------------------------------
 
 /// A resource that tracks frame timing information.
@@ -87,7 +87,7 @@ impl FrameClock {
 }
 
 // INFO: -----------------------
-//         Update system
+//         update system
 // -----------------------------
 
 /// A system that updates the `FrameClock` resource every frame.
diff --git a/crates/shared/src/time/mod.rs b/crates/shared/src/time/mod.rs
new file mode 100644
index 00000000..fadb9d50
--- /dev/null
+++ b/crates/shared/src/time/mod.rs
@@ -0,0 +1,33 @@
+mod frame_clock;
+mod world_clock;
+
+pub use frame_clock::FrameClock;
+pub use world_clock::{SECONDS_IN_A_DAY, WorldClockResource};
+
+/// Const for configuration of fixed update tick rate
+pub const TICKS_PER_SECOND: f64 = 20.0;
+
+// INFO: ---------------------
+//         time plugin
+// ---------------------------
+
+use crate::time::{frame_clock::update_frame_clock_system, world_clock::update_world_clock_system};
+use bevy::{
+    app::{App, FixedUpdate, Plugin, Update},
+    time::{Fixed, Time},
+};
+
+pub struct TimeControlPlugin;
+
+impl Plugin for TimeControlPlugin {
+    fn build(&self, app: &mut App) {
+        // configure bevy fixed update tick rate
+        app.insert_resource(Time::<Fixed>::from_hz(TICKS_PER_SECOND));
+
+        app.insert_resource(WorldClockResource::default())
+            .add_systems(FixedUpdate, update_world_clock_system);
+
+        app.insert_resource(FrameClock::default())
+            .add_systems(Update, update_frame_clock_system);
+    }
+}
diff --git a/crates/shared/src/simulation/time/world_clock.rs b/crates/shared/src/time/world_clock.rs
similarity index 92%
rename from crates/shared/src/simulation/time/world_clock.rs
rename to crates/shared/src/time/world_clock.rs
index fb3244f4..6c6f319b 100644
--- a/crates/shared/src/simulation/time/world_clock.rs
+++ b/crates/shared/src/time/world_clock.rs
@@ -1,11 +1,11 @@
 use crate::prelude::*;
-use crate::simulation::time::simulation_tick::SimulationTick;
-use bevy::ecs::prelude::*;
+use bevy::prelude::*;
 use std::time::Duration;
 
 /// Number of seconds it takes for a day/night cycle to complete
 pub const SECONDS_IN_A_DAY: f32 = 600.0;
 /// number of seconds to jump when using jump forward/backward commands
+#[allow(dead_code)]
 const JUMP_CLOCK_DISTANCE: f32 = 30.0;
 
 /// A resource that tracks the in-game date and time.
@@ -40,16 +40,15 @@ impl WorldClockResource {
 //         update world clock
 // ----------------------------------
 
-/// A system that runs every tick to advance the in-game calendar.
+/// A system that runs every fixed tick to advance the in-game calendar.
 #[instrument(skip_all)]
 pub fn update_world_clock_system(
     // Input
-    sim_tick: Res<SimulationTick>,
-
+    time: Res<Time<Fixed>>,
     // Output
     mut world_clock: ResMut<WorldClockResource>,
 ) {
-    world_clock.time_of_day += sim_tick.tick_duration;
+    world_clock.time_of_day += time.delta();
 
     if world_clock.time_of_day >= world_clock.day_duration {
         let day_dur = world_clock.day_duration;
@@ -62,6 +61,7 @@ pub fn update_world_clock_system(
 ///
 /// Should run before update_world_clock_system
 #[instrument(skip_all)]
+#[allow(dead_code)]
 pub fn jump_world_clock_forward_system(
     // Output
     mut world_clock: ResMut<WorldClockResource>,
@@ -79,6 +79,7 @@ pub fn jump_world_clock_forward_system(
 ///
 /// Should run before update_world_clock_system
 #[instrument(skip_all)]
+#[allow(dead_code)]
 pub fn jump_world_clock_backwards_system(
     // Output
     mut world_clock: ResMut<WorldClockResource>,
diff --git a/crates/shared/src/simulation/biome/biome_definition.rs b/crates/shared/src/world/biome/biome_definition.rs
similarity index 95%
rename from crates/shared/src/simulation/biome/biome_definition.rs
rename to crates/shared/src/world/biome/biome_definition.rs
index bd2cf24b..11ed58c6 100644
--- a/crates/shared/src/simulation/biome/biome_definition.rs
+++ b/crates/shared/src/world/biome/biome_definition.rs
@@ -11,7 +11,7 @@ pub fn load_biome_from_str(ron_string: &str) -> Result<BiomeDefinition, ron::Err
 }
 
 // INFO: -------------------------------------
-//         The biome struct definition
+//         the biome struct definition
 // -------------------------------------------
 
 #[derive(Asset, TypePath, Debug, Clone, Deserialize)]
@@ -37,7 +37,7 @@ mod raw {
     use super::*;
 
     // INFO: -----------------------------------------------
-    //         Raw deserialization struct definition
+    //         raw deserialization struct definition
     // -----------------------------------------------------
 
     #[derive(Deserialize, Debug)]
@@ -68,7 +68,7 @@ mod raw {
     }
 
     // INFO: ----------------------------------------------------------------
-    //         Conversion from raw struct to concrete BiomeDefinition
+    //         conversion from raw struct to concrete BiomeDefinition
     // ----------------------------------------------------------------------
 
     impl From<raw::BiomeDefinition> for super::BiomeDefinition {
diff --git a/crates/shared/src/simulation/biome/biome_registry.rs b/crates/shared/src/world/biome/biome_registry.rs
similarity index 76%
rename from crates/shared/src/simulation/biome/biome_registry.rs
rename to crates/shared/src/world/biome/biome_registry.rs
index 2010bc6a..3990c161 100644
--- a/crates/shared/src/simulation/biome/biome_registry.rs
+++ b/crates/shared/src/world/biome/biome_registry.rs
@@ -1,11 +1,14 @@
+use crate::lifecycle::load::{LoadBiomes, NodeCompleted, StartNode};
 use crate::{
+    lifecycle::PersistentPathsResource,
     prelude::*,
-    simulation::biome::biome_definition::{BiomeDefinition, load_biome_from_str},
+    world::biome::biome_definition::{BiomeDefinition, load_biome_from_str},
 };
 use bevy::asset::AssetServer;
-use bevy::ecs::prelude::*;
+use bevy::ecs::world::CommandQueue;
+use bevy::prelude::*;
+use bevy::tasks::AsyncComputeTaskPool;
 use std::{collections::HashMap, sync::Arc};
-use utils::PersistentPaths;
 
 pub type BiomeId = u8;
 
@@ -18,16 +21,6 @@ pub struct BiomeRegistryResource {
     name_to_id: Arc<HashMap<String, BiomeId>>,
 }
 
-impl FromWorld for BiomeRegistryResource {
-    fn from_world(world: &mut World) -> Self {
-        let persistent_paths = world
-            .get_resource::<PersistentPaths>()
-            .cloned()
-            .unwrap_or_else(PersistentPaths::resolve);
-        Self::load_from_disk(&persistent_paths)
-    }
-}
-
 impl BiomeRegistryResource {
     /// Gets the definition for a given biome ID (u8).
     ///
@@ -67,7 +60,7 @@ impl BiomeRegistryResource {
     }
 
     /// Internal util to load all biome from disk into a new registry instance.
-    fn load_from_disk(persistent_paths: &PersistentPaths) -> Self {
+    pub fn load_from_disk(persistent_paths: &PersistentPaths) -> Self {
         info!("Loading biome definitions from disk...");
 
         let mut biome_definitions: Vec<BiomeDefinition> = Vec::new();
@@ -141,6 +134,41 @@ impl BiomeRegistryResource {
     }
 }
 
+/// An asynchronous loading observer for the biome registry.
+///
+/// This is triggered when the biome loading node is ready to begin.
+pub fn load_biome_registry(
+    trigger: On<StartNode>,
+    mut commands: Commands,
+    persistent_paths: Res<PersistentPathsResource>,
+    existing: Option<Res<BiomeRegistryResource>>,
+) {
+    if existing.is_some() {
+        debug!("BiomeRegistry already exists, skipping I/O.");
+        commands.trigger(NodeCompleted::of::<LoadBiomes>());
+        return;
+    }
+
+    let paths = persistent_paths.0.clone();
+    let node_entity = trigger.0.entity();
+
+    let task = AsyncComputeTaskPool::get().spawn(async move {
+        let biome_registry = BiomeRegistryResource::load_from_disk(&paths);
+
+        let mut queue = CommandQueue::default();
+        queue.push(move |world: &mut World| {
+            world.insert_resource(biome_registry);
+            world.trigger(NodeCompleted::of::<LoadBiomes>());
+        });
+        queue
+    });
+
+    // Spawn the task as a child of the node entity
+    commands.entity(node_entity).with_children(|parent| {
+        parent.spawn(LoadingTaskComponent(task));
+    });
+}
+
 // INFO: ------------------------------
 //         System to load files
 // ------------------------------------
@@ -151,7 +179,7 @@ impl BiomeRegistryResource {
 pub fn initialize_biome_registry_system(
     mut commands: Commands,
     _asset_server: Res<AssetServer>,
-    persistent_paths: Res<PersistentPaths>,
+    persistent_paths: Res<PersistentPathsResource>,
 ) {
     let registry = BiomeRegistryResource::load_from_disk(&persistent_paths);
     commands.insert_resource(registry);
diff --git a/crates/shared/src/world/biome/mod.rs b/crates/shared/src/world/biome/mod.rs
new file mode 100644
index 00000000..66f89cf2
--- /dev/null
+++ b/crates/shared/src/world/biome/mod.rs
@@ -0,0 +1,25 @@
+pub mod biome_definition;
+pub mod biome_registry;
+
+pub use biome_definition::BiomeDefinition;
+pub use biome_registry::{BiomeId, BiomeRegistryResource};
+
+// INFO: ----------------------
+//         biome plugin
+// ----------------------------
+
+use crate::{
+    lifecycle::load::{AppStartupLoadingPhase, LoadBiomes, LoadBlocks, LoadingAppExt},
+    world::biome::biome_registry::load_biome_registry,
+};
+use bevy::app::{App, Plugin};
+
+pub struct BiomePlugin;
+
+impl Plugin for BiomePlugin {
+    fn build(&self, app: &mut App) {
+        app.configure_loading_phase::<AppStartupLoadingPhase>()
+            .add_node(LoadBiomes, load_biome_registry)
+            .add_dependency(LoadBiomes, LoadBlocks);
+    }
+}
diff --git a/crates/shared/src/simulation/block/block_definition.rs b/crates/shared/src/world/block/block_definition.rs
similarity index 97%
rename from crates/shared/src/simulation/block/block_definition.rs
rename to crates/shared/src/world/block/block_definition.rs
index ea720555..0875280b 100644
--- a/crates/shared/src/simulation/block/block_definition.rs
+++ b/crates/shared/src/world/block/block_definition.rs
@@ -27,6 +27,7 @@ pub mod raw {
         pub is_transparent: bool,
     }
 
+    /// Parsed texture config with state for all six block sides
     pub struct ParsedTextureConfig {
         pub top: String,
         pub bottom: String,
diff --git a/crates/shared/src/simulation/block/block_registry.rs b/crates/shared/src/world/block/block_registry.rs
similarity index 65%
rename from crates/shared/src/simulation/block/block_registry.rs
rename to crates/shared/src/world/block/block_registry.rs
index dda0f5a1..4c95a2ff 100644
--- a/crates/shared/src/simulation/block/block_registry.rs
+++ b/crates/shared/src/world/block/block_registry.rs
@@ -1,11 +1,15 @@
+use crate::lifecycle::PersistentPathsResource;
+use crate::lifecycle::load::{LoadBlocks, NodeCompleted, StartNode};
 use crate::{
     prelude::*,
-    simulation::block::{BlockDescription, load_block_from_str},
+    world::block::{BlockDescription, load_block_from_str},
 };
 use bevy::ecs::prelude::*;
+use bevy::ecs::world::CommandQueue;
+use bevy::prelude::*;
+use bevy::tasks::AsyncComputeTaskPool;
 use std::collections::HashMap;
 use std::sync::Arc;
-use utils::PersistentPaths;
 
 pub type BlockId = u8;
 /// ID of the default "air" block.
@@ -13,7 +17,7 @@ pub const AIR_BLOCK_ID: BlockId = 0;
 /// ID of a default solid block guaranteed to exist (probably stone).
 pub const SOLID_BLOCK_ID: BlockId = 1;
 
-#[derive(Resource, Clone, Default)]
+#[derive(Resource, Clone)]
 pub struct BlockRegistry {
     /// Direct access to transparency data from BlockRenderData
     /// to optimize super hot loops (meshing).
@@ -61,15 +65,15 @@ impl BlockRegistry {
         let mut descriptions_vec: Vec<BlockDescription> = Vec::new();
         let mut name_to_id: HashMap<String, BlockId> = HashMap::new();
 
-        // INFO: ---------------------------------------
-        //          manual air block registration (ID 0)
-        // ---------------------------------------------
+        // INFO: ----------------------------------------------
+        //         manual air block registration (ID 0)
+        // ----------------------------------------------------
 
         let air_desc = BlockDescription {
             display_name: "Air".to_string(),
         };
 
-        let air_id = register_block(
+        let air_id = Self::register_block(
             "air".to_string(),
             true,
             air_desc,
@@ -94,9 +98,9 @@ impl BlockRegistry {
         descriptions_vec.push(placeholder_desc);
         name_to_id.insert("stone".to_string(), SOLID_BLOCK_ID);
 
-        // INFO: ------------------------------------------
+        // INFO: ----------------------------------------
         //         parse block from shared assets
-        // ------------------------------------------------
+        // ----------------------------------------------
 
         let mut stone_was_loaded = false;
         let full_path = persistent_paths.assets_dir.join("shared/block");
@@ -122,7 +126,7 @@ impl BlockRegistry {
                         && let Ok((render_props, desc_props)) = load_block_from_str(&ron_string)
                     {
                         if name == "stone" {
-                            register_block(
+                            Self::register_block(
                                 name.clone(),
                                 render_props.is_transparent,
                                 desc_props,
@@ -133,7 +137,7 @@ impl BlockRegistry {
                             );
                             stone_was_loaded = true;
                         } else {
-                            register_block(
+                            Self::register_block(
                                 name.clone(),
                                 render_props.is_transparent,
                                 desc_props,
@@ -171,38 +175,73 @@ impl BlockRegistry {
             name_to_id: Arc::new(name_to_id),
         }
     }
-}
 
-fn register_block(
-    name: String,
-    is_transparent: bool,
-    desc: BlockDescription,
-    force_id: Option<BlockId>,
-    transparency_vec: &mut Vec<bool>,
-    descriptions_vec: &mut Vec<BlockDescription>,
-    name_to_id: &mut HashMap<String, BlockId>,
-) -> BlockId {
-    // force id into slot
-    if let Some(target_id) = force_id {
-        let idx = target_id as usize;
-        if idx < transparency_vec.len() {
-            transparency_vec[idx] = is_transparent;
-            descriptions_vec[idx] = desc;
-            name_to_id.insert(name.to_lowercase(), target_id);
-            target_id
+    fn register_block(
+        name: String,
+        is_transparent: bool,
+        desc: BlockDescription,
+        force_id: Option<BlockId>,
+        transparency_vec: &mut Vec<bool>,
+        descriptions_vec: &mut Vec<BlockDescription>,
+        name_to_id: &mut HashMap<String, BlockId>,
+    ) -> BlockId {
+        // force id into slot
+        if let Some(target_id) = force_id {
+            let idx = target_id as usize;
+            if idx < transparency_vec.len() {
+                transparency_vec[idx] = is_transparent;
+                descriptions_vec[idx] = desc;
+                name_to_id.insert(name.to_lowercase(), target_id);
+                target_id
+            } else {
+                panic!(
+                    "Critical: Attempted to force block '{}' to ID {} but registry length is {}",
+                    name,
+                    target_id,
+                    transparency_vec.len()
+                );
+            }
         } else {
-            panic!(
-                "Critical: Attempted to force block '{}' to ID {} but registry length is {}",
-                name,
-                target_id,
-                transparency_vec.len()
-            );
+            let id = transparency_vec.len() as BlockId;
+            transparency_vec.push(is_transparent);
+            descriptions_vec.push(desc);
+            name_to_id.insert(name.to_lowercase(), id);
+            id
         }
-    } else {
-        let id = transparency_vec.len() as BlockId;
-        transparency_vec.push(is_transparent);
-        descriptions_vec.push(desc);
-        name_to_id.insert(name.to_lowercase(), id);
-        id
     }
 }
+
+/// An asynchronous loading observer for the block registry.
+///
+/// This is triggered when the block loading node is ready to begin.
+pub fn load_block_registry(
+    trigger: On<StartNode>,
+    mut commands: Commands,
+    persistent_paths: Res<PersistentPathsResource>,
+    existing: Option<Res<BlockRegistry>>,
+) {
+    if existing.is_some() {
+        debug!("BlockRegistry already exists, skipping I/O.");
+        commands.trigger(NodeCompleted::of::<LoadBlocks>());
+        return;
+    }
+
+    let paths = persistent_paths.0.clone();
+    let node_entity = trigger.0.entity();
+
+    let task = AsyncComputeTaskPool::get().spawn(async move {
+        let block_registry = BlockRegistry::load_from_disk(&paths);
+
+        let mut queue = CommandQueue::default();
+        queue.push(move |world: &mut World| {
+            world.insert_resource(block_registry);
+            world.trigger(NodeCompleted::of::<LoadBlocks>());
+        });
+        queue
+    });
+
+    // Spawn the task as a child of the node entity
+    commands.entity(node_entity).with_children(|parent| {
+        parent.spawn(LoadingTaskComponent(task));
+    });
+}
diff --git a/crates/shared/src/simulation/block/mod.rs b/crates/shared/src/world/block/mod.rs
similarity index 51%
rename from crates/shared/src/simulation/block/mod.rs
rename to crates/shared/src/world/block/mod.rs
index a496867d..41fdbc44 100644
--- a/crates/shared/src/simulation/block/mod.rs
+++ b/crates/shared/src/world/block/mod.rs
@@ -1,28 +1,24 @@
 pub mod block_definition;
 pub mod block_registry;
-pub mod targeted_block;
 
 pub use block_definition::{BlockDescription, load_block_from_str};
 pub use block_registry::{AIR_BLOCK_ID, BlockId, BlockRegistry, SOLID_BLOCK_ID};
-pub use targeted_block::TargetedBlock;
 
 // INFO: ----------------------
-//         Block plugin
+//         block plugin
 // ----------------------------
 
+use crate::{
+    lifecycle::load::{AppStartupLoadingPhase, LoadBlocks, LoadingAppExt},
+    world::block::block_registry::load_block_registry,
+};
 use bevy::app::{App, Plugin};
 
 pub struct BlockPlugin;
 
 impl Plugin for BlockPlugin {
     fn build(&self, app: &mut App) {
-        // insert resources
-        app.init_resource::<TargetedBlock>();
-        app.init_resource::<BlockRegistry>();
-
-        // Note: For the client, registry initialization is handled asynchronously
-        // to avoid blocking the main thread during startup.
+        app.configure_loading_phase::<AppStartupLoadingPhase>()
+            .add_node(LoadBlocks, load_block_registry);
     }
 }
-
-pub mod texture_registry;
diff --git a/crates/shared/src/simulation/chunk/common/chunk_scaling.rs b/crates/shared/src/world/chunk/common/chunk_scaling.rs
similarity index 99%
rename from crates/shared/src/simulation/chunk/common/chunk_scaling.rs
rename to crates/shared/src/world/chunk/common/chunk_scaling.rs
index 5a6dc6c8..65e75024 100644
--- a/crates/shared/src/simulation/chunk/common/chunk_scaling.rs
+++ b/crates/shared/src/world/chunk/common/chunk_scaling.rs
@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use crate::simulation::chunk::{
+use crate::world::chunk::{
     CHUNK_SIDE_LENGTH, ChunkBlocksComponent, chunk_blocks::ChunkView, types::ChunkLod,
 };
 
diff --git a/crates/shared/src/simulation/chunk/common/mod.rs b/crates/shared/src/world/chunk/common/mod.rs
similarity index 100%
rename from crates/shared/src/simulation/chunk/common/mod.rs
rename to crates/shared/src/world/chunk/common/mod.rs
diff --git a/crates/shared/src/simulation/chunk/common/padded_chunk_view.rs b/crates/shared/src/world/chunk/common/padded_chunk_view.rs
similarity index 85%
rename from crates/shared/src/simulation/chunk/common/padded_chunk_view.rs
rename to crates/shared/src/world/chunk/common/padded_chunk_view.rs
index 2df9884a..c3c5bda5 100644
--- a/crates/shared/src/simulation/chunk/common/padded_chunk_view.rs
+++ b/crates/shared/src/world/chunk/common/padded_chunk_view.rs
@@ -1,6 +1,6 @@
 use super::TOTAL_BUFFER_SIZE;
 use crate::prelude::*;
-use crate::simulation::{
+use crate::world::{
     block::block_registry::{AIR_BLOCK_ID, BlockId, BlockRegistry},
     chunk::{CHUNK_SIDE_LENGTH, ChunkBlocksComponent, ChunkLod, ChunkView},
 };
@@ -27,7 +27,7 @@ pub enum ChunkDataOption {
 #[derive(Clone)]
 pub struct PaddedChunk {
     /// Padded chunk volume with side-length of size `PADDED_SIZE`.
-    voxels: Vec<BlockId>,
+    blocks: Vec<BlockId>,
 
     /// The LOD of the center chunk
     center_lod: ChunkLod,
@@ -99,27 +99,12 @@ impl PaddedChunk {
                             for z in z_range.clone() {
                                 for y in y_range.clone() {
                                     // map padded coords back to source chunk coords
-                                    let src_x = if offset.x == -1 {
-                                        31
-                                    } else if offset.x == 1 {
-                                        0
-                                    } else {
-                                        x - 1
-                                    };
-                                    let src_y = if offset.y == -1 {
-                                        31
-                                    } else if offset.y == 1 {
-                                        0
-                                    } else {
-                                        y - 1
-                                    };
-                                    let src_z = if offset.z == -1 {
-                                        31
-                                    } else if offset.z == 1 {
-                                        0
-                                    } else {
-                                        z - 1
-                                    };
+                                    let src_x = (x as i32 - 1).rem_euclid(CHUNK_SIDE_LENGTH as i32)
+                                        as usize;
+                                    let src_y = (y as i32 - 1).rem_euclid(CHUNK_SIDE_LENGTH as i32)
+                                        as usize;
+                                    let src_z = (z as i32 - 1).rem_euclid(CHUNK_SIDE_LENGTH as i32)
+                                        as usize;
 
                                     let block = data.get_data(src_x, src_y, src_z);
                                     let idx = y + z * PADDED_SIZE + x * PADDED_SIZE * PADDED_SIZE;
@@ -142,7 +127,7 @@ impl PaddedChunk {
                         match cell {
                             ChunkDataOption::Generated(comp) => {
                                 if comp.lod() != center_lod {
-                                    // Handle LOD mismatch / resampling here if needed
+                                    // handle LOD mismatch / resampling here if needed
                                     write_chunk_to_buffer(offset, comp.get_view());
                                 } else {
                                     write_chunk_to_buffer(offset, comp.get_view());
@@ -151,7 +136,7 @@ impl PaddedChunk {
                             ChunkDataOption::OutOfBounds => {
                                 // out of bounds just leave it be
                             }
-                            _ => {} // Leave as Air
+                            _ => {} // leave as Air
                         }
                     }
                 }
@@ -159,7 +144,7 @@ impl PaddedChunk {
         }
 
         Self {
-            voxels: buffer,
+            blocks: buffer,
             center_lod,
             neighbor_lods,
             center_uniform_block,
@@ -168,7 +153,7 @@ impl PaddedChunk {
 
     /// Consumes the PaddedChunk and returns the underlying buffer.
     pub fn take_buffer(self) -> Vec<BlockId> {
-        self.voxels
+        self.blocks
     }
 
     /// Hot loop accessor.
@@ -178,7 +163,7 @@ impl PaddedChunk {
         let py = (y + 1) as usize;
         let pz = (z + 1) as usize;
         let idx = py + pz * PADDED_SIZE + px * PADDED_SIZE * PADDED_SIZE;
-        unsafe { *self.voxels.get_unchecked(idx) }
+        unsafe { *self.blocks.get_unchecked(idx) }
     }
 
     /// Gets the center uniform block option.
@@ -232,7 +217,7 @@ impl PaddedChunk {
             for z in z_range.clone() {
                 for y in y_range.clone() {
                     let idx = y + z * PADDED_SIZE + x * PADDED_SIZE * PADDED_SIZE;
-                    let block_id = self.voxels[idx];
+                    let block_id = self.blocks[idx];
                     if transparency_lut[block_id as usize] {
                         return false;
                     }
diff --git a/crates/shared/src/simulation/chunk/common/thread_buffer_pool.rs b/crates/shared/src/world/chunk/common/thread_buffer_pool.rs
similarity index 95%
rename from crates/shared/src/simulation/chunk/common/thread_buffer_pool.rs
rename to crates/shared/src/world/chunk/common/thread_buffer_pool.rs
index 6145a941..578ddbdf 100644
--- a/crates/shared/src/simulation/chunk/common/thread_buffer_pool.rs
+++ b/crates/shared/src/world/chunk/common/thread_buffer_pool.rs
@@ -1,6 +1,6 @@
 use super::padded_chunk_view::PADDED_SIZE;
 use crate::prelude::*;
-use crate::simulation::block::BlockId;
+use crate::world::block::BlockId;
 use std::cell::RefCell;
 
 pub const TOTAL_BUFFER_SIZE: usize = PADDED_SIZE * PADDED_SIZE * PADDED_SIZE;
diff --git a/crates/shared/src/simulation/chunk/components/chunk_blocks.rs b/crates/shared/src/world/chunk/components/chunk_blocks.rs
similarity index 95%
rename from crates/shared/src/simulation/chunk/components/chunk_blocks.rs
rename to crates/shared/src/world/chunk/components/chunk_blocks.rs
index 6e1616e7..ab6d29df 100644
--- a/crates/shared/src/simulation/chunk/components/chunk_blocks.rs
+++ b/crates/shared/src/world/chunk/components/chunk_blocks.rs
@@ -1,5 +1,5 @@
-use crate::simulation::block::{AIR_BLOCK_ID, BlockId, SOLID_BLOCK_ID};
-use crate::simulation::chunk::{
+use crate::world::block::{AIR_BLOCK_ID, BlockId, SOLID_BLOCK_ID};
+use crate::world::chunk::{
     CHUNK_SIDE_LENGTH, ChunkLod, ChunkVolumeData, VolumeDataView, VolumeDataWriter,
 };
 use bevy::ecs::prelude::Component;
@@ -7,12 +7,12 @@ use bevy::ecs::prelude::Component;
 /// A read-only view into the chunk's data.
 #[derive(Clone, Copy)]
 pub enum ChunkView<'a> {
-    /// The chunk is uniform (all blocks are the same).
+    /// The chunk is uniform (all blocks within it are the same type).
     ///
     /// Contains the single BlockId.
     Uniform(BlockId),
 
-    /// The chunk is dense.
+    /// The chunk is dense (not all blocks within it are the same type).
     ///
     /// Contains a high-speed reader struct for hot loops.
     Dense(VolumeDataView<'a, BlockId>),
diff --git a/crates/shared/src/simulation/chunk/components/chunk_chord.rs b/crates/shared/src/world/chunk/components/chunk_chord.rs
similarity index 89%
rename from crates/shared/src/simulation/chunk/components/chunk_chord.rs
rename to crates/shared/src/world/chunk/components/chunk_chord.rs
index bfd0c83a..0a8ddf15 100644
--- a/crates/shared/src/simulation/chunk/components/chunk_chord.rs
+++ b/crates/shared/src/world/chunk/components/chunk_chord.rs
@@ -1,13 +1,14 @@
 use crate::prelude::*;
-use crate::simulation::chunk::{CHUNK_DEPTH, CHUNK_HEIGHT, CHUNK_SIDE_LENGTH, CHUNK_WIDTH};
+use crate::world::chunk::{CHUNK_DEPTH, CHUNK_HEIGHT, CHUNK_SIDE_LENGTH, CHUNK_WIDTH};
 use bevy::ecs::prelude::*;
 use derive_more::{Deref, DerefMut};
+use serde::{Deserialize, Serialize};
 use std::fmt;
 
 const BIT_SHIFT: i32 = CHUNK_SIDE_LENGTH.trailing_zeros() as i32;
 
 /// Stores the coordinate of the chunk an entity is currently in.
-#[derive(Component, Clone, Deref, DerefMut, Debug)]
+#[derive(Component, Serialize, Deserialize, Clone, Deref, DerefMut, Debug, PartialEq, Eq)]
 pub struct ChunkCoord {
     pub pos: IVec3,
 }
diff --git a/crates/shared/src/simulation/chunk/components/dirty.rs b/crates/shared/src/world/chunk/components/dirty.rs
similarity index 100%
rename from crates/shared/src/simulation/chunk/components/dirty.rs
rename to crates/shared/src/world/chunk/components/dirty.rs
diff --git a/crates/shared/src/simulation/chunk/components/generated.rs b/crates/shared/src/world/chunk/components/generated.rs
similarity index 68%
rename from crates/shared/src/simulation/chunk/components/generated.rs
rename to crates/shared/src/world/chunk/components/generated.rs
index 8abaafe5..213224bb 100644
--- a/crates/shared/src/simulation/chunk/components/generated.rs
+++ b/crates/shared/src/world/chunk/components/generated.rs
@@ -1,4 +1,4 @@
-use crate::simulation::{block::BlockId, chunk::ChunkBlocksComponent, terrain::BiomeMapComponent};
+use crate::world::block::BlockId;
 use bevy::ecs::prelude::Component;
 
 /// Contains all metadata calculated during generation.
@@ -29,13 +29,3 @@ impl ChunkMetadata {
         Self::default()
     }
 }
-
-// INFO: -----------------------
-//         bundled types
-// -----------------------------
-
-pub struct GeneratedChunkComponentBundle {
-    pub chunk_blocks: Option<ChunkBlocksComponent>,
-    pub chunk_metadata: Option<ChunkMetadata>,
-    pub biome_map: BiomeMapComponent,
-}
diff --git a/crates/shared/src/simulation/chunk/components/mod.rs b/crates/shared/src/world/chunk/components/mod.rs
similarity index 80%
rename from crates/shared/src/simulation/chunk/components/mod.rs
rename to crates/shared/src/world/chunk/components/mod.rs
index 5429732b..37dfcc8a 100644
--- a/crates/shared/src/simulation/chunk/components/mod.rs
+++ b/crates/shared/src/world/chunk/components/mod.rs
@@ -2,10 +2,8 @@ pub mod chunk_blocks;
 pub mod chunk_chord;
 pub mod dirty;
 pub mod generated;
-pub mod transform;
 
 pub use chunk_blocks::{ChunkBlocksComponent, ChunkData, ChunkView};
 pub use chunk_chord::ChunkCoord;
 pub use dirty::ChunkMeshDirty;
 pub use generated::*;
-pub use transform::TransformComponent;
diff --git a/crates/shared/src/simulation/chunk/consts.rs b/crates/shared/src/world/chunk/consts.rs
similarity index 71%
rename from crates/shared/src/simulation/chunk/consts.rs
rename to crates/shared/src/world/chunk/consts.rs
index 0ddcf5d4..570fa1a2 100644
--- a/crates/shared/src/simulation/chunk/consts.rs
+++ b/crates/shared/src/world/chunk/consts.rs
@@ -1,14 +1,17 @@
+use bevy::math::IVec3;
+
 // INFO: ----------------------
 //         chunk sizing
 // ----------------------------
 
-/// The number of bitshifts to apply to the chunk_width and height
+/// The number of bitshifts to apply to the chunk_width and height.
 ///
 /// 2^CHUNK_DIM_SHIFT will be the size of each side of the chunks
 ///
 /// Due to vertex pulling, 32 (shift of 4) should be he only choice that will work here
 const CHUNK_DIM_SHIFT: usize = 4;
 
+/// The block length of the side of a chunk.
 pub const CHUNK_SIDE_LENGTH: usize = 2 << CHUNK_DIM_SHIFT;
 pub const CHUNK_WIDTH: usize = CHUNK_SIDE_LENGTH;
 pub const CHUNK_HEIGHT: usize = CHUNK_SIDE_LENGTH;
@@ -39,3 +42,28 @@ pub const Y_SHIFT: usize = (CHUNK_WIDTH * CHUNK_DEPTH).trailing_zeros() as usize
 pub const CHUNK_SIZE: usize = CHUNK_WIDTH * CHUNK_HEIGHT * CHUNK_DEPTH;
 pub const CHUNK_AREA: usize = CHUNK_WIDTH * CHUNK_DEPTH;
 pub const INDEX_MASK: usize = CHUNK_SIZE - 1;
+
+/// Offsets to find the 26 direct neighbors of a chunk.
+pub const NEIGHBOR_OFFSETS: [IVec3; 26] = {
+    let mut offsets = [IVec3::ZERO; 26];
+
+    let mut index = 0;
+    let mut x = -1;
+    while x <= 1 {
+        let mut y = -1;
+        while y <= 1 {
+            let mut z = -1;
+            while z <= 1 {
+                if x != 0 || y != 0 || z != 0 {
+                    offsets[index] = IVec3::new(x, y, z);
+                    index += 1;
+                }
+                z += 1;
+            }
+            y += 1;
+        }
+        x += 1;
+    }
+
+    offsets
+};
diff --git a/crates/shared/src/world/chunk/mod.rs b/crates/shared/src/world/chunk/mod.rs
new file mode 100644
index 00000000..dbafcd27
--- /dev/null
+++ b/crates/shared/src/world/chunk/mod.rs
@@ -0,0 +1,25 @@
+pub mod common;
+pub mod components;
+pub mod consts;
+mod systems;
+pub mod types;
+
+pub use common::*;
+pub use components::*;
+pub use consts::*;
+pub use types::*;
+
+// INFO: ---------------------------
+//         plugin definition
+// ---------------------------------
+
+use bevy::app::{App, Plugin, PreUpdate};
+use systems::update_chunk_coords_system;
+
+pub struct ChunkPlugin;
+
+impl Plugin for ChunkPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(PreUpdate, update_chunk_coords_system);
+    }
+}
diff --git a/crates/shared/src/world/chunk/systems.rs b/crates/shared/src/world/chunk/systems.rs
new file mode 100644
index 00000000..4dd66662
--- /dev/null
+++ b/crates/shared/src/world/chunk/systems.rs
@@ -0,0 +1,26 @@
+use crate::{player::components::LogicalPosition, prelude::*, world::chunk::ChunkCoord};
+use bevy::{ecs::system::Query, transform::components::GlobalTransform};
+
+/// A system that updates the `ChunkCoord` of entities based on their position.
+/// It prefers `LogicalPosition` (authoritative simulation position) but falls back
+/// to `GlobalTransform` for entities without logical simulation state (like cameras).
+#[instrument(skip_all)]
+pub fn update_chunk_coords_system(
+    mut query: Query<(&GlobalTransform, &mut ChunkCoord, Option<&LogicalPosition>)>,
+) {
+    for (transform, mut vicinity, logical_pos) in query.iter_mut() {
+        let pos = logical_pos
+            .map(|lp| lp.0)
+            .unwrap_or_else(|| transform.translation());
+
+        let new_chunk_pos = ChunkCoord::world_to_chunk_pos(pos);
+        if new_chunk_pos != vicinity.pos {
+            debug!(
+                target: "chunk_coords",
+                "Entity crossed chunk boundary. Old: {:?}, New: {:?}",
+                vicinity.pos, new_chunk_pos
+            );
+            vicinity.pos = new_chunk_pos;
+        }
+    }
+}
diff --git a/crates/shared/src/simulation/chunk/types.rs b/crates/shared/src/world/chunk/types.rs
similarity index 97%
rename from crates/shared/src/simulation/chunk/types.rs
rename to crates/shared/src/world/chunk/types.rs
index 9ebf5fa7..5ab20b5b 100644
--- a/crates/shared/src/simulation/chunk/types.rs
+++ b/crates/shared/src/world/chunk/types.rs
@@ -1,11 +1,14 @@
 use crate::prelude::*;
-use crate::simulation::chunk::CHUNK_SIDE_LENGTH;
+use crate::world::chunk::CHUNK_SIDE_LENGTH;
+use bevy::prelude::{Component, Deref, DerefMut};
 use std::fmt::{Display, Formatter};
 use std::mem::MaybeUninit;
 use std::sync::Arc;
 
 /// A type-safe wrapper for a Level of Detail value.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref, DerefMut)]
+#[derive(
+    Component, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref, DerefMut, Default,
+)]
 pub struct ChunkLod(pub u8);
 
 impl Display for ChunkLod {
@@ -195,7 +198,7 @@ impl<'a, T: Copy> VolumeDataWriter<'a, T> {
 //         3d chunk volume container
 // -----------------------------------------
 
-/// Generic, LOD-aware, 3D container for chunk voxel data.
+/// Generic, LOD-aware, 3D container for chunk block data.
 #[derive(Clone)]
 pub struct ChunkVolumeData<T: Send + Sync + 'static> {
     data: Arc<[T]>,
@@ -343,7 +346,7 @@ impl<T: Copy + Send + Sync + 'static> ChunkVolumeData<T> {
 
         if cfg!(debug_assertions) && (x >= self.size || y >= self.size || z >= self.size) {
             error!(
-                "get_data_unchecked: Attempted to access voxel data out of bounds: ({}, {}, {}) in a chunk of size {}",
+                "get_data_unchecked: Attempted to access block data out of bounds: ({}, {}, {}) in a chunk of size {}",
                 x, y, z, self.size
             );
         }
@@ -534,7 +537,7 @@ impl<T: Copy + Send + Sync + 'static> ChunkColumnData<T> {
     pub fn get_data_unchecked(&self, x: usize, z: usize) -> T {
         if cfg!(debug_assertions) && (x >= self.size || z >= self.size) {
             error!(
-                "get_data_unchecked: Attempted to access voxel data out of bounds: ({}, {}) in 2D chunk of size {}",
+                "get_data_unchecked: Attempted to access block data out of bounds: ({}, {}) in 2D chunk of size {}",
                 x, z, self.size
             );
         }
diff --git a/crates/shared/src/world/mod.rs b/crates/shared/src/world/mod.rs
new file mode 100644
index 00000000..a9adc068
--- /dev/null
+++ b/crates/shared/src/world/mod.rs
@@ -0,0 +1,24 @@
+pub mod biome;
+pub mod block;
+pub mod chunk;
+
+// INFO: ----------------------
+//         plugin group
+// ----------------------------
+
+use bevy::{app::PluginGroupBuilder, prelude::PluginGroup};
+use biome::BiomePlugin;
+use block::BlockPlugin;
+use chunk::ChunkPlugin;
+
+/// A plugin group containing shared simulation and game logic plugins used by both client and server.
+pub struct WorldPlugins;
+
+impl PluginGroup for WorldPlugins {
+    fn build(self) -> PluginGroupBuilder {
+        PluginGroupBuilder::start::<Self>()
+            .add(ChunkPlugin)
+            .add(BlockPlugin)
+            .add(BiomePlugin)
+    }
+}
diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
index 253a4444..5e100f11 100644
--- a/crates/utils/Cargo.toml
+++ b/crates/utils/Cargo.toml
@@ -27,12 +27,6 @@ tracing-subscriber = { workspace = true }
 tracy-client = { workspace = true, optional = true }
 tracing-tracy = { workspace = true, optional = true }
 
-# INFO: --------------------------
-#         simulation logic
-# --------------------------------
-
-bevy = { workspace = true }
-
 # INFO: ---------------
 #         utils
 # ---------------------
diff --git a/crates/utils/readme.md b/crates/utils/readme.md
new file mode 100644
index 00000000..dad39c89
--- /dev/null
+++ b/crates/utils/readme.md
@@ -0,0 +1,9 @@
+# Vantablock Utils (`vantablock-utils`)
+
+The `vantablock-utils` crate provides generic helper functions and system integrations that are not tied to the specific game domain (like blocks or biomes).
+
+## Features
+
+- **Logging & Profiling**: Configures `tracing` subscribers and provides integration with `tracy-client` (via the `tracy` feature flag) for advanced memory and CPU allocation tracking.
+- **System Information**: Interacts with the host OS to gather system specs or determine platform-specific file directories (using `sysinfo` and `directories`).
+- **Paths**: Helper constants and functions for resolving asset and configuration paths across different OS environments.
diff --git a/crates/utils/src/logger.rs b/crates/utils/src/logger.rs
index 67d594a1..0657b530 100644
--- a/crates/utils/src/logger.rs
+++ b/crates/utils/src/logger.rs
@@ -1,8 +1,28 @@
+use std::sync::atomic::{AtomicU8, Ordering};
 use time::macros::format_description;
+use tracing::{Event, Level, Subscriber};
 use tracing_subscriber::{
-    Registry, filter::EnvFilter, fmt, fmt::time::LocalTime, layer::SubscriberExt, prelude::*,
+    Registry,
+    filter::EnvFilter,
+    fmt::{
+        self, FmtContext, FormatEvent, FormatFields, format::Writer, time::FormatTime,
+        time::LocalTime,
+    },
+    layer::SubscriberExt,
+    prelude::*,
+    registry::LookupSpan,
 };
 
+// 0 = Unknown/Shared, 1 = Client, 2 = Server
+static RUNTIME_CONTEXT: AtomicU8 = AtomicU8::new(0);
+
+pub fn set_runtime_context_client() {
+    RUNTIME_CONTEXT.store(1, Ordering::Relaxed);
+}
+pub fn set_runtime_context_server() {
+    RUNTIME_CONTEXT.store(2, Ordering::Relaxed);
+}
+
 pub fn attach_logger() {
     let timer = LocalTime::new(format_description!("[hour repr:24]:[minute]:[second]"));
 
@@ -27,13 +47,9 @@ pub fn attach_logger() {
         env_filter = env_filter.add_directive(directive.parse().unwrap());
     }
 
-    let fmt_layer = fmt::layer()
-        .with_target(false)
-        .with_line_number(false)
-        .with_thread_names(false)
-        .with_file(false)
-        .with_timer(timer)
-        .compact();
+    let format = VantablockFormatter { timer };
+
+    let fmt_layer = fmt::layer().event_format(format);
 
     #[cfg(feature = "tracy")]
     let fmt_layer = fmt_layer.with_ansi(false);
@@ -43,5 +59,62 @@ pub fn attach_logger() {
     #[cfg(feature = "tracy")]
     let subscriber = subscriber.with(tracing_tracy::TracyLayer::default());
 
-    subscriber.init();
+    let _ = subscriber.try_init();
+}
+
+/// A custom formatter that prints the time, a colored prefix for crate separation,
+/// and a short level indicator.
+pub struct VantablockFormatter<T> {
+    timer: T,
+}
+
+impl<T: FormatTime, S, N> FormatEvent<S, N> for VantablockFormatter<T>
+where
+    S: Subscriber + for<'a> LookupSpan<'a>,
+    N: for<'a> FormatFields<'a> + 'static,
+{
+    fn format_event(
+        &self,
+        ctx: &FmtContext<'_, S, N>,
+        mut writer: Writer<'_>,
+        event: &Event<'_>,
+    ) -> std::fmt::Result {
+        write!(writer, "\x1b[90m")?;
+        self.timer.format_time(&mut writer)?;
+        write!(writer, "\x1b[0m ")?;
+
+        let target = event.metadata().target();
+
+        if target.contains("server") {
+            write!(writer, "\x1b[35m[SERVER]\x1b[0m ")?;
+        } else if target.contains("client") {
+            write!(writer, "\x1b[36m[CLIENT]\x1b[0m ")?;
+        } else if target.contains("shared") {
+            // give shared crate context brackets so we know if caller was server or client
+            let bracket_color = match RUNTIME_CONTEXT.load(Ordering::Relaxed) {
+                1 => "\x1b[36m", // cyan (running on Client)
+                2 => "\x1b[35m", // magenta (running on Server)
+                _ => "\x1b[33m", // yellow (unknown)
+            };
+            write!(writer, "{}[", bracket_color)?;
+            write!(writer, "\x1b[33mSHARED")?;
+            write!(writer, "{}]\x1b[0m ", bracket_color)?;
+        } else {
+            write!(writer, "\x1b[37m[EXTERN]\x1b[0m ")?;
+        }
+
+        let level = *event.metadata().level();
+        let (level_char, level_color) = match level {
+            Level::TRACE => ("T", "\x1b[35m"), // magenta
+            Level::DEBUG => ("D", "\x1b[34m"), // blue
+            Level::INFO => ("I", "\x1b[32m"),  // green
+            Level::WARN => ("W", "\x1b[33m"),  // yellow
+            Level::ERROR => ("E", "\x1b[31m"), // red
+        };
+        write!(writer, "{}{}\x1b[0m ", level_color, level_char)?;
+
+        // final message
+        ctx.format_fields(writer.by_ref(), event)?;
+        writeln!(writer)
+    }
 }
diff --git a/crates/utils/src/paths.rs b/crates/utils/src/paths.rs
index 87fa129b..92d8f06e 100644
--- a/crates/utils/src/paths.rs
+++ b/crates/utils/src/paths.rs
@@ -1,4 +1,3 @@
-use bevy::prelude::Resource;
 use directories::ProjectDirs;
 use std::{fs, path::PathBuf};
 
@@ -8,7 +7,7 @@ use std::{fs, path::PathBuf};
 /// - macOS: `~/Library/Application Support/com.masoniis.vantablock/`
 /// - Windows: `%AppData%\Roaming\masoniis\vantablock\` (Config) and `%AppData%\Local\masoniis\vantablock\` (Data)
 /// - Linux: `~/.config/vantablock/` and `~/.local/share/vantablock/`
-#[derive(Resource, Clone, Debug)]
+#[derive(Clone, Debug)]
 pub struct PersistentPaths {
     /// Standard location for game assets (textures, models, configs).
     pub assets_dir: PathBuf,
@@ -28,55 +27,71 @@ impl PersistentPaths {
     ///
     /// This function will attempt to create all necessary subdirectories on disk.
     /// It panics if the OS fails to provide a standard directory structure.
-    pub fn resolve() -> Self {
-        // check for override from environment variable
-        if let Ok(path) = std::env::var("VANTABLOCK_ASSETS") {
-            let assets_dir = PathBuf::from(path);
-            if assets_dir.exists() {
-                let (config_dir, saves_dir, cache_dir, logs_dir) = Self::get_os_dirs();
-                let paths = Self {
-                    assets_dir,
-                    config_dir,
-                    saves_dir,
-                    cache_dir,
-                    logs_dir,
-                };
-                paths.ensure_exists();
-                return paths;
-            }
-        }
-
-        // if we are in a cargo workspace, resolve paths for dev env
-        let is_dev_env = std::env::var("CARGO").is_ok() || cfg!(debug_assertions);
-        if is_dev_env {
-            let crate_root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-            // crate root is two dirs up from utils crate
-            if let Some(workspace_root) = crate_root.parent().and_then(|p| p.parent()) {
-                return Self::resolve_dev_at(workspace_root.to_path_buf());
-            }
+    pub fn resolve_client() -> Self {
+        // if we are in a cargo workspace, resolve paths for dev env using "client" target
+        if let Some(dev_paths) = Self::try_resolve_dev("client") {
+            return dev_paths;
         }
 
         // otherwise assume a production environment
-        Self::resolve_production()
+        Self::resolve_client_paths()
     }
 
-    /// Resolves folders for a dev environment by placing them in a `.dev_data` directory under `root`.
-    fn resolve_dev_at(root: PathBuf) -> Self {
-        let dev_data = root.join(".dev_data");
+    /// Resolves folders for a dedicated server environment.
+    /// Places all data inside the current working directory (portable mode).
+    pub fn resolve_server() -> Self {
+        // if we are in a cargo workspace, resolve paths for dev env using "server" target
+        if let Some(dev_paths) = Self::try_resolve_dev("server") {
+            return dev_paths;
+        }
+
+        // use the dir that the executable is run from
+        let root = std::env::current_dir().expect("Failed to get current working directory");
 
         let paths = Self {
             assets_dir: root.join("assets"),
-            config_dir: dev_data.join("config"),
-            saves_dir: dev_data.join("saves"),
-            cache_dir: dev_data.join("cache"),
-            logs_dir: dev_data.join("logs"),
+            config_dir: root.join("config"),
+            saves_dir: root.join("saves"),
+            cache_dir: root.join("cache"),
+            logs_dir: root.join("logs"),
         };
+
         paths.ensure_exists();
         paths
     }
 
+    // INFO: ---------------------------
+    //         private utilities
+    // ---------------------------------
+
+    /// Checks if we are running via Cargo or in debug mode, and returns the constructed dev paths if so.
+    fn try_resolve_dev(target: &str) -> Option<Self> {
+        let is_dev_env = std::env::var("CARGO").is_ok() || cfg!(debug_assertions);
+
+        if is_dev_env {
+            let crate_root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+            // crate root is two dirs up from utils crate
+            if let Some(workspace_root) = crate_root.parent().and_then(|p| p.parent()) {
+                // isolate dev data into ./vantadev/client or ./vantadev/server
+                let dev_data = workspace_root.join("vantadev").join(target);
+
+                let paths = Self {
+                    assets_dir: workspace_root.join("assets"), // assets dir is same for both client/server
+                    config_dir: dev_data.join("config"),
+                    saves_dir: dev_data.join("saves"),
+                    cache_dir: dev_data.join("cache"),
+                    logs_dir: dev_data.join("logs"),
+                };
+
+                paths.ensure_exists();
+                return Some(paths);
+            }
+        }
+        None
+    }
+
     /// Resolves folder for a prod environment based on the host OS conventions
-    fn resolve_production() -> Self {
+    fn resolve_client_paths() -> Self {
         let exe_path = std::env::current_exe().expect("Failed to get executable path");
         let exe_dir = exe_path
             .parent()
diff --git a/flake.lock b/flake.lock
index fe0706d5..6b051f34 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1774913767,
-        "narHash": "sha256-+Rotvr6ewM3bq2jV4QTdmdDm/GNFNDpYK3fmOaudfnI=",
+        "lastModified": 1777173020,
+        "narHash": "sha256-JZOujjBG5sQmFcRtzIvlx3/xmroTJXxgmU3KAjkFGJ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9e161d92935ef625e3e0e88c36334821865262f9",
+        "rev": "c52145e60ba272f34a0f742d0440cd4e5a6b27f9",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1763464769,
-        "narHash": "sha256-AJHrsT7VoeQzErpBRlLJM1SODcaayp0joAoEA35yiwM=",
+        "lastModified": 1776949667,
+        "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6f374686605df381de8541c072038472a5ea2e2d",
+        "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762938485,
-        "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
+        "lastModified": 1775636079,
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 8e424318..8b0e1e71 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,9 +34,10 @@
           mkShell {
             buildInputs = [
               # rust stuff
-              pkgs-unstable.tracy-glfw
+              tracy-glfw
               pkgs-unstable.rust-analyzer
               pkgs-unstable.wgsl-analyzer
+              pkgs-unstable.cargo-nextest
               rustup
 
               # utils
diff --git a/justfile b/justfile
index 366e4d89..b277ed4f 100644
--- a/justfile
+++ b/justfile
@@ -1,44 +1,45 @@
-set shell := ["bash", "-c"]
-
-# crate names
-project := "vantablock"
-client  := "vantablock-client"
-server  := "vantablock-server"
+# INFO: -----------------------
+#         configuration
+# -----------------------------
 
-# where to place wsl windows builds
-wsl_target := "C:/temp/vantablock-build"
+set shell := ["bash", "-c"]
+set windows-shell := ["powershell.exe", "-NoProfile", "-Command"]
 
-open_cmd := if os() == "macos" { \
+os_family := os()
+open_cmd := if os_family == "macos" { \
     "open" \
-} else if os() == "windows" { \
+} else if os_family == "windows" { \
     "explorer.exe" \
 } else { \
     "xdg-open" \
 }
 
-default: run
+# crate names
+project := "vantablock"
+client  := "vantablock-client"
+server  := "vantablock-server"
+runner  := "vantablock-runner"
+
+# INFO: ------------------------
+#         core execution
+# ------------------------------
 
-# INFO: -------------------------
-#          core execution
-# -------------------------------
+default: client
 
 # runs the client via debug profile
-run *args:
-    cargo run -p {{client}} {{args}}
+client *args:
+    cargo run -p {{runner}} --bin vantablock {{args}}
 
 # runs the server via debug profile
 server *args:
-    cargo run -p {{server}} {{args}}
+    cargo run -p {{runner}} --bin vantablock-server --no-default-features --features server {{args}}
 
 # runs the client via max-optimization release profile
 release *args:
-    cargo run -p {{client}} --profile distribution --features {{client}}/distribution {{args}}
+    cargo run -p {{runner}} --bin vantablock --profile distribution --features distribution {{args}}
 
-# compiles and runs the client natively on Windows from within WSL
-wsl *args:
-    @WSL_PATH=$(wslpath -w .)
-    @powershell.exe -Command "if (!(Test-Path '{{wsl_target}}')) { New-Item -ItemType Directory -Force -Path '{{wsl_target}}' }; cd '$WSL_PATH'; \$env:CARGO_TARGET_DIR='{{wsl_target}}'; cargo run -p {{client}} {{args}}"
 
+alias run := client
 alias run-fast := release
 
 # INFO: -------------------------------
@@ -47,16 +48,15 @@ alias run-fast := release
 
 # runs cargo check across the workspace
 check *args:
-    cargo check {{args}}
-    cargo check --benches
+    cargo check --all-targets {{args}}
 
 # runs clippy across the workspace
 clippy *args:
     cargo clippy {{args}}
 
 # fix compiler-fixable issues
-fix:
-    cargo fix --allow-dirty
+fix *args:
+    cargo fix --all-targets --allow-dirty {{args}}
 
 # runs nix fmt (rustfmt + nixpkgs-fmt)
 fmt:
@@ -65,7 +65,9 @@ fmt:
 # cleans ephemeral dirs
 clean:
 	rm -rf target/
+	rm -rf .dev_data/
 
+alias lint := check
 alias clip := clippy
 
 # INFO: ------------------------------
@@ -74,7 +76,7 @@ alias clip := clippy
 
 # runs all workspace tests
 test *args:
-    cargo test {{args}}
+    cargo nextest run {{args}}
 
 # compiles benchmarks as tests to check for runtime errors
 test-bench:
@@ -82,11 +84,16 @@ test-bench:
     cargo test --benches
 
 # runs benchmarks and opens html report once finished
-bench *args:
+bench-client *args:
     cargo bench -p {{client}} {{args}}
     @echo "Opening Criterion report..."
     -{{ open_cmd }} target/criterion/report/index.html
 
+bench-server *args:
+    cargo bench -p {{server}} {{args}}
+    @echo "Opening Criterion report..."
+    -{{ open_cmd }} target/criterion/report/index.html
+
 # full pre-push verification suite
 ready *args:
     cargo check --benches
@@ -99,8 +106,12 @@ ready *args:
 
 # packages the client for distribution
 package profile="distribution":
-    cargo build -p client --profile {{profile}} --features distribution
-    cargo packager -p client --profile {{ if profile == "dev" { "debug" } else { profile } }}
+    cargo build -p {{runner}} --bin vantablock --profile {{profile}} --features distribution
+    cargo packager -p {{runner}} --bin vantablock --profile {{ if profile == "dev" { "debug" } else { profile } }}
+
+# packages the server for distribution
+server-package profile="distribution":
+    cargo build -p {{runner}} --bin vantablock-server --no-default-features --features server --profile {{profile}}
 
 # runs the texture processor utility
 texture:
@@ -117,7 +128,7 @@ sign:
 # Shows the ASM associated with a rust file.
 # requires https://crates.io/crates/cargo-show-asm
 asm path:
-    cargo asm -p {{client}} --color {{path}}
+    cargo asm -p {{runner}} --bin vantablock --color {{path}}
 
 # launch tracy if it isn't already running
 trace *args:
@@ -129,15 +140,15 @@ trace *args:
         TRACY_ENABLE_MEMORY=1
         tracy &
     fi
-    cargo run -p {{client}} --features {{client}}/tracy {{args}}
+    cargo run -p {{runner}} --bin vantablock --features tracy {{args}}
 
 # runs the client with Bevy-specific debug features
 debug_bevy *args:
-    cargo run -p {{client}} --features bevy/trace,bevy/track_location,bevy/debug {{args}}
+    cargo run -p {{runner}} --bin vantablock --features bevy/trace,bevy/track_location,bevy/debug {{args}}
 
 # runs the client with verbose wgpu logging
 debug_wgpu *args:
-    RUST_LOG=wgpu=trace cargo run -p {{client}} {{args}}
+    RUST_LOG=wgpu=trace cargo run -p {{runner}} --bin vantablock {{args}}
 
 # targeted tracing, call without args to list targets found in source.
 debug *args:
@@ -146,7 +157,7 @@ debug *args:
     set -- {{args}}
     if [ "$#" -eq 0 ]; then
         echo -e "\033[1;33mNo debug targets specified. Available targets are:\033[0m"
-        rg --no-heading -o --replace '$f:$1' 'target\s*:\s*"([^"]+)"' crates/{{client}}/src/ \
+        rg --no-heading -o --replace '$f:$1' 'target\s*:\s*"([^"]+)"' crates/ \
             | awk -F: '{print $NF}' | sort | uniq -c | sort -rn \
             | while read -r count target; do
                 printf '  - \033[1;35m%s\033[0m (%sx)\n' "$target" "$count"
@@ -160,4 +171,25 @@ debug *args:
     done
     export RUST_LOG="${log_targets%,},{{project}}=info"
     echo -e "\033[1;32mRunning with RUST_LOG=\033[0m$RUST_LOG"
-    cargo run -p {{client}}
+    cargo run -p {{runner}} --bin vantablock
+
+# INFO: ---------------------------------
+#         advanced/niche commands
+# ---------------------------------------
+
+# target wsl -> windows builds to happen in the windows temp dir
+windows_temp := if os_family == "windows" { "" \
+} else { \
+    `if [ -d /mnt/c ]; then cd /mnt/c && cmd.exe /c "echo %TEMP%" 2>/dev/null | tr -d '\r\n'; fi` \
+}
+windows_wsl_target_dir := windows_temp + "\\vantablock-target"
+
+# compiles and runs the client natively on Windows from within WSL
+# requires cargo, just, and VS build tools on Windows host:
+# - winget install just
+# - winget install rustup
+# - winget install --id Microsoft.VisualStudio.2022.BuildTools --override "--passive --wait --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended"
+wsl *args:
+    @echo "Compiling Windows target ({{windows_wsl_target_dir}})"
+    @WSL_PATH=$(wslpath -w .)
+    @powershell.exe -Command "if (!(Test-Path '{{windows_wsl_target_dir}}')) { New-Item -ItemType Directory -Force -Path '{{windows_wsl_target_dir}}' }; cd '$WSL_PATH'; \$env:CARGO_TARGET_DIR='{{windows_wsl_target_dir}}'; just {{args}}"
diff --git a/readme.md b/readme.md
index f61ca734..d3478698 100644
--- a/readme.md
+++ b/readme.md
@@ -46,7 +46,7 @@ Assuming rust is properly setup, `cargo` can be used like any standard Rust proj
 ### Common problems
 
 1. Mouse can be unlocked with `Escape`
-2. Shadows have very low render distance of 32 voxels and also have other noticable issues.
+2. Shadows have very low render distance of 32 blocks and also have other noticable issues.
 
 ### Keybinds
 
@@ -58,8 +58,8 @@ Assuming rust is properly setup, `cargo` can be used like any standard Rust proj
 | `A`           | Move left                                                                            |
 | `D`           | Move right                                                                           |
 | `Left Shift`  | Move faster                                                                          |
-| `Mouse Left`  | Break voxel                                                                          |
-| `Mouse right` | Place voxel                                                                          |
+| `Mouse Left`  | Break block                                                                          |
+| `Mouse right` | Place block                                                                          |
 | `T`           | Switch terrain generator (only applies to new chunks that generate e.g. from moving) |
 | `F1` or `1`   | Toggle diagnostics UI (FPS, vert count, coordinates)                                 |
 | `F2` or `2`   | Toggle opaque wireframe mode                                                         |
@@ -72,11 +72,11 @@ Assuming rust is properly setup, `cargo` can be used like any standard Rust proj
 
 1. "Vertex pulling." Each group of 6 vertices that make up a face share a single 32 bit float in a GPU buffer.
 2. Global illumination via the "Sun" with directional lighting, and a shadow pass that adds (somewhat scuffed) shadows
-3. Approximate ambient occlusion based on nearby voxels to a vertex.
+3. Approximate ambient occlusion based on nearby blocks to a vertex.
 4. Full transparency support via a separate render pass.
 5. Custom UI implementation (with `taffy` for computing flexbox layouts and `glyphon` for text heavylifting)
 6. Custom fog and sky shaders that define the sky and horizon blending with sun/moon.
-7. Convenient texture and voxel definition loading enabling swapping voxel textures easily in the `assets/shared/block` folder.
+7. Convenient texture and block definition loading enabling swapping block textures easily in the `assets/shared/block` folder.
 8. Water vertices "wave" up and down if you look at them closer
 
 </details>
diff --git a/release-plz.toml b/release-plz.toml
index 6b82ab62..0b3efdbb 100644
--- a/release-plz.toml
+++ b/release-plz.toml
@@ -18,9 +18,9 @@ pr_body = """
 {{ releases[0].changelog }}
 """
 
-# client package is the main release entrypoint
+# runner package is the main release entrypoint
 [[package]]
-name = "vantablock-client"
+name = "vantablock-runner"
 release = true
 # TODO: can't get git_only to work, https://github.com/release-plz/release-plz/issues/2595
 # waiting on https://github.com/release-plz/release-plz/pull/2652 to be merged, seems like the fix
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 4f3e8c52..4933b3ba 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.89"
+channel = "1.95"
diff --git a/treefmt.nix b/treefmt.nix
index 45866c3b..8e5f8cda 100644
--- a/treefmt.nix
+++ b/treefmt.nix
@@ -5,11 +5,15 @@
     clang-format.enable = true;
     nixfmt.enable = true;
     prettier.enable = true;
-    rustfmt = {
-      enable = true;
-      edition = "2024"; # 2024 matches the rust edition in Cargo.toml
-      # includes = [ "*.ron" ];
-    };
+  };
+
+  settings.formatter.rustfmt = {
+    command = "rustfmt";
+    options = [
+      "--edition"
+      "2024"
+    ];
+    includes = [ "*.rs" ];
   };
 
   settings.formatter.wgslfmt = {