diff --git a/Cargo.lock b/Cargo.lock
index 794ae63c5..35a7c803c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ab_glyph"
@@ -20,52 +20,55 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "accesskit"
-version = "0.14.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448"
+checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a"
 
 [[package]]
 name = "accesskit_consumer"
-version = "0.22.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bdfa1638ddd6eb9c752def95568df8b3ad832df252e9156d2eb783b201ca8a9"
+checksum = "f47983a1084940ba9a39c077a8c63e55c619388be5476ac04c804cfbd1e63459"
 dependencies = [
  "accesskit",
+ "hashbrown 0.15.2",
  "immutable-chunkmap",
 ]
 
 [[package]]
 name = "accesskit_macos"
-version = "0.15.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c236a84ff1111defc280cee755eaa953d0b24398786851b9d28322c6d3bb1ebd"
+checksum = "7329821f3bd1101e03a7d2e03bd339e3ac0dc64c70b4c9f9ae1949e3ba8dece1"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
+ "hashbrown 0.15.2",
  "objc2",
  "objc2-app-kit",
  "objc2-foundation",
- "once_cell",
 ]
 
 [[package]]
 name = "accesskit_windows"
-version = "0.20.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d7f43d24b16b3e76bef248124fbfd2493c3a9860edb5aae1010c890e826de5e"
+checksum = "24fcd5d23d70670992b823e735e859374d694a3d12bfd8dd32bd3bd8bedb5d81"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
+ "hashbrown 0.15.2",
  "paste",
  "static_assertions",
- "windows 0.54.0",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
 ]
 
 [[package]]
 name = "accesskit_winit"
-version = "0.20.4"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755535e6bf711a42dac28b888b884b10fc00ff4010d9d3bd871c5f5beae5aa78"
+checksum = "6a6a48dad5530b6deb9fc7a52cc6c3bf72cdd9eb8157ac9d32d69f2427a5e879"
 dependencies = [
  "accesskit",
  "accesskit_macos",
@@ -103,6 +106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
+ "const-random",
  "getrandom",
  "once_cell",
  "version_check",
@@ -164,7 +168,7 @@ dependencies = [
  "ndk-context",
  "ndk-sys 0.6.0+11769913",
  "num_enum",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -260,7 +264,7 @@ checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
 dependencies = [
  "clipboard-win",
  "core-graphics",
- "image 0.25.2",
+ "image",
  "log",
  "objc2",
  "objc2-app-kit",
@@ -290,11 +294,22 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
 
 [[package]]
 name = "ash"
-version = "0.37.3+1.3.251"
+version = "0.38.0+1.3.281"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "assert_type_match"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
+checksum = "f548ad2c4031f2902e3edc1f29c29e835829437de49562d8eb5dc5584d3a1043"
 dependencies = [
- "libloading 0.7.4",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -372,6 +387,12 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
+[[package]]
+name = "atomicow"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "467163b50876d3a4a44da5f4dbd417537e522fc059ede8d518d57941cfb3d745"
+
 [[package]]
 name = "autocfg"
 version = "1.3.0"
@@ -392,18 +413,18 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bevy"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8ece0d8dde51890fb52dcba5b04fd1c657617a4022908c327b2d6e83d173a32"
+checksum = "b6a01cd51a5cd310e4e7aa6e1560b1aabf29efc6a095a01e6daa8bf0a19f1fea"
 dependencies = [
  "bevy_internal",
 ]
 
 [[package]]
 name = "bevy-inspector-egui"
-version = "0.25.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b66b51a66c0be92604c13cd490509d77676c05406f4f4b046672aaffdcc925f"
+checksum = "dd64580f4496ed987c6231c6a7d833068914331a9084bf5a3dd9dcbc66fd8a73"
 dependencies = [
  "bevy-inspector-egui-derive",
  "bevy_app",
@@ -414,6 +435,7 @@ dependencies = [
  "bevy_ecs",
  "bevy_egui",
  "bevy_hierarchy",
+ "bevy_image",
  "bevy_log",
  "bevy_math",
  "bevy_pbr",
@@ -424,42 +446,43 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "bytemuck",
+ "disqualified",
  "egui",
  "fuzzy-matcher",
- "image 0.24.9",
- "once_cell",
- "pretty-type-name",
+ "image",
  "smallvec",
+ "winit",
 ]
 
 [[package]]
 name = "bevy-inspector-egui-derive"
-version = "0.25.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791acfac11e3d5a750952c5201dc0d414b88431260118b46949bf6b159c5a19c"
+checksum = "3afc67826e0a4347414545e022e748f42550a577a502b26af44e6d03742c9266"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_a11y"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d84e0ae7155afa21c4926fb8b89ebe0cbd66239ac817fdb834025327c4089b"
+checksum = "82c66b5bc82a2660a5663d85b3354ddb72c8ab2c443989333cbea146f39a4e9a"
 dependencies = [
  "accesskit",
  "bevy_app",
  "bevy_derive",
  "bevy_ecs",
+ "bevy_reflect",
 ]
 
 [[package]]
 name = "bevy_animation"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abec61c2d9d19329d8d9f0d7f1ce0188f6ed2c6d74d90412b238efc38c7d7794"
+checksum = "ee48f3fc65f583e5e320e38874053e20e7a71205a62aaace5d607446781bd742"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -476,20 +499,22 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "blake3",
- "fixedbitset 0.5.7",
+ "derive_more",
+ "downcast-rs",
+ "either",
  "petgraph",
  "ron",
  "serde",
- "thiserror",
+ "smallvec",
  "thread_local",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_app"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0af99549f5de61cc91c8c23303b13aa07f97b73fbace39695dee0a0a32cec9d4"
+checksum = "652574e4c10efcfa70f98036709dd5b67e5cb8d46c58087ef48c2ac6b62df9da"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -497,38 +522,44 @@ dependencies = [
  "bevy_tasks",
  "bevy_utils",
  "console_error_panic_hook",
+ "ctrlc",
+ "derive_more",
  "downcast-rs",
- "thiserror",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "bevy_asset"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6533d17f13b44ea4fb5177f83b0900269ed13c0fd45772ccffd19a69980647ec"
+checksum = "4d7d501eda01be6d500d843a06d9b9800c3f0fffaae3c29d17d9e4e172c28d37"
 dependencies = [
  "async-broadcast",
  "async-fs",
  "async-lock",
+ "atomicow",
  "bevy_app",
  "bevy_asset_macros",
  "bevy_ecs",
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bevy_winit",
+ "bevy_window",
+ "bitflags 2.6.0",
  "blake3",
  "crossbeam-channel",
+ "derive_more",
+ "disqualified",
  "downcast-rs",
+ "either",
  "futures-io",
  "futures-lite",
  "js-sys",
  "parking_lot",
  "ron",
  "serde",
- "thiserror",
+ "stackfuture",
  "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -537,21 +568,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b0e132a89e254c0f5c8bc8deebb0f2490f5662f4aa2215a6996701446d6a7b"
+checksum = "7474b77fc27db11ec03d49ca04f1a7471f369dc373fd5e091a12ad7ab533d8c8"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_audio"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3050cb7244560313800b284e4b5eafcf91e833464e44d8407b20ec6c65974fc"
+checksum = "20e378c4005d9c47b7ebaf637a6a197e3953463615516ab709ba8b0c3c215c2e"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -568,24 +599,24 @@ dependencies = [
 
 [[package]]
 name = "bevy_color"
-version = "0.14.2"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82c031f121b8d72e7637c94ef139097613bd32935784d36728f83e77cfdf26f4"
+checksum = "87bccacba27db37375eb97ffc86e91a7d95db3f5faa6a834fa7306db02cde327"
 dependencies = [
  "bevy_math",
  "bevy_reflect",
  "bytemuck",
+ "derive_more",
  "encase",
  "serde",
- "thiserror",
  "wgpu-types",
 ]
 
 [[package]]
 name = "bevy_core"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccc7118a2865267136afb5e6a2c0aed30994e522f298b2ba0b088878e6ddf59"
+checksum = "ecccf7be33330f58d4c7033b212a25c414d388e3a8d55b61331346da5dbabf22"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -598,9 +629,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "559ad1dc48c3fa6bbace503df2fe44a7de38c8dfe11bee911ec0ffaf93e3e57d"
+checksum = "8a3fb9f84fa60c2006d4a15e039c3d08d4d10599441b9175907341a77a69d627"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -608,35 +639,37 @@ dependencies = [
  "bevy_core",
  "bevy_derive",
  "bevy_ecs",
+ "bevy_image",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
+ "bevy_window",
  "bitflags 2.6.0",
+ "derive_more",
  "nonmax",
  "radsort",
  "serde",
  "smallvec",
- "thiserror",
 ]
 
 [[package]]
 name = "bevy_derive"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8675f337f374b2b8ae90539982b947d171f9adb302d00c032b823bd5231f8978"
+checksum = "e141b7eda52a23bb88740b37a291e26394524cb9ee3b034c7014669671fc2bb5"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_diagnostic"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdcc1d7ba5797e4285a7867227134d4cabaaf8cabfb7cdc42eb697d3b3db0460"
+checksum = "fa97748337405089edfb2857f7608f21bcc648a7ad272c9209808aad252ed542"
 dependencies = [
  "bevy_app",
  "bevy_core",
@@ -650,8 +683,8 @@ dependencies = [
 
 [[package]]
 name = "bevy_easy_compute"
-version = "0.14.0"
-source = "git+https://github.com/AnthonyTornetta/bevy_easy_compute?branch=no-build-worker#3c36e030a1202c1289cd8e4dc379ef23c5e9d775"
+version = "0.15.0"
+source = "git+https://github.com/AnthonyTornetta/bevy_easy_compute?branch=no-build-worker#a9c11869f3b5b539c0b9aaeabc783f8ebcac32bd"
 dependencies = [
  "bevy",
  "bytemuck",
@@ -663,9 +696,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a3eed7f144811946ebfa1c740da9e3bcd6dd2dd4da844eda085249d29bc9fef"
+checksum = "cb4c4b60d2a712c6d5cbe610bac7ecf0838fc56a095fd5b15f30230873e84f15"
 dependencies = [
  "arrayvec",
  "bevy_ecs_macros",
@@ -675,37 +708,52 @@ dependencies = [
  "bevy_utils",
  "bitflags 2.6.0",
  "concurrent-queue",
+ "derive_more",
+ "disqualified",
  "fixedbitset 0.5.7",
  "nonmax",
  "petgraph",
  "serde",
- "thiserror",
+ "smallvec",
 ]
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d523630f2eb9fde6727e6c5ea48fa708079c5345da21ffeb1a4bd8ca761830da"
+checksum = "cb4296b3254b8bd29769f6a4512731b2e6c4b163343ca18b72316927315b6096"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_egui"
-version = "0.28.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4a90f30f2849a07d91e393b10c0cc05df09b5773c010ddde57dd8b583be230"
+checksum = "954fbe8551af4b40767ea9390ec7d32fe1070a6ab55d524cf0868c17f8469a55"
 dependencies = [
  "arboard",
- "bevy",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_time",
+ "bevy_utils",
+ "bevy_window",
+ "bevy_winit",
  "bytemuck",
- "console_log",
  "crossbeam-channel",
  "egui",
+ "encase",
  "js-sys",
  "log",
  "thread_local",
@@ -713,14 +761,15 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "webbrowser",
+ "wgpu-types",
  "winit",
 ]
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a20ec101b103f430481112591e280a8fc3f2db6741579f885595372073b749b"
+checksum = "bfe562b883fb652acde84cb6bb01cbc9f23c377e411f1484467ecfdd3a3d234e"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -728,24 +777,24 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64d84c2cbc6a027ba2c293752f9508e6777607acb1d98d03c25eb2a80d55372"
+checksum = "adc3a5f9e872133d7f5c2fab82e17781c19ed0b98f371362a23ed972bb538d20"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_input",
  "bevy_time",
  "bevy_utils",
+ "derive_more",
  "gilrs",
- "thiserror",
 ]
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248324352331d719071b0d1545a43e3d63470f4730e75312edee575f210d3a77"
+checksum = "e1c82341f6a3517efeeeef2fe68135ac3a91b11b6e369fc1a07f6e9a4b462b57"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -753,6 +802,7 @@ dependencies = [
  "bevy_core_pipeline",
  "bevy_ecs",
  "bevy_gizmos_macros",
+ "bevy_image",
  "bevy_math",
  "bevy_pbr",
  "bevy_reflect",
@@ -766,21 +816,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos_macros"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbe1708bb0e45a1d0fe0f32e998557689231dfe7bdae62083326e8008e97de23"
+checksum = "9454ac9f0a2141900ef9f3482af9333e490d5546bbea3cab63a777447d35beed"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_gltf"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb57239cb4209e52354268062cd1973892af3a2077ccbdb4d19259cbbc2d2c2d"
+checksum = "b21ed694796a001a5cf63de9ddc62fc017302b0e2998a361ef1126880ec93555"
 dependencies = [
  "base64 0.22.1",
  "bevy_animation",
@@ -791,6 +841,7 @@ dependencies = [
  "bevy_core_pipeline",
  "bevy_ecs",
  "bevy_hierarchy",
+ "bevy_image",
  "bevy_math",
  "bevy_pbr",
  "bevy_reflect",
@@ -799,19 +850,19 @@ dependencies = [
  "bevy_tasks",
  "bevy_transform",
  "bevy_utils",
+ "derive_more",
  "gltf",
  "percent-encoding",
  "serde",
  "serde_json",
  "smallvec",
- "thiserror",
 ]
 
 [[package]]
 name = "bevy_hanabi"
-version = "0.12.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ae72b8d54ce7d3444044dbdc4c4b005f97bd8f6c9a713bb8f498f5912201856"
+checksum = "d0a6beb69876c338eec53ad41c0e4f81dd3a8fbbeb0b9921eda38ac81be5d9fb"
 dependencies = [
  "anyhow",
  "bevy",
@@ -825,45 +876,70 @@ dependencies = [
  "rand_pcg",
  "ron",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "typetag",
+ "wgpu",
 ]
 
 [[package]]
 name = "bevy_hierarchy"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb332d2789442ca1577c765977bafefea1dcd4db29479713ec8c6932dfb82cdb"
+checksum = "6fe0b538beea7edbf30a6062242b99e67ff3bfa716566aacf91d5b5e027f02a2"
 dependencies = [
  "bevy_app",
  "bevy_core",
  "bevy_ecs",
  "bevy_reflect",
  "bevy_utils",
+ "disqualified",
  "smallvec",
 ]
 
+[[package]]
+name = "bevy_image"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db46fa6a2f9e20435f3231710abbb136d2cc0a376f3f8e6ecfe071e286f5a246"
+dependencies = [
+ "bevy_asset",
+ "bevy_color",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_utils",
+ "bitflags 2.6.0",
+ "bytemuck",
+ "derive_more",
+ "futures-lite",
+ "image",
+ "ktx2",
+ "ruzstd",
+ "serde",
+ "wgpu",
+]
+
 [[package]]
 name = "bevy_input"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ce5f27a8729b473205b01927cd6a5c4898a004cb8fcffa7c896e19ba999d98"
+checksum = "46b4ea60095d1a1851e40cb12481ad3d5d234e14376d6b73142a85586c266b74"
 dependencies = [
  "bevy_app",
+ "bevy_core",
  "bevy_ecs",
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
+ "derive_more",
  "serde",
  "smol_str",
- "thiserror",
 ]
 
 [[package]]
 name = "bevy_internal"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2463102e46d7d67440dbfe3bc97d34bf529c93191c4f4bb41395f4982062ff3"
+checksum = "d4237e6e9b03902321032f00f931f18a4a211093bd9a7cf81276a0228a2a4417"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -880,10 +956,12 @@ dependencies = [
  "bevy_gizmos",
  "bevy_gltf",
  "bevy_hierarchy",
+ "bevy_image",
  "bevy_input",
  "bevy_log",
  "bevy_math",
  "bevy_pbr",
+ "bevy_picking",
  "bevy_ptr",
  "bevy_reflect",
  "bevy_render",
@@ -902,84 +980,99 @@ dependencies = [
 
 [[package]]
 name = "bevy_kira_audio"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180a9cb47545ec53a9bb0b4b2fc79af325f86334c7370722fceea90c765af5d9"
+checksum = "2d5ccfdf82791bcda06527cf752aa5ceffb20b5a13af93dd4e2f1105bafb4c2e"
 dependencies = [
  "anyhow",
  "bevy",
  "kira",
  "parking_lot",
- "thiserror",
+ "thiserror 1.0.69",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_log"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f2c0c374af59007396793a51f747f6b10d74ca4acfb080ce0ade267118827b"
+checksum = "1a0bdb42b00ac3752f0d6f531fbda8abf313603157a7b3163da8529412119a0a"
 dependencies = [
  "android_log-sys",
  "bevy_app",
  "bevy_ecs",
  "bevy_utils",
  "tracing-log",
+ "tracing-oslog",
  "tracing-subscriber",
  "tracing-wasm",
 ]
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ec4a585ec2a6dedd4f4143c07219d120ae142121929f0d83e68d82a452cdc9b"
+checksum = "3954dbb56a66a6c09c783e767f6ceca0dc0492c22e536e2aeaefb5545eac33c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
  "toml_edit",
 ]
 
 [[package]]
 name = "bevy_math"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40253578fe83a5ffe5f4fcb4dfa196b7d9c50f36dc8efaa231a53344bf4b3e57"
+checksum = "9ae26f952598e293acac783d947b21af1809673cbeba25d76b969a56f287160b"
 dependencies = [
  "bevy_reflect",
- "glam 0.27.0",
+ "derive_more",
+ "glam 0.29.2",
+ "itertools 0.13.0",
  "rand",
+ "rand_distr",
  "serde",
  "smallvec",
- "thiserror",
 ]
 
 [[package]]
-name = "bevy_mikktspace"
-version = "0.14.1"
+name = "bevy_mesh"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24a1ad15685c6035e01bdc9d5ea082558ef1438e9d40d69fc552857dd7e83e71"
+checksum = "9c324d45ca0043a4696d7324b569de65be17066ed3a97dd42205bc28693d20b5"
 dependencies = [
- "glam 0.27.0",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_image",
+ "bevy_math",
+ "bevy_mikktspace",
+ "bevy_reflect",
+ "bevy_transform",
+ "bevy_utils",
+ "bitflags 2.6.0",
+ "bytemuck",
+ "derive_more",
+ "hexasphere",
+ "serde",
+ "wgpu",
 ]
 
 [[package]]
-name = "bevy_mod_billboard"
-version = "0.7.0"
+name = "bevy_mikktspace"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7fcf796f109d285725c5cbb4c38f6f93b809c7dbea14bc19c5b94ce01ad59de"
+checksum = "da5ea3ad25d74ea36ea45418ad799f135d046db35c322b9704c4a8934eb65ce9"
 dependencies = [
- "bevy",
- "bitflags 2.6.0",
- "smallvec",
+ "glam 0.29.2",
 ]
 
 [[package]]
 name = "bevy_mod_debugdump"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30f0eab3099d7d474b25a95a6a2a945e6089d75e099af5a571fe896f7c1a455b"
+checksum = "2855a39000ecb45c94f1b44ca14133398b8e6c6a0913d80d932037b7c1c016f5"
 dependencies = [
  "bevy_app",
  "bevy_color",
@@ -994,23 +1087,21 @@ dependencies = [
 
 [[package]]
 name = "bevy_obj"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891c44dd1ed9aa3fc80d55e9019f61771307c1a6eb4cae3117cef25bd9fcfcee"
+checksum = "3b4ab78247d8e47e43295fe971d10842d4fcbed89c36d6388755e69a37c8723d"
 dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_render",
- "bevy_utils",
- "thiserror",
+ "bevy",
+ "serde",
+ "thiserror 1.0.69",
  "tobj",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588998ba295db4a14dec54e571f272490f2885e5aaac59191fb4fa32a25835d0"
+checksum = "01b3bd8e646ddd3f27743b712957d2990d7361eb21044accc47c4f66711bf2cb"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1018,6 +1109,7 @@ dependencies = [
  "bevy_core_pipeline",
  "bevy_derive",
  "bevy_ecs",
+ "bevy_image",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
@@ -1026,6 +1118,7 @@ dependencies = [
  "bevy_window",
  "bitflags 2.6.0",
  "bytemuck",
+ "derive_more",
  "fixedbitset 0.5.7",
  "nonmax",
  "radsort",
@@ -1033,16 +1126,38 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "bevy_picking"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97a137ed706574dc4a01cac527eb2c44a0b0e477d5bce3afc892a9ee95ee0078"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "uuid",
+]
+
 [[package]]
 name = "bevy_ptr"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ed72afbb6249a6803a3ed7bd2f68ff080d9392f550475e050b34c1e1c1e3e8f"
+checksum = "2af9e30b40fb3f0a80a658419f670f2de1e743efcaca1952c43cdcc923287944"
 
 [[package]]
 name = "bevy_rapier3d"
 version = "0.27.0"
-source = "git+https://github.com/AnthonyTornetta/bevy_rapier?branch=context-component#f3ef621a80c9019dbbac3eaf5f74e5c41548154f"
+source = "git+https://github.com/AnthonyTornetta/bevy_rapier?branch=master#4f23bb022daa2ff582b3b19d77cce8fbacb7e765"
 dependencies = [
  "bevy",
  "bitflags 2.6.0",
@@ -1054,42 +1169,44 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb37e8fc3c61d04da480c95cc8c303aa7781afed6be01dae333b336af493c38e"
+checksum = "52a37e2ae5ed62df4a0e3f958076effe280b39bc81fe878587350897a89332a2"
 dependencies = [
+ "assert_type_match",
  "bevy_ptr",
  "bevy_reflect_derive",
  "bevy_utils",
+ "derive_more",
+ "disqualified",
  "downcast-rs",
  "erased-serde",
- "glam 0.27.0",
+ "glam 0.29.2",
  "petgraph",
  "serde",
  "smallvec",
  "smol_str",
- "thiserror",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc00d5086f5bf534b4c2dbeba549a6b8d3223515f3cb5ba4fdaabe953ec6cea"
+checksum = "94c683fc68c75fc26f90bb1e529590095380d7cec66f6610dbe6b93d9fd26f94"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_render"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f570f36154296ae5377587d5ef19e1feb4c5734923785c571f55a9fff091701"
+checksum = "d188f392edf4edcae53dfda07f3ec618a7a704183ec3f2e8504657a9fb940c8a"
 dependencies = [
  "async-channel",
  "bevy_app",
@@ -1101,8 +1218,9 @@ dependencies = [
  "bevy_ecs",
  "bevy_encase_derive",
  "bevy_hierarchy",
+ "bevy_image",
  "bevy_math",
- "bevy_mikktspace",
+ "bevy_mesh",
  "bevy_reflect",
  "bevy_render_macros",
  "bevy_tasks",
@@ -1110,24 +1228,22 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.6.0",
  "bytemuck",
  "codespan-reporting",
+ "derive_more",
  "downcast-rs",
  "encase",
  "futures-lite",
- "hexasphere",
- "image 0.25.2",
+ "image",
  "js-sys",
  "ktx2",
  "naga",
  "naga_oil",
  "nonmax",
- "ruzstd",
+ "offset-allocator",
  "send_wrapper",
  "serde",
  "smallvec",
- "thiserror",
  "wasm-bindgen",
  "web-sys",
  "wgpu",
@@ -1135,33 +1251,32 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe2d5008c7b4a8a516ef7b58452b8e40e4c2317068fc7505398bedf34e8d45f7"
+checksum = "4ab37ee2945f93e9ba8daf91cd968b4cba9c677ac51d349dd8512a107a9a5d92"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_renet2"
-version = "0.0.5"
-source = "git+https://github.com/UkoeHB/renet2?tag=0.0.5#4dac070c66b13c49f87bb5224d0ea6f578d5e846"
+version = "0.0.7"
+source = "git+https://github.com/UkoeHB/renet2?branch=main#c3e52bacd5f5e7b30f8fa7b3925260968134c3ba"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_time",
- "bevy_window",
  "renet2",
 ]
 
 [[package]]
 name = "bevy_scene"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3910087f6fc45e7833fb62e4de282c36a7012ff381c0584eb2cc84dede02e72f"
+checksum = "0e883fd3c6d6e7761f1fe662e79bc7bdc7e917e73e7bfc434b1d16d2a5852119"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1172,16 +1287,16 @@ dependencies = [
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
+ "derive_more",
  "serde",
- "thiserror",
  "uuid",
 ]
 
 [[package]]
 name = "bevy_sprite"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffdfb9a18968c8606286b6be83c9323ff9008b5cc043a23a3ecc95ff72fb20c"
+checksum = "e975abc3f3f3432d6ad86ae32de804e96d7faf59d27f32b065b5ddc1e73ed7e1"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1189,25 +1304,30 @@ dependencies = [
  "bevy_core_pipeline",
  "bevy_derive",
  "bevy_ecs",
+ "bevy_image",
  "bevy_math",
+ "bevy_picking",
  "bevy_reflect",
  "bevy_render",
  "bevy_transform",
  "bevy_utils",
+ "bevy_window",
  "bitflags 2.6.0",
  "bytemuck",
+ "derive_more",
  "fixedbitset 0.5.7",
  "guillotiere",
+ "nonmax",
  "radsort",
  "rectangle-pack",
- "thiserror",
+ "serde",
 ]
 
 [[package]]
 name = "bevy_state"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21066e7bb8014d1b1dd4f611f28c0f4ea9c7738cec2325281e4260a65072d509"
+checksum = "036ec832197eae51b8a842220d2df03591dff75b4566dcf0f81153bbcb2b593b"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1219,40 +1339,44 @@ dependencies = [
 
 [[package]]
 name = "bevy_state_macros"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a449823c420d1cc1fa6cf3d484570b08358e5eeedc1b86de1efcf9c10399b5"
+checksum = "2828eb6762af9eccfebb5e4a0e56dbc4bd07bf3192083fa3e8525cfdb3e95add"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_tasks"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84f5414c3f49c96e02ceccf5fa12fb6cfbf8b271d2a820902d6f622e9c2fa681"
+checksum = "5171c605b462b4e3249e01986505e62e3933aa27642a9f793c841814fcbbfb4f"
 dependencies = [
  "async-channel",
  "async-executor",
  "concurrent-queue",
+ "futures-channel",
  "futures-lite",
+ "pin-project",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
 name = "bevy_text"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3e77dd86def15f5380e6e7c178ec54e5e356b3f464e2ad35794a08d5ecb82e4"
+checksum = "4fb000b2abad9f82f7a137fac7e0e3d2c6488cbf8dd9ddbb68f9a6b7e7af8d84"
 dependencies = [
- "ab_glyph",
  "bevy_app",
  "bevy_asset",
  "bevy_color",
+ "bevy_derive",
  "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_image",
  "bevy_math",
  "bevy_reflect",
  "bevy_render",
@@ -1260,16 +1384,19 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "glyph_brush_layout",
+ "cosmic-text",
+ "derive_more",
  "serde",
- "thiserror",
+ "smallvec",
+ "sys-locale",
+ "unicode-bidi",
 ]
 
 [[package]]
 name = "bevy_time"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3fb18cfac62098e07786e422e84b4f45f469f27ccb5b572b409500bef465f33"
+checksum = "291b6993b899c04554fc034ebb9e0d7fde9cb9b2fb58dcd912bfa6247abdedbb"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1277,30 +1404,30 @@ dependencies = [
  "bevy_utils",
  "crossbeam-channel",
  "serde",
- "thiserror",
 ]
 
 [[package]]
 name = "bevy_transform"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ff09cea0dd0d4e6a3ed5f7dcbd4fbbcec07e518ceb64a4c8a75dedbe294ab60"
+checksum = "dc35665624d0c728107ab0920d5ad2d352362b906a8c376eaf375ec9c751faf4"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
  "bevy_hierarchy",
  "bevy_math",
  "bevy_reflect",
+ "derive_more",
  "serde",
- "thiserror",
 ]
 
 [[package]]
 name = "bevy_ui"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50684629a03b7d4891b5953e84dd971c7a8bbd290751bab5ce06e119b692220b"
+checksum = "43da3326aa592d6f6326e31893901bf17cd6957ded4e0ea02bc54652e5624b7f"
 dependencies = [
+ "accesskit",
  "bevy_a11y",
  "bevy_app",
  "bevy_asset",
@@ -1309,8 +1436,10 @@ dependencies = [
  "bevy_derive",
  "bevy_ecs",
  "bevy_hierarchy",
+ "bevy_image",
  "bevy_input",
  "bevy_math",
+ "bevy_picking",
  "bevy_reflect",
  "bevy_render",
  "bevy_sprite",
@@ -1319,23 +1448,23 @@ dependencies = [
  "bevy_utils",
  "bevy_window",
  "bytemuck",
+ "derive_more",
  "nonmax",
  "serde",
  "smallvec",
  "taffy",
- "thiserror",
 ]
 
 [[package]]
 name = "bevy_utils"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6efbe5a621b56cc4ffa41074929eca84107e242302496b9bb7550675e6bf2e7"
+checksum = "a0a48bad33c385a7818b7683a16c8b5c6930eded05cd3f176264fc1f5acea473"
 dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
  "getrandom",
- "hashbrown",
+ "hashbrown 0.14.5",
  "thread_local",
  "tracing",
  "web-time",
@@ -1343,24 +1472,26 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils_proc_macros"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a1e91b4294cad2d08620ac062509395d4f65247b636946d6497eaeccf4dbfd"
+checksum = "3dfd8d4a525b8f04f85863e45ccad3e922d4c11ed4a8d54f7f62a40bf83fb90f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "bevy_window"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ba11880f05a3b267ecfa4149fe789b0c046c35fd8418dd8899fad3a4359c986"
+checksum = "05f3520279aae65935d6a84443202c154ead3abebf8dae906d095665162de358"
 dependencies = [
+ "android-activity",
  "bevy_a11y",
  "bevy_app",
  "bevy_ecs",
+ "bevy_input",
  "bevy_math",
  "bevy_reflect",
  "bevy_utils",
@@ -1371,17 +1502,20 @@ dependencies = [
 
 [[package]]
 name = "bevy_winit"
-version = "0.14.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5aeb4b2e3b1ece189fcf37ea2de625ceab93e6ac2a14d4b15b0393351e4c18b"
+checksum = "581bb2249a82285707e0977a9a1c79a2248ede587fcb289708faa03a82ebfa7f"
 dependencies = [
+ "accesskit",
  "accesskit_winit",
  "approx",
  "bevy_a11y",
  "bevy_app",
+ "bevy_asset",
  "bevy_derive",
  "bevy_ecs",
  "bevy_hierarchy",
+ "bevy_image",
  "bevy_input",
  "bevy_log",
  "bevy_math",
@@ -1389,12 +1523,14 @@ dependencies = [
  "bevy_tasks",
  "bevy_utils",
  "bevy_window",
+ "bytemuck",
  "cfg-if",
  "crossbeam-channel",
  "raw-window-handle",
  "serde",
  "wasm-bindgen",
  "web-sys",
+ "wgpu-types",
  "winit",
 ]
 
@@ -1429,7 +1565,7 @@ dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools",
+ "itertools 0.12.1",
  "lazy_static",
  "lazycell",
  "proc-macro2",
@@ -1437,7 +1573,27 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.77",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
+dependencies = [
+ "bitflags 2.6.0",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.13.0",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 1.1.0",
+ "shlex",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1446,7 +1602,16 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
- "bit-vec",
+ "bit-vec 0.6.3",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec 0.8.0",
 ]
 
 [[package]]
@@ -1454,10 +1619,22 @@ name = "bit-vec"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
+[[package]]
+name = "bit-vec"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -1522,9 +1699,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.17.1"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
+checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -1537,7 +1714,7 @@ checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1569,7 +1746,7 @@ dependencies = [
  "polling",
  "rustix",
  "slab",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -1671,7 +1848,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
- "libloading 0.8.5",
+ "libloading",
 ]
 
 [[package]]
@@ -1705,7 +1882,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1733,49 +1910,12 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
 [[package]]
 name = "colorchoice"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
-[[package]]
-name = "com"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
-dependencies = [
- "com_macros",
-]
-
-[[package]]
-name = "com_macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
-dependencies = [
- "com_macros_support",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "com_macros_support"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -1806,20 +1946,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "console_log"
-version = "1.0.0"
+name = "const-fnv1a-hash"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f"
+checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
+
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 dependencies = [
- "log",
- "web-sys",
+ "const-random-macro",
 ]
 
 [[package]]
-name = "const-fnv1a-hash"
-version = "1.1.0"
+name = "const-random-macro"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "tiny-keccak",
+]
 
 [[package]]
 name = "const_panic"
@@ -1848,12 +1998,6 @@ dependencies = [
  "const_soft_float",
 ]
 
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
 [[package]]
 name = "copyless"
 version = "0.1.5"
@@ -1870,6 +2014,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -1883,7 +2037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics-types",
  "foreign-types",
  "libc",
@@ -1896,7 +2050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "libc",
 ]
 
@@ -1917,12 +2071,35 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9"
 dependencies = [
- "bindgen",
+ "bindgen 0.69.4",
+]
+
+[[package]]
+name = "cosmic-text"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2"
+dependencies = [
+ "bitflags 2.6.0",
+ "fontdb",
+ "log",
+ "rangemap",
+ "rayon",
+ "rustc-hash 1.1.0",
+ "rustybuzz",
+ "self_cell",
+ "swash",
+ "sys-locale",
+ "ttf-parser 0.21.1",
+ "unicode-bidi",
+ "unicode-linebreak",
+ "unicode-script",
+ "unicode-segmentation",
 ]
 
 [[package]]
 name = "cosmos_client"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "anyhow",
  "arboard",
@@ -1931,7 +2108,6 @@ dependencies = [
  "bevy_easy_compute",
  "bevy_hanabi",
  "bevy_kira_audio",
- "bevy_mod_billboard",
  "bevy_mod_debugdump",
  "bevy_obj",
  "bevy_rapier3d",
@@ -1944,8 +2120,7 @@ dependencies = [
  "cosmos_core",
  "derive_more",
  "futures-lite",
- "image 0.25.2",
- "iyes_perf_ui",
+ "image",
  "local-ip-address",
  "noise",
  "rand",
@@ -1954,14 +2129,14 @@ dependencies = [
  "renet2",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 2.0.4",
  "thread-priority",
  "toml",
 ]
 
 [[package]]
 name = "cosmos_core"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "anyhow",
  "bevy",
@@ -1974,7 +2149,7 @@ dependencies = [
  "bitflags 2.6.0",
  "bytemuck",
  "derive_more",
- "image 0.25.2",
+ "image",
  "local-ip-address",
  "lz4_flex",
  "noise",
@@ -1983,12 +2158,12 @@ dependencies = [
  "rayon",
  "renet2",
  "serde",
- "thiserror",
+ "thiserror 2.0.4",
 ]
 
 [[package]]
 name = "cosmos_server"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "anyhow",
  "bevy",
@@ -2005,7 +2180,6 @@ dependencies = [
  "crossterm",
  "derive_more",
  "futures-lite",
- "iyes_perf_ui",
  "local-ip-address",
  "noise",
  "rand",
@@ -2015,7 +2189,7 @@ dependencies = [
  "renet2_visualizer",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 2.0.4",
  "thread-priority",
  "walkdir",
 ]
@@ -2119,16 +2293,16 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crossterm"
-version = "0.27.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
+checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
  "bitflags 2.6.0",
  "crossterm_winapi",
  "futures-core",
- "libc",
  "mio",
  "parking_lot",
+ "rustix",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -2143,6 +2317,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -2155,21 +2335,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "cursor-icon"
-version = "1.1.0"
+name = "ctrlc"
+version = "3.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix",
+ "windows-sys 0.59.0",
+]
 
 [[package]]
-name = "d3d12"
-version = "0.20.0"
+name = "cursor-icon"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813"
-dependencies = [
- "bitflags 2.6.0",
- "libloading 0.8.5",
- "winapi",
-]
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
 
 [[package]]
 name = "dasp_sample"
@@ -2185,15 +2364,23 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "derive_more"
-version = "0.99.18"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version",
- "syn 2.0.77",
+ "syn 2.0.90",
+ "unicode-xid",
 ]
 
 [[package]]
@@ -2202,13 +2389,19 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "disqualified"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9c272297e804878a2a4b707cfcfc6d2328b5bb936944613b4fdf2b9269afdfd"
+
 [[package]]
 name = "dlib"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.5",
+ "libloading",
 ]
 
 [[package]]
@@ -2234,9 +2427,9 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
 
 [[package]]
 name = "ecolor"
-version = "0.28.1"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8"
+checksum = "775cfde491852059e386c4e1deb4aef381c617dc364184c6f6afee99b87c402b"
 dependencies = [
  "bytemuck",
  "emath",
@@ -2244,9 +2437,9 @@ dependencies = [
 
 [[package]]
 name = "egui"
-version = "0.28.1"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798"
+checksum = "53eafabcce0cb2325a59a98736efe0bf060585b437763f8c476957fb274bb974"
 dependencies = [
  "ahash",
  "emath",
@@ -2262,43 +2455,52 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "emath"
-version = "0.28.1"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6"
+checksum = "b1fe0049ce51d0fb414d029e668dd72eb30bc2b739bf34296ed97bd33df544f3"
 dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "ena"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "encase"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9299a95fa5671ddf29ecc22b00e121843a65cb9ff24911e394b4ae556baf36"
+checksum = "b0a05902cf601ed11d564128448097b98ebe3c6574bd7b6a653a3d56d54aa020"
 dependencies = [
  "const_panic",
  "encase_derive",
- "glam 0.27.0",
- "thiserror",
+ "glam 0.29.2",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "encase_derive"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e09decb3beb1fe2db6940f598957b2e1f7df6206a804d438ff6cb2a9cddc10"
+checksum = "181d475b694e2dd56ae919ce7699d344d1fd259292d590c723a50d1189a2ea85"
 dependencies = [
  "encase_derive_impl",
 ]
 
 [[package]]
 name = "encase_derive_impl"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47"
+checksum = "f97b51c5cc57ef7c5f7a0c57c250251c49ee4c28f819f87ac32f4aceabc36792"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2312,19 +2514,26 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.28.1"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01"
+checksum = "a32af8da821bd4f43f2c137e295459ee2e1661d87ca8779dfa0eaf45d870e20f"
 dependencies = [
  "ab_glyph",
  "ahash",
  "bytemuck",
  "ecolor",
  "emath",
+ "epaint_default_fonts",
  "nohash-hasher",
  "parking_lot",
 ]
 
+[[package]]
+name = "epaint_default_fonts"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "483440db0b7993cf77a20314f08311dbe95675092405518c0677aa08c151a3ea"
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -2436,6 +2645,44 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
+[[package]]
+name = "font-types"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3971f9a5ca983419cdc386941ba3b9e1feba01a0ab888adf78739feb2798492"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "fontconfig-parser"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
+dependencies = [
+ "roxmltree",
+]
+
+[[package]]
+name = "fontdb"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
+dependencies = [
+ "fontconfig-parser",
+ "log",
+ "memmap2",
+ "slotmap",
+ "tinyvec",
+ "ttf-parser 0.20.0",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -2454,7 +2701,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2472,6 +2719,15 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "futures-core"
 version = "0.3.30"
@@ -2486,9 +2742,9 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
-version = "2.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -2541,9 +2797,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs"
-version = "0.10.9"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb8c78963a8856a5b10015c9349176ff5edbc8095384d52aada467a848bc03a"
+checksum = "bbb2c998745a3c1ac90f64f4f7b3a54219fd3612d7705e7798212935641ed18f"
 dependencies = [
  "fnv",
  "gilrs-core",
@@ -2554,11 +2810,11 @@ dependencies = [
 
 [[package]]
 name = "gilrs-core"
-version = "0.5.15"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732dadc05170599ddec9a89653f10d7a2af54da9181b3fa6e2bd49907ec8f7e4"
+checksum = "495af945e45efd6386227613cd9fb7bd7c43d3c095040e30c5304c489e6abed5"
 dependencies = [
- "core-foundation",
+ "core-foundation 0.10.0",
  "inotify",
  "io-kit-sys",
  "js-sys",
@@ -2595,9 +2851,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.27.0"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9"
+checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677"
 dependencies = [
  "bytemuck",
  "rand",
@@ -2612,9 +2868,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glow"
-version = "0.13.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
+checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -2643,7 +2899,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2660,24 +2916,13 @@ dependencies = [
 
 [[package]]
 name = "glutin_wgl_sys"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
+checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c"
 dependencies = [
  "gl_generator",
 ]
 
-[[package]]
-name = "glyph_brush_layout"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1e288bfd2f6c0313f78bf5aa538356ad481a3bb97e9b7f93220ab0066c5992"
-dependencies = [
- "ab_glyph",
- "approx",
- "xi-unicode",
-]
-
 [[package]]
 name = "gpu-alloc"
 version = "0.6.0"
@@ -2699,15 +2944,14 @@ dependencies = [
 
 [[package]]
 name = "gpu-allocator"
-version = "0.25.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
+checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd"
 dependencies = [
  "log",
  "presser",
- "thiserror",
- "winapi",
- "windows 0.52.0",
+ "thiserror 1.0.69",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -2718,7 +2962,7 @@ checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
 dependencies = [
  "bitflags 2.6.0",
  "gpu-descriptor-types",
- "hashbrown",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -2746,6 +2990,15 @@ dependencies = [
  "svg_fmt",
 ]
 
+[[package]]
+name = "hash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -2758,18 +3011,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "hassle-rs"
-version = "0.11.0"
+name = "hashbrown"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
- "bitflags 2.6.0",
- "com",
- "libc",
- "libloading 0.8.5",
- "thiserror",
- "widestring",
- "winapi",
+ "foldhash",
+]
+
+[[package]]
+name = "heapless"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
+dependencies = [
+ "hash32",
+ "stable_deref_trait",
 ]
 
 [[package]]
@@ -2786,12 +3043,12 @@ checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "hexasphere"
-version = "12.0.0"
+version = "15.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edd6b038160f086b0a7496edae34169ae22f328793cbe2b627a5a3d8373748ec"
+checksum = "741ab88b8cc670443da777c3daab02cebf5a3caccfc04e3c052f55c94d1643fe"
 dependencies = [
  "constgebra",
- "glam 0.27.0",
+ "glam 0.29.2",
 ]
 
 [[package]]
@@ -2827,21 +3084,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.9"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-traits",
-]
-
-[[package]]
-name = "image"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -2852,9 +3097,9 @@ dependencies = [
 
 [[package]]
 name = "immutable-chunkmap"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4419f022e55cc63d5bbd6b44b71e1d226b9c9480a47824c706e9d54e5c40c5eb"
+checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578"
 dependencies = [
  "arrayvec",
 ]
@@ -2866,7 +3111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -2877,11 +3122,11 @@ checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
 
 [[package]]
 name = "inotify"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "inotify-sys",
  "libc",
 ]
@@ -2928,9 +3173,18 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itertools"
-version = "0.12.1"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
@@ -2941,16 +3195,6 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
-[[package]]
-name = "iyes_perf_ui"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c7015cab699e6224bd5519854cff04280dddab4257090f4720e85d1095e66c8"
-dependencies = [
- "bevy",
- "num-traits",
-]
-
 [[package]]
 name = "jni"
 version = "0.21.1"
@@ -2962,7 +3206,7 @@ dependencies = [
  "combine",
  "jni-sys",
  "log",
- "thiserror",
+ "thiserror 1.0.69",
  "walkdir",
  "windows-sys 0.45.0",
 ]
@@ -2990,10 +3234,11 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -3004,7 +3249,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
 dependencies = [
  "libc",
- "libloading 0.8.5",
+ "libloading",
  "pkg-config",
 ]
 
@@ -3058,19 +3303,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.167"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
+checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
 
 [[package]]
 name = "libloading"
@@ -3123,14 +3358,14 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
 
 [[package]]
 name = "local-ip-address"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b435d7dd476416a905f9634dff8c330cee8d3168fdd1fbd472a17d1a75c00c3e"
+checksum = "3669cf5561f8d27e8fc84cc15e58350e70f557d4d65f70e3154e54cd2f8e1782"
 dependencies = [
  "libc",
  "neli",
- "thiserror",
- "windows-sys 0.48.0",
+ "thiserror 1.0.69",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3212,9 +3447,9 @@ dependencies = [
 
 [[package]]
 name = "metal"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb"
+checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
 dependencies = [
  "bitflags 2.6.0",
  "block",
@@ -3258,45 +3493,45 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "log",
  "wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "naga"
-version = "0.20.0"
+version = "23.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231"
+checksum = "3d5941e45a15b53aad4375eedf02033adb7a28931eedc31117faffa52e6a857e"
 dependencies = [
  "arrayvec",
- "bit-set",
+ "bit-set 0.8.0",
  "bitflags 2.6.0",
+ "cfg_aliases 0.1.1",
  "codespan-reporting",
  "hexf-parse",
  "indexmap",
  "log",
- "num-traits",
  "pp-rs",
  "rustc-hash 1.1.0",
  "spirv",
  "termcolor",
- "thiserror",
+ "thiserror 1.0.69",
  "unicode-xid",
 ]
 
 [[package]]
 name = "naga_oil"
-version = "0.14.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "275d9720a7338eedac966141089232514c84d76a246a58ef501af88c5edf402f"
+checksum = "31ea1f080bb359927cd5404d0af1e5e6758f4f2d82ecfbebb0a0c434764e40f1"
 dependencies = [
- "bit-set",
+ "bit-set 0.5.3",
  "codespan-reporting",
  "data-encoding",
  "indexmap",
@@ -3305,19 +3540,19 @@ dependencies = [
  "regex",
  "regex-syntax 0.8.4",
  "rustc-hash 1.1.0",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "unicode-ident",
 ]
 
 [[package]]
 name = "nalgebra"
-version = "0.33.0"
+version = "0.33.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c4b5f057b303842cf3262c27e465f4c303572e7f6b0648f60e16248ac3397f4"
+checksum = "26aecdf64b707efd1310e3544d709c5c0ac61c13756046aaaba41be5c4f66a3b"
 dependencies = [
  "approx",
- "glam 0.27.0",
+ "glam 0.29.2",
  "matrixmultiply",
  "nalgebra-macros",
  "num-complex",
@@ -3336,7 +3571,7 @@ checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3350,7 +3585,7 @@ dependencies = [
  "log",
  "ndk-sys 0.5.0+25.2.9519653",
  "num_enum",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3365,7 +3600,7 @@ dependencies = [
  "ndk-sys 0.6.0+11769913",
  "num_enum",
  "raw-window-handle",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3509,7 +3744,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3560,7 +3795,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3804,11 +4039,21 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "109983a091271ee8916076731ba5fdc9ee22fea871bc7c6ceab9bfd423eb1d99"
 
+[[package]]
+name = "offset-allocator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e234d535da3521eb95106f40f0b73483d80bfb3aacf27c40d7e2b72f1a3e00a2"
+dependencies = [
+ "log",
+ "nonmax",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "opaque-debug"
@@ -3846,7 +4091,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
 dependencies = [
- "ttf-parser",
+ "ttf-parser 0.24.1",
 ]
 
 [[package]]
@@ -3880,27 +4125,29 @@ dependencies = [
 
 [[package]]
 name = "parry3d"
-version = "0.16.1"
+version = "0.17.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec1d9cc5a359352e2be7e47270cef9f9e175794c03302553353804a436228e7f"
+checksum = "bfe2c6103af4dbaa10469f2929aab8f11c33bd4647ae525174c23a3ecabf7207"
 dependencies = [
  "approx",
  "arrayvec",
  "bitflags 2.6.0",
  "downcast-rs",
  "either",
+ "ena",
  "log",
  "nalgebra",
  "num-derive",
  "num-traits",
  "ordered-float",
+ "rstar",
  "rustc-hash 2.0.0",
  "serde",
  "simba",
  "slab",
  "smallvec",
  "spade",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3944,7 +4191,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -4039,6 +4286,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b"
 
+[[package]]
+name = "prettyplease"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "3.2.0"
@@ -4050,9 +4307,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -4117,6 +4374,16 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "rand_distr"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
 [[package]]
 name = "rand_pcg"
 version = "0.3.1"
@@ -4141,15 +4408,21 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
 
+[[package]]
+name = "rangemap"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684"
+
 [[package]]
 name = "rapier3d"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfa17fa28a7a4cfaebf669f57ca34dce0e758b295bd8a2aa1fbac4e054fb836"
+checksum = "87360935d1a54802efe0ddf908489436bb49c84865c36c930131843c7b1dc97d"
 dependencies = [
  "approx",
  "arrayvec",
- "bit-vec",
+ "bit-vec 0.7.0",
  "bitflags 2.6.0",
  "crossbeam",
  "downcast-rs",
@@ -4162,7 +4435,7 @@ dependencies = [
  "rustc-hash 2.0.0",
  "serde",
  "simba",
- "thiserror",
+ "thiserror 1.0.69",
  "vec_map",
 ]
 
@@ -4198,6 +4471,16 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "read-fonts"
+version = "0.22.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a04b892cb6f91951f144c33321843790c8574c825aafdb16d815fd7183b5229"
+dependencies = [
+ "bytemuck",
+ "font-types",
+]
+
 [[package]]
 name = "rectangle-pack"
 version = "0.4.2"
@@ -4274,8 +4557,8 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
 [[package]]
 name = "renet2"
-version = "0.0.5"
-source = "git+https://github.com/UkoeHB/renet2?tag=0.0.5#4dac070c66b13c49f87bb5224d0ea6f578d5e846"
+version = "0.0.7"
+source = "git+https://github.com/UkoeHB/renet2?branch=main#c3e52bacd5f5e7b30f8fa7b3925260968134c3ba"
 dependencies = [
  "bevy_ecs",
  "bevy_reflect",
@@ -4290,8 +4573,8 @@ dependencies = [
 
 [[package]]
 name = "renet2_visualizer"
-version = "0.0.4"
-source = "git+https://github.com/UkoeHB/renet2?tag=0.0.5#4dac070c66b13c49f87bb5224d0ea6f578d5e846"
+version = "0.0.7"
+source = "git+https://github.com/UkoeHB/renet2?branch=main#c3e52bacd5f5e7b30f8fa7b3925260968134c3ba"
 dependencies = [
  "bevy_ecs",
  "egui",
@@ -4300,8 +4583,8 @@ dependencies = [
 
 [[package]]
 name = "renetcode2"
-version = "0.0.5"
-source = "git+https://github.com/UkoeHB/renet2?tag=0.0.5#4dac070c66b13c49f87bb5224d0ea6f578d5e846"
+version = "0.0.7"
+source = "git+https://github.com/UkoeHB/renet2?branch=main#c3e52bacd5f5e7b30f8fa7b3925260968134c3ba"
 dependencies = [
  "chacha20poly1305",
  "log",
@@ -4324,12 +4607,12 @@ checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30"
 
 [[package]]
 name = "rodio"
-version = "0.18.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3"
+checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb"
 dependencies = [
  "cpal",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -4344,6 +4627,23 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "roxmltree"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
+
+[[package]]
+name = "rstar"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "421400d13ccfd26dfa5858199c30a5d76f9c54e0dba7575273025b43c5175dbb"
+dependencies = [
+ "heapless",
+ "num-traits",
+ "smallvec",
+]
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -4356,15 +4656,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.35"
@@ -4384,13 +4675,29 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
+[[package]]
+name = "rustybuzz"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
+dependencies = [
+ "bitflags 2.6.0",
+ "bytemuck",
+ "libm",
+ "smallvec",
+ "ttf-parser 0.21.1",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-properties",
+ "unicode-script",
+]
+
 [[package]]
 name = "ruzstd"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c8b8f3d26bd9f945e5cbae77f7cdfbf37af9a66956f1115eb4516e45df519f4"
+checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f"
 dependencies = [
- "byteorder",
  "twox-hash",
 ]
 
@@ -4444,10 +4751,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "semver"
-version = "1.0.23"
+name = "self_cell"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
 
 [[package]]
 name = "send_wrapper"
@@ -4472,7 +4779,7 @@ checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -4560,6 +4867,16 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
+[[package]]
+name = "skrifa"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe"
+dependencies = [
+ "bytemuck",
+ "read-fonts",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -4601,7 +4918,7 @@ dependencies = [
  "log",
  "memmap2",
  "rustix",
- "thiserror",
+ "thiserror 1.0.69",
  "wayland-backend",
  "wayland-client",
  "wayland-csd-frame",
@@ -4627,7 +4944,7 @@ version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bd14cf9e23b5241e1b1289ed3b9afc7746c95ead8df52d9254f5ed2d40c561b"
 dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
  "num-traits",
  "robust",
  "smallvec",
@@ -4642,6 +4959,18 @@ dependencies = [
  "bitflags 2.6.0",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "stackfuture"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eae92052b72ef70dafa16eddbabffc77e5ca3574be2f7bc1127b36f0a7ad7f2"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -4672,6 +5001,17 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca"
 
+[[package]]
+name = "swash"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2"
+dependencies = [
+ "skrifa",
+ "yazi",
+ "zeno",
+]
+
 [[package]]
 name = "symphonia"
 version = "0.5.4"
@@ -4756,27 +5096,35 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "sys-locale"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "sysinfo"
-version = "0.30.13"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
+checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af"
 dependencies = [
- "cfg-if",
  "core-foundation-sys",
  "libc",
+ "memchr",
  "ntapi",
- "once_cell",
- "windows 0.52.0",
+ "windows 0.54.0",
 ]
 
 [[package]]
@@ -4803,29 +5151,49 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490"
+dependencies = [
+ "thiserror-impl 2.0.4",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "thread-priority"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d3b04d33c9633b8662b167b847c7ab521f83d1ae20f2321b65b5b925e532e36"
+checksum = "cfe075d7053dae61ac5413a34ea7d4913b6e6207844fd726bdd858b37ff72bf5"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -4856,6 +5224,15 @@ dependencies = [
  "weezl",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tiny-skia"
 version = "0.11.4"
@@ -4958,7 +5335,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -4982,6 +5359,21 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-oslog"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "528bdd1f0e27b5dd9a4ededf154e824b0532731e4af73bb531de46276e0aab1e"
+dependencies = [
+ "bindgen 0.70.1",
+ "cc",
+ "cfg-if",
+ "once_cell",
+ "parking_lot",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.18"
@@ -5011,6 +5403,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "ttf-parser"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
+
+[[package]]
+name = "ttf-parser"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
+
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
@@ -5060,7 +5464,7 @@ checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5069,12 +5473,30 @@ version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
+[[package]]
+name = "unicode-bidi-mirroring"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"
+
+[[package]]
+name = "unicode-ccc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
 [[package]]
 name = "unicode-normalization"
 version = "0.1.23"
@@ -5084,6 +5506,18 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-properties"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
+
+[[package]]
+name = "unicode-script"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f"
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"
@@ -5098,9 +5532,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -5177,9 +5611,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5188,36 +5622,37 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5225,22 +5660,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"
 
 [[package]]
 name = "wayland-backend"
@@ -5353,9 +5788,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5378,7 +5813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e"
 dependencies = [
  "block2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "home",
  "jni",
  "log",
@@ -5397,12 +5832,11 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "wgpu"
-version = "0.20.1"
+version = "23.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c"
+checksum = "80f70000db37c469ea9d67defdc13024ddf9a5f1b89cb2941b812ad7cde1735a"
 dependencies = [
  "arrayvec",
- "cfg-if",
  "cfg_aliases 0.1.1",
  "document-features",
  "js-sys",
@@ -5423,15 +5857,14 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "0.21.1"
+version = "23.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39"
+checksum = "d63c3c478de8e7e01786479919c8769f62a22eec16788d8c2ac77ce2c132778a"
 dependencies = [
  "arrayvec",
- "bit-vec",
+ "bit-vec 0.8.0",
  "bitflags 2.6.0",
  "cfg_aliases 0.1.1",
- "codespan-reporting",
  "document-features",
  "indexmap",
  "log",
@@ -5442,37 +5875,35 @@ dependencies = [
  "raw-window-handle",
  "rustc-hash 1.1.0",
  "smallvec",
- "thiserror",
- "web-sys",
+ "thiserror 1.0.69",
  "wgpu-hal",
  "wgpu-types",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "0.21.1"
+version = "23.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222"
+checksum = "89364b8a0b211adc7b16aeaf1bd5ad4a919c1154b44c9ce27838213ba05fd821"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
- "bit-set",
+ "bit-set 0.8.0",
  "bitflags 2.6.0",
  "block",
+ "bytemuck",
  "cfg_aliases 0.1.1",
  "core-graphics-types",
- "d3d12",
  "glow",
  "glutin_wgl_sys",
  "gpu-alloc",
  "gpu-allocator",
  "gpu-descriptor",
- "hassle-rs",
  "js-sys",
  "khronos-egl",
  "libc",
- "libloading 0.8.5",
+ "libloading",
  "log",
  "metal",
  "naga",
@@ -5486,18 +5917,19 @@ dependencies = [
  "renderdoc-sys",
  "rustc-hash 1.1.0",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "web-sys",
  "wgpu-types",
- "winapi",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
 ]
 
 [[package]]
 name = "wgpu-types"
-version = "0.20.0"
+version = "23.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef"
+checksum = "610f6ff27778148c31093f3b03abc4840f9636d58d597ca2f5977433acfe0068"
 dependencies = [
  "bitflags 2.6.0",
  "js-sys",
@@ -5514,12 +5946,6 @@ dependencies = [
  "safe_arch",
 ]
 
-[[package]]
-name = "widestring"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -5551,16 +5977,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.54.0"
@@ -5568,8 +5984,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
  "windows-core 0.54.0",
- "windows-implement 0.53.0",
- "windows-interface 0.53.0",
  "windows-targets 0.52.6",
 ]
 
@@ -5583,15 +5997,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.54.0"
@@ -5608,24 +6013,13 @@ version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
- "windows-implement 0.58.0",
- "windows-interface 0.58.0",
+ "windows-implement",
+ "windows-interface",
  "windows-result 0.2.0",
  "windows-strings",
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-implement"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
 [[package]]
 name = "windows-implement"
 version = "0.58.0"
@@ -5634,18 +6028,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5656,7 +6039,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5916,7 +6299,7 @@ dependencies = [
  "calloop",
  "cfg_aliases 0.2.1",
  "concurrent-queue",
- "core-foundation",
+ "core-foundation 0.9.4",
  "core-graphics",
  "cursor-icon",
  "dpi",
@@ -5982,7 +6365,7 @@ dependencies = [
  "as-raw-xcb-connection",
  "gethostname",
  "libc",
- "libloading 0.8.5",
+ "libloading",
  "once_cell",
  "rustix",
  "x11rb-protocol",
@@ -6000,12 +6383,6 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
 
-[[package]]
-name = "xi-unicode"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
-
 [[package]]
 name = "xkbcommon-dl"
 version = "0.4.2"
@@ -6031,6 +6408,18 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
 
+[[package]]
+name = "yazi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
+
+[[package]]
+name = "zeno"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -6049,7 +6438,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.90",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 6297fce06..06d26336c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,48 +6,49 @@ members = ["cosmos_client", "cosmos_core", "cosmos_server"]
 resolver = "2"
 
 [workspace.dependencies]
-bevy = { version = "0.14.1", default-features = false }
-bevy_rapier3d = { git = "https://github.com/AnthonyTornetta/bevy_rapier", version = "0.27.0", branch = "context-component", features = [
+bevy = { version = "0.15", default-features = false }
+bevy_rapier3d = { git = "https://github.com/AnthonyTornetta/bevy_rapier", version = "0.27.0", branch = "master", features = [
     "simd-stable",
     "serde-serialize",
 ] }
 
-bevy_easy_compute = { git = "https://github.com/AnthonyTornetta/bevy_easy_compute", branch = "no-build-worker", version = "0.14.0" }
+bevy_easy_compute = { git = "https://github.com/AnthonyTornetta/bevy_easy_compute", branch = "no-build-worker", version = "0.15" }
 
-renet2 = { git = "https://github.com/UkoeHB/renet2", tag = "0.0.5" }
-serde = "1.0.203"
-serde_json = "1.0.120"
-bincode = "1.3.3"
+renet2 = { git = "https://github.com/UkoeHB/renet2", branch = "main", version = "0.0.7" }
+serde = "1.0"
+serde_json = "1.0"
+bincode = "1.3"
 noise = "0.9.0"
 # Check out https://crates.io/crates/tinyrand in future
-bevy_renet2 = { git = "https://github.com/UkoeHB/renet2", tag = "0.0.5" }
+bevy_renet2 = { git = "https://github.com/UkoeHB/renet2", branch = "main", version = "0.0.7" }
 rand = "0.8.5"
 rand_chacha = "0.3.1"
+# bigdecimal 0.4.6 has a formatting regression that causes a crash
 bigdecimal = "0.4.5"
-rayon = "1.10.0"
-futures-lite = "2.3.0"
-local-ip-address = "0.6.1"
-image = { version = "0.25.1", default-features = false, features = ["png"] }
-bevy-inspector-egui = "0.25.0"
-crossterm = { version = "0.27.0", features = ["event-stream"] }
-renet2_visualizer = { git = "https://github.com/UkoeHB/renet2", tag = "0.0.5" }
-walkdir = "2.5.0"
-toml = "0.8.14"
+rayon = "1.10"
+futures-lite = "2.5"
+local-ip-address = "0.6.3"
+image = { version = "0.25.5", default-features = false, features = ["png"] }
+bevy-inspector-egui = "0.28.0"
+crossterm = { version = "0.28.1", features = ["event-stream"] }
+renet2_visualizer = { git = "https://github.com/UkoeHB/renet2", branch = "main", version = "0.0.7" }
+walkdir = "2.5"
+toml = "0.8.19"
 lz4_flex = "0.11.3"
-thread-priority = "1.1.0"
-bevy_kira_audio = "0.20.0"
-anyhow = "1.0.86"
-thiserror = "1.0.61"
-bitflags = "2.6.0"
-bevy_mod_debugdump = "0.11.0"
-arboard = "3.4.0"
-derive_more = "0.99.18"
-clap = "4.5.8"
-bytemuck = "1.16.1"
-bevy_obj = "0.14"
-bevy_hanabi = "0.12.1"
-iyes_perf_ui = "0.3.0"
-bevy_mod_billboard = "0.7.0"
+thread-priority = "1.2"
+bevy_kira_audio = "0.21.0"
+anyhow = "1.0"
+thiserror = "2.0"
+bitflags = "2.6"
+bevy_mod_debugdump = "0.12.0"
+arboard = "3.4"
+derive_more = "1.0"
+clap = "4.5"
+bytemuck = "1.20"
+bevy_obj = "0.15"
+bevy_hanabi = "0.14"
+# iyes_perf_ui = "0.3.0"
+# bevy_mod_billboard = "0.7.0"
 
 # For any non workspace package
 [profile.dev.package."*"]
diff --git a/README.md b/README.md
index 83ac06c04..28c1d4650 100644
--- a/README.md
+++ b/README.md
@@ -55,41 +55,31 @@ Every time you want to view the documentation, navigate to the `docs/` directory
 
 #### System ordering
 
-If you want to view the ordering of the systems, run (on linux) `cargo run --features print-schedule | dot -Tsvg > ./debug.svg` for either the cosmos_client or cosmos_server projects. If the `print-schedule` feature is enabled, these are setup to use bevy_mod_debugdump to create graphs of the `Update` schedule. If you need a different schedule, you'll have to change the `main.rs` file for either project to specify the correct schedule.  Note, you'll need [graphviz](https://graphviz.org/download/) for the dot cmomand to work.
+If you want to view the ordering of the systems, run (on linux) `cargo run --features print-schedule | dot -Tsvg > ./debug.svg` for either the cosmos_client or cosmos_server projects. If the `print-schedule` feature is enabled, these are setup to use bevy_mod_debugdump to create graphs of the `Update` schedule. If you need a different schedule, you'll have to change the `main.rs` file for either project to specify the correct schedule. Note, you'll need [graphviz](https://graphviz.org/download/) for the dot cmomand to work.
 
 # Cosmos Roadmap
 
 See [the issues page](https://github.com/AnthonyTornetta/Cosmos/issues) for the list of current features/bugs in development.
 
 ## Release 0.0.7a (In Progress)
-- [ ] Wires
-  - [ ] Electrical
+
 - [ ] Music
+- [x] Creative Mode
+- [x] Chat
 - [x] Galaxy map
   - [x] Able to view stars
   - [x] Zoom in to view planets
   - [x] Set waypoint
 - [x] Rotating Planet
-- [ ] Biosphere Improvements
-  - [ ] Ice biosphere glaciers
-  - [ ] Better Water block
-  - [ ] Better Lava block
-  - [ ] Structures
-    - [ ] Rocks spawning
-    - [ ] Undergrowth
-    - [ ] 1 More tree type
-  - [ ] Groundwork for biomes
-    - [ ] Planes
-    - [ ] Redwood forest
-    - [ ] 1 Additional forest
-    - [ ] Ocean
   - [x] On-planet skybox
 - [x] Dropped item entity
   - [x] When storage is broken, drop items on ground
   - [x] If not enough inventory room when player is mining something, drop item
 - [x] Fix missing chunks on planets
+- [x] Bevy 0.15
 
 ## Release 0.0.6a
+
 - [x] Place rotated blocks
 - [x] Add main menu
   - [x] Customizable settings
@@ -136,6 +126,7 @@ See [the issues page](https://github.com/AnthonyTornetta/Cosmos/issues) for the
 - [x] Update to bevy 0.14
 
 ## Release 0.0.5a
+
 - [x] Add a gravity well block
   - [x] Remove snapping to structures on collision
 - [x] Camera system
@@ -262,7 +253,7 @@ See [the issues page](https://github.com/AnthonyTornetta/Cosmos/issues) for the
     - [x] Player world moves relative to its player
     - [x] Players can be a part of the same world if they are close enough
     - [x] Requires rewrite of bevy_rapier to support multiple physics worlds
-      - [ ] Merge PR https://github.com/dimforge/bevy_rapier/pull/328
+      - [x] Merge PR https://github.com/dimforge/bevy_rapier/pull/328
 - [x] Update to bevy 0.10.0
 - [x] Performant ships
   - [x] Ability to have 50 small-sized ships loaded with minimal performance impact
@@ -354,7 +345,7 @@ See [the issues page](https://github.com/AnthonyTornetta/Cosmos/issues) for the
 - [x] Sync bodies from server to client
 - [x] Ability to break/replace block
   - [x] Dynamic meshing
-  - [x] Dynamic physics bodies
+- [x] Dynamic physics bodies
   - [x] Block break events sent to server, server sends back block changed event
   - [x] Selects nearest structure
 - [x] Integrate physics system
@@ -368,6 +359,7 @@ See [the issues page](https://github.com/AnthonyTornetta/Cosmos/issues) for the
 - [x] Support re-sizable window
 
 ## Release 0.0.8a
+
 - [ ] More pirate ships
 - [ ] More asteroid types
 - [ ] Fuel for reactor
@@ -378,11 +370,27 @@ See [the issues page](https://github.com/AnthonyTornetta/Cosmos/issues) for the
 - [ ] Add more randomly generated structures (e.g. stations)
 
 ## Everything that will still have to be done after 0.0.7a
+
 - [ ] Shops
   - [ ] Peace zone?
   - [ ] Prices based on supply + rarity
     - [ ] Keep supply relatively equal between nearby shops
   - [ ] Each shop has its own supply of money that it cannot go below
+- [ ] Biosphere Improvements
+  - [ ] Ice biosphere glaciers
+  - [ ] Better Water block
+  - [ ] Better Lava block
+  - [ ] Structures
+    - [ ] Rocks spawning
+    - [ ] Undergrowth
+    - [ ] 1 More tree type
+  - [ ] Groundwork for biomes
+    - [ ] Planes
+    - [ ] Redwood forest
+    - [ ] 1 Additional forest
+    - [ ] Ocean
+- [ ] Wires
+  - [ ] Electrical
 
 ## NPCs
 
@@ -391,16 +399,16 @@ See [the issues page](https://github.com/AnthonyTornetta/Cosmos/issues) for the
 NPC controlled OR player controlled
 NPC controlled factions store reputation of other factions + players
 Factions have different attributes
-  - One may steal your ship blueprints
-    - To balance this:
-      - scrap is collected when you mine melting down ships instead of the actual blocks
-        - Different scrap types
-      - Substitute expensive blocks for less expensive ones if needed
-      - If ship is below 50% success rate, don't produce it again
-  - Dynamic faction expansion
-Bounty board
-  - Take down X ship
-  - Selling the ship
+
+- One may steal your ship blueprints
+  - To balance this:
+    - scrap is collected when you mine melting down ships instead of the actual blocks
+      - Different scrap types
+    - Substitute expensive blocks for less expensive ones if needed
+    - If ship is below 50% success rate, don't produce it again
+- Dynamic faction expansion
+  Bounty board
+- Take down X ship
+- Selling the ship
 - Selling ship designs
 - Buying ship designs
-
diff --git a/cosmos_client/Cargo.toml b/cosmos_client/Cargo.toml
index 41cc4834e..3ca6a51cd 100644
--- a/cosmos_client/Cargo.toml
+++ b/cosmos_client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cosmos_client"
-version = "0.0.6"
+version = "0.0.7"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -37,10 +37,11 @@ default = [
     "bevy/default_font",
     "bevy/webgl2",
     "bevy/sysinfo_plugin",
+    "bevy/bevy_window",
 ]
 
 [dependencies]
-cosmos_core = { version = "0.0.6", path = "../cosmos_core", features = [
+cosmos_core = { version = "0.0.7", path = "../cosmos_core", features = [
     "client",
 ] }
 
@@ -79,5 +80,5 @@ clap = { workspace = true, features = ["derive"] }
 bevy_easy_compute = { workspace = true }
 bevy_obj = { workspace = true }
 bevy_hanabi = { workspace = true }
-iyes_perf_ui = { workspace = true }
-bevy_mod_billboard = { workspace = true }
+# iyes_perf_ui = { workspace = true }
+# bevy_mod_billboard = { workspace = true }
diff --git a/cosmos_client/assets/cosmos/blocks/basic_fabricator.json b/cosmos_client/assets/cosmos/blocks/basic_fabricator.json
new file mode 100644
index 000000000..bfdd103e6
--- /dev/null
+++ b/cosmos_client/assets/cosmos/blocks/basic_fabricator.json
@@ -0,0 +1,24 @@
+{
+  "texture": {
+    "Sides": {
+      "right": {
+        "Single": "cosmos:basic_fabricator_sides"
+      },
+      "left": {
+        "Single": "cosmos:basic_fabricator_sides"
+      },
+      "front": {
+        "Single": "cosmos:basic_fabricator_sides"
+      },
+      "back": {
+        "Single": "cosmos:basic_fabricator_sides"
+      },
+      "top": {
+        "Single": "cosmos:basic_fabricator_top_bottom"
+      },
+      "bottom": {
+        "Single": "cosmos:basic_fabricator_top_bottom"
+      }
+    }
+  }
+}
diff --git a/cosmos_client/assets/cosmos/blocks/door_open.json b/cosmos_client/assets/cosmos/blocks/door_open.json
new file mode 100644
index 000000000..5a00b606b
--- /dev/null
+++ b/cosmos_client/assets/cosmos/blocks/door_open.json
@@ -0,0 +1,43 @@
+{
+    "texture": {
+        "All": {
+            "Connected": [
+                "cosmos:door_open_0",
+                "cosmos:door_open_1",
+                "cosmos:door_open_2",
+                "cosmos:door_open_3",
+                "cosmos:door_open_4",
+                "cosmos:door_open_5",
+                "cosmos:door_open_6",
+                "cosmos:door_open_7",
+                "cosmos:door_open_8",
+                "cosmos:door_open_9",
+                "cosmos:door_open_10",
+                "cosmos:door_open_11",
+                "cosmos:door_open_12",
+                "cosmos:door_open_13",
+                "cosmos:door_open_14",
+                "cosmos:door_open_15"
+            ]
+        }
+    },
+    "model": {
+        "Sides": {
+            "name": "cosmos:door_open",
+            "top": "cosmos:base_top",
+            "bottom": "cosmos:base_bottom",
+            "left": "cosmos:base_left",
+            "right": "cosmos:base_right",
+            "front": "cosmos:base_front",
+            "back": "cosmos:base_back",
+            "connected": {
+                "top": "none",
+                "bottom": "none",
+                "left": "none",
+                "right": "none",
+                "front": "none",
+                "back": "none"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/cosmos_client/assets/cosmos/images/blocks/basic_fabricator_sides.png b/cosmos_client/assets/cosmos/images/blocks/basic_fabricator_sides.png
new file mode 100644
index 000000000..3050277e9
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/basic_fabricator_sides.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/basic_fabricator_top_bottom.png b/cosmos_client/assets/cosmos/images/blocks/basic_fabricator_top_bottom.png
new file mode 100644
index 000000000..b4eda0860
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/basic_fabricator_top_bottom.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door.png b/cosmos_client/assets/cosmos/images/blocks/door.png
new file mode 100644
index 000000000..2a8efc773
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open.png b/cosmos_client/assets/cosmos/images/blocks/door_open.png
new file mode 100644
index 000000000..2a8efc773
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_0.png b/cosmos_client/assets/cosmos/images/blocks/door_open_0.png
new file mode 100644
index 000000000..e9e6e4b30
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_0.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_1.png b/cosmos_client/assets/cosmos/images/blocks/door_open_1.png
new file mode 100644
index 000000000..7bbb757d1
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_1.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_10.png b/cosmos_client/assets/cosmos/images/blocks/door_open_10.png
new file mode 100644
index 000000000..72315637e
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_10.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_11.png b/cosmos_client/assets/cosmos/images/blocks/door_open_11.png
new file mode 100644
index 000000000..2bef95ef2
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_11.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_12.png b/cosmos_client/assets/cosmos/images/blocks/door_open_12.png
new file mode 100644
index 000000000..c7288ca50
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_12.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_13.png b/cosmos_client/assets/cosmos/images/blocks/door_open_13.png
new file mode 100644
index 000000000..ef303531f
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_13.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_14.png b/cosmos_client/assets/cosmos/images/blocks/door_open_14.png
new file mode 100644
index 000000000..94644a2e6
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_14.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_15.png b/cosmos_client/assets/cosmos/images/blocks/door_open_15.png
new file mode 100644
index 000000000..4a97be3b4
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_15.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_2.png b/cosmos_client/assets/cosmos/images/blocks/door_open_2.png
new file mode 100644
index 000000000..b6f5c2bcf
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_2.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_3.png b/cosmos_client/assets/cosmos/images/blocks/door_open_3.png
new file mode 100644
index 000000000..19e31b66f
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_3.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_4.png b/cosmos_client/assets/cosmos/images/blocks/door_open_4.png
new file mode 100644
index 000000000..d996bcded
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_4.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_5.png b/cosmos_client/assets/cosmos/images/blocks/door_open_5.png
new file mode 100644
index 000000000..828493525
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_5.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_6.png b/cosmos_client/assets/cosmos/images/blocks/door_open_6.png
new file mode 100644
index 000000000..39930d15b
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_6.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_7.png b/cosmos_client/assets/cosmos/images/blocks/door_open_7.png
new file mode 100644
index 000000000..be7036ab8
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_7.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_8.png b/cosmos_client/assets/cosmos/images/blocks/door_open_8.png
new file mode 100644
index 000000000..dd5b51922
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_8.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/door_open_9.png b/cosmos_client/assets/cosmos/images/blocks/door_open_9.png
new file mode 100644
index 000000000..57eef4d7d
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/door_open_9.png differ
diff --git a/cosmos_client/assets/cosmos/images/blocks/iron_ore.png b/cosmos_client/assets/cosmos/images/blocks/iron_ore.png
new file mode 100644
index 000000000..1203eea82
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/blocks/iron_ore.png differ
diff --git a/cosmos_client/assets/cosmos/images/items/iron_bar.png b/cosmos_client/assets/cosmos/images/items/iron_bar.png
new file mode 100644
index 000000000..0052d7abe
Binary files /dev/null and b/cosmos_client/assets/cosmos/images/items/iron_bar.png differ
diff --git a/cosmos_client/assets/cosmos/lang/blocks/en_us.lang b/cosmos_client/assets/cosmos/lang/blocks/en_us.lang
index 133371298..daf8d5218 100644
--- a/cosmos_client/assets/cosmos/lang/blocks/en_us.lang
+++ b/cosmos_client/assets/cosmos/lang/blocks/en_us.lang
@@ -19,6 +19,10 @@ cosmos:water=Water
 cosmos:sand=Sand
 cosmos:cactus=Cactus
 cosmos:build_block=Build Block
+cosmos:door=Door
+cosmos:door_open=Door
+cosmos:basic_fabricator=Basic Fabricator
+cosmos:iron_ore=Iron Ore
 
 cosmos:ship_hull_grey=Grey Ship Hull
 cosmos:ship_hull_black=Black Ship Hull
@@ -105,4 +109,4 @@ cosmos:logic_wire_red=Red Logic Wire
 cosmos:logic_wire_dark_red=Dark Red Logic Wire
 cosmos:logic_wire_yellow=Yellow Logic Wire
 cosmos:logic_wire_dark_yellow=Dark Yellow Logic Wire
-cosmos:logic_wire_mint=Mint Logic Wire
\ No newline at end of file
+cosmos:logic_wire_mint=Mint Logic Wire
diff --git a/cosmos_client/assets/cosmos/lang/items/en_us.lang b/cosmos_client/assets/cosmos/lang/items/en_us.lang
index b8f4f0e2d..153823b27 100644
--- a/cosmos_client/assets/cosmos/lang/items/en_us.lang
+++ b/cosmos_client/assets/cosmos/lang/items/en_us.lang
@@ -1 +1,2 @@
-cosmos:test_crystal=Test Crystal
\ No newline at end of file
+cosmos:test_crystal=Test Crystal
+cosmos:iron_bar=Iron Bar
diff --git a/cosmos_client/src/asset/asset_loader.rs b/cosmos_client/src/asset/asset_loader.rs
index df00b4d43..c08551f49 100644
--- a/cosmos_client/src/asset/asset_loader.rs
+++ b/cosmos_client/src/asset/asset_loader.rs
@@ -65,7 +65,7 @@ pub fn load_assets<T: Asset, K: Send + Sync + 'static>(
             loading_assets.loading_handles.retain_mut(|handle| {
                 let load_state = asset_server.get_load_state(handle.id()).expect("Id has to exist here");
 
-                if load_state == LoadState::Loaded || matches!(load_state, LoadState::Failed(_)) {
+                if matches!(load_state, LoadState::Failed(_) | LoadState::Loaded) {
                     done_loading.loaded_handles.push((std::mem::take(handle), load_state));
                     false
                 } else {
diff --git a/cosmos_client/src/asset/asset_loading.rs b/cosmos_client/src/asset/asset_loading.rs
index 26cf9bf47..2da60b4d5 100644
--- a/cosmos_client/src/asset/asset_loading.rs
+++ b/cosmos_client/src/asset/asset_loading.rs
@@ -265,10 +265,10 @@ fn check_assets_ready(
     for folder_handle in loading.iter().map(|h| &h.folder_handle) {
         for handle in folder_handle {
             let load_state = server.get_load_state(handle);
-            if load_state == Some(LoadState::Loaded) || matches!(load_state, Some(LoadState::Failed(_))) {
+            if matches!(load_state, Some(LoadState::Failed(_) | LoadState::Loaded)) {
                 match server.get_recursive_dependency_load_state(handle) {
                     Some(RecursiveDependencyLoadState::Loaded) => {}
-                    Some(RecursiveDependencyLoadState::Failed) => {
+                    Some(RecursiveDependencyLoadState::Failed(_)) => {
                         panic!("Failed to load asset!!");
                     }
                     _ => {
diff --git a/cosmos_client/src/asset/materials/material_types/animated_material.rs b/cosmos_client/src/asset/materials/material_types/animated_material.rs
index 4402dd552..4568d576b 100644
--- a/cosmos_client/src/asset/materials/material_types/animated_material.rs
+++ b/cosmos_client/src/asset/materials/material_types/animated_material.rs
@@ -46,25 +46,25 @@ fn respond_to_add_materials_event(
 
         match mat.unlocalized_name() {
             "cosmos:animated" => {
-                commands.entity(ev.entity).insert(match ev.material_type {
+                commands.entity(ev.entity).insert(MeshMaterial3d(match ev.material_type {
                     MaterialType::Normal => default_material.0[idx].clone_weak(),
                     MaterialType::Illuminated => unlit_material.0[idx].clone_weak(),
                     MaterialType::FarAway => default_material.0[idx].clone_weak(),
-                });
+                }));
             }
             "cosmos:animated_illuminated" => {
-                commands.entity(ev.entity).insert(match ev.material_type {
+                commands.entity(ev.entity).insert(MeshMaterial3d(match ev.material_type {
                     MaterialType::Normal => unlit_material.0[idx].clone_weak(),
                     MaterialType::Illuminated => unlit_material.0[idx].clone_weak(),
                     MaterialType::FarAway => unlit_material.0[idx].clone_weak(),
-                });
+                }));
             }
             "cosmos:animated_transparent" => {
-                commands.entity(ev.entity).insert(match ev.material_type {
+                commands.entity(ev.entity).insert(MeshMaterial3d(match ev.material_type {
                     MaterialType::Normal => transparent_material.0[idx].clone_weak(),
                     MaterialType::Illuminated => unlit_transparent_material.0[idx].clone_weak(),
                     MaterialType::FarAway => default_material.0[idx].clone_weak(),
-                });
+                }));
             }
             _ => {}
         }
@@ -73,7 +73,7 @@ fn respond_to_add_materials_event(
 
 fn respond_to_remove_materails_event(mut event_reader: EventReader<RemoveAllMaterialsEvent>, mut commands: Commands) {
     for ev in event_reader.read() {
-        commands.entity(ev.entity).remove::<Handle<AnimatedArrayTextureMaterial>>();
+        commands.entity(ev.entity).remove::<MeshMaterial3d<AnimatedArrayTextureMaterial>>();
     }
 }
 
diff --git a/cosmos_client/src/asset/materials/material_types/lod_material.rs b/cosmos_client/src/asset/materials/material_types/lod_material.rs
index 7e6a55177..34cdfdfd6 100644
--- a/cosmos_client/src/asset/materials/material_types/lod_material.rs
+++ b/cosmos_client/src/asset/materials/material_types/lod_material.rs
@@ -30,25 +30,25 @@ fn respond_to_add_materials_event(
 
         match mat.unlocalized_name() {
             "cosmos:lod" => {
-                commands.entity(ev.entity).insert(match ev.material_type {
+                commands.entity(ev.entity).insert(MeshMaterial3d(match ev.material_type {
                     MaterialType::Normal => default_material.0[idx].clone_weak(),
                     MaterialType::Illuminated => unlit_material.0[idx].clone_weak(),
                     MaterialType::FarAway => default_material.0[idx].clone_weak(),
-                });
+                }));
             }
             "cosmos:lod_illuminated" => {
-                commands.entity(ev.entity).insert(match ev.material_type {
+                commands.entity(ev.entity).insert(MeshMaterial3d(match ev.material_type {
                     MaterialType::Normal => unlit_material.0[idx].clone_weak(),
                     MaterialType::Illuminated => unlit_material.0[idx].clone_weak(),
                     MaterialType::FarAway => unlit_material.0[idx].clone_weak(),
-                });
+                }));
             }
             "cosmos:lod_transparent" => {
-                commands.entity(ev.entity).insert(match ev.material_type {
+                commands.entity(ev.entity).insert(MeshMaterial3d(match ev.material_type {
                     MaterialType::Normal => transparent_material.0[idx].clone_weak(),
                     MaterialType::Illuminated => unlit_transparent_material.0[idx].clone_weak(),
                     MaterialType::FarAway => default_material.0[idx].clone_weak(),
-                });
+                }));
             }
             _ => {}
         }
@@ -57,7 +57,7 @@ fn respond_to_add_materials_event(
 
 fn respond_to_remove_materails_event(mut event_reader: EventReader<RemoveAllMaterialsEvent>, mut commands: Commands) {
     for ev in event_reader.read() {
-        commands.entity(ev.entity).remove::<Handle<LodArrayTextureMaterial>>();
+        commands.entity(ev.entity).remove::<MeshMaterial3d<LodArrayTextureMaterial>>();
     }
 }
 
diff --git a/cosmos_client/src/asset/materials/material_types/main_material.rs b/cosmos_client/src/asset/materials/material_types/main_material.rs
index 1a61a762c..160cbb683 100644
--- a/cosmos_client/src/asset/materials/material_types/main_material.rs
+++ b/cosmos_client/src/asset/materials/material_types/main_material.rs
@@ -30,25 +30,25 @@ fn respond_to_add_materials_event(
 
         match mat.unlocalized_name() {
             "cosmos:main" => {
-                commands.entity(ev.entity).insert(match ev.material_type {
+                commands.entity(ev.entity).insert(MeshMaterial3d(match ev.material_type {
                     MaterialType::Normal => default_material.0[idx].clone_weak(),
                     MaterialType::Illuminated => unlit_material.0[idx].clone_weak(),
                     MaterialType::FarAway => default_material.0[idx].clone_weak(),
-                });
+                }));
             }
             "cosmos:illuminated" => {
-                commands.entity(ev.entity).insert(match ev.material_type {
+                commands.entity(ev.entity).insert(MeshMaterial3d(match ev.material_type {
                     MaterialType::Normal => unlit_material.0[idx].clone_weak(),
                     MaterialType::Illuminated => unlit_material.0[idx].clone_weak(),
                     MaterialType::FarAway => unlit_material.0[idx].clone_weak(),
-                });
+                }));
             }
             "cosmos:transparent" => {
-                commands.entity(ev.entity).insert(match ev.material_type {
+                commands.entity(ev.entity).insert(MeshMaterial3d(match ev.material_type {
                     MaterialType::Normal => transparent_material.0[idx].clone_weak(),
                     MaterialType::Illuminated => unlit_transparent_material.0[idx].clone_weak(),
                     MaterialType::FarAway => default_material.0[idx].clone_weak(),
-                });
+                }));
             }
             _ => {}
         }
@@ -57,7 +57,7 @@ fn respond_to_add_materials_event(
 
 fn respond_to_remove_materails_event(mut event_reader: EventReader<RemoveAllMaterialsEvent>, mut commands: Commands) {
     for ev in event_reader.read() {
-        commands.entity(ev.entity).remove::<Handle<ArrayTextureMaterial>>();
+        commands.entity(ev.entity).remove::<MeshMaterial3d<ArrayTextureMaterial>>();
     }
 }
 
diff --git a/cosmos_client/src/asset/texture_atlas.rs b/cosmos_client/src/asset/texture_atlas.rs
index bfe851cc5..4793c3082 100644
--- a/cosmos_client/src/asset/texture_atlas.rs
+++ b/cosmos_client/src/asset/texture_atlas.rs
@@ -1,12 +1,12 @@
 //! Similar to bevy's default texture atlas, but the order they are inserted matters and assumes every texture is the same size and a square.
 
 use bevy::{
+    image::TextureFormatPixelInfo,
     prelude::{Assets, Handle, Image},
     reflect::Reflect,
     render::{
         render_asset::RenderAssetUsages,
         render_resource::{Extent3d, TextureDimension, TextureFormat},
-        texture::TextureFormatPixelInfo,
     },
     utils::HashMap,
 };
diff --git a/cosmos_client/src/audio/mod.rs b/cosmos_client/src/audio/mod.rs
index 8f9f83811..d663a1858 100644
--- a/cosmos_client/src/audio/mod.rs
+++ b/cosmos_client/src/audio/mod.rs
@@ -10,18 +10,16 @@ use bevy::{
     app::{App, PostUpdate, PreUpdate, Update},
     asset::{AssetId, Assets, Handle},
     ecs::{
-        bundle::Bundle,
         component::Component,
         entity::Entity,
         query::{Changed, With},
         removal_detection::RemovedComponents,
-        schedule::IntoSystemConfigs,
-        schedule::IntoSystemSetConfigs,
+        schedule::{IntoSystemConfigs, IntoSystemSetConfigs},
         system::{Commands, Query, ResMut, Resource},
     },
     hierarchy::DespawnRecursiveExt,
-    prelude::{Deref, DerefMut, SystemSet},
-    transform::{bundles::TransformBundle, components::GlobalTransform},
+    prelude::{Deref, DerefMut, SystemSet, Transform},
+    transform::components::GlobalTransform,
     utils::hashbrown::HashMap,
 };
 use bevy_kira_audio::{prelude::*, AudioSystemSet};
@@ -59,6 +57,7 @@ impl Default for AudioEmission {
 }
 
 #[derive(Default, Component)]
+#[require(Transform)]
 /// Contains a bunch of audio instances to output
 ///
 /// This must be put onto an entity with a transform to do anything
@@ -117,15 +116,6 @@ impl CosmosAudioEmitter {
     }
 }
 
-#[derive(Default, Bundle)]
-/// A bundle containing a [`CosmosAudioEmitter`] and a [`TransformBundle`]
-pub struct AudioEmitterBundle {
-    /// The thing responsible for emitting the audio
-    pub emitter: CosmosAudioEmitter,
-    /// The transform this source is at
-    pub transform: TransformBundle,
-}
-
 fn run_spacial_audio(
     receiver: Query<&GlobalTransform, With<AudioReceiver>>,
     emitters: Query<(&GlobalTransform, &CosmosAudioEmitter)>,
diff --git a/cosmos_client/src/audio/music/dynamic_music.rs b/cosmos_client/src/audio/music/dynamic_music.rs
index 95a41cf97..8d3a6bcb2 100644
--- a/cosmos_client/src/audio/music/dynamic_music.rs
+++ b/cosmos_client/src/audio/music/dynamic_music.rs
@@ -143,11 +143,11 @@ fn trigger_music_playing(mut next_song_time: ResMut<NextSongTime>, mut event_wri
     const MIN_DELAY_SEC: f32 = 5.0 * 60.0; // 5min
     const MAX_DELAY_SEC: f32 = 20.0 * 60.0; // 20min
 
-    if next_song_time.0 > time.elapsed_seconds() {
+    if next_song_time.0 > time.elapsed_secs() {
         return;
     }
 
-    next_song_time.0 = time.elapsed_seconds() + random_range(MIN_DELAY_SEC, MAX_DELAY_SEC);
+    next_song_time.0 = time.elapsed_secs() + random_range(MIN_DELAY_SEC, MAX_DELAY_SEC);
 
     event_writer.send(PlayMusicEvent {
         atmosphere: MusicAtmosphere::Calm,
@@ -161,7 +161,7 @@ pub(super) fn register(app: &mut App) {
 
     app.add_systems(
         Update,
-        (trigger_music_playing, start_playing.run_if(on_event::<PlayMusicEvent>()))
+        (trigger_music_playing, start_playing.run_if(on_event::<PlayMusicEvent>))
             .chain()
             .run_if(in_state(GameState::Playing))
             .run_if(not(resource_exists::<PlayingBackgroundSong>)),
diff --git a/cosmos_client/src/chat/mod.rs b/cosmos_client/src/chat/mod.rs
new file mode 100644
index 000000000..6e93c85ab
--- /dev/null
+++ b/cosmos_client/src/chat/mod.rs
@@ -0,0 +1,361 @@
+//! Client-side chat logic
+
+use bevy::{
+    a11y::Focus,
+    app::Update,
+    color::{Alpha, Color, Srgba},
+    core::Name,
+    log::error,
+    prelude::{
+        App, BuildChildren, Changed, ChildBuild, Children, Commands, Component, Entity, EventReader, IntoSystemConfigs, OnEnter, Query,
+        Res, ResMut, Text, TextUiWriter, Visibility, With, Without,
+    },
+    text::{LineBreak, TextFont, TextLayout},
+    time::Time,
+    ui::{BackgroundColor, FlexDirection, Node, Overflow, OverflowAxis, Val},
+};
+use cosmos_core::{
+    chat::{ClientSendChatMessageEvent, ServerSendChatMessageEvent},
+    ecs::NeedsDespawned,
+    netty::{
+        sync::events::client_event::{NettyEventReceived, NettyEventWriter},
+        system_sets::NetworkingSystemsSet,
+    },
+    state::GameState,
+};
+
+use crate::{
+    input::inputs::{CosmosInputs, InputChecker, InputHandler},
+    ui::{
+        components::{
+            scollable_container::{ScrollBox, ScrollerStyles},
+            show_cursor::ShowCursor,
+            text_input::{InputValue, TextInput},
+        },
+        font::DefaultFont,
+        pause::CloseMenusSet,
+        CloseMethod, OpenMenu,
+    },
+};
+
+#[derive(Component)]
+struct ChatContainer;
+
+#[derive(Component)]
+struct ReceivedMessagesContainer;
+
+#[derive(Component)]
+struct ChatScrollContainer;
+
+#[derive(Component)]
+struct SendingChatMessageBox;
+
+#[derive(Component)]
+struct ChatMessage(f32);
+
+#[derive(Component)]
+struct ChatDisplayReceivedMessagesContainer;
+
+#[derive(Component)]
+struct ChatDisplay;
+
+fn toggle_chat_display_visibility(
+    mut q_chat_display: Query<&mut Visibility, (Without<ChatContainer>, With<ChatDisplay>)>,
+    q_chat_box: Query<&Visibility, (Changed<Visibility>, With<ChatContainer>)>,
+) {
+    let Ok(changed_vis) = q_chat_box.get_single() else {
+        return;
+    };
+
+    let Ok(mut vis) = q_chat_display.get_single_mut() else {
+        return;
+    };
+
+    match *changed_vis {
+        Visibility::Hidden => *vis = Visibility::Inherited,
+        _ => *vis = Visibility::Hidden,
+    };
+}
+
+fn setup_chat_display(mut commands: Commands) {
+    commands
+        .spawn((
+            ChatDisplay,
+            Name::new("Chat Display"),
+            Node {
+                top: Val::Percent(20.0),
+                width: Val::Percent(45.0),
+                height: Val::Percent(60.0),
+                overflow: Overflow {
+                    x: OverflowAxis::Hidden,
+                    y: OverflowAxis::Hidden,
+                },
+                flex_direction: FlexDirection::ColumnReverse,
+                ..Default::default()
+            },
+        ))
+        .with_children(|p| {
+            p.spawn((
+                ChatDisplayReceivedMessagesContainer,
+                Node {
+                    flex_direction: FlexDirection::Column,
+                    ..Default::default()
+                },
+            ));
+        });
+}
+
+const CHAT_MSG_ALIVE_SEC: f32 = 10.0;
+
+fn fade_chat_messages(
+    q_time: Res<Time>,
+    mut writer: TextUiWriter,
+    mut q_chat_msg: Query<(Entity, &mut ChatMessage)>,
+    mut commands: Commands,
+) {
+    let delta = q_time.delta_secs();
+    for (ent, mut chat_msg) in q_chat_msg.iter_mut() {
+        chat_msg.0 -= delta;
+
+        if chat_msg.0 <= 0.0 {
+            commands.entity(ent).insert(NeedsDespawned);
+        } else {
+            writer.for_each_color(ent, |mut c| c.set_alpha(chat_msg.0 / CHAT_MSG_ALIVE_SEC))
+        }
+    }
+}
+
+fn setup_chat_box(mut commands: Commands, default_font: Res<DefaultFont>) {
+    commands
+        .spawn((
+            ChatContainer,
+            Name::new("Chat Container"),
+            Node {
+                top: Val::Percent(20.0),
+                width: Val::Percent(45.0),
+                height: Val::Percent(60.0),
+                flex_direction: FlexDirection::Column,
+                ..Default::default()
+            },
+            Visibility::Hidden,
+        ))
+        .with_children(|p| {
+            p.spawn((
+                Name::new("Received Messages"),
+                ChatScrollContainer,
+                Node {
+                    flex_grow: 1.0,
+                    flex_direction: FlexDirection::Column,
+                    ..Default::default()
+                },
+                ScrollBox {
+                    styles: ScrollerStyles {
+                        scrollbar_color: Srgba {
+                            red: 1.0,
+                            green: 1.0,
+                            blue: 1.0,
+                            alpha: 0.4,
+                        }
+                        .into(),
+                        scrollbar_background_color: Color::NONE,
+                    },
+                    ..Default::default()
+                },
+            ))
+            .with_children(|p| {
+                p.spawn((
+                    Name::new("Padding"),
+                    Node {
+                        flex_grow: 1.0,
+                        ..Default::default()
+                    },
+                ));
+            })
+            .with_children(|p| {
+                p.spawn((
+                    ReceivedMessagesContainer,
+                    Node {
+                        flex_direction: FlexDirection::Column,
+                        ..Default::default()
+                    },
+                ));
+            });
+
+            p.spawn((
+                Name::new("Sending Messages"),
+                SendingChatMessageBox,
+                TextFont {
+                    font_size: 24.0,
+                    font: default_font.0.clone(),
+                    ..Default::default()
+                },
+                BackgroundColor(
+                    Srgba {
+                        red: 0.0,
+                        green: 0.0,
+                        blue: 0.0,
+                        alpha: 0.7,
+                    }
+                    .into(),
+                ),
+                Node {
+                    width: Val::Percent(100.0),
+                    ..Default::default()
+                },
+                TextInput { ..Default::default() },
+            ));
+        });
+}
+
+fn display_messages(
+    default_font: Res<DefaultFont>,
+    mut nevr_chat_msg: EventReader<NettyEventReceived<ServerSendChatMessageEvent>>,
+    q_chat_box: Query<Entity, With<ReceivedMessagesContainer>>,
+    q_display_box: Query<Entity, With<ChatDisplayReceivedMessagesContainer>>,
+    mut commands: Commands,
+) {
+    for ev in nevr_chat_msg.read() {
+        let msg = &ev.message;
+
+        let text_style = TextFont {
+            font: default_font.0.clone_weak(),
+            font_size: 24.0,
+            ..Default::default()
+        };
+
+        let Ok(chat_box) = q_chat_box.get_single() else {
+            error!("No chat box?");
+            return;
+        };
+
+        let Ok(display_box) = q_display_box.get_single() else {
+            error!("No display box?");
+            return;
+        };
+
+        let text = Text::new(msg);
+        let text_layout = TextLayout {
+            linebreak: LineBreak::AnyCharacter,
+            ..Default::default()
+        };
+
+        commands
+            .spawn((Name::new("Received chat message"), text.clone(), text_style.clone(), text_layout))
+            .set_parent(chat_box);
+
+        commands
+            .spawn((
+                Name::new("Display received chat message"),
+                ChatMessage(CHAT_MSG_ALIVE_SEC),
+                text,
+                text_style.clone(),
+                text_layout,
+            ))
+            .set_parent(display_box);
+    }
+}
+
+/// # Must be run before [`toggle_chat_box`] or the message will get cleared before this has access
+/// to it
+fn send_chat_msg(
+    inputs: InputChecker,
+    mut q_value: Query<&mut InputValue, With<SendingChatMessageBox>>,
+    q_chat_box: Query<&Visibility, With<ChatContainer>>,
+    mut nevw: NettyEventWriter<ClientSendChatMessageEvent>,
+) {
+    if !inputs.check_just_pressed(CosmosInputs::SendChatMessage) {
+        return;
+    }
+
+    if q_chat_box.get_single().map(|x| *x == Visibility::Hidden).unwrap_or(true) {
+        return;
+    }
+
+    let Ok(mut val) = q_value.get_single_mut() else {
+        return;
+    };
+
+    let value = val.value();
+    if value.is_empty() {
+        return;
+    }
+
+    nevw.send(ClientSendChatMessageEvent::Global(value.to_owned()));
+
+    // Set val to "" in case toggle chat box and send message are bound to different keys
+    val.set_value("");
+}
+
+fn toggle_chat_box(
+    mut q_input_value: Query<(Entity, &mut InputValue), With<SendingChatMessageBox>>,
+    mut q_chat_box: Query<(Entity, &mut Visibility), With<ChatContainer>>,
+    mut q_scroll_box: Query<&mut ScrollBox, With<ChatScrollContainer>>,
+    inputs: InputChecker,
+    mut commands: Commands,
+    mut focus: ResMut<Focus>,
+    q_open_menus: Query<(), With<OpenMenu>>,
+) {
+    if inputs.check_just_pressed(CosmosInputs::ToggleChat) {
+        let Ok((chat_box_ent, mut cb)) = q_chat_box.get_single_mut() else {
+            return;
+        };
+
+        *cb = if *cb == Visibility::Hidden {
+            if !q_open_menus.is_empty() {
+                return;
+            }
+
+            let Ok((input_ent, mut input_value)) = q_input_value.get_single_mut() else {
+                return;
+            };
+            input_value.set_value("");
+
+            commands
+                .entity(chat_box_ent)
+                .insert(ShowCursor)
+                .insert(OpenMenu::with_close_method(0, CloseMethod::Visibility));
+            focus.0 = Some(input_ent);
+            if let Ok(mut scrollbox) = q_scroll_box.get_single_mut() {
+                // Start them at the bottom of the chat messages
+                scrollbox.scroll_amount = Val::Percent(100.0);
+            }
+            Visibility::Inherited
+        } else {
+            commands.entity(chat_box_ent).remove::<ShowCursor>().remove::<OpenMenu>();
+            focus.0 = None;
+            Visibility::Hidden
+        };
+    }
+}
+
+/// The maximum number of chat messages that can be stored in the chat box history.
+const MAX_MESSAGES: usize = 100;
+
+fn remove_very_old_messages(mut commands: Commands, q_children: Query<&Children, With<ReceivedMessagesContainer>>) {
+    let Ok(children) = q_children.get_single() else {
+        return;
+    };
+
+    for ent in children.iter().take(children.len().max(MAX_MESSAGES) - MAX_MESSAGES) {
+        commands.entity(*ent).insert(NeedsDespawned);
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(OnEnter(GameState::Playing), (setup_chat_display, setup_chat_box));
+
+    app.add_systems(
+        Update,
+        (
+            display_messages,
+            send_chat_msg,
+            toggle_chat_box,
+            fade_chat_messages,
+            remove_very_old_messages,
+            toggle_chat_display_visibility,
+        )
+            .chain()
+            .after(CloseMenusSet::CloseMenus)
+            .in_set(NetworkingSystemsSet::Between),
+    );
+}
diff --git a/cosmos_client/src/crafting/blocks/basic_fabricator/mod.rs b/cosmos_client/src/crafting/blocks/basic_fabricator/mod.rs
new file mode 100644
index 000000000..0226196a2
--- /dev/null
+++ b/cosmos_client/src/crafting/blocks/basic_fabricator/mod.rs
@@ -0,0 +1,70 @@
+use bevy::{
+    app::Update,
+    core::Name,
+    log::error,
+    prelude::{
+        in_state, App, Commands, Component, Entity, EventReader, IntoSystemConfigs, IntoSystemSetConfigs, Query, Res, SystemSet, With,
+    },
+    reflect::Reflect,
+};
+use cosmos_core::{
+    crafting::blocks::basic_fabricator::OpenBasicFabricatorEvent,
+    ecs::NeedsDespawned,
+    netty::{
+        sync::{
+            events::client_event::NettyEventReceived,
+            mapping::{Mappable, NetworkMapping},
+        },
+        system_sets::NetworkingSystemsSet,
+    },
+    prelude::StructureBlock,
+    state::GameState,
+};
+
+mod ui;
+
+#[derive(Component, Debug, Reflect)]
+struct OpenBasicFabricatorMenu(StructureBlock);
+
+fn open_menu(
+    q_open_menu: Query<Entity, With<OpenBasicFabricatorMenu>>,
+    mut commands: Commands,
+    mut nevr: EventReader<NettyEventReceived<OpenBasicFabricatorEvent>>,
+    network_mapping: Res<NetworkMapping>,
+) {
+    let Some(ev) = nevr.read().last() else {
+        return;
+    };
+
+    if let Ok(ent) = q_open_menu.get_single() {
+        commands.entity(ent).insert(NeedsDespawned);
+    }
+
+    let Ok(s_block) = ev.0.map(&network_mapping) else {
+        error!("Bad network mapping - {:?}", ev.0);
+        return;
+    };
+
+    commands.spawn((OpenBasicFabricatorMenu(s_block), Name::new("Open Basic Fabricator Menu")));
+}
+
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
+enum FabricatorMenuSet {
+    OpenMenu,
+    PopulateMenu,
+}
+
+pub(super) fn register(app: &mut App) {
+    ui::register(app);
+
+    app.configure_sets(Update, (FabricatorMenuSet::OpenMenu, FabricatorMenuSet::PopulateMenu).chain());
+
+    app.add_systems(
+        Update,
+        open_menu
+            .in_set(NetworkingSystemsSet::Between)
+            .in_set(FabricatorMenuSet::OpenMenu)
+            .run_if(in_state(GameState::Playing)),
+    )
+    .register_type::<OpenBasicFabricatorMenu>();
+}
diff --git a/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs b/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs
new file mode 100644
index 000000000..9e7c83e17
--- /dev/null
+++ b/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs
@@ -0,0 +1,434 @@
+use bevy::{
+    app::Update,
+    color::{palettes::css, Color, Srgba},
+    core::Name,
+    log::{error, info},
+    prelude::{
+        in_state, resource_exists, Added, App, BuildChildren, ChildBuild, Commands, Component, Entity, Event, EventReader,
+        IntoSystemConfigs, Query, Res, Text, With,
+    },
+    text::TextFont,
+    ui::{AlignItems, BackgroundColor, FlexDirection, JustifyContent, Node, TargetCamera, UiRect, Val},
+};
+use cosmos_core::{
+    crafting::{
+        blocks::basic_fabricator::CraftBasicFabricatorRecipeEvent,
+        recipes::{
+            basic_fabricator::{BasicFabricatorRecipe, BasicFabricatorRecipes},
+            RecipeItem,
+        },
+    },
+    inventory::Inventory,
+    item::Item,
+    netty::{
+        client::LocalPlayer,
+        sync::{
+            events::client_event::NettyEventWriter,
+            mapping::{Mappable, NetworkMapping},
+        },
+        system_sets::NetworkingSystemsSet,
+    },
+    prelude::Structure,
+    registry::{identifiable::Identifiable, Registry},
+    state::GameState,
+};
+
+use crate::{
+    input::inputs::{CosmosInputs, InputChecker, InputHandler},
+    inventory::{CustomInventoryRender, InventoryNeedsDisplayed, InventorySide, TextNeedsTopRoot},
+    lang::Lang,
+    rendering::MainCamera,
+    ui::{
+        components::{
+            button::{register_button, Button, ButtonEvent, ButtonStyles},
+            window::GuiWindow,
+        },
+        font::DefaultFont,
+        item_renderer::RenderItem,
+        OpenMenu, UiSystemSet,
+    },
+};
+
+use super::{FabricatorMenuSet, OpenBasicFabricatorMenu};
+
+#[derive(Event, Debug)]
+struct SelectItemEvent(Entity);
+impl ButtonEvent for SelectItemEvent {
+    fn create_event(btn_entity: Entity) -> Self {
+        Self(btn_entity)
+    }
+}
+
+#[derive(Event, Debug)]
+struct CreateClickedEvent;
+impl ButtonEvent for CreateClickedEvent {
+    fn create_event(_: Entity) -> Self {
+        Self
+    }
+}
+
+#[derive(Component, Debug, Clone)]
+struct Recipe(BasicFabricatorRecipe);
+
+#[derive(Component, Debug)]
+struct SelectedRecipe;
+
+#[derive(Component)]
+struct FabricateButton;
+
+fn populate_menu(
+    mut commands: Commands,
+    q_added_menu: Query<(Entity, &OpenBasicFabricatorMenu), Added<OpenBasicFabricatorMenu>>,
+    q_player: Query<Entity, With<LocalPlayer>>,
+    font: Res<DefaultFont>,
+    crafting_recipes: Res<BasicFabricatorRecipes>,
+    items: Res<Registry<Item>>,
+    lang: Res<Lang<Item>>,
+    q_structure: Query<&Structure>,
+    q_inventory: Query<&Inventory>,
+    q_cam: Query<Entity, With<MainCamera>>,
+) {
+    for (ent, fab_menu) in q_added_menu.iter() {
+        let Ok(cam) = q_cam.get_single() else {
+            return;
+        };
+
+        let Ok(structure) = q_structure.get(fab_menu.0.structure()) else {
+            error!("No structure for basic_fabricator!");
+            continue;
+        };
+
+        let Some(inventory) = structure.query_block_data(fab_menu.0.coords(), &q_inventory) else {
+            error!("No inventory in basic_fabricator!");
+            continue;
+        };
+        let Ok(player_ent) = q_player.get_single() else {
+            return;
+        };
+
+        commands
+            .entity(player_ent)
+            .insert(InventoryNeedsDisplayed::Normal(InventorySide::Left));
+
+        let mut ecmds = commands.entity(ent);
+
+        let text_style = TextFont {
+            font: font.0.clone_weak(),
+            font_size: 24.0,
+            ..Default::default()
+        };
+
+        let item_slot_size = 64.0;
+
+        ecmds.insert((
+            TargetCamera(cam),
+            OpenMenu::new(0),
+            BackgroundColor(Srgba::hex("2D2D2D").unwrap().into()),
+            Node {
+                width: Val::Px(item_slot_size * 6.0),
+                height: Val::Px(800.0),
+                margin: UiRect {
+                    // Centers it vertically
+                    top: Val::Auto,
+                    bottom: Val::Auto,
+                    // Aligns it 100px from the right
+                    left: Val::Auto,
+                    right: Val::Px(100.0),
+                },
+                ..Default::default()
+            },
+            GuiWindow {
+                title: "Basic Fabricator".into(),
+                body_styles: Node {
+                    flex_direction: FlexDirection::Column,
+                    ..Default::default()
+                },
+            },
+        ));
+
+        let mut slot_ents = vec![];
+
+        ecmds.with_children(|p| {
+            p.spawn((Node {
+                flex_grow: 1.0,
+                flex_direction: FlexDirection::Column,
+                ..Default::default()
+            },))
+                .with_children(|p| {
+                    for recipe in crafting_recipes.iter() {
+                        p.spawn((
+                            Node {
+                                height: Val::Px(100.0),
+                                width: Val::Percent(100.0),
+                                justify_content: JustifyContent::SpaceBetween,
+                                ..Default::default()
+                            },
+                            Button::<SelectItemEvent>::default(),
+                            Recipe(recipe.clone()),
+                        ))
+                        .with_children(|p| {
+                            p.spawn((
+                                Node {
+                                    width: Val::Px(64.0),
+                                    height: Val::Px(64.0),
+                                    margin: UiRect::all(Val::Auto),
+                                    ..Default::default()
+                                },
+                                RenderItem {
+                                    item_id: recipe.output.item,
+                                },
+                            ));
+
+                            let item = items.from_numeric_id(recipe.output.item);
+                            let name = lang.get_name_from_id(item.unlocalized_name()).unwrap_or(item.unlocalized_name());
+
+                            p.spawn((
+                                Name::new("Item name + inputs display"),
+                                Node {
+                                    width: Val::Percent(80.0),
+                                    flex_direction: FlexDirection::Column,
+                                    justify_content: JustifyContent::SpaceEvenly,
+                                    ..Default::default()
+                                },
+                            ))
+                            .with_children(|p| {
+                                p.spawn((
+                                    Node {
+                                        width: Val::Percent(100.0),
+                                        // margin: UiRect::vertical(Val::Auto),
+                                        ..Default::default()
+                                    },
+                                    Text::new(format!("{}x {}", recipe.output.quantity, name)),
+                                    text_style.clone(),
+                                ));
+
+                                p.spawn(Node {
+                                    flex_direction: FlexDirection::Row,
+                                    width: Val::Percent(100.0),
+                                    ..Default::default()
+                                })
+                                .with_children(|p| {
+                                    for item in recipe.inputs.iter() {
+                                        let RecipeItem::Item(item_id) = item.item;
+
+                                        p.spawn((
+                                            Node {
+                                                width: Val::Px(64.0),
+                                                height: Val::Px(64.0),
+                                                flex_direction: FlexDirection::Column,
+                                                align_items: AlignItems::End,
+                                                justify_content: JustifyContent::End,
+                                                ..Default::default()
+                                            },
+                                            RenderItem { item_id },
+                                        ))
+                                        .with_children(|p| {
+                                            p.spawn((
+                                                Name::new("Item recipe qty"),
+                                                TextNeedsTopRoot,
+                                                Text::new(format!("{}", item.quantity)),
+                                                text_style.clone(),
+                                            ));
+                                        });
+                                    }
+                                });
+                            });
+                        });
+                    }
+                });
+
+            p.spawn((
+                Name::new("Footer"),
+                Node {
+                    flex_direction: FlexDirection::Column,
+                    width: Val::Percent(100.0),
+                    height: Val::Px(item_slot_size * 2.0),
+                    ..Default::default()
+                },
+            ))
+            .with_children(|p| {
+                p.spawn((
+                    Name::new("Rendered Inventory"),
+                    Node {
+                        width: Val::Px(item_slot_size * 6.0),
+                        height: Val::Px(item_slot_size),
+                        ..Default::default()
+                    },
+                ))
+                .with_children(|p| {
+                    for (slot, _) in inventory.iter().enumerate() {
+                        let ent = p
+                            .spawn((
+                                Name::new("Rendered Item"),
+                                Node {
+                                    width: Val::Px(64.0),
+                                    height: Val::Px(64.0),
+                                    ..Default::default()
+                                },
+                            ))
+                            .id();
+                        slot_ents.push((slot, ent));
+                    }
+                });
+
+                p.spawn((
+                    Name::new("Fabricate Button"),
+                    FabricateButton,
+                    Button::<CreateClickedEvent> {
+                        text: Some(("Fabricate".into(), text_style, Default::default())),
+                        button_styles: Some(ButtonStyles { ..Default::default() }),
+                        ..Default::default()
+                    },
+                    Node {
+                        flex_grow: 1.0,
+                        ..Default::default()
+                    },
+                ));
+            });
+        });
+
+        commands
+            .entity(structure.block_data(fab_menu.0.coords()).expect("Must expect from above"))
+            .insert(InventoryNeedsDisplayed::Custom(CustomInventoryRender::new(slot_ents)));
+    }
+}
+
+fn on_select_item(
+    mut commands: Commands,
+    mut evr_select_item: EventReader<SelectItemEvent>,
+    q_recipe: Query<&Recipe>,
+    q_selected_recipe: Query<Entity, With<SelectedRecipe>>,
+    mut q_bg_col: Query<&mut BackgroundColor>,
+) {
+    for ev in evr_select_item.read() {
+        let Ok(recipe) = q_recipe.get(ev.0) else {
+            continue;
+        };
+
+        if let Ok(selected_recipe) = q_selected_recipe.get_single() {
+            commands.entity(selected_recipe).remove::<SelectedRecipe>();
+            q_bg_col.get_mut(selected_recipe).expect("Must be ui node").0 = Color::NONE;
+        }
+        commands.entity(ev.0).insert(SelectedRecipe);
+        q_bg_col.get_mut(ev.0).expect("Must be ui node").0 = Srgba {
+            red: 1.0,
+            green: 1.0,
+            blue: 1.0,
+            alpha: 0.1,
+        }
+        .into();
+
+        println!("{recipe:?}");
+    }
+}
+
+fn listen_create(
+    q_structure: Query<&Structure>,
+    q_inventory: Query<&Inventory>,
+    q_open_fab_menu: Query<&OpenBasicFabricatorMenu>,
+    q_selected_recipe: Query<&Recipe, With<SelectedRecipe>>,
+    mut evr_create: EventReader<CreateClickedEvent>,
+    mut nevw_craft_event: NettyEventWriter<CraftBasicFabricatorRecipeEvent>,
+    network_mapping: Res<NetworkMapping>,
+    input_handler: InputChecker,
+) {
+    for _ in evr_create.read() {
+        let Ok(fab_menu) = q_open_fab_menu.get_single() else {
+            return;
+        };
+
+        let Ok(structure) = q_structure.get(fab_menu.0.structure()) else {
+            continue;
+        };
+        let Some(block_inv) = structure.query_block_data(fab_menu.0.coords(), &q_inventory) else {
+            continue;
+        };
+
+        let Ok(recipe) = q_selected_recipe.get_single() else {
+            return;
+        };
+
+        let max_can_create = recipe.0.max_can_create(block_inv.iter().flatten());
+
+        if max_can_create == 0 {
+            continue;
+        }
+
+        if let Ok(block) = fab_menu.0.map_to_server(&network_mapping) {
+            let quantity = if input_handler.check_pressed(CosmosInputs::BulkCraft) {
+                max_can_create
+            } else {
+                1
+            };
+
+            info!("Sending craft {quantity} event!");
+
+            nevw_craft_event.send(CraftBasicFabricatorRecipeEvent {
+                block,
+                recipe: recipe.0.clone(),
+                quantity,
+            });
+        }
+    }
+}
+
+fn color_fabricate_button(
+    q_open_fab_menu: Query<&OpenBasicFabricatorMenu>,
+    q_structure: Query<&Structure>,
+    q_selected_recipe: Query<&Recipe, With<SelectedRecipe>>,
+    q_inventory: Query<&Inventory>,
+    mut q_fab_button: Query<&mut Button<CreateClickedEvent>, With<FabricateButton>>,
+) {
+    let Ok(mut btn) = q_fab_button.get_single_mut() else {
+        return;
+    };
+
+    let Ok(fab_menu) = q_open_fab_menu.get_single() else {
+        return;
+    };
+
+    let Ok(structure) = q_structure.get(fab_menu.0.structure()) else {
+        return;
+    };
+
+    let Some(inventory) = structure.query_block_data(fab_menu.0.coords(), &q_inventory) else {
+        return;
+    };
+
+    let Ok(recipe) = q_selected_recipe.get_single() else {
+        return;
+    };
+
+    if recipe.0.max_can_create(inventory.iter().flatten()) == 0 {
+        btn.button_styles = Some(ButtonStyles::default());
+    } else {
+        btn.button_styles = Some(ButtonStyles {
+            background_color: css::GREEN.into(),
+            foreground_color: css::WHITE.into(),
+            hover_background_color: css::GREEN.into(),
+            hover_foreground_color: css::WHITE.into(),
+            press_background_color: css::GREEN.into(),
+            press_foreground_color: css::WHITE.into(),
+        });
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    register_button::<SelectItemEvent>(app);
+    register_button::<CreateClickedEvent>(app);
+
+    app.add_systems(
+        Update,
+        (
+            populate_menu,
+            (on_select_item, listen_create, color_fabricate_button)
+                .chain()
+                .in_set(UiSystemSet::DoUi),
+        )
+            .chain()
+            .in_set(NetworkingSystemsSet::Between)
+            .in_set(FabricatorMenuSet::PopulateMenu)
+            .run_if(in_state(GameState::Playing))
+            .run_if(resource_exists::<BasicFabricatorRecipes>),
+    );
+}
diff --git a/cosmos_client/src/crafting/blocks/mod.rs b/cosmos_client/src/crafting/blocks/mod.rs
new file mode 100644
index 000000000..6336b82bd
--- /dev/null
+++ b/cosmos_client/src/crafting/blocks/mod.rs
@@ -0,0 +1,7 @@
+use bevy::prelude::App;
+
+mod basic_fabricator;
+
+pub(super) fn register(app: &mut App) {
+    basic_fabricator::register(app);
+}
diff --git a/cosmos_client/src/crafting/mod.rs b/cosmos_client/src/crafting/mod.rs
new file mode 100644
index 000000000..df1952517
--- /dev/null
+++ b/cosmos_client/src/crafting/mod.rs
@@ -0,0 +1,11 @@
+//! Client crafting logic
+
+use bevy::prelude::App;
+
+mod blocks;
+mod recipes;
+
+pub(super) fn register(app: &mut App) {
+    recipes::register(app);
+    blocks::register(app);
+}
diff --git a/cosmos_client/src/crafting/recipes/basic_fabricator.rs b/cosmos_client/src/crafting/recipes/basic_fabricator.rs
new file mode 100644
index 000000000..6aec59a1e
--- /dev/null
+++ b/cosmos_client/src/crafting/recipes/basic_fabricator.rs
@@ -0,0 +1,21 @@
+use bevy::{
+    app::Update,
+    log::info,
+    prelude::{App, Commands, EventReader, IntoSystemConfigs},
+};
+use cosmos_core::{
+    crafting::recipes::basic_fabricator::SyncBasicFabricatorRecipesEvent,
+    netty::{sync::events::client_event::NettyEventReceived, system_sets::NetworkingSystemsSet},
+};
+
+fn sync_recipes(mut commands: Commands, mut nevr: EventReader<NettyEventReceived<SyncBasicFabricatorRecipesEvent>>) {
+    for ev in nevr.read() {
+        let recipes = ev.0.clone();
+        info!("Received basic fabricator recipes from server {recipes:?}");
+        commands.insert_resource(recipes);
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(Update, sync_recipes.in_set(NetworkingSystemsSet::Between));
+}
diff --git a/cosmos_client/src/crafting/recipes/mod.rs b/cosmos_client/src/crafting/recipes/mod.rs
new file mode 100644
index 000000000..6336b82bd
--- /dev/null
+++ b/cosmos_client/src/crafting/recipes/mod.rs
@@ -0,0 +1,7 @@
+use bevy::prelude::App;
+
+mod basic_fabricator;
+
+pub(super) fn register(app: &mut App) {
+    basic_fabricator::register(app);
+}
diff --git a/cosmos_client/src/entities/player/player_movement.rs b/cosmos_client/src/entities/player/player_movement.rs
index ab0af7e48..f51c8d039 100644
--- a/cosmos_client/src/entities/player/player_movement.rs
+++ b/cosmos_client/src/entities/player/player_movement.rs
@@ -34,10 +34,8 @@ fn append_grounded_check(mut commands: Commands, q_player: Query<Entity, Added<L
     commands.entity(player_ent).with_children(|p| {
         p.spawn((
             GroundedChecker,
-            SpatialBundle {
-                transform: Transform::from_xyz(0.0, -0.80, 0.0),
-                ..Default::default()
-            },
+            Visibility::default(),
+            Transform::from_xyz(0.0, -0.80, 0.0),
             Name::new("Ground checker"),
             Collider::cuboid(0.1, 0.1, 0.1),
             Sensor,
@@ -111,7 +109,7 @@ pub(crate) fn process_player_movement(
     right = right.normalize_or_zero() * 100.0;
     let movement_up = up.normalize_or_zero() * 2.0;
 
-    let time = time.delta_seconds();
+    let time = time.delta_secs();
 
     let mut new_linvel = player_inv_rot * velocity.linvel;
 
diff --git a/cosmos_client/src/events/block/block_events.rs b/cosmos_client/src/events/block/block_events.rs
index 16b467b81..df2078523 100644
--- a/cosmos_client/src/events/block/block_events.rs
+++ b/cosmos_client/src/events/block/block_events.rs
@@ -4,11 +4,14 @@ use bevy::prelude::*;
 use bevy_renet2::renet2::RenetClient;
 use cosmos_core::{
     block::{
-        block_events::{BlockEventsSet, BlockInteractEvent, StructureBlockPair},
+        block_events::{BlockEventsSet, BlockInteractEvent},
         block_rotation::BlockRotation,
     },
     netty::{
-        client_reliable_messages::ClientReliableMessages, cosmos_encoder, sync::mapping::NetworkMapping, system_sets::NetworkingSystemsSet,
+        client_reliable_messages::ClientReliableMessages,
+        cosmos_encoder,
+        sync::mapping::{Mappable, NetworkMapping},
+        system_sets::NetworkingSystemsSet,
         NettyChannelClient,
     },
     state::GameState,
@@ -20,8 +23,6 @@ use crate::interactions::block_interactions::process_player_interaction;
 #[derive(Debug, Event)]
 /// Sent when this client tries to breaks a block
 pub struct RequestBlockBreakEvent {
-    /// The structure this block was on
-    pub structure_entity: Entity,
     /// block coords
     pub block: StructureBlock,
 }
@@ -29,8 +30,6 @@ pub struct RequestBlockBreakEvent {
 #[derive(Debug, Event)]
 /// Sent when this client tries to places a block
 pub struct RequestBlockPlaceEvent {
-    /// The structure this block is on
-    pub structure_entity: Entity,
     /// block coords
     pub block: StructureBlock,
     /// Which inventory slot it came from to make sure the inventory isn't out of sync
@@ -47,12 +46,13 @@ fn handle_block_break(
     network_mapping: Res<NetworkMapping>,
 ) {
     for ev in event_reader.read() {
+        let Ok(sb) = ev.block.map_to_server(&network_mapping) else {
+            continue;
+        };
+
         client.send_message(
             NettyChannelClient::Reliable,
-            cosmos_encoder::serialize(&ClientReliableMessages::BreakBlock {
-                structure_entity: network_mapping.server_from_client(&ev.structure_entity).unwrap(),
-                block: ev.block,
-            }),
+            cosmos_encoder::serialize(&ClientReliableMessages::BreakBlock { block: sb }),
         );
     }
 }
@@ -63,11 +63,14 @@ fn handle_block_place(
     network_mapping: Res<NetworkMapping>,
 ) {
     for ev in event_reader.read() {
+        let Ok(sb) = ev.block.map_to_server(&network_mapping) else {
+            continue;
+        };
+
         client.send_message(
             NettyChannelClient::Reliable,
             cosmos_encoder::serialize(&ClientReliableMessages::PlaceBlock {
-                structure_entity: network_mapping.server_from_client(&ev.structure_entity).unwrap(),
-                block: ev.block,
+                block: sb,
                 block_id: ev.block_id,
                 block_rotation: ev.block_rotation,
                 inventory_slot: ev.inventory_slot as u32,
@@ -82,25 +85,15 @@ fn handle_block_interact(
     network_mapping: Res<NetworkMapping>,
 ) {
     for ev in event_reader.read() {
-        let Some(any_ent) = network_mapping.server_from_client(&ev.block_including_fluids.structure_entity) else {
+        let Ok(server_structure_block) = ev.block_including_fluids.map_to_server(&network_mapping) else {
             continue;
         };
 
         client.send_message(
             NettyChannelClient::Reliable,
             cosmos_encoder::serialize(&ClientReliableMessages::InteractWithBlock {
-                block_including_fluids: StructureBlockPair {
-                    structure_block: ev.block_including_fluids.structure_block,
-                    structure_entity: any_ent,
-                },
-                block: ev.block.and_then(|b| {
-                    network_mapping
-                        .server_from_client(&b.structure_entity)
-                        .map(|ent| StructureBlockPair {
-                            structure_block: b.structure_block,
-                            structure_entity: ent,
-                        })
-                }),
+                block_including_fluids: server_structure_block,
+                block: ev.block.and_then(|b| b.map_to_server(&network_mapping).ok()),
                 alternate: ev.alternate,
             }),
         );
diff --git a/cosmos_client/src/input/inputs.rs b/cosmos_client/src/input/inputs.rs
index bab8ebcc8..3a6ca0815 100644
--- a/cosmos_client/src/input/inputs.rs
+++ b/cosmos_client/src/input/inputs.rs
@@ -122,6 +122,14 @@ pub enum CosmosInputs {
     ToggleWaypoint,
     /// For debug only - teleports player to the selected spot on the map
     TeleportSelected,
+
+    /// Toggles the send-chat window
+    ToggleChat,
+    /// Sends the chat message the user has typed - does not close the chat window
+    SendChatMessage,
+
+    /// Instead of crafting 1, the maximum amount will be crafted
+    BulkCraft,
 }
 
 fn init_input(mut input_handler: ResMut<CosmosInputHandler>) {
@@ -188,6 +196,11 @@ fn init_input(mut input_handler: ResMut<CosmosInputHandler>) {
     input_handler.set_keycode(CosmosInputs::ResetMapPosition, KeyCode::KeyR);
     input_handler.set_keycode(CosmosInputs::ToggleWaypoint, KeyCode::Enter);
     input_handler.set_keycode(CosmosInputs::TeleportSelected, KeyCode::KeyT);
+
+    input_handler.set_keycode(CosmosInputs::ToggleChat, KeyCode::Enter);
+    input_handler.set_keycode(CosmosInputs::SendChatMessage, KeyCode::Enter);
+
+    input_handler.set_keycode(CosmosInputs::BulkCraft, KeyCode::ShiftLeft);
 }
 
 #[derive(Resource, Default, Debug)]
diff --git a/cosmos_client/src/interactions/block_interactions.rs b/cosmos_client/src/interactions/block_interactions.rs
index 531bfe9c7..f4b811533 100644
--- a/cosmos_client/src/interactions/block_interactions.rs
+++ b/cosmos_client/src/interactions/block_interactions.rs
@@ -3,19 +3,20 @@
 use bevy::prelude::*;
 use bevy_rapier3d::{
     geometry::{CollisionGroups, Group, RayIntersection},
-    plugin::DefaultRapierContextAccess,
+    plugin::ReadDefaultRapierContext,
     prelude::{QueryFilter, RapierContext},
 };
 use cosmos_core::{
     block::{
         block_direction::BlockDirection,
-        block_events::{BlockEventsSet, BlockInteractEvent, StructureBlockPair},
+        block_events::{BlockEventsSet, BlockInteractEvent},
         block_face::BlockFace,
         block_rotation::{BlockRotation, BlockSubRotation},
         blocks::fluid::FLUID_COLLISION_GROUP,
         Block,
     },
     blockitems::BlockItems,
+    entities::player::creative::Creative,
     inventory::Inventory,
     item::Item,
     netty::{client::LocalPlayer, system_sets::NetworkingSystemsSet},
@@ -40,8 +41,6 @@ use crate::{
 ///
 /// This could be a solid or a non-solid (fluid) block.
 pub struct LookedAtBlock {
-    /// The structure's entity
-    pub structure_entity: Entity,
     /// The block on the structure
     pub block: StructureBlock,
     /// The information about the ray that intersected this block
@@ -67,8 +66,8 @@ fn add_looking_at_component(q_added_player: Query<Entity, Added<LocalPlayer>>, m
 pub(crate) fn process_player_interaction(
     input_handler: InputChecker,
     camera: Query<&GlobalTransform, With<MainCamera>>,
-    mut player_body: Query<(Entity, &mut Inventory, &mut LookingAt), (With<LocalPlayer>, Without<Pilot>)>,
-    rapier_context_access: DefaultRapierContextAccess,
+    mut q_player: Query<(Entity, &mut Inventory, &mut LookingAt, Option<&Creative>), (With<LocalPlayer>, Without<Pilot>)>,
+    rapier_context_access: ReadDefaultRapierContext,
     q_chunk_physics_part: Query<&ChunkPhysicsPart>,
     q_structure: Query<(&Structure, &GlobalTransform, Option<&Planet>)>,
     mut break_writer: EventWriter<RequestBlockBreakEvent>,
@@ -83,7 +82,7 @@ pub(crate) fn process_player_interaction(
     let rapier_context = rapier_context_access.single();
 
     // this fails if the player is a pilot
-    let Ok((player_entity, mut inventory, mut looking_at)) = player_body.get_single_mut() else {
+    let Ok((player_entity, mut inventory, mut looking_at, creative)) = q_player.get_single_mut() else {
         return;
     };
 
@@ -111,8 +110,6 @@ pub(crate) fn process_player_interaction(
 
     looking_at.looking_at_any = Some(hit_block);
 
-    let any_structure = structure;
-
     if structure.block_at(hit_block.block.coords(), &blocks).is_fluid() {
         if let Some((hit_block, s, sgt, ip)) = send_ray(
             rapier_context,
@@ -136,10 +133,7 @@ pub(crate) fn process_player_interaction(
 
     if input_handler.check_just_pressed(CosmosInputs::BreakBlock) {
         if let Some(x) = &looking_at.looking_at_block {
-            break_writer.send(RequestBlockBreakEvent {
-                structure_entity: structure.get_entity().unwrap(),
-                block: x.block,
-            });
+            break_writer.send(RequestBlockBreakEvent { block: x.block });
         }
     }
 
@@ -168,7 +162,9 @@ pub(crate) fn process_player_interaction(
                 return Some(0); // the return doesn't matter, it's just used for early returns
             }
 
-            inventory.decrease_quantity_at(inventory_slot, 1, &mut commands);
+            if creative.is_none() {
+                inventory.decrease_quantity_at(inventory_slot, 1, &mut commands);
+            }
 
             let block_rotation = if block.is_fully_rotatable() || block.should_face_front() {
                 let delta = UnboundBlockCoordinate::from(place_at_coords) - UnboundBlockCoordinate::from(looking_at_block.block.coords());
@@ -227,8 +223,7 @@ pub(crate) fn process_player_interaction(
             };
 
             place_writer.send(RequestBlockPlaceEvent {
-                structure_entity: structure.get_entity().unwrap(),
-                block: StructureBlock::new(place_at_coords),
+                block: StructureBlock::new(place_at_coords, structure.get_entity().unwrap()),
                 inventory_slot,
                 block_id,
                 block_rotation,
@@ -241,15 +236,9 @@ pub(crate) fn process_player_interaction(
     if input_handler.check_just_pressed(CosmosInputs::Interact) {
         if let Some(looking_at_any) = &looking_at.looking_at_any {
             interact_writer.send(BlockInteractEvent {
-                block_including_fluids: StructureBlockPair {
-                    structure_block: looking_at_any.block,
-                    structure_entity: any_structure.get_entity().unwrap(),
-                },
+                block_including_fluids: looking_at_any.block,
                 interactor: player_entity,
-                block: looking_at.looking_at_block.map(|looked_at| StructureBlockPair {
-                    structure_block: looked_at.block,
-                    structure_entity: structure.get_entity().unwrap(),
-                }),
+                block: looking_at.looking_at_block.map(|looked_at| looked_at.block),
                 alternate: input_handler.check_pressed(CosmosInputs::AlternateInteraction),
             });
         }
@@ -286,9 +275,8 @@ fn send_ray<'a>(
 
     Some((
         LookedAtBlock {
-            block: StructureBlock::new(coords),
+            block: StructureBlock::new(coords, structure_entity),
             intersection,
-            structure_entity,
         },
         structure,
         structure_g_transform,
diff --git a/cosmos_client/src/inventory/mod.rs b/cosmos_client/src/inventory/mod.rs
index ed7c7d230..a3aa68229 100644
--- a/cosmos_client/src/inventory/mod.rs
+++ b/cosmos_client/src/inventory/mod.rs
@@ -22,8 +22,9 @@ use crate::{
     input::inputs::{CosmosInputs, InputChecker, InputHandler},
     ui::{
         components::{
-            scollable_container::ScrollBundle,
-            window::{GuiWindow, UiWindowSystemSet, WindowBundle},
+            scollable_container::ScrollBox,
+            show_cursor::no_open_menus,
+            window::{GuiWindow, UiWindowSystemSet},
         },
         item_renderer::{ItemRenderLayer, RenderItem},
         OpenMenu, UiMiddleRoot, UiRoot, UiSystemSet, UiTopRoot,
@@ -34,11 +35,14 @@ pub mod netty;
 
 fn get_server_inventory_identifier(entity: Entity, mapping: &NetworkMapping, q_block_data: &Query<&BlockData>) -> InventoryIdentifier {
     if let Ok(block_data) = q_block_data.get(entity) {
+        let structure_ent = mapping
+            .server_from_client(&block_data.identifier.block.structure())
+            .expect("Unable to map inventory to server inventory");
+
+        let mut block = block_data.identifier.block;
+        block.set_structure(structure_ent);
         InventoryIdentifier::BlockData(BlockDataIdentifier {
-            block: block_data.identifier.block,
-            structure_entity: mapping
-                .server_from_client(&block_data.identifier.structure_entity)
-                .expect("Unable to map inventory to server inventory"),
+            block,
             block_id: block_data.identifier.block_id,
         })
     } else {
@@ -58,23 +62,25 @@ struct RenderedInventory {
 fn toggle_inventory(
     mut commands: Commands,
     player_inventory: Query<Entity, With<LocalPlayer>>,
-    open_inventories: Query<Entity, With<NeedsDisplayed>>,
+    open_inventories: Query<Entity, With<InventoryNeedsDisplayed>>,
     open_menus: Query<(), With<OpenMenu>>,
     inputs: InputChecker,
 ) {
     if inputs.check_just_pressed(CosmosInputs::ToggleInventory) {
         if !open_inventories.is_empty() {
             open_inventories.iter().for_each(|ent| {
-                commands.entity(ent).remove::<NeedsDisplayed>();
+                commands.entity(ent).remove::<InventoryNeedsDisplayed>();
             });
         } else if let Ok(player_inventory_ent) = player_inventory.get_single() {
             if open_menus.is_empty() {
-                commands.entity(player_inventory_ent).insert(NeedsDisplayed(InventorySide::Left));
+                commands
+                    .entity(player_inventory_ent)
+                    .insert(InventoryNeedsDisplayed::Normal(InventorySide::Left));
             }
         }
     } else if inputs.check_just_pressed(CosmosInputs::Interact) && !open_inventories.is_empty() {
         open_inventories.iter().for_each(|ent| {
-            commands.entity(ent).remove::<NeedsDisplayed>();
+            commands.entity(ent).remove::<InventoryNeedsDisplayed>();
         });
     }
 }
@@ -82,21 +88,52 @@ fn toggle_inventory(
 fn close_button_system(
     mut commands: Commands,
     q_close_inventory: Query<&RenderedInventory, With<NeedsDespawned>>,
-    open_inventories: Query<Entity, With<NeedsDisplayed>>,
+    open_inventories: Query<Entity, With<InventoryNeedsDisplayed>>,
 ) {
     for rendered_inventory in q_close_inventory.iter() {
         // TODO: fix inventory closing to only close the one open
         if let Some(mut _ecmds) = commands.get_entity(rendered_inventory.inventory_holder) {
             open_inventories.iter().for_each(|ent| {
-                commands.entity(ent).remove::<NeedsDisplayed>();
+                commands.entity(ent).remove::<InventoryNeedsDisplayed>();
             });
         }
     }
 }
 
-#[derive(Default, Component)]
+#[derive(Debug, Clone)]
+/// Instructions on how to render this inventory.
+pub struct CustomInventoryRender {
+    slots: Vec<(usize, Entity)>,
+}
+
+impl CustomInventoryRender {
+    /// The slots should be a Vec<(slot_index, slot_entity)>.
+    ///
+    /// Each `slot_index` should be based off the slots in the inventory you wish to render.
+    ///
+    /// Each `slot_entity` should be a UI node that will be filled in to be an interactable item
+    /// slot.
+    pub fn new(slots: Vec<(usize, Entity)>) -> Self {
+        Self { slots }
+    }
+}
+
+#[derive(Component, Debug, Clone)]
 /// Add this to an inventory you want displayed, and remove this component when you want to hide the inventory
-pub struct NeedsDisplayed(InventorySide);
+pub enum InventoryNeedsDisplayed {
+    /// A standard inventory rendering with no custom rendering. This Will be rendered like a chest
+    /// or player's inventory.
+    Normal(InventorySide),
+    /// You dictate where and which inventory slots should be rendered. See
+    /// [`CustomInventoryRender::new`]
+    Custom(CustomInventoryRender),
+}
+
+impl Default for InventoryNeedsDisplayed {
+    fn default() -> Self {
+        Self::Normal(Default::default())
+    }
+}
 
 #[derive(Default, Clone, Copy, Debug, PartialEq, Eq)]
 /// The side of the screen the inventory will be rendered
@@ -130,12 +167,15 @@ struct InventoryRenderedItem;
 fn toggle_inventory_rendering(
     mut commands: Commands,
     asset_server: Res<AssetServer>,
-    added_inventories: Query<(Entity, &Inventory, &NeedsDisplayed, Option<&OpenInventoryEntity>), Added<NeedsDisplayed>>,
-    mut without_needs_displayed_inventories: Query<(Entity, &mut Inventory, Option<&OpenInventoryEntity>), Without<NeedsDisplayed>>,
+    added_inventories: Query<(Entity, &Inventory, &InventoryNeedsDisplayed, Option<&OpenInventoryEntity>), Added<InventoryNeedsDisplayed>>,
+    mut without_needs_displayed_inventories: Query<
+        (Entity, &mut Inventory, Option<&OpenInventoryEntity>),
+        Without<InventoryNeedsDisplayed>,
+    >,
     mut holding_item: Query<(Entity, &DisplayedItemFromInventory, &mut HeldItemStack), With<FollowCursor>>,
     mut client: ResMut<RenetClient>,
     mapping: Res<NetworkMapping>,
-    mut removed_components: RemovedComponents<NeedsDisplayed>,
+    mut removed_components: RemovedComponents<InventoryNeedsDisplayed>,
     q_block_data: Query<&BlockData>,
     q_middle_root: Query<Entity, With<UiMiddleRoot>>,
     q_bottom_root: Query<Entity, With<UiRoot>>,
@@ -213,10 +253,25 @@ fn toggle_inventory_rendering(
 
         let font = asset_server.load("fonts/PixeloidSans.ttf");
 
-        let text_style = TextStyle {
-            color: Color::WHITE,
+        let text_style = TextFont {
             font_size: 22.0,
             font: font.clone(),
+            ..Default::default()
+        };
+
+        let needs_displayed_side = match needs_displayed {
+            InventoryNeedsDisplayed::Custom(slots) => {
+                for &(slot_number, slot) in slots.slots.iter() {
+                    commands.entity(slot).with_children(|p| {
+                        let slot = inventory.itemstack_at(slot_number);
+
+                        create_inventory_slot(inventory_holder, slot_number, p, slot, text_style.clone(), ItemRenderLayer::Middle);
+                    });
+                }
+
+                continue;
+            }
+            InventoryNeedsDisplayed::Normal(needs_displayed_side) => needs_displayed_side,
         };
 
         let inventory_border_size = 2.0;
@@ -224,7 +279,7 @@ fn toggle_inventory_rendering(
         let slot_size = 64.0;
         let scrollbar_width = 15.0;
 
-        let (left, right) = if needs_displayed.0 == InventorySide::Right {
+        let (left, right) = if *needs_displayed_side == InventorySide::Right {
             (Val::Auto, Val::Px(100.0))
         } else {
             (Val::Px(100.0), Val::Auto)
@@ -258,35 +313,24 @@ fn toggle_inventory_rendering(
                         left: 0.0,
                         top: title_bar_height,
                     },
-                    ScrollBundle {
-                        node_bundle: NodeBundle {
-                            style: Style {
-                                width,
-                                position_type: PositionType::Absolute,
-                                right,
-                                border: UiRect::horizontal(Val::Px(inventory_border_size)),
-                                min_height: Val::Px(non_hotbar_height),
-                                ..default()
-                            },
-                            border_color,
-                            background_color: BackgroundColor(Srgba::hex("3D3D3D").unwrap().into()),
-                            ..default()
-                        },
-                        ..Default::default()
+                    border_color,
+                    BackgroundColor(Srgba::hex("3D3D3D").unwrap().into()),
+                    ScrollBox::default(),
+                    Node {
+                        width,
+                        position_type: PositionType::Absolute,
+                        right,
+                        border: UiRect::horizontal(Val::Px(inventory_border_size)),
+                        min_height: Val::Px(non_hotbar_height),
+                        ..default()
                     },
                 ))
                 .with_children(|p| {
-                    p.spawn(NodeBundle {
-                        style: Style {
-                            display: Display::Grid,
-                            flex_grow: 1.0,
-                            grid_column: GridPlacement::end(n_slots_per_row as i16),
-                            grid_template_columns: vec![RepeatedGridTrack::px(
-                                GridTrackRepetition::Count(n_slots_per_row as u16),
-                                slot_size,
-                            )],
-                            ..default()
-                        },
+                    p.spawn(Node {
+                        display: Display::Grid,
+                        flex_grow: 1.0,
+                        grid_column: GridPlacement::end(n_slots_per_row as i16),
+                        grid_template_columns: vec![RepeatedGridTrack::px(GridTrackRepetition::Count(n_slots_per_row as u16), slot_size)],
                         ..Default::default()
                     })
                     .with_children(|slots| {
@@ -319,28 +363,22 @@ fn toggle_inventory_rendering(
                             left: 0.0,
                             top: non_hotbar_height + title_bar_height,
                         },
-                        NodeBundle {
-                            style: Style {
-                                display: Display::Flex,
-                                height: Val::Px(5.0 + slot_size + 2.0),
-                                border: UiRect::new(
-                                    Val::Px(inventory_border_size),
-                                    Val::Px(inventory_border_size),
-                                    Val::Px(5.0),
-                                    Val::Px(inventory_border_size),
-                                ),
-                                position_type: PositionType::Absolute,
-                                right,
-                                width,
-                                ..default()
-                            },
-                            border_color,
+                        border_color,
+                        Node {
+                            display: Display::Flex,
+                            height: Val::Px(5.0 + slot_size + 2.0),
+                            border: UiRect::new(
+                                Val::Px(inventory_border_size),
+                                Val::Px(inventory_border_size),
+                                Val::Px(5.0),
+                                Val::Px(inventory_border_size),
+                            ),
+                            position_type: PositionType::Absolute,
+                            right,
+                            width,
                             ..default()
                         },
-                        UiImage {
-                            texture: asset_server.load("cosmos/images/ui/inventory-footer.png"),
-                            ..Default::default()
-                        },
+                        ImageNode::new(asset_server.load("cosmos/images/ui/inventory-footer.png")),
                     ))
                     .with_children(|slots| {
                         for slot_number in priority_slots {
@@ -368,28 +406,22 @@ fn toggle_inventory_rendering(
                     RenderedInventory { inventory_holder },
                     OpenMenu::new(0),
                     InventoryTitleBar(current_ents),
-                    WindowBundle {
-                        window: GuiWindow {
-                            title: inventory.name().into(),
-                            body_styles: Style {
-                                flex_direction: FlexDirection::Column,
-                                ..Default::default()
-                            },
-                        },
-                        node_bundle: NodeBundle {
-                            style: Style {
-                                position_type: PositionType::Absolute,
-                                right,
-                                left,
-                                top: Val::Px(100.0),
-                                width,
-                                border: UiRect::all(Val::Px(inventory_border_size)),
-                                ..default()
-                            },
-                            border_color: BorderColor(Color::BLACK),
-                            ..default()
+                    BorderColor(Color::BLACK),
+                    GuiWindow {
+                        title: inventory.name().into(),
+                        body_styles: Node {
+                            flex_direction: FlexDirection::Column,
+                            ..Default::default()
                         },
-                        ..Default::default()
+                    },
+                    Node {
+                        position_type: PositionType::Absolute,
+                        right,
+                        left,
+                        top: Val::Px(100.0),
+                        width,
+                        border: UiRect::all(Val::Px(inventory_border_size)),
+                        ..default()
                     },
                 ))
                 .id(),
@@ -437,8 +469,8 @@ fn drop_item(
 }
 
 fn reposition_window_children(
-    mut q_style: Query<(&StyleOffsets, &mut Style), Without<InventoryTitleBar>>,
-    q_changed_window_pos: Query<(&Style, &InventoryTitleBar), Changed<Style>>,
+    mut q_style: Query<(&StyleOffsets, &mut Node), Without<InventoryTitleBar>>,
+    q_changed_window_pos: Query<(&Node, &InventoryTitleBar), Changed<Node>>,
 ) {
     for (style, title_bar) in q_changed_window_pos.iter() {
         let Val::Px(top) = style.top else {
@@ -533,10 +565,10 @@ fn rerender_inventory_slot(
         // This is rarely hit, so putting this load in here is best
         let font = asset_server.load("fonts/PixeloidSans.ttf");
 
-        let text_style = TextStyle {
-            color: Color::WHITE,
+        let text_style = TextFont {
             font_size: 22.0,
             font: font.clone(),
+            ..Default::default()
         };
 
         if as_child {
@@ -559,23 +591,19 @@ fn create_inventory_slot(
     slot_number: usize,
     slots: &mut ChildBuilder,
     item_stack: Option<&ItemStack>,
-    text_style: TextStyle,
+    text_style: TextFont,
     render_layer: ItemRenderLayer,
 ) {
     let mut ecmds = slots.spawn((
         Name::new("Inventory Item"),
         InventoryItemMarker,
-        NodeBundle {
-            style: Style {
-                border: UiRect::all(Val::Px(2.0)),
-                width: Val::Px(INVENTORY_SLOTS_DIMS),
-                height: Val::Px(INVENTORY_SLOTS_DIMS),
-                ..default()
-            },
-
-            border_color: BorderColor(Srgba::hex("222222").unwrap().into()),
+        Node {
+            border: UiRect::all(Val::Px(2.0)),
+            width: Val::Px(INVENTORY_SLOTS_DIMS),
+            height: Val::Px(INVENTORY_SLOTS_DIMS),
             ..default()
         },
+        BorderColor(Srgba::hex("222222").unwrap().into()),
         Interaction::None,
         DisplayedItemFromInventory {
             inventory_holder,
@@ -628,10 +656,10 @@ fn pickup_item_into_cursor(
 
     let font = asset_server.load("fonts/PixeloidSans.ttf");
 
-    let text_style = TextStyle {
-        color: Color::WHITE,
+    let text_style = TextFont {
         font_size: 22.0,
         font: font.clone(),
+        ..Default::default()
     };
 
     let mut ecmds = commands.spawn(FollowCursor);
@@ -670,7 +698,7 @@ fn handle_interactions(
     mapping: Res<NetworkMapping>,
     q_block_data: Query<&BlockData>,
     asset_server: Res<AssetServer>,
-    open_inventories: Query<Entity, With<NeedsDisplayed>>,
+    open_inventories: Query<Entity, With<InventoryNeedsDisplayed>>,
 ) {
     let lmb = input_handler.mouse_inputs().just_pressed(MouseButton::Left);
     let rmb = input_handler.mouse_inputs().just_pressed(MouseButton::Right);
@@ -824,27 +852,24 @@ fn handle_interactions(
  */
 
 #[derive(Component)]
-struct TextNeedsTopRoot;
+pub struct TextNeedsTopRoot;
 
 fn create_item_stack_slot_data(
     item_stack: &ItemStack,
     ecmds: &mut EntityCommands,
-    text_style: TextStyle,
+    text_style: TextFont,
     quantity: u16,
     render_layer: ItemRenderLayer,
 ) {
     ecmds
         .insert((
             Name::new("Render Item"),
-            NodeBundle {
-                style: Style {
-                    width: Val::Px(64.0),
-                    height: Val::Px(64.0),
-                    display: Display::Flex,
-                    justify_content: JustifyContent::FlexEnd,
-                    align_items: AlignItems::FlexEnd,
-                    ..Default::default()
-                },
+            Node {
+                width: Val::Px(64.0),
+                height: Val::Px(64.0),
+                display: Display::Flex,
+                justify_content: JustifyContent::FlexEnd,
+                align_items: AlignItems::FlexEnd,
                 ..Default::default()
             },
             render_layer,
@@ -855,24 +880,21 @@ fn create_item_stack_slot_data(
         ))
         .with_children(|p| {
             p.spawn((
-                TextBundle {
-                    style: Style {
-                        margin: UiRect::new(Val::Px(0.0), Val::Px(5.0), Val::Px(0.0), Val::Px(5.0)),
-                        ..default()
-                    },
-                    text: Text::from_section(format!("{quantity}"), text_style),
+                Node {
+                    margin: UiRect::new(Val::Px(0.0), Val::Px(5.0), Val::Px(0.0), Val::Px(5.0)),
                     ..default()
                 },
+                Text::new(format!("{quantity}")),
+                text_style,
                 TextNeedsTopRoot,
             ));
         });
 }
 
 fn hide_hidden(
-    q_non_hotbar_slots: Query<(&Node, &GlobalTransform), With<NonHotbarSlots>>,
+    q_non_hotbar_slots: Query<(&ComputedNode, &GlobalTransform), With<NonHotbarSlots>>,
     q_parent: Query<&Parent>,
-    mut q_render_item: Query<(&Node, &mut Visibility, &Parent, &GlobalTransform), With<RenderItem>>,
-    ui_scale: Res<UiScale>,
+    mut q_render_item: Query<(&ComputedNode, &mut Visibility, &Parent, &GlobalTransform), With<RenderItem>>,
 ) {
     for (node, mut vis, parent, g_trans) in q_render_item.iter_mut() {
         // this is evil.
@@ -894,13 +916,15 @@ fn hide_hidden(
 
         let maybe_non_hotbar = four.get();
 
-        let this_logical_rect = node.physical_rect(g_trans, 1.0, ui_scale.0);
+        let t = g_trans.translation();
+        let this_logical_rect = Rect::from_center_size(Vec2::new(t.x, t.y), node.size());
 
         let Ok((non_hotbar_node, g_trans)) = q_non_hotbar_slots.get(maybe_non_hotbar) else {
             continue;
         };
 
-        let dims = non_hotbar_node.physical_rect(g_trans, 1.0, ui_scale.0);
+        let t = g_trans.translation();
+        let dims = Rect::from_center_size(Vec2::new(t.x, t.y), non_hotbar_node.size());
 
         if !(dims.contains(this_logical_rect.min) || dims.contains(this_logical_rect.max)) {
             *vis = Visibility::Hidden;
@@ -908,7 +932,7 @@ fn hide_hidden(
     }
 }
 
-fn follow_cursor(mut query: Query<&mut Style, With<FollowCursor>>, primary_window_query: Query<&Window, With<PrimaryWindow>>) {
+fn follow_cursor(mut query: Query<&mut Node, With<FollowCursor>>, primary_window_query: Query<&Window, With<PrimaryWindow>>) {
     let Some(Some(cursor_pos)) = primary_window_query.get_single().ok().map(|x| x.cursor_position()) else {
         return; // cursor is outside of window or the window was closed
     };
@@ -932,6 +956,8 @@ enum InventorySet {
 fn make_render_middle_camera(
     q_mid_cam: Query<Entity, With<UiTopRoot>>,
     mut q_target_cam: Query<&mut TargetCamera, (Changed<TargetCamera>, With<TextNeedsTopRoot>)>,
+    q_needs_target_cam: Query<Entity, (Without<TargetCamera>, With<TextNeedsTopRoot>)>,
+    mut commands: Commands,
 ) {
     for mut target_camera in q_target_cam.iter_mut() {
         let middle_camera_entity = q_mid_cam.single();
@@ -939,6 +965,11 @@ fn make_render_middle_camera(
             target_camera.0 = middle_camera_entity;
         }
     }
+
+    for ent in q_needs_target_cam.iter() {
+        let middle_camera_entity = q_mid_cam.single();
+        commands.entity(ent).insert(TargetCamera(middle_camera_entity));
+    }
 }
 
 pub(super) fn register(app: &mut App) {
@@ -964,7 +995,7 @@ pub(super) fn register(app: &mut App) {
     .add_systems(
         Update,
         (
-            drop_item,
+            drop_item.run_if(no_open_menus),
             (toggle_inventory, close_button_system)
                 .chain()
                 .in_set(InventorySet::ToggleInventory),
diff --git a/cosmos_client/src/inventory/netty.rs b/cosmos_client/src/inventory/netty.rs
index d402b92a2..a91d6a82a 100644
--- a/cosmos_client/src/inventory/netty.rs
+++ b/cosmos_client/src/inventory/netty.rs
@@ -17,7 +17,7 @@ use cosmos_core::{
     structure::Structure,
 };
 
-use super::{HeldItemStack, InventorySide, NeedsDisplayed};
+use super::{HeldItemStack, InventoryNeedsDisplayed, InventorySide};
 
 fn sync(
     mut client: ResMut<RenetClient>,
@@ -58,17 +58,17 @@ fn sync(
                     InventoryIdentifier::Entity(owner) => {
                         if let Some(client_entity) = network_mapping.client_from_server(&owner) {
                             if let Some(mut ecmds) = commands.get_entity(client_entity) {
-                                ecmds.insert(NeedsDisplayed::default());
+                                ecmds.insert(InventoryNeedsDisplayed::default());
                             }
                         } else {
                             warn!("Error: unrecognized entity {owner:?} received from server when trying to sync up inventories!");
                         }
                     }
                     InventoryIdentifier::BlockData(block_data) => {
-                        let Some(client_entity) = network_mapping.client_from_server(&block_data.structure_entity) else {
+                        let Some(client_entity) = network_mapping.client_from_server(&block_data.block.structure()) else {
                             warn!(
                                 "Error: unrecognized entity {:?} received from server when trying to sync up inventories!",
-                                block_data.structure_entity
+                                block_data.block.structure()
                             );
                             continue;
                         };
@@ -90,11 +90,13 @@ fn sync(
                             continue;
                         }
 
-                        commands.entity(data_entity).insert(NeedsDisplayed::default());
+                        commands.entity(data_entity).insert(InventoryNeedsDisplayed::default());
                     }
                 }
 
-                commands.entity(local_player.single()).insert(NeedsDisplayed(InventorySide::Left));
+                commands
+                    .entity(local_player.single())
+                    .insert(InventoryNeedsDisplayed::Normal(InventorySide::Left));
             }
         }
     }
diff --git a/cosmos_client/src/item/item_mesh.rs b/cosmos_client/src/item/item_mesh.rs
index 79e1911f2..2a0fcd8f0 100644
--- a/cosmos_client/src/item/item_mesh.rs
+++ b/cosmos_client/src/item/item_mesh.rs
@@ -90,7 +90,6 @@ fn generate_item_model(
     item_textures: &Registry<ItemTextureIndex>,
     material_definitions_registry: &Registry<MaterialDefinition>,
 ) -> Option<(Mesh, u16, u32)> {
-    println!("{item_textures:?}");
     let index = item_textures
         .from_id(item.unlocalized_name())
         .unwrap_or_else(|| item_textures.from_id("missing").expect("Missing texture should exist."));
diff --git a/cosmos_client/src/item/physical_item.rs b/cosmos_client/src/item/physical_item.rs
index a7cb8df05..4d7227f2b 100644
--- a/cosmos_client/src/item/physical_item.rs
+++ b/cosmos_client/src/item/physical_item.rs
@@ -2,11 +2,8 @@
 
 use bevy::{
     app::Update,
-    asset::Handle,
     math::Vec3,
-    prelude::{
-        in_state, App, Changed, Commands, Entity, EventWriter, IntoSystemConfigs, Mesh, Query, Res, Transform, VisibilityBundle, With,
-    },
+    prelude::{in_state, App, Changed, Commands, Entity, EventWriter, IntoSystemConfigs, Mesh3d, Query, Res, Transform, Visibility, With},
 };
 use cosmos_core::{
     inventory::Inventory,
@@ -31,18 +28,18 @@ fn render_physical_item(
     for (ent, mut trans, inventory) in q_physical_item.iter_mut() {
         let mut ecmds = commands.entity(ent);
         let Some(is) = inventory.itemstack_at(0) else {
-            ecmds.remove::<Handle<Mesh>>();
+            ecmds.remove::<Mesh3d>();
             continue;
         };
 
         let Some(rendering_info) = item_rendering_info.from_id(items.from_numeric_id(is.item_id()).unlocalized_name()) else {
-            ecmds.remove::<Handle<Mesh>>();
+            ecmds.remove::<Mesh3d>();
             continue;
         };
 
         trans.scale = Vec3::splat(0.2);
 
-        ecmds.insert((VisibilityBundle::default(), rendering_info.mesh_handle().clone_weak()));
+        ecmds.insert((Visibility::default(), Mesh3d(rendering_info.mesh_handle().clone_weak())));
         evw_remove_material.send(RemoveAllMaterialsEvent { entity: ent });
         evw_add_material.send(AddMaterialEvent {
             entity: ent,
diff --git a/cosmos_client/src/main.rs b/cosmos_client/src/main.rs
index 47c9b8539..bb4a13e52 100644
--- a/cosmos_client/src/main.rs
+++ b/cosmos_client/src/main.rs
@@ -7,6 +7,8 @@ pub mod asset;
 pub mod audio;
 pub mod block;
 pub mod camera;
+pub mod chat;
+pub mod crafting;
 pub mod debug;
 pub mod economy;
 pub mod ecs;
@@ -36,7 +38,7 @@ use bevy::prelude::*;
 use bevy::window::WindowMode;
 use bevy::{core::TaskPoolThreadAssignmentPolicy, diagnostic::FrameTimeDiagnosticsPlugin};
 use bevy_hanabi::HanabiPlugin;
-use bevy_mod_billboard::plugin::BillboardPlugin;
+// use bevy_mod_billboard::plugin::BillboardPlugin;
 use bevy_mod_debugdump::schedule_graph;
 use bevy_obj::ObjPlugin;
 
@@ -47,7 +49,7 @@ use clap::{arg, Parser};
 use cosmos_core::netty::sync::registry::RegistrySyncInit;
 use cosmos_core::state::GameState;
 use cosmos_core::{physics::collision_handling::CosmosPhysicsFilter, plugin::cosmos_core_plugin::CosmosCorePluginGroup};
-use iyes_perf_ui::PerfUiPlugin;
+// use iyes_perf_ui::PerfUiPlugin;
 use netty::connect::{self};
 use thread_priority::{set_current_thread_priority, ThreadPriority};
 
@@ -95,7 +97,7 @@ fn main() {
         .set(WindowPlugin {
             primary_window: Some(Window {
                 mode: if args.fullscreen {
-                    WindowMode::BorderlessFullscreen
+                    WindowMode::BorderlessFullscreen(MonitorSelection::Current)
                 } else {
                     WindowMode::Windowed
                 },
@@ -148,8 +150,8 @@ fn main() {
             SystemInformationDiagnosticsPlugin,
             EntityCountDiagnosticsPlugin,
             FrameTimeDiagnosticsPlugin,
-            PerfUiPlugin,
-            BillboardPlugin,
+            // PerfUiPlugin,
+            // BillboardPlugin,
         ))
         // .add_plugins(RapierDebugRenderPlugin::default())
         .add_systems(OnEnter(GameState::Connecting), connect::establish_connection)
@@ -182,6 +184,8 @@ fn main() {
     economy::register(&mut app);
     item::register(&mut app);
     debug::register(&mut app);
+    chat::register(&mut app);
+    crafting::register(&mut app);
 
     if cfg!(feature = "print-schedule") {
         println!(
diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 14fbb8b6e..57b440549 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -4,7 +4,7 @@
 
 use std::sync::{Arc, Mutex};
 
-use bevy::{color::palettes::css, core_pipeline::bloom::BloomSettings, prelude::*, window::PrimaryWindow};
+use bevy::{color::palettes::css, core_pipeline::bloom::Bloom, prelude::*, window::PrimaryWindow};
 use bevy_kira_audio::prelude::AudioReceiver;
 use bevy_rapier3d::prelude::*;
 use bevy_renet2::renet2::{transport::NetcodeClientTransport, RenetClient};
@@ -106,7 +106,7 @@ fn update_crosshair(
         if docked.is_some() {
             crosshair_offset.x = 0.0;
             crosshair_offset.y = 0.0;
-        } else if let Some(mut pos_on_screen) = camera.world_to_viewport(
+        } else if let Ok(mut pos_on_screen) = camera.world_to_viewport(
             cam_global_trans,
             last_rotation.0.mul_vec3(Vec3::from(cam_trans.forward())) + cam_global_trans.translation(),
         ) {
@@ -241,7 +241,7 @@ pub(crate) fn client_sync_players(
     let client_id = transport.client_id();
 
     requested_entities.entities.retain_mut(|x| {
-        x.seconds_since_request += time.delta_seconds();
+        x.seconds_since_request += time.delta_secs();
         if x.seconds_since_request < 10.0 {
             true
         } else {
@@ -414,7 +414,7 @@ pub(crate) fn client_sync_players(
                     CosmosPbrBundle {
                         location: loc,
                         rotation: body.rotation.into(),
-                        mesh: meshes.add(Capsule3d::default()),
+                        mesh: Mesh3d(meshes.add(Capsule3d::default())),
                         ..default()
                     },
                     Collider::capsule_y(0.65, 0.25),
@@ -460,19 +460,17 @@ pub(crate) fn client_sync_players(
                         ))
                         .with_children(|parent| {
                             parent.spawn((
-                                Camera3dBundle {
-                                    camera: Camera {
-                                        hdr: true,
-                                        ..Default::default()
-                                    },
-                                    transform: Transform::from_translation(camera_offset),
-                                    projection: Projection::from(PerspectiveProjection {
-                                        fov: (desired_fov.0 / 180.0) * std::f32::consts::PI,
-                                        ..default()
-                                    }),
-                                    ..default()
+                                Camera {
+                                    hdr: true,
+                                    ..Default::default()
                                 },
-                                BloomSettings { ..Default::default() },
+                                Transform::from_translation(camera_offset),
+                                Projection::from(PerspectiveProjection {
+                                    fov: (desired_fov.0 / 180.0) * std::f32::consts::PI,
+                                    ..default()
+                                }),
+                                Camera3d::default(),
+                                Bloom { ..Default::default() },
                                 CameraHelper::default(),
                                 Name::new("Main Camera"),
                                 MainCamera,
@@ -677,10 +675,10 @@ pub(crate) fn client_sync_players(
                 if let Some(client_ent) = network_mapping.client_from_server(&structure_entity) {
                     if let Ok(mut structure) = q_structure.get_mut(client_ent) {
                         for block_changed in blocks_changed_packet.0 {
-                            structure.set_block_at(
+                            structure.set_block_and_info_at(
                                 block_changed.coordinates.coords(),
                                 blocks.from_numeric_id(block_changed.block_id),
-                                block_changed.block_rotation,
+                                block_changed.block_info,
                                 &blocks,
                                 Some(&mut block_change_event_writer),
                             );
@@ -875,11 +873,13 @@ fn get_entity_identifier_entity_for_despawning(
             }
         }),
         ComponentEntityIdentifier::BlockData {
-            identifier,
+            mut identifier,
             server_data_entity,
         } => network_mapping
-            .client_from_server(&identifier.structure_entity)
+            .client_from_server(&identifier.block.structure())
             .and_then(|structure_entity| {
+                identifier.block.set_structure(structure_entity);
+
                 let mut structure = q_structure.get_mut(structure_entity).ok()?;
 
                 let bd = structure.block_data(identifier.block.coords());
@@ -898,7 +898,6 @@ fn get_entity_identifier_entity_for_despawning(
 
                     block_data_changed.send(BlockDataChangedEvent {
                         block: identifier.block,
-                        structure_entity,
                         block_data_entity: None,
                     });
                 }
@@ -960,10 +959,9 @@ fn fix_location(
                 if let Some(mut transform) = transform {
                     transform.translation = translation;
                 } else {
-                    commands.entity(entity).insert((
-                        WorldWithin(pw),
-                        TransformBundle::from_transform(Transform::from_translation(translation)),
-                    ));
+                    commands
+                        .entity(entity)
+                        .insert((WorldWithin(pw), Transform::from_translation(translation)));
                 }
                 location.last_transform_loc = Some(translation);
             }
@@ -1062,7 +1060,7 @@ pub(super) fn register(app: &mut App) {
                     .in_set(NetworkingSystemsSet::ReceiveMessages)
                     .before(CosmosBundleSet::HandleCosmosBundles),
             )
-                .run_if(in_state(GameState::Playing).or_else(in_state(GameState::LoadingWorld)))
+                .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld)))
                 .chain(),
         )
         .add_systems(
diff --git a/cosmos_client/src/netty/mod.rs b/cosmos_client/src/netty/mod.rs
index 337ff2884..8e3b5fab8 100644
--- a/cosmos_client/src/netty/mod.rs
+++ b/cosmos_client/src/netty/mod.rs
@@ -22,7 +22,7 @@ pub(super) fn register(app: &mut App) {
             ComponentSyncingSet::DoComponentSyncing,
             ComponentSyncingSet::PostComponentSyncing,
         )
-            .run_if(in_state(GameState::Playing).or_else(in_state(GameState::LoadingWorld)))
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld)))
             .after(CosmosBundleSet::HandleCosmosBundles)
             .in_set(NetworkingSystemsSet::SyncComponents)
             .chain(),
@@ -32,7 +32,7 @@ pub(super) fn register(app: &mut App) {
         Update,
         ComponentSyncingSet::ReceiveComponents
             .in_set(NetworkingSystemsSet::ReceiveMessages)
-            .run_if(in_state(GameState::Playing).or_else(in_state(GameState::LoadingWorld))),
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld))),
     );
 
     gameplay::register(app);
diff --git a/cosmos_client/src/plugin/client_plugin.rs b/cosmos_client/src/plugin/client_plugin.rs
index e98cc91ff..0cc4cc922 100644
--- a/cosmos_client/src/plugin/client_plugin.rs
+++ b/cosmos_client/src/plugin/client_plugin.rs
@@ -19,7 +19,7 @@ impl PluginGroup for ClientPluginGroup {
         PluginGroupBuilder::start::<Self>()
             .add(WinitPlugin::<WakeUp>::default())
             .add(TextPlugin)
-            .add(UiPlugin)
+            .add(UiPlugin::default())
             .add(PbrPlugin::default())
             .add(CorePipelinePlugin)
             // NOTE: Load this after renderer initialization so that it knows about the supported
diff --git a/cosmos_client/src/projectiles/lasers.rs b/cosmos_client/src/projectiles/lasers.rs
index 4f5939a66..f08c7f551 100644
--- a/cosmos_client/src/projectiles/lasers.rs
+++ b/cosmos_client/src/projectiles/lasers.rs
@@ -63,13 +63,13 @@ fn lasers_netty(
                     strength,
                     no_hit,
                     CosmosPbrBundle {
-                        mesh: laser_mesh.0.clone_weak(),
-                        material: materials.add(StandardMaterial {
+                        mesh: Mesh3d(laser_mesh.0.clone_weak()),
+                        material: MeshMaterial3d(materials.add(StandardMaterial {
                             base_color: color.unwrap_or(Color::WHITE),
                             // emissive: color,
                             unlit: true,
                             ..Default::default()
-                        }),
+                        })),
                         ..Default::default()
                     },
                     &time,
diff --git a/cosmos_client/src/projectiles/missile.rs b/cosmos_client/src/projectiles/missile.rs
index c8190e911..d938ada69 100644
--- a/cosmos_client/src/projectiles/missile.rs
+++ b/cosmos_client/src/projectiles/missile.rs
@@ -14,7 +14,7 @@ use cosmos_core::{
 
 use crate::{
     asset::asset_loader::load_assets,
-    audio::{AudioEmission, AudioEmitterBundle, CosmosAudioEmitter, DespawnOnNoEmissions},
+    audio::{AudioEmission, CosmosAudioEmitter, DespawnOnNoEmissions},
     structure::ship::PlayerParentChangingSet,
 };
 
@@ -30,7 +30,7 @@ fn track_time_alive(
     mut q_time_alive: Query<(Entity, &mut ExplosionTimeAlive, Option<&MaxTimeExplosionAlive>)>,
 ) {
     for (ent, mut time_alive, max_time) in &mut q_time_alive {
-        time_alive.0 += time.delta_seconds();
+        time_alive.0 += time.delta_secs();
 
         if let Some(max_time) = max_time {
             if time_alive.0 >= max_time.0.as_secs_f32() {
@@ -60,9 +60,9 @@ fn on_add_missile(
 ) {
     for ent in &q_added_missile {
         commands.entity(ent).insert((
-            VisibilityBundle::default(),
-            missile_rendering_info.0.clone_weak(),
-            missile_rendering_info.1.clone_weak(),
+            Visibility::default(),
+            Mesh3d(missile_rendering_info.0.clone_weak()),
+            MeshMaterial3d(missile_rendering_info.1.clone_weak()),
         ));
     }
 }
@@ -136,16 +136,14 @@ fn respond_to_explosion(
             Name::new("Explosion sound"),
             DespawnOnNoEmissions,
             *explosion_loc,
-            AudioEmitterBundle {
-                emitter: CosmosAudioEmitter::with_emissions(vec![AudioEmission {
-                    instance: playing_sound,
-                    handle: audio_handle,
-                    max_distance: 200.0,
-                    peak_volume: 1.0,
-                    ..Default::default()
-                }]),
-                transform: TransformBundle::from_transform(Transform::from_translation(transform.translation)),
-            },
+            CosmosAudioEmitter::with_emissions(vec![AudioEmission {
+                instance: playing_sound,
+                handle: audio_handle,
+                max_distance: 200.0,
+                peak_volume: 1.0,
+                ..Default::default()
+            }]),
+            Transform::from_translation(transform.translation),
         ));
     }
 }
@@ -154,7 +152,7 @@ fn respond_to_explosion(
 /// This fixes that issue.
 ///
 /// Note that this needs to be run *before* the explosion particle creation system, for some reason
-fn start_explosion_particle_system(mut q_spawner: Query<&mut EffectSpawner, (Added<ExplosionParticle>, With<ExplosionParticle>)>) {
+fn start_explosion_particle_system(mut q_spawner: Query<&mut EffectInitializers, (Added<ExplosionParticle>, With<ExplosionParticle>)>) {
     for mut effect_spawner in &mut q_spawner {
         effect_spawner.reset();
         effect_spawner.set_active(true);
@@ -181,9 +179,9 @@ fn create_particle_fx(color: Option<Color>, effects: &mut Assets<EffectAsset>) -
     }
 
     let mut size_gradient1 = Gradient::new();
-    size_gradient1.add_key(0.0, Vec2::splat(0.2));
-    size_gradient1.add_key(0.3, Vec2::splat(0.2));
-    size_gradient1.add_key(1.0, Vec2::splat(0.0));
+    size_gradient1.add_key(0.0, Vec3::splat(0.2));
+    size_gradient1.add_key(0.3, Vec3::splat(0.2));
+    size_gradient1.add_key(1.0, Vec3::splat(0.0));
 
     let writer = ExprWriter::new();
 
@@ -212,7 +210,7 @@ fn create_particle_fx(color: Option<Color>, effects: &mut Assets<EffectAsset>) -
         speed: (writer.rand(ScalarType::Float) * writer.lit(20.) + writer.lit(20.)).expr(),
     };
 
-    let effect = EffectAsset::new(vec![32768], Spawner::once(1250.0.into(), true), writer.finish())
+    let effect = EffectAsset::new(32768, Spawner::once(1250.0.into(), true), writer.finish())
         .with_name("explosion")
         .init(init_pos)
         .init(init_vel)
diff --git a/cosmos_client/src/rendering/custom_blocks/logic_indicator.rs b/cosmos_client/src/rendering/custom_blocks/logic_indicator.rs
index f9067d0c2..33ee7ac5f 100644
--- a/cosmos_client/src/rendering/custom_blocks/logic_indicator.rs
+++ b/cosmos_client/src/rendering/custom_blocks/logic_indicator.rs
@@ -12,10 +12,10 @@ use bevy::{
     hierarchy::{BuildChildren, DespawnRecursiveExt},
     log::warn,
     math::{Rect, Vec3},
+    prelude::{Mesh3d, Transform, Visibility},
     reflect::Reflect,
-    render::{mesh::Mesh, view::VisibilityBundle},
+    render::mesh::Mesh,
     state::state::OnEnter,
-    transform::bundles::TransformBundle,
     utils::HashMap,
 };
 use cosmos_core::{
@@ -91,7 +91,7 @@ fn on_render_logic_indicator(
         let mut material_meshes: HashMap<(MaterialType, u16, u32), CosmosMeshBuilder> = HashMap::default();
 
         for block in structure.block_iter_for_chunk(ev.chunk_coordinate, true) {
-            if structure.block_id_at(block.coords()) != logic_indicator_id {
+            if structure.block_id_at(block) != logic_indicator_id {
                 continue;
             }
 
@@ -108,11 +108,11 @@ fn on_render_logic_indicator(
 
             let mut one_mesh_only = false;
 
-            let block_rotation = structure.block_rotation(block.coords());
+            let block_rotation = structure.block_rotation(block);
 
             let rotation = block_rotation.as_quat();
 
-            let Some(&logic_data) = structure.query_block_data(block.coords(), &q_logic_data) else {
+            let Some(&logic_data) = structure.query_block_data(block, &q_logic_data) else {
                 continue;
             };
 
@@ -126,7 +126,7 @@ fn on_render_logic_indicator(
             // let mesh_builder = material_meshes.entry((material_type, mat_id)).or_default();
 
             let faces = ALL_BLOCK_FACES.iter().copied().filter(|face| {
-                if let Ok(new_coord) = BlockCoordinate::try_from(block.coords() + face.direction().to_coordinates()) {
+                if let Ok(new_coord) = BlockCoordinate::try_from(block + face.direction().to_coordinates()) {
                     return structure.block_at(new_coord, &blocks).is_see_through();
                 }
                 true
@@ -174,7 +174,7 @@ fn on_render_logic_indicator(
 
                 // Scale the rotated positions, not the pre-rotated positions since our side checks are absolute
 
-                let structure_coords = block.coords();
+                let structure_coords = block;
 
                 let additional_info = material_definition.add_material_data(logic_indicator_id, &mesh_info);
 
@@ -215,9 +215,9 @@ fn on_render_logic_indicator(
 
             let entity = commands
                 .spawn((
-                    TransformBundle::default(),
-                    VisibilityBundle::default(),
-                    meshes.add(mesh),
+                    Transform::default(),
+                    Visibility::default(),
+                    Mesh3d(meshes.add(mesh)),
                     Name::new("Rendered Logic Indicators"),
                 ))
                 .set_parent(ev.mesh_entity_parent)
diff --git a/cosmos_client/src/rendering/custom_blocks/tank.rs b/cosmos_client/src/rendering/custom_blocks/tank.rs
index 22e781710..4c6ee8266 100644
--- a/cosmos_client/src/rendering/custom_blocks/tank.rs
+++ b/cosmos_client/src/rendering/custom_blocks/tank.rs
@@ -12,10 +12,10 @@ use bevy::{
     hierarchy::BuildChildren,
     log::warn,
     math::{Rect, Vec3},
+    prelude::{Mesh3d, Transform, Visibility},
     reflect::Reflect,
-    render::{mesh::Mesh, view::VisibilityBundle},
+    render::mesh::Mesh,
     state::state::OnEnter,
-    transform::bundles::TransformBundle,
     utils::HashMap,
 };
 use cosmos_core::{
@@ -101,11 +101,11 @@ fn on_render_tanks(
         let mut material_meshes: HashMap<(u16, u32), CosmosMeshBuilder> = HashMap::default();
 
         for block in structure.block_iter_for_chunk(ev.chunk_coordinate, true) {
-            if structure.block_id_at(block.coords()) != tank_id {
+            if structure.block_id_at(block) != tank_id {
                 continue;
             }
 
-            let Some(&BlockFluidData::Fluid(data)) = structure.query_block_data(block.coords(), &q_stored_fluid) else {
+            let Some(&BlockFluidData::Fluid(data)) = structure.query_block_data(block, &q_stored_fluid) else {
                 continue;
             };
 
@@ -131,12 +131,12 @@ fn on_render_tanks(
 
             let mut one_mesh_only = false;
 
-            let block_rotation = structure.block_rotation(block.coords());
+            let block_rotation = structure.block_rotation(block);
 
             let rotation = block_rotation.as_quat();
 
             let faces = ALL_BLOCK_FACES.iter().copied().filter(|face| {
-                if let Ok(new_coord) = BlockCoordinate::try_from(block.coords() + face.direction().to_coordinates()) {
+                if let Ok(new_coord) = BlockCoordinate::try_from(block + face.direction().to_coordinates()) {
                     if structure.block_id_at(new_coord) == tank_id {
                         return match structure.query_block_data(new_coord, &q_stored_fluid) {
                             Some(BlockFluidData::Fluid(sf)) => sf.fluid_stored == 0,
@@ -207,7 +207,7 @@ fn on_render_tanks(
 
                 // Scale the rotated positions, not the pre-rotated positions since our side checks are absolute
 
-                let structure_coords = block.coords();
+                let structure_coords = block;
 
                 const GAP: f32 = 0.01;
                 let mut scale_x = 1.0;
@@ -290,9 +290,9 @@ fn on_render_tanks(
 
             let entity = commands
                 .spawn((
-                    TransformBundle::default(),
-                    VisibilityBundle::default(),
-                    meshes.add(mesh),
+                    Transform::default(),
+                    Visibility::default(),
+                    Mesh3d(meshes.add(mesh)),
                     Name::new("Rendered Tank Fluid"),
                 ))
                 .set_parent(ev.mesh_entity_parent)
diff --git a/cosmos_client/src/rendering/lod_renderer.rs b/cosmos_client/src/rendering/lod_renderer.rs
index 592ff8467..bb404a2d3 100644
--- a/cosmos_client/src/rendering/lod_renderer.rs
+++ b/cosmos_client/src/rendering/lod_renderer.rs
@@ -385,7 +385,7 @@ fn compute_meshes_and_kill_dead_entities(
 
         // The entity was verified to exist above
         if let Some(mut ecmds) = commands.get_entity(entity) {
-            ecmds.insert(meshes.add(delayed_mesh));
+            ecmds.insert(Mesh3d(meshes.add(delayed_mesh)));
         }
 
         kill_all(to_kill, &mut commands);
@@ -428,8 +428,8 @@ fn poll_rendering_lods(
 
                     let ent = commands
                         .spawn((
-                            TransformBundle::from_transform(Transform::from_translation(offset)),
-                            VisibilityBundle::default(),
+                            Transform::from_translation(offset),
+                            Visibility::default(),
                             // Aabb::from_min_max(Vec3::new(-s, -s, -s), Vec3::new(s, s, s)),
                             RenderedLod { scale },
                             DespawnWithStructure,
diff --git a/cosmos_client/src/rendering/mesh_delayer.rs b/cosmos_client/src/rendering/mesh_delayer.rs
index 7b45ea429..9640daf99 100644
--- a/cosmos_client/src/rendering/mesh_delayer.rs
+++ b/cosmos_client/src/rendering/mesh_delayer.rs
@@ -2,7 +2,7 @@
 
 use std::{collections::VecDeque, mem::swap};
 
-use bevy::prelude::{App, Assets, Commands, Entity, Mesh, ResMut, Resource, Update};
+use bevy::prelude::{App, Assets, Commands, Entity, Mesh, Mesh3d, ResMut, Resource, Update};
 
 #[derive(Debug)]
 struct DelayedMesh {
@@ -52,7 +52,7 @@ fn add_meshes(mut meshes: ResMut<Assets<Mesh>>, mut commands: Commands, mut mesh
         };
 
         // The entity was verified to exist above
-        commands.entity(delayed_mesh.entity).insert(meshes.add(delayed_mesh.mesh));
+        commands.entity(delayed_mesh.entity).insert(Mesh3d(meshes.add(delayed_mesh.mesh)));
     }
 }
 
diff --git a/cosmos_client/src/rendering/mod.rs b/cosmos_client/src/rendering/mod.rs
index ace70b2fc..6d70eca1c 100644
--- a/cosmos_client/src/rendering/mod.rs
+++ b/cosmos_client/src/rendering/mod.rs
@@ -874,7 +874,7 @@ fn register_block_meshes(
 }
 
 fn get_mesh_information(model_name: &String) -> Option<MeshInformation> {
-    if model_name.to_ascii_lowercase() == "none" {
+    if model_name.eq_ignore_ascii_case("none") {
         return None;
     }
 
diff --git a/cosmos_client/src/rendering/panorama/mod.rs b/cosmos_client/src/rendering/panorama/mod.rs
index ab3cda483..ba44d8bf0 100644
--- a/cosmos_client/src/rendering/panorama/mod.rs
+++ b/cosmos_client/src/rendering/panorama/mod.rs
@@ -4,11 +4,13 @@ use bevy::{
     app::{App, Update},
     math::{Quat, Vec3},
     prelude::{not, resource_exists, Commands, Component, Entity, IntoSystemConfigs, Or, Query, Res, ResMut, Resource, With},
-    render::view::{screenshot::ScreenshotManager, Visibility},
+    render::view::{
+        screenshot::{save_to_disk, Screenshot},
+        Visibility,
+    },
     time::{common_conditions::on_timer, Time},
     transform::components::Transform,
     ui::Node,
-    window::PrimaryWindow,
 };
 use cosmos_core::ecs::NeedsDespawned;
 
@@ -49,18 +51,10 @@ fn take_panorama(
     }
 }
 
-fn taking_panorama(
-    mut screenshot_manager: ResMut<ScreenshotManager>,
-    mut pan_angle: ResMut<PanAngle>,
-    mut commands: Commands,
-    q_primary_window: Query<Entity, With<PrimaryWindow>>,
-    mut q_camera: Query<&mut Transform, With<MainCamera>>,
-) {
+fn taking_panorama(mut pan_angle: ResMut<PanAngle>, mut commands: Commands, mut q_camera: Query<&mut Transform, With<MainCamera>>) {
     let path = format!("./pan-screenshots/{}.png", pan_angle.0);
 
-    screenshot_manager
-        .save_screenshot_to_disk(q_primary_window.single(), path)
-        .expect("Failed to save panorama screenshot!");
+    commands.spawn(Screenshot::primary_window()).observe(save_to_disk(path));
 
     pan_angle.0 += 1;
     q_camera.single_mut().rotation = Quat::from_axis_angle(Vec3::Y, pan_angle.0 as f32 / (N_SCREENSHOTS - 2) as f32 * PI * 2.0);
@@ -81,7 +75,7 @@ fn restore_ui_after_panorama(
     mut fin: ResMut<FinishedPan>,
     time: Res<Time>,
 ) {
-    fin.0 += time.delta_seconds();
+    fin.0 += time.delta_secs();
 
     if fin.0 < 0.2 {
         return;
diff --git a/cosmos_client/src/rendering/structure_renderer/chunk_rendering/async_rendering.rs b/cosmos_client/src/rendering/structure_renderer/chunk_rendering/async_rendering.rs
index e410a71b2..0786333ea 100644
--- a/cosmos_client/src/rendering/structure_renderer/chunk_rendering/async_rendering.rs
+++ b/cosmos_client/src/rendering/structure_renderer/chunk_rendering/async_rendering.rs
@@ -4,12 +4,12 @@ use crate::block::lighting::{BlockLightProperties, BlockLighting};
 use crate::rendering::structure_renderer::{BlockRenderingModes, StructureRenderingSet};
 use crate::rendering::{CosmosMeshBuilder, ReadOnlyBlockMeshRegistry};
 use bevy::prelude::{
-    App, Assets, BuildChildren, Commands, DespawnRecursiveExt, Entity, EventWriter, GlobalTransform, Handle, IntoSystemConfigs, Mesh,
-    PointLight, PointLightBundle, Query, Res, ResMut, Transform, Update, Vec3, VisibilityBundle, With,
+    App, Assets, BuildChildren, Commands, DespawnRecursiveExt, Entity, EventWriter, GlobalTransform, IntoSystemConfigs, Mesh, Mesh3d,
+    PointLight, Query, Res, ResMut, Transform, Update, Vec3, Visibility, With,
 };
+use bevy::render::mesh::MeshAabb;
 use bevy::render::primitives::Aabb;
 use bevy::tasks::AsyncComputeTaskPool;
-use bevy::transform::bundles::TransformBundle;
 use bevy::utils::HashMap;
 use cosmos_core::block::Block;
 use cosmos_core::netty::client::LocalPlayer;
@@ -30,7 +30,7 @@ fn poll_rendering_chunks(
     mut commands: Commands,
     mut rendering_chunks: ResMut<RenderingChunks>,
     mut meshes: ResMut<Assets<Mesh>>,
-    q_mesh: Query<&Handle<Mesh>>,
+    q_mesh: Query<&Mesh3d>,
     q_lights: Query<&LightsHolder>,
     q_chunk_meshes: Query<&ChunkMeshes>,
     q_chunk_entity: Query<&ChunkEntity>,
@@ -98,7 +98,7 @@ fn poll_rendering_chunks(
 
         // The first mesh a chunk has will be on the chunk entity instead of child entities,
         // so clear that out first.
-        commands.entity(entity).remove::<Handle<Mesh>>();
+        commands.entity(entity).remove::<Mesh3d>();
         evw_remove_all_materials.send(RemoveAllMaterialsEvent { entity });
 
         let mut chunk_meshes_component = ChunkMeshes::default();
@@ -112,9 +112,9 @@ fn poll_rendering_chunks(
 
             let ent = commands
                 .spawn((
-                    mesh,
-                    TransformBundle::default(),
-                    VisibilityBundle::default(),
+                    Mesh3d(mesh),
+                    Transform::default(),
+                    Visibility::default(),
                     // Remove this once https://github.com/bevyengine/bevy/issues/4294 is done (when bevy ~0.10~ ~0.11~ ~0.12~ 0.13 is released)
                     Aabb::from_min_max(Vec3::new(-s, -s, -s), Vec3::new(s, s, s)),
                 ))
@@ -142,7 +142,7 @@ fn poll_rendering_chunks(
             let mesh = meshes.add(mesh_material.mesh);
 
             commands.entity(entity).insert((
-                mesh,
+                Mesh3d(mesh),
                 // mesh_material.material_id,
                 // Remove this once https://github.com/bevyengine/bevy/issues/4294 is done (when bevy ~0.10~ ~0.11~ ~0.12~ 0.13 is released)
                 aabb.unwrap_or_default(),
@@ -213,8 +213,8 @@ fn create_lighting_data(
 
             if !found {
                 let light_entity = commands
-                    .spawn(PointLightBundle {
-                        point_light: PointLight {
+                    .spawn((
+                        PointLight {
                             color: properties.color,
                             intensity: properties.intensity,
                             range: properties.range,
@@ -223,13 +223,12 @@ fn create_lighting_data(
                             shadows_enabled: false, // !properties.shadows_disabled,
                             ..Default::default()
                         },
-                        transform: Transform::from_xyz(
+                        Transform::from_xyz(
                             block_light_coord.x as f32 - (CHUNK_DIMENSIONS as f32 / 2.0 - 0.5),
                             block_light_coord.y as f32 - (CHUNK_DIMENSIONS as f32 / 2.0 - 0.5),
                             block_light_coord.z as f32 - (CHUNK_DIMENSIONS as f32 / 2.0 - 0.5),
                         ),
-                        ..Default::default()
-                    })
+                    ))
                     .id();
 
                 new_lights.lights.push(LightEntry {
diff --git a/cosmos_client/src/rendering/structure_renderer/chunk_rendering/chunk_renderer.rs b/cosmos_client/src/rendering/structure_renderer/chunk_rendering/chunk_renderer.rs
index e7cd1c87d..0579bb746 100644
--- a/cosmos_client/src/rendering/structure_renderer/chunk_rendering/chunk_renderer.rs
+++ b/cosmos_client/src/rendering/structure_renderer/chunk_rendering/chunk_renderer.rs
@@ -162,61 +162,105 @@ impl<M: MeshBuilder + Default> ChunkRenderer<M> {
 
                     let mut neighbors = BlockNeighbors::empty();
 
+                    // These starting values are unused, but required to be set by the compiler.
+                    let mut pos_x = BlockDirection::PosX;
+                    let mut neg_x = BlockDirection::NegX;
+                    let mut pos_y = BlockDirection::PosY;
+                    let mut neg_y = BlockDirection::NegY;
+                    let mut pos_z = BlockDirection::PosZ;
+                    let mut neg_z = BlockDirection::NegZ;
+
+                    #[inline]
+                    fn account_for_rotation_in_neighbor_check(dir_vec: Vec3, pos_dir: &mut BlockDirection, neg_dir: &mut BlockDirection) {
+                        use BlockDirection::*;
+
+                        if dir_vec.x > 0.99 {
+                            *pos_dir = PosX;
+                            *neg_dir = NegX;
+                        } else if dir_vec.x < -0.99 {
+                            *pos_dir = NegX;
+                            *neg_dir = PosX;
+                        } else if dir_vec.y > 0.99 {
+                            *pos_dir = PosY;
+                            *neg_dir = NegY;
+                        } else if dir_vec.y < -0.99 {
+                            *pos_dir = NegY;
+                            *neg_dir = PosY;
+                        } else if dir_vec.z > 0.99 {
+                            *pos_dir = PosZ;
+                            *neg_dir = NegZ;
+                        } else if dir_vec.z < -0.99 {
+                            *pos_dir = NegZ;
+                            *neg_dir = PosZ;
+                        } else {
+                            unreachable!("Bad");
+                        }
+                    }
+
+                    // TODO: This fails for sub-rotations :(
+                    let x = rotation * Vec3::X;
+                    let y = rotation * Vec3::Y;
+                    let z = rotation * Vec3::Z;
+
+                    account_for_rotation_in_neighbor_check(x, &mut pos_x, &mut neg_x);
+                    account_for_rotation_in_neighbor_check(y, &mut pos_y, &mut neg_y);
+                    account_for_rotation_in_neighbor_check(z, &mut pos_z, &mut neg_z);
+
                     match direction {
                         BlockDirection::PosZ | BlockDirection::NegZ => {
-                            if block_connections[BlockDirection::PosX.index()] {
+                            if block_connections[pos_x.index()] {
                                 neighbors |= BlockNeighbors::Right;
                             }
-                            if block_connections[BlockDirection::NegX.index()] {
+                            if block_connections[neg_x.index()] {
                                 neighbors |= BlockNeighbors::Left;
                             }
-                            if block_connections[BlockDirection::PosY.index()] {
+                            if block_connections[pos_y.index()] {
                                 neighbors |= BlockNeighbors::Top;
                             }
-                            if block_connections[BlockDirection::NegY.index()] {
+                            if block_connections[neg_y.index()] {
                                 neighbors |= BlockNeighbors::Bottom;
                             }
                         }
                         BlockDirection::PosY | BlockDirection::NegY => {
-                            if block_connections[BlockDirection::PosX.index()] {
+                            if block_connections[pos_x.index()] {
                                 neighbors |= BlockNeighbors::Right;
                             }
-                            if block_connections[BlockDirection::NegX.index()] {
+                            if block_connections[neg_x.index()] {
                                 neighbors |= BlockNeighbors::Left;
                             }
-                            if block_connections[BlockDirection::PosZ.index()] {
+                            if block_connections[pos_z.index()] {
                                 neighbors |= BlockNeighbors::Top;
                             }
-                            if block_connections[BlockDirection::NegZ.index()] {
+                            if block_connections[neg_z.index()] {
                                 neighbors |= BlockNeighbors::Bottom;
                             }
                         }
                         // idk why right and left have to separate, and I don't want to know why
                         BlockDirection::PosX => {
-                            if block_connections[BlockDirection::PosZ.index()] {
+                            if block_connections[pos_z.index()] {
                                 neighbors |= BlockNeighbors::Right;
                             }
-                            if block_connections[BlockDirection::NegZ.index()] {
+                            if block_connections[neg_z.index()] {
                                 neighbors |= BlockNeighbors::Left;
                             }
-                            if block_connections[BlockDirection::PosY.index()] {
+                            if block_connections[pos_y.index()] {
                                 neighbors |= BlockNeighbors::Top;
                             }
-                            if block_connections[BlockDirection::NegY.index()] {
+                            if block_connections[neg_y.index()] {
                                 neighbors |= BlockNeighbors::Bottom;
                             }
                         }
                         BlockDirection::NegX => {
-                            if block_connections[BlockDirection::NegZ.index()] {
+                            if block_connections[neg_z.index()] {
                                 neighbors |= BlockNeighbors::Right;
                             }
-                            if block_connections[BlockDirection::PosZ.index()] {
+                            if block_connections[pos_z.index()] {
                                 neighbors |= BlockNeighbors::Left;
                             }
-                            if block_connections[BlockDirection::PosY.index()] {
+                            if block_connections[pos_y.index()] {
                                 neighbors |= BlockNeighbors::Top;
                             }
-                            if block_connections[BlockDirection::NegY.index()] {
+                            if block_connections[neg_y.index()] {
                                 neighbors |= BlockNeighbors::Bottom;
                             }
                         }
diff --git a/cosmos_client/src/rendering/structure_renderer/monitor_needs_rerendered_chunks.rs b/cosmos_client/src/rendering/structure_renderer/monitor_needs_rerendered_chunks.rs
index de8fddaa7..979d86af6 100644
--- a/cosmos_client/src/rendering/structure_renderer/monitor_needs_rerendered_chunks.rs
+++ b/cosmos_client/src/rendering/structure_renderer/monitor_needs_rerendered_chunks.rs
@@ -20,11 +20,11 @@ fn monitor_block_updates_system(
     let mut chunks_todo = HashMap::<Entity, HashSet<ChunkCoordinate>>::default();
 
     for ev in evr_changed_data.read() {
-        let Ok(structure) = q_structure.get(ev.structure_entity) else {
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
             continue;
         };
 
-        let chunks = chunks_todo.entry(ev.structure_entity).or_default();
+        let chunks = chunks_todo.entry(ev.block.structure()).or_default();
 
         let cc = ev.block.chunk_coords();
 
@@ -58,11 +58,11 @@ fn monitor_block_updates_system(
     }
 
     for ev in evr_block_changed.read() {
-        let Ok(structure) = q_structure.get(ev.structure_entity) else {
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
             continue;
         };
 
-        let chunks = chunks_todo.entry(ev.structure_entity).or_default();
+        let chunks = chunks_todo.entry(ev.block.structure()).or_default();
 
         let cc = ev.block.chunk_coords();
 
diff --git a/cosmos_client/src/shop/netty.rs b/cosmos_client/src/shop/netty.rs
index bb39518c1..1c013873a 100644
--- a/cosmos_client/src/shop/netty.rs
+++ b/cosmos_client/src/shop/netty.rs
@@ -32,8 +32,7 @@ fn shop_listen_netty(
                 ev_writer_open_shop_ui.send(
                     OpenShopUiEvent {
                         shop: shop_data,
-                        structure_block: StructureBlock::new(shop_block),
-                        structure_entity,
+                        structure_block: StructureBlock::new(shop_block, structure_entity),
                     }
                     .into(),
                 );
diff --git a/cosmos_client/src/shop/ui.rs b/cosmos_client/src/shop/ui.rs
index 31649abb5..1a464fbf2 100644
--- a/cosmos_client/src/shop/ui.rs
+++ b/cosmos_client/src/shop/ui.rs
@@ -13,14 +13,11 @@ use bevy::{
     },
     hierarchy::{BuildChildren, DespawnRecursiveExt},
     log::{error, info},
+    prelude::{ChildBuild, Text},
     reflect::Reflect,
     state::condition::in_state,
-    text::{Text, TextSection, TextStyle},
-    ui::{
-        node_bundles::{NodeBundle, TextBundle},
-        widget::Label,
-        BackgroundColor, FlexDirection, JustifyContent, Style, UiRect, Val,
-    },
+    text::{TextFont, TextSpan},
+    ui::{widget::Label, BackgroundColor, BorderColor, FlexDirection, JustifyContent, Node, UiRect, Val},
 };
 use bevy_renet2::renet2::RenetClient;
 use cosmos_core::{
@@ -41,13 +38,14 @@ use crate::{
     lang::Lang,
     ui::{
         components::{
-            button::{register_button, Button, ButtonBundle, ButtonEvent, ButtonStyles},
-            scollable_container::{ScrollBox, ScrollBundle},
-            slider::{Slider, SliderBundle},
-            text_input::{InputType, TextInput, TextInputBundle},
-            window::{GuiWindow, WindowBundle},
+            button::{register_button, Button, ButtonEvent, ButtonStyles},
+            scollable_container::ScrollBox,
+            slider::Slider,
+            text_input::{InputType, TextInput},
+            window::GuiWindow,
             Disabled,
         },
+        font::DefaultFont,
         reactivity::{add_reactable_type, BindValue, BindValues, ReactableFields, ReactableValue},
         OpenMenu, UiSystemSet,
     },
@@ -58,18 +56,16 @@ use super::{PurchasedEvent, SoldEvent};
 #[derive(Event)]
 pub(super) struct OpenShopUiEvent {
     pub shop: Shop,
-    pub structure_entity: Entity,
     pub structure_block: StructureBlock,
 }
 
 #[derive(Component, Debug)]
 struct ShopUi {
     shop: Shop,
-    structure_block: StructureBlock,
     /// # ⚠️ WARNING ⚠️
     ///
     /// This refers to the server's entity NOT the client's
-    structure_entity: Entity,
+    structure_block: StructureBlock,
     selected_item: Option<SelectedItem>,
 }
 
@@ -234,7 +230,6 @@ fn open_shop_ui(mut commands: Commands, mut ev_reader: EventReader<MutEvent<Open
                 shop,
                 selected_item: None,
                 structure_block: ev.structure_block,
-                structure_entity: ev.structure_entity,
             },
         ));
     }
@@ -257,16 +252,16 @@ fn render_shop_ui(
 
     let name = &shop_ui.shop.name;
 
-    let text_style = TextStyle {
-        color: css::WHITE.into(),
+    let text_style = TextFont {
         font_size: 32.0,
         font: asset_server.load("fonts/PixeloidSans.ttf"),
+        ..Default::default()
     };
 
-    let text_style_small = TextStyle {
-        color: css::WHITE.into(),
+    let text_style_small = TextFont {
         font_size: 24.0,
         font: asset_server.load("fonts/PixeloidSans.ttf"),
+        ..Default::default()
     };
 
     let ui_variables_entity = ui_ent;
@@ -292,118 +287,93 @@ fn render_shop_ui(
         ))
         .insert((
             Name::new("Shop UI"),
-            WindowBundle {
-                node_bundle: NodeBundle {
-                    background_color: Srgba::hex("2D2D2D").unwrap().into(),
-                    style: Style {
-                        width: Val::Px(1000.0),
-                        height: Val::Px(800.0),
-                        margin: UiRect {
-                            // Centers it vertically
-                            top: Val::Auto,
-                            bottom: Val::Auto,
-                            left: Val::Auto,
-                            right: Val::Auto,
-                        },
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                window: GuiWindow {
-                    title: name.into(),
-                    body_styles: Style {
-                        flex_direction: FlexDirection::Column,
-                        ..Default::default()
-                    },
+            BackgroundColor(Srgba::hex("2D2D2D").unwrap().into()),
+            Node {
+                width: Val::Px(1000.0),
+                height: Val::Px(800.0),
+                margin: UiRect {
+                    // Centers it vertically
+                    top: Val::Auto,
+                    bottom: Val::Auto,
+                    left: Val::Auto,
+                    right: Val::Auto,
                 },
                 ..Default::default()
             },
-        ))
-        .with_children(|p| {
-            p.spawn(NodeBundle {
-                style: Style {
-                    height: Val::Px(50.0),
+            GuiWindow {
+                title: name.into(),
+                body_styles: Node {
+                    flex_direction: FlexDirection::Column,
                     ..Default::default()
                 },
+            },
+        ))
+        .with_children(|p| {
+            p.spawn(Node {
+                height: Val::Px(50.0),
                 ..Default::default()
             })
             .with_children(|p| {
                 p.spawn((
                     ShopUiEntity(ui_ent),
-                    ButtonBundle::<ClickSellTabEvent> {
-                        node_bundle: NodeBundle {
-                            style: Style {
-                                flex_grow: 1.0,
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
-                        button: Button {
-                            button_styles: Some(ButtonStyles {
-                                background_color: Srgba::hex("880000").unwrap().into(),
-                                hover_background_color: Srgba::hex("880000").unwrap().into(),
-                                press_background_color: Srgba::hex("880000").unwrap().into(),
-                                ..Default::default()
-                            }),
-                            text: Some(("Sell".into(), text_style.clone())),
+                    Node {
+                        flex_grow: 1.0,
+                        ..Default::default()
+                    },
+                    Button::<ClickSellTabEvent> {
+                        button_styles: Some(ButtonStyles {
+                            background_color: Srgba::hex("880000").unwrap().into(),
+                            hover_background_color: Srgba::hex("880000").unwrap().into(),
+                            press_background_color: Srgba::hex("880000").unwrap().into(),
                             ..Default::default()
-                        },
+                        }),
+                        text: Some(("Sell".into(), text_style.clone(), Default::default())),
+                        ..Default::default()
                     },
                 ));
 
                 p.spawn((
                     ShopUiEntity(ui_ent),
-                    ButtonBundle::<ClickBuyTabEvent> {
-                        node_bundle: NodeBundle {
-                            style: Style {
-                                flex_grow: 1.0,
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
-                        button: Button {
-                            button_styles: Some(ButtonStyles {
-                                background_color: css::DARK_GREEN.into(),
-                                hover_background_color: css::DARK_GREEN.into(),
-                                press_background_color: css::DARK_GREEN.into(),
-                                ..Default::default()
-                            }),
-                            text: Some(("Buy".into(), text_style.clone())),
+                    Node {
+                        flex_grow: 1.0,
+                        ..Default::default()
+                    },
+                    Button::<ClickBuyTabEvent> {
+                        button_styles: Some(ButtonStyles {
+                            background_color: css::DARK_GREEN.into(),
+                            hover_background_color: css::DARK_GREEN.into(),
+                            press_background_color: css::DARK_GREEN.into(),
                             ..Default::default()
-                        },
+                        }),
+                        text: Some(("Buy".into(), text_style.clone(), Default::default())),
+                        ..Default::default()
                     },
                 ));
             });
 
             p.spawn((
                 Name::new("Body"),
-                NodeBundle {
-                    border_color: Srgba::hex("1C1C1C").unwrap().into(),
-                    style: Style {
-                        border: UiRect {
-                            bottom: Val::Px(4.0),
-                            top: Val::Px(4.0),
-                            ..Default::default()
-                        },
-                        flex_grow: 1.0,
+                BorderColor(Srgba::hex("1C1C1C").unwrap().into()),
+                Node {
+                    border: UiRect {
+                        bottom: Val::Px(4.0),
+                        top: Val::Px(4.0),
                         ..Default::default()
                     },
+                    flex_grow: 1.0,
                     ..Default::default()
                 },
             ))
             .with_children(|body| {
                 body.spawn((
                     Name::new("Main Stuff"),
-                    NodeBundle {
-                        style: Style {
-                            flex_grow: 1.0,
-                            padding: UiRect {
-                                left: Val::Px(40.0),
-                                right: Val::Px(40.0),
-                                top: Val::Px(20.0),
-                                bottom: Val::Px(20.0),
-                            },
-                            ..Default::default()
+                    Node {
+                        flex_grow: 1.0,
+                        padding: UiRect {
+                            left: Val::Px(40.0),
+                            right: Val::Px(40.0),
+                            top: Val::Px(20.0),
+                            bottom: Val::Px(20.0),
                         },
                         ..Default::default()
                     },
@@ -411,12 +381,9 @@ fn render_shop_ui(
                 .with_children(|body| {
                     body.spawn((
                         Name::new("Description section"),
-                        NodeBundle {
-                            style: Style {
-                                flex_direction: FlexDirection::Column,
-                                flex_grow: 1.0,
-                                ..Default::default()
-                            },
+                        Node {
+                            flex_direction: FlexDirection::Column,
+                            flex_grow: 1.0,
                             ..Default::default()
                         },
                     ))
@@ -427,14 +394,12 @@ fn render_shop_ui(
                                 ui_variables_entity,
                                 ReactableFields::Text { section: 0 },
                             )]),
-                            TextBundle {
-                                text: Text::from_section("Select an item...", text_style.clone()),
-                                style: Style {
-                                    margin: UiRect {
-                                        bottom: Val::Px(10.0),
-                                        top: Val::Px(10.0),
-                                        ..Default::default()
-                                    },
+                            Text::new("Select an item..."),
+                            text_style.clone(),
+                            Node {
+                                margin: UiRect {
+                                    bottom: Val::Px(10.0),
+                                    top: Val::Px(10.0),
                                     ..Default::default()
                                 },
                                 ..Default::default()
@@ -447,23 +412,22 @@ fn render_shop_ui(
                                 ui_variables_entity,
                                 ReactableFields::Text { section: 0 },
                             )]),
-                            TextBundle {
-                                text: Text::from_section("", text_style_small.clone()),
-                                style: Style {
-                                    margin: UiRect {
-                                        bottom: Val::Px(30.0),
-                                        top: Val::Px(10.0),
-                                        ..Default::default()
-                                    },
+                            Text::new(""),
+                            text_style_small.clone(),
+                            Node {
+                                margin: UiRect {
+                                    bottom: Val::Px(30.0),
+                                    top: Val::Px(10.0),
                                     ..Default::default()
                                 },
                                 ..Default::default()
                             },
                         ));
 
-                        p.spawn(TextBundle {
-                            text: Text::from_section("Stats", text_style.clone()),
-                            style: Style {
+                        p.spawn((
+                            Text::new("Stats"),
+                            text_style.clone(),
+                            Node {
                                 margin: UiRect {
                                     bottom: Val::Px(10.0),
                                     top: Val::Px(10.0),
@@ -471,12 +435,12 @@ fn render_shop_ui(
                                 },
                                 ..Default::default()
                             },
-                            ..Default::default()
-                        });
+                        ));
 
-                        p.spawn(TextBundle {
-                            text: Text::from_section("", text_style_small.clone()),
-                            style: Style {
+                        p.spawn((
+                            Text::new(""),
+                            text_style_small.clone(),
+                            Node {
                                 margin: UiRect {
                                     left: Val::Px(20.0),
                                     bottom: Val::Px(10.0),
@@ -485,27 +449,23 @@ fn render_shop_ui(
                                 },
                                 ..Default::default()
                             },
-                            ..Default::default()
-                        });
+                        ));
                     });
 
-                    body.spawn((Name::new("Item picture"), NodeBundle { ..Default::default() }));
+                    body.spawn((Name::new("Item picture"), Node { ..Default::default() }));
                 });
 
                 body.spawn((
                     Name::new("Shop Categories"),
-                    NodeBundle {
-                        border_color: Srgba::hex("1C1C1C").unwrap().into(),
-                        style: Style {
-                            flex_direction: FlexDirection::Column,
-                            width: Val::Px(400.0),
-                            border: UiRect {
-                                left: Val::Px(4.0),
-                                ..Default::default()
-                            },
-                            padding: UiRect::all(Val::Px(10.0)),
+                    BackgroundColor(Srgba::hex("1C1C1C").unwrap().into()),
+                    Node {
+                        flex_direction: FlexDirection::Column,
+                        width: Val::Px(400.0),
+                        border: UiRect {
+                            left: Val::Px(4.0),
                             ..Default::default()
                         },
+                        padding: UiRect::all(Val::Px(10.0)),
                         ..Default::default()
                     },
                 ))
@@ -513,14 +473,12 @@ fn render_shop_ui(
                     body.spawn((
                         Name::new("Stock Header Text"),
                         Label,
-                        TextBundle {
-                            text: Text::from_section("Stock", text_style.clone()),
-                            style: Style {
-                                margin: UiRect {
-                                    bottom: Val::Px(10.0),
-                                    top: Val::Px(10.0),
-                                    ..Default::default()
-                                },
+                        Text::new("Stock"),
+                        text_style.clone(),
+                        Node {
+                            margin: UiRect {
+                                bottom: Val::Px(10.0),
+                                top: Val::Px(10.0),
                                 ..Default::default()
                             },
                             ..Default::default()
@@ -530,24 +488,18 @@ fn render_shop_ui(
                     body.spawn((
                         Name::new("Search Text Box"),
                         BindValues::<SearchItemQuery>::new(vec![BindValue::new(ui_variables_entity, ReactableFields::Value)]),
-                        TextInputBundle {
-                            text_input: TextInput {
-                                style: text_style.clone(),
-                                input_type: InputType::Text { max_length: Some(20) },
-                                ..Default::default()
-                            },
-                            node_bundle: NodeBundle {
-                                border_color: Srgba::hex("111111").unwrap().into(),
-                                background_color: Srgba::hex("555555").unwrap().into(),
-                                style: Style {
-                                    border: UiRect::all(Val::Px(2.0)),
-                                    padding: UiRect {
-                                        top: Val::Px(4.0),
-                                        bottom: Val::Px(4.0),
-                                        ..Default::default()
-                                    },
-                                    ..Default::default()
-                                },
+                        BorderColor(Srgba::hex("111111").unwrap().into()),
+                        BackgroundColor(Srgba::hex("555555").unwrap().into()),
+                        TextInput {
+                            input_type: InputType::Text { max_length: Some(20) },
+                            ..Default::default()
+                        },
+                        text_style.clone(),
+                        Node {
+                            border: UiRect::all(Val::Px(2.0)),
+                            padding: UiRect {
+                                top: Val::Px(4.0),
+                                bottom: Val::Px(4.0),
                                 ..Default::default()
                             },
                             ..Default::default()
@@ -556,28 +508,20 @@ fn render_shop_ui(
 
                     body.spawn((
                         Name::new("Items List"),
-                        ScrollBundle {
-                            node_bundle: NodeBundle {
-                                style: Style {
-                                    flex_grow: 1.0,
-                                    margin: UiRect::top(Val::Px(10.0)),
-                                    ..Default::default()
-                                },
-                                ..Default::default()
-                            },
-                            slider: ScrollBox { ..Default::default() },
+                        Node {
+                            flex_grow: 1.0,
+                            margin: UiRect::top(Val::Px(10.0)),
+                            ..Default::default()
                         },
+                        ScrollBox { ..Default::default() },
                     ))
                     .with_children(|p| {
                         shop_entities.contents_entity = p
                             .spawn((
                                 Name::new("Contents"),
-                                NodeBundle {
-                                    style: Style {
-                                        padding: UiRect::all(Val::Px(10.0)),
-                                        flex_direction: FlexDirection::Column,
-                                        ..Default::default()
-                                    },
+                                Node {
+                                    padding: UiRect::all(Val::Px(10.0)),
+                                    flex_direction: FlexDirection::Column,
                                     ..Default::default()
                                 },
                             ))
@@ -588,50 +532,41 @@ fn render_shop_ui(
 
             p.spawn((
                 Name::new("Footer"),
-                NodeBundle {
-                    style: Style {
-                        padding: UiRect::top(Val::Px(10.0)),
-                        // height: Val::Px(170.0),
-                        ..Default::default()
-                    },
+                Node {
+                    padding: UiRect::top(Val::Px(10.0)),
+                    // height: Val::Px(170.0),
                     ..Default::default()
                 },
             ))
             .with_children(|p| {
-                p.spawn(NodeBundle {
-                    style: Style {
-                        // WIERDNESS:
-                        width: Val::Percent(0.0),
-                        flex_grow: 4.0,
-                        /*
-                           Explanation:
-
-                           Idk why it works like this, but if I make width auto and flex_grow: 2.0 (which are what they are supposed to be),
-                           when the text changes its length the container width changes, which it shouldnt.
-
-                           However, by randomly guessing i found that a width of 0 and flex_grow of 4.0 (???) makes it look like
-                           flex_grow 2.0 and its width isn't effected by the size of the text. Idk why.
-                        */
-                        // END WEIRDNESS
-                        flex_direction: FlexDirection::Column,
-                        padding: UiRect {
-                            bottom: Val::Px(10.0),
-                            top: Val::Px(0.0),
-                            left: Val::Px(20.0),
-                            right: Val::Px(20.0),
-                        },
-                        ..Default::default()
+                p.spawn(Node {
+                    // WIERDNESS:
+                    width: Val::Percent(0.0),
+                    flex_grow: 4.0,
+                    /*
+                       Explanation:
+
+                       Idk why it works like this, but if I make width auto and flex_grow: 2.0 (which are what they are supposed to be),
+                       when the text changes its length the container width changes, which it shouldnt.
+
+                       However, by randomly guessing i found that a width of 0 and flex_grow of 4.0 (???) makes it look like
+                       flex_grow 2.0 and its width isn't effected by the size of the text. Idk why.
+                    */
+                    // END WEIRDNESS
+                    flex_direction: FlexDirection::Column,
+                    padding: UiRect {
+                        bottom: Val::Px(10.0),
+                        top: Val::Px(0.0),
+                        left: Val::Px(20.0),
+                        right: Val::Px(20.0),
                     },
                     ..Default::default()
                 })
                 .with_children(|p| {
-                    p.spawn(NodeBundle {
-                        style: Style {
-                            padding: UiRect {
-                                left: Val::Px(20.0),
-                                bottom: Val::Px(10.0),
-                                ..Default::default()
-                            },
+                    p.spawn(Node {
+                        padding: UiRect {
+                            left: Val::Px(20.0),
+                            bottom: Val::Px(10.0),
                             ..Default::default()
                         },
                         ..Default::default()
@@ -640,38 +575,33 @@ fn render_shop_ui(
                         p.spawn((
                             Name::new("Credits amount"),
                             BindValues::<Credits>::new(vec![BindValue::new(player_entity, ReactableFields::Text { section: 1 })]),
-                            TextBundle {
-                                text: Text::from_sections([
-                                    TextSection::new("$", text_style.clone()),
-                                    TextSection::new(format!("{}", credits.amount()), text_style.clone()),
-                                ]),
-                                ..Default::default()
-                            },
+                            Text::new("$"),
+                            text_style.clone(),
                         ));
+                    })
+                    .with_children(|p| {
+                        p.spawn((TextSpan::new(format!("{}", credits.amount())), text_style.clone()));
                     });
 
                     p.spawn((
                         BindValues::<ShopModeSign>::new(vec![BindValue::new(ui_variables_entity, ReactableFields::Text { section: 0 })]),
                         BindValues::<PricePerUnit>::new(vec![BindValue::new(ui_variables_entity, ReactableFields::Text { section: 1 })]),
                         BindValues::<AmountSelected>::new(vec![BindValue::new(ui_variables_entity, ReactableFields::Text { section: 3 })]),
-                        TextBundle {
-                            text: Text::from_sections([
-                                TextSection::new("", text_style.clone()),
-                                TextSection::new("", text_style.clone()),
-                                TextSection::new(" x ", text_style.clone()),
-                                TextSection::new("", text_style.clone()),
-                            ]),
-                            style: Style {
-                                bottom: Val::Px(10.0),
-                                ..Default::default()
-                            },
+                        Text::new(""),
+                        Node {
+                            bottom: Val::Px(10.0),
                             ..Default::default()
                         },
-                    ));
+                    ))
+                    .with_children(|p| {
+                        p.spawn((TextSpan::new(""), text_style.clone()));
+                        p.spawn((TextSpan::new(" x "), text_style.clone()));
+                        p.spawn((TextSpan::new(""), text_style.clone()));
+                    });
 
-                    p.spawn(NodeBundle {
-                        border_color: Srgba::hex("555555").unwrap().into(),
-                        style: Style {
+                    p.spawn((
+                        BorderColor(Srgba::hex("555555").unwrap().into()),
+                        Node {
                             border: UiRect {
                                 top: Val::Px(5.0),
                                 ..Default::default()
@@ -683,98 +613,72 @@ fn render_shop_ui(
                             },
                             ..Default::default()
                         },
-                        ..Default::default()
-                    })
+                    ))
                     .with_children(|p| {
                         p.spawn((
                             BindValues::<NetCredits>::new(vec![BindValue::new(ui_variables_entity, ReactableFields::Text { section: 1 })]),
-                            TextBundle {
-                                text: Text::from_sections([
-                                    TextSection::new("$", text_style.clone()),
-                                    TextSection::new("", text_style.clone()),
-                                ]),
-                                ..Default::default()
-                            },
-                        ));
+                            Text::new("$"),
+                            text_style.clone(),
+                        ))
+                        .with_children(|p| {
+                            p.spawn((TextSpan::new(""), text_style.clone()));
+                        });
                     });
                 });
 
-                p.spawn(NodeBundle {
-                    style: Style {
-                        flex_grow: 3.0,
-                        flex_direction: FlexDirection::Column,
-                        ..Default::default()
-                    },
+                p.spawn(Node {
+                    flex_grow: 3.0,
+                    flex_direction: FlexDirection::Column,
                     ..Default::default()
                 })
                 .with_children(|p| {
-                    p.spawn(NodeBundle {
-                        style: Style { ..Default::default() },
-                        ..Default::default()
-                    })
-                    .with_children(|p| {
+                    p.spawn(Node { ..Default::default() }).with_children(|p| {
                         p.spawn((
                             Name::new("Amount Input"),
                             BindValues::<AmountSelected>::new(vec![BindValue::new(ui_variables_entity, ReactableFields::Value)]),
                             BindValues::<SelectedItemMaxQuantity>::new(vec![BindValue::new(ui_variables_entity, ReactableFields::Max)]),
-                            TextInputBundle {
-                                node_bundle: NodeBundle {
-                                    style: Style {
-                                        width: Val::Px(250.0),
-                                        padding: UiRect::all(Val::Px(10.0)),
-                                        ..Default::default()
-                                    },
-                                    border_color: Srgba::hex("111111").unwrap().into(),
-                                    background_color: Srgba::hex("555555").unwrap().into(),
-                                    ..Default::default()
-                                },
-                                text_input: TextInput {
-                                    input_type: InputType::Integer { min: 0, max: 1000 },
-                                    style: text_style.clone(),
-                                    ..Default::default()
-                                },
+                            BorderColor(Srgba::hex("111111").unwrap().into()),
+                            BackgroundColor(Srgba::hex("555555").unwrap().into()),
+                            Node {
+                                width: Val::Px(250.0),
+                                padding: UiRect::all(Val::Px(10.0)),
+
                                 ..Default::default()
                             },
+                            TextInput {
+                                input_type: InputType::Integer { min: 0, max: 1000 },
+                                ..Default::default()
+                            },
+                            text_style.clone(),
                         ));
 
-                        p.spawn(NodeBundle {
-                            style: Style {
-                                flex_grow: 1.0,
-                                margin: UiRect {
-                                    right: Val::Px(10.0),
-                                    left: Val::Px(20.0),
-                                    ..Default::default()
-                                },
-                                flex_direction: FlexDirection::Column,
-                                justify_content: JustifyContent::SpaceBetween,
+                        p.spawn(Node {
+                            flex_grow: 1.0,
+                            margin: UiRect {
+                                right: Val::Px(10.0),
+                                left: Val::Px(20.0),
                                 ..Default::default()
                             },
+                            flex_direction: FlexDirection::Column,
+                            justify_content: JustifyContent::SpaceBetween,
                             ..Default::default()
                         })
                         .with_children(|p| {
-                            p.spawn(NodeBundle {
-                                style: Style {
-                                    flex_grow: 1.0,
-                                    justify_content: JustifyContent::SpaceBetween,
-                                    ..Default::default()
-                                },
+                            p.spawn(Node {
+                                flex_grow: 1.0,
+                                justify_content: JustifyContent::SpaceBetween,
                                 ..Default::default()
                             })
                             .with_children(|p| {
-                                p.spawn(TextBundle {
-                                    text: Text::from_section("0", text_style_small.clone()),
-                                    ..Default::default()
-                                });
+                                p.spawn((Text::new("0"), text_style_small.clone()));
 
                                 p.spawn((
                                     BindValues::<SelectedItemMaxQuantity>::new(vec![BindValue::new(
                                         ui_variables_entity,
                                         ReactableFields::Text { section: 0 },
                                     )]),
-                                    TextBundle {
-                                        text: Text::from_section("", text_style_small.clone()),
-                                        ..Default::default()
-                                    },
+                                    Text::new(""),
+                                    text_style_small.clone(),
                                 ));
                             });
 
@@ -783,19 +687,12 @@ fn render_shop_ui(
                                 ShopUiEntity(ui_ent),
                                 BindValues::<AmountSelected>::new(vec![BindValue::new(ui_variables_entity, ReactableFields::Value)]),
                                 BindValues::<SelectedItemMaxQuantity>::new(vec![BindValue::new(ui_variables_entity, ReactableFields::Max)]),
-                                SliderBundle {
-                                    node_bundle: NodeBundle {
-                                        style: Style { ..Default::default() },
-                                        ..Default::default()
-                                    },
-                                    slider: Slider {
-                                        min: 0,
-                                        max: 1,
-                                        background_color: Srgba::hex("999999").unwrap().into(),
-                                        foreground_color: css::AQUAMARINE.into(),
-                                        square_color: Srgba::hex("555555").unwrap().into(),
-                                        ..Default::default()
-                                    },
+                                Slider {
+                                    min: 0,
+                                    max: 1,
+                                    background_color: Srgba::hex("999999").unwrap().into(),
+                                    foreground_color: css::AQUAMARINE.into(),
+                                    square_color: Srgba::hex("555555").unwrap().into(),
                                     ..Default::default()
                                 },
                             ));
@@ -805,25 +702,20 @@ fn render_shop_ui(
                     shop_entities.buy_sell_button = p
                         .spawn((
                             BuyOrSellButton { shop_entity: ui_ent },
-                            ButtonBundle::<BuyOrSellBtnEvent> {
-                                node_bundle: NodeBundle {
-                                    style: Style {
-                                        margin: UiRect::top(Val::Px(10.0)),
-                                        height: Val::Px(80.0),
-                                        ..Default::default()
-                                    },
-                                    ..Default::default()
-                                },
-                                button: Button {
-                                    text: Some(("BUY".into(), text_style.clone())),
-                                    button_styles: Some(ButtonStyles {
-                                        background_color: Srgba::hex("008000").unwrap().into(),
-                                        hover_background_color: css::DARK_GREEN.into(),
-                                        press_background_color: css::DARK_GREEN.into(),
-                                        ..Default::default()
-                                    }),
+                            Node {
+                                margin: UiRect::top(Val::Px(10.0)),
+                                height: Val::Px(80.0),
+                                ..Default::default()
+                            },
+                            Button::<BuyOrSellBtnEvent> {
+                                text: Some(("BUY".into(), text_style.clone(), Default::default())),
+                                button_styles: Some(ButtonStyles {
+                                    background_color: Srgba::hex("008000").unwrap().into(),
+                                    hover_background_color: css::DARK_GREEN.into(),
+                                    press_background_color: css::DARK_GREEN.into(),
                                     ..Default::default()
-                                },
+                                }),
+                                ..Default::default()
                             },
                         ))
                         .id();
@@ -999,17 +891,15 @@ fn update_total(
 fn update_search(
     q_search: Query<(Entity, &ShopEntities, &ShopUi, &ShopMode, &SearchItemQuery), Or<(Changed<SearchItemQuery>, Changed<ShopMode>)>>,
     mut commands: Commands,
-
-    asset_server: Res<AssetServer>,
-
+    default_font: Res<DefaultFont>,
     items: Res<Registry<Item>>,
     lang: Res<Lang<Item>>,
 ) {
     for (ui_ent, shop_ents, shop_ui, shop_mode, search_item_query) in &q_search {
-        let text_style_small = TextStyle {
-            color: css::WHITE.into(),
+        let text_style_small = TextFont {
             font_size: 24.0,
-            font: asset_server.load("fonts/PixeloidSans.ttf"),
+            font: default_font.0.clone(),
+            ..Default::default()
         };
 
         commands.entity(shop_ents.contents_entity).despawn_descendants().with_children(|p| {
@@ -1060,36 +950,27 @@ fn update_search(
                     Name::new(display_name.to_owned()),
                     *shop_entry,
                     ShopUiEntity(ui_ent),
-                    ButtonBundle::<ClickItemEvent> {
-                        button: Button { ..Default::default() },
-                        node_bundle: NodeBundle {
-                            style: Style {
-                                flex_direction: FlexDirection::Row,
-                                margin: UiRect::vertical(Val::Px(2.0)),
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
+                    Button::<ClickItemEvent> { ..Default::default() },
+                    Node {
+                        flex_direction: FlexDirection::Row,
+                        margin: UiRect::vertical(Val::Px(2.0)),
+                        ..Default::default()
                     },
                 ))
                 .with_children(|p| {
                     p.spawn((
                         Name::new("Item Name"),
-                        TextBundle {
-                            text: Text::from_section(display_name, text_style_small.clone()),
-                            style: Style {
-                                flex_grow: 1.0,
-                                ..Default::default()
-                            },
+                        Text::new(display_name),
+                        text_style_small.clone(),
+                        Node {
+                            flex_grow: 1.0,
                             ..Default::default()
                         },
                     ));
                     p.spawn((
                         Name::new("Quantity"),
-                        TextBundle {
-                            text: Text::from_section(format!("({amount_display})"), text_style_small.clone()),
-                            ..Default::default()
-                        },
+                        Text::new(format!("({amount_display})")),
+                        text_style_small.clone(),
                     ));
                 });
             }
@@ -1109,7 +990,7 @@ fn enable_buy_button(
                 continue;
             };
 
-            if shop_ui.structure_entity == ev.structure_entity && shop_ui.structure_block.coords() == ev.shop_block {
+            if shop_ui.structure_block.structure() == ev.structure_entity && shop_ui.structure_block.coords() == ev.shop_block {
                 match &ev.details {
                     Ok(shop) => {
                         shop_ui.shop = shop.clone();
@@ -1138,7 +1019,7 @@ fn enable_sell_button(
                 continue;
             };
 
-            if shop_ui.structure_entity == ev.structure_entity && shop_ui.structure_block.coords() == ev.shop_block {
+            if shop_ui.structure_block.structure() == ev.structure_entity && shop_ui.structure_block.coords() == ev.shop_block {
                 match &ev.details {
                     Ok(shop) => {
                         shop_ui.shop = shop.clone();
@@ -1189,7 +1070,7 @@ fn on_buy(
                     NettyChannelClient::Shop,
                     cosmos_encoder::serialize(&ClientShopMessages::Sell {
                         shop_block: shop_ui.structure_block.coords(),
-                        structure_entity: shop_ui.structure_entity,
+                        structure_entity: shop_ui.structure_block.structure(),
                         item_id,
                         quantity: amount_selected.0 as u32,
                     }),
@@ -1204,7 +1085,7 @@ fn on_buy(
                     NettyChannelClient::Shop,
                     cosmos_encoder::serialize(&ClientShopMessages::Buy {
                         shop_block: shop_ui.structure_block.coords(),
-                        structure_entity: shop_ui.structure_entity,
+                        structure_entity: shop_ui.structure_block.structure(),
                         item_id,
                         quantity: amount_selected.0 as u32,
                     }),
diff --git a/cosmos_client/src/skybox/mod.rs b/cosmos_client/src/skybox/mod.rs
index 0d188bf71..65b1c0baf 100644
--- a/cosmos_client/src/skybox/mod.rs
+++ b/cosmos_client/src/skybox/mod.rs
@@ -30,7 +30,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 }
 
 fn asset_loaded(asset_server: Res<AssetServer>, mut images: ResMut<Assets<Image>>, mut cubemap: ResMut<Cubemap>) {
-    if !cubemap.is_loaded && asset_server.get_load_state(cubemap.image_handle.id()) == Some(LoadState::Loaded) {
+    if !cubemap.is_loaded && matches!(asset_server.get_load_state(cubemap.image_handle.id()), Some(LoadState::Loaded)) {
         let image = images.get_mut(&cubemap.image_handle).unwrap();
         // NOTE: PNGs do not have any metadata that could indicate they contain a cubemap texture,
         // so they appear as one texture. The following code reconfigures the texture as necessary.
@@ -49,6 +49,7 @@ fn asset_loaded(asset_server: Res<AssetServer>, mut images: ResMut<Assets<Image>
 fn on_enter_playing_state(cubemap: Res<Cubemap>, mut commands: Commands, query: Query<Entity, With<MainCamera>>) {
     for ent in query.iter() {
         commands.entity(ent).insert(Skybox {
+            rotation: Quat::IDENTITY,
             image: cubemap.image_handle.clone(),
             brightness: 1000.0,
         });
diff --git a/cosmos_client/src/structure/audio/break_place_block_sound.rs b/cosmos_client/src/structure/audio/break_place_block_sound.rs
index 55ee764eb..ffa2c7e8a 100644
--- a/cosmos_client/src/structure/audio/break_place_block_sound.rs
+++ b/cosmos_client/src/structure/audio/break_place_block_sound.rs
@@ -1,9 +1,6 @@
-use bevy::{
-    prelude::{
-        resource_exists, App, BuildChildren, Commands, EventReader, Handle, IntoSystemConfigs, Name, Query, Res, Resource, Transform,
-        Update,
-    },
-    transform::bundles::TransformBundle,
+use bevy::prelude::{
+    resource_exists, App, BuildChildren, ChildBuild, Commands, EventReader, Handle, IntoSystemConfigs, Name, Query, Res, Resource,
+    Transform, Update,
 };
 use bevy_kira_audio::{Audio, AudioControl, AudioInstance, AudioSource};
 use cosmos_core::{
@@ -27,7 +24,7 @@ fn play_block_break_sound(
     mut commands: Commands,
 ) {
     for ev in event_reader.read() {
-        let Ok(structure) = structure_query.get(ev.structure_entity) else {
+        let Ok(structure) = structure_query.get(ev.block.structure()) else {
             continue;
         };
 
@@ -41,12 +38,12 @@ fn play_block_break_sound(
             ..Default::default()
         }]);
 
-        commands.entity(ev.structure_entity).with_children(|p| {
+        commands.entity(ev.block.structure()).with_children(|p| {
             p.spawn((
                 Name::new("Block break sound"),
                 DespawnWithStructure,
                 DespawnOnNoEmissions,
-                TransformBundle::from_transform(Transform::from_translation(sound_location)),
+                Transform::from_translation(sound_location),
                 sound_emission,
             ));
         });
@@ -61,7 +58,7 @@ fn play_block_place_sound(
     mut commands: Commands,
 ) {
     for ev in event_reader.read() {
-        let Ok(structure) = structure_query.get(ev.structure_entity) else {
+        let Ok(structure) = structure_query.get(ev.block.structure()) else {
             continue;
         };
 
@@ -75,12 +72,12 @@ fn play_block_place_sound(
             ..Default::default()
         }]);
 
-        commands.entity(ev.structure_entity).with_children(|p| {
+        commands.entity(ev.block.structure()).with_children(|p| {
             p.spawn((
                 Name::new("Block break sound"),
                 DespawnWithStructure,
                 DespawnOnNoEmissions,
-                TransformBundle::from_transform(Transform::from_translation(sound_location)),
+                Transform::from_translation(sound_location),
                 sound_emission,
             ));
         });
diff --git a/cosmos_client/src/structure/audio/take_damage_sound.rs b/cosmos_client/src/structure/audio/take_damage_sound.rs
index 10cb227ec..61a32c788 100644
--- a/cosmos_client/src/structure/audio/take_damage_sound.rs
+++ b/cosmos_client/src/structure/audio/take_damage_sound.rs
@@ -1,9 +1,6 @@
-use bevy::{
-    prelude::{
-        resource_exists, App, BuildChildren, Commands, EventReader, Handle, IntoSystemConfigs, Name, Query, Res, Resource, Transform,
-        Update,
-    },
-    transform::bundles::TransformBundle,
+use bevy::prelude::{
+    resource_exists, App, BuildChildren, ChildBuild, Commands, EventReader, Handle, IntoSystemConfigs, Name, Query, Res, Resource,
+    Transform, Update,
 };
 use bevy_kira_audio::{Audio, AudioControl, AudioInstance, AudioSource};
 use cosmos_core::{
@@ -46,7 +43,7 @@ fn play_block_damage_sound(
                 Name::new("Block take damage sound"),
                 DespawnWithStructure,
                 DespawnOnNoEmissions,
-                TransformBundle::from_transform(Transform::from_translation(sound_location)),
+                Transform::from_translation(sound_location),
                 sound_emission,
             ));
         });
diff --git a/cosmos_client/src/structure/chunk_retreiver.rs b/cosmos_client/src/structure/chunk_retreiver.rs
index a86be209b..c0f40687d 100644
--- a/cosmos_client/src/structure/chunk_retreiver.rs
+++ b/cosmos_client/src/structure/chunk_retreiver.rs
@@ -52,6 +52,6 @@ pub(super) fn register(app: &mut App) {
         Update,
         populate_structures
             .in_set(NetworkingSystemsSet::SyncComponents)
-            .run_if(in_state(GameState::LoadingWorld).or_else(in_state(GameState::Playing))),
+            .run_if(in_state(GameState::LoadingWorld).or(in_state(GameState::Playing))),
     );
 }
diff --git a/cosmos_client/src/structure/planet/planet_skybox.rs b/cosmos_client/src/structure/planet/planet_skybox.rs
index 7497f17c0..182422f40 100644
--- a/cosmos_client/src/structure/planet/planet_skybox.rs
+++ b/cosmos_client/src/structure/planet/planet_skybox.rs
@@ -21,29 +21,26 @@ fn spawn_planet_skysphere(mut meshes: ResMut<Assets<Mesh>>, mut materials: ResMu
         Name::new("Planet skybox"),
         NotShadowCaster,
         NotShadowReceiver,
-        PbrBundle {
-            mesh: meshes.add(Sphere { radius: 5_000_000.0 }),
-            material: materials.add(StandardMaterial {
-                unlit: true,
-                base_color: css::SKY_BLUE.into(),
-                alpha_mode: AlphaMode::Blend,
-                ..Default::default()
-            }),
-            transform: Transform {
-                // By setting the scale to -1, the model will be inverted, which is good since we
-                // want to see it while being inside of it.
-                scale: Vec3::NEG_ONE,
-                ..Default::default()
-            },
-            visibility: Visibility::Hidden,
+        Mesh3d(meshes.add(Sphere { radius: 5_000_000.0 })),
+        MeshMaterial3d(materials.add(StandardMaterial {
+            unlit: true,
+            base_color: css::SKY_BLUE.into(),
+            alpha_mode: AlphaMode::Blend,
+            ..Default::default()
+        })),
+        Transform {
+            // By setting the scale to -1, the model will be inverted, which is good since we
+            // want to see it while being inside of it.
+            scale: Vec3::NEG_ONE,
             ..Default::default()
         },
+        Visibility::Hidden,
     ));
 }
 
 fn color_planet_skybox(
     q_star_loc: Query<&Location, With<Star>>,
-    mut q_planet_skybox: Query<(&mut Visibility, &Handle<StandardMaterial>), With<PlanetSkybox>>,
+    mut q_planet_skybox: Query<(&mut Visibility, &MeshMaterial3d<StandardMaterial>), With<PlanetSkybox>>,
     q_planets: Query<(&Location, &PlanetAtmosphere, &Structure, &GlobalTransform), With<Planet>>,
     q_player: Query<&Location, With<LocalPlayer>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
@@ -81,7 +78,7 @@ fn color_planet_skybox(
         let planet_face_direction = planet_rot
             * Planet::planet_face_relative(planet_rot.inverse() * Vec3::from(*player_loc - *closest_planet_loc))
                 .direction()
-                .to_vec3();
+                .as_vec3();
 
         let dot = star_direction.dot(planet_face_direction);
         const BEGIN_FADE: f32 = 0.2;
diff --git a/cosmos_client/src/structure/shared/build_mode.rs b/cosmos_client/src/structure/shared/build_mode.rs
index 12c1fe9a2..0509232f5 100644
--- a/cosmos_client/src/structure/shared/build_mode.rs
+++ b/cosmos_client/src/structure/shared/build_mode.rs
@@ -3,10 +3,10 @@
 use bevy::{
     color::LinearRgba,
     math::primitives::Cuboid,
-    pbr::{NotShadowCaster, NotShadowReceiver},
+    pbr::{MeshMaterial3d, NotShadowCaster, NotShadowReceiver},
     prelude::{
-        in_state, App, AssetServer, Assets, BuildChildren, Changed, Commands, Component, DespawnRecursiveExt, Entity, EventReader,
-        IntoSystemConfigs, MaterialMeshBundle, Mesh, Name, Parent, Query, Res, ResMut, Transform, Update, Vec3, With, Without,
+        in_state, App, AssetServer, Assets, BuildChildren, Changed, ChildBuild, Commands, Component, DespawnRecursiveExt, Entity,
+        EventReader, IntoSystemConfigs, Mesh, Mesh3d, Name, Parent, Query, Res, ResMut, Transform, Update, Vec3, With, Without,
     },
     time::Time,
 };
@@ -95,7 +95,7 @@ fn control_build_mode(
     right = right.normalize_or_zero() * max_speed;
     let movement_up = up * max_speed;
 
-    let time = time.delta_seconds();
+    let time = time.delta_secs();
 
     if input_handler.check_pressed(CosmosInputs::MoveForward) {
         transform.translation += forward * time;
@@ -147,7 +147,7 @@ fn place_symmetries(
             NettyChannelClient::Reliable,
             cosmos_encoder::serialize(&ClientReliableMessages::SetSymmetry {
                 axis: BuildAxis::X,
-                coordinate: looking_at_block.map(|block| block.x),
+                coordinate: looking_at_block.map(|block| block.x()),
             }),
         )
     }
@@ -157,7 +157,7 @@ fn place_symmetries(
             NettyChannelClient::Reliable,
             cosmos_encoder::serialize(&ClientReliableMessages::SetSymmetry {
                 axis: BuildAxis::Y,
-                coordinate: looking_at_block.map(|block| block.y),
+                coordinate: looking_at_block.map(|block| block.y()),
             }),
         )
     }
@@ -167,7 +167,7 @@ fn place_symmetries(
             NettyChannelClient::Reliable,
             cosmos_encoder::serialize(&ClientReliableMessages::SetSymmetry {
                 axis: BuildAxis::Z,
-                coordinate: looking_at_block.map(|block| block.z),
+                coordinate: looking_at_block.map(|block| block.z()),
             }),
         )
     }
@@ -250,25 +250,22 @@ fn change_visuals(
                         NotShadowCaster,
                         NotShadowReceiver,
                         Name::new("X Axis - build mode"),
-                        MaterialMeshBundle {
-                            mesh: meshes.add(Cuboid::new(0.001, size as f32, size as f32)),
-                            material: materials.add(UnlitRepeatedMaterial {
-                                repeats: Repeats {
-                                    horizontal: size as u32 / 4,
-                                    vertical: size as u32 / 4,
-                                    ..Default::default()
-                                },
-                                texture: texture_handle.clone(),
-                                color: LinearRgba {
-                                    red: 1.0,
-                                    green: 0.0,
-                                    blue: 0.0,
-                                    alpha: 1.0,
-                                },
-                            }),
-                            transform: Transform::from_xyz(coords.x, 0.5, 0.5),
-                            ..Default::default()
-                        },
+                        Mesh3d(meshes.add(Cuboid::new(0.001, size as f32, size as f32))),
+                        MeshMaterial3d(materials.add(UnlitRepeatedMaterial {
+                            repeats: Repeats {
+                                horizontal: size as u32 / 4,
+                                vertical: size as u32 / 4,
+                                ..Default::default()
+                            },
+                            texture: texture_handle.clone(),
+                            color: LinearRgba {
+                                red: 1.0,
+                                green: 0.0,
+                                blue: 0.0,
+                                alpha: 1.0,
+                            },
+                        })),
+                        Transform::from_xyz(coords.x, 0.5, 0.5),
                     ))
                     .id(),
             );
@@ -286,25 +283,22 @@ fn change_visuals(
                         NotShadowCaster,
                         NotShadowReceiver,
                         Name::new("Y Axis - build mode"),
-                        MaterialMeshBundle {
-                            mesh: meshes.add(Cuboid::new(size as f32, 0.001, size as f32)),
-                            material: materials.add(UnlitRepeatedMaterial {
-                                repeats: Repeats {
-                                    horizontal: size as u32 / 4,
-                                    vertical: size as u32 / 4,
-                                    ..Default::default()
-                                },
-                                texture: texture_handle.clone(),
-                                color: LinearRgba {
-                                    red: 0.0,
-                                    green: 1.0,
-                                    blue: 0.0,
-                                    alpha: 1.0,
-                                },
-                            }),
-                            transform: Transform::from_xyz(0.5, coords.y, 0.5),
-                            ..Default::default()
-                        },
+                        Mesh3d(meshes.add(Cuboid::new(size as f32, 0.001, size as f32))),
+                        MeshMaterial3d(materials.add(UnlitRepeatedMaterial {
+                            repeats: Repeats {
+                                horizontal: size as u32 / 4,
+                                vertical: size as u32 / 4,
+                                ..Default::default()
+                            },
+                            texture: texture_handle.clone(),
+                            color: LinearRgba {
+                                red: 0.0,
+                                green: 1.0,
+                                blue: 0.0,
+                                alpha: 1.0,
+                            },
+                        })),
+                        Transform::from_xyz(0.5, coords.y, 0.5),
                     ))
                     .id(),
             );
@@ -322,25 +316,22 @@ fn change_visuals(
                         NotShadowCaster,
                         NotShadowReceiver,
                         Name::new("Z Axis - build mode"),
-                        MaterialMeshBundle {
-                            mesh: meshes.add(Cuboid::new(size as f32, size as f32, 0.001)),
-                            material: materials.add(UnlitRepeatedMaterial {
-                                repeats: Repeats {
-                                    horizontal: size as u32 / 4,
-                                    vertical: size as u32 / 4,
-                                    ..Default::default()
-                                },
-                                texture: texture_handle.clone(),
-                                color: LinearRgba {
-                                    red: 0.0,
-                                    green: 0.0,
-                                    blue: 1.0,
-                                    alpha: 1.0,
-                                },
-                            }),
-                            transform: Transform::from_xyz(0.5, 0.5, coords.z),
-                            ..Default::default()
-                        },
+                        Mesh3d(meshes.add(Cuboid::new(size as f32, size as f32, 0.001))),
+                        MeshMaterial3d(materials.add(UnlitRepeatedMaterial {
+                            repeats: Repeats {
+                                horizontal: size as u32 / 4,
+                                vertical: size as u32 / 4,
+                                ..Default::default()
+                            },
+                            texture: texture_handle.clone(),
+                            color: LinearRgba {
+                                red: 0.0,
+                                green: 0.0,
+                                blue: 1.0,
+                                alpha: 1.0,
+                            },
+                        })),
+                        Transform::from_xyz(0.5, 0.5, coords.z),
                     ))
                     .id(),
             );
diff --git a/cosmos_client/src/structure/shields/mod.rs b/cosmos_client/src/structure/shields/mod.rs
index c151949d1..ace8cd741 100644
--- a/cosmos_client/src/structure/shields/mod.rs
+++ b/cosmos_client/src/structure/shields/mod.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 
 use bevy::{
     app::Update,
-    asset::{Assets, Handle},
+    asset::Assets,
     color::palettes::css,
     core::Name,
     ecs::{
@@ -15,12 +15,12 @@ use bevy::{
         system::{Commands, Query, Res, ResMut},
     },
     math::{Vec3, Vec4},
-    pbr::{NotShadowCaster, StandardMaterial},
-    prelude::App,
+    pbr::{MeshMaterial3d, NotShadowCaster, StandardMaterial},
+    prelude::{App, Mesh3d},
     render::{
         alpha::AlphaMode,
         mesh::{Mesh, MeshBuilder, SphereKind, SphereMeshBuilder},
-        view::{Visibility, VisibilityBundle},
+        view::Visibility,
     },
     time::Time,
 };
@@ -35,7 +35,7 @@ use crate::{
 struct OldRadius(f32);
 
 fn on_change_shield_update_rendering(
-    mut q_changed_shield: Query<(&Shield, &mut OldRadius, &mut Visibility, &mut Handle<Mesh>), Changed<Shield>>,
+    mut q_changed_shield: Query<(&Shield, &mut OldRadius, &mut Visibility, &mut Mesh3d), Changed<Shield>>,
     mut meshes: ResMut<Assets<Mesh>>,
 ) {
     for (shield, mut old_radius, mut visibility, mut mesh_handle) in q_changed_shield.iter_mut() {
@@ -48,7 +48,7 @@ fn on_change_shield_update_rendering(
         }
 
         if old_radius.0 != shield.radius {
-            *mesh_handle = meshes.add(SphereMeshBuilder::new(shield.radius, SphereKind::Uv { sectors: 256, stacks: 256 }).build());
+            *mesh_handle = Mesh3d(meshes.add(SphereMeshBuilder::new(shield.radius, SphereKind::Uv { sectors: 256, stacks: 256 }).build()));
             old_radius.0 = shield.radius;
         }
     }
@@ -59,7 +59,7 @@ const MAX_ANIMATION_DURATION: Duration = Duration::from_secs(2);
 fn update_shield_times(
     time: Res<Time>,
     mut materials: ResMut<Assets<ShieldMaterial>>,
-    mut q_shields: Query<(&mut ShieldRender, &Handle<ShieldMaterial>)>,
+    mut q_shields: Query<(&mut ShieldRender, &MeshMaterial3d<ShieldMaterial>)>,
 ) {
     for (mut shield_render, handle) in &mut q_shields {
         let Some(mat) = materials.get_mut(handle) else {
@@ -80,7 +80,7 @@ fn update_shield_times(
             ripple.y = hit_point.y;
             ripple.z = hit_point.z;
 
-            *hit_time += time.delta_seconds();
+            *hit_time += time.delta_secs();
 
             if *hit_time > MAX_ANIMATION_DURATION.as_secs_f32() {
                 *hit = None;
@@ -122,12 +122,9 @@ fn on_add_shield_create_rendering(
         commands.entity(shield_entity).insert((
             Name::new("Shield"),
             ShieldRender::default(),
-            VisibilityBundle {
-                visibility: Visibility::Hidden,
-                ..Default::default()
-            },
+            Visibility::Hidden,
             NotShadowCaster,
-            materials.add(ShieldMaterial {
+            MeshMaterial3d(materials.add(ShieldMaterial {
                 base: StandardMaterial {
                     // unlit: true,
                     alpha_mode: AlphaMode::Add,
@@ -137,9 +134,9 @@ fn on_add_shield_create_rendering(
                 extension: ShieldMaterialExtension {
                     ripples: [Vec4::new(0.0, 0.0, 0.0, -1.0); MAX_SHIELD_HIT_POINTS],
                 },
-            }),
+            })),
             OldRadius(shield.radius),
-            meshes.add(SphereMeshBuilder::new(shield.radius, SphereKind::Uv { sectors: 256, stacks: 256 }).build()),
+            Mesh3d(meshes.add(SphereMeshBuilder::new(shield.radius, SphereKind::Uv { sectors: 256, stacks: 256 }).build())),
         ));
     }
 }
diff --git a/cosmos_client/src/structure/ship/client_ship_builder.rs b/cosmos_client/src/structure/ship/client_ship_builder.rs
index 31b548919..e19b0d986 100644
--- a/cosmos_client/src/structure/ship/client_ship_builder.rs
+++ b/cosmos_client/src/structure/ship/client_ship_builder.rs
@@ -3,10 +3,9 @@
 use bevy::{
     ecs::system::EntityCommands,
     prelude::{
-        resource_exists, Added, App, BuildChildren, Commands, Entity, Handle, IntoSystemConfigs, Name, Query, Res, Resource, Transform,
-        Update,
+        resource_exists, Added, App, BuildChildren, ChildBuild, Commands, Entity, Handle, IntoSystemConfigs, Name, Query, Res, Resource,
+        Transform, Update,
     },
-    transform::bundles::TransformBundle,
 };
 use bevy_kira_audio::{Audio, AudioControl, AudioInstance, AudioSource};
 use bevy_rapier3d::prelude::Velocity;
@@ -69,7 +68,7 @@ fn client_on_add_ship(
             p.spawn((
                 Name::new("Engine idle sound"),
                 DespawnWithStructure,
-                TransformBundle::from_transform(Transform::from_xyz(0.5, 0.5, 0.5)),
+                Transform::from_xyz(0.5, 0.5, 0.5),
                 idle_emitter,
             ));
         });
diff --git a/cosmos_client/src/structure/systems/laser_cannon_system.rs b/cosmos_client/src/structure/systems/laser_cannon_system.rs
index 431316abe..a70e1882c 100644
--- a/cosmos_client/src/structure/systems/laser_cannon_system.rs
+++ b/cosmos_client/src/structure/systems/laser_cannon_system.rs
@@ -55,7 +55,7 @@ fn apply_shooting_sound(
             },
             DespawnOnNoEmissions,
             location,
-            TransformBundle::from_transform(Transform::from_translation(translation)),
+            Transform::from_translation(translation),
         ));
     }
 }
@@ -75,7 +75,11 @@ pub(super) fn register(app: &mut App) {
         ],
         |mut commands, handles| {
             commands.insert_resource(LaserCannonFireHandles(
-                handles.into_iter().filter(|x| x.1 == LoadState::Loaded).map(|x| x.0).collect(),
+                handles
+                    .into_iter()
+                    .filter(|x| matches!(x.1, LoadState::Loaded))
+                    .map(|x| x.0)
+                    .collect(),
             ));
         },
     );
diff --git a/cosmos_client/src/structure/systems/mining_laser_system.rs b/cosmos_client/src/structure/systems/mining_laser_system.rs
index e5b6da89a..8606b7ec9 100644
--- a/cosmos_client/src/structure/systems/mining_laser_system.rs
+++ b/cosmos_client/src/structure/systems/mining_laser_system.rs
@@ -151,7 +151,7 @@ fn apply_mining_effects(
                     }],
                 },
                 DespawnOnNoEmissions,
-                TransformBundle::from_transform(Transform::from_xyz(0.5, 0.5, 1.0)),
+                Transform::from_xyz(0.5, 0.5, 1.0),
             ));
         });
 
@@ -185,17 +185,14 @@ fn apply_mining_effects(
 
                 let material = materials_cache.0.get(&hashed).expect("Added above");
 
-                let beam_direction = line.direction.to_vec3();
+                let beam_direction = line.direction.as_vec3();
 
-                let laser_start = structure.block_relative_position(line.start.coords());
+                let laser_start = structure.block_relative_position(line.start);
                 let beam_ent = p
                     .spawn((
-                        PbrBundle {
-                            transform: Transform::from_translation(laser_start).looking_to(beam_direction, Vec3::Y),
-                            material: material.clone_weak(),
-                            mesh: mesh.0.clone_weak(),
-                            ..Default::default()
-                        },
+                        Transform::from_translation(laser_start).looking_to(beam_direction, Vec3::Y),
+                        MeshMaterial3d(material.clone_weak()),
+                        Mesh3d(mesh.0.clone_weak()),
                         NotShadowCaster,
                         NotShadowReceiver,
                         MiningLaser {
@@ -279,7 +276,7 @@ fn create_mining_laser_mesh(mut commands: Commands, mut meshes: ResMut<Assets<Me
 
 fn rotate_mining_lasers(time: Res<Time>, mut q_transforms: Query<(&mut Transform, &MiningLaser)>) {
     for (mut trans, mining_laser) in q_transforms.iter_mut() {
-        trans.rotation = Quat::from_axis_angle(mining_laser.laser_direction.to_vec3(), time.delta_seconds()).mul_quat(trans.rotation);
+        trans.rotation = Quat::from_axis_angle(mining_laser.laser_direction.as_vec3(), time.delta_secs()).mul_quat(trans.rotation);
     }
 }
 
@@ -304,7 +301,11 @@ pub(super) fn register(app: &mut App) {
         ],
         |mut commands, handles| {
             commands.insert_resource(LaserCannonFireHandles(
-                handles.into_iter().filter(|x| x.1 == LoadState::Loaded).map(|x| x.0).collect(),
+                handles
+                    .into_iter()
+                    .filter(|x| matches!(x.1, LoadState::Loaded))
+                    .map(|x| x.0)
+                    .collect(),
             ));
         },
     );
diff --git a/cosmos_client/src/structure/systems/missile_launcher_system.rs b/cosmos_client/src/structure/systems/missile_launcher_system.rs
index e8129ad02..b731ce0bf 100644
--- a/cosmos_client/src/structure/systems/missile_launcher_system.rs
+++ b/cosmos_client/src/structure/systems/missile_launcher_system.rs
@@ -72,7 +72,7 @@ fn apply_shooting_sound(
             },
             DespawnOnNoEmissions,
             location,
-            TransformBundle::from_transform(Transform::from_translation(translation)),
+            Transform::from_translation(translation),
         ));
     }
 }
@@ -144,8 +144,8 @@ fn render_lockon_status(
     q_missile_focus: Query<&MissileLauncherFocus>,
     q_ui_root: Query<Entity, With<UiRoot>>,
     q_missile_focus_ui: Query<(Entity, &MissileFocusUi)>,
-    mut q_style: Query<(&mut Style, &mut UiImage)>,
-    mut q_column_style: Query<&mut Style, Without<UiImage>>,
+    mut q_style: Query<(&mut Node, &mut ImageNode)>,
+    mut q_column_style: Query<&mut Node, Without<ImageNode>>,
 ) {
     let focus_ui = q_missile_focus_ui.get_single();
 
@@ -221,15 +221,12 @@ fn render_lockon_status(
 
         let mut ecmds = commands.spawn((
             TargetCamera(ui_root),
-            NodeBundle {
-                style: Style {
-                    position_type: PositionType::Absolute,
-                    justify_content: JustifyContent::Center,
-                    align_items: AlignItems::Center,
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    ..Default::default()
-                },
+            Node {
+                position_type: PositionType::Absolute,
+                justify_content: JustifyContent::Center,
+                align_items: AlignItems::Center,
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
                 ..Default::default()
             },
             Name::new("Missile focus UI"),
@@ -239,12 +236,9 @@ fn render_lockon_status(
             missile_focus_ui.left_column = p
                 .spawn((
                     Name::new("Left column"),
-                    NodeBundle {
-                        style: Style {
-                            flex_direction: FlexDirection::Column,
-                            margin: UiRect::right(Val::Px(gap)),
-                            ..Default::default()
-                        },
+                    Node {
+                        flex_direction: FlexDirection::Column,
+                        margin: UiRect::right(Val::Px(gap)),
                         ..Default::default()
                     },
                 ))
@@ -252,19 +246,16 @@ fn render_lockon_status(
                     missile_focus_ui.top_left = p
                         .spawn((
                             Name::new("Top left"),
-                            ImageBundle {
-                                image: UiImage {
-                                    texture: lockon_graphic.0.clone_weak(),
-                                    flip_x: false,
-                                    flip_y: false,
-                                    ..Default::default()
-                                },
-                                style: Style {
-                                    width: Val::Px(64.0),
-                                    height: Val::Px(64.0),
-                                    top: Val::Px(-gap),
-                                    ..Default::default()
-                                },
+                            ImageNode {
+                                image: lockon_graphic.0.clone_weak(),
+                                flip_x: false,
+                                flip_y: false,
+                                ..Default::default()
+                            },
+                            Node {
+                                width: Val::Px(64.0),
+                                height: Val::Px(64.0),
+                                top: Val::Px(-gap),
                                 ..Default::default()
                             },
                         ))
@@ -273,19 +264,16 @@ fn render_lockon_status(
                     missile_focus_ui.bottom_left = p
                         .spawn((
                             Name::new("Bottom left"),
-                            ImageBundle {
-                                image: UiImage {
-                                    texture: lockon_graphic.0.clone_weak(),
-                                    flip_x: false,
-                                    flip_y: true,
-                                    ..Default::default()
-                                },
-                                style: Style {
-                                    width: Val::Px(64.0),
-                                    height: Val::Px(64.0),
-                                    top: Val::Px(gap),
-                                    ..Default::default()
-                                },
+                            ImageNode {
+                                image: lockon_graphic.0.clone_weak(),
+                                flip_x: false,
+                                flip_y: true,
+                                ..Default::default()
+                            },
+                            Node {
+                                width: Val::Px(64.0),
+                                height: Val::Px(64.0),
+                                top: Val::Px(gap),
                                 ..Default::default()
                             },
                         ))
@@ -296,12 +284,9 @@ fn render_lockon_status(
             missile_focus_ui.right_column = p
                 .spawn((
                     Name::new("Right Column"),
-                    NodeBundle {
-                        style: Style {
-                            flex_direction: FlexDirection::Column,
-                            margin: UiRect::left(Val::Px(gap)),
-                            ..Default::default()
-                        },
+                    Node {
+                        flex_direction: FlexDirection::Column,
+                        margin: UiRect::left(Val::Px(gap)),
                         ..Default::default()
                     },
                 ))
@@ -309,19 +294,16 @@ fn render_lockon_status(
                     missile_focus_ui.top_right = p
                         .spawn((
                             Name::new("Top right"),
-                            ImageBundle {
-                                image: UiImage {
-                                    texture: lockon_graphic.0.clone_weak(),
-                                    flip_x: true,
-                                    flip_y: false,
-                                    ..Default::default()
-                                },
-                                style: Style {
-                                    width: Val::Px(64.0),
-                                    height: Val::Px(64.0),
-                                    top: Val::Px(-gap),
-                                    ..Default::default()
-                                },
+                            ImageNode {
+                                image: lockon_graphic.0.clone_weak(),
+                                flip_x: true,
+                                flip_y: false,
+                                ..Default::default()
+                            },
+                            Node {
+                                width: Val::Px(64.0),
+                                height: Val::Px(64.0),
+                                top: Val::Px(-gap),
                                 ..Default::default()
                             },
                         ))
@@ -330,19 +312,16 @@ fn render_lockon_status(
                     missile_focus_ui.bottom_right = p
                         .spawn((
                             Name::new("Bottom right"),
-                            ImageBundle {
-                                image: UiImage {
-                                    texture: lockon_graphic.0.clone_weak(),
-                                    flip_x: true,
-                                    flip_y: true,
-                                    ..Default::default()
-                                },
-                                style: Style {
-                                    width: Val::Px(64.0),
-                                    height: Val::Px(64.0),
-                                    top: Val::Px(gap),
-                                    ..Default::default()
-                                },
+                            ImageNode {
+                                image: lockon_graphic.0.clone_weak(),
+                                flip_x: true,
+                                flip_y: true,
+                                ..Default::default()
+                            },
+                            Node {
+                                width: Val::Px(64.0),
+                                height: Val::Px(64.0),
+                                top: Val::Px(gap),
                                 ..Default::default()
                             },
                         ))
@@ -355,7 +334,7 @@ fn render_lockon_status(
     }
 }
 
-fn update_corner_styles(q_style: &mut Query<(&mut Style, &mut UiImage)>, entity: Entity, gap: f32, color: Color) {
+fn update_corner_styles(q_style: &mut Query<(&mut Node, &mut ImageNode)>, entity: Entity, gap: f32, color: Color) {
     let Ok((mut style, mut img)) = q_style.get_mut(entity) else {
         return;
     };
@@ -373,7 +352,11 @@ pub(super) fn register(app: &mut App) {
         vec!["cosmos/sounds/sfx/missile-launch-1.ogg", "cosmos/sounds/sfx/missile-launch-2.ogg"],
         |mut commands, handles| {
             commands.insert_resource(MissileLauncherFireHandles(
-                handles.into_iter().filter(|x| x.1 == LoadState::Loaded).map(|x| x.0).collect(),
+                handles
+                    .into_iter()
+                    .filter(|x| matches!(x.1, LoadState::Loaded))
+                    .map(|x| x.0)
+                    .collect(),
             ));
         },
     );
diff --git a/cosmos_client/src/ui/components/button.rs b/cosmos_client/src/ui/components/button.rs
index 19b7955b4..1ca50f2f3 100644
--- a/cosmos_client/src/ui/components/button.rs
+++ b/cosmos_client/src/ui/components/button.rs
@@ -2,29 +2,9 @@
 
 use std::marker::PhantomData;
 
-use bevy::{
-    app::{App, Update},
-    color::{palettes::css, Color, Srgba},
-    core::Name,
-    ecs::{
-        bundle::Bundle,
-        change_detection::DetectChanges,
-        component::Component,
-        entity::Entity,
-        event::{Event, EventWriter},
-        query::{Added, Changed, Without},
-        schedule::{IntoSystemConfigs, IntoSystemSetConfigs, SystemSet},
-        system::{Commands, Query},
-        world::Ref,
-    },
-    hierarchy::{BuildChildren, Children},
-    log::error,
-    text::{Text, TextSection, TextStyle},
-    ui::{
-        node_bundles::{NodeBundle, TextBundle},
-        AlignItems, BackgroundColor, Interaction, JustifyContent, Style, UiImage,
-    },
-};
+use bevy::color::palettes::css;
+use bevy::prelude::*;
+
 use cosmos_core::ecs::NeedsDespawned;
 
 use crate::ui::UiSystemSet;
@@ -38,6 +18,7 @@ pub trait ButtonEvent: Sized + Event + std::fmt::Debug {
 }
 
 #[derive(Component, Debug)]
+#[require(Node)]
 /// A UI element that will send out events (of type `T`) when it is pressed.
 ///
 /// This does NOT use the default bevy `Button` component.
@@ -50,9 +31,9 @@ pub struct Button<T: ButtonEvent> {
     /// states a button can be in. Leave `None` if you don't want this.
     pub button_styles: Option<ButtonStyles>,
     /// Text to display in the button. The text will be center aligned.
-    pub text: Option<(String, TextStyle)>,
+    pub text: Option<(String, TextFont, TextColor)>,
     /// Image to display in the button. The image will take up the entire button.
-    pub image: Option<UiImage>,
+    pub image: Option<ImageNode>,
 }
 
 #[derive(Debug, Clone)]
@@ -100,30 +81,10 @@ impl<T: ButtonEvent> Default for Button<T> {
     }
 }
 
-#[derive(Debug, Bundle)]
-/// A UI element that will send out events (of type `T`) when it is pressed.
-///
-/// This does NOT use the default bevy `Button` component.
-pub struct ButtonBundle<T: ButtonEvent> {
-    /// The node bundle that will be used with the TextInput
-    pub node_bundle: NodeBundle,
-    /// The button UI element
-    pub button: Button<T>,
-}
-
-impl<T: ButtonEvent> Default for ButtonBundle<T> {
-    fn default() -> Self {
-        Self {
-            button: Default::default(),
-            node_bundle: Default::default(),
-        }
-    }
-}
-
 #[derive(Component)]
 struct ButtonText(Entity);
 
-fn on_add_button<T: ButtonEvent>(mut commands: Commands, mut q_added_button: Query<(Entity, &Button<T>, &mut Style), Added<Button<T>>>) {
+fn on_add_button<T: ButtonEvent>(mut commands: Commands, mut q_added_button: Query<(Entity, &Button<T>, &mut Node), Added<Button<T>>>) {
     for (ent, button, mut style) in q_added_button.iter_mut() {
         commands.entity(ent).insert(Interaction::default());
 
@@ -135,15 +96,9 @@ fn on_add_button<T: ButtonEvent>(mut commands: Commands, mut q_added_button: Que
             commands.entity(ent).insert(ui_node);
         }
 
-        if let Some((text, text_style)) = button.text.clone() {
+        if let Some((text, text_style, text_color)) = button.text.clone() {
             let text_ent = commands
-                .spawn((
-                    Name::new("Button Text"),
-                    TextBundle {
-                        text: Text::from_section(text, text_style),
-                        ..Default::default()
-                    },
-                ))
+                .spawn((Name::new("Button Text"), Text::new(text), text_style, text_color))
                 .id();
 
             commands.entity(ent).insert(ButtonText(text_ent)).add_child(text_ent);
@@ -157,7 +112,8 @@ fn on_interact_button<T: ButtonEvent>(
         (Entity, &Interaction, &mut Button<T>, &mut BackgroundColor, &Children),
         (Changed<Interaction>, Without<Disabled>),
     >,
-    mut q_text: Query<&mut Text>,
+    mut writer: TextUiWriter,
+    q_has_text: Query<(), With<Text>>,
 ) {
     for (btn_entity, interaction, mut button, mut bg_color, children) in q_added_button.iter_mut() {
         if let Some(btn_styles) = &button.button_styles {
@@ -167,16 +123,14 @@ fn on_interact_button<T: ButtonEvent>(
                 Interaction::Pressed => btn_styles.press_background_color,
             };
 
-            if let Some(&text_child) = children.iter().find(|&x| q_text.contains(*x)) {
-                let mut text = q_text.get_mut(text_child).expect("Checked above");
-
+            if let Some(&text_child) = children.iter().find(|&x| q_has_text.contains(*x)) {
                 let color = match *interaction {
                     Interaction::None => btn_styles.foreground_color,
                     Interaction::Hovered => btn_styles.hover_foreground_color,
                     Interaction::Pressed => btn_styles.press_foreground_color,
                 };
 
-                text.sections.iter_mut().for_each(|x| x.style.color = color);
+                writer.for_each_color(text_child, |mut c| c.0 = color);
             }
         }
 
@@ -192,23 +146,23 @@ fn on_interact_button<T: ButtonEvent>(
 
 fn on_change_button<T: ButtonEvent>(
     mut commands: Commands,
-    mut q_text: Query<&mut Text>,
     mut q_changed_button: Query<
         (
             Entity,
             Ref<Button<T>>,
-            Option<&UiImage>,
+            Option<&ImageNode>,
             Option<&ButtonText>,
             &Interaction,
             &mut BackgroundColor,
         ),
         Changed<Button<T>>,
     >,
+    mut writer: TextUiWriter,
 ) {
     for (ent, btn, image, button_text, &interaction, mut bg_color) in q_changed_button.iter_mut().filter(|x| !x.1.is_added()) {
-        fn calc_text_color<T: ButtonEvent>(btn: &Button<T>, interaction: Interaction, text_style: &mut TextStyle) {
+        fn calc_text_color<T: ButtonEvent>(btn: &Button<T>, interaction: Interaction, text_style: &mut TextColor) {
             if let Some(btn_styles) = &btn.button_styles {
-                text_style.color = match interaction {
+                text_style.0 = match interaction {
                     Interaction::None => btn_styles.foreground_color,
                     Interaction::Hovered => btn_styles.hover_foreground_color,
                     Interaction::Pressed => btn_styles.press_foreground_color,
@@ -219,7 +173,7 @@ fn on_change_button<T: ButtonEvent>(
         if !image
             .map(|x| {
                 if let Some(y) = &btn.image {
-                    x.flip_x == y.flip_x && x.flip_y == y.flip_y && x.texture == y.texture
+                    x.flip_x == y.flip_x && x.flip_y == y.flip_y && x.image == y.image
                 } else {
                     false
                 }
@@ -229,47 +183,40 @@ fn on_change_button<T: ButtonEvent>(
             if let Some(image) = btn.image.clone() {
                 commands.entity(ent).insert(image);
             } else {
-                commands.entity(ent).remove::<UiImage>();
+                commands.entity(ent).remove::<ImageNode>();
             }
         }
 
         if let Some(button_text) = button_text {
-            if let Some((new_text_value, text_style)) = &btn.text {
-                let Ok(mut text) = q_text.get_mut(button_text.0) else {
-                    error!("Text entity has no text");
-                    continue;
-                };
-
-                if let Some(text_section) = text.sections.first() {
-                    let same_text_style = text_section.style.color == text_style.color
-                        && text_section.style.font_size == text_style.font_size
-                        && text_section.style.font == text_style.font;
-
-                    if !same_text_style || &text_section.value != new_text_value {
-                        let mut text_style = text_style.clone();
-                        calc_text_color(&btn, interaction, &mut text_style);
-                        text.sections = vec![TextSection::new(new_text_value.clone(), text_style)];
+            if let Some((new_text_value, text_font, text_color)) = &btn.text {
+                if let Some((_, _, cur_text_value, cur_font_style, cur_text_color)) = writer.get(button_text.0, 0) {
+                    let same_text_style = text_color.0 == cur_text_color.as_ref().0
+                        && text_font.font == cur_font_style.font
+                        && text_font.font_size == cur_font_style.font_size
+                        && text_font.font_smoothing == cur_font_style.font_smoothing;
+
+                    if !same_text_style || new_text_value != cur_text_value.as_ref() {
+                        writer.color(button_text.0, 0).as_mut().0 = text_color.0;
+                        *writer.font(button_text.0, 0).as_mut() = text_font.clone();
+                        *writer.text(button_text.0, 0).as_mut() = new_text_value.clone();
                     }
                 } else {
-                    let mut text_style = text_style.clone();
-                    calc_text_color(&btn, interaction, &mut text_style);
-                    text.sections = vec![TextSection::new(new_text_value.clone(), text_style.clone())];
+                    error!("It happened!!!");
+                    // let mut col = text_color.clone();
+                    // let font = text_font.clone();
+                    // calc_text_color(&btn, interaction, &mut col);
+                    //
+                    // writer.text.sections = vec![TextSection::new(new_text_value.clone(), text_style.clone())];
                 }
             } else {
                 commands.entity(button_text.0).insert(NeedsDespawned);
                 commands.entity(ent).remove::<ButtonText>();
             }
-        } else if let Some((text, mut text_style)) = btn.text.clone() {
-            calc_text_color(&btn, interaction, &mut text_style);
+        } else if let Some((text, text_style, mut text_color)) = btn.text.clone() {
+            calc_text_color(&btn, interaction, &mut text_color);
 
             let text_ent = commands
-                .spawn((
-                    Name::new("Button Text"),
-                    TextBundle {
-                        text: Text::from_section(text, text_style),
-                        ..Default::default()
-                    },
-                ))
+                .spawn((Name::new("Button Text"), Text::new(text), text_style, text_color))
                 .id();
 
             commands.entity(ent).insert(ButtonText(text_ent)).add_child(text_ent);
diff --git a/cosmos_client/src/ui/components/scollable_container.rs b/cosmos_client/src/ui/components/scollable_container.rs
index 66af960ef..95df6fbf2 100644
--- a/cosmos_client/src/ui/components/scollable_container.rs
+++ b/cosmos_client/src/ui/components/scollable_container.rs
@@ -5,7 +5,6 @@ use bevy::{
     color::{Color, Srgba},
     core::Name,
     ecs::{
-        bundle::Bundle,
         component::Component,
         entity::Entity,
         event::EventReader,
@@ -20,9 +19,11 @@ use bevy::{
         ButtonInput,
     },
     log::error,
+    math::{Rect, Vec2},
+    prelude::{Changed, ChildBuild},
     reflect::Reflect,
     transform::components::GlobalTransform,
-    ui::{node_bundles::NodeBundle, FlexDirection, Interaction, Node, Overflow, PositionType, Style, UiScale, Val},
+    ui::{BackgroundColor, ComputedNode, FlexDirection, Interaction, Node, Overflow, PositionType, Val},
     window::{PrimaryWindow, Window},
 };
 
@@ -30,11 +31,12 @@ use crate::ui::UiSystemSet;
 
 use super::Disabled;
 
-#[derive(Component, Default, Debug)]
+#[derive(Component, Default, Debug, Reflect)]
+#[require(Node)]
 /// Put content you want to scroll through as a child of this
 pub struct ScrollBox {
-    /// The amount that is scrolled by
-    pub scroll_amount: f32,
+    /// The amount that is scrolled by (in pixels)
+    pub scroll_amount: Val,
     /// The styles of this scroll box
     pub styles: ScrollerStyles,
 }
@@ -69,15 +71,6 @@ impl Default for ScrollerStyles {
     }
 }
 
-#[derive(Debug, Bundle, Default)]
-/// Put stuff you want to scroll through as a child of this bundle
-pub struct ScrollBundle {
-    /// The node bundle that will be used with the Scrollbar
-    pub node_bundle: NodeBundle,
-    /// The slider component
-    pub slider: ScrollBox,
-}
-
 #[derive(Component)]
 struct ContentsContainer(Entity);
 
@@ -87,22 +80,20 @@ struct ScrollbarContainerEntity(Entity);
 #[derive(Component)]
 struct ScrollbarEntity(Entity);
 
-fn on_add_scrollbar(mut commands: Commands, mut q_added_button: Query<(Entity, &ScrollBox, &mut Style, &Children), Added<ScrollBox>>) {
+fn on_add_scrollbar(mut commands: Commands, mut q_added_button: Query<(Entity, &ScrollBox, &mut Node, &Children), Added<ScrollBox>>) {
     for (ent, scrollbox, mut style, children) in q_added_button.iter_mut() {
         style.overflow = Overflow::clip_y();
 
         let container_entity = commands
             .spawn((
                 Name::new("Scrollbar Content Container"),
-                NodeBundle {
-                    style: Style {
-                        // Take the size of the parent node.
-                        flex_grow: 1.0,
-                        position_type: PositionType::Absolute,
-                        flex_direction: FlexDirection::Column,
-                        width: Val::Percent(100.0),
-                        ..Default::default()
-                    },
+                Node {
+                    // Take the size of the parent node.
+                    flex_grow: 1.0,
+                    position_type: PositionType::Absolute,
+                    flex_direction: FlexDirection::Column,
+                    width: Val::Percent(100.0),
+                    min_height: Val::Percent(100.0),
                     ..Default::default()
                 },
             ))
@@ -112,38 +103,33 @@ fn on_add_scrollbar(mut commands: Commands, mut q_added_button: Query<(Entity, &
             .spawn((
                 Name::new("Scrollbar Container"),
                 Interaction::None,
-                NodeBundle {
-                    style: Style {
-                        // Take the size of the parent node.
-                        position_type: PositionType::Absolute,
-                        right: Val::Px(0.0), // aligns it to right
-                        width: Val::Px(15.0),
-                        height: Val::Percent(100.0),
-                        flex_direction: FlexDirection::Column,
-                        ..Default::default()
-                    },
-                    background_color: scrollbox.styles.scrollbar_background_color.into(),
+                Node {
+                    // Take the size of the parent node.
+                    position_type: PositionType::Absolute,
+                    right: Val::Px(0.0), // aligns it to right
+                    width: Val::Px(15.0),
+                    height: Val::Percent(100.0),
+                    flex_direction: FlexDirection::Column,
                     ..Default::default()
                 },
+                BackgroundColor(scrollbox.styles.scrollbar_background_color),
             ))
             .with_children(|p| {
                 p.spawn((
                     Name::new("Scrollbar"),
                     ScrollbarContainerEntity(ent),
                     Interaction::None,
-                    NodeBundle {
-                        style: Style {
-                            // Take the size of the parent node.
-                            position_type: PositionType::Relative,
-                            top: Val::Percent(0.0),
-                            width: Val::Px(15.0),
-                            height: Val::Px(0.0),
-                            flex_direction: FlexDirection::Column,
-                            ..Default::default()
-                        },
-                        background_color: scrollbox.styles.scrollbar_color.into(),
+                    Node {
+                        // Take the size of the parent node.
+                        position_type: PositionType::Relative,
+                        top: Val::Percent(0.0),
+                        width: Val::Px(15.0),
+                        height: Val::Px(0.0),
+                        flex_direction: FlexDirection::Column,
+
                         ..Default::default()
                     },
+                    BackgroundColor(scrollbox.styles.scrollbar_color),
                 ));
             })
             .id();
@@ -160,22 +146,31 @@ fn on_add_scrollbar(mut commands: Commands, mut q_added_button: Query<(Entity, &
     }
 }
 
+fn compute_scroll_px(scroll_amount: Val, items_height: f32, container_height: f32) -> f32 {
+    let max_scroll = (items_height - container_height).max(0.0);
+    match scroll_amount {
+        Val::Px(px) => px,
+        Val::Percent(perc) => max_scroll * perc / 100.0,
+        Val::Auto => 0.0,
+        _ => panic!("Not supported by scroll bar (yet)"),
+    }
+}
+
 fn on_interact_slider(
     mut mouse_wheel_events: EventReader<MouseWheel>,
     mut q_scroll_containers: Query<
         (
             &mut ScrollBox,
             &Interaction,
-            &Node,
+            &ComputedNode,
             &ContentsContainer,
             &ScrollbarEntity,
             &GlobalTransform,
         ),
         Without<Disabled>,
     >,
-    mut q_container: Query<(&mut Style, &Node)>,
+    q_container: Query<&ComputedNode>,
     input: Res<ButtonInput<KeyCode>>,
-    scale: Res<UiScale>,
     mouse_btns: Res<ButtonInput<MouseButton>>,
     q_windows: Query<&Window, With<PrimaryWindow>>,
     q_interaction: Query<&Interaction>,
@@ -186,7 +181,7 @@ fn on_interact_slider(
                 continue;
             }
 
-            let Ok((mut style, contents_node)) = q_container.get_mut(contents_container.0) else {
+            let Ok(contents_node) = q_container.get(contents_container.0) else {
                 error!("This should never happen - contents has no style/node.");
                 continue;
             };
@@ -207,9 +202,10 @@ fn on_interact_slider(
                 MouseScrollUnit::Pixel => mouse_wheel_event.y,
             } * scroll_speed_multiplier;
 
-            scrollbar.scroll_amount -= dy;
-            scrollbar.scroll_amount = scrollbar.scroll_amount.clamp(0.0, max_scroll);
-            style.top = Val::Px(-scrollbar.scroll_amount);
+            let as_px = compute_scroll_px(scrollbar.scroll_amount, items_height, container_height);
+
+            let new_amount = (as_px - dy).clamp(0.0, max_scroll);
+            scrollbar.scroll_amount = Val::Px(new_amount);
         }
     }
 
@@ -223,7 +219,7 @@ fn on_interact_slider(
                 continue;
             }
 
-            let Ok((mut style, contents_node)) = q_container.get_mut(contents_container.0) else {
+            let Ok(contents_node) = q_container.get(contents_container.0) else {
                 error!("This should never happen - contents has no style/node.");
                 continue;
             };
@@ -243,23 +239,42 @@ fn on_interact_slider(
 
             let max_scroll = (items_height - container_height).max(0.0);
 
-            let phys_rect = node.physical_rect(g_trans, 1.0, scale.0);
+            let t = g_trans.translation();
+            let phys_rect = Rect::from_center_size(Vec2::new(t.x, t.y), node.size());
 
             let min = phys_rect.min.y + scrollbar_height_px / 2.0;
             let max = phys_rect.max.y - scrollbar_height_px / 2.0;
 
             let mouse_percent = ((cursor_pos.y - min) / (max - min)).clamp(0.0, 1.0);
 
-            scrollbar.scroll_amount = mouse_percent * max_scroll;
-            style.top = Val::Px(-scrollbar.scroll_amount);
+            let amount = mouse_percent * max_scroll;
+            scrollbar.scroll_amount = Val::Px(amount);
         }
     }
 }
 
+fn on_change_scrollbar(
+    q_scroll_containers: Query<(&ScrollBox, &ComputedNode, &ContentsContainer), Changed<ScrollBox>>,
+    mut q_container: Query<(&mut Node, &ComputedNode)>,
+) {
+    for (scrollbar, node, contents_container) in q_scroll_containers.iter() {
+        let Ok((mut style, contents_node)) = q_container.get_mut(contents_container.0) else {
+            error!("This should never happen - contents has no style/node.");
+            continue;
+        };
+
+        let items_height = contents_node.size().y;
+        let container_height = node.size().y;
+
+        let as_px = compute_scroll_px(scrollbar.scroll_amount, items_height, container_height);
+        style.top = Val::Px(-as_px);
+    }
+}
+
 fn handle_scrollbar(
-    mut query_list: Query<(&ScrollbarContainerEntity, &mut Style)>,
-    q_scroll_container: Query<(&Node, &ScrollBox, &ContentsContainer)>,
-    q_node: Query<&Node>,
+    mut query_list: Query<(&ScrollbarContainerEntity, &mut Node)>,
+    q_scroll_container: Query<(&ComputedNode, &ScrollBox, &ContentsContainer)>,
+    q_node: Query<&ComputedNode>,
 ) {
     for (scrollbar_entity, mut style) in query_list.iter_mut() {
         let Ok((node, scrollbar, contents_container)) = q_scroll_container.get(scrollbar_entity.0) else {
@@ -280,7 +295,9 @@ fn handle_scrollbar(
         let scrollbar_height_px = scroll_height * container_height;
 
         if scroll_height != 1.0 {
-            style.top = Val::Px(scrollbar.scroll_amount / (items_height - container_height) * (container_height - scrollbar_height_px));
+            let as_px = compute_scroll_px(scrollbar.scroll_amount, items_height, container_height);
+
+            style.top = Val::Px(as_px / (items_height - container_height) * (container_height - scrollbar_height_px));
         } else {
             style.top = Val::Px(0.0);
         }
@@ -316,7 +333,10 @@ pub(super) fn register(app: &mut App) {
         (
             on_add_scrollbar.in_set(ScrollBoxUiSystemSet::AddScrollBoxBundle),
             on_interact_slider.in_set(ScrollBoxUiSystemSet::ScrollBoxInteraction),
-            handle_scrollbar.in_set(ScrollBoxUiSystemSet::UpdateScrollBoxDisplay),
+            (handle_scrollbar, on_change_scrollbar)
+                .chain()
+                .in_set(ScrollBoxUiSystemSet::UpdateScrollBoxDisplay),
         ),
-    );
+    )
+    .register_type::<ScrollBox>();
 }
diff --git a/cosmos_client/src/ui/components/slider.rs b/cosmos_client/src/ui/components/slider.rs
index 774bd9550..801da49f8 100644
--- a/cosmos_client/src/ui/components/slider.rs
+++ b/cosmos_client/src/ui/components/slider.rs
@@ -1,4 +1,4 @@
-//! A UI component that is used to select a number between a range of values using a slider.
+//! A UI comonent that is used to select a number between a range of values using a slider.
 //!
 //! Similar to the HTML `input type="range"`.use std::ops::Range;
 
@@ -7,20 +7,21 @@ use bevy::{
     color::{palettes::css, Color},
     core::Name,
     ecs::{
-        bundle::Bundle,
         change_detection::DetectChanges,
         component::Component,
         entity::Entity,
         query::{Added, With, Without},
         schedule::{IntoSystemConfigs, IntoSystemSetConfigs, SystemSet},
-        system::{Commands, Query, Res},
+        system::{Commands, Query},
         world::Ref,
     },
     hierarchy::BuildChildren,
     log::info,
+    math::{Rect, Vec2},
+    prelude::ChildBuild,
     reflect::Reflect,
     transform::components::GlobalTransform,
-    ui::{node_bundles::NodeBundle, BackgroundColor, Interaction, Node, PositionType, Style, UiRect, UiScale, Val},
+    ui::{BackgroundColor, ComputedNode, Interaction, Node, PositionType, UiRect, Val},
     window::{PrimaryWindow, Window},
 };
 
@@ -29,6 +30,7 @@ use crate::ui::UiSystemSet;
 use super::Disabled;
 
 #[derive(Component, Debug, Reflect)]
+#[require(Node, SliderValue)]
 /// A UI component that is used to select a number between a range of values using a slider.
 ///
 /// Similar to the HTML `input type="range"`.
@@ -100,19 +102,6 @@ impl Default for Slider {
     }
 }
 
-#[derive(Debug, Bundle, Default)]
-/// A UI component that is used to select a number between a range of values using a slider.
-///
-/// Similar to the HTML `input type="range"`.
-pub struct SliderBundle {
-    /// The node bundle that will be used with the TextInput
-    pub node_bundle: NodeBundle,
-    /// The slider component
-    pub slider: Slider,
-    /// The value the slider is set to
-    pub slider_value: SliderValue,
-}
-
 #[derive(Component)]
 struct SliderProgressEntites {
     empty_bar_entity: Entity,
@@ -133,7 +122,7 @@ const BASE_SQUARE_SIZE: f32 = 10.0;
 const X_MARGIN: f32 = BASE_SQUARE_SIZE;
 const Y_MARGIN: f32 = BASE_SQUARE_SIZE / 2.0;
 
-fn on_add_slider(mut commands: Commands, mut q_added_slider: Query<(Entity, &mut Style, &Slider, &SliderValue), Added<Slider>>) {
+fn on_add_slider(mut commands: Commands, mut q_added_slider: Query<(Entity, &mut Node, &Slider, &SliderValue), Added<Slider>>) {
     for (ent, mut style, slider, slider_value) in q_added_slider.iter_mut() {
         style.height = Val::Px(slider.height + BASE_SQUARE_SIZE);
 
@@ -145,9 +134,9 @@ fn on_add_slider(mut commands: Commands, mut q_added_slider: Query<(Entity, &mut
 
         commands.entity(ent).insert(Interaction::default()).with_children(|p| {
             empty_bar_entity = Some(
-                p.spawn(NodeBundle {
-                    background_color: slider.background_color.into(),
-                    style: Style {
+                p.spawn((
+                    BackgroundColor(slider.background_color),
+                    Node {
                         width: Val::Percent(100.0),
                         height: Val::Px(slider.height),
                         margin: UiRect {
@@ -158,8 +147,7 @@ fn on_add_slider(mut commands: Commands, mut q_added_slider: Query<(Entity, &mut
                         },
                         ..Default::default()
                     },
-                    ..Default::default()
-                })
+                ))
                 .with_children(|p| {
                     let percent_selected = slider_percent(slider, slider_value);
 
@@ -168,13 +156,10 @@ fn on_add_slider(mut commands: Commands, mut q_added_slider: Query<(Entity, &mut
                     bar_entity = Some(
                         p.spawn((
                             Name::new("Slider bar"),
-                            NodeBundle {
-                                background_color: slider.foreground_color.into(),
-                                style: Style {
-                                    width: Val::Percent(percent_selected),
-                                    height: Val::Percent(100.0),
-                                    ..Default::default()
-                                },
+                            BackgroundColor(slider.foreground_color),
+                            Node {
+                                width: Val::Percent(percent_selected),
+                                height: Val::Percent(100.0),
                                 ..Default::default()
                             },
                         ))
@@ -184,16 +169,13 @@ fn on_add_slider(mut commands: Commands, mut q_added_slider: Query<(Entity, &mut
                     square_entity = Some(
                         p.spawn((
                             Name::new("Slider square"),
-                            NodeBundle {
-                                background_color: slider.square_color.into(),
-                                style: Style {
-                                    position_type: PositionType::Absolute,
-                                    width: Val::Px(square_size),
-                                    height: Val::Px(square_size),
-                                    left: Val::Px(-BASE_SQUARE_SIZE),
-                                    top: Val::Px(-BASE_SQUARE_SIZE / 2.0),
-                                    ..Default::default()
-                                },
+                            BackgroundColor(slider.square_color),
+                            Node {
+                                position_type: PositionType::Absolute,
+                                width: Val::Px(square_size),
+                                height: Val::Px(square_size),
+                                left: Val::Px(-BASE_SQUARE_SIZE),
+                                top: Val::Px(-BASE_SQUARE_SIZE / 2.0),
                                 ..Default::default()
                             },
                         ))
@@ -213,13 +195,12 @@ fn on_add_slider(mut commands: Commands, mut q_added_slider: Query<(Entity, &mut
 }
 
 fn on_interact_slider(
-    ui_scale: Res<UiScale>,
     mut q_sliders: Query<
         (
             Ref<Interaction>,
             &Slider,
             &mut SliderValue,
-            &Node,
+            &ComputedNode,
             &GlobalTransform,
             &SliderProgressEntites,
         ),
@@ -238,7 +219,10 @@ fn on_interact_slider(
                 continue;
             };
 
-            let mut slider_bounds = node.physical_rect(g_trans, 1.0, ui_scale.0);
+            let t = g_trans.translation();
+            let mut slider_bounds = Rect::from_center_size(Vec2::new(t.x, t.y), node.size());
+
+            // let mut slider_bounds = Rect::node.physical_rect(g_trans, 1.0, ui_scale.0);
             slider_bounds.min.x += X_MARGIN;
             slider_bounds.max.x -= X_MARGIN;
 
@@ -276,10 +260,9 @@ fn on_interact_slider(
 }
 
 fn on_change_value(
-    mut q_style: Query<&mut Style>,
-    ui_scale: Res<UiScale>,
+    mut q_style: Query<&mut Node>,
     // Changed<SliderValue> fails here when SliderValue isn't the default value when the slider is just created.
-    q_slider_value: Query<(&SliderProgressEntites, &SliderValue, &Slider, &Node, &GlobalTransform)>,
+    q_slider_value: Query<(&SliderProgressEntites, &SliderValue, &Slider, &ComputedNode, &GlobalTransform)>,
 ) {
     for (slider_progress_entity, slider_value, slider, node, g_trans) in q_slider_value.iter() {
         let Ok(mut style) = q_style.get_mut(slider_progress_entity.bar_entity) else {
@@ -292,7 +275,8 @@ fn on_change_value(
             continue;
         };
 
-        let slider_bounds = node.physical_rect(g_trans, 1.0, ui_scale.0);
+        let t = g_trans.translation();
+        let slider_bounds = Rect::from_center_size(Vec2::new(t.x, t.y), node.size());
         let slider_actual_width = slider_bounds.size().x - X_MARGIN * 2.0;
 
         style.left = Val::Px(slider_actual_width * slider_percent(slider, slider_value) - BASE_SQUARE_SIZE);
diff --git a/cosmos_client/src/ui/components/text_input.rs b/cosmos_client/src/ui/components/text_input.rs
index 623b2a475..af4cdea6d 100644
--- a/cosmos_client/src/ui/components/text_input.rs
+++ b/cosmos_client/src/ui/components/text_input.rs
@@ -6,11 +6,9 @@ use arboard::Clipboard;
 use bevy::{
     a11y::Focus,
     app::{App, Update},
-    asset::{AssetId, AssetServer, Handle},
-    color::{palettes::css, Color},
+    color::Color,
     core::Name,
     ecs::{
-        bundle::Bundle,
         component::Component,
         entity::Entity,
         event::EventReader,
@@ -25,13 +23,10 @@ use bevy::{
         ButtonInput, ButtonState,
     },
     log::{info, warn},
-    prelude::Deref,
-    text::{Text, TextSection, TextStyle},
+    prelude::{ChildBuild, Deref, Text, TextUiWriter},
+    text::{LineBreak, TextColor, TextFont, TextLayout, TextSpan},
     time::Time,
-    ui::{
-        node_bundles::{NodeBundle, TextBundle},
-        AlignSelf, FocusPolicy, Interaction, Style,
-    },
+    ui::{AlignSelf, FocusPolicy, Interaction, Node},
 };
 
 use crate::ui::UiSystemSet;
@@ -97,6 +92,7 @@ pub enum InputType {
 }
 
 #[derive(Component, Debug)]
+#[require(InputValue, Node, TextFont, TextColor)]
 /// A text box the user can type in
 pub struct TextInput {
     /// Handles input validation to ensure the data stored in [`InputValue`] is correct.
@@ -105,8 +101,6 @@ pub struct TextInput {
     pub cursor_pos: usize,
     /// Where the highlighting should begin (an index). This can be before or after the cursor.
     pub highlight_begin: Option<usize>,
-    /// The style of the text
-    pub style: TextStyle,
 }
 
 impl TextInput {
@@ -126,26 +120,10 @@ impl Default for TextInput {
             cursor_pos: 0,
             highlight_begin: None,
             input_type: InputType::Text { max_length: None },
-            style: TextStyle {
-                color: css::WHITE.into(),
-                font_size: 12.0,
-                font: Default::default(), // font assigned later
-            },
         }
     }
 }
 
-#[derive(Bundle, Debug, Default)]
-/// An easy way of creating the [`TextInput`] UI element.
-pub struct TextInputBundle {
-    /// The node bundle that will be used with the TextInput
-    pub node_bundle: NodeBundle,
-    /// The [`TextInput`] used to capture user input
-    pub text_input: TextInput,
-    /// The component you can read to get what the user types
-    pub value: InputValue,
-}
-
 fn monitor_clicked(
     mut focused: ResMut<Focus>,
     mut focused_time: ResMut<CursorFlashTime>,
@@ -173,46 +151,39 @@ struct TextEnt(Entity);
 
 fn added_text_input_bundle(
     mut commands: Commands,
-    asset_server: Res<AssetServer>,
-    mut q_added: Query<(Entity, &InputValue, &mut TextInput), Added<TextInput>>,
+    q_added: Query<(Entity, &InputValue, &TextFont, &TextColor), Added<TextInput>>,
     focused: Res<Focus>,
 ) {
-    for (entity, input_value, mut text_input) in q_added.iter_mut() {
+    for (entity, input_value, t_font, t_col) in q_added.iter() {
         commands.entity(entity).insert(Interaction::None).insert(FocusPolicy::Block);
 
-        if let Handle::Weak(id) = text_input.style.font {
-            if id == AssetId::default() {
-                // Font hasn't been assigned yet if it's the default handle, so assign the default now.
-                text_input.style.font = asset_server.load("fonts/PixeloidSans.ttf");
-            }
-        }
-
         let mut text_ent = None;
 
-        let mut cursor_style = text_input.style.clone();
-
+        let mut cursor_style = *t_col;
         if focused.0 != Some(entity) {
-            cursor_style.color = Color::NONE;
+            cursor_style.0 = Color::NONE;
         }
 
         commands.entity(entity).with_children(|p| {
             text_ent = Some(
                 p.spawn((
                     Name::new("Text input text display"),
-                    TextBundle {
-                        text: Text::from_sections([
-                            TextSection::new(input_value.0.clone(), text_input.style.clone()),
-                            TextSection::new("|", cursor_style),
-                            TextSection::new("", text_input.style.clone()),
-                        ])
-                        .with_no_wrap(),
-                        style: Style {
-                            align_self: AlignSelf::Center,
-                            ..Default::default()
-                        },
+                    Text::new(input_value.0.clone()),
+                    TextLayout {
+                        linebreak: LineBreak::NoWrap,
+                        ..Default::default()
+                    },
+                    t_font.clone(),
+                    *t_col,
+                    Node {
+                        align_self: AlignSelf::Center,
                         ..Default::default()
                     },
                 ))
+                .with_children(|p| {
+                    p.spawn((TextSpan::new("|"), t_font.clone(), cursor_style));
+                    p.spawn((TextSpan::new(""), t_font.clone(), *t_col));
+                })
                 .id(),
             );
         });
@@ -245,7 +216,14 @@ fn send_key_inputs(
         }
 
         if !inputs.pressed(KeyCode::ControlLeft) && !inputs.pressed(KeyCode::ControlRight) {
-            if let Key::Character(smol_str) = &pressed.logical_key {
+            let smol_str = match &pressed.logical_key {
+                Key::Character(smol_str) => Some(String::from(smol_str.clone())),
+                Key::Space => Some(" ".to_owned()),
+                Key::Tab => Some("\t".to_owned()),
+                _ => None,
+            };
+
+            if let Some(smol_str) = smol_str {
                 let mut new_value = text.0.clone();
                 let new_cursor_pos;
 
@@ -253,7 +231,7 @@ fn send_key_inputs(
                     let replace_string = smol_str;
                     new_cursor_pos = range.start + replace_string.len();
 
-                    text.0.replace_range(range, replace_string);
+                    text.0.replace_range(range, &replace_string);
                 } else if focused_input_field.cursor_pos == text.len() {
                     new_value.push_str(smol_str.as_str());
 
@@ -307,16 +285,13 @@ fn send_key_inputs(
     }
 }
 
-fn show_text_cursor(focused: Res<Focus>, mut q_text_inputs: Query<(Entity, &TextEnt, &TextInput)>, mut q_text: Query<&mut Text>) {
-    for (ent, text, text_input) in q_text_inputs.iter_mut() {
-        let Ok(mut text) = q_text.get_mut(text.0) else {
-            continue;
-        };
-
+fn show_text_cursor(mut writer: TextUiWriter, focused: Res<Focus>, q_text_inputs: Query<(Entity, &TextEnt)>) {
+    for (ent, text) in q_text_inputs.iter() {
         if focused.0.map(|x| x == ent).unwrap_or(false) {
-            text.sections[1].style.color = text_input.style.color;
+            let col = writer.color(text.0, 0).0;
+            writer.color(text.0, 1).0 = col;
         } else {
-            text.sections[1].style.color = Color::NONE;
+            writer.color(text.0, 1).0 = Color::NONE;
         }
     }
 }
@@ -324,9 +299,9 @@ fn show_text_cursor(focused: Res<Focus>, mut q_text_inputs: Query<(Entity, &Text
 fn flash_cursor(
     mut cursor_flash_time: ResMut<CursorFlashTime>,
     focused: Res<Focus>,
-    mut q_text: Query<&mut Text>,
-    q_text_inputs: Query<(&TextEnt, &TextInput)>,
+    q_text_inputs: Query<&TextEnt>,
     time: Res<Time>,
+    mut writer: TextUiWriter,
 ) {
     const CURSOR_FLASH_SPEED: f32 = 1.0; // # flashes per second
 
@@ -334,36 +309,32 @@ fn flash_cursor(
         return;
     };
 
-    let Ok((text, text_input)) = q_text_inputs.get(focused_ent) else {
+    let Ok(text) = q_text_inputs.get(focused_ent) else {
         return;
     };
 
-    let Ok(mut text) = q_text.get_mut(text.0) else {
-        return;
-    };
+    let col = writer.color(text.0, 0).0;
 
+    let empty = writer.text(text.0, 1).is_empty();
+    let mut c = writer.color(text.0, 1);
     if (cursor_flash_time.0 * CURSOR_FLASH_SPEED * 2.0) as i64 % 2 == 0 {
-        if text.sections[1].style.color != text_input.style.color {
-            text.sections[1].style.color = text_input.style.color;
+        if c.as_ref().0 != col {
+            c.as_mut().0 = col;
         }
-    } else if !text.sections[1].value.is_empty() && text.sections[1].style.color != Color::NONE {
-        text.sections[1].style.color = Color::NONE;
+    } else if !empty && c.as_ref().0 != Color::NONE {
+        c.as_mut().0 = Color::NONE;
     }
 
-    cursor_flash_time.0 += time.delta_seconds();
+    cursor_flash_time.0 += time.delta_secs();
 }
 
 fn value_changed(
     focused: Res<Focus>,
     mut q_values_changed: Query<(Entity, &InputValue, &mut TextInput, &TextEnt), Or<(Changed<InputValue>, Changed<TextInput>)>>,
-    mut q_text: Query<&mut Text>,
     mut cursor_flash_time: ResMut<CursorFlashTime>,
+    mut writer: TextUiWriter,
 ) {
     for (entity, input_val, mut text_input, text) in q_values_changed.iter_mut() {
-        let Ok(mut text) = q_text.get_mut(text.0) else {
-            continue;
-        };
-
         if focused.0.map(|x| x == entity).unwrap_or(false) {
             cursor_flash_time.0 = 0.0;
         }
@@ -373,11 +344,11 @@ fn value_changed(
             text_input.cursor_pos = input_val.len();
         }
 
-        input_val[0..text_input.cursor_pos].clone_into(&mut text.sections[0].value);
+        input_val[0..text_input.cursor_pos].clone_into(writer.text(text.0, 0).as_mut());
         if text_input.cursor_pos < input_val.len() {
-            input_val[text_input.cursor_pos..input_val.len()].clone_into(&mut text.sections[2].value);
+            input_val[text_input.cursor_pos..input_val.len()].clone_into(writer.text(text.0, 2).as_mut());
         } else {
-            text.sections[2].value = "".into();
+            *writer.text(text.0, 2).as_mut() = "".into();
         }
     }
 }
diff --git a/cosmos_client/src/ui/components/window.rs b/cosmos_client/src/ui/components/window.rs
index 6ba68e003..9904163c8 100644
--- a/cosmos_client/src/ui/components/window.rs
+++ b/cosmos_client/src/ui/components/window.rs
@@ -6,7 +6,6 @@ use bevy::{
     color::palettes::css,
     core::Name,
     ecs::{
-        bundle::Bundle,
         component::Component,
         entity::Entity,
         event::{Event, EventReader},
@@ -15,12 +14,11 @@ use bevy::{
         system::{Commands, Query, Res},
     },
     hierarchy::{BuildChildren, Children},
-    text::{JustifyText, Text, TextStyle},
+    math::{Rect, Vec2},
+    prelude::{ChildBuild, ImageNode, Text},
+    text::{JustifyText, TextFont, TextLayout},
     transform::components::GlobalTransform,
-    ui::{
-        node_bundles::{NodeBundle, TextBundle},
-        AlignItems, Display, FlexDirection, Interaction, JustifyContent, Node, PositionType, Style, UiImage, UiRect, Val,
-    },
+    ui::{AlignItems, BackgroundColor, ComputedNode, Display, FlexDirection, Interaction, JustifyContent, Node, PositionType, UiRect, Val},
     utils::default,
     window::{PrimaryWindow, Window},
 };
@@ -29,17 +27,18 @@ use cosmos_core::ecs::NeedsDespawned;
 use crate::{ui::UiSystemSet, window::setup::DeltaCursorPosition};
 
 use super::{
-    button::{register_button, Button, ButtonBundle, ButtonEvent},
+    button::{register_button, Button, ButtonEvent},
     show_cursor::ShowCursor,
 };
 
 #[derive(Debug, Component, Default)]
+#[require(Node, ShowCursor)]
 /// A wrapper around ui components that will make them movable and have a title bar with a close button.
 pub struct GuiWindow {
     /// The title that should be displayed
     pub title: String,
     /// Styles that effect the wrapper around the children of the window node
-    pub body_styles: Style,
+    pub body_styles: Node,
 }
 
 impl GuiWindow {
@@ -47,19 +46,6 @@ impl GuiWindow {
     pub const TITLE_BAR_HEIGHT_PX: f32 = 60.0;
 }
 
-#[derive(Bundle, Debug, Default)]
-/// A wrapper around ui components that will make them movable and have a title bar with a close button.
-pub struct WindowBundle {
-    /// A wrapper around ui components that will make them movable and have a title bar with a close button.
-    pub window: GuiWindow,
-    /// NodeBundle for further customization. This will be the NodeBundle of the entire window.
-    ///
-    /// To only style the body of the window, change the body_styles in the GuiWindow object.
-    pub node_bundle: NodeBundle,
-    /// Makes the cursor show itself
-    pub show_cursor: ShowCursor,
-}
-
 #[derive(Event, Debug)]
 struct CloseUiEvent(Entity);
 
@@ -81,7 +67,7 @@ struct TitleBar {
 
 fn add_window(
     mut commands: Commands,
-    mut q_added_window: Query<(Entity, &GuiWindow, Option<&Children>, &mut Style), Added<GuiWindow>>,
+    mut q_added_window: Query<(Entity, &GuiWindow, Option<&Children>, &mut Node), Added<GuiWindow>>,
     asset_server: Res<AssetServer>,
 ) {
     for (ent, window, children, mut style) in &mut q_added_window {
@@ -100,72 +86,56 @@ fn add_window(
                     Name::new("Title Bar"),
                     TitleBar { window_entity: ent },
                     Interaction::None,
-                    NodeBundle {
-                        style: Style {
-                            display: Display::Flex,
-                            flex_direction: FlexDirection::Row,
-                            justify_content: JustifyContent::SpaceBetween,
-                            align_items: AlignItems::Center,
-                            width: Val::Percent(100.0),
-                            height: Val::Px(60.0),
-                            padding: UiRect::new(Val::Px(20.0), Val::Px(20.0), Val::Px(0.0), Val::Px(0.0)),
+                    Node {
+                        display: Display::Flex,
+                        flex_direction: FlexDirection::Row,
+                        justify_content: JustifyContent::SpaceBetween,
+                        align_items: AlignItems::Center,
+                        width: Val::Percent(100.0),
+                        height: Val::Px(60.0),
+                        padding: UiRect::new(Val::Px(20.0), Val::Px(20.0), Val::Px(0.0), Val::Px(0.0)),
 
-                            ..default()
-                        },
-                        background_color: css::WHITE.into(),
                         ..default()
                     },
-                    UiImage {
-                        texture: asset_server.load("cosmos/images/ui/inventory-header.png"),
-                        ..Default::default()
-                    },
+                    BackgroundColor(css::WHITE.into()),
+                    ImageNode::new(asset_server.load("cosmos/images/ui/inventory-header.png")),
                 ))
                 .with_children(|parent| {
                     parent.spawn((
                         Name::new("Title Text"),
-                        TextBundle {
-                            style: Style { ..default() },
-                            text: Text::from_section(
-                                &window.title,
-                                TextStyle {
-                                    color: css::WHITE.into(),
-                                    font_size: 24.0,
-                                    font: font.clone(),
-                                },
-                            )
-                            .with_justify(JustifyText::Center),
-                            ..default()
+                        Text::new(&window.title),
+                        TextFont {
+                            font_size: 24.0,
+                            font: font.clone(),
+                            ..Default::default()
+                        },
+                        TextLayout {
+                            justify: JustifyText::Center,
+                            ..Default::default()
                         },
                     ));
 
                     parent.spawn((
                         Name::new("Window Close Button"),
                         close_button,
-                        ButtonBundle {
-                            node_bundle: NodeBundle {
-                                background_color: css::WHITE.into(),
-                                style: Style {
-                                    width: Val::Px(50.0),
-                                    height: Val::Px(50.0),
+                        BackgroundColor(css::WHITE.into()),
+                        Node {
+                            width: Val::Px(50.0),
+                            height: Val::Px(50.0),
+                            ..Default::default()
+                        },
+                        Button::<CloseUiEvent> {
+                            image: Some(ImageNode::new(asset_server.load("cosmos/images/ui/inventory-close-button.png"))),
+                            text: Some((
+                                "X".into(),
+                                TextFont {
+                                    font_size: 24.0,
+                                    font: font.clone(),
                                     ..Default::default()
                                 },
-                                ..Default::default()
-                            },
-                            button: Button::<CloseUiEvent> {
-                                image: Some(UiImage {
-                                    texture: asset_server.load("cosmos/images/ui/inventory-close-button.png"),
-                                    ..Default::default()
-                                }),
-                                text: Some((
-                                    "X".into(),
-                                    TextStyle {
-                                        color: css::WHITE.into(),
-                                        font_size: 24.0,
-                                        font: font.clone(),
-                                    },
-                                )),
-                                ..Default::default()
-                            },
+                                Default::default(),
+                            )),
+                            ..Default::default()
                         },
                     ));
                 });
@@ -174,12 +144,9 @@ fn add_window(
                 parent
                     .spawn((
                         Name::new("Window Body"),
-                        NodeBundle {
-                            style: Style {
-                                flex_grow: 1.0,
-                                ..window.body_styles.clone()
-                            },
-                            ..Default::default()
+                        Node {
+                            flex_grow: 1.0,
+                            ..window.body_styles.clone()
                         },
                     ))
                     .id(),
@@ -198,7 +165,7 @@ fn add_window(
 fn move_window(
     q_window: Query<&Window, With<PrimaryWindow>>,
     cursor_delta_position: Res<DeltaCursorPosition>,
-    mut q_style: Query<(&Node, &GlobalTransform, &mut Style)>,
+    mut q_style: Query<(&ComputedNode, &GlobalTransform, &mut Node)>,
     q_title_bar: Query<(&Interaction, &TitleBar)>,
 ) {
     for (interaction, title_bar) in &q_title_bar {
@@ -211,7 +178,9 @@ fn move_window(
                 continue;
             };
 
-            let bounds = node.logical_rect(g_trans);
+            let t = g_trans.translation();
+            let bounds = Rect::from_center_size(Vec2::new(t.x, t.y), node.size());
+            // let bounds = node.logical_rect(g_trans);
 
             let left = match style.left {
                 Val::Px(px) => px,
diff --git a/cosmos_client/src/ui/crosshair.rs b/cosmos_client/src/ui/crosshair.rs
index d1ce03187..bee43a064 100644
--- a/cosmos_client/src/ui/crosshair.rs
+++ b/cosmos_client/src/ui/crosshair.rs
@@ -8,26 +8,22 @@ use crate::window::setup::CursorFlagsSet;
 fn add_crosshair(mut commands: Commands, asset_server: Res<AssetServer>) {
     commands
         .spawn((
-            NodeBundle {
-                style: Style {
-                    position_type: PositionType::Absolute,
-                    display: Display::Flex,
-                    justify_content: JustifyContent::Center,
-                    align_items: AlignItems::Center,
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    ..default()
-                },
-                // color: Color::NONE.into(),
+            Node {
+                position_type: PositionType::Absolute,
+                display: Display::Flex,
+                justify_content: JustifyContent::Center,
+                align_items: AlignItems::Center,
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
                 ..default()
             },
             Name::new("Crosshair"),
         ))
         .with_children(|parent| {
             parent
-                .spawn(ImageBundle {
-                    image: asset_server.load("cosmos/images/ui/crosshair.png").into(),
-                    style: Style {
+                .spawn((
+                    ImageNode::new(asset_server.load("cosmos/images/ui/crosshair.png")),
+                    Node {
                         width: Val::Px(8.0),
                         height: Val::Px(8.0),
                         left: Val::Px(0.0),
@@ -36,10 +32,7 @@ fn add_crosshair(mut commands: Commands, asset_server: Res<AssetServer>) {
                         bottom: Val::Px(0.0),
                         ..default()
                     },
-
-                    // color: Color::NONE.into(),
-                    ..default()
-                })
+                ))
                 .insert(Crosshair);
         });
 }
@@ -48,7 +41,7 @@ fn add_crosshair(mut commands: Commands, asset_server: Res<AssetServer>) {
 /// This is used for the UI element for the crosshair as an identifier
 pub struct Crosshair;
 
-fn update_cursor_pos(pos: Res<CrosshairOffset>, mut query: Query<&mut Style, With<Crosshair>>) {
+fn update_cursor_pos(pos: Res<CrosshairOffset>, mut query: Query<&mut Node, With<Crosshair>>) {
     if let Ok(mut crosshair) = query.get_single_mut() {
         crosshair.left = Val::Px(pos.x);
         // bottom doesn't seem to work, so -pos.y is used.
diff --git a/cosmos_client/src/ui/debug_info_display.rs b/cosmos_client/src/ui/debug_info_display.rs
index f9e5df653..794891270 100644
--- a/cosmos_client/src/ui/debug_info_display.rs
+++ b/cosmos_client/src/ui/debug_info_display.rs
@@ -12,7 +12,7 @@ use cosmos_core::{
 
 use crate::{interactions::block_interactions::LookingAt, lang::Lang};
 
-use super::UiRoot;
+use super::{font::DefaultFont, UiRoot};
 
 #[derive(Component, Debug, Default)]
 struct FPSCounter {
@@ -29,89 +29,81 @@ struct CoordsCounter;
 #[derive(Component)]
 struct ActualCoordsCounter;
 
-fn add_text(mut commands: Commands, q_target_camera: Query<Entity, With<UiRoot>>, asset_server: Res<AssetServer>) {
-    let text_style = TextStyle {
-        color: Color::WHITE,
-        font_size: 32.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
-    };
-
+fn add_text(mut commands: Commands, default_font: Res<DefaultFont>, q_target_camera: Query<Entity, With<UiRoot>>) {
     let text_gap = 35.0;
 
     let target_cam = TargetCamera(q_target_camera.single());
 
+    let font = TextFont {
+        font: default_font.0.clone(),
+        font_size: 32.0,
+        ..Default::default()
+    };
+
     commands.spawn((
         target_cam.clone(),
-        TextBundle {
-            style: Style {
-                bottom: Val::Px(5.0),
-                left: Val::Px(5.0),
-                position_type: PositionType::Absolute,
-                ..default()
-            },
-            text: Text::from_section("(x, y, z) (x, y, z)", text_style.clone()),
-            ..default()
+        Node {
+            bottom: Val::Px(5.0),
+            left: Val::Px(5.0),
+            position_type: PositionType::Absolute,
+            ..Default::default()
         },
+        Text::new("(x, y, z) (x, y, z)"),
+        font.clone(),
         CoordsCounter,
     ));
 
     commands.spawn((
         target_cam.clone(),
-        TextBundle {
-            style: Style {
-                bottom: Val::Px(5.0 + text_gap),
-                left: Val::Px(5.0),
-                position_type: PositionType::Absolute,
+        Node {
+            bottom: Val::Px(5.0 + text_gap),
+            left: Val::Px(5.0),
+            position_type: PositionType::Absolute,
 
-                ..default()
-            },
-            text: Text::from_section("(x, y, z)", text_style.clone()),
             ..default()
         },
+        Text::new("(x, y, z)"),
+        font.clone(),
         ActualCoordsCounter,
     ));
 
     commands.spawn((
         target_cam.clone(),
-        TextBundle {
-            style: Style {
-                bottom: Val::Px(5.0 + text_gap * 2.0),
-                left: Val::Px(5.0),
-                position_type: PositionType::Absolute,
+        Node {
+            bottom: Val::Px(5.0 + text_gap * 2.0),
+            left: Val::Px(5.0),
+            position_type: PositionType::Absolute,
 
-                ..default()
-            },
-            text: Text::from_section("FPS: ", text_style.clone()),
             ..default()
         },
+        Text::new("FPS: "),
+        font.clone(),
         FPSCounter::default(),
     ));
 
-    commands.spawn((
-        target_cam,
-        TextBundle {
-            style: Style {
+    commands
+        .spawn((
+            target_cam,
+            Node {
                 bottom: Val::Px(5.0 + text_gap * 3.0),
                 left: Val::Px(5.0),
                 position_type: PositionType::Absolute,
 
                 ..default()
             },
-            text: Text::from_sections(vec![
-                TextSection::new("Looking At: ", text_style.clone()),
-                TextSection::new("Nothing", text_style.clone()),
-            ]),
-            ..default()
-        },
-        LookingAtText,
-    ));
+            Text::new("Looking At: "),
+            font.clone(),
+        ))
+        .with_children(|p| {
+            p.spawn((LookingAtText, TextSpan::new("Nothing"), font.clone()));
+        });
 }
 
 fn update_looking_at_text(
     q_looking_at: Query<&LookingAt>,
     q_structure: Query<&Structure>,
     blocks: Res<Registry<Block>>,
-    mut q_looking_at_text: Query<&mut Text, With<LookingAtText>>,
+    mut q_looking_at_text: Query<&mut TextSpan, With<LookingAtText>>,
     lang: Res<Lang<Block>>,
 ) {
     let Ok(mut text) = q_looking_at_text.get_single_mut() else {
@@ -123,21 +115,21 @@ fn update_looking_at_text(
     };
 
     if let Some(looking_at) = looking_at.looking_at_any {
-        let Ok(structure) = q_structure.get(looking_at.structure_entity) else {
+        let Ok(structure) = q_structure.get(looking_at.block.structure()) else {
             return;
         };
 
         let block = structure.block_at(looking_at.block.coords(), &blocks);
         let block_rotation = structure.block_rotation(looking_at.block.coords());
 
-        text.sections[1].value = format!(
+        text.as_mut().0 = format!(
             "{}: {:?}, {:?}",
             lang.get_name(block).unwrap_or(block.unlocalized_name()),
             block_rotation.face_pointing_pos_y,
             block_rotation.sub_rotation
         );
     } else {
-        text.sections[1].value = "Nothing".into();
+        text.as_mut().0 = "Nothing".into();
     }
 }
 
@@ -148,23 +140,23 @@ fn update_coords(
 ) {
     if let Ok(loc) = query.get_single() {
         for mut txt_coords in txt_coords.iter_mut() {
-            txt_coords.sections[0].value = format!("({}), ({:.1}, {:.1}, {:.1})", loc.sector(), loc.local.x, loc.local.y, loc.local.z);
+            txt_coords.as_mut().0 = format!("({}), ({:.1}, {:.1}, {:.1})", loc.sector(), loc.local.x, loc.local.y, loc.local.z);
         }
 
         for mut txt_coords_actual in txt_coords_actual.iter_mut() {
             let absolute_coords = loc.absolute_coords();
-            txt_coords_actual.sections[0].value = format!("({:.1}, {:.1}, {:.1})", absolute_coords.x, absolute_coords.y, absolute_coords.z);
+            txt_coords_actual.as_mut().0 = format!("({:.1}, {:.1}, {:.1})", absolute_coords.x, absolute_coords.y, absolute_coords.z);
         }
     }
 }
 
 fn update_fps(mut query: Query<(&mut Text, &mut FPSCounter)>, time: Res<Time>) {
     for (mut text, mut fps) in query.iter_mut() {
-        fps.delta_time += time.delta_seconds();
+        fps.delta_time += time.delta_secs();
 
         fps.count += 1;
         if fps.delta_time >= 1.0 {
-            text.sections[0].value = format!("FPS: {}", fps.count);
+            text.as_mut().0 = format!("FPS: {}", fps.count);
             fps.count = 0;
             fps.delta_time = 0.0;
         }
diff --git a/cosmos_client/src/ui/font.rs b/cosmos_client/src/ui/font.rs
new file mode 100644
index 000000000..a8c0da471
--- /dev/null
+++ b/cosmos_client/src/ui/font.rs
@@ -0,0 +1,20 @@
+//! Contains fonts used by the game
+
+use bevy::{
+    app::Startup,
+    asset::{AssetServer, Handle},
+    prelude::{App, Commands, Res, Resource},
+    text::Font,
+};
+
+#[derive(Resource)]
+/// The default font used for most things
+pub struct DefaultFont(pub Handle<Font>);
+
+fn init_default_font(mut commands: Commands, asset_server: Res<AssetServer>) {
+    commands.insert_resource(DefaultFont(asset_server.load("fonts/PixeloidSans.ttf")));
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(Startup, init_default_font);
+}
diff --git a/cosmos_client/src/ui/hotbar.rs b/cosmos_client/src/ui/hotbar.rs
index 96522abd4..46a330c3c 100644
--- a/cosmos_client/src/ui/hotbar.rs
+++ b/cosmos_client/src/ui/hotbar.rs
@@ -20,6 +20,7 @@ use crate::{
 
 use super::{
     components::show_cursor::no_open_menus,
+    font::DefaultFont,
     item_renderer::{create_ui_cameras, RenderItem},
     UiMiddleRoot,
 };
@@ -239,15 +240,15 @@ fn listen_button_presses(
     }
 }
 
-fn tick_text_alpha_down(mut query: Query<&mut Text, With<ItemNameDisplay>>, time: Res<Time>) {
+fn tick_text_alpha_down(mut query: Query<&mut TextColor, With<ItemNameDisplay>>, time: Res<Time>) {
     if let Ok(mut text) = query.get_single_mut() {
-        let col: Srgba = text.sections[0].style.color.into();
+        let col: Srgba = text.as_ref().0.into();
 
-        text.sections[0].style.color = Srgba {
+        text.as_mut().0 = Srgba {
             red: col.red,
             green: col.green,
             blue: col.blue,
-            alpha: (col.alpha - time.delta_seconds() / ITEM_NAME_FADE_DURATION_SEC).max(0.0),
+            alpha: (col.alpha - time.delta_secs() / ITEM_NAME_FADE_DURATION_SEC).max(0.0),
         }
         .into();
     }
@@ -258,7 +259,7 @@ fn listen_for_change_events(
     query_inventory: Query<&HotbarContents, (Changed<HotbarContents>, With<LocalPlayerHotbar>)>,
     inventory_unchanged: Query<&HotbarContents, With<LocalPlayerHotbar>>,
     asset_server: Res<AssetServer>,
-    mut text_query: Query<&mut Text>,
+    mut text_query: Query<(&mut Text, &mut TextColor)>,
     item_name_query: Query<Entity, With<ItemNameDisplay>>,
     mut commands: Commands,
     names: Res<Lang<Item>>,
@@ -271,26 +272,26 @@ fn listen_for_change_events(
     if hb.selected_slot != hb.prev_slot {
         commands
             .entity(hb.slots[hb.prev_slot].0)
-            .insert(UiImage::new(asset_server.load(image_path(false))));
+            .insert(ImageNode::new(asset_server.load(image_path(false))));
 
         commands
             .entity(hb.slots[hb.selected_slot].0)
-            .insert(UiImage::new(asset_server.load(image_path(true))));
+            .insert(ImageNode::new(asset_server.load(image_path(true))));
 
         hb.prev_slot = hb.selected_slot;
 
         if let Ok(inv) = inventory_unchanged.get_single() {
             if let Ok(ent) = item_name_query.get_single() {
-                if let Ok(mut name_text) = text_query.get_mut(ent) {
+                if let Ok((mut name_text, mut name_color)) = text_query.get_mut(ent) {
                     if let Some(is) = inv.itemstack_at(hb.selected_slot()) {
                         names
                             .get_name_from_numeric_id(is.item_id())
                             .unwrap_or(items.from_numeric_id(is.item_id()).unlocalized_name())
-                            .clone_into(&mut name_text.sections[0].value);
+                            .clone_into(&mut name_text.as_mut().0);
 
-                        name_text.sections[0].style.color = Color::WHITE;
+                        name_color.as_mut().0 = Color::WHITE;
                     } else {
-                        "".clone_into(&mut name_text.sections[0].value);
+                        "".clone_into(&mut name_text.as_mut().0);
                     }
                 }
             }
@@ -301,61 +302,60 @@ fn listen_for_change_events(
         for hb_slot in 0..hb.max_slots {
             let is = hotbar_contents.itemstack_at(hb_slot);
 
-            if let Ok(mut text) = text_query.get_mut(hb.slots[hb_slot].1) {
+            if let Ok((mut text, _)) = text_query.get_mut(hb.slots[hb_slot].1) {
                 if let Some(is) = is {
                     if is.quantity() != 1 {
-                        text.sections[0].value = format!("{}", is.quantity());
+                        text.as_mut().0 = format!("{}", is.quantity());
                     } else {
-                        text.sections[0].value = "".into();
+                        text.as_mut().0 = "".into();
                     }
                 } else {
-                    text.sections[0].value = "".into();
+                    text.as_mut().0 = "".into();
                 }
             }
         }
     }
 }
 
-fn add_item_text(mut commands: Commands, q_target_camera: Query<Entity, With<UiMiddleRoot>>, asset_server: Res<AssetServer>) {
+fn add_item_text(mut commands: Commands, q_target_camera: Query<Entity, With<UiMiddleRoot>>, default_font: Res<DefaultFont>) {
     let target_cam = q_target_camera.single();
 
+    let text_font = TextFont {
+        font_size: 24.0,
+        font: default_font.0.clone(),
+        ..Default::default()
+    };
+
     commands
         .spawn((
             Name::new("Item hotbar text"),
             TargetCamera(target_cam),
-            NodeBundle {
-                style: Style {
-                    position_type: PositionType::Absolute,
-                    display: Display::Flex,
-                    justify_content: JustifyContent::Center,
-                    align_items: AlignItems::FlexEnd,
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    ..default()
-                },
+            Node {
+                position_type: PositionType::Absolute,
+                display: Display::Flex,
+                justify_content: JustifyContent::Center,
+                align_items: AlignItems::FlexEnd,
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
                 ..default()
             },
         ))
         .with_children(|parent| {
             parent
-                .spawn(TextBundle {
-                    style: Style {
+                .spawn((
+                    Node {
                         bottom: Val::Px(75.0),
                         position_type: PositionType::Absolute,
 
                         ..default()
                     },
-                    text: Text::from_section(
-                        "",
-                        TextStyle {
-                            color: Color::WHITE,
-                            font_size: 24.0,
-                            font: asset_server.load("fonts/PixeloidSans.ttf"),
-                        },
-                    )
-                    .with_justify(JustifyText::Center),
-                    ..default()
-                })
+                    Text::new(""),
+                    text_font,
+                    TextLayout {
+                        justify: JustifyText::Center,
+                        ..Default::default()
+                    },
+                ))
                 .insert(ItemNameDisplay);
         });
 }
@@ -398,22 +398,24 @@ fn populate_hotbar(
     }
 }
 
-fn add_hotbar(mut commands: Commands, q_target_camera: Query<Entity, With<UiMiddleRoot>>, asset_server: Res<AssetServer>) {
+fn add_hotbar(
+    mut commands: Commands,
+    q_target_camera: Query<Entity, With<UiMiddleRoot>>,
+    default_font: Res<DefaultFont>,
+    asset_server: Res<AssetServer>,
+) {
     let target_cam = q_target_camera.single();
 
     commands
         .spawn((
             TargetCamera(target_cam),
-            NodeBundle {
-                style: Style {
-                    position_type: PositionType::Absolute,
-                    display: Display::Flex,
-                    justify_content: JustifyContent::Center,
-                    align_items: AlignItems::FlexEnd,
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    ..default()
-                },
+            Node {
+                position_type: PositionType::Absolute,
+                display: Display::Flex,
+                justify_content: JustifyContent::Center,
+                align_items: AlignItems::FlexEnd,
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
                 ..default()
             },
             Name::new("Hotbar Container"),
@@ -422,13 +424,10 @@ fn add_hotbar(mut commands: Commands, q_target_camera: Query<Entity, With<UiMidd
             let mut hotbar = Hotbar::default();
 
             let mut slots = parent.spawn((
-                NodeBundle {
-                    style: Style {
-                        flex_direction: FlexDirection::Row,
-                        flex_grow: 1.0,
-                        justify_content: JustifyContent::Center,
-                        ..default()
-                    },
+                Node {
+                    flex_direction: FlexDirection::Row,
+                    flex_grow: 1.0,
+                    justify_content: JustifyContent::Center,
                     ..default()
                 },
                 LocalPlayerHotbar,
@@ -439,39 +438,38 @@ fn add_hotbar(mut commands: Commands, q_target_camera: Query<Entity, With<UiMidd
                 for slot_num in 0..hotbar.max_slots {
                     let path = image_path(hotbar.selected_slot == slot_num);
 
-                    let mut slot = parent.spawn(ImageBundle {
-                        image: asset_server.load(path).into(),
-                        style: Style {
+                    let mut slot = parent.spawn((
+                        ImageNode::new(asset_server.load(path)),
+                        Node {
                             width: Val::Px(64.0),
                             height: Val::Px(64.0),
                             ..default()
                         },
-                        ..default()
-                    });
+                    ));
 
                     let mut text_entity = None;
 
                     slot.with_children(|slot| {
                         text_entity = Some(
-                            slot.spawn(TextBundle {
-                                style: Style {
+                            slot.spawn((
+                                Node {
                                     bottom: Val::Px(5.0),
                                     right: Val::Px(5.0),
                                     position_type: PositionType::Absolute,
 
                                     ..default()
                                 },
-                                text: Text::from_section(
-                                    "",
-                                    TextStyle {
-                                        color: Color::WHITE,
-                                        font_size: 24.0,
-                                        font: asset_server.load("fonts/PixeloidSans.ttf"),
-                                    },
-                                )
-                                .with_justify(JustifyText::Right),
-                                ..default()
-                            })
+                                Text::new(""),
+                                TextFont {
+                                    font_size: 24.0,
+                                    font: default_font.0.clone(),
+                                    ..Default::default()
+                                },
+                                TextLayout {
+                                    justify: JustifyText::Right,
+                                    ..Default::default()
+                                },
+                            ))
                             .id(),
                         );
                     });
diff --git a/cosmos_client/src/ui/hud/mod.rs b/cosmos_client/src/ui/hud/mod.rs
index e33a9a6bb..0e526d78d 100644
--- a/cosmos_client/src/ui/hud/mod.rs
+++ b/cosmos_client/src/ui/hud/mod.rs
@@ -1,7 +1,6 @@
 use bevy::{
     app::App,
     asset::AssetServer,
-    color::palettes::css,
     core::Name,
     ecs::{
         entity::Entity,
@@ -10,12 +9,10 @@ use bevy::{
     },
     hierarchy::BuildChildren,
     log::error,
+    prelude::{ChildBuild, Text},
     state::state::OnEnter,
-    text::{Text, TextSection, TextStyle},
-    ui::{
-        node_bundles::{NodeBundle, TextBundle},
-        AlignContent, JustifyContent, PositionType, Style, TargetCamera, UiRect, Val,
-    },
+    text::{TextFont, TextSpan},
+    ui::{AlignContent, JustifyContent, Node, PositionType, TargetCamera, UiRect, Val},
 };
 use cosmos_core::{economy::Credits, netty::client::LocalPlayer, state::GameState};
 
@@ -37,10 +34,10 @@ fn create_credits_node(
 
     let font = asset_server.load("fonts/PixeloidSans.ttf");
 
-    let text_style = TextStyle {
-        color: css::WHITE.into(),
+    let text_style = TextFont {
         font_size: 24.0,
         font: font.clone(),
+        ..Default::default()
     };
 
     let ui_root = q_ui_root.single();
@@ -49,16 +46,13 @@ fn create_credits_node(
         .spawn((
             TargetCamera(ui_root),
             Name::new("Credits display"),
-            NodeBundle {
-                style: Style {
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    justify_content: JustifyContent::End,
-                    align_content: AlignContent::Start,
-                    padding: UiRect::all(Val::Px(10.0)),
-                    position_type: PositionType::Absolute,
-                    ..Default::default()
-                },
+            Node {
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                justify_content: JustifyContent::End,
+                align_content: AlignContent::Start,
+                padding: UiRect::all(Val::Px(10.0)),
+                position_type: PositionType::Absolute,
                 ..Default::default()
             },
         ))
@@ -66,14 +60,12 @@ fn create_credits_node(
             p.spawn((
                 Name::new("Credits Text"),
                 BindValues::<Credits>::new(vec![BindValue::new(local_player, ReactableFields::Text { section: 1 })]),
-                TextBundle {
-                    text: Text::from_sections([
-                        TextSection::new("$", text_style.clone()),
-                        TextSection::new(format!("{}", credits.amount()), text_style.clone()),
-                    ]),
-                    ..Default::default()
-                },
-            ));
+                text_style.clone(),
+                Text::new("$"),
+            ))
+            .with_children(|p| {
+                p.spawn((TextSpan::new(format!("{}", credits.amount())), text_style.clone()));
+            });
         });
 }
 
diff --git a/cosmos_client/src/ui/item_renderer/mod.rs b/cosmos_client/src/ui/item_renderer/mod.rs
index 7ea6fc502..7c9b93705 100644
--- a/cosmos_client/src/ui/item_renderer/mod.rs
+++ b/cosmos_client/src/ui/item_renderer/mod.rs
@@ -29,42 +29,38 @@ pub(crate) fn create_ui_cameras(mut commands: Commands) {
     commands.spawn((
         Name::new("UI Top Camera"),
         UiTopRoot,
-        Camera3dBundle {
-            projection: Projection::Orthographic(OrthographicProjection {
-                scaling_mode: ScalingMode::WindowSize(40.0),
-                ..Default::default()
-            }),
-            camera_3d: Camera3d::default(),
-            camera: Camera {
-                order: 2,
-                clear_color: ClearColorConfig::Custom(Color::NONE),
-                hdr: true, // Transparent stuff fails to render properly if this is off - this may be a bevy bug?
-                ..Default::default()
-            },
-            transform: Transform::from_xyz(0.0, 0.0, 1.0).looking_at(Vec3::ZERO, Vec3::Y),
+        Camera3d { ..Default::default() },
+        Projection::Orthographic(OrthographicProjection {
+            scaling_mode: ScalingMode::WindowSize, // 40.0
+            scale: 1.0 / 40.0,
+            ..OrthographicProjection::default_3d()
+        }),
+        Camera {
+            order: 2,
+            clear_color: ClearColorConfig::Custom(Color::NONE),
+            hdr: true, // Transparent stuff fails to render properly if this is off - this may be a bevy bug?
             ..Default::default()
         },
+        Transform::from_xyz(0.0, 0.0, 1.0).looking_at(Vec3::ZERO, Vec3::Y),
         RenderLayers::from_layers(&[INVENTORY_SLOT_LAYER]),
     ));
 
     commands.spawn((
         Name::new("UI Middle Camera"),
         UiMiddleRoot,
-        Camera3dBundle {
-            projection: Projection::Orthographic(OrthographicProjection {
-                scaling_mode: ScalingMode::WindowSize(40.0),
-                ..Default::default()
-            }),
-            camera_3d: Camera3d::default(),
-            camera: Camera {
-                order: 1,
-                clear_color: ClearColorConfig::Custom(Color::NONE),
-                hdr: true, // Transparent stuff fails to render properly if this is off - this may be a bevy bug?
-                ..Default::default()
-            },
-            transform: Transform::from_xyz(0.0, 0.0, 1.0).looking_at(Vec3::ZERO, Vec3::Y),
+        Camera3d { ..Default::default() },
+        Projection::Orthographic(OrthographicProjection {
+            scaling_mode: ScalingMode::WindowSize, // 40.0
+            scale: 1.0 / 40.0,
+            ..OrthographicProjection::default_3d()
+        }),
+        Camera {
+            order: 1,
+            clear_color: ClearColorConfig::Custom(Color::NONE),
+            hdr: true, // Transparent stuff fails to render properly if this is off - this may be a bevy bug?
             ..Default::default()
         },
+        Transform::from_xyz(0.0, 0.0, 1.0).looking_at(Vec3::ZERO, Vec3::Y),
         RenderLayers::from_layers(&[MIDDLE_INVENTORY_SLOT_LAYER]),
     ));
 }
@@ -200,9 +196,7 @@ fn render_items(
             // hide it till we position it properly
             transform.translation.x = -1000000.0;
 
-            commands
-                .spawn((TransformBundle::from_transform(transform), VisibilityBundle::default()))
-                .id()
+            commands.spawn((transform, Visibility::default())).id()
         };
 
         let render_layer = match render_layer {
@@ -250,7 +244,7 @@ fn generate_item_model(
             ui_element_entity: entity,
             item_id: changed_render_item.item_id,
         },
-        item_mat_material.mesh_handle().clone_weak(),
+        Mesh3d(item_mat_material.mesh_handle().clone_weak()),
         RenderLayers::from_layers(&[render_layer]),
         Name::new(format!("Rendered Inventory Item ({})", changed_render_item.item_id)),
     ));
diff --git a/cosmos_client/src/ui/main_menu/disconnect_screen/mod.rs b/cosmos_client/src/ui/main_menu/disconnect_screen/mod.rs
index 84ce3383f..9d8fab8ef 100644
--- a/cosmos_client/src/ui/main_menu/disconnect_screen/mod.rs
+++ b/cosmos_client/src/ui/main_menu/disconnect_screen/mod.rs
@@ -2,7 +2,8 @@ use bevy::{app::App, prelude::*};
 use bevy_renet2::renet2::{DisconnectReason, RenetClient};
 
 use crate::ui::{
-    components::button::{register_button, Button, ButtonBundle, ButtonEvent, ButtonStyles},
+    components::button::{register_button, Button, ButtonEvent, ButtonStyles},
+    font::DefaultFont,
     settings::SettingsMenuSet,
 };
 
@@ -10,37 +11,38 @@ use super::{in_main_menu_state, title_screen::TitleScreenSet, MainMenuRootUiNode
 
 fn create_disconnect_screen(
     mut commands: Commands,
-    asset_server: Res<AssetServer>,
     q_ui_root: Query<Entity, With<MainMenuRootUiNode>>,
     client: Option<Res<RenetClient>>,
+    default_font: Res<DefaultFont>,
 ) {
     let cool_blue: Color = Srgba::hex("00FFFF").unwrap().into();
 
-    let text_style = TextStyle {
-        color: Color::WHITE,
+    let text_style = TextFont {
         font_size: 32.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        font: default_font.0.clone(),
+        ..Default::default()
     };
-    let text_style_small = TextStyle {
-        color: Color::WHITE,
+    let text_style_small = TextFont {
         font_size: 24.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        font: default_font.0.clone(),
+        ..Default::default()
     };
+
     let Ok(main_menu_root) = q_ui_root.get_single() else {
         warn!("No main menu UI root.");
         return;
     };
 
     commands.entity(main_menu_root).with_children(|p| {
-        p.spawn(TextBundle {
-            text: Text::from_section("Disconnected", text_style.clone()),
-            style: Style {
+        p.spawn((
+            Text::new("Disconnected"),
+            text_style.clone(),
+            Node {
                 margin: UiRect::bottom(Val::Px(20.0)),
                 align_self: AlignSelf::Center,
                 ..Default::default()
             },
-            ..Default::default()
-        });
+        ));
 
         let dc_reason = client.and_then(|x| x.disconnect_reason());
 
@@ -62,40 +64,37 @@ fn create_disconnect_screen(
             Some(DisconnectReason::Transport) => "Unable to Establish Connection".into(),
         };
 
-        p.spawn(TextBundle {
-            text: Text::from_section(reason_text, text_style_small),
-            style: Style {
+        p.spawn((
+            Text::new(reason_text),
+            text_style_small,
+            Node {
                 margin: UiRect::bottom(Val::Px(50.0)),
                 align_self: AlignSelf::Center,
                 ..Default::default()
             },
-            ..Default::default()
-        });
-
-        p.spawn(ButtonBundle::<OkButtonEvent> {
-            node_bundle: NodeBundle {
-                border_color: cool_blue.into(),
-                style: Style {
-                    border: UiRect::all(Val::Px(2.0)),
-                    width: Val::Px(500.0),
-                    height: Val::Px(70.0),
-                    align_self: AlignSelf::Center,
-                    margin: UiRect::top(Val::Px(20.0)),
-                    ..Default::default()
-                },
+        ));
+
+        p.spawn((
+            BorderColor(cool_blue),
+            Node {
+                border: UiRect::all(Val::Px(2.0)),
+                width: Val::Px(500.0),
+                height: Val::Px(70.0),
+                align_self: AlignSelf::Center,
+                margin: UiRect::top(Val::Px(20.0)),
                 ..Default::default()
             },
-            button: Button {
+            Button::<OkButtonEvent> {
                 button_styles: Some(ButtonStyles {
                     background_color: Srgba::hex("333333").unwrap().into(),
                     hover_background_color: Srgba::hex("232323").unwrap().into(),
                     press_background_color: Srgba::hex("111111").unwrap().into(),
                     ..Default::default()
                 }),
-                text: Some(("OK".into(), text_style.clone())),
+                text: Some(("OK".into(), text_style.clone(), Default::default())),
                 ..Default::default()
             },
-        });
+        ));
     });
 }
 
@@ -135,7 +134,7 @@ pub(super) fn register(app: &mut App) {
                 .run_if(resource_exists_and_changed::<MainMenuSubState>)
                 .in_set(MainMenuSystemSet::InitializeMenu),
             ok_clicked
-                .run_if(on_event::<OkButtonEvent>())
+                .run_if(on_event::<OkButtonEvent>)
                 .run_if(in_main_menu_state(MainMenuSubState::Disconnect))
                 .in_set(MainMenuSystemSet::UpdateMenu),
         )
diff --git a/cosmos_client/src/ui/main_menu/menu_panorama.rs b/cosmos_client/src/ui/main_menu/menu_panorama.rs
index 2c620b111..ec8cba677 100644
--- a/cosmos_client/src/ui/main_menu/menu_panorama.rs
+++ b/cosmos_client/src/ui/main_menu/menu_panorama.rs
@@ -30,7 +30,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 }
 
 fn asset_loaded(asset_server: Res<AssetServer>, mut images: ResMut<Assets<Image>>, mut cubemap: ResMut<Cubemap>) {
-    if !cubemap.is_loaded && asset_server.get_load_state(cubemap.image_handle.id()) == Some(LoadState::Loaded) {
+    if !cubemap.is_loaded && matches!(asset_server.get_load_state(cubemap.image_handle.id()), Some(LoadState::Loaded)) {
         let image = images.get_mut(&cubemap.image_handle).unwrap();
         // NOTE: PNGs do not have any metadata that could indicate they contain a cubemap texture,
         // so they appear as one texture. The following code reconfigures the texture as necessary.
@@ -50,6 +50,7 @@ fn on_enter_main_menu(cubemap: Res<Cubemap>, mut commands: Commands, query: Quer
     for ent in query.iter() {
         commands.entity(ent).insert(Skybox {
             image: cubemap.image_handle.clone(),
+            rotation: Quat::IDENTITY,
             brightness: 1000.0,
         });
     }
@@ -59,6 +60,7 @@ fn on_add_main_menu_camera(cubemap: Res<Cubemap>, mut commands: Commands, query:
     for ent in query.iter() {
         commands.entity(ent).insert(Skybox {
             image: cubemap.image_handle.clone(),
+            rotation: Quat::IDENTITY,
             brightness: 1000.0,
         });
     }
diff --git a/cosmos_client/src/ui/main_menu/mod.rs b/cosmos_client/src/ui/main_menu/mod.rs
index 10be6f396..57caaefe0 100644
--- a/cosmos_client/src/ui/main_menu/mod.rs
+++ b/cosmos_client/src/ui/main_menu/mod.rs
@@ -1,6 +1,9 @@
 //! The menu that first appears when you load into the game.
 
-use bevy::{app::App, core_pipeline::bloom::BloomSettings, hierarchy::DespawnRecursiveExt, prelude::*, render::camera::Camera};
+use bevy::{
+    app::App, core_pipeline::bloom::Bloom, hierarchy::DespawnRecursiveExt, picking::pointer::PointerPress, prelude::*,
+    render::camera::Camera, window::Monitor,
+};
 use bevy_kira_audio::prelude::AudioReceiver;
 use bevy_rapier3d::plugin::DefaultRapierContext;
 use cosmos_core::state::GameState;
@@ -61,15 +64,12 @@ fn create_main_menu_background_node(mut commands: Commands, q_main_menu_camera:
         BackgroundColorNode,
         TargetCamera(cam_ent),
         DespawnOnSwitchState,
-        NodeBundle {
-            style: Style {
-                width: Val::Percent(100.0),
-                height: Val::Percent(100.0),
-                align_content: AlignContent::Center,
-                justify_content: JustifyContent::Center,
-                flex_direction: FlexDirection::Column,
-                ..Default::default()
-            },
+        Node {
+            width: Val::Percent(100.0),
+            height: Val::Percent(100.0),
+            align_content: AlignContent::Center,
+            justify_content: JustifyContent::Center,
+            flex_direction: FlexDirection::Column,
             ..Default::default()
         },
     ));
@@ -83,15 +83,12 @@ fn create_main_menu_root_node(q_bg_node: Query<Entity, With<BackgroundColorNode>
     commands.entity(ent).with_children(|p| {
         p.spawn((
             MainMenuRootUiNode,
-            NodeBundle {
-                style: Style {
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    align_content: AlignContent::Center,
-                    justify_content: JustifyContent::Center,
-                    flex_direction: FlexDirection::Column,
-                    ..Default::default()
-                },
+            Node {
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                align_content: AlignContent::Center,
+                justify_content: JustifyContent::Center,
+                flex_direction: FlexDirection::Column,
                 ..Default::default()
             },
         ));
@@ -100,7 +97,7 @@ fn create_main_menu_root_node(q_bg_node: Query<Entity, With<BackgroundColorNode>
 
 fn spin_camera(mut q_main_menu_camera: Query<&mut Transform, With<MainMenuCamera>>, time: Res<Time>) {
     for mut trans in q_main_menu_camera.iter_mut() {
-        trans.rotation *= Quat::from_axis_angle(Vec3::Y, time.delta_seconds() / 30.0);
+        trans.rotation *= Quat::from_axis_angle(Vec3::Y, time.delta_secs() / 30.0);
     }
 }
 
@@ -124,27 +121,25 @@ fn fade_in_background(
         .into();
     }
 
-    main_menu_time.0 += time.delta_seconds();
+    main_menu_time.0 += time.delta_secs();
 }
 
 fn create_main_menu_camera(mut commands: Commands) {
     commands.spawn((
         DespawnOnSwitchState,
         MainMenuCamera,
-        Camera3dBundle {
-            camera: Camera {
-                hdr: true,
-                ..Default::default()
-            },
-            transform: Transform::default(),
-            projection: Projection::from(PerspectiveProjection {
-                fov: (90.0 / 180.0) * std::f32::consts::PI,
-                ..default()
-            }),
-            ..default()
+        Camera {
+            hdr: true,
+            ..Default::default()
         },
-        BloomSettings { ..Default::default() },
+        Transform::default(),
+        Projection::from(PerspectiveProjection {
+            fov: (90.0 / 180.0) * std::f32::consts::PI,
+            ..default()
+        }),
+        Bloom { ..Default::default() },
         Name::new("Main Menu Camera"),
+        Camera3d::default(),
         UiRoot,
         AudioReceiver,
         ShowCursor,
@@ -155,10 +150,14 @@ fn create_main_menu_resource(
     q_entity: Query<
         Entity,
         (
+            // Maybe we make this opt-in in the future?
             Without<SurviveMainMenu>,
             Without<Window>,
             Without<DefaultRapierContext>,
             Without<Parent>,
+            Without<Observer>,
+            Without<Monitor>,
+            Without<Pointer<PointerPress>>,
         ),
     >,
     mut commands: Commands,
diff --git a/cosmos_client/src/ui/main_menu/settings_screen/mod.rs b/cosmos_client/src/ui/main_menu/settings_screen/mod.rs
index 95ed5a00c..de124955e 100644
--- a/cosmos_client/src/ui/main_menu/settings_screen/mod.rs
+++ b/cosmos_client/src/ui/main_menu/settings_screen/mod.rs
@@ -49,12 +49,12 @@ pub(super) fn register(app: &mut App) {
                 .in_set(MainMenuSystemSet::InitializeMenu)
                 .before(SettingsMenuSet::SettingsMenuInteractions),
             cancel_clicked
-                .run_if(on_event::<SettingsCancelButtonEvent>())
+                .run_if(on_event::<SettingsCancelButtonEvent>)
                 .run_if(in_main_menu_state(MainMenuSubState::Settings))
                 .in_set(MainMenuSystemSet::UpdateMenu)
                 .after(SettingsMenuSet::SettingsMenuInteractions),
             done_clicked
-                .run_if(on_event::<SettingsDoneButtonEvent>())
+                .run_if(on_event::<SettingsDoneButtonEvent>)
                 .run_if(in_main_menu_state(MainMenuSubState::Settings))
                 .in_set(MainMenuSystemSet::UpdateMenu)
                 .after(SettingsSet::ChangeSettings)
diff --git a/cosmos_client/src/ui/main_menu/title_screen/mod.rs b/cosmos_client/src/ui/main_menu/title_screen/mod.rs
index 205a2d3d3..f863b9b80 100644
--- a/cosmos_client/src/ui/main_menu/title_screen/mod.rs
+++ b/cosmos_client/src/ui/main_menu/title_screen/mod.rs
@@ -10,9 +10,10 @@ use crate::{
     netty::connect::HostConfig,
     ui::{
         components::{
-            button::{register_button, Button, ButtonBundle, ButtonEvent, ButtonStyles},
-            text_input::{InputType, TextInput, TextInputBundle},
+            button::{register_button, Button, ButtonEvent, ButtonStyles},
+            text_input::{InputType, TextInput},
         },
+        font::DefaultFont,
         reactivity::{add_reactable_type, BindValue, BindValues, ReactableFields, ReactableValue},
         settings::SettingsMenuSet,
     },
@@ -49,23 +50,25 @@ impl ReactableValue for ErrorMessage {
     }
 }
 
-fn create_main_menu(mut commands: Commands, asset_server: Res<AssetServer>, q_ui_root: Query<Entity, With<MainMenuRootUiNode>>) {
+fn create_main_menu(mut commands: Commands, default_font: Res<DefaultFont>, q_ui_root: Query<Entity, With<MainMenuRootUiNode>>) {
     let cool_blue = Srgba::hex("00FFFF").unwrap().into();
 
-    let text_style = TextStyle {
-        color: Color::WHITE,
+    let text_style = TextFont {
         font_size: 32.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        font: default_font.0.clone(),
+        ..Default::default()
     };
-    let text_style_small = TextStyle {
-        color: Color::WHITE,
+    let text_style_small = TextFont {
         font_size: 24.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        font: default_font.0.clone(),
+        ..Default::default()
     };
-    let text_style_large = TextStyle {
-        color: cool_blue,
+
+    let text_blue = TextColor(cool_blue);
+    let text_style_large = TextFont {
         font_size: 256.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        font: default_font.0.clone(),
+        ..Default::default()
     };
 
     let Ok(main_menu_root) = q_ui_root.get_single() else {
@@ -74,121 +77,108 @@ fn create_main_menu(mut commands: Commands, asset_server: Res<AssetServer>, q_ui
     };
 
     commands.entity(main_menu_root).with_children(|p| {
-        p.spawn(TextBundle {
-            text: Text::from_section("COSMOS", text_style_large),
-            style: Style {
-                margin: UiRect::bottom(Val::Px(200.0)),
+        p.spawn((
+            Text::new("COSMOS"),
+            text_style_large,
+            text_blue,
+            Node {
+                margin: UiRect::bottom(Val::Px(50.0)),
                 align_self: AlignSelf::Center,
                 ..Default::default()
             },
-            ..Default::default()
-        });
-
-        p.spawn(ButtonBundle::<ConnectButtonEvent> {
-            node_bundle: NodeBundle {
-                border_color: cool_blue.into(),
-                style: Style {
-                    border: UiRect::all(Val::Px(2.0)),
-                    width: Val::Px(500.0),
-                    height: Val::Px(70.0),
-                    align_self: AlignSelf::Center,
-                    ..Default::default()
-                },
+        ));
+
+        p.spawn((
+            BorderColor(cool_blue),
+            Node {
+                border: UiRect::all(Val::Px(2.0)),
+                width: Val::Px(500.0),
+                height: Val::Px(70.0),
+                align_self: AlignSelf::Center,
                 ..Default::default()
             },
-            button: Button {
+            Button::<ConnectButtonEvent> {
                 button_styles: Some(ButtonStyles {
                     background_color: Srgba::hex("333333").unwrap().into(),
                     hover_background_color: Srgba::hex("232323").unwrap().into(),
                     press_background_color: Srgba::hex("111111").unwrap().into(),
                     ..Default::default()
                 }),
-                text: Some(("Connect".into(), text_style.clone())),
+                text: Some(("Connect".into(), text_style.clone(), Default::default())),
                 ..Default::default()
             },
-        });
+        ));
 
         let vars_entity = p.spawn((ConnectionString("localhost".into()), ErrorMessage::default())).id();
 
         p.spawn((
             BindValues::single(BindValue::<ConnectionString>::new(vars_entity, ReactableFields::Value)),
-            TextInputBundle {
-                text_input: TextInput {
-                    style: text_style_small.clone(),
-                    input_type: InputType::Text { max_length: None },
-                    ..Default::default()
-                },
-                value: InputValue::new("localhost"),
-                node_bundle: NodeBundle {
-                    border_color: Srgba::hex("555555").unwrap().into(),
-                    background_color: Srgba::hex("111111").unwrap().into(),
-                    style: Style {
-                        border: UiRect::all(Val::Px(2.0)),
-                        width: Val::Px(500.0),
-                        height: Val::Px(45.0),
-                        align_self: AlignSelf::Center,
-                        margin: UiRect::top(Val::Px(20.0)),
-                        padding: UiRect {
-                            top: Val::Px(4.0),
-                            bottom: Val::Px(4.0),
-                            ..Default::default()
-                        },
-                        ..Default::default()
-                    },
+            text_style_small.clone(),
+            TextInput {
+                input_type: InputType::Text { max_length: None },
+                ..Default::default()
+            },
+            InputValue::new("localhost"),
+            BorderColor(Srgba::hex("555555").unwrap().into()),
+            BackgroundColor(Srgba::hex("111111").unwrap().into()),
+            Node {
+                border: UiRect::all(Val::Px(2.0)),
+                width: Val::Px(500.0),
+                min_height: Val::Px(45.0),
+                align_self: AlignSelf::Center,
+                margin: UiRect::top(Val::Px(20.0)),
+                padding: UiRect {
+                    top: Val::Px(4.0),
+                    bottom: Val::Px(4.0),
                     ..Default::default()
                 },
+                ..Default::default()
             },
         ));
 
-        p.spawn(ButtonBundle::<SettingsButtonEvent> {
-            node_bundle: NodeBundle {
-                border_color: cool_blue.into(),
-                style: Style {
-                    border: UiRect::all(Val::Px(2.0)),
-                    width: Val::Px(500.0),
-                    height: Val::Px(70.0),
-                    align_self: AlignSelf::Center,
-                    margin: UiRect::top(Val::Px(20.0)),
-                    ..Default::default()
-                },
+        p.spawn((
+            BorderColor(cool_blue),
+            Node {
+                border: UiRect::all(Val::Px(2.0)),
+                width: Val::Px(500.0),
+                height: Val::Px(70.0),
+                align_self: AlignSelf::Center,
+                margin: UiRect::top(Val::Px(20.0)),
                 ..Default::default()
             },
-            button: Button {
+            Button::<SettingsButtonEvent> {
                 button_styles: Some(ButtonStyles {
                     background_color: Srgba::hex("333333").unwrap().into(),
                     hover_background_color: Srgba::hex("232323").unwrap().into(),
                     press_background_color: Srgba::hex("111111").unwrap().into(),
                     ..Default::default()
                 }),
-                text: Some(("Settings".into(), text_style.clone())),
+                text: Some(("Settings".into(), text_style.clone(), Default::default())),
                 ..Default::default()
             },
-        });
-
-        p.spawn(ButtonBundle::<QuitButtonEvent> {
-            node_bundle: NodeBundle {
-                border_color: cool_blue.into(),
-                style: Style {
-                    border: UiRect::all(Val::Px(2.0)),
-                    width: Val::Px(500.0),
-                    height: Val::Px(70.0),
-                    align_self: AlignSelf::Center,
-                    margin: UiRect::top(Val::Px(20.0)),
-                    ..Default::default()
-                },
+        ));
+
+        p.spawn((
+            BorderColor(cool_blue),
+            Node {
+                border: UiRect::all(Val::Px(2.0)),
+                width: Val::Px(500.0),
+                height: Val::Px(70.0),
+                align_self: AlignSelf::Center,
+                margin: UiRect::top(Val::Px(20.0)),
                 ..Default::default()
             },
-            button: Button {
+            Button::<QuitButtonEvent> {
                 button_styles: Some(ButtonStyles {
                     background_color: Srgba::hex("333333").unwrap().into(),
                     hover_background_color: Srgba::hex("232323").unwrap().into(),
                     press_background_color: Srgba::hex("111111").unwrap().into(),
                     ..Default::default()
                 }),
-                text: Some(("Quit".into(), text_style.clone())),
+                text: Some(("Quit".into(), text_style.clone(), Default::default())),
                 ..Default::default()
             },
-        });
+        ));
     });
 }
 
@@ -308,16 +298,16 @@ pub(super) fn register(app: &mut App) {
                 .run_if(resource_exists_and_changed::<MainMenuSubState>)
                 .in_set(MainMenuSystemSet::InitializeMenu),
             goto_settings
-                .run_if(on_event::<SettingsButtonEvent>())
+                .run_if(on_event::<SettingsButtonEvent>)
                 .run_if(in_main_menu_state(MainMenuSubState::TitleScreen))
                 .in_set(MainMenuSystemSet::UpdateMenu),
             trigger_connection
                 .run_if(in_state(GameState::MainMenu))
-                .run_if(on_event::<ConnectButtonEvent>())
+                .run_if(on_event::<ConnectButtonEvent>)
                 .run_if(in_main_menu_state(MainMenuSubState::TitleScreen))
                 .in_set(MainMenuSystemSet::UpdateMenu),
             quit_game
-                .run_if(on_event::<QuitButtonEvent>())
+                .run_if(on_event::<QuitButtonEvent>)
                 .run_if(in_main_menu_state(MainMenuSubState::TitleScreen))
                 .in_set(MainMenuSystemSet::UpdateMenu),
         )
diff --git a/cosmos_client/src/ui/main_menu/triggers.rs b/cosmos_client/src/ui/main_menu/triggers.rs
index 3fca06913..61048ed95 100644
--- a/cosmos_client/src/ui/main_menu/triggers.rs
+++ b/cosmos_client/src/ui/main_menu/triggers.rs
@@ -26,7 +26,7 @@ pub(super) fn register(app: &mut App) {
     app.add_systems(
         Update,
         switch_to_title
-            .run_if(in_state(GameState::Playing).or_else(in_state(GameState::Connecting)))
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::Connecting)))
             .run_if(is_client_disconnected),
     );
 }
diff --git a/cosmos_client/src/ui/message.rs b/cosmos_client/src/ui/message.rs
index a3fbe0d29..d2db6df1e 100644
--- a/cosmos_client/src/ui/message.rs
+++ b/cosmos_client/src/ui/message.rs
@@ -2,18 +2,11 @@
 
 use std::{collections::VecDeque, time::Duration};
 
-use bevy::{
-    color::Alpha,
-    prelude::{
-        in_state, App, AssetServer, BuildChildren, Color, Commands, Component, DespawnRecursiveExt, IntoSystemConfigs, Name, NodeBundle,
-        Parent, Query, Res, ResMut, Resource, TextBundle, Update,
-    },
-    text::{JustifyText, Text, TextSection, TextStyle},
-    time::Time,
-    ui::{JustifyContent, PositionType, Style, Val},
-};
+use bevy::prelude::*;
 use cosmos_core::{netty::system_sets::NetworkingSystemsSet, state::GameState};
 
+use super::font::DefaultFont;
+
 const HUD_DISPLAY_DURATION: Duration = Duration::from_secs(7);
 const FADE_DURATION: Duration = Duration::from_secs(3);
 
@@ -123,14 +116,15 @@ struct ShownHudMessage {
 }
 
 fn display_hud_messages(
+    default_font: Res<DefaultFont>,
     mut commands: Commands,
-    mut shown_hud_message: Query<(&Parent, &mut ShownHudMessage, &mut Text)>,
+    mut shown_hud_message: Query<(Entity, &Parent, &mut ShownHudMessage)>,
     mut hud_messages: ResMut<HudMessages>,
-    asset_server: Res<AssetServer>,
+    mut writer: TextUiWriter,
     time: Res<Time>,
 ) {
-    if let Ok((parent, mut shown_hud_message, mut text)) = shown_hud_message.get_single_mut() {
-        let time_now = time.elapsed_seconds();
+    if let Ok((entity, parent, mut shown_hud_message)) = shown_hud_message.get_single_mut() {
+        let time_now = time.elapsed_secs();
 
         if let Some(current_hud_message) = hud_messages.1.as_mut() {
             if current_hud_message.time_needs_reset {
@@ -145,16 +139,11 @@ fn display_hud_messages(
             commands.entity(parent.get()).despawn_recursive();
             hud_messages.1 = None;
         } else {
-            for section in text.sections.iter_mut() {
-                section
-                    .style
-                    .color
-                    .set_alpha((time_remaining / FADE_DURATION.as_secs_f32()).min(1.0));
-            }
+            writer.for_each_color(entity, |mut c| c.set_alpha((time_remaining / FADE_DURATION.as_secs_f32()).min(1.0)));
         }
     } else if let Some(hud_message) = hud_messages.0.pop_front() {
         let shown_hud_message = ShownHudMessage {
-            time_created: time.elapsed_seconds(),
+            time_created: time.elapsed_secs(),
         };
 
         hud_messages.1 = Some(CurrentDisplayedHudCache {
@@ -165,44 +154,43 @@ fn display_hud_messages(
         commands
             .spawn((
                 Name::new("HUD Message"),
-                NodeBundle {
-                    style: Style {
-                        width: Val::Percent(100.0),
-                        height: Val::Percent(100.0),
-                        justify_content: JustifyContent::Center,
-                        ..Default::default()
-                    },
+                Node {
+                    width: Val::Percent(100.0),
+                    height: Val::Percent(100.0),
+                    justify_content: JustifyContent::Center,
                     ..Default::default()
                 },
             ))
             .with_children(|p| {
-                p.spawn((
-                    shown_hud_message,
-                    TextBundle {
-                        style: Style {
+                // TODO: This
+                let mut messages = hud_message.text.into_iter();
+                if let Some(first) = messages.next() {
+                    let font = TextFont {
+                        font_size: 24.0,
+                        font: default_font.0.clone(),
+                        ..Default::default()
+                    };
+                    p.spawn((
+                        shown_hud_message,
+                        Node {
                             position_type: PositionType::Absolute,
                             bottom: Val::Px(125.0),
                             ..Default::default()
                         },
-                        text: Text {
-                            sections: hud_message
-                                .text
-                                .into_iter()
-                                .map(|x| TextSection {
-                                    value: x.text,
-                                    style: TextStyle {
-                                        color: x.color,
-                                        font: asset_server.load("fonts/PixeloidSans.ttf"),
-                                        font_size: 24.0,
-                                    },
-                                })
-                                .collect(),
+                        font.clone(),
+                        Text::new(first.text),
+                        TextColor(first.color),
+                        TextLayout {
                             justify: JustifyText::Center,
                             ..Default::default()
                         },
-                        ..Default::default()
-                    },
-                ));
+                    ))
+                    .with_children(|p| {
+                        for next_message in messages {
+                            p.spawn((font.clone(), TextSpan::new(next_message.text), TextColor(next_message.color)));
+                        }
+                    });
+                }
             });
     }
 }
diff --git a/cosmos_client/src/ui/mod.rs b/cosmos_client/src/ui/mod.rs
index f06e73b2b..9d00d48d6 100644
--- a/cosmos_client/src/ui/mod.rs
+++ b/cosmos_client/src/ui/mod.rs
@@ -6,14 +6,14 @@ use bevy::{
         component::Component,
         schedule::{IntoSystemSetConfigs, SystemSet},
     },
-    prelude::App,
-    text::Text,
-    ui::{BackgroundColor, Style, UiImage},
+    prelude::{App, ImageNode, Text},
+    ui::{BackgroundColor, Node},
 };
 
 pub mod components;
 pub mod crosshair;
 pub mod debug_info_display;
+pub mod font;
 pub mod hotbar;
 mod hud;
 pub mod item_renderer;
@@ -57,6 +57,17 @@ pub struct UiTopRoot;
 /// When you make a menu that can be closed via the `Escape`/pause menu key, add this component to it.
 pub struct OpenMenu {
     level: u32,
+    close_method: CloseMethod,
+}
+
+#[derive(Default, Debug, PartialEq, Eq, Hash, Clone, Copy)]
+/// How a menu should be closed
+pub enum CloseMethod {
+    #[default]
+    /// The menu should be despawned via [`NeedsDespawned`].
+    Despawn,
+    /// The menu should be set to [`Visibility::Hidden`]
+    Visibility,
 }
 
 impl OpenMenu {
@@ -68,7 +79,22 @@ impl OpenMenu {
     /// Typically, if you are constructing a heirarchy of windows, you should start your base window
     /// at 0 and count up from there.
     pub fn new(level: u32) -> Self {
-        Self { level }
+        Self {
+            level,
+            close_method: Default::default(),
+        }
+    }
+
+    /// Creates an open menu with this "level" of being above every other menu.
+    /// The close_method determines the logic used to close this menu. See [`CloseMethod`].
+    ///
+    /// This doesn't effect rendering order, rather effects which menu the "Escape" button will target first.
+    /// Menus of the same level will all be closed together. Each escape press will remove the highest-level group of menus.
+    ///
+    /// Typically, if you are constructing a heirarchy of windows, you should start your base window
+    /// at 0 and count up from there.   
+    pub fn with_close_method(level: u32, close_method: CloseMethod) -> Self {
+        Self { level, close_method }
     }
 
     /// Sets the level for this menu
@@ -80,6 +106,11 @@ impl OpenMenu {
     pub fn level(&self) -> u32 {
         self.level
     }
+
+    /// Gets the method that should be used to close this menu
+    pub fn close_method(&self) -> CloseMethod {
+        self.close_method
+    }
 }
 
 pub(super) fn register(app: &mut App) {
@@ -93,6 +124,7 @@ pub(super) fn register(app: &mut App) {
     reactivity::register(app);
     main_menu::register(app);
     hud::register(app);
+    font::register(app);
     pause::register(app);
     settings::register(app);
 
@@ -101,6 +133,6 @@ pub(super) fn register(app: &mut App) {
     // These probably don't matter
     app.allow_ambiguous_component::<Text>();
     app.allow_ambiguous_component::<BackgroundColor>();
-    app.allow_ambiguous_component::<Style>();
-    app.allow_ambiguous_component::<UiImage>();
+    app.allow_ambiguous_component::<Node>();
+    app.allow_ambiguous_component::<ImageNode>();
 }
diff --git a/cosmos_client/src/ui/pause/mod.rs b/cosmos_client/src/ui/pause/mod.rs
index cca063d87..ac45a1ac1 100644
--- a/cosmos_client/src/ui/pause/mod.rs
+++ b/cosmos_client/src/ui/pause/mod.rs
@@ -2,7 +2,6 @@
 
 use bevy::{
     app::{App, Update},
-    color::palettes::css,
     prelude::*,
 };
 use cosmos_core::{ecs::NeedsDespawned, state::GameState};
@@ -15,11 +14,12 @@ use crate::{
 
 use super::{
     components::{
-        button::{register_button, Button, ButtonBundle, ButtonEvent, ButtonStyles},
+        button::{register_button, Button, ButtonEvent, ButtonStyles},
         show_cursor::ShowCursor,
     },
+    font::DefaultFont,
     settings::{NeedsSettingsAdded, SettingsCancelButtonEvent, SettingsDoneButtonEvent, SettingsMenuSet},
-    OpenMenu, UiSystemSet, UiTopRoot,
+    CloseMethod, OpenMenu, UiSystemSet, UiTopRoot,
 };
 
 #[derive(Resource)]
@@ -31,18 +31,18 @@ struct PauseMenu;
 
 fn toggle_pause_menu(
     mut commands: Commands,
-    q_open_menus: Query<(Entity, &OpenMenu)>,
+    mut q_open_menus: Query<(Entity, &OpenMenu, &mut Visibility)>,
     q_pause_menu: Query<Entity, With<PauseMenu>>,
     input_handler: InputChecker,
     q_ui_root: Query<Entity, With<UiTopRoot>>,
-    asset_server: Res<AssetServer>,
+    default_font: Res<DefaultFont>,
 ) {
     if !input_handler.check_just_pressed(CosmosInputs::Pause) {
         return;
     }
 
     if !q_open_menus.is_empty() {
-        if close_topmost_menus(&q_open_menus, &mut commands) {
+        if close_topmost_menus(&mut q_open_menus, &mut commands) {
             if let Ok(ent) = q_pause_menu.get_single() {
                 commands.entity(ent).insert(Visibility::Visible);
             }
@@ -58,10 +58,10 @@ fn toggle_pause_menu(
 
     let ui_root = q_ui_root.single();
 
-    let text_style = TextStyle {
-        color: css::WHITE.into(),
+    let text_style = TextFont {
         font_size: 32.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        font: default_font.0.clone(),
+        ..Default::default()
     };
 
     let cool_blue = Srgba::hex("00FFFF").unwrap();
@@ -72,7 +72,7 @@ fn toggle_pause_menu(
         press_background_color: Srgba::hex("111111").unwrap().into(),
         ..Default::default()
     });
-    let style = Style {
+    let style = Node {
         border: UiRect::all(Val::Px(2.0)),
         width: Val::Px(500.0),
         height: Val::Px(70.0),
@@ -85,68 +85,58 @@ fn toggle_pause_menu(
         .spawn((
             TargetCamera(ui_root),
             Name::new("Pause Menu"),
-            NodeBundle {
-                style: Style {
-                    flex_direction: FlexDirection::Column,
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    justify_content: JustifyContent::Center,
-                    align_content: AlignContent::Center,
-                    row_gap: Val::Px(20.0),
-                    ..Default::default()
-                },
-                background_color: Srgba {
+            Node {
+                flex_direction: FlexDirection::Column,
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                justify_content: JustifyContent::Center,
+                align_content: AlignContent::Center,
+                row_gap: Val::Px(20.0),
+                ..Default::default()
+            },
+            GlobalZIndex(100),
+            BackgroundColor(
+                Srgba {
                     red: 0.0,
                     green: 0.0,
                     blue: 0.0,
                     alpha: 0.3,
                 }
                 .into(),
-                z_index: ZIndex::Global(100),
-                ..Default::default()
-            },
+            ),
             PauseMenu,
             ShowCursor,
         ))
         .with_children(|p| {
-            p.spawn(ButtonBundle::<ResumeButtonEvent> {
-                node_bundle: NodeBundle {
-                    border_color: cool_blue.into(),
-                    style: style.clone(),
-                    ..Default::default()
-                },
-                button: Button {
+            p.spawn((
+                BorderColor(cool_blue.into()),
+                style.clone(),
+                Button::<ResumeButtonEvent> {
                     button_styles: button_styles.clone(),
-                    text: Some(("RESUME".into(), text_style.clone())),
+                    text: Some(("RESUME".into(), text_style.clone(), Default::default())),
                     ..Default::default()
                 },
-            });
+            ));
 
-            p.spawn(ButtonBundle::<SettingsButtonEvent> {
-                node_bundle: NodeBundle {
-                    border_color: cool_blue.into(),
-                    style: style.clone(),
-                    ..Default::default()
-                },
-                button: Button::<SettingsButtonEvent> {
+            p.spawn((
+                BorderColor(cool_blue.into()),
+                style.clone(),
+                Button::<SettingsButtonEvent> {
                     button_styles: button_styles.clone(),
-                    text: Some(("SETTINGS".into(), text_style.clone())),
+                    text: Some(("SETTINGS".into(), text_style.clone(), Default::default())),
                     ..Default::default()
                 },
-            });
+            ));
 
-            p.spawn(ButtonBundle::<DisconnectButtonEvent> {
-                node_bundle: NodeBundle {
-                    border_color: cool_blue.into(),
-                    style,
-                    ..Default::default()
-                },
-                button: Button::<DisconnectButtonEvent> {
+            p.spawn((
+                BorderColor(cool_blue.into()),
+                style.clone(),
+                Button::<DisconnectButtonEvent> {
                     button_styles: button_styles.clone(),
-                    text: Some(("DISCONNECT".into(), text_style.clone())),
+                    text: Some(("DISCONNECT".into(), text_style.clone(), Default::default())),
                     ..Default::default()
                 },
-            });
+            ));
         });
 }
 
@@ -177,15 +167,33 @@ impl ButtonEvent for DisconnectButtonEvent {
     }
 }
 
-fn close_topmost_menus(q_open_menus: &Query<(Entity, &OpenMenu)>, commands: &mut Commands) -> bool {
-    let mut open = q_open_menus.iter().collect::<Vec<(Entity, &OpenMenu)>>();
+fn close_topmost_menus(q_open_menus: &mut Query<(Entity, &OpenMenu, &mut Visibility)>, commands: &mut Commands) -> bool {
+    let mut open = q_open_menus
+        .iter_mut()
+        .filter(|(_, open_menu, visibility)| open_menu.close_method() != CloseMethod::Visibility || **visibility != Visibility::Hidden)
+        .collect::<Vec<(Entity, &OpenMenu, Mut<Visibility>)>>();
+
     open.sort_by(|a, b| b.1.level().cmp(&a.1.level()));
     let topmost = open[0].1.level();
-    for (ent, open_menu) in open.iter() {
+    for (ent, open_menu, mut visibility) in open {
         if open_menu.level() != topmost {
             return false;
         }
-        commands.entity(*ent).insert(NeedsDespawned);
+
+        match open_menu.close_method() {
+            CloseMethod::Despawn => {
+                commands.entity(ent).insert(NeedsDespawned);
+            }
+            CloseMethod::Visibility => {
+                commands
+                    .entity(ent)
+                    .remove::<OpenMenu>()
+                    // Typically ShowCursor is used in conjunction w/ OpenMenu. Maybe these should
+                    // be combined at some point?
+                    .remove::<ShowCursor>();
+                *visibility = Visibility::Hidden;
+            }
+        }
     }
 
     true
@@ -208,20 +216,19 @@ fn settings_clicked(
     commands.spawn((
         TargetCamera(ui_root),
         Name::new("Pause Menu Settings"),
-        NodeBundle {
-            style: Style {
-                width: Val::Percent(100.0),
-                height: Val::Percent(100.0),
-                ..Default::default()
-            },
-            background_color: Srgba {
+        BackgroundColor(
+            Srgba {
                 red: 0.0,
                 green: 0.0,
                 blue: 0.0,
                 alpha: 0.3,
             }
             .into(),
-            z_index: ZIndex::Global(101),
+        ),
+        GlobalZIndex(101),
+        Node {
+            width: Val::Percent(100.0),
+            height: Val::Percent(100.0),
             ..Default::default()
         },
         OpenMenu::new(1),
@@ -256,16 +263,25 @@ fn resume(mut commands: Commands, q_pause_menu: Query<Entity, With<PauseMenu>>)
     commands.remove_resource::<Paused>();
 }
 
+#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
+/// When the `Escape` key is pressed to open the pause menu, this set will be called
+pub enum CloseMenusSet {
+    /// This set is when close any menus open will be closed when `Escape` is pressed.
+    CloseMenus,
+}
+
 pub(super) fn register(app: &mut App) {
     register_button::<ResumeButtonEvent>(app);
     register_button::<DisconnectButtonEvent>(app);
     register_button::<SettingsButtonEvent>(app);
 
+    app.configure_sets(Update, CloseMenusSet::CloseMenus);
+
     app.add_systems(
         Update,
         (
-            toggle_pause_menu,
-            settings_clicked.run_if(on_event::<SettingsButtonEvent>()).after(UiSystemSet::DoUi),
+            toggle_pause_menu.in_set(CloseMenusSet::CloseMenus),
+            settings_clicked.run_if(on_event::<SettingsButtonEvent>).after(UiSystemSet::DoUi),
         )
             .chain()
             .run_if(in_state(GameState::Playing))
@@ -275,11 +291,11 @@ pub(super) fn register(app: &mut App) {
         Update,
         (
             settings_done
-                .run_if(on_event::<SettingsDoneButtonEvent>().or_else(on_event::<SettingsCancelButtonEvent>()))
+                .run_if(on_event::<SettingsDoneButtonEvent>.or(on_event::<SettingsCancelButtonEvent>))
                 .after(SettingsMenuSet::SettingsMenuInteractions),
-            resume.run_if(on_event::<ResumeButtonEvent>()).after(UiSystemSet::DoUi),
+            resume.run_if(on_event::<ResumeButtonEvent>).after(UiSystemSet::DoUi),
             disconnect_clicked
-                .run_if(on_event::<DisconnectButtonEvent>())
+                .run_if(on_event::<DisconnectButtonEvent>)
                 .after(UiSystemSet::DoUi),
         ),
     );
diff --git a/cosmos_client/src/ui/reactivity/text.rs b/cosmos_client/src/ui/reactivity/text.rs
index 74d9b3739..187d96862 100644
--- a/cosmos_client/src/ui/reactivity/text.rs
+++ b/cosmos_client/src/ui/reactivity/text.rs
@@ -5,17 +5,17 @@ use bevy::{
     app::{App, Update},
     ecs::{event::EventReader, system::Query},
     log::{error, warn},
-    prelude::IntoSystemConfigs,
-    text::Text,
+    prelude::{Entity, IntoSystemConfigs, Text, TextUiWriter, With},
 };
 
 fn on_need_update_value<T: ReactableValue>(
     q_react_value: Query<&T>,
     mut ev_reader: EventReader<NeedsValueFetched>,
-    mut q_changed_value: Query<(&mut Text, &BindValues<T>)>,
+    q_changed_value: Query<(Entity, &BindValues<T>), With<Text>>,
+    mut writer: TextUiWriter,
 ) {
     for ev in ev_reader.read() {
-        let Ok((mut text_input_value, bind_values)) = q_changed_value.get_mut(ev.0) else {
+        let Ok((text_input_entity, bind_values)) = q_changed_value.get(ev.0) else {
             continue;
         };
 
@@ -26,8 +26,8 @@ fn on_need_update_value<T: ReactableValue>(
             };
 
             if let ReactableFields::Text { section } = bind_value.field {
-                if let Some(section) = text_input_value.sections.get_mut(section) {
-                    section.value = react_value.as_value();
+                if let Some(mut section) = writer.get_text(text_input_entity, section) {
+                    *section = react_value.as_value();
                 } else {
                     error!("Text missing {section} section but is bound to value!");
                 }
diff --git a/cosmos_client/src/ui/settings/mod.rs b/cosmos_client/src/ui/settings/mod.rs
index 0e4266f9b..3afdb7d97 100644
--- a/cosmos_client/src/ui/settings/mod.rs
+++ b/cosmos_client/src/ui/settings/mod.rs
@@ -8,9 +8,8 @@ use crate::{
     settings::{Setting, SettingCategory, SettingConstraint, SettingData},
     ui::{
         components::{
-            button::{Button, ButtonBundle, ButtonEvent, ButtonStyles},
-            scollable_container::ScrollBundle,
-            text_input::{InputType, InputValue, TextInput, TextInputBundle},
+            button::{Button, ButtonEvent, ButtonStyles},
+            text_input::{InputType, InputValue, TextInput},
         },
         reactivity::{BindValue, BindValues, ReactableFields, ReactableValue},
     },
@@ -19,8 +18,10 @@ use crate::{
 use super::{
     components::{
         button::register_button,
-        slider::{Slider, SliderBundle, SliderValue},
+        scollable_container::ScrollBox,
+        slider::{Slider, SliderValue},
     },
+    font::DefaultFont,
     reactivity::add_reactable_type,
     UiSystemSet,
 };
@@ -50,11 +51,11 @@ struct SettingsMenu;
 
 fn create_settings_screen(
     mut commands: Commands,
-    asset_server: Res<AssetServer>,
     q_ui_root: Query<Entity, (Without<SettingsMenu>, With<NeedsSettingsAdded>)>,
     settings: Res<Registry<Setting>>,
     lang: Res<Lang<Setting>>,
-    mut q_style: Query<&mut Style, With<NeedsSettingsAdded>>,
+    mut q_style: Query<&mut Node, With<NeedsSettingsAdded>>,
+    default_font: Res<DefaultFont>,
 ) {
     let Ok(main_menu_root) = q_ui_root.get_single() else {
         return;
@@ -62,20 +63,22 @@ fn create_settings_screen(
 
     let cool_blue = Srgba::hex("00FFFF").unwrap().into();
 
-    let text_style_large = TextStyle {
-        color: cool_blue,
+    let blue_text = TextColor(cool_blue);
+    let text_style_large = TextFont {
         font_size: 64.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        font: default_font.0.clone(),
+        ..Default::default()
     };
-    let text_style = TextStyle {
-        color: Color::WHITE,
+
+    let text_style = TextFont {
         font_size: 32.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        font: default_font.0.clone(),
+        ..Default::default()
     };
-    let text_style_small = TextStyle {
-        color: Color::WHITE,
+    let text_style_small = TextFont {
         font_size: 24.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        font: default_font.0.clone(),
+        ..Default::default()
     };
 
     q_style
@@ -84,27 +87,25 @@ fn create_settings_screen(
         .flex_direction = FlexDirection::Column;
 
     commands.entity(main_menu_root).insert(SettingsMenu).with_children(|p| {
-        p.spawn(TextBundle {
-            text: Text::from_section("SETTINGS", text_style_large.clone()),
-            style: Style {
+        p.spawn((
+            Text::new("SETTINGS"),
+            text_style_large,
+            blue_text,
+            Node {
                 margin: UiRect::new(Val::Px(0.0), Val::Px(0.0), Val::Px(100.0), Val::Px(70.0)),
                 align_self: AlignSelf::Center,
                 ..Default::default()
             },
-            ..Default::default()
-        });
+        ));
 
-        p.spawn(ScrollBundle {
-            node_bundle: NodeBundle {
-                style: Style {
-                    flex_grow: 1.0,
-                    margin: UiRect::new(Val::Percent(10.0), Val::Percent(10.0), Val::Px(0.0), Val::Px(0.0)),
-                    ..Default::default()
-                },
+        p.spawn((
+            Node {
+                flex_grow: 1.0,
+                margin: UiRect::new(Val::Percent(10.0), Val::Percent(10.0), Val::Px(0.0), Val::Px(0.0)),
                 ..Default::default()
             },
-            ..Default::default()
-        })
+            ScrollBox::default(),
+        ))
         .with_children(|p| {
             let mut categorized_settings: HashMap<SettingCategory, Vec<(&Setting, &str)>> = HashMap::default();
             for setting in settings.iter() {
@@ -129,27 +130,24 @@ fn create_settings_screen(
                     SettingCategory::Audio => "Audio",
                 };
 
-                p.spawn(TextBundle {
-                    text: Text::from_section(category_display_name, text_style.clone()),
-                    style: Style {
+                p.spawn((
+                    Text::new(category_display_name),
+                    text_style.clone(),
+                    Node {
                         margin: UiRect::bottom(Val::Px(20.0)),
                         align_self: AlignSelf::Center,
                         ..Default::default()
                     },
-                    ..Default::default()
-                });
+                ));
 
                 settings.sort_by(|(_, x), (_, y)| x.to_lowercase().cmp(&y.to_lowercase()));
 
                 for (setting, display_name) in settings {
-                    p.spawn(NodeBundle {
-                        style: Style {
-                            width: Val::Percent(100.0),
-                            justify_content: JustifyContent::Center,
-                            column_gap: Val::Px(20.0),
-                            margin: UiRect::bottom(Val::Px(20.0)),
-                            ..Default::default()
-                        },
+                    p.spawn(Node {
+                        width: Val::Percent(100.0),
+                        justify_content: JustifyContent::Center,
+                        column_gap: Val::Px(20.0),
+                        margin: UiRect::bottom(Val::Px(20.0)),
                         ..Default::default()
                     })
                     .with_children(|p| {
@@ -164,13 +162,11 @@ fn create_settings_screen(
                                     setting_id: setting.id(),
                                     value: input_value.clone(),
                                 },
-                                TextBundle {
-                                    text: Text::from_section(display_name, text_style.clone()),
-                                    style: Style {
-                                        width: Val::Px(500.0),
-                                        align_self: AlignSelf::Center,
-                                        ..Default::default()
-                                    },
+                                Text::new(display_name),
+                                text_style.clone(),
+                                Node {
+                                    width: Val::Px(500.0),
+                                    align_self: AlignSelf::Center,
                                     ..Default::default()
                                 },
                             ))
@@ -180,36 +176,31 @@ fn create_settings_screen(
                             None => {
                                 p.spawn((
                                     BindValues::single(BindValue::<WrittenSetting>::new(data_ent, ReactableFields::Value)),
-                                    TextInputBundle {
-                                        text_input: TextInput {
-                                            style: text_style_small.clone(),
-                                            input_type: match &setting.data {
-                                                SettingData::I32(_) => InputType::Integer {
-                                                    min: i32::MIN as i64,
-                                                    max: i32::MAX as i64,
-                                                },
-                                                SettingData::String(_) => InputType::Text { max_length: None },
+                                    text_style_small.clone(),
+                                    TextInput {
+                                        input_type: match &setting.data {
+                                            SettingData::I32(_) => InputType::Integer {
+                                                min: i32::MIN as i64,
+                                                max: i32::MAX as i64,
                                             },
-                                            ..Default::default()
+                                            SettingData::String(_) => InputType::Text { max_length: None },
                                         },
-                                        value: InputValue::new(input_value),
-                                        node_bundle: NodeBundle {
-                                            border_color: Srgba::hex("555555").unwrap().into(),
-                                            background_color: Srgba::hex("111111").unwrap().into(),
-                                            style: Style {
-                                                border: UiRect::all(Val::Px(2.0)),
-                                                width: Val::Px(150.0),
-                                                height: Val::Px(45.0),
-                                                align_self: AlignSelf::Center,
-                                                padding: UiRect {
-                                                    top: Val::Px(4.0),
-                                                    bottom: Val::Px(4.0),
-                                                    ..Default::default()
-                                                },
-                                                ..Default::default()
-                                            },
+                                        ..Default::default()
+                                    },
+                                    InputValue::new(input_value),
+                                    BorderColor(Srgba::hex("555555").unwrap().into()),
+                                    BackgroundColor(Srgba::hex("111111").unwrap().into()),
+                                    Node {
+                                        border: UiRect::all(Val::Px(2.0)),
+                                        width: Val::Px(150.0),
+                                        height: Val::Px(45.0),
+                                        align_self: AlignSelf::Center,
+                                        padding: UiRect {
+                                            top: Val::Px(4.0),
+                                            bottom: Val::Px(4.0),
                                             ..Default::default()
                                         },
+                                        ..Default::default()
                                     },
                                 ));
                             }
@@ -218,33 +209,25 @@ fn create_settings_screen(
                                     panic!("Cannot have f32 constraint for non-f32 value!");
                                 };
 
-                                p.spawn(NodeBundle {
-                                    style: Style {
-                                        width: Val::Px(300.0),
-                                        justify_content: JustifyContent::SpaceBetween,
-                                        ..Default::default()
-                                    },
+                                p.spawn(Node {
+                                    width: Val::Px(300.0),
+                                    justify_content: JustifyContent::SpaceBetween,
                                     ..Default::default()
                                 })
                                 .with_children(|p| {
                                     p.spawn((
                                         BindValues::single(BindValue::<WrittenSetting>::new(data_ent, ReactableFields::Value)),
-                                        SliderBundle {
-                                            slider_value: SliderValue::new(value as i64),
-                                            slider: Slider {
-                                                min: min as i64,
-                                                max: max as i64,
-                                                background_color: Srgba::hex("111111").unwrap().into(),
-                                                foreground_color: Srgba::hex("555555").unwrap().into(),
-                                                ..Default::default()
-                                            },
-                                            node_bundle: NodeBundle {
-                                                style: Style {
-                                                    width: Val::Px(200.0),
-                                                    ..Default::default()
-                                                },
-                                                ..Default::default()
-                                            },
+                                        SliderValue::new(value as i64),
+                                        Slider {
+                                            min: min as i64,
+                                            max: max as i64,
+                                            background_color: Srgba::hex("111111").unwrap().into(),
+                                            foreground_color: Srgba::hex("555555").unwrap().into(),
+                                            ..Default::default()
+                                        },
+                                        Node {
+                                            width: Val::Px(200.0),
+                                            ..Default::default()
                                         },
                                     ));
 
@@ -253,10 +236,8 @@ fn create_settings_screen(
                                             data_ent,
                                             ReactableFields::Text { section: 0 },
                                         )),
-                                        TextBundle {
-                                            text: Text::from_section(format!("{value}"), text_style_small.clone()),
-                                            ..Default::default()
-                                        },
+                                        Text::new(format!("{value}")),
+                                        text_style_small.clone(),
                                     ));
                                 });
                             }
@@ -266,66 +247,57 @@ fn create_settings_screen(
             }
         });
 
-        p.spawn(NodeBundle {
-            style: Style {
-                width: Val::Percent(100.0),
-                justify_content: JustifyContent::Center,
-                margin: UiRect::new(Val::Px(0.0), Val::Px(0.0), Val::Px(70.0), Val::Px(30.0)),
-                column_gap: Val::Px(50.0),
-                ..Default::default()
-            },
+        p.spawn(Node {
+            width: Val::Percent(100.0),
+            justify_content: JustifyContent::Center,
+            margin: UiRect::new(Val::Px(0.0), Val::Px(0.0), Val::Px(70.0), Val::Px(30.0)),
+            column_gap: Val::Px(50.0),
             ..Default::default()
         })
         .with_children(|p| {
-            p.spawn(ButtonBundle::<SettingsCancelButtonEvent> {
-                node_bundle: NodeBundle {
-                    border_color: cool_blue.into(),
-                    style: Style {
-                        border: UiRect::all(Val::Px(2.0)),
-                        width: Val::Px(500.0),
-                        height: Val::Px(70.0),
-                        align_self: AlignSelf::Center,
-                        margin: UiRect::top(Val::Px(20.0)),
-                        ..Default::default()
-                    },
+            p.spawn((
+                BorderColor(cool_blue),
+                Node {
+                    border: UiRect::all(Val::Px(2.0)),
+                    width: Val::Px(500.0),
+                    height: Val::Px(70.0),
+                    align_self: AlignSelf::Center,
+                    margin: UiRect::top(Val::Px(20.0)),
                     ..Default::default()
                 },
-                button: Button {
+                Button::<SettingsCancelButtonEvent> {
                     button_styles: Some(ButtonStyles {
                         background_color: Srgba::hex("333333").unwrap().into(),
                         hover_background_color: Srgba::hex("232323").unwrap().into(),
                         press_background_color: Srgba::hex("111111").unwrap().into(),
                         ..Default::default()
                     }),
-                    text: Some(("Cancel".into(), text_style.clone())),
+                    text: Some(("Cancel".into(), text_style.clone(), Default::default())),
                     ..Default::default()
                 },
-            });
-
-            p.spawn(ButtonBundle::<SettingsDoneButtonEvent> {
-                node_bundle: NodeBundle {
-                    border_color: cool_blue.into(),
-                    style: Style {
-                        border: UiRect::all(Val::Px(2.0)),
-                        width: Val::Px(500.0),
-                        height: Val::Px(70.0),
-                        align_self: AlignSelf::Center,
-                        margin: UiRect::top(Val::Px(20.0)),
-                        ..Default::default()
-                    },
+            ));
+
+            p.spawn((
+                BorderColor(cool_blue),
+                Node {
+                    border: UiRect::all(Val::Px(2.0)),
+                    width: Val::Px(500.0),
+                    height: Val::Px(70.0),
+                    align_self: AlignSelf::Center,
+                    margin: UiRect::top(Val::Px(20.0)),
                     ..Default::default()
                 },
-                button: Button {
+                Button::<SettingsDoneButtonEvent> {
                     button_styles: Some(ButtonStyles {
                         background_color: Srgba::hex("333333").unwrap().into(),
                         hover_background_color: Srgba::hex("232323").unwrap().into(),
                         press_background_color: Srgba::hex("111111").unwrap().into(),
                         ..Default::default()
                     }),
-                    text: Some(("Done".into(), text_style.clone())),
+                    text: Some(("Done".into(), text_style.clone(), Default::default())),
                     ..Default::default()
                 },
-            });
+            ));
         });
     });
 }
@@ -394,7 +366,7 @@ pub(super) fn register(app: &mut App) {
                 .in_set(UiSystemSet::DoUi)
                 .before(SettingsMenuSet::SettingsMenuInteractions),
             done_clicked
-                .run_if(on_event::<SettingsDoneButtonEvent>())
+                .run_if(on_event::<SettingsDoneButtonEvent>)
                 .in_set(SettingsMenuSet::SettingsMenuInteractions),
         ),
     )
diff --git a/cosmos_client/src/ui/ship_flight/indicators.rs b/cosmos_client/src/ui/ship_flight/indicators.rs
index a0b1d4930..f43f7bfa6 100644
--- a/cosmos_client/src/ui/ship_flight/indicators.rs
+++ b/cosmos_client/src/ui/ship_flight/indicators.rs
@@ -18,6 +18,7 @@ use crate::{
     asset::asset_loader::load_assets,
     input::inputs::{CosmosInputs, InputChecker, InputHandler},
     rendering::MainCamera,
+    ui::font::DefaultFont,
 };
 
 use super::super::components::show_cursor::no_open_menus;
@@ -77,17 +78,18 @@ fn create_indicator(
     images: &mut Assets<Image>,
     color: Color,
     indicator_images: &mut IndicatorImages,
-    asset_server: &AssetServer,
+    default_font: &DefaultFont,
 ) {
-    let text_style = TextStyle {
-        color,
+    let text_color = TextColor(color);
+    let text_font = TextFont {
+        font: default_font.0.clone(),
         font_size: 16.0,
-        font: asset_server.load("fonts/PixeloidSans.ttf"),
+        ..Default::default()
     };
-
+    let text_style = (text_font, text_color);
     let text_ent = commands
-        .spawn(TextBundle {
-            style: Style {
+        .spawn((
+            Node {
                 align_self: AlignSelf::Center,
                 margin: UiRect {
                     // Horizontally centers the text - textalign center doesn't work for some reason (shrug)
@@ -97,10 +99,10 @@ fn create_indicator(
                 },
                 ..default()
             },
-            visibility: Visibility::Hidden,
-            text: Text::from_section("", text_style),
-            ..default()
-        })
+            Visibility::Hidden,
+            Text::new(""),
+            text_style.clone(),
+        ))
         .id();
 
     let indicator_entity = commands
@@ -108,11 +110,8 @@ fn create_indicator(
             Name::new("Indicator Waypoint"),
             IndicatorTextEntity(text_ent),
             Indicating(entity),
-            NodeBundle {
-                style: Style {
-                    position_type: PositionType::Absolute,
-                    ..Default::default()
-                },
+            Node {
+                position_type: PositionType::Absolute,
                 ..Default::default()
             },
         ))
@@ -151,9 +150,9 @@ fn create_indicator(
 
             let (w, h) = (img.width() as f32, img.height() as f32);
 
-            p.spawn(ImageBundle {
-                image: UiImage::new(handle),
-                style: Style {
+            p.spawn((
+                ImageNode::new(handle),
+                Node {
                     width: Val::Px(w),
                     height: Val::Px(h),
                     margin: UiRect {
@@ -163,8 +162,7 @@ fn create_indicator(
                     },
                     ..Default::default()
                 },
-                ..Default::default()
-            })
+            ))
             .add_child(text_ent);
         })
         .id();
@@ -186,7 +184,7 @@ fn add_indicators(
     indicator_image: Res<IndicatorImage>,
     mut images: ResMut<Assets<Image>>,
     mut indicator_images: ResMut<IndicatorImages>,
-    asset_server: Res<AssetServer>,
+    default_font: Res<DefaultFont>,
     q_text_entity_with_focus: Query<&IndicatorTextEntity, With<FocusedWaypointEntity>>,
 ) {
     let despawn_indicator = |(entity, indicator): (Entity, &HasIndicator)| {
@@ -222,7 +220,7 @@ fn add_indicators(
                 if let Some(has_indicator) = has_indicator {
                     if let Ok(text_entity) = q_text_entity_with_focus.get(has_indicator.0) {
                         if let Ok(mut text) = text_query.get_mut(text_entity.0) {
-                            text.sections[0].value = get_distance_text(distance_sqrd.sqrt());
+                            text.0 = get_distance_text(distance_sqrd.sqrt());
                         }
                     }
                 } else {
@@ -233,7 +231,7 @@ fn add_indicators(
                         &mut images,
                         indicator_settings.color,
                         &mut indicator_images,
-                        &asset_server,
+                        &default_font,
                     );
                 }
             } else if let Some(has_indicator) = has_indicator {
@@ -292,7 +290,7 @@ fn added(
 
 fn position_diamonds(
     cam_query: Query<(&Camera, &GlobalTransform), With<MainCamera>>,
-    mut indicators: Query<(Entity, &mut Style, &Indicating)>,
+    mut indicators: Query<(Entity, &mut Node, &Indicating)>,
     global_trans_query: Query<&GlobalTransform>,
     indicator_settings_query: Query<&IndicatorSettings>,
     mut commands: Commands,
@@ -447,7 +445,7 @@ pub(super) fn register(app: &mut App) {
         vec!["cosmos/images/ui/diamond.png"],
         |mut commands, mut handles| {
             let (handle, state) = handles.remove(0);
-            if state != LoadState::Loaded {
+            if !matches!(state, LoadState::Loaded) {
                 warn!("Failed to load diamond.png for ship UI!");
                 return;
             }
diff --git a/cosmos_client/src/ui/ship_flight/stats_display.rs b/cosmos_client/src/ui/ship_flight/stats_display.rs
index 0b8e1b745..133f7980d 100644
--- a/cosmos_client/src/ui/ship_flight/stats_display.rs
+++ b/cosmos_client/src/ui/ship_flight/stats_display.rs
@@ -12,11 +12,9 @@ use bevy::{
         system::{Commands, Query, Res},
     },
     hierarchy::BuildChildren,
-    text::{Text, TextStyle},
-    ui::{
-        node_bundles::{NodeBundle, TextBundle},
-        FlexDirection, PositionType, Style, UiRect, Val,
-    },
+    prelude::{ChildBuild, Text},
+    text::{TextColor, TextFont},
+    ui::{FlexDirection, Node, PositionType, UiRect, Val},
 };
 use bevy_rapier3d::dynamics::Velocity;
 use cosmos_core::{
@@ -53,51 +51,41 @@ fn create_nodes(
 
         let font = asset_server.load("fonts/PixeloidSans.ttf");
 
-        let text_style_energy = TextStyle {
-            color: css::YELLOW.into(),
-            font_size: 32.0,
-            font: font.clone(),
-        };
-        let text_style_speed = TextStyle {
-            color: css::AQUAMARINE.into(),
-            font_size: 32.0,
-            font: font.clone(),
-        };
+        let text_style_energy = (
+            TextColor(css::YELLOW.into()),
+            TextFont {
+                font_size: 32.0,
+                font: font.clone(),
+                ..Default::default()
+            },
+        );
+
+        let text_style_speed = (
+            TextColor(css::AQUAMARINE.into()),
+            TextFont {
+                font_size: 32.0,
+                font: font.clone(),
+                ..Default::default()
+            },
+        );
 
         commands
             .spawn((
                 Name::new("Ship stats ui"),
                 // TargetCamera(ui_root),
                 StatsNodes,
-                NodeBundle {
-                    style: Style {
-                        padding: UiRect::all(Val::Px(10.0)),
-                        width: Val::Percent(100.0),
-                        height: Val::Percent(100.0),
-                        flex_direction: FlexDirection::Column,
-                        position_type: PositionType::Absolute,
-                        ..Default::default()
-                    },
+                Node {
+                    padding: UiRect::all(Val::Px(10.0)),
+                    width: Val::Percent(100.0),
+                    height: Val::Percent(100.0),
+                    flex_direction: FlexDirection::Column,
+                    position_type: PositionType::Absolute,
                     ..Default::default()
                 },
             ))
             .with_children(|p| {
-                p.spawn((
-                    Name::new("Energy Text"),
-                    EnergyText,
-                    TextBundle {
-                        text: Text::from_section("", text_style_energy),
-                        ..Default::default()
-                    },
-                ));
-                p.spawn((
-                    Name::new("Speed Text"),
-                    SpeedText,
-                    TextBundle {
-                        text: Text::from_section("", text_style_speed),
-                        ..Default::default()
-                    },
-                ));
+                p.spawn((Name::new("Energy Text"), EnergyText, Text::new(""), text_style_energy));
+                p.spawn((Name::new("Speed Text"), SpeedText, Text::new(""), text_style_speed));
             });
     }
 }
@@ -119,7 +107,7 @@ fn update_nodes(
     };
 
     if let Ok(mut text) = q_speed_text.get_single_mut() {
-        text.sections[0].value = format!("Speed: {:.1}m/s", piloting_vel.linvel.length());
+        text.0 = format!("Speed: {:.1}m/s", piloting_vel.linvel.length());
     }
 
     if let Ok(mut text) = q_energy_text.get_single_mut() {
@@ -130,7 +118,7 @@ fn update_nodes(
                 0.0
             };
 
-            text.sections[0].value = format!("Energy {}%", (percent * 100.0).round());
+            text.0 = format!("Energy {}%", (percent * 100.0).round());
         }
     }
 }
diff --git a/cosmos_client/src/universe/map/mod.rs b/cosmos_client/src/universe/map/mod.rs
index a3a31c4a8..0e976d0e3 100644
--- a/cosmos_client/src/universe/map/mod.rs
+++ b/cosmos_client/src/universe/map/mod.rs
@@ -4,25 +4,25 @@ use std::f32::consts::PI;
 
 use bevy::{
     app::Update,
-    asset::{AssetServer, Assets, Handle},
-    color::{palettes::css, Alpha, Color},
+    asset::{AssetServer, Assets},
+    color::{palettes::css, Alpha},
     core::Name,
-    core_pipeline::bloom::BloomSettings,
+    core_pipeline::bloom::Bloom,
     input::mouse::{MouseScrollUnit, MouseWheel},
     math::{Dir3, Quat, Vec3},
-    pbr::{PbrBundle, StandardMaterial},
+    pbr::{MeshMaterial3d, StandardMaterial},
     prelude::{
-        in_state, AlphaMode, App, BuildChildren, Camera, Camera3dBundle, Capsule3d, Changed, Commands, Component, Cuboid, Entity,
-        EventReader, IntoSystemConfigs, Mesh, MouseButton, NodeBundle, OnEnter, PerspectiveProjection, Projection, Query, Res, ResMut,
-        Sphere, TextBundle, Transform, TransformBundle, Visibility, VisibilityBundle, With, Without,
+        in_state, AlphaMode, App, BuildChildren, Camera, Camera3d, Capsule3d, Changed, ChildBuild, Commands, Component, Cuboid, Entity,
+        EventReader, IntoSystemConfigs, Mesh, Mesh3d, MouseButton, OnEnter, PerspectiveProjection, Projection, Query, Res, ResMut, Sphere,
+        Text, Transform, Visibility, With, Without,
     },
     reflect::Reflect,
     render::view::RenderLayers,
-    text::{Text, TextStyle},
+    text::TextFont,
     time::Time,
-    ui::{AlignSelf, FlexDirection, JustifyContent, PositionType, Style, TargetCamera, UiRect, Val},
+    ui::{AlignSelf, FlexDirection, JustifyContent, Node, PositionType, TargetCamera, UiRect, Val},
 };
-use bevy_mod_billboard::{BillboardDepth, BillboardTextBundle};
+// use bevy_mod_billboard::{BillboardDepth, BillboardTextBundle};
 use cosmos_core::{
     ecs::NeedsDespawned,
     netty::{client::LocalPlayer, sync::events::client_event::NettyEventWriter, system_sets::NetworkingSystemsSet},
@@ -79,23 +79,21 @@ impl Default for MapCamera {
 
 fn create_map_camera(mut commands: Commands) {
     commands.spawn((
-        Camera3dBundle {
-            camera: Camera {
-                hdr: true,
-                msaa_writeback: false, // override all other cameras
-                order: 20,
-                is_active: false,
-                clear_color: bevy::prelude::ClearColorConfig::Custom(css::BLACK.into()),
-                ..Default::default()
-            },
-            transform: Transform::default(),
-            projection: Projection::from(PerspectiveProjection {
-                fov: (90.0 / 180.0) * std::f32::consts::PI,
-                ..Default::default()
-            }),
+        Camera {
+            hdr: true,
+            msaa_writeback: false, // override all other cameras
+            order: 20,
+            is_active: false,
+            clear_color: bevy::prelude::ClearColorConfig::Custom(css::BLACK.into()),
             ..Default::default()
         },
-        BloomSettings { ..Default::default() },
+        Transform::default(),
+        Projection::from(PerspectiveProjection {
+            fov: (90.0 / 180.0) * std::f32::consts::PI,
+            ..Default::default()
+        }),
+        Camera3d::default(),
+        Bloom { ..Default::default() },
         Name::new("Map Camera"),
         RenderLayers::from_layers(&[CAMERA_LAYER]),
         MapCamera::default(),
@@ -138,6 +136,7 @@ fn toggle_map(
     mut q_map_camera: Query<(Entity, &mut Transform), With<MapCamera>>,
     mut nevw_system_map: NettyEventWriter<RequestSystemMap>,
     mut nevw_galaxy_map: NettyEventWriter<RequestGalaxyMap>,
+    q_open_menus: Query<(), With<OpenMenu>>,
 ) {
     if !input_handler.check_just_pressed(CosmosInputs::ToggleMap) {
         return;
@@ -152,6 +151,11 @@ fn toggle_map(
         return;
     }
 
+    if !q_open_menus.is_empty() {
+        // Don't open the map while there are other menus open
+        return;
+    }
+
     let Ok(player_loc) = q_player.get_single() else {
         return;
     };
@@ -166,23 +170,23 @@ fn toggle_map(
             OpenMenu::new(0),
             RenderLayers::from_layers(&[CAMERA_LAYER]),
             Name::new("System map display"),
-            TransformBundle::default(),
-            VisibilityBundle::default(),
+            Transform::default(),
+            Visibility::default(),
             ShowCursor,
         ))
         .id();
 
     let font = asset_server.load("fonts/PixeloidSans.ttf");
-    let big_text = TextStyle {
-        color: Color::WHITE,
+    let big_text = TextFont {
         font_size: 48.0,
         font: font.clone(),
+        ..Default::default()
     };
 
-    let small_text = TextStyle {
-        color: Color::WHITE,
+    let small_text = TextFont {
         font_size: 24.0,
         font: font.clone(),
+        ..Default::default()
     };
 
     commands
@@ -190,15 +194,12 @@ fn toggle_map(
             TargetCamera(map_cam_ent),
             DespawnWith(map_display),
             Name::new("Galaxy map UI root"),
-            NodeBundle {
-                style: Style {
-                    position_type: PositionType::Absolute,
-                    width: Val::Percent(100.0),
-                    height: Val::Percent(100.0),
-                    flex_direction: FlexDirection::Column,
-                    justify_content: JustifyContent::SpaceBetween,
-                    ..Default::default()
-                },
+            Node {
+                position_type: PositionType::Absolute,
+                width: Val::Percent(100.0),
+                height: Val::Percent(100.0),
+                flex_direction: FlexDirection::Column,
+                justify_content: JustifyContent::SpaceBetween,
                 ..Default::default()
             },
         ))
@@ -207,14 +208,11 @@ fn toggle_map(
                 TargetCamera(map_cam_ent),
                 DespawnWith(map_display),
                 Name::new("Galaxy map text UI"),
-                NodeBundle {
-                    style: Style {
-                        justify_content: JustifyContent::Center,
-                        margin: UiRect::top(Val::Px(10.0)),
-                        row_gap: Val::Px(12.0),
-                        flex_direction: FlexDirection::Column,
-                        ..Default::default()
-                    },
+                Node {
+                    justify_content: JustifyContent::Center,
+                    margin: UiRect::top(Val::Px(10.0)),
+                    row_gap: Val::Px(12.0),
+                    flex_direction: FlexDirection::Column,
                     ..Default::default()
                 },
             ))
@@ -222,77 +220,70 @@ fn toggle_map(
                 p.spawn((
                     Name::new("Sector text"),
                     MapSelectedSectorText,
-                    TextBundle {
-                        style: Style {
-                            align_self: AlignSelf::Center,
-                            ..Default::default()
-                        },
-                        text: Text::from_section("", big_text.clone()),
+                    Node {
+                        align_self: AlignSelf::Center,
                         ..Default::default()
                     },
+                    Text::new(""),
+                    big_text.clone(),
                 ));
                 p.spawn((
                     Name::new("Waypoint text"),
                     WaypointText,
-                    TextBundle {
-                        style: Style {
-                            align_self: AlignSelf::Center,
-                            ..Default::default()
-                        },
-                        text: Text::from_section("", small_text.clone()),
+                    Node {
+                        align_self: AlignSelf::Center,
                         ..Default::default()
                     },
+                    Text::new(""),
+                    small_text.clone(),
                 ));
             });
 
             p.spawn((
                 Name::new("Controls text"),
-                NodeBundle {
-                    style: Style {
-                        width: Val::Percent(100.0),
-                        flex_direction: FlexDirection::Column,
-                        margin: UiRect::all(Val::Px(30.0)),
-                        ..Default::default()
-                    },
+                Node {
+                    width: Val::Percent(100.0),
+                    flex_direction: FlexDirection::Column,
+                    margin: UiRect::all(Val::Px(30.0)),
                     ..Default::default()
                 },
             ))
             .with_children(|p| {
-                p.spawn((TextBundle {
-                    style: Style {
+                p.spawn((
+                    Node {
                         width: Val::Percent(100.0),
                         ..Default::default()
                     },
-                    text: Text::from_section("WASD to Move", small_text.clone()),
-                    ..Default::default()
-                },));
+                    Text::new("WASDEQ to Move"),
+                    small_text.clone(),
+                ));
 
-                p.spawn((TextBundle {
-                    style: Style {
+                p.spawn((
+                    Node {
                         width: Val::Percent(100.0),
                         ..Default::default()
                     },
-                    text: Text::from_section("Scroll to Zoom", small_text.clone()),
-                    ..Default::default()
-                },));
+                    Text::new("Scroll to Zoom"),
+                    small_text.clone(),
+                ));
 
-                p.spawn((TextBundle {
-                    style: Style {
+                p.spawn((
+                    Node {
                         width: Val::Percent(100.0),
                         ..Default::default()
                     },
-                    text: Text::from_section("R to Reset to Your Sector", small_text.clone()),
-                    ..Default::default()
-                },));
+                    Text::new("R to Reset to Your Sector"),
+                    small_text.clone(),
+                ));
 
-                p.spawn((TextBundle {
-                    style: Style {
+                p.spawn((
+                    Node {
                         width: Val::Percent(100.0),
                         ..Default::default()
                     },
-                    text: Text::from_section("Enter to Set/Unset Waypoint", small_text.clone()),
-                    ..Default::default()
-                },));
+                    Text::new("Enter to Set/Unset Waypoint"),
+                    small_text.clone(),
+                ));
             });
         });
     nevw_system_map.send(RequestSystemMap { system: player_system });
@@ -310,7 +301,7 @@ fn update_waypoint_text(q_waypoint: Query<&Location, With<Waypoint>>, mut q_text
         .map(|x| format!("{}, {}, {}", x.sector.x(), x.sector.y(), x.sector.z()))
         .unwrap_or("<enter to set>".to_owned());
 
-    text.sections[0].value = format!("Waypoint: {}", waypoint_text);
+    text.as_mut().0 = format!("Waypoint: {}", waypoint_text);
 }
 
 fn update_sector_text(q_cam: Query<&MapCamera, Changed<MapCamera>>, mut q_text: Query<&mut Text, With<MapSelectedSectorText>>) {
@@ -322,7 +313,7 @@ fn update_sector_text(q_cam: Query<&MapCamera, Changed<MapCamera>>, mut q_text:
         return;
     };
 
-    text.sections[0].value = format!("{}, {}, {}", cam.sector.x(), cam.sector.y(), cam.sector.z());
+    text.as_mut().0 = format!("{}, {}, {}", cam.sector.x(), cam.sector.y(), cam.sector.z());
 }
 
 const SECTOR_SCALE: f32 = 1.0;
@@ -342,7 +333,7 @@ fn position_camera(mut q_camera: Query<(&mut Transform, &mut MapCamera)>) {
 
 fn handle_waypoint_sector(
     mut materials: ResMut<Assets<StandardMaterial>>,
-    mut q_selected_sector: Query<(&mut Visibility, &mut Transform, &Handle<StandardMaterial>), With<WaypointSector>>,
+    mut q_selected_sector: Query<(&mut Visibility, &mut Transform, &MeshMaterial3d<StandardMaterial>), With<WaypointSector>>,
     q_waypoint: Query<&Location, With<Waypoint>>,
     time: Res<Time>,
     mut q_sector_text: Query<&mut Text, With<WaypointSectorText>>,
@@ -362,17 +353,17 @@ fn handle_waypoint_sector(
     sector_trans.translation = Vec3::new(ws.x() as f32, ws.y() as f32, ws.z() as f32) * SECTOR_SCALE;
 
     let standard_material = materials.get_mut(standard_material).expect("Material missing");
-    standard_material.base_color.set_alpha(time.elapsed_seconds().sin().abs() * 0.1);
+    standard_material.base_color.set_alpha(time.elapsed_secs().sin().abs() * 0.1);
 
     let Ok(mut text) = q_sector_text.get_single_mut() else {
         return;
     };
 
-    text.sections[0].value = format!("{}, {}, {}", ws.x(), ws.y(), ws.z());
+    text.as_mut().0 = format!("{}, {}, {}", ws.x(), ws.y(), ws.z());
 }
 fn handle_selected_sector(
     mut materials: ResMut<Assets<StandardMaterial>>,
-    mut q_selected_sector: Query<(&mut Transform, &Handle<StandardMaterial>), (With<SelectedSector>, Without<MapCamera>)>,
+    mut q_selected_sector: Query<(&mut Transform, &MeshMaterial3d<StandardMaterial>), (With<SelectedSector>, Without<MapCamera>)>,
     q_camera: Query<&MapCamera>,
     time: Res<Time>,
     mut q_sector_text: Query<&mut Text, With<SelectedSectorText>>,
@@ -387,13 +378,13 @@ fn handle_selected_sector(
 
     sector_trans.translation = cam.lerp_sector;
     let standard_material = materials.get_mut(standard_material).expect("Material missing");
-    standard_material.base_color.set_alpha(time.elapsed_seconds().sin().abs() * 0.1);
+    standard_material.base_color.set_alpha(time.elapsed_secs().sin().abs() * 0.1);
 
     let Ok(mut text) = q_sector_text.get_single_mut() else {
         return;
     };
 
-    text.sections[0].value = format!("{}, {}, {}", cam.sector.x(), cam.sector.y(), cam.sector.z());
+    text.as_mut().0 = format!("{}, {}, {}", cam.sector.x(), cam.sector.y(), cam.sector.z());
 }
 
 #[derive(Component)]
@@ -440,10 +431,10 @@ fn render_galaxy_map(
         // cam_trans.look_at(player_translation, Vec3::Y);
 
         let font = asset_server.load("fonts/PixeloidSans.ttf");
-        let text_style = TextStyle {
-            color: Color::WHITE,
+        let _text_style = TextFont {
             font_size: 22.0,
             font: font.clone(),
+            ..Default::default()
         };
 
         commands.entity(ent).with_children(|p| {
@@ -451,32 +442,29 @@ fn render_galaxy_map(
                 Name::new("Selected Sector"),
                 SelectedSector,
                 RenderLayers::from_layers(&[CAMERA_LAYER]), // https://github.com/bevyengine/bevy/issues/12461
-                PbrBundle {
-                    mesh: meshes.add(Cuboid::new(SECTOR_SCALE, SECTOR_SCALE, SECTOR_SCALE)),
-                    material: materials.add(StandardMaterial {
-                        base_color: css::YELLOW.into(),
-                        unlit: true,
-                        alpha_mode: AlphaMode::Blend,
-                        ..Default::default()
-                    }),
-                    transform: Transform::from_translation(cam.lerp_sector),
+                Mesh3d(meshes.add(Cuboid::new(SECTOR_SCALE, SECTOR_SCALE, SECTOR_SCALE))),
+                MeshMaterial3d(materials.add(StandardMaterial {
+                    base_color: css::YELLOW.into(),
+                    unlit: true,
+                    alpha_mode: AlphaMode::Blend,
                     ..Default::default()
-                },
+                })),
+                Transform::from_translation(cam.lerp_sector),
             ))
             .with_children(|p| {
                 p.spawn((
                     RenderLayers::from_layers(&[CAMERA_LAYER]), // https://github.com/bevyengine/bevy/issues/12461
                     SelectedSectorText,
                     Name::new("Selected text"),
-                    BillboardTextBundle {
-                        billboard_depth: BillboardDepth(false),
-                        transform: Transform::from_scale(Vec3::splat(0.008)),
-                        text: Text::from_section(
-                            format!("{}, {}, {}", cam.sector.x(), cam.sector.y(), cam.sector.z()),
-                            text_style.clone(),
-                        ),
-                        ..Default::default()
-                    },
+                    // BillboardTextBundle {
+                    //     billboard_depth: BillboardDepth(false),
+                    //     transform: Transform::from_scale(Vec3::splat(0.008)),
+                    //     text: Text::from_section(
+                    //         format!("{}, {}, {}", cam.sector.x(), cam.sector.y(), cam.sector.z()),
+                    //         text_style.clone(),
+                    //     ),
+                    //     ..Default::default()
+                    // },
                 ));
             });
 
@@ -484,32 +472,29 @@ fn render_galaxy_map(
                 Name::new("Waypoint Sector"),
                 WaypointSector,
                 RenderLayers::from_layers(&[CAMERA_LAYER]), // https://github.com/bevyengine/bevy/issues/12461
-                PbrBundle {
-                    mesh: meshes.add(Cuboid::new(SECTOR_SCALE, SECTOR_SCALE, SECTOR_SCALE)),
-                    material: materials.add(StandardMaterial {
-                        base_color: css::WHITE.into(),
-                        unlit: true,
-                        alpha_mode: AlphaMode::Blend,
-                        ..Default::default()
-                    }),
-                    visibility: Visibility::Hidden,
+                Mesh3d(meshes.add(Cuboid::new(SECTOR_SCALE, SECTOR_SCALE, SECTOR_SCALE))),
+                MeshMaterial3d(materials.add(StandardMaterial {
+                    base_color: css::WHITE.into(),
+                    unlit: true,
+                    alpha_mode: AlphaMode::Blend,
                     ..Default::default()
-                },
+                })),
+                Visibility::Hidden,
             ))
             .with_children(|p| {
                 p.spawn((
                     RenderLayers::from_layers(&[CAMERA_LAYER]), // https://github.com/bevyengine/bevy/issues/12461
                     WaypointSectorText,
                     Name::new("Waypoint text"),
-                    BillboardTextBundle {
-                        billboard_depth: BillboardDepth(false),
-                        transform: Transform::from_scale(Vec3::splat(0.008)),
-                        text: Text::from_section(
-                            format!("{}, {}, {}", cam.sector.x(), cam.sector.y(), cam.sector.z()),
-                            text_style.clone(),
-                        ),
-                        ..Default::default()
-                    },
+                    // BillboardTextBundle {
+                    //     billboard_depth: BillboardDepth(false),
+                    //     transform: Transform::from_scale(Vec3::splat(0.008)),
+                    //     text: Text::from_section(
+                    //         format!("{}, {}, {}", cam.sector.x(), cam.sector.y(), cam.sector.z()),
+                    //         text_style.clone(),
+                    //     ),
+                    //     ..Default::default()
+                    // },
                 ));
             });
 
@@ -574,12 +559,9 @@ fn render_galaxy_map(
 
                 p.spawn((
                     RenderLayers::from_layers(&[CAMERA_LAYER]), // https://github.com/bevyengine/bevy/issues/12461
-                    PbrBundle {
-                        transform,
-                        mesh,
-                        material,
-                        ..Default::default()
-                    },
+                    transform,
+                    Mesh3d(mesh),
+                    MeshMaterial3d(material),
                 ));
             }
         });
diff --git a/cosmos_client/src/universe/star.rs b/cosmos_client/src/universe/star.rs
index a03236d85..19776f0f7 100644
--- a/cosmos_client/src/universe/star.rs
+++ b/cosmos_client/src/universe/star.rs
@@ -4,10 +4,10 @@ use std::f32::consts::PI;
 
 use bevy::{
     math::primitives::Sphere,
-    pbr::NotShadowCaster,
+    pbr::{MeshMaterial3d, NotShadowCaster},
     prelude::{
-        Added, App, Assets, Commands, DirectionalLight, DirectionalLightBundle, Entity, EulerRot, Mesh, Name, OnEnter, PbrBundle, Quat,
-        Query, ResMut, StandardMaterial, Transform, Update, Vec3, With, Without,
+        Added, App, Assets, Commands, DirectionalLight, Entity, EulerRot, Mesh, Mesh3d, Name, OnEnter, Quat, Query, ResMut,
+        StandardMaterial, Transform, Update, Vec3, With, Without,
     },
 };
 use cosmos_core::{physics::location::SECTOR_DIMENSIONS, state::GameState, universe::star::Star};
@@ -39,17 +39,14 @@ fn create_added_star(
     for (entity, star) in added.iter() {
         commands.entity(entity).insert((
             Name::new("Star"),
-            PbrBundle {
-                mesh: meshes.add(Sphere {
-                    radius: SECTOR_DIMENSIONS * 2.0,
-                }),
-                material: materials.add(StandardMaterial {
-                    base_color: star.color(),
-                    unlit: true,
-                    ..Default::default()
-                }),
+            Mesh3d(meshes.add(Sphere {
+                radius: SECTOR_DIMENSIONS * 2.0,
+            })),
+            MeshMaterial3d(materials.add(StandardMaterial {
+                base_color: star.color(),
+                unlit: true,
                 ..Default::default()
-            },
+            })),
             NotShadowCaster,
         ));
     }
@@ -59,17 +56,14 @@ fn create_added_star(
 fn create_star_light_source(mut commands: Commands) {
     commands.spawn((
         Name::new("Star Light Emitter"),
-        DirectionalLightBundle {
-            directional_light: DirectionalLight {
-                illuminance: 30000.0,
-                shadows_enabled: true,
-                ..Default::default()
-            },
-            transform: Transform {
-                translation: Vec3::ZERO,
-                rotation: Quat::from_euler(EulerRot::XYZ, -PI / 4.0, 0.1, 0.1),
-                ..Default::default()
-            },
+        DirectionalLight {
+            illuminance: 30000.0,
+            shadows_enabled: true,
+            ..Default::default()
+        },
+        Transform {
+            translation: Vec3::ZERO,
+            rotation: Quat::from_euler(EulerRot::XYZ, -PI / 4.0, 0.1, 0.1),
             ..Default::default()
         },
     ));
diff --git a/cosmos_client/src/window/setup.rs b/cosmos_client/src/window/setup.rs
index f7c014129..f5c7dd19f 100644
--- a/cosmos_client/src/window/setup.rs
+++ b/cosmos_client/src/window/setup.rs
@@ -6,7 +6,7 @@ use bevy::{
     window::{CursorGrabMode, PrimaryWindow, WindowFocused},
 };
 use cosmos_core::state::GameState;
-use iyes_perf_ui::entries::PerfUiBundle;
+// use iyes_perf_ui::entries::PerfUiBundle;
 
 #[derive(Resource, Copy, Clone)]
 /// Resource containing the various flags about the cursor, like if it's hidden or not
@@ -58,8 +58,8 @@ fn setup_window(mut primary_query: Query<&mut Window, With<PrimaryWindow>>) {
     let mut window = primary_query.get_single_mut().expect("Missing primary window.");
 
     window.title = "Cosmos".into();
-    window.cursor.visible = false;
-    window.cursor.grab_mode = CursorGrabMode::Locked;
+    window.cursor_options.visible = false;
+    window.cursor_options.grab_mode = CursorGrabMode::Locked;
 }
 
 fn update_mouse_deltas(mut delta: ResMut<DeltaCursorPosition>, mut ev_mouse_motion: EventReader<MouseMotion>) {
@@ -85,19 +85,19 @@ fn window_focus_changed(
         if ev.focused {
             apply_cursor_flags(&mut window, *cursor_flags);
         } else {
-            window.cursor.grab_mode = CursorGrabMode::None;
-            window.cursor.visible = true;
+            window.cursor_options.grab_mode = CursorGrabMode::None;
+            window.cursor_options.visible = true;
         }
     }
 }
 
 fn apply_cursor_flags(window: &mut Window, cursor_flags: CursorFlags) {
-    window.cursor.grab_mode = if cursor_flags.locked {
+    window.cursor_options.grab_mode = if cursor_flags.locked {
         CursorGrabMode::Locked
     } else {
         CursorGrabMode::None
     };
-    window.cursor.visible = cursor_flags.visible;
+    window.cursor_options.visible = cursor_flags.visible;
 }
 
 fn apply_cursor_flags_on_change(cursor_flags: Res<CursorFlags>, mut primary_query: Query<&mut Window, With<PrimaryWindow>>) {
@@ -117,8 +117,8 @@ pub enum CursorFlagsSet {
     ApplyCursorFlagsUpdates,
 }
 
-fn create_debug(mut commands: Commands) {
-    commands.spawn(PerfUiBundle::default());
+fn create_debug(_commands: Commands) {
+    // commands.spawn(PerfUiBundle::default());
 }
 
 pub(super) fn register(app: &mut App) {
diff --git a/cosmos_core/Cargo.toml b/cosmos_core/Cargo.toml
index 82527ddca..2c5ea9528 100644
--- a/cosmos_core/Cargo.toml
+++ b/cosmos_core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cosmos_core"
-version = "0.0.6"
+version = "0.0.7"
 edition = "2021"
 
 [features]
diff --git a/cosmos_core/src/block/block_direction.rs b/cosmos_core/src/block/block_direction.rs
index c5af6fe4f..d72b3737c 100644
--- a/cosmos_core/src/block/block_direction.rs
+++ b/cosmos_core/src/block/block_direction.rs
@@ -3,6 +3,7 @@
 use std::fmt::Display;
 
 use bevy::{
+    log::error,
     math::{vec3, Vec3},
     reflect::Reflect,
 };
@@ -79,7 +80,7 @@ impl BlockDirection {
     }
 
     /// Returns the direction each face represents as a Vec3.
-    pub const fn to_vec3(&self) -> Vec3 {
+    pub const fn as_vec3(&self) -> Vec3 {
         match *self {
             Self::PosX => Vec3::X,
             Self::NegX => Vec3::NEG_X,
@@ -92,11 +93,14 @@ impl BlockDirection {
 
     /// Returns the `Direction` this vec3 represents.
     /// Vector must have one entry non-zero and all others 0 (within tolerance).
+    ///
+    /// If an invalid vector is passed in, [`Self::PosY`] is returned.
     pub fn from_vec3(vec: Vec3) -> Self {
-        debug_assert!(
-            (vec.x.abs() > f32::EPSILON) as u8 + (vec.y.abs() > f32::EPSILON) as u8 + (vec.z.abs() > f32::EPSILON) as u8 == 1,
-            "{vec:?} must have exactly one axis above epsilon."
-        );
+        if (vec.x.abs() > f32::EPSILON) as u8 + (vec.y.abs() > f32::EPSILON) as u8 + (vec.z.abs() > f32::EPSILON) as u8 != 1 {
+            error!("{vec:?} must have exactly one axis above epsilon.");
+            return Self::PosY;
+        }
+
         if vec.x > f32::EPSILON {
             Self::PosX
         } else if vec.x < -f32::EPSILON {
@@ -114,7 +118,7 @@ impl BlockDirection {
 
     /// Returns the integer tuple this direction represents.
     pub const fn to_i32_tuple(&self) -> (i32, i32, i32) {
-        let vec = self.to_vec3();
+        let vec = self.as_vec3();
         (vec.x as i32, vec.y as i32, vec.z as i32)
     }
 
@@ -126,13 +130,13 @@ impl BlockDirection {
 
     /// Returns the direction each face represents as an UnboundBlockCoordinate
     pub const fn to_coordinates(&self) -> UnboundBlockCoordinate {
-        let vec = self.to_vec3();
+        let vec = self.as_vec3();
         UnboundBlockCoordinate::new(vec.x as i64, vec.y as i64, vec.z as i64)
     }
 
     /// Returns the direction each face represents as an UnboundChunkBlockCoordinate
     pub const fn to_chunk_block_coordinates(&self) -> UnboundChunkBlockCoordinate {
-        let vec = self.to_vec3();
+        let vec = self.as_vec3();
         UnboundChunkBlockCoordinate::new(vec.x as i64, vec.y as i64, vec.z as i64)
     }
 
diff --git a/cosmos_core/src/block/block_events.rs b/cosmos_core/src/block/block_events.rs
index 90ccecf12..479774ed9 100644
--- a/cosmos_core/src/block/block_events.rs
+++ b/cosmos_core/src/block/block_events.rs
@@ -2,7 +2,6 @@
 
 use bevy::prelude::*;
 use bevy_rapier3d::prelude::Velocity;
-use serde::{Deserialize, Serialize};
 
 use crate::{
     blockitems::BlockItems,
@@ -10,6 +9,7 @@ use crate::{
         bundles::BundleStartingRotation,
         mut_events::{MutEvent, MutEventsCommand},
     },
+    entities::player::creative::Creative,
     events::block_events::BlockChangedEvent,
     inventory::{
         itemstack::{ItemShouldHaveData, ItemStackSystemSet},
@@ -35,30 +35,19 @@ use super::{
 /// This is sent whenever a player breaks a block
 #[derive(Debug, Event)]
 pub struct BlockBreakEvent {
-    /// The entity that was targeted
-    pub structure_entity: Entity,
     /// The player breaking the block
     pub breaker: Entity,
     /// The block broken with
     pub block: StructureBlock,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone, Copy)]
-/// this is stupid.
-pub struct StructureBlockPair {
-    /// The block interacted with
-    pub structure_block: StructureBlock,
-    /// The structure it is on
-    pub structure_entity: Entity,
-}
-
 /// This is sent whenever a player interacts with a block
 #[derive(Debug, Event)]
 pub struct BlockInteractEvent {
     /// The block that was interacted with by the player
-    pub block: Option<StructureBlockPair>,
+    pub block: Option<StructureBlock>,
     /// Includes blocks normally ignored by most interaction checks
-    pub block_including_fluids: StructureBlockPair,
+    pub block_including_fluids: StructureBlock,
     /// The player that interacted with the block
     pub interactor: Entity,
     /// If this is true, the player was crouching while interacting with this block
@@ -82,8 +71,6 @@ pub enum BlockPlaceEvent {
 /// This is sent whenever a player places a block
 #[derive(Debug, Event, Clone, Copy)]
 pub struct BlockPlaceEventData {
-    /// The structure the block was placed on
-    pub structure_entity: Entity,
     /// Where the block is placed
     pub structure_block: StructureBlock,
     /// The placed block's id
@@ -114,7 +101,7 @@ fn handle_block_break_events(
         // structures in the game
 
         if q_structure.contains(ev.breaker) {
-            let Ok((mut structure, _, _, _)) = q_structure.get_mut(ev.structure_entity) else {
+            let Ok((mut structure, _, _, _)) = q_structure.get_mut(ev.block.structure()) else {
                 continue;
             };
 
@@ -144,7 +131,7 @@ fn handle_block_break_events(
 
                 for (_, mut inventory) in q_inventory_block_data
                     .iter_mut()
-                    .filter(|(block_data, _)| block_data.identifier.structure_entity == ev.breaker)
+                    .filter(|(block_data, _)| block_data.identifier.block.structure() == ev.breaker)
                 {
                     if inventory.insert_item(item, 1, &mut commands, &has_data).0 == 0 {
                         break;
@@ -156,17 +143,21 @@ fn handle_block_break_events(
 
             structure.remove_block_at(coord, &blocks, Some(&mut event_writer));
         } else if let Ok((mut inventory, build_mode, parent)) = inventory_query.get_mut(ev.breaker) {
-            if let Ok((mut structure, s_loc, g_trans, velocity)) = q_structure.get_mut(ev.structure_entity) {
+            if let Ok((mut structure, s_loc, g_trans, velocity)) = q_structure.get_mut(ev.block.structure()) {
                 let mut structure_blocks = vec![(ev.block.coords(), BlockRotation::default())];
 
+                let coord = ev.block.coords();
+                let block = structure.block_at(coord, &blocks);
+
                 if let (Some(build_mode), Some(parent)) = (build_mode, parent) {
                     structure_blocks = calculate_build_mode_blocks(
                         structure_blocks,
                         build_mode,
                         parent,
-                        ev.structure_entity,
+                        ev.block.structure(),
                         &mut inventory,
                         &structure,
+                        block,
                     );
                 }
 
@@ -249,6 +240,7 @@ fn calculate_build_mode_blocks(
     structure_entity: Entity,
     inventory: &mut Mut<'_, Inventory>,
     structure: &Structure,
+    block: &Block,
 ) -> Vec<(BlockCoordinate, BlockRotation)> {
     if parent.get() != structure_entity {
         // Tried to place a block on a structure they're not in build mode on
@@ -315,15 +307,8 @@ fn calculate_build_mode_blocks(
                     let new_block_rotation = match block_rotation {
                         BlockRotation {
                             face_pointing_pos_y: BlockFace::Top | BlockFace::Bottom,
-                            sub_rotation: BlockSubRotation::Flip | BlockSubRotation::None,
+                            sub_rotation: _,
                         } => block_rotation.inverse(),
-                        BlockRotation {
-                            face_pointing_pos_y: BlockFace::Top | BlockFace::Bottom,
-                            sub_rotation: BlockSubRotation::CCW | BlockSubRotation::CW,
-                        } => BlockRotation {
-                            face_pointing_pos_y: block_rotation.face_pointing_pos_y.inverse(),
-                            sub_rotation: block_rotation.sub_rotation,
-                        },
                         BlockRotation {
                             face_pointing_pos_y: BlockFace::Right | BlockFace::Left,
                             sub_rotation: BlockSubRotation::CCW | BlockSubRotation::CW,
@@ -333,9 +318,9 @@ fn calculate_build_mode_blocks(
                         },
                         BlockRotation {
                             face_pointing_pos_y: BlockFace::Back | BlockFace::Front,
-                            sub_rotation: BlockSubRotation::Flip | BlockSubRotation::None,
+                            sub_rotation: _,
                         } => BlockRotation {
-                            face_pointing_pos_y: block_rotation.face_pointing_pos_y,
+                            face_pointing_pos_y: block_rotation.face_pointing_pos_y.inverse(),
                             sub_rotation: block_rotation.sub_rotation.inverse(),
                         },
                         _ => block_rotation,
@@ -365,14 +350,21 @@ fn calculate_build_mode_blocks(
                         BlockRotation {
                             face_pointing_pos_y: BlockFace::Back | BlockFace::Front,
                             sub_rotation: BlockSubRotation::None | BlockSubRotation::Flip,
-                        } => block_rotation.inverse(),
+                        } => BlockRotation {
+                            face_pointing_pos_y: block_rotation.face_pointing_pos_y,
+                            sub_rotation: block_rotation.sub_rotation.inverse(),
+                        },
                         BlockRotation {
-                            face_pointing_pos_y: BlockFace::Back | BlockFace::Front,
-                            sub_rotation: BlockSubRotation::CCW | BlockSubRotation::CW,
+                            face_pointing_pos_y: BlockFace::Left | BlockFace::Right,
+                            sub_rotation: BlockSubRotation::CW | BlockSubRotation::CCW,
                         } => BlockRotation {
                             face_pointing_pos_y: block_rotation.face_pointing_pos_y.inverse(),
                             sub_rotation: block_rotation.sub_rotation,
                         },
+                        BlockRotation {
+                            face_pointing_pos_y: BlockFace::Left | BlockFace::Right,
+                            sub_rotation: _,
+                        } => block_rotation.inverse(),
                         BlockRotation {
                             face_pointing_pos_y: _,
                             sub_rotation: BlockSubRotation::None | BlockSubRotation::Flip,
@@ -388,6 +380,16 @@ fn calculate_build_mode_blocks(
             }
         }
 
+        // TODO: Sub rotations aren't properly handled by connected textures.
+        // Nothing that has connected textures and uses sub rotations exists yet, so for now just
+        // disable them on build block placements. This will have to get fixed eventually.
+        let connected = !block.connect_to_groups.is_empty();
+        if connected {
+            for (_, rot) in &mut new_coords {
+                rot.sub_rotation = Default::default();
+            }
+        }
+
         structure_blocks = new_coords;
     }
 
@@ -398,7 +400,7 @@ fn handle_block_place_events(
     mut query: Query<&mut Structure>,
     mut event_reader: EventReader<MutEvent<BlockPlaceEvent>>,
     mut event_writer: EventWriter<BlockChangedEvent>,
-    mut player_query: Query<(&mut Inventory, Option<&BuildMode>, Option<&Parent>)>,
+    mut player_query: Query<(&mut Inventory, Option<&BuildMode>, Option<&Parent>, Option<&Creative>)>,
     items: Res<Registry<Item>>,
     blocks: Res<Registry<Block>>,
     block_items: Res<BlockItems>,
@@ -411,23 +413,36 @@ fn handle_block_place_events(
             continue;
         };
 
-        let Ok((mut inv, build_mode, parent)) = player_query.get_mut(place_event_data.placer) else {
+        let Ok((mut inv, build_mode, parent, creative)) = player_query.get_mut(place_event_data.placer) else {
             continue;
         };
 
-        let Ok(mut structure) = query.get_mut(place_event_data.structure_entity) else {
+        let Ok(mut structure) = query.get_mut(place_event_data.structure_block.structure()) else {
             continue;
         };
         let mut structure_blocks = vec![(place_event_data.structure_block.coords(), place_event_data.block_up)];
 
+        let Some(is) = inv.itemstack_at(place_event_data.inventory_slot) else {
+            break;
+        };
+
+        let item = items.from_numeric_id(is.item_id());
+
+        let Some(block_id) = block_items.block_from_item(item) else {
+            break;
+        };
+
+        let block = blocks.from_numeric_id(block_id);
+
         if let (Some(build_mode), Some(parent)) = (build_mode, parent) {
             structure_blocks = calculate_build_mode_blocks(
                 structure_blocks,
                 build_mode,
                 parent,
-                place_event_data.structure_entity,
+                place_event_data.structure_block.structure(),
                 &mut inv,
                 &structure,
+                block,
             );
         }
 
@@ -436,29 +451,17 @@ fn handle_block_place_events(
                 continue;
             }
 
-            let Some(is) = inv.itemstack_at(place_event_data.inventory_slot) else {
-                break;
-            };
-
-            let item = items.from_numeric_id(is.item_id());
-
-            let Some(block_id) = block_items.block_from_item(item) else {
-                break;
-            };
-
             if block_id != place_event_data.block_id {
                 *ev.write() = BlockPlaceEvent::Cancelled;
                 // May have run out of the item or it was swapped with something else (not really possible currently, but more checks never hurt anyone)
                 break;
             }
 
-            let block = blocks.from_numeric_id(block_id);
-
             if block.unlocalized_name() == "cosmos:ship_core" || block.unlocalized_name() == "cosmos:station_core" {
                 break;
             }
 
-            if inv.decrease_quantity_at(place_event_data.inventory_slot, 1, &mut commands) == 0 {
+            if creative.is_some() || inv.decrease_quantity_at(place_event_data.inventory_slot, 1, &mut commands) == 0 {
                 structure.set_block_at(coords, block, block_up, &blocks, Some(&mut event_writer));
             } else {
                 break;
@@ -481,6 +484,8 @@ pub enum BlockEventsSet {
     /// Please note that at this point, the only event sent may be the [`BlockPlaceEvent`] - not the resulting [`BlockChangedEvent`].
     /// The [`BlockChangedEvent`] is only sent once the block is inserted into the structure (which happens during this set).
     ProcessEventsPrePlacement,
+    /// The structure updates blocks based on the [`BlockPlaceEvent`] and send [`BlockChangedEvent`].
+    ChangeBlocks,
     /// If your event processing relies on the block being placed, run it in this set. The data still is not guarenteed to be present.
     ProcessEvents,
     /// For systems that need information set in the [`BlockEventsSet::ProcessEvents`] stage. Block data should be present.
@@ -497,6 +502,7 @@ pub(super) fn register(app: &mut App) {
             BlockEventsSet::PreProcessEvents,
             BlockEventsSet::SendBlockUpdateEvents,
             BlockEventsSet::ProcessEventsPrePlacement,
+            BlockEventsSet::ChangeBlocks,
             BlockEventsSet::ProcessEvents,
             BlockEventsSet::PostProcessEvents,
             BlockEventsSet::SendEventsForNextFrame,
@@ -513,6 +519,6 @@ pub(super) fn register(app: &mut App) {
             (handle_block_break_events, handle_block_place_events)
                 .chain()
                 .in_set(ItemStackSystemSet::CreateDataEntity)
-                .in_set(BlockEventsSet::ProcessEventsPrePlacement),
+                .in_set(BlockEventsSet::ChangeBlocks),
         );
 }
diff --git a/cosmos_core/src/block/block_rotation.rs b/cosmos_core/src/block/block_rotation.rs
index dd2db9972..354006961 100644
--- a/cosmos_core/src/block/block_rotation.rs
+++ b/cosmos_core/src/block/block_rotation.rs
@@ -31,19 +31,25 @@ impl BlockRotation {
         }
     }
 
+    /// Returns the [`Self::face_pointing_pos_y`] face as a quaternion that will be used to
+    /// complete this rotation.
+    pub fn face_pointing_pos_y_quat(&self) -> Quat {
+        match self.face_pointing_pos_y {
+            BlockFace::Top => Quat::IDENTITY,
+            BlockFace::Bottom => Quat::from_axis_angle(Vec3::X, PI),
+            BlockFace::Back => Quat::from_axis_angle(Vec3::X, -PI / 2.0),
+            BlockFace::Front => Quat::from_axis_angle(Vec3::X, PI / 2.0),
+            BlockFace::Left => Quat::from_axis_angle(Vec3::Z, PI / 2.0),
+            BlockFace::Right => Quat::from_axis_angle(Vec3::Z, -PI / 2.0),
+        }
+    }
+
     /// Returns this rotation's representation as a quaternion.
     pub fn as_quat(&self) -> Quat {
-        self.sub_rotation
-            .as_quat()
-            .mul_quat(match self.face_pointing_pos_y {
-                BlockFace::Top => Quat::IDENTITY,
-                BlockFace::Bottom => Quat::from_axis_angle(Vec3::X, PI),
-                BlockFace::Back => Quat::from_axis_angle(Vec3::X, PI / 2.0),
-                BlockFace::Front => Quat::from_axis_angle(Vec3::X, -PI / 2.0),
-                BlockFace::Left => Quat::from_axis_angle(Vec3::Z, PI / 2.0),
-                BlockFace::Right => Quat::from_axis_angle(Vec3::Z, -PI / 2.0),
-            })
-            .normalize()
+        let quat = self.face_pointing_pos_y_quat();
+        let sub_rotation_quat = self.sub_rotation.as_quat();
+
+        (sub_rotation_quat * quat).normalize()
     }
 
     #[inline(always)]
@@ -60,7 +66,7 @@ impl BlockRotation {
     /// For example, if this rotation makes [`BlockFace::Front`] point [`Direction::NegX`]
     /// and you provide [`BlockFace::Front`], you will be given [`Direction::NegX`].
     pub fn direction_of(&self, face: BlockFace) -> BlockDirection {
-        let unrotated_vec3 = face.direction().to_vec3();
+        let unrotated_vec3 = face.direction().as_vec3();
         let rotated_vec3 = self.as_quat().mul_vec3(unrotated_vec3);
         BlockDirection::from_vec3(rotated_vec3)
     }
@@ -102,16 +108,16 @@ impl BlockRotation {
         match top_face_pointing {
             D::PosX => match front_face_pointing {
                 // The inner match arms are ordered by the resulting sub-rotation to make them easier to visualize.
-                D::NegZ => Self::new(BF::Left, BlockSubRotation::None),
+                D::NegZ => Self::new(BF::Right, BlockSubRotation::None),
                 D::NegY => Self::new(BF::Back, BlockSubRotation::CW),
-                D::PosZ => Self::new(BF::Right, BlockSubRotation::Flip),
+                D::PosZ => Self::new(BF::Right, BlockSubRotation::CCW),
                 D::PosY => Self::new(BF::Front, BlockSubRotation::CCW),
                 _ => panic!("Invalid combination of top and front face directions."),
             },
             D::NegX => match front_face_pointing {
-                D::NegZ => Self::new(BF::Right, BlockSubRotation::None),
+                D::NegZ => Self::new(BF::Right, BlockSubRotation::CW),
                 D::PosY => Self::new(BF::Front, BlockSubRotation::CW),
-                D::PosZ => Self::new(BF::Left, BlockSubRotation::Flip),
+                D::PosZ => Self::new(BF::Left, BlockSubRotation::CW),
                 D::NegY => Self::new(BF::Back, BlockSubRotation::CCW),
                 _ => panic!("Invalid combination of top and front face directions."),
             },
@@ -131,16 +137,16 @@ impl BlockRotation {
             },
             D::PosZ => match front_face_pointing {
                 D::PosY => Self::new(BF::Front, BlockSubRotation::None),
-                D::PosX => Self::new(BF::Left, BlockSubRotation::CW),
+                D::PosX => Self::new(BF::Left, BlockSubRotation::None),
                 D::NegY => Self::new(BF::Back, BlockSubRotation::Flip),
-                D::NegX => Self::new(BF::Right, BlockSubRotation::CCW),
+                D::NegX => Self::new(BF::Right, BlockSubRotation::None),
                 _ => panic!("Invalid combination of top and front face directions."),
             },
             D::NegZ => match front_face_pointing {
                 D::NegY => Self::new(BF::Back, BlockSubRotation::None),
-                D::PosX => Self::new(BF::Right, BlockSubRotation::CW),
+                D::PosX => Self::new(BF::Right, BlockSubRotation::Flip),
                 D::PosY => Self::new(BF::Front, BlockSubRotation::Flip),
-                D::NegX => Self::new(BF::Left, BlockSubRotation::CCW),
+                D::NegX => Self::new(BF::Left, BlockSubRotation::Flip),
                 _ => panic!("Invalid combination of top and front face directions."),
             },
         }
diff --git a/cosmos_core/src/block/block_update.rs b/cosmos_core/src/block/block_update.rs
index 2f1325aa8..91dd449e4 100644
--- a/cosmos_core/src/block/block_update.rs
+++ b/cosmos_core/src/block/block_update.rs
@@ -13,24 +13,19 @@ use super::{block_events::BlockEventsSet, block_face::ALL_BLOCK_FACES};
 #[derive(Debug, Clone, Copy, Event, PartialEq, Eq)]
 /// This event is sent whenever an adjacent block is changed
 pub struct BlockUpdate {
-    structure_entity: Entity,
     block: StructureBlock,
     cancelled: bool,
 }
 
 impl BlockUpdate {
     /// Creates a new block update
-    pub fn new(structure_entity: Entity, block: StructureBlock) -> Self {
-        Self {
-            block,
-            structure_entity,
-            cancelled: false,
-        }
+    pub fn new(block: StructureBlock) -> Self {
+        Self { block, cancelled: false }
     }
 
     /// The structure that was updated
     pub fn structure_entity(&self) -> Entity {
-        self.structure_entity
+        self.block.structure()
     }
 
     /// The block that was changed
@@ -63,7 +58,7 @@ pub fn send_block_updates(
     let block_updates = block_chage_event
         .read()
         .filter_map(|ev| {
-            let Ok(structure) = structure_query.get(ev.structure_entity) else {
+            let Ok(structure) = structure_query.get(ev.block.structure()) else {
                 return None;
             };
 
@@ -77,8 +72,7 @@ pub fn send_block_updates(
                 }
 
                 Some(MutEvent::from(BlockUpdate {
-                    structure_entity: ev.structure_entity,
-                    block: StructureBlock(coord),
+                    block: StructureBlock::new(coord, ev.block.structure()),
                     cancelled: false,
                 }))
             }))
diff --git a/cosmos_core/src/block/blocks/mod.rs b/cosmos_core/src/block/blocks/mod.rs
index 2673798c7..1f7576deb 100644
--- a/cosmos_core/src/block/blocks/mod.rs
+++ b/cosmos_core/src/block/blocks/mod.rs
@@ -468,6 +468,30 @@ fn add_cosmos_blocks(
 
     blocks.register(logic_bus_builder.create());
 
+    blocks.register(
+        BlockBuilder::new("cosmos:door", 4.0, 100.0, 10.0)
+            .add_property(BlockProperty::Full)
+            .create(),
+    );
+    blocks.register(
+        BlockBuilder::new("cosmos:door_open", 4.0, 100.0, 10.0)
+            .add_connection_group("cosmos:door_open")
+            .connect_to_group("cosmos:door_open")
+            .create(),
+    );
+
+    blocks.register(
+        BlockBuilder::new("cosmos:basic_fabricator", 2.0, 20.0, 5.0)
+            .add_property(BlockProperty::Full)
+            .create(),
+    );
+
+    blocks.register(
+        BlockBuilder::new("cosmos:iron_ore", 10.0, 50.0, 12.0)
+            .add_property(BlockProperty::Full)
+            .create(),
+    );
+
     loading.finish_loading(id, &mut end_writer);
 }
 
diff --git a/cosmos_core/src/block/data/mod.rs b/cosmos_core/src/block/data/mod.rs
index bda0d5c83..a1c171f14 100644
--- a/cosmos_core/src/block/data/mod.rs
+++ b/cosmos_core/src/block/data/mod.rs
@@ -35,8 +35,6 @@ pub struct BlockDataIdentifier {
     pub block: StructureBlock,
     /// The block id that this data is for
     pub block_id: u16,
-    /// The structure this block is a part of
-    pub structure_entity: Entity,
 }
 
 impl BlockData {
diff --git a/cosmos_core/src/block/multiblock/reactor.rs b/cosmos_core/src/block/multiblock/reactor.rs
index 489e0a423..c57dffbdb 100644
--- a/cosmos_core/src/block/multiblock/reactor.rs
+++ b/cosmos_core/src/block/multiblock/reactor.rs
@@ -21,7 +21,6 @@ use crate::{
     structure::{
         coordinates::BlockCoordinate,
         loading::StructureLoadingSet,
-        structure_block::StructureBlock,
         systems::{energy_storage_system::EnergyStorageSystem, StructureSystems, StructureSystemsSet},
         Structure,
     },
@@ -39,14 +38,14 @@ pub struct ReactorBounds {
 #[derive(Clone, Copy, Debug, Reflect, Serialize, Deserialize, PartialEq)]
 /// Represents a constructed reactor
 pub struct Reactor {
-    controller: StructureBlock,
+    controller: BlockCoordinate,
     power_per_second: f32,
     bounds: ReactorBounds,
 }
 
 impl Reactor {
     /// Creates a new constructed reactor
-    pub fn new(controller: StructureBlock, power_per_second: f32, bounds: ReactorBounds) -> Self {
+    pub fn new(controller: BlockCoordinate, power_per_second: f32, bounds: ReactorBounds) -> Self {
         Self {
             bounds,
             controller,
@@ -66,7 +65,7 @@ impl Reactor {
     }
 
     /// Returns the block where the controller for this reactor is
-    pub fn controller_block(&self) -> StructureBlock {
+    pub fn controller_block(&self) -> BlockCoordinate {
         self.controller
     }
 }
@@ -159,20 +158,22 @@ fn on_modify_reactor(
     reactor_cells: Res<Registry<ReactorPowerGenerationBlock>>,
 ) {
     for ev in block_change_event.read() {
-        let Ok(mut reactors) = reactors_query.get_mut(ev.structure_entity) else {
+        let Ok(mut reactors) = reactors_query.get_mut(ev.block.structure()) else {
             continue;
         };
 
         reactors.retain_mut(|reactor| {
             let (neg, pos) = (reactor.bounds.negative_coords, reactor.bounds.positive_coords);
 
-            let within_x = neg.x <= ev.block.x && pos.x >= ev.block.x;
-            let within_y = neg.y <= ev.block.y && pos.y >= ev.block.y;
-            let within_z = neg.z <= ev.block.z && pos.z >= ev.block.z;
+            let block = ev.block.coords();
 
-            if (neg.x == ev.block.x || pos.x == ev.block.x) && (within_y && within_z)
-                || (neg.y == ev.block.y || pos.y == ev.block.y) && (within_x && within_z)
-                || (neg.z == ev.block.z || pos.z == ev.block.z) && (within_x && within_y)
+            let within_x = neg.x <= block.x && pos.x >= block.x;
+            let within_y = neg.y <= block.y && pos.y >= block.y;
+            let within_z = neg.z <= block.z && pos.z >= block.z;
+
+            if (neg.x == block.x || pos.x == block.x) && (within_y && within_z)
+                || (neg.y == block.y || pos.y == block.y) && (within_x && within_z)
+                || (neg.z == block.z || pos.z == block.z) && (within_x && within_y)
             {
                 // They changed the casing of the reactor - kill it
                 false
@@ -211,7 +212,7 @@ fn generate_power(
         };
 
         for reactor in reactors.iter() {
-            system.increase_energy(reactor.power_per_second * time.delta_seconds());
+            system.increase_energy(reactor.power_per_second * time.delta_secs());
         }
     }
 }
diff --git a/cosmos_core/src/block/specific_blocks/and_gate.rs b/cosmos_core/src/block/specific_blocks/and_gate.rs
index 0a4b9270e..b5c2a5c9f 100644
--- a/cosmos_core/src/block/specific_blocks/and_gate.rs
+++ b/cosmos_core/src/block/specific_blocks/and_gate.rs
@@ -45,13 +45,13 @@ fn and_gate_input_event_listener(
 ) {
     let bs_params = Rc::new(RefCell::new(bs_params));
     for ev in evr_logic_input.read() {
-        let Ok(structure) = q_structure.get(ev.entity) else {
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
             continue;
         };
         if structure.block_at(ev.block.coords(), &blocks).unlocalized_name() != "cosmos:and_gate" {
             continue;
         }
-        let Ok(logic_driver) = q_logic_driver.get_mut(ev.entity) else {
+        let Ok(logic_driver) = q_logic_driver.get_mut(ev.block.structure()) else {
             continue;
         };
         let Some(mut logic_data) = structure.query_block_data_mut(ev.block.coords(), &mut q_logic_data, bs_params.clone()) else {
diff --git a/cosmos_core/src/block/specific_blocks/gravity_well.rs b/cosmos_core/src/block/specific_blocks/gravity_well.rs
index 402687400..fc2db4853 100644
--- a/cosmos_core/src/block/specific_blocks/gravity_well.rs
+++ b/cosmos_core/src/block/specific_blocks/gravity_well.rs
@@ -40,7 +40,7 @@ fn do_gravity_well(
         };
 
         ext_impulse.impulse +=
-            Quat::from_affine3(&g_trans.affine()).mul_vec3(under_gravity_well.g_constant * read_mass_props.mass * time.delta_seconds());
+            Quat::from_affine3(&g_trans.affine()).mul_vec3(under_gravity_well.g_constant * read_mass_props.mass * time.delta_secs());
     }
 }
 
diff --git a/cosmos_core/src/block/specific_blocks/logic_indicator.rs b/cosmos_core/src/block/specific_blocks/logic_indicator.rs
index c163dc0bd..063a9fab6 100644
--- a/cosmos_core/src/block/specific_blocks/logic_indicator.rs
+++ b/cosmos_core/src/block/specific_blocks/logic_indicator.rs
@@ -31,13 +31,13 @@ fn logic_indicator_input_event_listener(
 ) {
     let bs_params = Rc::new(RefCell::new(bs_params));
     for ev in evr_logic_input.read() {
-        let Ok(structure) = q_structure.get(ev.entity) else {
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
             continue;
         };
         if structure.block_at(ev.block.coords(), &blocks).unlocalized_name() != "cosmos:logic_indicator" {
             continue;
         }
-        let Ok(logic_driver) = q_logic_driver.get_mut(ev.entity) else {
+        let Ok(logic_driver) = q_logic_driver.get_mut(ev.block.structure()) else {
             continue;
         };
         let Some(mut logic_data) = structure.query_block_data_mut(ev.block.coords(), &mut q_logic_data, bs_params.clone()) else {
diff --git a/cosmos_core/src/block/specific_blocks/logic_on.rs b/cosmos_core/src/block/specific_blocks/logic_on.rs
index 548206863..716936b0f 100644
--- a/cosmos_core/src/block/specific_blocks/logic_on.rs
+++ b/cosmos_core/src/block/specific_blocks/logic_on.rs
@@ -30,13 +30,13 @@ fn logic_on_output_event_listener(
 ) {
     // Internal logic signal should later be set to 1 (or some other value) with a GUI.
     for ev in evr_logic_output.read() {
-        let Ok(structure) = q_structure.get_mut(ev.entity) else {
+        let Ok(structure) = q_structure.get_mut(ev.block.structure()) else {
             continue;
         };
         if structure.block_at(ev.block.coords(), &blocks).unlocalized_name() != "cosmos:logic_on" {
             continue;
         }
-        let Ok(mut logic_driver) = q_logic_driver.get_mut(ev.entity) else {
+        let Ok(mut logic_driver) = q_logic_driver.get_mut(ev.block.structure()) else {
             continue;
         };
 
@@ -47,7 +47,7 @@ fn logic_on_output_event_listener(
 
         for face in logic_block.output_faces() {
             let port = Port::new(ev.block.coords(), structure.block_rotation(ev.block.coords()).direction_of(face));
-            logic_driver.update_producer(port, 1, &mut evw_queue_logic_input, ev.entity);
+            logic_driver.update_producer(port, 1, &mut evw_queue_logic_input, ev.block.structure());
         }
     }
 }
diff --git a/cosmos_core/src/block/specific_blocks/not_gate.rs b/cosmos_core/src/block/specific_blocks/not_gate.rs
index ae4f20f4a..300a3a7fc 100644
--- a/cosmos_core/src/block/specific_blocks/not_gate.rs
+++ b/cosmos_core/src/block/specific_blocks/not_gate.rs
@@ -45,13 +45,13 @@ fn not_gate_input_event_listener(
 ) {
     let bs_params = Rc::new(RefCell::new(bs_params));
     for ev in evr_logic_input.read() {
-        let Ok(structure) = q_structure.get(ev.entity) else {
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
             continue;
         };
         if structure.block_at(ev.block.coords(), &blocks).unlocalized_name() != "cosmos:not_gate" {
             continue;
         }
-        let Ok(logic_driver) = q_logic_driver.get_mut(ev.entity) else {
+        let Ok(logic_driver) = q_logic_driver.get_mut(ev.block.structure()) else {
             continue;
         };
         let Some(mut logic_data) = structure.query_block_data_mut(ev.block.coords(), &mut q_logic_data, bs_params.clone()) else {
diff --git a/cosmos_core/src/block/specific_blocks/or_gate.rs b/cosmos_core/src/block/specific_blocks/or_gate.rs
index 8958af74b..40da2fb7b 100644
--- a/cosmos_core/src/block/specific_blocks/or_gate.rs
+++ b/cosmos_core/src/block/specific_blocks/or_gate.rs
@@ -45,13 +45,13 @@ fn or_gate_input_event_listener(
 ) {
     let bs_params = Rc::new(RefCell::new(bs_params));
     for ev in evr_logic_input.read() {
-        let Ok(structure) = q_structure.get(ev.entity) else {
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
             continue;
         };
         if structure.block_at(ev.block.coords(), &blocks).unlocalized_name() != "cosmos:or_gate" {
             continue;
         }
-        let Ok(logic_driver) = q_logic_driver.get_mut(ev.entity) else {
+        let Ok(logic_driver) = q_logic_driver.get_mut(ev.block.structure()) else {
             continue;
         };
         let Some(mut logic_data) = structure.query_block_data_mut(ev.block.coords(), &mut q_logic_data, bs_params.clone()) else {
diff --git a/cosmos_core/src/block/specific_blocks/xor_gate.rs b/cosmos_core/src/block/specific_blocks/xor_gate.rs
index e92413620..2e11f2779 100644
--- a/cosmos_core/src/block/specific_blocks/xor_gate.rs
+++ b/cosmos_core/src/block/specific_blocks/xor_gate.rs
@@ -46,13 +46,13 @@ fn xor_gate_input_event_listener(
 ) {
     let bs_params = Rc::new(RefCell::new(bs_params));
     for ev in evr_logic_input.read() {
-        let Ok(structure) = q_structure.get(ev.entity) else {
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
             continue;
         };
         if structure.block_at(ev.block.coords(), &blocks).unlocalized_name() != "cosmos:xor_gate" {
             continue;
         }
-        let Ok(logic_driver) = q_logic_driver.get_mut(ev.entity) else {
+        let Ok(logic_driver) = q_logic_driver.get_mut(ev.block.structure()) else {
             continue;
         };
         let Some(mut logic_data) = structure.query_block_data_mut(ev.block.coords(), &mut q_logic_data, bs_params.clone()) else {
diff --git a/cosmos_core/src/chat/mod.rs b/cosmos_core/src/chat/mod.rs
new file mode 100644
index 000000000..b5c46f550
--- /dev/null
+++ b/cosmos_core/src/chat/mod.rs
@@ -0,0 +1,50 @@
+//! Chat messages sent between the server and clients
+
+use crate::netty::sync::events::netty_event::{IdentifiableEvent, NettyEvent, SyncedEventImpl};
+use bevy::prelude::{App, Entity, Event};
+use serde::{Deserialize, Serialize};
+
+#[derive(Event, Debug, Serialize, Deserialize)]
+/// Sent from client to server to send a chat message to everyone
+pub enum ClientSendChatMessageEvent {
+    /// This message should be sent to everyone
+    Global(String),
+}
+
+impl IdentifiableEvent for ClientSendChatMessageEvent {
+    fn unlocalized_name() -> &'static str {
+        "cosmos:client_send_chat_msg"
+    }
+}
+
+impl NettyEvent for ClientSendChatMessageEvent {
+    fn event_receiver() -> crate::netty::sync::events::netty_event::EventReceiver {
+        crate::netty::sync::events::netty_event::EventReceiver::Server
+    }
+}
+
+#[derive(Event, Debug, Serialize, Deserialize)]
+/// Sent from server to clients that should display this chat message
+pub struct ServerSendChatMessageEvent {
+    /// The entity that sent this message - none if no entity sent it
+    pub sender: Option<Entity>,
+    /// The message to display
+    pub message: String,
+}
+
+impl IdentifiableEvent for ServerSendChatMessageEvent {
+    fn unlocalized_name() -> &'static str {
+        "cosmos:server_send_chat_msg"
+    }
+}
+
+impl NettyEvent for ServerSendChatMessageEvent {
+    fn event_receiver() -> crate::netty::sync::events::netty_event::EventReceiver {
+        crate::netty::sync::events::netty_event::EventReceiver::Client
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_netty_event::<ClientSendChatMessageEvent>();
+    app.add_netty_event::<ServerSendChatMessageEvent>();
+}
diff --git a/cosmos_core/src/crafting/blocks/basic_fabricator.rs b/cosmos_core/src/crafting/blocks/basic_fabricator.rs
new file mode 100644
index 000000000..387759351
--- /dev/null
+++ b/cosmos_core/src/crafting/blocks/basic_fabricator.rs
@@ -0,0 +1,56 @@
+//! Contains logic for the basic fabricator block
+
+use bevy::prelude::{App, Event};
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    crafting::recipes::basic_fabricator::BasicFabricatorRecipe,
+    netty::sync::events::netty_event::{IdentifiableEvent, NettyEvent, SyncedEventImpl},
+    prelude::StructureBlock,
+};
+
+#[derive(Event, Debug, Clone, Copy, Serialize, Deserialize)]
+/// Sent by the server to the client to instruct them to open a basic fabricator.
+pub struct OpenBasicFabricatorEvent(pub StructureBlock);
+
+impl IdentifiableEvent for OpenBasicFabricatorEvent {
+    fn unlocalized_name() -> &'static str {
+        "cosmos:open_basic_fabricator"
+    }
+}
+
+impl NettyEvent for OpenBasicFabricatorEvent {
+    fn event_receiver() -> crate::netty::sync::events::netty_event::EventReceiver {
+        crate::netty::sync::events::netty_event::EventReceiver::Client
+    }
+}
+
+#[derive(Event, Debug, Clone, Serialize, Deserialize)]
+/// Sent by the client to the server to request crafting a specific recipe.
+pub struct CraftBasicFabricatorRecipeEvent {
+    /// The block that contains the fabricator the client is using
+    pub block: StructureBlock,
+    /// The recipe to use. Note that this MUST match one of the recipes the server contains or it
+    /// will be ignored by the server.
+    pub recipe: BasicFabricatorRecipe,
+    /// The quantity they wish to craft. If more is requested than can be crafted, the maximum
+    /// amount that can be fabricated will be created.
+    pub quantity: u32,
+}
+
+impl IdentifiableEvent for CraftBasicFabricatorRecipeEvent {
+    fn unlocalized_name() -> &'static str {
+        "cosmos:craft_basic_fabricator"
+    }
+}
+
+impl NettyEvent for CraftBasicFabricatorRecipeEvent {
+    fn event_receiver() -> crate::netty::sync::events::netty_event::EventReceiver {
+        crate::netty::sync::events::netty_event::EventReceiver::Server
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_netty_event::<OpenBasicFabricatorEvent>()
+        .add_netty_event::<CraftBasicFabricatorRecipeEvent>();
+}
diff --git a/cosmos_core/src/crafting/blocks/mod.rs b/cosmos_core/src/crafting/blocks/mod.rs
new file mode 100644
index 000000000..cd652ffef
--- /dev/null
+++ b/cosmos_core/src/crafting/blocks/mod.rs
@@ -0,0 +1,9 @@
+//! Contains logic for blocks that are used for crafting
+
+use bevy::prelude::App;
+
+pub mod basic_fabricator;
+
+pub(super) fn register(app: &mut App) {
+    basic_fabricator::register(app);
+}
diff --git a/cosmos_core/src/crafting/mod.rs b/cosmos_core/src/crafting/mod.rs
new file mode 100644
index 000000000..a5ef99ab0
--- /dev/null
+++ b/cosmos_core/src/crafting/mod.rs
@@ -0,0 +1,11 @@
+//! Shared logic for all forms of crafting
+
+use bevy::prelude::App;
+
+pub mod blocks;
+pub mod recipes;
+
+pub(super) fn register(app: &mut App) {
+    recipes::register(app);
+    blocks::register(app);
+}
diff --git a/cosmos_core/src/crafting/recipes/basic_fabricator.rs b/cosmos_core/src/crafting/recipes/basic_fabricator.rs
new file mode 100644
index 000000000..5fbe5b492
--- /dev/null
+++ b/cosmos_core/src/crafting/recipes/basic_fabricator.rs
@@ -0,0 +1,139 @@
+//! Shared logic for Basic Fabricator recipes.
+
+use bevy::{
+    prelude::{App, Event, Resource},
+    utils::HashMap,
+};
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    inventory::itemstack::ItemStack,
+    item::Item,
+    netty::sync::events::netty_event::{IdentifiableEvent, NettyEvent, SyncedEventImpl},
+    registry::identifiable::Identifiable,
+};
+
+use super::RecipeItem;
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+/// An item that can be used as an input for a basic fabricator recipe
+pub struct FabricatorItemInput {
+    /// The amount of this item required
+    pub quantity: u16,
+    /// The type of item required
+    pub item: RecipeItem,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+/// The output of the fabricator recipe
+pub struct FabricatorItemOutput {
+    /// The quantity output
+    pub quantity: u16,
+    /// The item output
+    pub item: u16,
+}
+
+impl FabricatorItemInput {
+    /// Creates a new fabricator item input
+    pub fn new(item: RecipeItem, quantity: u16) -> Self {
+        Self { item, quantity }
+    }
+}
+
+impl FabricatorItemOutput {
+    /// Creates a new fabricator item output
+    pub fn new(item: &Item, quantity: u16) -> Self {
+        Self { item: item.id(), quantity }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+/// A recipe for the basic fabricator.
+pub struct BasicFabricatorRecipe {
+    /// All inputs for this recipe
+    pub inputs: Vec<FabricatorItemInput>,
+    /// The output for this recipe
+    pub output: FabricatorItemOutput,
+}
+
+impl BasicFabricatorRecipe {
+    /// Creates a new recipe
+    pub fn new(output: FabricatorItemOutput, inputs: Vec<FabricatorItemInput>) -> Self {
+        Self { output, inputs }
+    }
+
+    /// Computes the maximum amount of items this recipe can prodce, with the given items.
+    ///
+    /// The `items` iterator can contain items unrelated to the recipe.
+    pub fn max_can_create<'a>(&self, items: impl Iterator<Item = &'a ItemStack>) -> u32 {
+        let mut unique_item_counts = HashMap::new();
+        for item in items {
+            *unique_item_counts.entry(item.item_id()).or_insert(0) += item.quantity() as u32;
+        }
+
+        for input in &self.inputs {
+            let RecipeItem::Item(id) = input.item;
+            unique_item_counts.entry(id).or_insert(0);
+        }
+
+        unique_item_counts
+            .into_iter()
+            .flat_map(|(item_id, quantity)| {
+                let input = self.inputs.iter().find(|x| match x.item {
+                    RecipeItem::Item(id) => id == item_id,
+                })?;
+
+                Some(quantity / input.quantity as u32)
+            })
+            .min()
+            .unwrap_or(0)
+            * self.output.quantity as u32
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default, Resource)]
+/// Contains all the Basic Fabricator recipes.
+///
+/// Recipes should be registered with this to be considered active.
+pub struct BasicFabricatorRecipes(Vec<BasicFabricatorRecipe>);
+
+impl BasicFabricatorRecipes {
+    /// Returns true if this is a valid recipe contained in this registry
+    pub fn contains(&self, recipe: &BasicFabricatorRecipe) -> bool {
+        self.iter().any(|x| x == recipe)
+    }
+
+    /// Adds a recipe to the registry. This will not add duplicates.
+    pub fn add_recipe(&mut self, recipe: BasicFabricatorRecipe) {
+        if self.contains(&recipe) {
+            return;
+        }
+        self.0.push(recipe);
+    }
+
+    /// Iterates over every recipe
+    pub fn iter(&self) -> impl Iterator<Item = &'_ BasicFabricatorRecipe> {
+        self.0.iter()
+    }
+}
+
+#[derive(Event, Serialize, Deserialize, Debug)]
+/// Used to sync all recipes to the connecting clients. Sent when a client joins after they have
+/// loaded all the recipes.
+pub struct SyncBasicFabricatorRecipesEvent(pub BasicFabricatorRecipes);
+
+impl IdentifiableEvent for SyncBasicFabricatorRecipesEvent {
+    fn unlocalized_name() -> &'static str {
+        "cosmos:sync_basic_fabricator_recipes"
+    }
+}
+
+impl NettyEvent for SyncBasicFabricatorRecipesEvent {
+    fn event_receiver() -> crate::netty::sync::events::netty_event::EventReceiver {
+        crate::netty::sync::events::netty_event::EventReceiver::Client
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_netty_event::<SyncBasicFabricatorRecipesEvent>();
+}
diff --git a/cosmos_core/src/crafting/recipes/mod.rs b/cosmos_core/src/crafting/recipes/mod.rs
new file mode 100644
index 000000000..cc6ba91ec
--- /dev/null
+++ b/cosmos_core/src/crafting/recipes/mod.rs
@@ -0,0 +1,18 @@
+//! Contains logic for the different types of recipes
+
+use bevy::prelude::App;
+use serde::{Deserialize, Serialize};
+
+pub mod basic_fabricator;
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+/// An item that is used in a recipe
+pub enum RecipeItem {
+    /// A single item's numberic id
+    Item(u16),
+    // Category(u16),
+}
+
+pub(super) fn register(app: &mut App) {
+    basic_fabricator::register(app);
+}
diff --git a/cosmos_core/src/debug/mod.rs b/cosmos_core/src/debug/mod.rs
index 5378b8075..a1bbd1ff2 100644
--- a/cosmos_core/src/debug/mod.rs
+++ b/cosmos_core/src/debug/mod.rs
@@ -69,17 +69,17 @@ pub(super) fn register(app: &mut App) {
     // app.cleanup();
     // app.update();
 
-    // fn assert_no_conflicting_systems(sub_app: &SubApp) {
-    //     let ignored_ambiguous_systems = get_ignored_ambiguous_systems();
+    fn assert_no_conflicting_systems(sub_app: &SubApp) {
+        let ignored_ambiguous_systems = get_ignored_ambiguous_systems();
 
-    //     let schedules = sub_app.world().resource::<Schedules>();
-    //     for (_, schedule) in schedules.iter() {
-    //         if ignored_ambiguous_systems.iter().any(|label| **label == *schedule.label()) {
-    //             continue;
-    //         }
-    //         assert!(schedule.graph().conflicting_systems().is_empty());
-    //     }
-    // }
-    // let sub_app = app.main();
-    // assert_no_conflicting_systems(sub_app);
+        let schedules = sub_app.world().resource::<Schedules>();
+        for (_, schedule) in schedules.iter() {
+            if ignored_ambiguous_systems.iter().any(|label| **label == *schedule.label()) {
+                continue;
+            }
+            assert!(schedule.graph().conflicting_systems().is_empty());
+        }
+    }
+    let sub_app = app.main();
+    assert_no_conflicting_systems(sub_app);
 }
diff --git a/cosmos_core/src/ecs/bundles.rs b/cosmos_core/src/ecs/bundles.rs
index 727deef62..3069f9960 100644
--- a/cosmos_core/src/ecs/bundles.rs
+++ b/cosmos_core/src/ecs/bundles.rs
@@ -20,12 +20,15 @@ impl From<Quat> for BundleStartingRotation {
 }
 
 /// A component bundle for entities with a [`Mesh`] and a [`Material`].
+///
+/// A [`Transform`] component will be added, then immediately set values based on the [`Location`]
+/// and [`BundleStartingRotation`].
 #[derive(Bundle, Clone, Debug, Reflect, Default)]
 pub struct CosmosMaterialMeshBundle<M: Material> {
     /// The bevy mesh
-    pub mesh: Handle<Mesh>,
+    pub mesh: Mesh3d,
     /// The material type provided
-    pub material: Handle<M>,
+    pub material: MeshMaterial3d<M>,
     /// User indication of whether an entity is visible
     pub visibility: Visibility,
     /// The location of this entity
diff --git a/cosmos_core/src/entities/mod.rs b/cosmos_core/src/entities/mod.rs
index 22810a7cd..70e400160 100644
--- a/cosmos_core/src/entities/mod.rs
+++ b/cosmos_core/src/entities/mod.rs
@@ -2,4 +2,10 @@
 //!
 //! This is far to generic of a module, and should be removed at some point in favor of more specific modules.
 
+use bevy::prelude::App;
+
 pub mod player;
+
+pub(super) fn register(app: &mut App) {
+    player::register(app);
+}
diff --git a/cosmos_core/src/entities/player/creative.rs b/cosmos_core/src/entities/player/creative.rs
new file mode 100644
index 000000000..b8a43d28e
--- /dev/null
+++ b/cosmos_core/src/entities/player/creative.rs
@@ -0,0 +1,26 @@
+//! Creative mode
+
+use bevy::prelude::{App, Component};
+use serde::{Deserialize, Serialize};
+
+use crate::netty::sync::{sync_component, IdentifiableComponent, SyncableComponent};
+
+#[derive(Component, Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
+/// Signifies a player is in creative mode
+pub struct Creative;
+
+impl IdentifiableComponent for Creative {
+    fn get_component_unlocalized_name() -> &'static str {
+        "cosmos:creative"
+    }
+}
+
+impl SyncableComponent for Creative {
+    fn get_sync_type() -> crate::netty::sync::SyncType {
+        crate::netty::sync::SyncType::ServerAuthoritative
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    sync_component::<Creative>(app);
+}
diff --git a/cosmos_core/src/entities/player/mod.rs b/cosmos_core/src/entities/player/mod.rs
index 525fc9f90..5e3c0d386 100644
--- a/cosmos_core/src/entities/player/mod.rs
+++ b/cosmos_core/src/entities/player/mod.rs
@@ -1,9 +1,9 @@
 //! Represents a player
 
-// pub mod apart_of_ship;
+pub mod creative;
 pub mod render_distance;
 
-use bevy::prelude::Component;
+use bevy::prelude::{App, Component};
 use bevy_renet2::renet2::ClientId;
 
 #[derive(Component, Debug)]
@@ -22,7 +22,7 @@ impl Player {
     }
 
     /// Gets the player's name
-    pub fn name(&self) -> &String {
+    pub fn name(&self) -> &str {
         &self.name
     }
 
@@ -31,3 +31,7 @@ impl Player {
         self.id
     }
 }
+
+pub(super) fn register(app: &mut App) {
+    creative::register(app);
+}
diff --git a/cosmos_core/src/events/block_events.rs b/cosmos_core/src/events/block_events.rs
index 3055b4d5f..63d71acb9 100644
--- a/cosmos_core/src/events/block_events.rs
+++ b/cosmos_core/src/events/block_events.rs
@@ -1,6 +1,7 @@
 //! Events that are related to blocks
 
 use crate::block::block_rotation::BlockRotation;
+use crate::structure::chunk::BlockInfo;
 use crate::structure::structure_block::StructureBlock;
 use bevy::ecs::event::EventWriter;
 use bevy::ecs::system::Commands;
@@ -19,16 +20,26 @@ pub struct BlockChangedEvent {
     ///
     /// The actual block may or may not have been updated yet
     pub block: StructureBlock,
-    /// The structure entity
-    pub structure_entity: Entity,
     /// The block that was there before
     pub old_block: u16,
     /// The block that is there now/will be there
     pub new_block: u16,
     /// Old block's rotation
-    pub old_block_rotation: BlockRotation,
+    pub old_block_info: BlockInfo,
     /// New block's rotation
-    pub new_block_rotation: BlockRotation,
+    pub new_block_info: BlockInfo,
+}
+
+impl BlockChangedEvent {
+    /// Computes what the old rotation was from the old [`BlockInfo`]
+    pub fn old_block_rotation(&self) -> BlockRotation {
+        self.old_block_info.get_rotation()
+    }
+
+    /// Computes what the new rotation was from the new [`BlockInfo`]
+    pub fn new_block_rotation(&self) -> BlockRotation {
+        self.new_block_info.get_rotation()
+    }
 }
 
 #[derive(Event, Debug, Clone)]
@@ -42,8 +53,6 @@ pub struct BlockDataChangedEvent {
     pub block_data_entity: Option<Entity>,
     /// The block this is referring to
     pub block: StructureBlock,
-    /// The structure's entity
-    pub structure_entity: Entity,
 }
 
 #[derive(SystemParam)]
diff --git a/cosmos_core/src/inventory/itemstack.rs b/cosmos_core/src/inventory/itemstack.rs
index 6c2b61a05..7b11060f1 100644
--- a/cosmos_core/src/inventory/itemstack.rs
+++ b/cosmos_core/src/inventory/itemstack.rs
@@ -393,6 +393,12 @@ impl ItemStack {
         }
     }
 
+    /// Returns the maximum amount of items that can be inserted into this itemstack without going
+    /// over the maximum stack size.
+    pub fn max_quantity_can_be_inserted(&self) -> u16 {
+        self.max_stack_size() - self.quantity
+    }
+
     #[inline]
     /// Returns true if the ItemStack is at or above the max stack size.
     pub fn is_full(&self) -> bool {
diff --git a/cosmos_core/src/inventory/mod.rs b/cosmos_core/src/inventory/mod.rs
index 493545509..d057a61ce 100644
--- a/cosmos_core/src/inventory/mod.rs
+++ b/cosmos_core/src/inventory/mod.rs
@@ -395,6 +395,24 @@ impl Inventory {
         (qty, new_slot)
     }
 
+    /// Returns the maximum amount of this item that could be inserted into this inventory.
+    pub fn max_quantity_can_be_inserted(&mut self, item: &Item) -> u32 {
+        self.items
+            .iter()
+            .map(|x| {
+                if let Some(x) = x {
+                    if x.item_id() == item.id() && x.data_entity().is_none() {
+                        x.max_quantity_can_be_inserted() as u32
+                    } else {
+                        0
+                    }
+                } else {
+                    item.max_stack_size() as u32
+                }
+            })
+            .sum()
+    }
+
     /// Returns the overflow that could not fit in any slot. The second item in the tuple will be Some
     /// if some or all of the ItemStack got its own slot. If it did, then this will represent the
     /// new slot in use.
@@ -822,6 +840,16 @@ impl Inventory {
     pub fn iter_mut(&mut self) -> std::slice::IterMut<Option<ItemStack>> {
         self.items.iter_mut()
     }
+
+    /// Returns the total quantity of this item within the inventory. This does NOT respect
+    /// any item data that may make it unique
+    pub fn total_quantity_of_item(&self, item_id: u16) -> u64 {
+        self.iter()
+            .flatten()
+            .filter(|x| x.item_id() == item_id)
+            .map(|x| x.quantity() as u64)
+            .sum::<u64>()
+    }
 }
 
 pub(super) fn register<T: States>(app: &mut App, playing_state: T) {
diff --git a/cosmos_core/src/item/items/mod.rs b/cosmos_core/src/item/items/mod.rs
index c09b02e40..56e1db6af 100644
--- a/cosmos_core/src/item/items/mod.rs
+++ b/cosmos_core/src/item/items/mod.rs
@@ -19,6 +19,8 @@ fn add_cosmos_items(
     items.register(Item::new("cosmos:fluid_cell", DEFAULT_MAX_STACK_SIZE));
     items.register(Item::new("cosmos:fluid_cell_filled", 1));
 
+    items.register(Item::new("cosmos:iron_bar", DEFAULT_MAX_STACK_SIZE));
+
     loading.finish_loading(id, &mut end_writer);
 }
 
diff --git a/cosmos_core/src/lib.rs b/cosmos_core/src/lib.rs
index 178770d05..42ed00747 100644
--- a/cosmos_core/src/lib.rs
+++ b/cosmos_core/src/lib.rs
@@ -5,6 +5,8 @@
 
 pub mod block;
 pub mod blockitems;
+pub mod chat;
+pub mod crafting;
 pub mod debug;
 pub mod economy;
 pub mod ecs;
diff --git a/cosmos_core/src/loader/mod.rs b/cosmos_core/src/loader/mod.rs
index 36f628ed3..e825a0d7d 100644
--- a/cosmos_core/src/loader/mod.rs
+++ b/cosmos_core/src/loader/mod.rs
@@ -136,7 +136,7 @@ pub(super) fn register<T: States + Clone + Copy + FreelyMutableState>(
             Update,
             monitor_loading::<T>
                 .in_set(MonitorLoadingSet::MonitorLoading)
-                .run_if(in_state(pre_loading_state).or_else(in_state(loading_state).or_else(in_state(post_loading_state)))),
+                .run_if(in_state(pre_loading_state).or(in_state(loading_state).or(in_state(post_loading_state)))),
         )
         .insert_resource(LoadingStatus::new(pre_loading_state, loading_state, post_loading_state, done_state))
         .insert_resource(LoadingManager::default())
diff --git a/cosmos_core/src/logic/logic_driver.rs b/cosmos_core/src/logic/logic_driver.rs
index f526140c1..8a41c0567 100644
--- a/cosmos_core/src/logic/logic_driver.rs
+++ b/cosmos_core/src/logic/logic_driver.rs
@@ -55,6 +55,8 @@ impl LogicDriver {
             return;
         };
 
+        // DFS on the structure may lead to concurrency issues if many blocks are changed in one tick.
+        // See [`LogicGraph::remove_port`] and how it removed dfs.
         let maybe_group = self.logic_graph.dfs_for_group(
             neighbor_coords,
             direction.inverse(),
@@ -132,6 +134,8 @@ impl LogicDriver {
             for wire_face in logic_block.wire_faces_connecting_to(WireType::Color(wire_color_id)) {
                 let direction = structure.block_rotation(coords).direction_of(wire_face);
                 if let Ok(neighbor_coords) = coords.step(direction) {
+                    // DFS on the structure may lead to concurrency issues if many blocks are changed in one tick.
+                    // See [`LogicGraph::remove_port`] and how it removed dfs.
                     if let Some(group_id) = self.logic_graph.dfs_for_group(
                         neighbor_coords,
                         direction.inverse(),
@@ -182,8 +186,6 @@ impl LogicDriver {
                 rotation.direction_of(input_face),
                 PortType::Input,
                 structure,
-                blocks,
-                logic_blocks,
                 evw_queue_logic_input,
             )
         }
@@ -195,8 +197,6 @@ impl LogicDriver {
                 rotation.direction_of(output_face),
                 PortType::Output,
                 structure,
-                blocks,
-                logic_blocks,
                 evw_queue_logic_input,
             )
         }
@@ -241,7 +241,7 @@ impl LogicDriver {
                             new_group
                                 .consumers
                                 .iter()
-                                .map(|input_port| QueueLogicInputEvent::new(StructureBlock::new(input_port.coords), entity)),
+                                .map(|input_port| QueueLogicInputEvent::new(StructureBlock::new(input_port.coords, entity))),
                         );
                     }
                 }
diff --git a/cosmos_core/src/logic/logic_graph.rs b/cosmos_core/src/logic/logic_graph.rs
index 6b6d13e10..e33cb12b7 100644
--- a/cosmos_core/src/logic/logic_graph.rs
+++ b/cosmos_core/src/logic/logic_graph.rs
@@ -26,6 +26,7 @@ pub(super) struct LogicGroup {
     /// If this wire is removed, an adjacent wire's coordinates are used. If there are no adjacent wires, it becomes [`None`].
     recent_wire_coords: Option<BlockCoordinate>,
     /// All output [`Port`]s in this group. They update first in each frame, pushing any change in their output values to the consumers.
+    /// The integer value is the output port's current logic value.
     pub producers: HashMap<Port, i32>,
     /// All input [`Port`]s in this group. They update second in each frame, using their new input values to recalculate their block's logic formula.
     pub consumers: HashSet<Port>,
@@ -81,10 +82,14 @@ impl LogicGroup {
             evw_queue_logic_input.send_batch(
                 self.consumers
                     .iter()
-                    .map(|input_port| QueueLogicInputEvent::new(StructureBlock::new(input_port.coords), entity)),
+                    .map(|input_port| QueueLogicInputEvent::new(StructureBlock::new(input_port.coords, entity))),
             );
         }
     }
+
+    pub(crate) fn has_one_port(&self) -> bool {
+        (self.consumers.len() + self.producers.len()) == 1
+    }
 }
 
 #[derive(Debug, Default, Reflect)]
@@ -345,11 +350,11 @@ impl LogicGraph {
         match port_type {
             PortType::Input => {
                 logic_group.consumers.insert(Port::new(coords, direction));
-                evw_queue_logic_input.send(QueueLogicInputEvent::new(StructureBlock::new(coords), entity));
+                evw_queue_logic_input.send(QueueLogicInputEvent::new(StructureBlock::new(coords, entity)));
             }
             PortType::Output => {
                 logic_group.producers.insert(Port::new(coords, direction), signal);
-                evw_queue_logic_output.send(QueueLogicOutputEvent::new(StructureBlock::new(coords), entity));
+                evw_queue_logic_output.send(QueueLogicOutputEvent::new(StructureBlock::new(coords, entity)));
             }
         };
     }
@@ -360,36 +365,22 @@ impl LogicGraph {
         direction: BlockDirection,
         port_type: PortType,
         structure: &Structure,
-        blocks: &Registry<Block>,
-        logic_blocks: &Registry<LogicBlock>,
         evw_queue_logic_input: &mut EventWriter<QueueLogicInputEvent>,
     ) {
-        // If the neighbor coordinates don't exist, no port is removed.
-        let Ok(neighbor_coords) = coords.step(direction) else {
-            return;
-        };
-
         let port = Port::new(coords, direction);
         let &group_id = match port_type {
             PortType::Input => &mut self.input_port_group_id,
             PortType::Output => &mut self.output_port_group_id,
         }
         .get(&port)
-        .expect("Port to be removed should exist.");
+        .unwrap_or_else(|| panic!("Port {port:?} to be removed should have a logic group."));
 
         // Check if this port is the last block of its group, and delete the group if so.
         if self
-            .dfs_for_group(
-                neighbor_coords,
-                direction.inverse(),
-                None,
-                false,
-                structure,
-                &mut Port::all_for(coords),
-                blocks,
-                logic_blocks,
-            )
-            .is_none()
+            .groups
+            .get(&group_id)
+            .expect("Logic group with port should exist.")
+            .has_one_port()
         {
             self.remove_group(group_id);
         } else {
@@ -406,10 +397,10 @@ impl LogicGraph {
             // Ping all inputs in this group to let them know this output port is gone.
             if port_type == PortType::Output {
                 for &input_port in self.groups.get(&group_id).expect("Port should have logic group.").consumers.iter() {
-                    evw_queue_logic_input.send(QueueLogicInputEvent::new(
-                        StructureBlock::new(input_port.coords),
+                    evw_queue_logic_input.send(QueueLogicInputEvent::new(StructureBlock::new(
+                        input_port.coords,
                         structure.get_entity().expect("Structure should have entity."),
-                    ));
+                    )));
                 }
             }
         }
@@ -475,7 +466,7 @@ impl LogicGraph {
             .consumers
             .iter()
         {
-            evw_queue_logic_input.send(QueueLogicInputEvent::new(StructureBlock::new(input_port.coords), entity));
+            evw_queue_logic_input.send(QueueLogicInputEvent::new(StructureBlock::new(input_port.coords, entity)));
         }
     }
 
diff --git a/cosmos_core/src/logic/mod.rs b/cosmos_core/src/logic/mod.rs
index 760d119e2..f0c599a70 100644
--- a/cosmos_core/src/logic/mod.rs
+++ b/cosmos_core/src/logic/mod.rs
@@ -275,8 +275,6 @@ impl PartialEq for LogicWireColor {
 pub struct LogicInputEvent {
     /// The block coordinates.
     pub block: StructureBlock,
-    /// The entity containing the structure and logic graph this block is in.
-    pub entity: Entity,
 }
 
 #[derive(Event, Debug)]
@@ -285,8 +283,8 @@ pub struct QueueLogicInputEvent(LogicInputEvent);
 
 impl QueueLogicInputEvent {
     /// Convenience constructor to avoid having to construct the inner type.
-    pub fn new(block: StructureBlock, entity: Entity) -> Self {
-        Self(LogicInputEvent { block, entity })
+    pub fn new(block: StructureBlock) -> Self {
+        Self(LogicInputEvent { block })
     }
 }
 
@@ -296,8 +294,6 @@ impl QueueLogicInputEvent {
 pub struct LogicOutputEvent {
     /// The block coordinates.
     pub block: StructureBlock,
-    /// The entity containing the structure and logic graph this block is in.
-    pub entity: Entity,
 }
 
 #[derive(Event, Debug)]
@@ -306,8 +302,8 @@ pub struct QueueLogicOutputEvent(LogicOutputEvent);
 
 impl QueueLogicOutputEvent {
     /// Convenience constructor to avoid having to construct the inner type.
-    pub fn new(block: StructureBlock, entity: Entity) -> Self {
-        Self(LogicOutputEvent { block, entity })
+    pub fn new(block: StructureBlock) -> Self {
+        Self(LogicOutputEvent { block })
     }
 }
 
@@ -338,16 +334,13 @@ fn listen_for_changed_logic_data(
         evr_block_data_changed
             .read()
             .filter(|ev| {
-                let Ok(structure) = q_structure.get(ev.structure_entity) else {
+                let Ok(structure) = q_structure.get(ev.block.structure()) else {
                     return false;
                 };
                 let id = structure.block_id_at(ev.block.coords());
                 logic_blocks.from_id(blocks.from_numeric_id(id).unlocalized_name()).is_some()
             })
-            .map(|ev| LogicOutputEvent {
-                block: ev.block,
-                entity: ev.structure_entity,
-            }),
+            .map(|ev| LogicOutputEvent { block: ev.block }),
     );
 }
 
@@ -365,24 +358,13 @@ fn logic_block_placed_event_listener(
     mut evw_queue_logic_input: EventWriter<QueueLogicInputEvent>,
 ) {
     for ev in evr_block_changed.read() {
-        // println!("{ev:?}");
-
-        /*
-        BlockChangedEvent { block: StructureBlock(BlockCoordinate { x: 160, y: 160, z: 159 }), structure_entity: Entity { index: 624, generation: 6 }, old_block: 72, new_block: 0, old_block_rotation: BlockRotation { face_pointing_pos_y: Top, sub_rotation: None }, new_block_rotation: BlockRotation { face_pointing_pos_y: Top, sub_rotation: None } }
-        BlockChangedEvent { block: StructureBlock(BlockCoordinate { x: 160, y: 160, z: 160 }), structure_entity: Entity { index: 624, generation: 6 }, old_block: 7, new_block: 0, old_block_rotation: BlockRotation { face_pointing_pos_y: Top, sub_rotation: None }, new_block_rotation: BlockRotation { face_pointing_pos_y: Top, sub_rotation: None } }
-        BlockChangedEvent { block: StructureBlock(BlockCoordinate { x: 320, y: 320, z: 323 }), structure_entity: Entity { index: 597, generation: 2 }, old_block: 72, new_block: 0, old_block_rotation: BlockRotation { face_pointing_pos_y: Top, sub_rotation: Flip }, new_block_rotation: BlockRotation { face_pointing_pos_y: Top, sub_rotation: None } }
-        BlockChangedEvent { block: StructureBlock(BlockCoordinate { x: 320, y: 320, z: 324 }), structure_entity: Entity { index: 597, generation: 2 }, old_block: 72, new_block: 0, old_block_rotation: BlockRotation { face_pointing_pos_y: Top, sub_rotation: Flip }, new_block_rotation: BlockRotation { face_pointing_pos_y: Top, sub_rotation: None } }
-        thread 'Compute Task Pool (1)' panicked at cosmos_core/src/logic/logic_graph.rs:117:39:
-        Logic group to be removed should exist.
-        */
-
         // If was logic block, remove from the logic graph.
         if let Some(logic_block) = logic_blocks.from_id(blocks.from_numeric_id(ev.old_block).unlocalized_name()) {
-            if let Ok(structure) = q_structure.get_mut(ev.structure_entity) {
-                if let Ok(mut logic) = q_logic.get_mut(ev.structure_entity) {
+            if let Ok(structure) = q_structure.get_mut(ev.block.structure()) {
+                if let Ok(mut logic) = q_logic.get_mut(ev.block.structure()) {
                     logic.remove_logic_block(
                         logic_block,
-                        ev.old_block_rotation,
+                        ev.old_block_rotation(),
                         ev.block.coords(),
                         &structure,
                         structure.get_entity().expect("Structure should have entity."),
@@ -398,12 +380,12 @@ fn logic_block_placed_event_listener(
 
         // If is now logic block, add to the logic graph.
         if let Some(logic_block) = logic_blocks.from_id(blocks.from_numeric_id(ev.new_block).unlocalized_name()) {
-            if let Ok(mut structure) = q_structure.get_mut(ev.structure_entity) {
-                if let Ok(mut logic) = q_logic.get_mut(ev.structure_entity) {
+            if let Ok(mut structure) = q_structure.get_mut(ev.block.structure()) {
+                if let Ok(mut logic) = q_logic.get_mut(ev.block.structure()) {
                     let coords = ev.block.coords();
                     logic.add_logic_block(
                         logic_block,
-                        ev.new_block_rotation,
+                        ev.new_block_rotation(),
                         coords,
                         &structure,
                         structure.get_entity().expect("Structure should have entity"),
@@ -467,13 +449,13 @@ pub fn default_logic_block_output(
     q_logic_data: Query<&BlockLogicData>,
 ) {
     for ev in evr_logic_output.read() {
-        let Ok(structure) = q_structure.get_mut(ev.entity) else {
+        let Ok(structure) = q_structure.get_mut(ev.block.structure()) else {
             continue;
         };
         if structure.block_at(ev.block.coords(), blocks).unlocalized_name() != block_name {
             continue;
         }
-        let Ok(mut logic_driver) = q_logic_driver.get_mut(ev.entity) else {
+        let Ok(mut logic_driver) = q_logic_driver.get_mut(ev.block.structure()) else {
             continue;
         };
         let Some(&BlockLogicData(signal)) = structure.query_block_data(ev.block.coords(), &q_logic_data) else {
@@ -486,7 +468,7 @@ pub fn default_logic_block_output(
 
         for face in logic_block.output_faces() {
             let port = Port::new(ev.block.coords(), structure.block_rotation(ev.block.coords()).direction_of(face));
-            logic_driver.update_producer(port, signal, &mut evw_queue_logic_input, ev.entity);
+            logic_driver.update_producer(port, signal, &mut evw_queue_logic_input, ev.block.structure());
         }
     }
 }
diff --git a/cosmos_core/src/netty/client_registry.rs b/cosmos_core/src/netty/client_registry.rs
new file mode 100644
index 000000000..87cb04736
--- /dev/null
+++ b/cosmos_core/src/netty/client_registry.rs
@@ -0,0 +1,12 @@
+//! Used to sync registries from client -> server
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize)]
+/// Used to inform the server that the client has received all necessary registries
+///
+/// For this to work, both the client and server must call their own versions of `sync_registry<T>` for the registry type.
+pub enum RegistrySyncing {
+    /// The client has received all necessary registries
+    FinishedReceivingRegistries,
+}
diff --git a/cosmos_core/src/netty/client_reliable_messages.rs b/cosmos_core/src/netty/client_reliable_messages.rs
index af64ffcf7..ecb464998 100644
--- a/cosmos_core/src/netty/client_reliable_messages.rs
+++ b/cosmos_core/src/netty/client_reliable_messages.rs
@@ -5,7 +5,7 @@ use bevy::prelude::{Component, Entity};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    block::{block_events::StructureBlockPair, block_rotation::BlockRotation},
+    block::block_rotation::BlockRotation,
     entities::player::render_distance::RenderDistance,
     structure::{
         coordinates::{ChunkCoordinate, CoordinateType},
@@ -35,15 +35,11 @@ pub enum ClientReliableMessages {
     },
     /// The client broke a block
     BreakBlock {
-        /// The structure they broke it on
-        structure_entity: Entity,
         /// The block they broke
         block: StructureBlock,
     },
     /// The client placed a block
     PlaceBlock {
-        /// The structure they placed it on
-        structure_entity: Entity,
         /// The block they placed
         block: StructureBlock,
         /// This is passed along with `inventory_slot` to verify that the client + server are still in sync
@@ -56,9 +52,9 @@ pub enum ClientReliableMessages {
     /// The player interacts with a block
     InteractWithBlock {
         /// The block that was interacted with by the player
-        block: Option<StructureBlockPair>,
+        block: Option<StructureBlock>,
         /// Includes blocks normally ignored by most interaction checks
-        block_including_fluids: StructureBlockPair,
+        block_including_fluids: StructureBlock,
         /// Sent if the alternate interaction should be used
         alternate: bool,
     },
diff --git a/cosmos_core/src/netty/cosmos_encoder.rs b/cosmos_core/src/netty/cosmos_encoder.rs
index ce99ab0db..60e21b9a3 100644
--- a/cosmos_core/src/netty/cosmos_encoder.rs
+++ b/cosmos_core/src/netty/cosmos_encoder.rs
@@ -3,6 +3,7 @@
 //! This compresses items before their usage & decompresses them before deserializing to save a ton
 //! of space + bits sent over the network.
 
+use bevy::log::error;
 use serde::{de::DeserializeOwned, Serialize};
 
 /// Serializes the data to be sent - compresses it if needed
@@ -18,5 +19,11 @@ pub fn deserialize<T: DeserializeOwned>(raw: &[u8]) -> Result<T, Box<bincode::Er
         return Err(Box::new(bincode::ErrorKind::Custom("Unable to decompress".into())));
     };
 
-    bincode::deserialize::<T>(&decompressed)
+    let res = bincode::deserialize::<T>(&decompressed);
+
+    if res.is_err() {
+        error!("Error deserializing - decompressed form: {:?}", decompressed);
+    }
+
+    res
 }
diff --git a/cosmos_core/src/netty/mod.rs b/cosmos_core/src/netty/mod.rs
index bbf12921a..b538cde2a 100644
--- a/cosmos_core/src/netty/mod.rs
+++ b/cosmos_core/src/netty/mod.rs
@@ -2,6 +2,7 @@
 
 #[cfg(feature = "client")]
 pub mod client;
+pub mod client_registry;
 pub mod client_reliable_messages;
 pub mod client_unreliable_messages;
 pub mod cosmos_encoder;
@@ -76,6 +77,8 @@ pub enum NettyChannelClient {
     ComponentReplication,
     /// Automatic syncing of events
     NettyEvent,
+    /// Automatic syncing of registries
+    Registry,
 }
 
 impl From<NettyChannelClient> for u8 {
@@ -87,6 +90,7 @@ impl From<NettyChannelClient> for u8 {
             NettyChannelClient::Shop => 3,
             NettyChannelClient::ComponentReplication => 4,
             NettyChannelClient::NettyEvent => 5,
+            NettyChannelClient::Registry => 6,
         }
     }
 }
@@ -138,6 +142,13 @@ impl NettyChannelClient {
                     resend_time: Duration::from_millis(200),
                 },
             },
+            ChannelConfig {
+                channel_id: Self::Registry.into(),
+                max_memory_usage_bytes: MB,
+                send_type: SendType::ReliableOrdered {
+                    resend_time: Duration::from_millis(200),
+                },
+            },
         ]
     }
 }
diff --git a/cosmos_core/src/netty/server_reliable_messages.rs b/cosmos_core/src/netty/server_reliable_messages.rs
index bdecc11cc..5678a31a2 100644
--- a/cosmos_core/src/netty/server_reliable_messages.rs
+++ b/cosmos_core/src/netty/server_reliable_messages.rs
@@ -11,11 +11,10 @@ use bevy_renet2::renet2::ClientId;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    block::block_rotation::BlockRotation,
     entities::player::render_distance::RenderDistance,
     physics::location::Location,
     structure::{
-        chunk::netty::SerializedChunkBlockData,
+        chunk::{netty::SerializedChunkBlockData, BlockInfo},
         coordinates::{ChunkBlockCoordinate, ChunkCoordinate, CoordinateType},
         loading::ChunksNeedLoaded,
         planet::{generation::terrain_generation::GpuPermutationTable, Planet},
@@ -34,8 +33,8 @@ pub struct BlockChanged {
     pub coordinates: StructureBlock,
     /// The block it was changed to.
     pub block_id: u16,
-    /// The block's rotation
-    pub block_rotation: BlockRotation,
+    /// The block's tiny (u8) data
+    pub block_info: BlockInfo,
 }
 
 #[derive(Debug, Serialize, Deserialize, Component)]
diff --git a/cosmos_core/src/netty/sync/client_syncing.rs b/cosmos_core/src/netty/sync/client_syncing.rs
index 5bc5574cb..47395ef48 100644
--- a/cosmos_core/src/netty/sync/client_syncing.rs
+++ b/cosmos_core/src/netty/sync/client_syncing.rs
@@ -48,8 +48,6 @@ fn client_deserialize_component<T: SyncableComponent>(
     mapping: Res<NetworkMapping>,
     q_t: Query<&T>,
 ) {
-    // println!("{components_registry:?}");
-
     for ev in ev_reader.read() {
         let synced_id = components_registry
             .try_from_numeric_id(ev.component_id)
@@ -486,12 +484,12 @@ fn get_entity_identifier_info(
             maybe_data_ent.map(|x| (x, x))
         }),
         ComponentEntityIdentifier::BlockData {
-            identifier,
+            mut identifier,
             server_data_entity,
         } => network_mapping
             .client_from_server(&server_data_entity)
             .map(|x| {
-                let Ok(bd) = q_block_data.get(x) else {
+                if !q_block_data.contains(x) {
                     error!("Component got for block data but had no block data component - requesting entity. (Client: {x:?})");
 
                     client.send_message(
@@ -502,7 +500,7 @@ fn get_entity_identifier_info(
                     );
 
                     return network_mapping
-                        .client_from_server(&identifier.structure_entity)
+                        .client_from_server(&identifier.block.structure())
                         .and_then(|structure_entity| {
                             let mut structure = q_structure.get_mut(structure_entity).ok()?;
                             let data_entity = structure.get_or_create_block_data_for_block_id(
@@ -511,12 +509,13 @@ fn get_entity_identifier_info(
                                 commands,
                             )?;
 
+                            identifier.block.set_structure(structure_entity);
+
                             network_mapping.add_mapping(data_entity, server_data_entity);
 
                             evw_block_data_changed.send(BlockDataChangedEvent {
                                 block: identifier.block,
                                 block_data_entity: Some(data_entity),
-                                structure_entity,
                             });
 
                             Some((data_entity, data_entity))
@@ -526,14 +525,13 @@ fn get_entity_identifier_info(
                 evw_block_data_changed.send(BlockDataChangedEvent {
                     block: identifier.block,
                     block_data_entity: Some(x),
-                    structure_entity: bd.identifier.structure_entity,
                 });
 
                 Some((x, x))
             })
             .unwrap_or_else(|| {
                 network_mapping
-                    .client_from_server(&identifier.structure_entity)
+                    .client_from_server(&identifier.block.structure())
                     .and_then(|structure_entity| {
                         // We could either be
 
@@ -561,10 +559,11 @@ fn get_entity_identifier_info(
 
                         network_mapping.add_mapping(data_entity, server_data_entity);
 
+                        identifier.block.set_structure(structure_entity);
+
                         evw_block_data_changed.send(BlockDataChangedEvent {
                             block: identifier.block,
                             block_data_entity: Some(data_entity),
-                            structure_entity,
                         });
 
                         Some((data_entity, data_entity))
diff --git a/cosmos_core/src/netty/sync/events/client_event.rs b/cosmos_core/src/netty/sync/events/client_event.rs
index d921f2cad..5d36b985a 100644
--- a/cosmos_core/src/netty/sync/events/client_event.rs
+++ b/cosmos_core/src/netty/sync/events/client_event.rs
@@ -5,11 +5,11 @@ use bevy::{
         system::SystemParam,
     },
     log::{error, warn},
-    prelude::{resource_exists, Deref, Event, EventReader, EventWriter, IntoSystemConfigs, Res, ResMut},
+    prelude::{resource_exists, Event, EventReader, EventWriter, IntoSystemConfigs, Res, ResMut},
 };
 use renet2::RenetClient;
 
-use crate::registry::Registry;
+use crate::{netty::NettyChannelServer, registry::Registry};
 use crate::{
     netty::{cosmos_encoder, system_sets::NetworkingSystemsSet, NettyChannelClient},
     registry::identifiable::Identifiable,
@@ -28,11 +28,10 @@ pub(super) struct GotNetworkEvent {
 /// the inner event sent to the server.
 pub struct NettyEventToSend<T: NettyEvent>(pub T);
 
-#[derive(Deref, Event, Debug)]
 /// An event received from the server.
 ///
 /// Read this via an [`EventReader<NettyEventReceived<T>>`].
-pub struct NettyEventReceived<T: NettyEvent>(pub T);
+pub type NettyEventReceived<T> = T;
 
 /// Send your [`NettyEvent`] via this before [`NetworkingSystemsSet::SyncComponents`] to have it
 /// automatically sent to the server.
@@ -99,7 +98,7 @@ fn send_events<T: NettyEvent>(
 }
 
 fn receive_events(mut client: ResMut<RenetClient>, mut evw_got_event: EventWriter<GotNetworkEvent>) {
-    while let Some(message) = client.receive_message(NettyChannelClient::NettyEvent) {
+    while let Some(message) = client.receive_message(NettyChannelServer::NettyEvent) {
         let Some(msg) = cosmos_encoder::deserialize::<NettyEventMessage>(&message)
             .map(Some)
             .unwrap_or_else(|e| {
@@ -107,6 +106,7 @@ fn receive_events(mut client: ResMut<RenetClient>, mut evw_got_event: EventWrite
                 None
             })
         else {
+            error!("Error deserializing message into `NettyEventMessage`");
             continue;
         };
 
@@ -161,8 +161,6 @@ pub(super) fn client_receive_event<T: NettyEvent>(app: &mut App) {
 }
 
 pub(super) fn register_event<T: NettyEvent>(app: &mut App) {
-    app.add_event::<NettyEventReceived<T>>();
-
     if T::event_receiver() == EventReceiver::Client || T::event_receiver() == EventReceiver::Both {
         client_receive_event::<T>(app);
     }
diff --git a/cosmos_core/src/netty/sync/events/mod.rs b/cosmos_core/src/netty/sync/events/mod.rs
index 1fa72f925..9f9de3e49 100644
--- a/cosmos_core/src/netty/sync/events/mod.rs
+++ b/cosmos_core/src/netty/sync/events/mod.rs
@@ -1,6 +1,6 @@
 //! Used to easily send events between the server and client using bevy patterns.
 //!
-//! Make sure to put your systems that interact with thins in the
+//! Make sure to put your systems that interact with this in the
 //! [`crate::netty::system_sets::NetworkingSystemsSet::Between`] set to avoid 1-frame delays.
 //!
 //! Usage:
diff --git a/cosmos_core/src/netty/sync/events/netty_event.rs b/cosmos_core/src/netty/sync/events/netty_event.rs
index 6505b2932..962d96f1a 100644
--- a/cosmos_core/src/netty/sync/events/netty_event.rs
+++ b/cosmos_core/src/netty/sync/events/netty_event.rs
@@ -49,7 +49,7 @@ pub(super) enum NettyEventMessage {
 /// `app.add_netty_event` implementation.
 pub trait SyncedEventImpl {
     /// Adds a netty-synced event. See [`NettyEvent`].
-    fn add_netty_event<T: NettyEvent>(&mut self);
+    fn add_netty_event<T: NettyEvent>(&mut self) -> &mut Self;
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -73,12 +73,14 @@ impl Identifiable for RegisteredNettyEvent {
 }
 
 impl SyncedEventImpl for App {
-    fn add_netty_event<T: NettyEvent>(&mut self) {
+    fn add_netty_event<T: NettyEvent>(&mut self) -> &mut Self {
         #[cfg(feature = "client")]
         client_event::register_event::<T>(self);
 
         #[cfg(feature = "server")]
         server_event::register_event::<T>(self);
+
+        self
     }
 }
 
diff --git a/cosmos_core/src/netty/sync/events/server_event.rs b/cosmos_core/src/netty/sync/events/server_event.rs
index 40a101e83..b4af56c7b 100644
--- a/cosmos_core/src/netty/sync/events/server_event.rs
+++ b/cosmos_core/src/netty/sync/events/server_event.rs
@@ -10,7 +10,7 @@ use bevy::{
 use renet2::{ClientId, RenetServer};
 
 use crate::{
-    netty::{cosmos_encoder, system_sets::NetworkingSystemsSet, NettyChannelClient},
+    netty::{cosmos_encoder, system_sets::NetworkingSystemsSet, NettyChannelClient, NettyChannelServer},
     registry::identifiable::Identifiable,
 };
 use crate::{registry::Registry, state::GameState};
@@ -162,7 +162,7 @@ fn send_events<T: NettyEvent>(
         if let Some(client_id) = ev.client_id {
             server.send_message(
                 client_id,
-                NettyChannelClient::NettyEvent,
+                NettyChannelServer::NettyEvent,
                 cosmos_encoder::serialize(&NettyEventMessage::SendNettyEvent {
                     component_id: registered_event.id(),
                     raw_data: serialized,
@@ -170,7 +170,7 @@ fn send_events<T: NettyEvent>(
             );
         } else {
             server.broadcast_message(
-                NettyChannelClient::NettyEvent,
+                NettyChannelServer::NettyEvent,
                 cosmos_encoder::serialize(&NettyEventMessage::SendNettyEvent {
                     component_id: registered_event.id(),
                     raw_data: serialized,
diff --git a/cosmos_core/src/netty/sync/mapping.rs b/cosmos_core/src/netty/sync/mapping.rs
index 191084339..aab4920fa 100644
--- a/cosmos_core/src/netty/sync/mapping.rs
+++ b/cosmos_core/src/netty/sync/mapping.rs
@@ -3,7 +3,10 @@
 //! The resources in this file are **exclusively** used on the client-side. They are only
 //! in the core project for specific client-only use cases.
 
-use crate::netty::netty_rigidbody::{NettyRigidBody, NettyRigidBodyLocation};
+use crate::{
+    netty::netty_rigidbody::{NettyRigidBody, NettyRigidBodyLocation},
+    prelude::StructureBlock,
+};
 use bevy::{
     ecs::component::Component,
     prelude::{Entity, Resource},
@@ -17,7 +20,7 @@ use bevy::{
 #[derive(Component, Reflect, PartialEq, Eq)]
 pub struct ServerEntity(pub Entity);
 
-#[derive(Default, Resource)]
+#[derive(Default, Resource, Debug)]
 /// Used to map server entities to client entities and client entities to server entities.
 pub struct NetworkMapping {
     server_to_client: HashMap<Entity, Entity>,
@@ -80,6 +83,13 @@ pub trait Mappable {
     fn map(self, network_mapping: &NetworkMapping) -> Result<Self, MappingError<Self>>
     where
         Self: Sized;
+
+    /// Converts all instances of server entities into their respective client entities based off the mapping.
+    ///
+    /// Returns Err if it is unable to find the proper mapping
+    fn map_to_server(self, network_mapping: &NetworkMapping) -> Result<Self, MappingError<Self>>
+    where
+        Self: Sized;
 }
 
 impl Mappable for NettyRigidBody {
@@ -99,4 +109,45 @@ impl Mappable for NettyRigidBody {
             NettyRigidBodyLocation::Absolute(_) => Ok(self),
         }
     }
+
+    fn map_to_server(self, network_mapping: &NetworkMapping) -> Result<Self, MappingError<Self>>
+    where
+        Self: Sized,
+    {
+        match self.location {
+            NettyRigidBodyLocation::Relative(rel_pos, parent_ent) => {
+                let Some(client_ent) = network_mapping.server_from_client(&parent_ent) else {
+                    return Err(MappingError::MissingRecord(self));
+                };
+
+                Ok(NettyRigidBody {
+                    body_vel: self.body_vel,
+                    location: NettyRigidBodyLocation::Relative(rel_pos, client_ent),
+                    rotation: self.rotation,
+                })
+            }
+            NettyRigidBodyLocation::Absolute(_) => Ok(self),
+        }
+    }
+}
+
+impl Mappable for StructureBlock {
+    fn map(self, network_mapping: &NetworkMapping) -> Result<Self, MappingError<Self>> {
+        if let Some(e) = network_mapping.client_from_server(&self.structure()) {
+            Ok(Self::new(self.coords(), e))
+        } else {
+            Err(MappingError::MissingRecord(self))
+        }
+    }
+
+    fn map_to_server(self, network_mapping: &NetworkMapping) -> Result<Self, MappingError<Self>>
+    where
+        Self: Sized,
+    {
+        if let Some(e) = network_mapping.server_from_client(&self.structure()) {
+            Ok(Self::new(self.coords(), e))
+        } else {
+            Err(MappingError::MissingRecord(self))
+        }
+    }
 }
diff --git a/cosmos_core/src/netty/sync/registry/client.rs b/cosmos_core/src/netty/sync/registry/client.rs
index 4714e67cb..c4b7e57dd 100644
--- a/cosmos_core/src/netty/sync/registry/client.rs
+++ b/cosmos_core/src/netty/sync/registry/client.rs
@@ -1,7 +1,7 @@
 //! Handles client-side registry syncing logic
 
 use crate::{
-    netty::{cosmos_encoder, server_registry::RegistrySyncing, system_sets::NetworkingSystemsSet, NettyChannelServer},
+    netty::{cosmos_encoder, server_registry::RegistrySyncing, system_sets::NetworkingSystemsSet, NettyChannelClient, NettyChannelServer},
     registry::{identifiable::Identifiable, Registry},
 };
 use bevy::{
@@ -118,12 +118,17 @@ pub(super) fn register<T: States + FreelyMutableState + Clone + Copy>(
 
     app.configure_sets(Update, TransitionStateSet::TransitionState);
 
-    let transition_state = move |mut state_changer: ResMut<NextState<T>>, loading_registries: Res<RegistriesLeftToSync>| {
-        if loading_registries.0.is_some_and(|x| x == 0) {
-            info!("Got all registries from server - loading world!");
-            state_changer.set(loading_world_state);
-        }
-    };
+    let transition_state =
+        move |mut client: ResMut<RenetClient>, mut state_changer: ResMut<NextState<T>>, loading_registries: Res<RegistriesLeftToSync>| {
+            if loading_registries.0.is_some_and(|x| x == 0) {
+                info!("Got all registries from server - loading world!");
+                state_changer.set(loading_world_state);
+                client.send_message(
+                    NettyChannelClient::Registry,
+                    cosmos_encoder::serialize(&crate::netty::client_registry::RegistrySyncing::FinishedReceivingRegistries),
+                )
+            }
+        };
 
     app.add_systems(
         Update,
diff --git a/cosmos_core/src/physics/block_colliders.rs b/cosmos_core/src/physics/block_colliders.rs
index aa9c634a0..9c8b34aa2 100644
--- a/cosmos_core/src/physics/block_colliders.rs
+++ b/cosmos_core/src/physics/block_colliders.rs
@@ -102,6 +102,13 @@ impl BlockCollider {
 fn register_custom_colliders(blocks: Res<Registry<Block>>, mut registry: ResMut<Registry<BlockCollider>>) {
     registry.register(BlockCollider::new(BlockColliderType::Empty, "cosmos:air"));
 
+    if blocks.contains("cosmos:door_open") {
+        registry.register(BlockCollider::new(
+            BlockColliderType::Full(BlockColliderMode::SensorCollider),
+            "cosmos:door_open",
+        ));
+    }
+
     const EPSILON: f32 = 0.001;
 
     if blocks.contains("cosmos:short_grass") {
diff --git a/cosmos_core/src/physics/gravity_system.rs b/cosmos_core/src/physics/gravity_system.rs
index 04cd2f305..e475ab2b9 100644
--- a/cosmos_core/src/physics/gravity_system.rs
+++ b/cosmos_core/src/physics/gravity_system.rs
@@ -39,7 +39,7 @@ fn gravity_system(
                 if ratio >= 0.9 {
                     let face = Planet::planet_face_relative(rotation.inverse() * relative_position);
 
-                    let grav_dir = -(*rotation * face.direction().to_vec3());
+                    let grav_dir = -(*rotation * face.direction().as_vec3());
 
                     force += (prop.get().mass * force_per_kilogram * ratio) * grav_dir;
                 } else if ratio >= 0.1 {
@@ -49,7 +49,7 @@ fn gravity_system(
                 }
             }
 
-            force *= time.delta_seconds();
+            force *= time.delta_secs();
 
             if let Some(mut external_force) = external_force {
                 external_force.impulse += force;
diff --git a/cosmos_core/src/physics/location.rs b/cosmos_core/src/physics/location.rs
index 17e4504ef..feb89ce90 100644
--- a/cosmos_core/src/physics/location.rs
+++ b/cosmos_core/src/physics/location.rs
@@ -24,7 +24,6 @@ use bevy::{
         Added, App, Children, Commands, Component, Deref, DerefMut, Entity, Parent, Quat, Query, Transform, Update, Vec3, With, Without,
     },
     reflect::Reflect,
-    transform::bundles::TransformBundle,
 };
 use bevy_rapier3d::{na::Vector3, plugin::RapierContextEntityLink};
 use bigdecimal::{BigDecimal, FromPrimitive};
@@ -460,9 +459,9 @@ impl Location {
         let local_z = BigDecimal::from_f32(self.local.z).unwrap_or_else(|| panic!("Died on {}", self.local.z));
 
         Vector3::new(
-            BigDecimal::from_i64(self.sector.x()).unwrap() * &sector_dims + local_x,
-            BigDecimal::from_i64(self.sector.y()).unwrap() * &sector_dims + local_y,
-            BigDecimal::from_i64(self.sector.z()).unwrap() * &sector_dims + local_z,
+            BigDecimal::from_i64(self.sector.x()).unwrap_or_else(|| panic!("Died on {}", self.sector.x())) * &sector_dims + local_x,
+            BigDecimal::from_i64(self.sector.y()).unwrap_or_else(|| panic!("Died on {}", self.sector.y())) * &sector_dims + local_y,
+            BigDecimal::from_i64(self.sector.z()).unwrap_or_else(|| panic!("Died on {}", self.sector.z())) * &sector_dims + local_z,
         )
     }
 
@@ -572,7 +571,10 @@ pub fn handle_child_syncing(
 }
 
 fn on_add_location_without_transform(
-    mut query: Query<(Entity, &mut Location, Option<&BundleStartingRotation>), (Added<Location>, Without<Transform>, Without<PlayerWorld>)>,
+    mut query: Query<
+        (Entity, &mut Location, Option<&BundleStartingRotation>),
+        (Added<Location>, /* Without<Transform>, */ Without<PlayerWorld>),
+    >,
     q_worlds: Query<(&Location, &RapierContextEntityLink), With<PlayerWorld>>,
     mut commands: Commands,
 ) {
@@ -601,7 +603,7 @@ fn on_add_location_without_transform(
             commands
                 .entity(needs_transform_entity)
                 .remove::<BundleStartingRotation>()
-                .insert((TransformBundle::from_transform(transform), best_physics_world));
+                .insert((transform, best_physics_world));
         } else {
             warn!("Location bundle added before there was a player world!");
             let transform = Transform::from_translation(my_loc.absolute_coords_f32()).with_rotation(rotation);
@@ -611,7 +613,7 @@ fn on_add_location_without_transform(
             commands
                 .entity(needs_transform_entity)
                 .remove::<BundleStartingRotation>()
-                .insert(TransformBundle::from_transform(transform));
+                .insert(transform);
         }
     }
 }
diff --git a/cosmos_core/src/physics/structure_physics.rs b/cosmos_core/src/physics/structure_physics.rs
index 25678a793..46dc1b892 100644
--- a/cosmos_core/src/physics/structure_physics.rs
+++ b/cosmos_core/src/physics/structure_physics.rs
@@ -19,7 +19,6 @@ use bevy::prelude::{
     Res, Transform,
 };
 use bevy::reflect::Reflect;
-use bevy::transform::bundles::TransformBundle;
 use bevy::utils::HashSet;
 use bevy_rapier3d::geometry::{CollisionGroups, Group};
 use bevy_rapier3d::math::Vect;
@@ -583,7 +582,7 @@ fn listen_for_new_physics_event(
                             chunk_entity,
                             structure_entity,
                         },
-                        TransformBundle::from_transform(*chunk_trans),
+                        *chunk_trans,
                         collider,
                         ColliderMassProperties::Mass(mass),
                     ));
@@ -678,7 +677,7 @@ fn listen_for_structure_event(
     for ev in event.read() {
         to_do.insert(ChunkNeedsPhysicsEvent {
             chunk: (ev.block.chunk_coords()),
-            structure_entity: ev.structure_entity,
+            structure_entity: ev.block.structure(),
         });
     }
 
diff --git a/cosmos_core/src/plugin/cosmos_core_plugin.rs b/cosmos_core/src/plugin/cosmos_core_plugin.rs
index 5bb398978..506c20037 100644
--- a/cosmos_core/src/plugin/cosmos_core_plugin.rs
+++ b/cosmos_core/src/plugin/cosmos_core_plugin.rs
@@ -1,7 +1,9 @@
 //! This should contain everything needed for a cosmos application to run
 
 use crate::netty::sync::registry::RegistrySyncInit;
-use crate::{block, debug, economy, ecs, fluid, inventory, logic, netty, persistence, projectiles, shop, universe, utils};
+use crate::{
+    block, chat, crafting, debug, economy, ecs, entities, fluid, inventory, logic, netty, persistence, projectiles, shop, universe, utils,
+};
 use crate::{blockitems, structure};
 use crate::{events, loader};
 use crate::{item, physics};
@@ -115,6 +117,9 @@ impl<T: States + Clone + Copy + FreelyMutableState> Plugin for CosmosCorePlugin<
         fluid::register(app);
         debug::register(app);
         utils::register(app);
+        chat::register(app);
+        entities::register(app);
+        crafting::register(app);
     }
 }
 
diff --git a/cosmos_core/src/projectiles/laser.rs b/cosmos_core/src/projectiles/laser.rs
index 31a8be917..bd790d81c 100644
--- a/cosmos_core/src/projectiles/laser.rs
+++ b/cosmos_core/src/projectiles/laser.rs
@@ -130,9 +130,7 @@ impl Laser {
                 linvel: laser_velocity + firer_velocity,
                 ..Default::default()
             },
-            FireTime {
-                time: time.elapsed_seconds(),
-            },
+            FireTime { time: time.elapsed_secs() },
             context_entity_link,
             NotShadowCaster,
             NotShadowReceiver,
@@ -279,7 +277,7 @@ fn send_laser_hit_events(
 
 fn despawn_lasers(mut commands: Commands, query: Query<(Entity, &FireTime), With<Laser>>, time: Res<Time>) {
     for (ent, fire_time) in query.iter() {
-        if time.elapsed_seconds() - fire_time.time > LASER_LIVE_TIME.as_secs_f32() {
+        if time.elapsed_secs() - fire_time.time > LASER_LIVE_TIME.as_secs_f32() {
             commands.entity(ent).insert(NeedsDespawned);
         }
     }
diff --git a/cosmos_core/src/structure/base_structure.rs b/cosmos_core/src/structure/base_structure.rs
index 8ebe24ad5..e59435d1d 100644
--- a/cosmos_core/src/structure/base_structure.rs
+++ b/cosmos_core/src/structure/base_structure.rs
@@ -492,7 +492,7 @@ impl BaseStructure {
 
             if let Some(structure_entity) = self.get_entity() {
                 if let Some((take_damage_event_writer, destroyed_event_writer)) = event_writers {
-                    let block = StructureBlock::new(coords);
+                    let block = StructureBlock::new(coords, structure_entity);
 
                     take_damage_event_writer.send(BlockTakeDamageEvent {
                         structure_entity,
@@ -847,16 +847,18 @@ impl BaseStructure {
         &mut self,
         coords: BlockCoordinate,
         block_info: BlockInfo,
-        evw_block_data_changed: &mut EventWriter<BlockDataChangedEvent>,
+        evw_block_data_changed: Option<&mut EventWriter<BlockDataChangedEvent>>,
     ) {
         if let Some(chunk) = self.mut_chunk_at_block_coordinates(coords) {
             chunk.set_block_info_at(ChunkBlockCoordinate::for_block_coordinate(coords), block_info);
-            if let Some(structure_entity) = self.get_entity() {
-                evw_block_data_changed.send(BlockDataChangedEvent {
-                    block_data_entity: self.block_data(coords),
-                    block: StructureBlock::new(coords),
-                    structure_entity,
-                });
+
+            if let Some(evw_block_data_changed) = evw_block_data_changed {
+                if let Some(structure_entity) = self.get_entity() {
+                    evw_block_data_changed.send(BlockDataChangedEvent {
+                        block_data_entity: self.block_data(coords),
+                        block: StructureBlock::new(coords, structure_entity),
+                    });
+                }
             }
         }
     }
diff --git a/cosmos_core/src/structure/chunk/mod.rs b/cosmos_core/src/structure/chunk/mod.rs
index d0dd6d7f5..268d21c0c 100644
--- a/cosmos_core/src/structure/chunk/mod.rs
+++ b/cosmos_core/src/structure/chunk/mod.rs
@@ -299,8 +299,7 @@ impl Chunk {
 
             system_params.ev_writer.send(BlockDataChangedEvent {
                 block_data_entity: Some(data_ent),
-                block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords),
-                structure_entity,
+                block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords, structure_entity),
             });
 
             data_ent
@@ -314,9 +313,8 @@ impl Chunk {
                     BlockData {
                         data_count: 1,
                         identifier: BlockDataIdentifier {
-                            block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords),
+                            block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords, structure_entity),
                             block_id: id,
-                            structure_entity,
                         },
                     },
                 ))
@@ -327,8 +325,7 @@ impl Chunk {
 
             system_params.ev_writer.send(BlockDataChangedEvent {
                 block_data_entity: Some(data_ent),
-                block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords),
-                structure_entity,
+                block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords, structure_entity),
             });
 
             data_ent
@@ -363,8 +360,7 @@ impl Chunk {
             .spawn((BlockData {
                 data_count: 0,
                 identifier: BlockDataIdentifier {
-                    block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords),
-                    structure_entity,
+                    block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords, structure_entity),
                     block_id,
                 },
             },))
@@ -417,9 +413,8 @@ impl Chunk {
             let mut ecmds = system_params.commands.spawn(BlockData {
                 data_count: 1,
                 identifier: BlockDataIdentifier {
-                    block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords),
+                    block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords, structure_entity),
                     block_id: id,
-                    structure_entity,
                 },
             });
 
@@ -438,8 +433,7 @@ impl Chunk {
 
         system_params.ev_writer.send(BlockDataChangedEvent {
             block_data_entity: Some(data_ent),
-            block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords),
-            structure_entity,
+            block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords, structure_entity),
         });
 
         data_ent
@@ -481,8 +475,7 @@ impl Chunk {
                 let mut_block_data = MutBlockData::new(
                     result,
                     block_system_params.clone(),
-                    StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords),
-                    structure_entity,
+                    StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords, structure_entity),
                     data_ent,
                 );
 
@@ -519,8 +512,7 @@ impl Chunk {
 
             system_params.ev_writer.send(BlockDataChangedEvent {
                 block_data_entity: None,
-                block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords),
-                structure_entity,
+                block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords, structure_entity),
             });
 
             None
@@ -529,8 +521,7 @@ impl Chunk {
 
             system_params.ev_writer.send(BlockDataChangedEvent {
                 block_data_entity: Some(ent),
-                block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords),
-                structure_entity,
+                block: StructureBlock::new(self.chunk_coordinates().first_structure_block() + coords, structure_entity),
             });
 
             Some(ent)
diff --git a/cosmos_core/src/structure/dynamic_structure.rs b/cosmos_core/src/structure/dynamic_structure.rs
index 5a3f84407..bc6bc243f 100644
--- a/cosmos_core/src/structure/dynamic_structure.rs
+++ b/cosmos_core/src/structure/dynamic_structure.rs
@@ -21,7 +21,7 @@ use crate::{
 use super::{
     base_structure::BaseStructure,
     block_storage::BlockStorer,
-    chunk::{Chunk, ChunkUnloadEvent, CHUNK_DIMENSIONS},
+    chunk::{BlockInfo, Chunk, ChunkUnloadEvent, CHUNK_DIMENSIONS},
     coordinates::{BlockCoordinate, ChunkBlockCoordinate, ChunkCoordinate, Coordinate, CoordinateType},
     structure_block::StructureBlock,
     ChunkState,
@@ -97,6 +97,40 @@ impl DynamicStructure {
         self.get_chunk_state(coords) == ChunkState::Loaded && self.empty_chunks.contains(&self.flatten(coords))
     }
 
+    /// Sets the block at the given block coordinates.
+    /// Also sets its block_info. This does NOT send a [`BlockDataChangedEvent`] event!
+    ///
+    /// * `event_writer` If this is `None`, no event will be generated. A valid usecase for this being `None` is when you are initially loading/generating everything and you don't want a billion events being generated.
+    pub fn set_block_and_info_at(
+        &mut self,
+        coords: BlockCoordinate,
+        block: &Block,
+        block_info: BlockInfo,
+        blocks: &Registry<Block>,
+        event_writer: Option<&mut EventWriter<BlockChangedEvent>>,
+    ) {
+        let old_block = self.block_id_at(coords);
+        let old_block_info = self.block_info_at(coords);
+
+        self.set_block_at(coords, block, block_info.get_rotation(), blocks, None);
+        self.set_block_info_at(coords, block_info, None);
+
+        if let Some(event_writer) = event_writer {
+            if old_block_info != block_info || old_block != block.id() {
+                let Some(self_entity) = self.base_structure.self_entity else {
+                    return;
+                };
+                event_writer.send(BlockChangedEvent {
+                    new_block: block.id(),
+                    old_block,
+                    block: StructureBlock::new(coords, self_entity),
+                    old_block_info,
+                    new_block_info: self.block_info_at(coords),
+                });
+            }
+        }
+    }
+
     /// Sets the block at the given block coordinates.
     ///
     /// * `event_writer` If this is `None`, no event will be generated. A valid usecase for this being `None` is when you are initially loading/generating everything and you don't want a billion events being generated.
@@ -113,7 +147,7 @@ impl DynamicStructure {
             return;
         }
 
-        let old_block_rotation = self.block_rotation(coords);
+        let old_block_info = self.block_info_at(coords);
 
         let chunk_coords = ChunkCoordinate::for_block_coordinate(coords);
         let chunk_block_coords = ChunkBlockCoordinate::for_block_coordinate(coords);
@@ -149,10 +183,9 @@ impl DynamicStructure {
                     event_writer.send(BlockChangedEvent {
                         new_block: block.id(),
                         old_block,
-                        structure_entity: self_entity,
-                        block: StructureBlock::new(coords),
-                        old_block_rotation,
-                        new_block_rotation: block_rotation,
+                        block: StructureBlock::new(coords, self_entity),
+                        old_block_info,
+                        new_block_info: self.block_info_at(coords),
                     });
                 }
             }
diff --git a/cosmos_core/src/structure/full_structure.rs b/cosmos_core/src/structure/full_structure.rs
index ec64e7c45..40b44a1f1 100644
--- a/cosmos_core/src/structure/full_structure.rs
+++ b/cosmos_core/src/structure/full_structure.rs
@@ -19,7 +19,7 @@ use crate::{
 use super::{
     base_structure::BaseStructure,
     block_storage::BlockStorer,
-    chunk::Chunk,
+    chunk::{BlockInfo, Chunk},
     coordinates::{BlockCoordinate, ChunkBlockCoordinate, ChunkCoordinate, CoordinateType},
     structure_block::StructureBlock,
     ChunkState, Structure,
@@ -91,6 +91,40 @@ impl FullStructure {
         Self::block_relative_position_static(coords, self.blocks_width(), self.blocks_height(), self.blocks_length())
     }
 
+    /// Sets the block at the given block coordinates.
+    /// Also sets its block_info. This does NOT send a [`BlockDataChangedEvent`] event!
+    ///
+    /// * `event_writer` If this is `None`, no event will be generated. A valid usecase for this being `None` is when you are initially loading/generating everything and you don't want a billion events being generated.
+    pub fn set_block_and_info_at(
+        &mut self,
+        coords: BlockCoordinate,
+        block: &Block,
+        block_info: BlockInfo,
+        blocks: &Registry<Block>,
+        event_writer: Option<&mut EventWriter<BlockChangedEvent>>,
+    ) {
+        let old_block = self.block_id_at(coords);
+        let old_block_info = self.block_info_at(coords);
+
+        self.set_block_at(coords, block, block_info.get_rotation(), blocks, None);
+        self.set_block_info_at(coords, block_info, None);
+
+        if let Some(event_writer) = event_writer {
+            if old_block_info != block_info || old_block != block.id() {
+                let Some(self_entity) = self.base_structure.self_entity else {
+                    return;
+                };
+                event_writer.send(BlockChangedEvent {
+                    new_block: block.id(),
+                    old_block,
+                    block: StructureBlock::new(coords, self_entity),
+                    old_block_info,
+                    new_block_info: self.block_info_at(coords),
+                });
+            }
+        }
+    }
+
     /// Sets the block at the given block coordinates.
     ///
     /// * `event_writer` If this is `None`, no event will be generated. A valid usecase for this being `None` is when you are initially loading/generating everything and you don't want a billion events being generated.
@@ -109,7 +143,7 @@ impl FullStructure {
             return;
         }
 
-        let old_block_rotation = self.block_rotation(coords);
+        let old_block_info = self.block_info_at(coords);
 
         let chunk_coords = ChunkCoordinate::for_block_coordinate(coords);
         let chunk_block_coords = ChunkBlockCoordinate::for_block_coordinate(coords);
@@ -152,10 +186,9 @@ impl FullStructure {
         event_writer.send(BlockChangedEvent {
             new_block: block.id(),
             old_block,
-            structure_entity: self_entity,
-            block: StructureBlock::new(coords),
-            old_block_rotation,
-            new_block_rotation: block_rotation,
+            block: StructureBlock::new(coords, self_entity),
+            old_block_info,
+            new_block_info: self.block_info_at(coords),
         });
     }
 
@@ -240,10 +273,9 @@ impl FullStructure {
         );
 
         let mut any_blocks = false;
-        for b in self_as_structure.all_blocks_iter(false) {
+        for c in self_as_structure.all_blocks_iter(false) {
             any_blocks = true;
 
-            let c = b.coords();
             if c.x < min.x {
                 min.x = c.x;
             }
diff --git a/cosmos_core/src/structure/mod.rs b/cosmos_core/src/structure/mod.rs
index e1c31be7d..d5b008176 100644
--- a/cosmos_core/src/structure/mod.rs
+++ b/cosmos_core/src/structure/mod.rs
@@ -10,9 +10,8 @@ use std::sync::{Arc, Mutex};
 
 use bevy::app::Update;
 use bevy::ecs::query::{QueryData, QueryFilter, ROQueryItem, With};
-use bevy::prelude::{App, Event, IntoSystemConfigs, IntoSystemSetConfigs, Name, PreUpdate, SystemSet, VisibilityBundle};
+use bevy::prelude::{App, Event, IntoSystemConfigs, IntoSystemSetConfigs, Name, PreUpdate, SystemSet, Visibility};
 use bevy::reflect::Reflect;
-use bevy::transform::bundles::TransformBundle;
 use bevy::utils::{HashMap, HashSet};
 use bevy_rapier3d::plugin::RapierContextEntityLink;
 use chunk::BlockInfo;
@@ -64,7 +63,6 @@ use self::dynamic_structure::DynamicStructure;
 use self::events::ChunkSetEvent;
 use self::full_structure::FullStructure;
 use self::loading::StructureLoadingSet;
-use self::structure_block::StructureBlock;
 use self::structure_iterator::{BlockIterator, ChunkIterator};
 
 #[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
@@ -341,6 +339,23 @@ impl Structure {
         }
     }
 
+    /// Sets the block at the given block coordinates.
+    ///
+    /// * `event_writer` If this is `None`, no event will be generated. A valid usecase for this being `None` is when you are initially loading/generating everything and you don't want a billion events being generated.
+    pub fn set_block_and_info_at(
+        &mut self,
+        coords: BlockCoordinate,
+        block: &Block,
+        block_info: BlockInfo,
+        blocks: &Registry<Block>,
+        event_writer: Option<&mut EventWriter<BlockChangedEvent>>,
+    ) {
+        match self {
+            Self::Full(fs) => fs.set_block_and_info_at(coords, block, block_info, blocks, event_writer),
+            Self::Dynamic(ds) => ds.set_block_and_info_at(coords, block, block_info, blocks, event_writer),
+        }
+    }
+
     /// Gets the chunk's relative position to this structure's transform.
     pub fn chunk_relative_position(&self, coords: ChunkCoordinate) -> Vec3 {
         match self {
@@ -693,8 +708,8 @@ impl Structure {
         evw_block_data_changed: &mut EventWriter<BlockDataChangedEvent>,
     ) {
         match self {
-            Self::Full(fs) => fs.set_block_info_at(coords, block_info, evw_block_data_changed),
-            Self::Dynamic(ds) => ds.set_block_info_at(coords, block_info, evw_block_data_changed),
+            Self::Full(fs) => fs.set_block_info_at(coords, block_info, Some(evw_block_data_changed)),
+            Self::Dynamic(ds) => ds.set_block_info_at(coords, block_info, Some(evw_block_data_changed)),
         }
     }
 
@@ -737,7 +752,7 @@ fn remove_empty_chunks(
     mut commands: Commands,
 ) {
     for bce in block_change_event.read() {
-        let Ok(mut structure) = structure_query.get_mut(bce.structure_entity) else {
+        let Ok(mut structure) = structure_query.get_mut(bce.block.structure()) else {
             continue;
         };
 
@@ -762,8 +777,8 @@ fn spawn_chunk_entity(
     chunk_set_events: &mut HashSet<ChunkSetEvent>,
 ) {
     let mut entity_cmds = commands.spawn((
-        VisibilityBundle::default(),
-        TransformBundle::from_transform(Transform::from_translation(structure.chunk_relative_position(chunk_coordinate))),
+        Visibility::default(),
+        Transform::from_translation(structure.chunk_relative_position(chunk_coordinate)),
         Name::new("Chunk Entity"),
         NoSendEntity,
         ChunkEntity {
@@ -800,7 +815,7 @@ fn add_chunks_system(
     let mut chunk_set_events = HashSet::new();
 
     for ev in block_reader.read() {
-        s_chunks.insert((ev.structure_entity, ev.block.chunk_coords()));
+        s_chunks.insert((ev.block.structure(), ev.block.chunk_coords()));
     }
 
     for ev in chunk_init_reader.read() {
diff --git a/cosmos_core/src/structure/query.rs b/cosmos_core/src/structure/query.rs
index 39d2ad797..15162bbf2 100644
--- a/cosmos_core/src/structure/query.rs
+++ b/cosmos_core/src/structure/query.rs
@@ -22,7 +22,6 @@ pub struct MutBlockData<'q, 'w, 's, Q: QueryData> {
     bs_params: Rc<RefCell<BlockDataSystemParams<'w, 's>>>,
     changed: bool,
     block: StructureBlock,
-    structure_entity: Entity,
     data_entity: Entity,
 }
 
@@ -35,7 +34,6 @@ impl<'q, 'w, 's, Q: QueryData> MutBlockData<'q, 'w, 's, Q> {
         data: QueryItem<'q, Q>,
         bs_params: Rc<RefCell<BlockDataSystemParams<'w, 's>>>,
         block: StructureBlock,
-        structure_entity: Entity,
         data_entity: Entity,
     ) -> Self {
         Self {
@@ -44,7 +42,6 @@ impl<'q, 'w, 's, Q: QueryData> MutBlockData<'q, 'w, 's, Q> {
             bs_params,
             block,
             data_entity,
-            structure_entity,
         }
     }
 
@@ -79,7 +76,6 @@ impl<Q: QueryData> Drop for MutBlockData<'_, '_, '_, Q> {
         self.bs_params.borrow_mut().ev_writer.send(BlockDataChangedEvent {
             block: self.block,
             block_data_entity: Some(self.data_entity),
-            structure_entity: self.structure_entity,
         });
     }
 }
diff --git a/cosmos_core/src/structure/structure_block.rs b/cosmos_core/src/structure/structure_block.rs
index 895b08b0d..57b872532 100644
--- a/cosmos_core/src/structure/structure_block.rs
+++ b/cosmos_core/src/structure/structure_block.rs
@@ -1,7 +1,7 @@
 //! Represents a block that is a part of a structure
 
 use bevy::{
-    prelude::{App, Deref, DerefMut},
+    prelude::{App, Entity},
     reflect::Reflect,
 };
 use serde::{Deserialize, Serialize};
@@ -16,57 +16,48 @@ use super::{
     Structure,
 };
 
-#[derive(Clone, Deref, DerefMut, Debug, Reflect, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Reflect, Copy, PartialEq, Eq, Serialize, Deserialize)]
 /// A block that is a part of a structure.
 ///
 /// This is really just a wrapper around a BlockCoordinate, but this implies there is (or at least was) a block here.
 /// This may not be valid when it is used.
-pub struct StructureBlock(pub BlockCoordinate);
-
-impl From<StructureBlock> for (CoordinateType, CoordinateType, CoordinateType) {
-    fn from(val: StructureBlock) -> Self {
-        (val.x, val.y, val.z)
-    }
-}
-
-impl From<&StructureBlock> for (CoordinateType, CoordinateType, CoordinateType) {
-    fn from(val: &StructureBlock) -> Self {
-        (val.x, val.y, val.z)
-    }
+pub struct StructureBlock {
+    coordinate: BlockCoordinate,
+    structure: Entity,
 }
 
 impl StructureBlock {
     #[inline]
     /// Gets the x position
     pub fn x(&self) -> CoordinateType {
-        self.x
+        self.coordinate.x
     }
     #[inline]
     /// Gets the y position
     pub fn y(&self) -> CoordinateType {
-        self.y
+        self.coordinate.y
     }
     #[inline]
     /// Gets the z position
     pub fn z(&self) -> CoordinateType {
-        self.z
+        self.coordinate.z
     }
 
     /// Creates a structure block
-    pub fn new(coords: BlockCoordinate) -> Self {
-        Self(coords)
+    pub fn new(coordinate: BlockCoordinate, structure: Entity) -> Self {
+        Self { coordinate, structure }
     }
 
     #[inline]
     /// Returns this block's top facing face
     pub fn block_up(&self, structure: &Structure) -> BlockRotation {
-        structure.block_rotation(self.0)
+        structure.block_rotation(self.coordinate)
     }
 
     #[inline]
     /// Returns the numeric block id - this returns air if the block is not loaded
     pub fn block_id(&self, structure: &Structure) -> u16 {
-        structure.block_id_at(self.0)
+        structure.block_id_at(self.coordinate)
     }
 
     #[inline]
@@ -78,13 +69,24 @@ impl StructureBlock {
     #[inline]
     /// The chunk that contains this block's coordinates as (x, y, z).
     pub fn coords(&self) -> BlockCoordinate {
-        self.0
+        self.coordinate
     }
 
     #[inline]
     /// The chunk that contains this block's coordinates as (x, y, z).
     pub fn chunk_coords(&self) -> ChunkCoordinate {
-        ChunkCoordinate::for_block_coordinate(self.0)
+        ChunkCoordinate::for_block_coordinate(self.coordinate)
+    }
+
+    #[inline]
+    /// Returns the entity this block is for
+    pub fn structure(&self) -> Entity {
+        self.structure
+    }
+
+    /// Sets the structure this belongs to to this entity
+    pub fn set_structure(&mut self, e: Entity) {
+        self.structure = e;
     }
 }
 
diff --git a/cosmos_core/src/structure/structure_iterator.rs b/cosmos_core/src/structure/structure_iterator.rs
index 1d1b5a216..25f5dd692 100644
--- a/cosmos_core/src/structure/structure_iterator.rs
+++ b/cosmos_core/src/structure/structure_iterator.rs
@@ -6,7 +6,6 @@ use super::{
     block_storage::BlockStorer,
     chunk::{Chunk, CHUNK_DIMENSIONS},
     coordinates::{BlockCoordinate, ChunkBlockCoordinate, ChunkCoordinate, Coordinate, UnboundBlockCoordinate, UnboundChunkCoordinate},
-    structure_block::StructureBlock,
     Structure,
 };
 
@@ -135,7 +134,7 @@ impl<'a> BlockIterator<'a> {
 }
 
 impl Iterator for BlockIterator<'_> {
-    type Item = StructureBlock;
+    type Item = BlockCoordinate;
 
     fn next(&mut self) -> Option<Self::Item> {
         match &mut self.state {
@@ -161,7 +160,7 @@ impl Iterator for BlockIterator<'_> {
                     }
                 }
 
-                Some(StructureBlock::new(position))
+                Some(position)
             }
             BlockItrState::ExcludeEmpty(body) => {
                 let first_block_coordinate = body.cur_chunk.chunk_coordinates().first_structure_block();
@@ -205,11 +204,11 @@ impl Iterator for BlockIterator<'_> {
                     }
                 }
 
-                let to_return = Some(StructureBlock::new(BlockCoordinate::new(
+                let to_return = Some(BlockCoordinate::new(
                     body.body.at.x + body.cur_chunk.structure_x() * CHUNK_DIMENSIONS,
                     body.body.at.y + body.cur_chunk.structure_y() * CHUNK_DIMENSIONS,
                     body.body.at.z + body.cur_chunk.structure_z() * CHUNK_DIMENSIONS,
-                )));
+                ));
 
                 if advance_body(body) {
                     self.state = BlockItrState::Invalid;
diff --git a/cosmos_core/src/structure/systems/laser_cannon_system/mod.rs b/cosmos_core/src/structure/systems/laser_cannon_system/mod.rs
index 302cd5dcf..733af6427 100644
--- a/cosmos_core/src/structure/systems/laser_cannon_system/mod.rs
+++ b/cosmos_core/src/structure/systems/laser_cannon_system/mod.rs
@@ -71,8 +71,7 @@ impl LineSystemCooldown {
     /// Removes any no-longer used cooldowns.
     pub fn remove_unused_cooldowns<T: LineProperty, S: LinePropertyCalculator<T>>(&mut self, line_system: &LineSystem<T, S>) {
         // This could be made more efficient, but oh well.
-        self.lines
-            .retain(|&k, _| line_system.lines.iter().map(|x| x.start).any(|x| x.coords() == k));
+        self.lines.retain(|&k, _| line_system.lines.iter().map(|x| x.start).any(|x| x == k));
     }
 }
 
diff --git a/cosmos_core/src/structure/systems/line_system.rs b/cosmos_core/src/structure/systems/line_system.rs
index 876526a3d..1fea93dc0 100644
--- a/cosmos_core/src/structure/systems/line_system.rs
+++ b/cosmos_core/src/structure/systems/line_system.rs
@@ -8,10 +8,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     block::{block_direction::BlockDirection, Block},
     registry::{create_registry, identifiable::Identifiable, Registry},
-    structure::{
-        coordinates::{BlockCoordinate, CoordinateType},
-        StructureBlock,
-    },
+    structure::coordinates::{BlockCoordinate, CoordinateType},
 };
 
 use super::StructureSystemImpl;
@@ -122,7 +119,7 @@ impl Registry<LineColorBlock> {
 /// All blocks in this line are facing the same direction.
 pub struct Line<T: LineProperty> {
     /// The block at the start
-    pub start: StructureBlock,
+    pub start: BlockCoordinate,
     /// The direction this line is facing
     pub direction: BlockDirection,
     /// How many blocks this line has
@@ -145,15 +142,15 @@ pub struct Line<T: LineProperty> {
 impl<T: LineProperty> Line<T> {
     #[inline]
     /// Returns the ending structure block
-    pub fn end(&self) -> StructureBlock {
+    pub fn end(&self) -> BlockCoordinate {
         let (dx, dy, dz) = self.direction.to_i32_tuple();
         let delta = self.len as i32 - 1;
 
-        StructureBlock::new(BlockCoordinate::new(
+        BlockCoordinate::new(
             (self.start.x as i32 + delta * dx) as CoordinateType,
             (self.start.y as i32 + delta * dy) as CoordinateType,
             (self.start.z as i32 + delta * dz) as CoordinateType,
-        ))
+        )
     }
 
     /// Checks if this line is *individually* active.
@@ -226,11 +223,11 @@ pub struct LineSystem<T: LineProperty, S: LinePropertyCalculator<T>> {
 
 impl<T: LineProperty, S: LinePropertyCalculator<T>> LineSystem<T, S> {
     /// Returns the line that contains this block (if any)
-    pub fn mut_line_containing(&mut self, block: StructureBlock) -> Option<&mut Line<T>> {
+    pub fn mut_line_containing(&mut self, block: BlockCoordinate) -> Option<&mut Line<T>> {
         self.lines.iter_mut().find(|x| x.within(&block))
     }
     /// Returns the line that contains this block (if any)
-    pub fn line_containing(&mut self, block: StructureBlock) -> Option<&Line<T>> {
+    pub fn line_containing(&mut self, block: BlockCoordinate) -> Option<&Line<T>> {
         self.lines.iter().find(|x| x.within(&block))
     }
 }
diff --git a/cosmos_server/Cargo.toml b/cosmos_server/Cargo.toml
index 1a2ed8dc6..9982c7164 100644
--- a/cosmos_server/Cargo.toml
+++ b/cosmos_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cosmos_server"
-version = "0.0.6"
+version = "0.0.7"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -38,10 +38,11 @@ default = [
     "bevy/default_font",
     "bevy/webgl2",
     "bevy/sysinfo_plugin",
+    "bevy/bevy_window",
 ]
 
 [dependencies]
-cosmos_core = { version = "0.0.6", path = "../cosmos_core", features = [
+cosmos_core = { version = "0.0.7", path = "../cosmos_core", features = [
     "server",
 ] }
 
@@ -77,4 +78,4 @@ derive_more = { workspace = true }
 
 bevy_easy_compute = { workspace = true }
 bytemuck = { workspace = true }
-iyes_perf_ui = { workspace = true }
+# iyes_perf_ui = { workspace = true }
diff --git a/cosmos_server/assets/cosmos/kits/starter.json b/cosmos_server/assets/cosmos/kits/starter.json
new file mode 100644
index 000000000..f04ca3a3a
--- /dev/null
+++ b/cosmos_server/assets/cosmos/kits/starter.json
@@ -0,0 +1,32 @@
+[
+  {
+    "slot": 0,
+    "item": "cosmos:ship_core",
+    "quantity": 1
+  },
+  {
+    "slot": 1,
+    "item": "cosmos:thruster",
+    "quantity": 5
+  },
+  {
+    "slot": 2,
+    "item": "cosmos:reactor",
+    "quantity": 6
+  },
+  {
+    "slot": 3,
+    "item": "cosmos:plasma_drill",
+    "quantity": 12
+  },
+  {
+    "slot": 4,
+    "item": "cosmos:ship_hull_grey",
+    "quantity": 30
+  },
+  {
+    "slot": 5,
+    "item": "cosmos:laser_cannon",
+    "quantity": 6
+  }
+]
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/grey_ship_hull.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/grey_ship_hull.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/grey_ship_hull.json
@@ -0,0 +1 @@
+{}
diff --git a/cosmos_server/src/ai/pirate.rs b/cosmos_server/src/ai/pirate.rs
index d9e9bbc68..631ed4d70 100644
--- a/cosmos_server/src/ai/pirate.rs
+++ b/cosmos_server/src/ai/pirate.rs
@@ -157,7 +157,7 @@ fn handle_pirate_movement(
         if let Some(brake_check_start) = pirate_ai.brake_check {
             pirate_ship_movement.movement = Vec3::ZERO;
             pirate_ship_movement.braking = true;
-            if time.elapsed_seconds() - brake_check_start > 1.0 {
+            if time.elapsed_secs() - brake_check_start > 1.0 {
                 pirate_ai.brake_check = None;
             }
         } else {
@@ -167,7 +167,7 @@ fn handle_pirate_movement(
                 pirate_ship_movement.movement = Vec3::Z;
             } else {
                 if pirate_vel.linvel.length() > 50.0 && rand::random::<f32>() < 0.003 {
-                    pirate_ai.brake_check = Some(time.elapsed_seconds());
+                    pirate_ai.brake_check = Some(time.elapsed_secs());
                 }
                 pirate_ship_movement.movement = -Vec3::Z;
             }
diff --git a/cosmos_server/src/blocks/block_events.rs b/cosmos_server/src/blocks/block_events.rs
index d3a780470..8ebe2d44a 100644
--- a/cosmos_server/src/blocks/block_events.rs
+++ b/cosmos_server/src/blocks/block_events.rs
@@ -1,29 +1,50 @@
 use bevy::{prelude::*, utils::HashMap};
 use bevy_renet2::renet2::RenetServer;
 use cosmos_core::{
-    events::block_events::BlockChangedEvent,
+    events::block_events::{BlockChangedEvent, BlockDataChangedEvent},
     netty::{
         cosmos_encoder,
         server_reliable_messages::{BlockChanged, BlocksChangedPacket, ServerReliableMessages},
         system_sets::NetworkingSystemsSet,
         NettyChannelServer,
     },
+    prelude::Structure,
     state::GameState,
 };
 
 use crate::structure::block_health::BlockHealthSet;
 
-fn handle_block_changed_event(mut event_reader: EventReader<BlockChangedEvent>, mut server: ResMut<RenetServer>) {
-    let iter_len = event_reader.read().len();
+fn handle_block_changed_event(
+    mut evr_block_changed_event: EventReader<BlockChangedEvent>,
+    mut evr_block_data_changed: EventReader<BlockDataChangedEvent>,
+    mut server: ResMut<RenetServer>,
+    q_structure: Query<&Structure>,
+) {
+    let events_iter = evr_block_changed_event.read();
+    let iter_len = events_iter.len();
     let mut map = HashMap::new();
-    for ev in event_reader.read() {
-        if !map.contains_key(&ev.structure_entity) {
-            map.insert(ev.structure_entity, Vec::with_capacity(iter_len));
+
+    for ev in events_iter {
+        if !map.contains_key(&ev.block.structure()) {
+            map.insert(ev.block.structure(), Vec::with_capacity(iter_len));
         }
-        map.get_mut(&ev.structure_entity).expect("Set above").push(BlockChanged {
+        map.get_mut(&ev.block.structure()).expect("Set above").push(BlockChanged {
             coordinates: ev.block,
             block_id: ev.new_block,
-            block_rotation: ev.new_block_rotation,
+            block_info: ev.new_block_info,
+        });
+    }
+    for ev in evr_block_data_changed.read() {
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
+            continue;
+        };
+        if !map.contains_key(&ev.block.structure()) {
+            map.insert(ev.block.structure(), Vec::with_capacity(iter_len));
+        }
+        map.get_mut(&ev.block.structure()).expect("Set above").push(BlockChanged {
+            coordinates: ev.block,
+            block_id: structure.block_id_at(ev.block.coords()),
+            block_info: structure.block_info_at(ev.block.coords()),
         });
     }
 
diff --git a/cosmos_server/src/blocks/data/basic_fabricator.rs b/cosmos_server/src/blocks/data/basic_fabricator.rs
new file mode 100644
index 000000000..8b639a136
--- /dev/null
+++ b/cosmos_server/src/blocks/data/basic_fabricator.rs
@@ -0,0 +1,140 @@
+//! Handles basic fabricator inventory
+
+use bevy::{
+    app::{App, Update},
+    ecs::{
+        entity::Entity,
+        event::{EventReader, EventWriter},
+        query::With,
+        schedule::IntoSystemConfigs,
+        system::{Query, Res},
+    },
+    prelude::Event,
+};
+use cosmos_core::{
+    block::{block_events::BlockEventsSet, data::BlockData, Block},
+    events::block_events::{BlockChangedEvent, BlockDataSystemParams},
+    inventory::Inventory,
+    netty::system_sets::NetworkingSystemsSet,
+    registry::{identifiable::Identifiable, Registry},
+    structure::{structure_block::StructureBlock, Structure},
+};
+
+use crate::{
+    fluid::interact_fluid::FluidInteractionSet,
+    persistence::loading::{LoadingBlueprintSystemSet, NeedsBlueprintLoaded, LOADING_SCHEDULE},
+};
+
+#[derive(Event, Debug)]
+/// Sent whenever an entity needs an inventory populated.
+///
+/// This should be populated by reading the block data on disk or creating a new inventory.
+struct PopulateBasicFabricatorInventoryEvent {
+    /// The block
+    pub block: StructureBlock,
+}
+
+/// Used to process the addition/removal of storage blocks to a structure.
+///
+/// Sends out the `PopulateBlockInventoryEvent` event when needed.
+fn on_add_basic_fabricator(
+    mut q_structure: Query<&mut Structure>,
+    blocks: Res<Registry<Block>>,
+    mut evr_block_changed: EventReader<BlockChangedEvent>,
+    mut ev_writer: EventWriter<PopulateBasicFabricatorInventoryEvent>,
+    mut q_block_data: Query<&mut BlockData>,
+    mut params: BlockDataSystemParams,
+    q_has_data: Query<(), With<Inventory>>,
+) {
+    if evr_block_changed.is_empty() {
+        return;
+    }
+
+    let Some(block) = blocks.from_id("cosmos:basic_fabricator") else {
+        return;
+    };
+
+    for ev in evr_block_changed.read() {
+        if ev.new_block == ev.old_block {
+            continue;
+        }
+
+        let Ok(mut structure) = q_structure.get_mut(ev.block.structure()) else {
+            continue;
+        };
+
+        if blocks.from_numeric_id(ev.old_block) == block {
+            let coords = ev.block.coords();
+
+            structure.remove_block_data::<Inventory>(coords, &mut params, &mut q_block_data, &q_has_data);
+        }
+
+        if blocks.from_numeric_id(ev.new_block) == block {
+            ev_writer.send(PopulateBasicFabricatorInventoryEvent { block: ev.block });
+        }
+    }
+}
+
+fn on_load_blueprint_storage(
+    needs_blueprint_loaded_structure: Query<(Entity, &Structure), With<NeedsBlueprintLoaded>>,
+    blocks: Res<Registry<Block>>,
+    mut ev_writer: EventWriter<PopulateBasicFabricatorInventoryEvent>,
+) {
+    for (structure_entity, structure) in needs_blueprint_loaded_structure.iter() {
+        let Some(storage_block) = blocks.from_id("cosmos:basic_fabricator") else {
+            return;
+        };
+
+        for block in structure.all_blocks_iter(false) {
+            if structure.block_id_at(block) == storage_block.id() {
+                ev_writer.send(PopulateBasicFabricatorInventoryEvent {
+                    block: StructureBlock::new(block, structure_entity),
+                });
+            }
+        }
+    }
+}
+
+fn populate_inventory(
+    mut q_structure: Query<&mut Structure>,
+    mut q_block_data: Query<&mut BlockData>,
+    q_has_inventory: Query<(), With<Inventory>>,
+    mut params: BlockDataSystemParams,
+    mut ev_reader: EventReader<PopulateBasicFabricatorInventoryEvent>,
+) {
+    for ev in ev_reader.read() {
+        let coords = ev.block.coords();
+
+        let Ok(mut structure) = q_structure.get_mut(ev.block.structure()) else {
+            continue;
+        };
+
+        structure.insert_block_data_with_entity(
+            coords,
+            |e| Inventory::new("Basic Fabricator", 6, None, e),
+            &mut params,
+            &mut q_block_data,
+            &q_has_inventory,
+        );
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(
+        Update,
+        (
+            on_add_basic_fabricator
+                .in_set(BlockEventsSet::ProcessEvents)
+                .ambiguous_with(FluidInteractionSet::InteractWithFluidBlocks),
+            populate_inventory.in_set(BlockEventsSet::SendEventsForNextFrame),
+        )
+            .chain()
+            .in_set(NetworkingSystemsSet::Between),
+    )
+    .add_systems(
+        LOADING_SCHEDULE,
+        // Need structure to be populated first, thus `DoneLoadingBlueprints` instead of `DoLoadingBlueprints``
+        on_load_blueprint_storage.in_set(LoadingBlueprintSystemSet::DoneLoadingBlueprints),
+    )
+    .add_event::<PopulateBasicFabricatorInventoryEvent>();
+}
diff --git a/cosmos_server/src/blocks/data/mod.rs b/cosmos_server/src/blocks/data/mod.rs
index 1209fe55e..59a818b12 100644
--- a/cosmos_server/src/blocks/data/mod.rs
+++ b/cosmos_server/src/blocks/data/mod.rs
@@ -1,7 +1,9 @@
 use bevy::app::App;
 
+mod basic_fabricator;
 mod storage;
 
 pub(super) fn register(app: &mut App) {
     storage::register(app);
+    basic_fabricator::register(app);
 }
diff --git a/cosmos_server/src/blocks/data/storage.rs b/cosmos_server/src/blocks/data/storage.rs
index 440fabe87..72632644c 100644
--- a/cosmos_server/src/blocks/data/storage.rs
+++ b/cosmos_server/src/blocks/data/storage.rs
@@ -30,8 +30,6 @@ use crate::{
 ///
 /// This should be populated by reading the block data on disk or creating a new inventory.
 struct PopulateBlockInventoryEvent {
-    /// The structure's entity
-    pub structure_entity: Entity,
     /// The block
     pub block: StructureBlock,
 }
@@ -61,7 +59,7 @@ fn on_add_storage(
             continue;
         }
 
-        let Ok(mut structure) = q_structure.get_mut(ev.structure_entity) else {
+        let Ok(mut structure) = q_structure.get_mut(ev.block.structure()) else {
             continue;
         };
 
@@ -72,10 +70,7 @@ fn on_add_storage(
         }
 
         if blocks.from_numeric_id(ev.new_block) == block {
-            ev_writer.send(PopulateBlockInventoryEvent {
-                block: ev.block,
-                structure_entity: ev.structure_entity,
-            });
+            ev_writer.send(PopulateBlockInventoryEvent { block: ev.block });
         }
     }
 }
@@ -91,8 +86,10 @@ fn on_load_blueprint_storage(
         };
 
         for block in structure.all_blocks_iter(false) {
-            if block.block_id(structure) == storage_block.id() {
-                ev_writer.send(PopulateBlockInventoryEvent { block, structure_entity });
+            if structure.block_id_at(block) == storage_block.id() {
+                ev_writer.send(PopulateBlockInventoryEvent {
+                    block: StructureBlock::new(block, structure_entity),
+                });
             }
         }
     }
@@ -108,7 +105,7 @@ fn populate_inventory(
     for ev in ev_reader.read() {
         let coords = ev.block.coords();
 
-        let Ok(mut structure) = q_structure.get_mut(ev.structure_entity) else {
+        let Ok(mut structure) = q_structure.get_mut(ev.block.structure()) else {
             continue;
         };
 
diff --git a/cosmos_server/src/blocks/interactable/door.rs b/cosmos_server/src/blocks/interactable/door.rs
new file mode 100644
index 000000000..c79f6c3ac
--- /dev/null
+++ b/cosmos_server/src/blocks/interactable/door.rs
@@ -0,0 +1,118 @@
+use bevy::{prelude::*, utils::hashbrown::HashSet};
+use cosmos_core::{
+    block::{
+        block_direction::ALL_BLOCK_DIRECTIONS,
+        block_events::{BlockEventsSet, BlockInteractEvent},
+        Block,
+    },
+    events::block_events::BlockChangedEvent,
+    netty::system_sets::NetworkingSystemsSet,
+    prelude::{BlockCoordinate, Structure, StructureBlock},
+    registry::{identifiable::Identifiable, Registry},
+    state::GameState,
+};
+
+#[derive(Debug, Event)]
+struct ToggleDoorEvent(StructureBlock);
+
+fn handle_door_block_event(
+    mut interact_events: EventReader<BlockInteractEvent>,
+    q_structure: Query<&Structure>,
+    blocks: Res<Registry<Block>>,
+    mut ev_writer: EventWriter<ToggleDoorEvent>,
+) {
+    for ev in interact_events.read() {
+        let Some(s_block) = ev.block else {
+            continue;
+        };
+
+        let Ok(structure) = q_structure.get(s_block.structure()) else {
+            warn!("{s_block:?}");
+            continue;
+        };
+
+        let block = structure.block_at(s_block.coords(), &blocks);
+        let un = block.unlocalized_name();
+        if un != "cosmos:door" && un != "cosmos:door_open" {
+            return;
+        }
+
+        ev_writer.send(ToggleDoorEvent(s_block));
+    }
+}
+
+fn toggle_doors(
+    mut q_structure: Query<&mut Structure>,
+    mut evr_door_toggle: EventReader<ToggleDoorEvent>,
+    mut evw_block_changed: EventWriter<BlockChangedEvent>,
+    blocks: Res<Registry<Block>>,
+) {
+    for ev in evr_door_toggle.read() {
+        let Ok(mut structure) = q_structure.get_mut(ev.0.structure()) else {
+            warn!("Not structure?");
+            continue;
+        };
+
+        let Some(door) = blocks.from_id("cosmos:door") else {
+            return;
+        };
+        let Some(door_open) = blocks.from_id("cosmos:door_open") else {
+            return;
+        };
+
+        let door_id = door.id();
+        let door_open_id = door_open.id();
+
+        let open = structure.block_id_at(ev.0.coords()) == door_open_id;
+        let block = if open { door } else { door_open };
+
+        let mut todo = HashSet::new();
+        todo.insert(ev.0.coords());
+
+        let mut done = HashSet::new();
+        while !todo.is_empty() {
+            let mut new_todo = HashSet::new();
+
+            for c in &todo {
+                done.insert(*c);
+            }
+
+            for coord in todo {
+                let block_id_here = structure.block_id_at(coord);
+                if block_id_here != door_id && block_id_here != door_open_id {
+                    continue;
+                }
+
+                let block_info = structure.block_info_at(coord);
+
+                structure.set_block_and_info_at(coord, block, block_info, &blocks, Some(&mut evw_block_changed));
+
+                done.insert(coord);
+
+                for dir in ALL_BLOCK_DIRECTIONS {
+                    if let Ok(coord) = BlockCoordinate::try_from(dir.to_coordinates() + coord) {
+                        if !done.contains(&coord) {
+                            new_todo.insert(coord);
+                        }
+                    }
+                }
+            }
+
+            todo = new_todo;
+        }
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(
+        Update,
+        (
+            handle_door_block_event.in_set(BlockEventsSet::ProcessEvents),
+            toggle_doors.in_set(BlockEventsSet::SendEventsForNextFrame),
+        )
+            .chain()
+            .in_set(NetworkingSystemsSet::Between)
+            .run_if(in_state(GameState::Playing)),
+    )
+    .add_event::<ToggleDoorEvent>();
+}
diff --git a/cosmos_server/src/blocks/interactable/gravity_well.rs b/cosmos_server/src/blocks/interactable/gravity_well.rs
index e73fa2f93..26f3a2f1d 100644
--- a/cosmos_server/src/blocks/interactable/gravity_well.rs
+++ b/cosmos_server/src/blocks/interactable/gravity_well.rs
@@ -44,7 +44,7 @@ fn grav_well_handle_block_event(
             continue;
         };
 
-        let Ok(structure) = q_structure.get(s_block.structure_entity) else {
+        let Ok(structure) = q_structure.get(s_block.structure()) else {
             continue;
         };
 
@@ -53,11 +53,11 @@ fn grav_well_handle_block_event(
             continue;
         }
 
-        let block = structure.block_at(s_block.structure_block.coords(), &blocks);
+        let block = structure.block_at(s_block.coords(), &blocks);
 
         if block.unlocalized_name() == "cosmos:gravity_well" {
             if let Ok(grav_well) = q_grav_well.get(ev.interactor) {
-                if grav_well.block == s_block.structure_block.coords() && grav_well.structure_entity == s_block.structure_entity {
+                if grav_well.block == s_block.coords() && grav_well.structure_entity == s_block.structure() {
                     commands.entity(ev.interactor).remove::<GravityWell>();
 
                     continue;
@@ -67,16 +67,16 @@ fn grav_well_handle_block_event(
             commands
                 .entity(ev.interactor)
                 .insert(GravityWell {
-                    block: s_block.structure_block.coords(),
+                    block: s_block.coords(),
                     g_constant: Vec3::new(0.0, -9.8, 0.0),
-                    structure_entity: s_block.structure_entity,
+                    structure_entity: s_block.structure(),
                 })
-                .set_parent(s_block.structure_entity);
+                .set_parent(s_block.structure());
         }
     }
 
     for ev in block_break_events.read() {
-        let Ok(structure) = q_structure.get(ev.structure_entity) else {
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
             continue;
         };
 
diff --git a/cosmos_server/src/blocks/interactable/mod.rs b/cosmos_server/src/blocks/interactable/mod.rs
index f553ad5ee..b902ced96 100644
--- a/cosmos_server/src/blocks/interactable/mod.rs
+++ b/cosmos_server/src/blocks/interactable/mod.rs
@@ -2,6 +2,7 @@
 
 use bevy::prelude::App;
 
+mod door;
 mod gravity_well;
 mod ship_core;
 mod storage;
@@ -10,4 +11,5 @@ pub(super) fn register(app: &mut App) {
     ship_core::register(app);
     storage::register(app);
     gravity_well::register(app);
+    door::register(app);
 }
diff --git a/cosmos_server/src/blocks/interactable/ship_core.rs b/cosmos_server/src/blocks/interactable/ship_core.rs
index 12806672e..e0accec49 100644
--- a/cosmos_server/src/blocks/interactable/ship_core.rs
+++ b/cosmos_server/src/blocks/interactable/ship_core.rs
@@ -26,7 +26,7 @@ fn handle_block_event(
             continue;
         };
 
-        let Ok(structure) = s_query.get(s_block.structure_entity) else {
+        let Ok(structure) = s_query.get(s_block.structure()) else {
             continue;
         };
 
@@ -34,7 +34,7 @@ fn handle_block_event(
             continue;
         };
 
-        let block_id = s_block.structure_block.block_id(structure);
+        let block_id = s_block.block_id(structure);
 
         if block_id != block.id() {
             continue;
@@ -42,9 +42,9 @@ fn handle_block_event(
 
         // Only works on ships (maybe replace this with pilotable component instead of only checking ships)
         // Cannot pilot a ship that already has a pilot
-        if !pilot_query.contains(s_block.structure_entity) {
+        if !pilot_query.contains(s_block.structure()) {
             change_pilot_event.send(ChangePilotEvent {
-                structure_entity: s_block.structure_entity,
+                structure_entity: s_block.structure(),
                 pilot_entity: Some(ev.interactor),
             });
         }
diff --git a/cosmos_server/src/blocks/interactable/storage.rs b/cosmos_server/src/blocks/interactable/storage.rs
index a1ffb3f73..62c7a7042 100644
--- a/cosmos_server/src/blocks/interactable/storage.rs
+++ b/cosmos_server/src/blocks/interactable/storage.rs
@@ -33,7 +33,7 @@ fn handle_block_event(
             continue;
         };
 
-        let Ok(structure) = s_query.get(s_block.structure_entity) else {
+        let Ok(structure) = s_query.get(s_block.structure()) else {
             continue;
         };
 
@@ -41,18 +41,14 @@ fn handle_block_event(
             continue;
         };
 
-        let block_id = s_block.structure_block.block_id(structure);
+        let block_id = s_block.block_id(structure);
 
         if block_id == block.id() {
             server.send_message(
                 player.id(),
                 NettyChannelServer::Inventory,
                 cosmos_encoder::serialize(&ServerInventoryMessages::OpenInventory {
-                    owner: InventoryIdentifier::BlockData(BlockDataIdentifier {
-                        block: s_block.structure_block,
-                        structure_entity: s_block.structure_entity,
-                        block_id,
-                    }),
+                    owner: InventoryIdentifier::BlockData(BlockDataIdentifier { block: s_block, block_id }),
                 }),
             );
         }
diff --git a/cosmos_server/src/blocks/multiblock/reactor.rs b/cosmos_server/src/blocks/multiblock/reactor.rs
index 838304afc..a0c963ed2 100644
--- a/cosmos_server/src/blocks/multiblock/reactor.rs
+++ b/cosmos_server/src/blocks/multiblock/reactor.rs
@@ -19,7 +19,6 @@ use cosmos_core::{
     state::GameState,
     structure::{
         coordinates::{BlockCoordinate, CoordinateType, UnboundBlockCoordinate},
-        structure_block::StructureBlock,
         systems::StructureSystemsSet,
         Structure,
     },
@@ -340,12 +339,12 @@ fn create_reactor(
     blocks: &Registry<Block>,
     reactor_blocks: &Registry<ReactorPowerGenerationBlock>,
     bounds: ReactorBounds,
-    controller: StructureBlock,
+    controller: BlockCoordinate,
 ) -> Reactor {
     let mut power_per_second = 0.0;
 
     for block in structure.block_iter(bounds.negative_coords.into(), bounds.positive_coords.into(), true) {
-        let block = block.block(structure, blocks);
+        let block = structure.block_at(block, blocks);
 
         if let Some(reactor_block) = reactor_blocks.for_block(block) {
             power_per_second += reactor_block.power_per_second();
@@ -367,11 +366,11 @@ fn on_piloted_by_ai(
 
         let blockz = structure
             .all_blocks_iter(false)
-            .filter(|x| structure.block_id_at(x.coords()) == reactor_block.id())
-            .collect::<Vec<StructureBlock>>();
+            .filter(|x| structure.block_id_at(*x) == reactor_block.id())
+            .collect::<Vec<BlockCoordinate>>();
 
         for block_here in blockz {
-            if let Some(bounds) = check_is_valid_multiblock(structure, block_here.coords(), &blocks) {
+            if let Some(bounds) = check_is_valid_multiblock(structure, block_here, &blocks) {
                 match check_valid(bounds, structure, &blocks) {
                     ReactorValidity::Valid => {
                         let reactor = create_reactor(structure, &blocks, &reactor_blocks, bounds, block_here);
@@ -400,18 +399,18 @@ fn on_interact_reactor(
             continue;
         };
 
-        let Ok((structure, mut reactors)) = structure_query.get_mut(s_block.structure_entity) else {
+        let Ok((structure, mut reactors)) = structure_query.get_mut(s_block.structure()) else {
             continue;
         };
 
-        let block = structure.block_at(s_block.structure_block.coords(), &blocks);
+        let block = structure.block_at(s_block.coords(), &blocks);
 
         if block.unlocalized_name() == "cosmos:reactor_controller" {
-            if reactors.iter().any(|reactor| reactor.controller_block() == s_block.structure_block) {
+            if reactors.iter().any(|reactor| reactor.controller_block() == s_block.coords()) {
                 continue;
             }
 
-            if let Some(bounds) = check_is_valid_multiblock(&structure, s_block.structure_block.coords(), &blocks) {
+            if let Some(bounds) = check_is_valid_multiblock(&structure, s_block.coords(), &blocks) {
                 match check_valid(bounds, &structure, &blocks) {
                     ReactorValidity::MissingCasing(_) => {
                         let Ok(player) = player_query.get(ev.interactor) else {
@@ -438,7 +437,7 @@ fn on_interact_reactor(
                         );
                     }
                     ReactorValidity::Valid => {
-                        let reactor = create_reactor(&structure, &blocks, &reactor_blocks, bounds, s_block.structure_block);
+                        let reactor = create_reactor(&structure, &blocks, &reactor_blocks, bounds, s_block.coords());
 
                         reactors.add_reactor(reactor);
                     }
diff --git a/cosmos_server/src/chat/mod.rs b/cosmos_server/src/chat/mod.rs
new file mode 100644
index 000000000..6297e2836
--- /dev/null
+++ b/cosmos_server/src/chat/mod.rs
@@ -0,0 +1,55 @@
+//! Server-side chat logic
+
+use bevy::{
+    app::Update,
+    log::info,
+    prelude::{in_state, App, EventReader, IntoSystemConfigs, Query, Res},
+};
+use cosmos_core::{
+    chat::{ClientSendChatMessageEvent, ServerSendChatMessageEvent},
+    entities::player::Player,
+    netty::{
+        server::ServerLobby,
+        sync::events::server_event::{NettyEventReceived, NettyEventWriter},
+        system_sets::NetworkingSystemsSet,
+    },
+    state::GameState,
+};
+
+fn receive_messages(
+    mut nevw_send_chat_msg: NettyEventWriter<ServerSendChatMessageEvent>,
+    mut nevr_chat_msg: EventReader<NettyEventReceived<ClientSendChatMessageEvent>>,
+    clients: Res<ServerLobby>,
+    q_player: Query<&Player>,
+) {
+    for ev in nevr_chat_msg.read() {
+        let Some(Ok((player_ent, player))) = clients
+            .player_from_id(ev.client_id)
+            .map(|player_ent| q_player.get(player_ent).map(|player| (player_ent, player)))
+        else {
+            continue;
+        };
+
+        match &ev.event {
+            ClientSendChatMessageEvent::Global(msg) => {
+                let message = format!("{}> {}", player.name(), msg);
+
+                info!("{message}");
+
+                nevw_send_chat_msg.broadcast(ServerSendChatMessageEvent {
+                    sender: Some(player_ent),
+                    message,
+                });
+            }
+        }
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(
+        Update,
+        receive_messages
+            .in_set(NetworkingSystemsSet::Between)
+            .run_if(in_state(GameState::Playing)),
+    );
+}
diff --git a/cosmos_server/src/crafting/blocks/basic_fabricator.rs b/cosmos_server/src/crafting/blocks/basic_fabricator.rs
new file mode 100644
index 000000000..e6f4a3142
--- /dev/null
+++ b/cosmos_server/src/crafting/blocks/basic_fabricator.rs
@@ -0,0 +1,151 @@
+use std::{cell::RefCell, rc::Rc};
+
+use bevy::{
+    app::Update,
+    log::{error, warn},
+    prelude::{in_state, App, Commands, EventReader, IntoSystemConfigs, Query, Res, With, Without},
+};
+
+use cosmos_core::{
+    block::{
+        block_events::{BlockEventsSet, BlockInteractEvent},
+        Block,
+    },
+    crafting::{
+        blocks::basic_fabricator::{CraftBasicFabricatorRecipeEvent, OpenBasicFabricatorEvent},
+        recipes::{basic_fabricator::BasicFabricatorRecipes, RecipeItem},
+    },
+    entities::player::Player,
+    events::block_events::BlockDataSystemParams,
+    inventory::{itemstack::ItemShouldHaveData, Inventory},
+    item::Item,
+    netty::{
+        server::ServerLobby,
+        sync::events::{
+            netty_event::SyncedEventImpl,
+            server_event::{NettyEventReceived, NettyEventWriter},
+        },
+        system_sets::NetworkingSystemsSet,
+    },
+    prelude::Structure,
+    registry::{identifiable::Identifiable, Registry},
+    state::GameState,
+};
+
+fn monitor_basic_fabricator_interactions(
+    mut evr_block_interact: EventReader<BlockInteractEvent>,
+    mut nevw_open_basic_fabricator: NettyEventWriter<OpenBasicFabricatorEvent>,
+    q_player: Query<&Player>,
+    q_structure: Query<&Structure>,
+    blocks: Res<Registry<Block>>,
+) {
+    for ev in evr_block_interact.read() {
+        let Some(block) = ev.block else {
+            continue;
+        };
+        let Ok(structure) = q_structure.get(block.structure()) else {
+            continue;
+        };
+        if structure.block_at(block.coords(), &blocks).unlocalized_name() != "cosmos:basic_fabricator" {
+            continue;
+        }
+        let Ok(player) = q_player.get(ev.interactor) else {
+            continue;
+        };
+
+        nevw_open_basic_fabricator.send(OpenBasicFabricatorEvent(block), player.id());
+    }
+}
+
+fn monitor_craft_event(
+    mut nevr_craft_event: EventReader<NettyEventReceived<CraftBasicFabricatorRecipeEvent>>,
+    q_structure: Query<&Structure>,
+    // Separate queries to please borrow checker
+    mut q_player_inventory: Query<&mut Inventory, With<Player>>,
+    mut q_not_player_inventory: Query<&mut Inventory, Without<Player>>,
+    lobby: Res<ServerLobby>,
+    blocks: Res<Registry<Block>>,
+    bd_params: BlockDataSystemParams,
+    recipes: Res<BasicFabricatorRecipes>,
+    mut commands: Commands,
+    needs_data: Res<ItemShouldHaveData>,
+    items: Res<Registry<Item>>,
+) {
+    let bd_params = Rc::new(RefCell::new(bd_params));
+    for ev in nevr_craft_event.read() {
+        let Some(player_ent) = lobby.player_from_id(ev.client_id) else {
+            warn!("Bad player - cid: {}", ev.client_id);
+            continue;
+        };
+
+        if !recipes.contains(&ev.recipe) {
+            warn!("Invalid recipe from client {:?}", player_ent);
+            continue;
+        }
+
+        let Ok(mut player_inv) = q_player_inventory.get_mut(player_ent) else {
+            error!("Player {player_ent:?} missing inventory component");
+            continue;
+        };
+
+        let Ok(structure) = q_structure.get(ev.block.structure()) else {
+            warn!("Invalid structure entity - {:?}.", ev.block);
+            continue;
+        };
+
+        if structure.block_at(ev.block.coords(), &blocks).unlocalized_name() != "cosmos:basic_fabricator" {
+            warn!("Block here is not fabricator.");
+            continue;
+        }
+
+        let Some(mut fab_inv) = structure.query_block_data_mut(ev.block.coords(), &mut q_not_player_inventory, bd_params.clone()) else {
+            error!("Fabricator @ {:?} missing inventory block data!", ev.block);
+            continue;
+        };
+
+        let max_qty = ev.recipe.max_can_create(fab_inv.iter().flatten());
+        if ev.quantity > max_qty {
+            warn!("Invalid quantity requested.");
+            continue;
+        }
+
+        let item = items.from_numeric_id(ev.recipe.output.item);
+
+        let max_can_be_inserted = player_inv.max_quantity_can_be_inserted(item);
+        let leftover = if max_can_be_inserted < ev.quantity {
+            ev.quantity - max_can_be_inserted
+        } else {
+            0
+        };
+
+        let qty_crafted = ev.quantity - leftover;
+        // Enures always a whole amount is crafted
+        let qty_crafted = (qty_crafted / ev.recipe.output.quantity as u32) * ev.recipe.output.quantity as u32;
+        let input_multiplier = qty_crafted / ev.recipe.output.quantity as u32;
+
+        for input in ev.recipe.inputs.iter() {
+            let RecipeItem::Item(item) = input.item;
+            let item = items.from_numeric_id(item);
+            let (leftover, _) = fab_inv.take_and_remove_item(item, input.quantity as usize * input_multiplier as usize, &mut commands);
+            assert_eq!(leftover, 0, "Invalid crafting occurred! Input Leftover ({leftover}) != 0");
+        }
+
+        let (leftover, _) = player_inv.insert_item(item, qty_crafted as u16, &mut commands, &needs_data);
+        assert_eq!(
+            leftover, 0,
+            "Invalid crafting occured! Unable to insert all products! ({} leftover)",
+            leftover
+        );
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(
+        Update,
+        (monitor_basic_fabricator_interactions, monitor_craft_event)
+            .in_set(NetworkingSystemsSet::Between)
+            .in_set(BlockEventsSet::ProcessEvents)
+            .run_if(in_state(GameState::Playing)),
+    )
+    .add_netty_event::<OpenBasicFabricatorEvent>();
+}
diff --git a/cosmos_server/src/crafting/blocks/mod.rs b/cosmos_server/src/crafting/blocks/mod.rs
new file mode 100644
index 000000000..6336b82bd
--- /dev/null
+++ b/cosmos_server/src/crafting/blocks/mod.rs
@@ -0,0 +1,7 @@
+use bevy::prelude::App;
+
+mod basic_fabricator;
+
+pub(super) fn register(app: &mut App) {
+    basic_fabricator::register(app);
+}
diff --git a/cosmos_server/src/crafting/mod.rs b/cosmos_server/src/crafting/mod.rs
new file mode 100644
index 000000000..cecfdffa0
--- /dev/null
+++ b/cosmos_server/src/crafting/mod.rs
@@ -0,0 +1,11 @@
+//! Server-related crafting logic
+
+use bevy::prelude::App;
+
+mod blocks;
+mod recipes;
+
+pub(super) fn register(app: &mut App) {
+    recipes::register(app);
+    blocks::register(app);
+}
diff --git a/cosmos_server/src/crafting/recipes/basic_fabricator.rs b/cosmos_server/src/crafting/recipes/basic_fabricator.rs
new file mode 100644
index 000000000..88996dbf6
--- /dev/null
+++ b/cosmos_server/src/crafting/recipes/basic_fabricator.rs
@@ -0,0 +1,129 @@
+use bevy::{
+    app::Update,
+    log::{info, warn},
+    prelude::{in_state, resource_exists_and_changed, App, Commands, EventReader, IntoSystemConfigs, OnEnter, Res},
+};
+use serde::{Deserialize, Serialize};
+
+use cosmos_core::{
+    crafting::recipes::{
+        basic_fabricator::{
+            BasicFabricatorRecipe, BasicFabricatorRecipes, FabricatorItemInput, FabricatorItemOutput, SyncBasicFabricatorRecipesEvent,
+        },
+        RecipeItem,
+    },
+    item::Item,
+    netty::{sync::events::server_event::NettyEventWriter, system_sets::NetworkingSystemsSet},
+    registry::{identifiable::Identifiable, Registry},
+    state::GameState,
+};
+
+use crate::netty::sync::registry::ClientFinishedReceivingRegistriesEvent;
+
+use super::RawRecipeItem;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct RawFabricatorItem {
+    quantity: u16,
+    item: RawRecipeItem,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct RawBasicFabricatorRecipe {
+    inputs: Vec<RawFabricatorItem>,
+    output: RawFabricatorItem,
+}
+
+fn load_recipes(items: Res<Registry<Item>>, mut commands: Commands) {
+    info!("Loading basic fabricator recipes!");
+
+    // for entry in WalkDir::new("assets/cosmos/recipes/basic_fabricator").max_depth(0) {
+    //     let Ok(entry) = entry else {
+    //         continue;
+    //     };
+    //
+    //     let path = entry.path();
+    //     if path.is_dir() || path.extension().and_then(OsStr::to_str) != Some("json") {
+    //         continue;
+    //     }
+    // }
+    //
+    let mut recipes = BasicFabricatorRecipes::default();
+
+    if let Some(iron_bar) = items.from_id("cosmos:iron_bar") {
+        if let Some(iron_ore) = items.from_id("cosmos:iron_ore") {
+            recipes.add_recipe(BasicFabricatorRecipe::new(
+                FabricatorItemOutput::new(iron_bar, 1),
+                vec![FabricatorItemInput::new(RecipeItem::Item(iron_ore.id()), 2)],
+            ));
+        } else {
+            warn!("Missing iron ore!");
+        }
+    } else {
+        warn!("Missing iron bar!");
+    }
+
+    if let Some(grey_hull) = items.from_id("cosmos:ship_hull_grey") {
+        if let Some(iron_bar) = items.from_id("cosmos:iron_bar") {
+            recipes.add_recipe(BasicFabricatorRecipe::new(
+                FabricatorItemOutput::new(grey_hull, 1),
+                vec![FabricatorItemInput::new(RecipeItem::Item(iron_bar.id()), 1)],
+            ));
+        } else {
+            warn!("Missing iron bar!");
+        }
+    } else {
+        warn!("Missing grey ship hull!");
+    }
+
+    if let Some(laser_cannon) = items.from_id("cosmos:laser_cannon") {
+        if let Some(iron_bar) = items.from_id("cosmos:iron_bar") {
+            if let Some(crystal) = items.from_id("cosmos:test_crystal") {
+                recipes.add_recipe(BasicFabricatorRecipe::new(
+                    FabricatorItemOutput::new(laser_cannon, 1),
+                    vec![
+                        FabricatorItemInput::new(RecipeItem::Item(crystal.id()), 5),
+                        FabricatorItemInput::new(RecipeItem::Item(iron_bar.id()), 1),
+                    ],
+                ));
+            } else {
+                warn!("Missing crystal!");
+            }
+        } else {
+            warn!("Missing iron bar!");
+        }
+    } else {
+        warn!("Missing grey ship hull!");
+    }
+
+    commands.insert_resource(recipes);
+
+    info!("Load basic fabricator recipes!");
+}
+
+fn sync_recipes_on_change(recipes: Res<BasicFabricatorRecipes>, mut nevw_sync_recipes: NettyEventWriter<SyncBasicFabricatorRecipesEvent>) {
+    nevw_sync_recipes.broadcast(SyncBasicFabricatorRecipesEvent(recipes.clone()));
+}
+
+fn sync_recipes_on_join(
+    recipes: Res<BasicFabricatorRecipes>,
+    mut evr_loaded_registries: EventReader<ClientFinishedReceivingRegistriesEvent>,
+    mut nevw_sync_recipes: NettyEventWriter<SyncBasicFabricatorRecipesEvent>,
+) {
+    for ev in evr_loaded_registries.read() {
+        nevw_sync_recipes.send(SyncBasicFabricatorRecipesEvent(recipes.clone()), ev.0);
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(OnEnter(GameState::PostLoading), load_recipes).add_systems(
+        Update,
+        (
+            sync_recipes_on_join,
+            sync_recipes_on_change.run_if(resource_exists_and_changed::<BasicFabricatorRecipes>),
+        )
+            .chain()
+            .in_set(NetworkingSystemsSet::SyncComponents)
+            .run_if(in_state(GameState::Playing)),
+    );
+}
diff --git a/cosmos_server/src/crafting/recipes/mod.rs b/cosmos_server/src/crafting/recipes/mod.rs
new file mode 100644
index 000000000..020b1a622
--- /dev/null
+++ b/cosmos_server/src/crafting/recipes/mod.rs
@@ -0,0 +1,14 @@
+use bevy::prelude::App;
+use serde::{Deserialize, Serialize};
+
+mod basic_fabricator;
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub enum RawRecipeItem {
+    Item(String),
+    Category(String),
+}
+
+pub(super) fn register(app: &mut App) {
+    basic_fabricator::register(app);
+}
diff --git a/cosmos_server/src/debug.rs b/cosmos_server/src/debug.rs
index 45c479c74..148238700 100644
--- a/cosmos_server/src/debug.rs
+++ b/cosmos_server/src/debug.rs
@@ -1,26 +1,26 @@
 use bevy::{
     app::App,
-    prelude::{Camera3dBundle, Commands, OnEnter},
+    prelude::{Camera3d, Commands, OnEnter},
 };
 use cosmos_core::state::GameState;
-use iyes_perf_ui::{
-    entries::{PerfUiFramerateEntries, PerfUiSystemEntries},
-    prelude::*,
-};
-
+// use iyes_perf_ui::{
+//     entries::{PerfUiFramerateEntries, PerfUiSystemEntries},
+//     prelude::*,
+// };
+//
 fn create_debug(mut commands: Commands) {
-    commands.spawn((
-        PerfUiRoot::default(),
-        // Contains everything related to FPS and frame time
-        PerfUiFramerateEntries::default(),
-        PerfUiEntryEntityCount::default(),
-        // Contains everything related to system diagnostics (CPU, RAM)
-        PerfUiSystemEntries::default(),
-    ));
-
-    commands.spawn(Camera3dBundle { ..Default::default() });
+    //     commands.spawn((
+    //         PerfUiRoot::default(),
+    //         // Contains everything related to FPS and frame time
+    //         PerfUiFramerateEntries::default(),
+    //         PerfUiEntryEntityCount::default(),
+    //         // Contains everything related to system diagnostics (CPU, RAM)
+    //         PerfUiSystemEntries::default(),
+    //     ));
+    //
+    commands.spawn(Camera3d { ..Default::default() });
 }
-
+//
 pub(super) fn register(app: &mut App) {
     app.add_systems(OnEnter(GameState::Playing), create_debug);
 }
diff --git a/cosmos_server/src/fluid/interact_fluid.rs b/cosmos_server/src/fluid/interact_fluid.rs
index 64a0ebdd7..66accd213 100644
--- a/cosmos_server/src/fluid/interact_fluid.rs
+++ b/cosmos_server/src/fluid/interact_fluid.rs
@@ -54,11 +54,11 @@ fn on_interact_with_fluid(
     for ev in ev_reader.read() {
         let s_block = ev.block_including_fluids;
 
-        let Ok(structure) = q_structure.get(s_block.structure_entity) else {
+        let Ok(structure) = q_structure.get(s_block.structure()) else {
             continue;
         };
 
-        let block = structure.block_at(s_block.structure_block.coords(), &blocks);
+        let block = structure.block_at(s_block.coords(), &blocks);
 
         let Some(fluid) = fluid_registry.from_id(block.unlocalized_name()) else {
             continue;
@@ -145,11 +145,11 @@ fn on_interact_with_tank(
             continue;
         };
 
-        let Ok(mut structure) = q_structure.get_mut(s_block.structure_entity) else {
+        let Ok(mut structure) = q_structure.get_mut(s_block.structure()) else {
             continue;
         };
 
-        let coords = s_block.structure_block.coords();
+        let coords = s_block.coords();
 
         let block = structure.block_at(coords, &blocks);
 
diff --git a/cosmos_server/src/fluid/mod.rs b/cosmos_server/src/fluid/mod.rs
index df54943b2..e6a89f618 100644
--- a/cosmos_server/src/fluid/mod.rs
+++ b/cosmos_server/src/fluid/mod.rs
@@ -32,7 +32,7 @@ fn on_place_tank(
     blocks: Res<Registry<Block>>,
 ) {
     for ev in evr_changed_block.read() {
-        let Ok(mut structure) = q_structure.get_mut(ev.structure_entity) else {
+        let Ok(mut structure) = q_structure.get_mut(ev.block.structure()) else {
             continue;
         };
         let coords = ev.block.coords();
diff --git a/cosmos_server/src/fluid/tank.rs b/cosmos_server/src/fluid/tank.rs
index c2e2eb433..483951bf7 100644
--- a/cosmos_server/src/fluid/tank.rs
+++ b/cosmos_server/src/fluid/tank.rs
@@ -217,7 +217,7 @@ fn on_add_tank(
 
     for ev in ev_reader.read() {
         if ev.new_block == tank {
-            let Ok(mut structure) = q_structure.get_mut(ev.structure_entity) else {
+            let Ok(mut structure) = q_structure.get_mut(ev.block.structure()) else {
                 continue;
             };
 
@@ -249,7 +249,7 @@ fn listen_for_changed_fluid_data(
         .read()
         .map(|x| CombinedBlockEvent {
             block: x.block.coords(),
-            structure_entity: x.structure_entity,
+            structure_entity: x.block.structure(),
         })
         .chain(evr_block_changed_event.read().map(|x| {
             let x = *x.read();
diff --git a/cosmos_server/src/inventory/block_events.rs b/cosmos_server/src/inventory/block_events.rs
index 1f7c40d0c..99d852e91 100644
--- a/cosmos_server/src/inventory/block_events.rs
+++ b/cosmos_server/src/inventory/block_events.rs
@@ -80,7 +80,7 @@ fn monitor_block_breaks(
     mut evr_block_break: EventReader<BlockBreakEvent>,
     mut commands: Commands,
 ) {
-    for (block, structure_entity) in evr_block_break.read().map(|x| (x.block, x.structure_entity)) {
+    for (block, structure_entity) in evr_block_break.read().map(|x| (x.block, x.block.structure())) {
         process_event(structure_entity, block, &q_inventory, &q_structure, &mut commands);
     }
 }
diff --git a/cosmos_server/src/inventory/netty.rs b/cosmos_server/src/inventory/netty.rs
index 8801c1629..ecf060031 100644
--- a/cosmos_server/src/inventory/netty.rs
+++ b/cosmos_server/src/inventory/netty.rs
@@ -62,8 +62,8 @@ fn get_inventory_mut<'a>(
     match identifier {
         InventoryIdentifier::Entity(entity) => q_inventory.get_mut(entity).ok(),
         InventoryIdentifier::BlockData(block_data) => {
-            let Ok(structure) = q_structure.get(block_data.structure_entity) else {
-                warn!("Missing structure entity for {:?}", block_data.structure_entity);
+            let Ok(structure) = q_structure.get(block_data.block.structure()) else {
+                warn!("Missing structure entity for {:?}", block_data.block.structure());
                 return None;
             };
 
@@ -71,7 +71,7 @@ fn get_inventory_mut<'a>(
                 warn!(
                     "Missing block data for {} in entity {:?}",
                     block_data.block.coords(),
-                    block_data.structure_entity
+                    block_data.block.structure()
                 );
                 return None;
             };
@@ -91,7 +91,7 @@ fn get_many_inventories_mut<'a, const N: usize>(
         .map(|x| match x {
             InventoryIdentifier::Entity(entity) => Some(entity),
             InventoryIdentifier::BlockData(block_data) => {
-                let structure = q_structure.get(block_data.structure_entity).ok()?;
+                let structure = q_structure.get(block_data.block.structure()).ok()?;
 
                 structure.block_data(block_data.block.coords())
             }
diff --git a/cosmos_server/src/items/mod.rs b/cosmos_server/src/items/mod.rs
index b94bb729d..02109c464 100644
--- a/cosmos_server/src/items/mod.rs
+++ b/cosmos_server/src/items/mod.rs
@@ -47,7 +47,7 @@ fn advance_time_since_spawn(
     }
 
     for (ent, mut time_since_spawn) in q_physical_items.iter_mut() {
-        time_since_spawn.0 += time.delta_seconds();
+        time_since_spawn.0 += time.delta_secs();
 
         if time_since_spawn.0 > PHYSICAL_ITEM_LIFETIME.as_secs_f32() {
             commands.entity(ent).insert(NeedsDespawned);
diff --git a/cosmos_server/src/main.rs b/cosmos_server/src/main.rs
index 8822e2d12..18184bbec 100644
--- a/cosmos_server/src/main.rs
+++ b/cosmos_server/src/main.rs
@@ -19,7 +19,7 @@ use cosmos_core::{
     plugin::cosmos_core_plugin::CosmosCorePluginGroup, state::GameState,
 };
 
-use iyes_perf_ui::PerfUiPlugin;
+// use iyes_perf_ui::PerfUiPlugin;
 use plugin::server_plugin::ServerPlugin;
 use settings::read_server_settings;
 use thread_priority::{set_current_thread_priority, ThreadPriority};
@@ -29,7 +29,9 @@ use bevy::log::LogPlugin;
 
 pub mod ai;
 pub mod blocks;
+pub mod chat;
 pub mod commands;
+pub mod crafting;
 mod debug;
 pub mod entities;
 pub mod fluid;
@@ -111,7 +113,7 @@ fn main() {
             SystemInformationDiagnosticsPlugin,
             EntityCountDiagnosticsPlugin,
             FrameTimeDiagnosticsPlugin,
-            PerfUiPlugin,
+            // PerfUiPlugin,
         ))
         .insert_resource(server_settings);
 
diff --git a/cosmos_server/src/netty/server_events.rs b/cosmos_server/src/netty/server_events.rs
index 69b5548de..04f15d7d8 100644
--- a/cosmos_server/src/netty/server_events.rs
+++ b/cosmos_server/src/netty/server_events.rs
@@ -1,11 +1,14 @@
 //! Handles client connecting and disconnecting
 
+use std::fs;
+
 use bevy::prelude::*;
 use bevy_rapier3d::prelude::*;
 use bevy_renet2::renet2::transport::NetcodeServerTransport;
 use bevy_renet2::renet2::{ClientId, RenetServer, ServerEvent};
 use cosmos_core::economy::Credits;
 use cosmos_core::ecs::NeedsDespawned;
+use cosmos_core::entities::player::creative::Creative;
 use cosmos_core::entities::player::render_distance::RenderDistance;
 use cosmos_core::inventory::itemstack::ItemShouldHaveData;
 use cosmos_core::inventory::Inventory;
@@ -23,21 +26,72 @@ use cosmos_core::registry::identifiable::Identifiable;
 use cosmos_core::registry::Registry;
 use cosmos_core::{entities::player::Player, netty::netty_rigidbody::NettyRigidBody};
 use renet2_visualizer::RenetServerVisualizer;
+use serde::{Deserialize, Serialize};
 
 use crate::entities::player::PlayerLooking;
 use crate::netty::network_helpers::ClientTicks;
 use crate::physics::assign_player_world;
+use crate::settings::ServerSettings;
+
+#[derive(Debug, Serialize, Deserialize)]
+struct KitEntry {
+    slot: u32,
+    item: String,
+    quantity: u16,
+}
+
+fn fill_inventory_from_kit(
+    kit_name: &str,
+    inventory: &mut Inventory,
+    items: &Registry<Item>,
+    commands: &mut Commands,
+    needs_data: &ItemShouldHaveData,
+) {
+    let Ok(kit) = fs::read_to_string(format!("assets/cosmos/kits/{kit_name}.json")) else {
+        error!("Missing kit - {kit_name}");
+        return;
+    };
+
+    let kit = serde_json::from_str::<Vec<KitEntry>>(&kit).map(Some).unwrap_or_else(|e| {
+        error!("{e}");
+        None
+    });
+
+    let Some(kit) = kit else {
+        error!("Invalid kit file - {kit_name}");
+        return;
+    };
+
+    for entry in kit {
+        let Some(item) = items.from_id(&entry.item) else {
+            error!("Missing item {} in kit {kit_name}", entry.item);
+            continue;
+        };
+
+        if entry.slot as usize >= inventory.len() {
+            error!("Slot {} in kit {kit_name} out of inventory bounds!", entry.slot);
+            continue;
+        }
+
+        inventory.insert_item_at(entry.slot as usize, item, entry.quantity, commands, needs_data);
+    }
+}
 
 fn generate_player_inventory(
     inventory_entity: Entity,
     items: &Registry<Item>,
     commands: &mut Commands,
     has_data: &ItemShouldHaveData,
+    creative: bool,
 ) -> Inventory {
     let mut inventory = Inventory::new("Inventory", 9 * 16, Some(0..9), inventory_entity);
 
-    for item in items.iter().rev().filter(|item| item.unlocalized_name() != "cosmos:air") {
-        inventory.insert_item(item, item.max_stack_size(), commands, has_data);
+    if creative {
+        for item in items.iter().rev().filter(|item| item.unlocalized_name() != "cosmos:air") {
+            inventory.insert_item(item, item.max_stack_size(), commands, has_data);
+        }
+    } else {
+        fill_inventory_from_kit("starter", &mut inventory, items, commands, has_data);
     }
 
     inventory
@@ -67,6 +121,7 @@ pub(super) fn handle_server_events(
     mut evw_player_join: EventWriter<PlayerConnectedEvent>,
     mut evw_sync_registries: EventWriter<SyncRegistriesEvent>,
     needs_data: Res<ItemShouldHaveData>,
+    server_settings: Res<ServerSettings>,
 ) {
     for event in server_events.read() {
         match event {
@@ -82,7 +137,7 @@ pub(super) fn handle_server_events(
                         entity,
                         id: player.id(),
                         body,
-                        name: player.name().clone(),
+                        name: player.name().to_owned(),
                         render_distance: Some(*render_distance),
                     });
 
@@ -105,13 +160,15 @@ pub(super) fn handle_server_events(
                 let starting_pos = Vec3::new(0.0, 1900.0, 0.0);
                 let location = Location::new(starting_pos, Sector::new(25, 25, 25));
                 let velocity = Velocity::default();
-                let inventory = generate_player_inventory(player_entity, &items, &mut commands, &needs_data);
+                let inventory = generate_player_inventory(player_entity, &items, &mut commands, &needs_data, server_settings.creative);
 
                 let netty_body = NettyRigidBody::new(Some(velocity), Quat::IDENTITY, NettyRigidBodyLocation::Absolute(location));
 
-                let credits = Credits::new(1_000_000);
+                let credits = Credits::new(25_000);
 
-                commands.entity(player_entity).insert((
+                let mut ecmds = commands.entity(player_entity);
+
+                ecmds.insert((
                     location,
                     LockedAxes::ROTATION_LOCKED,
                     RigidBody::Dynamic,
@@ -131,6 +188,10 @@ pub(super) fn handle_server_events(
                     credits,
                 ));
 
+                if server_settings.creative {
+                    ecmds.insert(Creative);
+                }
+
                 lobby.add_player(client_id, player_entity);
 
                 assign_player_world(&player_worlds, player_entity, &location, &mut commands);
diff --git a/cosmos_server/src/netty/server_listener.rs b/cosmos_server/src/netty/server_listener.rs
index 945146924..a93c0760f 100644
--- a/cosmos_server/src/netty/server_listener.rs
+++ b/cosmos_server/src/netty/server_listener.rs
@@ -158,17 +158,15 @@ fn server_listen_messages(
                         chunk_coords: chunk,
                     });
                 }
-                ClientReliableMessages::BreakBlock { structure_entity, block } => {
+                ClientReliableMessages::BreakBlock { block } => {
                     if let Some(player_entity) = lobby.player_from_id(client_id) {
                         break_block_event.send(BlockBreakEvent {
-                            structure_entity,
                             breaker: player_entity,
                             block,
                         });
                     }
                 }
                 ClientReliableMessages::PlaceBlock {
-                    structure_entity,
                     block,
                     block_id,
                     block_rotation: block_up,
@@ -177,7 +175,6 @@ fn server_listen_messages(
                     if let Some(player_entity) = lobby.player_from_id(client_id) {
                         place_block_event.send(
                             BlockPlaceEvent::Event(BlockPlaceEventData {
-                                structure_entity,
                                 structure_block: block,
                                 block_id,
                                 block_up,
diff --git a/cosmos_server/src/netty/sync/mod.rs b/cosmos_server/src/netty/sync/mod.rs
index c109f22c0..af071c5af 100644
--- a/cosmos_server/src/netty/sync/mod.rs
+++ b/cosmos_server/src/netty/sync/mod.rs
@@ -2,8 +2,10 @@
 
 use bevy::prelude::App;
 
+pub mod registry;
 pub mod sync_bodies;
 
 pub(super) fn register(app: &mut App) {
     sync_bodies::register(app);
+    registry::register(app);
 }
diff --git a/cosmos_server/src/netty/sync/registry.rs b/cosmos_server/src/netty/sync/registry.rs
new file mode 100644
index 000000000..b63cf20c5
--- /dev/null
+++ b/cosmos_server/src/netty/sync/registry.rs
@@ -0,0 +1,51 @@
+//! Server registry syncing
+
+use bevy::{
+    app::Update,
+    log::{info, warn},
+    prelude::{in_state, App, Event, EventWriter, IntoSystemConfigs, ResMut},
+};
+use cosmos_core::{
+    netty::{client_registry::RegistrySyncing, cosmos_encoder, system_sets::NetworkingSystemsSet, NettyChannelClient},
+    state::GameState,
+};
+use renet2::{ClientId, RenetServer};
+
+#[derive(Debug, Event)]
+/// This event is sent when the client has received every registry from the server.
+///
+/// This will be sent in their initial connecting phase, and anything that relies on a registry
+/// must be sent after this is received.
+pub struct ClientFinishedReceivingRegistriesEvent(pub ClientId);
+
+fn listen_for_done_syncing(
+    mut server: ResMut<RenetServer>,
+    mut evw_finished_receiving_registries: EventWriter<ClientFinishedReceivingRegistriesEvent>,
+) {
+    for client_id in server.clients_id().into_iter() {
+        while let Some(message) = server.receive_message(client_id, NettyChannelClient::Registry) {
+            let Ok(msg) = cosmos_encoder::deserialize::<RegistrySyncing>(&message) else {
+                warn!("Bad deserialization");
+                continue;
+            };
+
+            info!("Got registry message from client {client_id}");
+
+            match msg {
+                RegistrySyncing::FinishedReceivingRegistries => {
+                    evw_finished_receiving_registries.send(ClientFinishedReceivingRegistriesEvent(client_id));
+                }
+            }
+        }
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(
+        Update,
+        listen_for_done_syncing
+            .run_if(in_state(GameState::Playing))
+            .in_set(NetworkingSystemsSet::ReceiveMessages),
+    )
+    .add_event::<ClientFinishedReceivingRegistriesEvent>();
+}
diff --git a/cosmos_server/src/physics/mod.rs b/cosmos_server/src/physics/mod.rs
index bdf271790..f917d097f 100644
--- a/cosmos_server/src/physics/mod.rs
+++ b/cosmos_server/src/physics/mod.rs
@@ -301,9 +301,7 @@ fn recursively_fix_locations(
 
         parent_rotation *= my_trans.rotation;
     } else {
-        commands
-            .entity(entity)
-            .insert((TransformBundle::from_transform(Transform::from_translation(translation)),));
+        commands.entity(entity).insert((Transform::from_translation(translation),));
     }
 
     let Ok(children) = q_children.get(entity) else {
diff --git a/cosmos_server/src/plugin/server_plugin.rs b/cosmos_server/src/plugin/server_plugin.rs
index d48b73ad9..ecb28cfdb 100644
--- a/cosmos_server/src/plugin/server_plugin.rs
+++ b/cosmos_server/src/plugin/server_plugin.rs
@@ -3,7 +3,7 @@
 use bevy::{log::info, prelude::Plugin};
 
 use crate::{
-    ai, blocks, commands, debug, fluid,
+    ai, blocks, chat, commands, crafting, debug, fluid,
     init::{self, init_server},
     inventory, items, logic, netty, persistence, physics, projectiles, shop, structure, universe, utility_runs,
 };
@@ -38,6 +38,8 @@ impl Plugin for ServerPlugin {
         fluid::register(app);
         logic::register(app);
         debug::register(app);
+        chat::register(app);
+        crafting::register(app);
 
         info!("Done setting up server!");
     }
diff --git a/cosmos_server/src/projectiles/explosion.rs b/cosmos_server/src/projectiles/explosion.rs
index 617714087..32dc0aabc 100644
--- a/cosmos_server/src/projectiles/explosion.rs
+++ b/cosmos_server/src/projectiles/explosion.rs
@@ -140,7 +140,6 @@ fn respond_to_explosion(
                     local_coords + UnboundBlockCoordinate::splat(max_block_radius),
                     true, // Include air false is broken for some reason
                 )
-                .map(|x| x.coords())
                 .filter(|&coords| structure.has_block_at(coords)) // Remove this once `include_air` works.
                 .flat_map(|this_block| {
                     calculate_block_explosion_power(
diff --git a/cosmos_server/src/projectiles/missile.rs b/cosmos_server/src/projectiles/missile.rs
index d526663c9..9706001c0 100644
--- a/cosmos_server/src/projectiles/missile.rs
+++ b/cosmos_server/src/projectiles/missile.rs
@@ -56,7 +56,7 @@ fn look_towards_target(
 
         let cur_forward = missile_trans.forward();
 
-        let dir_lerped = cur_forward.lerp(direction, time.delta_seconds().min(1.0));
+        let dir_lerped = cur_forward.lerp(direction, time.delta_secs().min(1.0));
 
         missile_trans.look_to(dir_lerped, Vec3::Y);
     }
@@ -67,7 +67,7 @@ const MISSILE_IMPULSE_PER_SEC: f32 = 1.5;
 fn apply_missile_thrust(mut commands: Commands, time: Res<Time>, q_missiles: Query<(Entity, &GlobalTransform), With<Missile>>) {
     for (ent, g_trans) in &q_missiles {
         commands.entity(ent).insert(ExternalImpulse {
-            impulse: g_trans.forward() * MISSILE_IMPULSE_PER_SEC * time.delta_seconds(),
+            impulse: g_trans.forward() * MISSILE_IMPULSE_PER_SEC * time.delta_secs(),
             ..Default::default()
         });
     }
@@ -119,7 +119,7 @@ fn despawn_missiles(mut commands: Commands, mut query: Query<(Entity, &Velocity,
     for (ent, velocity, location, mut missile) in query.iter_mut() {
         missile.lifetime = missile
             .lifetime
-            .checked_sub(Duration::from_secs_f32(time.delta_seconds()))
+            .checked_sub(Duration::from_secs_f32(time.delta_secs()))
             .unwrap_or(Duration::ZERO);
 
         if missile.lifetime == Duration::ZERO {
diff --git a/cosmos_server/src/settings/mod.rs b/cosmos_server/src/settings/mod.rs
index a842c0764..a4d39d3b4 100644
--- a/cosmos_server/src/settings/mod.rs
+++ b/cosmos_server/src/settings/mod.rs
@@ -22,6 +22,10 @@ pub struct Args {
     /// If this is true, no planets will spawn
     #[arg(long, default_value_t = false)]
     no_planets: bool,
+
+    /// If all players should be in creative mode
+    #[arg(long, default_value_t = false)]
+    creative: bool,
 }
 
 #[derive(Resource)]
@@ -35,6 +39,8 @@ pub struct ServerSettings {
     pub spawn_asteroids: bool,
     /// If planets should spawn
     pub spawn_planets: bool,
+    /// If all players should be in creative mode
+    pub creative: bool,
 }
 
 /// Reads the server settings passed in from the command line
@@ -46,5 +52,6 @@ pub(super) fn read_server_settings() -> ServerSettings {
         peaceful: args.peaceful,
         spawn_planets: !args.no_planets,
         spawn_asteroids: !args.no_asteroids,
+        creative: args.creative,
     }
 }
diff --git a/cosmos_server/src/shop/ev_reader.rs b/cosmos_server/src/shop/ev_reader.rs
index 9288e281a..4abf7fbf3 100644
--- a/cosmos_server/src/shop/ev_reader.rs
+++ b/cosmos_server/src/shop/ev_reader.rs
@@ -46,11 +46,11 @@ fn on_interact_with_shop(
             continue;
         };
 
-        let Ok(structure) = q_structure.get(s_block.structure_entity) else {
+        let Ok(structure) = q_structure.get(s_block.structure()) else {
             continue;
         };
 
-        let block = s_block.structure_block.block(structure, &blocks);
+        let block = s_block.block(structure, &blocks);
 
         if block.unlocalized_name() == "cosmos:shop" {
             let fake_shop_data = generate_fake_shop(&default_shop_entries);
@@ -59,8 +59,8 @@ fn on_interact_with_shop(
                 player.id(),
                 NettyChannelServer::Shop,
                 cosmos_encoder::serialize(&ServerShopMessages::OpenShop {
-                    shop_block: s_block.structure_block.coords(),
-                    structure_entity: s_block.structure_entity,
+                    shop_block: s_block.coords(),
+                    structure_entity: s_block.structure(),
                     shop_data: fake_shop_data,
                 }),
             );
diff --git a/cosmos_server/src/structure/planet/biosphere/biosphere_generation.rs b/cosmos_server/src/structure/planet/biosphere/biosphere_generation.rs
index 56fe10c97..6f698c5a4 100644
--- a/cosmos_server/src/structure/planet/biosphere/biosphere_generation.rs
+++ b/cosmos_server/src/structure/planet/biosphere/biosphere_generation.rs
@@ -71,7 +71,7 @@ fn read_gpu_data(
 
     info!(
         "GPU DONE - took {}ms",
-        (1000.0 * (time.elapsed_seconds() - sent_to_gpu_time.0)).floor()
+        (1000.0 * (time.elapsed_secs() - sent_to_gpu_time.0)).floor()
     );
 
     let v: Vec<TerrainData> = worker.try_read_vec("values").expect("Failed to read chunk generation values!");
@@ -268,7 +268,7 @@ fn send_chunks_to_gpu(
 
         worker.execute();
 
-        sent_to_gpu_time.0 = time.elapsed_seconds();
+        sent_to_gpu_time.0 = time.elapsed_secs();
     }
 }
 
diff --git a/cosmos_server/src/structure/planet/persistence.rs b/cosmos_server/src/structure/planet/persistence.rs
index 7c1ab8dd5..380470ea9 100644
--- a/cosmos_server/src/structure/planet/persistence.rs
+++ b/cosmos_server/src/structure/planet/persistence.rs
@@ -177,9 +177,7 @@ fn load_chunk(
 
         commands
             .entity(entity)
-            .insert(TransformBundle::from_transform(Transform::from_translation(
-                structure.chunk_relative_position(coords),
-            )));
+            .insert(Transform::from_translation(structure.chunk_relative_position(coords)));
 
         structure.set_chunk_entity(coords, entity);
 
diff --git a/cosmos_server/src/structure/planet/planet_rotation.rs b/cosmos_server/src/structure/planet/planet_rotation.rs
index 2215e4376..163db2e15 100644
--- a/cosmos_server/src/structure/planet/planet_rotation.rs
+++ b/cosmos_server/src/structure/planet/planet_rotation.rs
@@ -65,7 +65,7 @@ fn rotate_planets(
         let delta_rot = if planet_rotation.duration_per_revolution != Duration::ZERO {
             Quat::from_axis_angle(
                 *planet_rotation.axis,
-                TAU * time.delta_seconds() / planet_rotation.duration_per_revolution.as_secs_f32(),
+                TAU * time.delta_secs() / planet_rotation.duration_per_revolution.as_secs_f32(),
             )
         } else {
             Quat::IDENTITY
diff --git a/cosmos_server/src/structure/shared/build_mode.rs b/cosmos_server/src/structure/shared/build_mode.rs
index 8a21e6d0c..2c69ac8c3 100644
--- a/cosmos_server/src/structure/shared/build_mode.rs
+++ b/cosmos_server/src/structure/shared/build_mode.rs
@@ -25,17 +25,17 @@ fn interact_with_block(
             continue;
         };
 
-        let Ok(structure) = structure_query.get(s_block.structure_entity) else {
+        let Ok(structure) = structure_query.get(s_block.structure()) else {
             continue;
         };
 
-        if s_block.structure_block.block(structure, &blocks).unlocalized_name() != "cosmos:build_block" {
+        if s_block.block(structure, &blocks).unlocalized_name() != "cosmos:build_block" {
             continue;
         }
 
         enter_writer.send(EnterBuildModeEvent {
             player_entity: ev.interactor,
-            structure_entity: s_block.structure_entity,
+            structure_entity: s_block.structure(),
         });
     }
 }
diff --git a/cosmos_server/src/structure/shared/melt_down.rs b/cosmos_server/src/structure/shared/melt_down.rs
index 48c7ab2ca..0fd23d8da 100644
--- a/cosmos_server/src/structure/shared/melt_down.rs
+++ b/cosmos_server/src/structure/shared/melt_down.rs
@@ -22,7 +22,7 @@ fn monitor_block_events(mut commands: Commands, blocks: Res<Registry<Block>>, mu
         let block = blocks.from_numeric_id(ev.old_block);
 
         if block.unlocalized_name() == "cosmos:ship_core" || block.unlocalized_name() == "cosmos:station_core" {
-            commands.entity(ev.structure_entity).insert(MeltingDown::default());
+            commands.entity(ev.block.structure()).insert(MeltingDown::default());
         }
     }
 }
diff --git a/cosmos_server/src/structure/shared/mod.rs b/cosmos_server/src/structure/shared/mod.rs
index 2b73d0f7f..ec918b3a5 100644
--- a/cosmos_server/src/structure/shared/mod.rs
+++ b/cosmos_server/src/structure/shared/mod.rs
@@ -36,14 +36,14 @@ fn on_melting_down(
         if melting_down.0 >= 1.0 {
             melting_down.0 -= 1.0;
 
-            if let Some(block) = structure.all_blocks_iter(false).next() {
-                structure.remove_block_at(block.coords(), &blocks, Some(&mut event_writer));
+            if let Some(coords) = structure.all_blocks_iter(false).next() {
+                structure.remove_block_at(coords, &blocks, Some(&mut event_writer));
             } else {
                 commands.entity(entity).insert(NeedsDespawned);
             }
         }
 
-        melting_down.0 += time.delta_seconds();
+        melting_down.0 += time.delta_secs();
     }
 }
 
diff --git a/cosmos_server/src/structure/systems/camera_system.rs b/cosmos_server/src/structure/systems/camera_system.rs
index 7e1545361..15326db96 100644
--- a/cosmos_server/src/structure/systems/camera_system.rs
+++ b/cosmos_server/src/structure/systems/camera_system.rs
@@ -33,7 +33,7 @@ fn camera_block_update_system(
     q_systems: Query<&StructureSystems>,
 ) {
     for ev in event.read() {
-        let Ok(systems) = q_systems.get(ev.structure_entity) else {
+        let Ok(systems) = q_systems.get(ev.block.structure()) else {
             continue;
         };
 
@@ -64,8 +64,8 @@ fn camera_structure_loaded_event_processor(
             let mut system = CameraSystem::default();
 
             for block in structure.all_blocks_iter(false) {
-                if camera_blocks.is_camera(block.block(structure, &blocks)) {
-                    system.block_added(block.coords());
+                if camera_blocks.is_camera(structure.block_at(block, &blocks)) {
+                    system.block_added(block);
                 }
             }
 
diff --git a/cosmos_server/src/structure/systems/dock_system.rs b/cosmos_server/src/structure/systems/dock_system.rs
index 7e12173c7..8be2c96dc 100644
--- a/cosmos_server/src/structure/systems/dock_system.rs
+++ b/cosmos_server/src/structure/systems/dock_system.rs
@@ -9,10 +9,9 @@ use bevy::{
         removal_detection::RemovedComponents,
         world::Ref,
     },
-    math::{Quat, Vec3},
+    math::{bounding::Aabb3d, Quat, Vec3},
     prelude::{in_state, App, Commands, EventReader, IntoSystemConfigs, Query, Res, Update},
     reflect::Reflect,
-    render::primitives::Aabb,
     transform::components::GlobalTransform,
 };
 
@@ -55,7 +54,7 @@ fn dock_block_update_system(
     q_systems: Query<&StructureSystems>,
 ) {
     for ev in event.read() {
-        let Ok(systems) = q_systems.get(ev.structure_entity) else {
+        let Ok(systems) = q_systems.get(ev.block.structure()) else {
             continue;
         };
 
@@ -85,8 +84,8 @@ fn dock_structure_loaded_event_processor(
             let mut system = DockSystem::default();
 
             for block in structure.all_blocks_iter(false) {
-                if block.block(structure, &blocks).unlocalized_name() == "cosmos:ship_dock" {
-                    system.block_added(block.coords());
+                if structure.block_at(block, &blocks).unlocalized_name() == "cosmos:ship_dock" {
+                    system.block_added(block);
                 }
             }
 
@@ -142,7 +141,7 @@ fn on_active(
             let rel_pos = structure.block_relative_position(docking_block);
             let block_rotation = structure.block_rotation(docking_block);
             let docking_look_direction = block_rotation.direction_of(BlockFace::Front);
-            let front_direction = docking_look_direction.to_vec3();
+            let front_direction = docking_look_direction.as_vec3();
 
             let abs_block_pos = g_trans.transform_point(rel_pos);
 
@@ -196,7 +195,7 @@ fn on_active(
 
             let hit_block_direction = hit_structure.block_rotation(hit_coords).direction_of(BlockFace::Front);
             let hit_rotation = Quat::from_affine3(&hit_g_trans.affine());
-            let front_direction = hit_rotation.mul_vec3(hit_block_direction.to_vec3());
+            let front_direction = hit_rotation.mul_vec3(hit_block_direction.as_vec3());
 
             let dotted = ray_dir.dot(front_direction);
 
@@ -211,7 +210,7 @@ fn on_active(
 
             let rel_pos = hit_structure.block_relative_position(hit_coords)
                 - relative_docked_ship_rotation
-                    .mul_vec3(structure.block_relative_position(docking_block) + docking_look_direction.to_vec3());
+                    .mul_vec3(structure.block_relative_position(docking_block) + docking_look_direction.as_vec3());
 
             let delta_position = rel_pos - (g_trans.translation() - hit_g_trans.translation());
 
@@ -247,7 +246,10 @@ fn on_active(
             &mut q_structure,
         );
 
-        let aabb = Aabb::from_min_max(min + Vec3::splat(0.1), max - Vec3::splat(0.1));
+        let aabb = Aabb3d {
+            min: (min + Vec3::splat(0.1)).into(),
+            max: (max - Vec3::splat(0.1)).into(),
+        };
 
         let mut hit_something_bad = false;
 
@@ -339,8 +341,8 @@ fn monitor_removed_dock_blocks(
         }
 
         for (docked_entity, docked) in q_docked.iter() {
-            if docked.to == ev.structure_entity && docked.to_block == ev.block.coords()
-                || ev.structure_entity == docked_entity && docked.this_block == ev.block.coords()
+            if docked.to == ev.block.structure() && docked.to_block == ev.block.coords()
+                || ev.block.structure() == docked_entity && docked.this_block == ev.block.coords()
             {
                 let vel = q_velocity.get(docked.to).copied().unwrap_or_default();
                 commands.entity(docked_entity).remove::<Docked>().insert(vel);
diff --git a/cosmos_server/src/structure/systems/energy_generation_system.rs b/cosmos_server/src/structure/systems/energy_generation_system.rs
index 47c50d00b..7039a210d 100644
--- a/cosmos_server/src/structure/systems/energy_generation_system.rs
+++ b/cosmos_server/src/structure/systems/energy_generation_system.rs
@@ -39,7 +39,7 @@ fn block_update_system(
     systems_query: Query<&StructureSystems>,
 ) {
     for ev in event.read() {
-        if let Ok(systems) = systems_query.get(ev.structure_entity) {
+        if let Ok(systems) = systems_query.get(ev.block.structure()) {
             if let Ok(mut system) = systems.query_mut(&mut system_query) {
                 if let Some(prop) = energy_generation_blocks.get(blocks.from_numeric_id(ev.old_block)) {
                     system.block_removed(prop);
@@ -62,7 +62,7 @@ fn update_energy(
     for (gen, system) in e_gen_query.iter() {
         if let Ok(systems) = sys_query.get(system.structure_entity()) {
             if let Ok(mut storage) = systems.query_mut(&mut e_storage_query) {
-                storage.increase_energy(gen.energy_generation_rate() * time.delta_seconds());
+                storage.increase_energy(gen.energy_generation_rate() * time.delta_secs());
             }
         }
     }
@@ -81,7 +81,7 @@ fn structure_loaded_event(
             let mut system = EnergyGenerationSystem::default();
 
             for block in structure.all_blocks_iter(false) {
-                if let Some(prop) = energy_generation_blocks.get(block.block(structure, &blocks)) {
+                if let Some(prop) = energy_generation_blocks.get(structure.block_at(block, &blocks)) {
                     system.block_added(prop);
                 }
             }
diff --git a/cosmos_server/src/structure/systems/energy_storage_system.rs b/cosmos_server/src/structure/systems/energy_storage_system.rs
index 66b90a547..2105d4ba3 100644
--- a/cosmos_server/src/structure/systems/energy_storage_system.rs
+++ b/cosmos_server/src/structure/systems/energy_storage_system.rs
@@ -37,7 +37,7 @@ fn block_update_system(
     systems_query: Query<&StructureSystems>,
 ) {
     for ev in event.read() {
-        if let Ok(systems) = systems_query.get(ev.structure_entity) {
+        if let Ok(systems) = systems_query.get(ev.block.structure()) {
             if let Ok(mut system) = systems.query_mut(&mut system_query) {
                 if let Some(prop) = energy_storage_blocks.get(blocks.from_numeric_id(ev.old_block)) {
                     system.block_removed(prop);
@@ -64,7 +64,7 @@ fn structure_loaded_event(
             let mut system = EnergyStorageSystem::default();
 
             for block in structure.all_blocks_iter(false) {
-                if let Some(prop) = energy_storage_blocks.get(block.block(structure, &blocks)) {
+                if let Some(prop) = energy_storage_blocks.get(structure.block_at(block, &blocks)) {
                     system.block_added(prop);
                 }
             }
diff --git a/cosmos_server/src/structure/systems/laser_cannon_system.rs b/cosmos_server/src/structure/systems/laser_cannon_system.rs
index 3fdc5b812..4631bfeea 100644
--- a/cosmos_server/src/structure/systems/laser_cannon_system.rs
+++ b/cosmos_server/src/structure/systems/laser_cannon_system.rs
@@ -70,7 +70,7 @@ fn update_system(
             continue;
         };
 
-        let sec = time.elapsed_seconds();
+        let sec = time.elapsed_secs();
 
         let mut any_fired = false;
 
@@ -82,7 +82,7 @@ fn update_system(
         cooldown.remove_unused_cooldowns(cannon_system);
 
         for line in cannon_system.lines.iter() {
-            let cooldown = cooldown.lines.entry(line.start.coords()).or_insert(default_cooldown);
+            let cooldown = cooldown.lines.entry(line.start).or_insert(default_cooldown);
 
             if sec - cooldown.last_use_time < cooldown.cooldown_time.as_secs_f32() {
                 continue;
@@ -96,9 +96,9 @@ fn update_system(
             any_fired = true;
             energy_storage_system.decrease_energy(line.property.energy_per_shot);
 
-            let location = structure.block_world_location(line.start.coords(), global_transform, location);
+            let location = structure.block_world_location(line.start, global_transform, location);
 
-            let relative_direction = line.direction.to_vec3();
+            let relative_direction = line.direction.as_vec3();
             let laser_velocity = global_transform.affine().matrix3.mul_vec3(relative_direction) * LASER_BASE_VELOCITY;
 
             let strength = (5.0 * line.len as f32).powf(1.2);
@@ -147,19 +147,19 @@ fn laser_cannon_input_event_listener(
     mut q_laser_cannon_system: Query<&mut LaserCannonSystem>,
 ) {
     for ev in evr_logic_input.read() {
-        let Ok((structure, systems)) = q_structure.get(ev.entity) else {
+        let Ok((structure, systems)) = q_structure.get(ev.block.structure()) else {
             continue;
         };
         if structure.block_at(ev.block.coords(), &blocks).unlocalized_name() != "cosmos:laser_cannon" {
             continue;
         }
-        let Ok(logic_driver) = q_logic_driver.get_mut(ev.entity) else {
+        let Ok(logic_driver) = q_logic_driver.get_mut(ev.block.structure()) else {
             continue;
         };
         let Ok(mut laser_cannon_system) = systems.query_mut(&mut q_laser_cannon_system) else {
             continue;
         };
-        let Some(line) = laser_cannon_system.mut_line_containing(ev.block) else {
+        let Some(line) = laser_cannon_system.mut_line_containing(ev.block.coords()) else {
             continue;
         };
 
diff --git a/cosmos_server/src/structure/systems/line_system.rs b/cosmos_server/src/structure/systems/line_system.rs
index b97d7f90f..91def3558 100644
--- a/cosmos_server/src/structure/systems/line_system.rs
+++ b/cosmos_server/src/structure/systems/line_system.rs
@@ -16,7 +16,6 @@ use cosmos_core::{
     structure::{
         coordinates::{BlockCoordinate, CoordinateType, UnboundBlockCoordinate, UnboundCoordinateType},
         events::StructureLoadedEvent,
-        structure_block::StructureBlock,
         systems::{
             line_system::{Line, LineBlocks, LineColorBlock, LineColorProperty, LineProperty, LinePropertyCalculator, LineSystem},
             StructureSystemType, StructureSystems, StructureSystemsSet,
@@ -36,17 +35,17 @@ fn block_update_system<T: LineProperty, S: LinePropertyCalculator<T>>(
     systems_query: Query<&StructureSystems>,
 ) {
     for ev in event.read() {
-        if let Ok(systems) = systems_query.get(ev.structure_entity) {
+        if let Ok(systems) = systems_query.get(ev.block.structure()) {
             if let Ok(mut system) = systems.query_mut(&mut system_query) {
                 let old_block = blocks.from_numeric_id(ev.old_block);
                 let new_block = blocks.from_numeric_id(ev.new_block);
 
                 if laser_cannon_blocks.get(old_block).is_some() {
-                    system.remove_block(&ev.block);
+                    system.remove_block(ev.block.coords());
                 }
 
                 if let Some(property) = laser_cannon_blocks.get(new_block) {
-                    system.add_block(&ev.block, ev.new_block_rotation, property);
+                    system.add_block(ev.block.coords(), ev.new_block_rotation(), property);
                 }
 
                 let mut recalc = false;
@@ -82,15 +81,15 @@ fn structure_loaded_event<T: LineProperty, S: LinePropertyCalculator<T>>(
 
             let mut color_found = false;
 
-            for structure_block in structure.all_blocks_iter(false) {
-                let block = structure_block.block(structure, &blocks);
-                let block_rotation = structure.block_rotation(structure_block.coords());
+            for coords in structure.all_blocks_iter(false) {
+                let block = structure.block_at(coords, &blocks);
+                let block_rotation = structure.block_rotation(coords);
                 if let Some(prop) = line_blocks.get(block) {
-                    system.add_block(&structure_block, block_rotation, prop);
+                    system.add_block(coords, block_rotation, prop);
                 }
                 if let Some(color_property) = color_blocks.from_block(block) {
                     color_found = true;
-                    system.colors.push((structure_block.coords(), color_property.properties));
+                    system.colors.push((coords, color_property.properties));
                 }
             }
 
@@ -158,7 +157,7 @@ fn add_colors(mut colors: ResMut<Registry<LineColorBlock>>, blocks: Res<Registry
 }
 
 impl<T: LineProperty, S: LinePropertyCalculator<T>> BlockStructureSystem<T> for LineSystem<T, S> {
-    fn add_block(&mut self, block: &StructureBlock, block_rotation: BlockRotation, prop: &T) {
+    fn add_block(&mut self, block: BlockCoordinate, block_rotation: BlockRotation, prop: &T) {
         let block_direction = block_rotation.direction_of(BlockFace::Front);
 
         let mut found_line = None;
@@ -172,9 +171,9 @@ impl<T: LineProperty, S: LinePropertyCalculator<T>> BlockStructureSystem<T> for
         for (i, line) in self.lines.iter_mut().filter(|x| x.direction == block_direction).enumerate() {
             let delta = block_direction.to_coordinates();
 
-            let start: UnboundBlockCoordinate = line.start.coords().into();
+            let start: UnboundBlockCoordinate = line.start.into();
 
-            let block: UnboundBlockCoordinate = block.coords().into();
+            let block: UnboundBlockCoordinate = block.into();
 
             // Block is before start
             if start.x - delta.x == block.x && start.y - delta.y == block.y && start.z - delta.z == block.z {
@@ -247,7 +246,7 @@ impl<T: LineProperty, S: LinePropertyCalculator<T>> BlockStructureSystem<T> for
         let property = S::calculate_property(&properties);
 
         self.lines.push(Line {
-            start: *block,
+            start: block,
             direction: block_direction,
             len: 1,
             properties,
@@ -258,11 +257,11 @@ impl<T: LineProperty, S: LinePropertyCalculator<T>> BlockStructureSystem<T> for
         });
     }
 
-    fn remove_block(&mut self, sb: &StructureBlock) {
+    fn remove_block(&mut self, sb: BlockCoordinate) {
         for (i, line) in self.lines.iter_mut().enumerate() {
-            line.mark_block_inactive(sb.coords());
+            line.mark_block_inactive(sb);
 
-            if line.start == *sb {
+            if line.start == sb {
                 let (dx, dy, dz) = line.direction.to_i32_tuple();
                 line.start.x = (line.start.x as i32 + dx) as CoordinateType;
                 line.start.y = (line.start.y as i32 + dy) as CoordinateType;
@@ -273,14 +272,14 @@ impl<T: LineProperty, S: LinePropertyCalculator<T>> BlockStructureSystem<T> for
                     self.lines.swap_remove(i);
                 }
                 return;
-            } else if line.end() == *sb {
+            } else if line.end() == sb {
                 line.len -= 1;
 
                 if line.len == 0 {
                     self.lines.swap_remove(i);
                 }
                 return;
-            } else if line.within(sb) {
+            } else if line.within(&sb) {
                 let l1_len = match line.direction {
                     BlockDirection::PosX => sb.x - line.start.x,
                     BlockDirection::NegX => line.start.x - sb.x,
@@ -333,11 +332,11 @@ impl<T: LineProperty, S: LinePropertyCalculator<T>> BlockStructureSystem<T> for
 
                 let l2_property = S::calculate_property(&l2_props);
                 let mut l2 = Line {
-                    start: StructureBlock::new(BlockCoordinate::new(
+                    start: BlockCoordinate::new(
                         (line.start.x as i32 + dx * dist) as CoordinateType,
                         (line.start.y as i32 + dy * dist) as CoordinateType,
                         (line.start.z as i32 + dz * dist) as CoordinateType,
-                    )),
+                    ),
                     direction: line.direction,
                     len: l2_len,
                     properties: l2_props,
@@ -363,7 +362,7 @@ impl<T: LineProperty, S: LinePropertyCalculator<T>> BlockStructureSystem<T> for
     }
 }
 
-fn is_in_line_with(testing_block: &StructureBlock, direction: BlockDirection, line_coord: &BlockCoordinate) -> bool {
+fn is_in_line_with(testing_block: BlockCoordinate, direction: BlockDirection, line_coord: BlockCoordinate) -> bool {
     match direction {
         BlockDirection::PosX => line_coord.x >= testing_block.x && line_coord.y == testing_block.y && line_coord.z == testing_block.z,
         BlockDirection::NegX => line_coord.x <= testing_block.x && line_coord.y == testing_block.y && line_coord.z == testing_block.z,
@@ -376,13 +375,13 @@ fn is_in_line_with(testing_block: &StructureBlock, direction: BlockDirection, li
 
 fn calculate_color_for_line<T: LineProperty, S: LinePropertyCalculator<T>>(
     line_system: &LineSystem<T, S>,
-    block: &StructureBlock,
+    block: BlockCoordinate,
     direction: BlockDirection,
 ) -> Option<Color> {
     let colors = line_system
         .colors
         .iter()
-        .filter(|x| is_in_line_with(block, direction, &x.0))
+        .filter(|x| is_in_line_with(block, direction, x.0))
         .map(|x| x.1)
         .collect::<Vec<LineColorProperty>>();
 
@@ -423,10 +422,10 @@ fn recalculate_colors<T: LineProperty, S: LinePropertyCalculator<T>>(
 
     for line in lines.iter_mut().filter(|line| {
         changed_coordinate
-            .map(|changed_coordinate| is_in_line_with(&line.start, line.direction, &changed_coordinate))
+            .map(|changed_coordinate| is_in_line_with(line.start, line.direction, changed_coordinate))
             .unwrap_or(false)
     }) {
-        line.color = calculate_color_for_line(line_system, &line.start, line.direction);
+        line.color = calculate_color_for_line(line_system, line.start, line.direction);
     }
 
     line_system.lines = lines;
diff --git a/cosmos_server/src/structure/systems/mining_laser_system.rs b/cosmos_server/src/structure/systems/mining_laser_system.rs
index ed66e26cb..2d170af0f 100644
--- a/cosmos_server/src/structure/systems/mining_laser_system.rs
+++ b/cosmos_server/src/structure/systems/mining_laser_system.rs
@@ -65,7 +65,7 @@ fn check_should_break(
     blocks: Res<Registry<Block>>,
     time: Res<Time>,
 ) {
-    let delta = time.delta_seconds();
+    let delta = time.delta_secs();
 
     for (structure_entity, structure, mut being_mined) in q_structure.iter_mut() {
         being_mined.0.retain(|coordinate, &mut entity| {
@@ -77,9 +77,8 @@ fn check_should_break(
 
             if mining_block.time_mined >= block.mining_resistance() {
                 ev_writer.send(BlockBreakEvent {
-                    block: StructureBlock::new(*coordinate),
+                    block: StructureBlock::new(*coordinate, structure_entity),
                     breaker: mining_block.last_toucher,
-                    structure_entity,
                 });
                 commands.entity(entity).insert(NeedsDespawned);
                 return false;
@@ -130,7 +129,7 @@ fn update_mining_beams(
 
     let mut mining_blocks: Vec<CachedBlockBeingMined> = vec![];
 
-    let delta_time = time.delta_seconds();
+    let delta_time = time.delta_secs();
 
     for (entity, beam, p_world, g_trans) in q_mining_beams.iter_mut() {
         if !q_is_system_active.contains(beam.system_entity) {
@@ -285,16 +284,16 @@ fn on_activate_system(
     for (system_entity, mining_system, system) in query.iter_mut() {
         if let Ok((ship_entity, systems, structure, physics_world)) = systems.get(system.structure_entity()) {
             if let Ok(mut energy_storage_system) = systems.query_mut(&mut es_query) {
-                let sec = time.delta_seconds();
+                let sec = time.delta_secs();
 
                 for line in mining_system.lines.iter() {
                     let energy = line.property.energy_per_second * sec;
 
                     if energy_storage_system.decrease_energy(energy) == 0.0 {
-                        let beam_direction = line.direction.to_vec3();
+                        let beam_direction = line.direction.as_vec3();
 
                         let beam_begin = line.end();
-                        let rel_pos = structure.block_relative_position(beam_begin.coords());
+                        let rel_pos = structure.block_relative_position(beam_begin);
 
                         let mining_beam = commands
                             .spawn((
@@ -305,7 +304,7 @@ fn on_activate_system(
                                     system_entity,
                                 },
                                 DespawnWithStructure,
-                                TransformBundle::from_transform(Transform::from_translation(rel_pos).looking_to(beam_direction, Vec3::Y)),
+                                Transform::from_translation(rel_pos).looking_to(beam_direction, Vec3::Y),
                                 *physics_world,
                             ))
                             .id();
diff --git a/cosmos_server/src/structure/systems/missile_launcher_system.rs b/cosmos_server/src/structure/systems/missile_launcher_system.rs
index f44da1d9d..3e7b3c565 100644
--- a/cosmos_server/src/structure/systems/missile_launcher_system.rs
+++ b/cosmos_server/src/structure/systems/missile_launcher_system.rs
@@ -139,7 +139,7 @@ fn missile_lockon(
                 if *focusing_server_entity != best_target {
                     missile_launmcher_focus.change_focus(best_target, MISSILE_FOCUS_TIME);
                 } else {
-                    *focused_duration += Duration::from_secs_f32(time.delta_seconds());
+                    *focused_duration += Duration::from_secs_f32(time.delta_secs());
                 }
             }
             MissileLauncherFocus::NotFocusing => {
@@ -198,7 +198,7 @@ fn update_missile_system(
             continue;
         };
 
-        let sec = time.elapsed_seconds();
+        let sec = time.elapsed_secs();
 
         let mut any_fired = false;
 
@@ -210,7 +210,7 @@ fn update_missile_system(
         cooldown.remove_unused_cooldowns(missile_launcher_system);
 
         for line in missile_launcher_system.lines.iter() {
-            let cooldown = cooldown.lines.entry(line.start.coords()).or_insert(default_cooldown);
+            let cooldown = cooldown.lines.entry(line.start).or_insert(default_cooldown);
 
             if sec - cooldown.last_use_time <= cooldown.cooldown_time.as_secs_f32() {
                 continue;
@@ -224,9 +224,9 @@ fn update_missile_system(
             any_fired = true;
             energy_storage_system.decrease_energy(line.property.energy_per_shot);
 
-            let location = structure.block_world_location(line.start.coords(), global_transform, location);
+            let location = structure.block_world_location(line.start, global_transform, location);
 
-            let relative_direction = line.direction.to_vec3();
+            let relative_direction = line.direction.as_vec3();
 
             let missile_vel = MISSILE_BASE_VELOCITY + (line.len as f32 * MISSILE_SPEED_DIVIDER + 1.0).ln() * MISSILE_SPEED_MULTIPLIER;
 
@@ -290,19 +290,19 @@ fn missile_launcher_input_event_listener(
     mut q_missile_launcher_system: Query<&mut MissileLauncherSystem>,
 ) {
     for ev in evr_logic_input.read() {
-        let Ok((structure, systems)) = q_structure.get(ev.entity) else {
+        let Ok((structure, systems)) = q_structure.get(ev.block.structure()) else {
             continue;
         };
         if structure.block_at(ev.block.coords(), &blocks).unlocalized_name() != "cosmos:missile_launcher" {
             continue;
         }
-        let Ok(logic_driver) = q_logic_driver.get_mut(ev.entity) else {
+        let Ok(logic_driver) = q_logic_driver.get_mut(ev.block.structure()) else {
             continue;
         };
         let Ok(mut missile_launcher_system) = systems.query_mut(&mut q_missile_launcher_system) else {
             continue;
         };
-        let Some(line) = missile_launcher_system.mut_line_containing(ev.block) else {
+        let Some(line) = missile_launcher_system.mut_line_containing(ev.block.coords()) else {
             continue;
         };
 
diff --git a/cosmos_server/src/structure/systems/mod.rs b/cosmos_server/src/structure/systems/mod.rs
index 131c4185e..93d42fe5b 100644
--- a/cosmos_server/src/structure/systems/mod.rs
+++ b/cosmos_server/src/structure/systems/mod.rs
@@ -1,7 +1,7 @@
 //! Contains projectile systems needed on the server
 
 use bevy::prelude::App;
-use cosmos_core::{block::block_rotation::BlockRotation, structure::structure_block::StructureBlock};
+use cosmos_core::{block::block_rotation::BlockRotation, prelude::BlockCoordinate};
 
 mod camera_system;
 mod dock_system;
@@ -18,9 +18,9 @@ mod thruster_system;
 /// A system that is created by the addition and removal of blocks
 pub trait BlockStructureSystem<T> {
     /// Called whenever a block is added that is relevant to this system
-    fn add_block(&mut self, sb: &StructureBlock, block_rotation: BlockRotation, property: &T);
+    fn add_block(&mut self, sb: BlockCoordinate, block_rotation: BlockRotation, property: &T);
     /// Called whenever a block is removed that is relevant to this system
-    fn remove_block(&mut self, sb: &StructureBlock);
+    fn remove_block(&mut self, sb: BlockCoordinate);
 }
 
 pub(super) fn register(app: &mut App) {
diff --git a/cosmos_server/src/structure/systems/shield_system/mod.rs b/cosmos_server/src/structure/systems/shield_system/mod.rs
index dac7c6021..c2e9861f7 100644
--- a/cosmos_server/src/structure/systems/shield_system/mod.rs
+++ b/cosmos_server/src/structure/systems/shield_system/mod.rs
@@ -14,13 +14,12 @@ use bevy::{
     hierarchy::{BuildChildren, Parent},
     log::warn,
     math::Vec3,
-    prelude::{in_state, App, Commands, EventReader, IntoSystemConfigs, IntoSystemSetConfigs, OnEnter, Query, Res, ResMut, Update},
+    prelude::{
+        in_state, App, ChildBuild, Commands, EventReader, IntoSystemConfigs, IntoSystemSetConfigs, OnEnter, Query, Res, ResMut, Update,
+    },
     reflect::Reflect,
     time::Time,
-    transform::{
-        bundles::TransformBundle,
-        components::{GlobalTransform, Transform},
-    },
+    transform::components::{GlobalTransform, Transform},
     utils::hashbrown::HashMap,
 };
 
@@ -107,7 +106,7 @@ fn block_update_system(
     systems_query: Query<&StructureSystems>,
 ) {
     for ev in event.read() {
-        if let Ok(systems) = systems_query.get(ev.structure_entity) {
+        if let Ok(systems) = systems_query.get(ev.block.structure()) {
             if let Ok(mut system) = systems.query_mut(&mut system_query) {
                 if shield_projector_blocks.0.get(&ev.old_block).is_some() {
                     system.projector_removed(ev.block.coords());
@@ -142,12 +141,12 @@ fn structure_loaded_event(
             let mut system = ShieldSystem::default();
 
             for block in structure.all_blocks_iter(false) {
-                if let Some(&prop) = shield_projector_blocks.0.get(&structure.block_id_at(block.coords())) {
-                    system.projector_added(prop, block.coords());
+                if let Some(&prop) = shield_projector_blocks.0.get(&structure.block_id_at(block)) {
+                    system.projector_added(prop, block);
                 }
 
-                if let Some(&prop) = shield_generator_blocks.0.get(&structure.block_id_at(block.coords())) {
-                    system.generator_added(prop, block.coords());
+                if let Some(&prop) = shield_generator_blocks.0.get(&structure.block_id_at(block)) {
+                    system.generator_added(prop, block);
                 }
             }
 
@@ -236,7 +235,7 @@ fn recalculate_shields_if_needed(
                 let shield_ent = p
                     .spawn((
                         Name::new("Shield"),
-                        TransformBundle::from_transform(Transform::from_translation(shield_pos)),
+                        Transform::from_translation(shield_pos),
                         *loc + shield_loc,
                         LoadingDistance::new(1, 2),
                         Shield {
@@ -274,12 +273,12 @@ fn power_shields(
         if shield.strength < shield.max_strength {
             if shield.strength == 0.0 {
                 let Some(mut shield_downtime) = shield_downtime else {
-                    commands.entity(ent).insert(ShieldDowntime(time.delta_seconds()));
+                    commands.entity(ent).insert(ShieldDowntime(time.delta_secs()));
                     continue;
                 };
 
                 if shield_downtime.0 < MAX_SHIELD_DOWNTIME.as_secs_f32() {
-                    shield_downtime.0 += time.delta_seconds();
+                    shield_downtime.0 += time.delta_secs();
                     continue;
                 }
             }
@@ -287,7 +286,7 @@ fn power_shields(
             let strength_missing = shield.max_strength - shield.strength;
 
             let optimal_power_usage = strength_missing / shield.power_efficiency;
-            let power_usage = optimal_power_usage.min(shield.power_per_second * time.delta_seconds());
+            let power_usage = optimal_power_usage.min(shield.power_per_second * time.delta_secs());
 
             let Ok(systems) = q_systems.get(parent.get()) else {
                 warn!("Shield's parent isn't a structure?");
diff --git a/cosmos_server/src/structure/systems/thruster_system.rs b/cosmos_server/src/structure/systems/thruster_system.rs
index 932eca595..d2cb97878 100644
--- a/cosmos_server/src/structure/systems/thruster_system.rs
+++ b/cosmos_server/src/structure/systems/thruster_system.rs
@@ -66,7 +66,7 @@ fn block_update_system(
     systems_query: Query<&StructureSystems>,
 ) {
     for ev in event.read() {
-        if let Ok(systems) = systems_query.get(ev.structure_entity) {
+        if let Ok(systems) = systems_query.get(ev.block.structure()) {
             if let Ok(mut system) = systems.query_mut(&mut system_query) {
                 if let Some(prop) = energy_storage_blocks.get(blocks.from_numeric_id(ev.old_block)) {
                     system.block_removed(prop);
@@ -107,7 +107,7 @@ pub(super) fn update_ship_force_and_velocity(
 
                 const MAX_ANGLE_PER_SECOND: f32 = 100.0;
 
-                let max = MAX_ANGLE_PER_SECOND * time.delta_seconds();
+                let max = MAX_ANGLE_PER_SECOND * time.delta_secs();
 
                 velocity.angvel = torque.clamp_length(0.0, max);
 
@@ -126,7 +126,7 @@ pub(super) fn update_ship_force_and_velocity(
 
                 movement_vector = movement_vector.normalize();
 
-                let delta = time.delta_seconds();
+                let delta = time.delta_secs();
 
                 let mut energy_used = thruster_system.energy_consumption() * delta;
 
@@ -150,7 +150,7 @@ pub(super) fn update_ship_force_and_velocity(
 
             if movement.braking {
                 let mut brake_vec = -velocity.linvel * readmass.get().mass;
-                let delta = time.delta_seconds() * MAX_BRAKE_DELTA_PER_THRUST * thruster_system.thrust_total();
+                let delta = time.delta_secs() * MAX_BRAKE_DELTA_PER_THRUST * thruster_system.thrust_total();
 
                 if brake_vec.length_squared() >= delta * delta {
                     brake_vec = brake_vec.normalize() * delta;
@@ -177,7 +177,7 @@ fn structure_loaded_event(
             let mut system = ThrusterSystem::default();
 
             for block in structure.all_blocks_iter(false) {
-                if let Some(prop) = thruster_blocks.get(block.block(structure, &blocks)) {
+                if let Some(prop) = thruster_blocks.get(structure.block_at(block, &blocks)) {
                     system.block_added(prop);
                 }
             }
diff --git a/cosmos_server/src/universe/spawners/pirate.rs b/cosmos_server/src/universe/spawners/pirate.rs
index ef9a04282..4b2f81880 100644
--- a/cosmos_server/src/universe/spawners/pirate.rs
+++ b/cosmos_server/src/universe/spawners/pirate.rs
@@ -63,7 +63,7 @@ struct NextPirateSpawn(f64);
 
 fn add_spawn_times(q_players: Query<Entity, (With<Player>, Without<NextPirateSpawn>)>, time: Res<Time>, mut commands: Commands) {
     for ent in q_players.iter() {
-        commands.entity(ent).insert(NextPirateSpawn(time.delta_seconds_f64()));
+        commands.entity(ent).insert(NextPirateSpawn(time.delta_secs_f64()));
     }
 }
 
@@ -104,7 +104,7 @@ fn spawn_pirates(
     }
 
     for (sector, (next_pirate_spawn, player_ents)) in player_groups {
-        if time.elapsed_seconds_f64() < next_pirate_spawn.0 {
+        if time.elapsed_secs_f64() < next_pirate_spawn.0 {
             continue;
         }
 
@@ -156,7 +156,7 @@ fn spawn_pirates(
         }
 
         let min_secs = min_pirate_spawn_time.0.as_secs_f64();
-        let next_spawn_time = rand::random::<f64>() * min_secs * 3.0 + min_secs + time.elapsed_seconds_f64();
+        let next_spawn_time = rand::random::<f64>() * min_secs * 3.0 + min_secs + time.elapsed_secs_f64();
 
         for player_ent in player_ents {
             commands.entity(player_ent).insert(NextPirateSpawn(next_spawn_time));
diff --git a/mockups/fabricator_mockup.html b/mockups/fabricator_mockup.html
new file mode 100644
index 000000000..00215bd9c
--- /dev/null
+++ b/mockups/fabricator_mockup.html
@@ -0,0 +1,143 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+
+    <style>
+      * {
+        margin: 0;
+        padding: 0;
+        border: none;
+        font-family: Verdana, Geneva, Tahoma, sans-serif;
+        box-sizing: border-box;
+      }
+
+      html {
+        background-color: black;
+        min-height: 100%;
+        display: flex;
+      }
+
+      body {
+        flex: 1;
+        display: flex;
+      }
+
+      .shop {
+        position: relative;
+        margin: auto;
+
+        height: 800px;
+        width: 1000px;
+        background-color: #2d2d2d;
+        display: flex;
+        flex-direction: column;
+      }
+
+      .top-bar {
+        width: 100%;
+        color: white;
+        padding: 10px;
+        display: flex;
+        justify-content: space-between;
+      }
+
+      main {
+        flex: 1;
+        display: flex;
+      }
+
+      .main-stuff {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+      }
+
+      .categories {
+        width: 400px;
+        padding: 10px;
+        border-left: thick solid #1c1c1c;
+        height: 100%;
+        display: flex;
+      }
+
+      p,
+      h2,
+      h3 {
+        color: white;
+        margin: 10px 0;
+        line-height: 1.5em;
+      }
+
+      ul {
+        margin-left: 20px;
+      }
+
+      li {
+        list-style-type: none;
+        line-height: 1.5em;
+      }
+
+      .top {
+        flex: 1;
+        padding: 20px 40px;
+      }
+
+      .money {
+        font-size: 1.5em;
+        color: white;
+        display: inline-block;
+        display: flex;
+        margin: 0 10px;
+      }
+
+      .scrollbar {
+        width: 15px;
+        background-color: #888;
+        height: 100%;
+      }
+
+      .scroll-pos {
+        height: 20%;
+        background-color: #555;
+      }
+
+      .items li {
+        color: white;
+      }
+
+      .left {
+        display: flex;
+        flex-direction: column;
+        flex: 1;
+      }
+
+      .tab-btn {
+        height: 100%;
+        font-size: 2em;
+        flex: 1;
+        background-color: green;
+        color: white;
+        width: 50%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div class="shop">
+      <div class="top-bar">
+        <h1>Fabricator</h1>
+        <h1>X</h1>
+      </div>
+      <main>
+        <p></p>
+      </main>
+    </div>
+  </body>
+</html>
diff --git a/shop_mockup.html b/mockups/shop_mockup.html
similarity index 100%
rename from shop_mockup.html
rename to mockups/shop_mockup.html