diff --git a/Cargo.lock b/Cargo.lock
index 08176cf..fa24bf0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -140,7 +140,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
 dependencies = [
  "alsa-sys",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cfg-if",
  "libc",
 ]
@@ -162,7 +162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
 dependencies = [
  "android-properties",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cc",
  "cesu8",
  "jni",
@@ -312,7 +312,7 @@ checksum = "f548ad2c4031f2902e3edc1f29c29e835829437de49562d8eb5dc5584d3a1043"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -341,9 +341,9 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.14.0"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
 dependencies = [
  "async-task",
  "concurrent-queue",
@@ -518,7 +518,7 @@ checksum = "d577eae7246a1cda461df1b63188619fc6a3c619adba2a8e5a79e9aa51f64671"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -584,7 +584,7 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "blake3",
  "crossbeam-channel",
  "derive_more 2.1.1",
@@ -615,7 +615,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -699,7 +699,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "nonmax",
  "radsort",
  "smallvec",
@@ -715,7 +715,7 @@ checksum = "f9396b256b366a43d7f61d1f230cdab0a512fb4712cbf7d688f3d6fce4c5ea8a"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -758,7 +758,7 @@ dependencies = [
  "bevy_reflect",
  "bevy_tasks",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "bumpalo",
  "concurrent-queue",
  "derive_more 2.1.1",
@@ -782,7 +782,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -848,7 +848,7 @@ checksum = "92c4b3c3aac86f0db85d4f708883ebdc735c3f88ac5b84c033874fcdd3540a9d"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -900,7 +900,7 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "bytemuck",
  "futures-lite",
  "guillotiere",
@@ -1049,7 +1049,7 @@ dependencies = [
  "parking_lot",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
  "toml_edit",
 ]
 
@@ -1089,7 +1089,7 @@ dependencies = [
  "bevy_platform",
  "bevy_reflect",
  "bevy_transform",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "bytemuck",
  "derive_more 2.1.1",
  "hexasphere",
@@ -1128,7 +1128,7 @@ dependencies = [
  "bevy_shader",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "bytemuck",
  "derive_more 2.1.1",
  "fixedbitset 0.5.7",
@@ -1207,7 +1207,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "nonmax",
  "radsort",
  "smallvec",
@@ -1226,7 +1226,7 @@ name = "bevy_ratatui"
 version = "0.10.0"
 dependencies = [
  "bevy",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "color-eyre",
  "ratatui",
  "tracing",
@@ -1270,7 +1270,7 @@ dependencies = [
  "indexmap 2.13.0",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
  "uuid",
 ]
 
@@ -1301,7 +1301,7 @@ dependencies = [
  "bevy_transform",
  "bevy_utils",
  "bevy_window",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "bytemuck",
  "derive_more 2.1.1",
  "downcast-rs 2.0.2",
@@ -1332,7 +1332,7 @@ dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1392,7 +1392,7 @@ checksum = "0d280e7e01308ef9b2629d888d71845f65c3f790f3dfedecc537182175527118"
 dependencies = [
  "heck 0.5.0",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1444,7 +1444,7 @@ dependencies = [
  "bevy_text",
  "bevy_transform",
  "bevy_utils",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "bytemuck",
  "derive_more 2.1.1",
  "fixedbitset 0.5.7",
@@ -1476,7 +1476,7 @@ checksum = "bcda45913b1d6470c6b751656e72fb3f25ca6b5b7b2ee055b294aaed1eb7e5ba"
 dependencies = [
  "bevy_macro_utils",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1691,16 +1691,16 @@ version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cexpr",
  "clang-sys",
- "itertools 0.13.0",
+ "itertools 0.12.1",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash 2.1.1",
  "shlex",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1741,9 +1741,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.11.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 dependencies = [
  "bytemuck",
  "serde_core",
@@ -1853,7 +1853,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1890,7 +1890,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "log",
  "polling",
  "rustix 0.38.44",
@@ -1921,9 +1921,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.56"
+version = "1.2.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
+checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1983,9 +1983,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.58"
+version = "4.5.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806"
+checksum = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1993,9 +1993,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.58"
+version = "4.5.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2"
+checksum = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2012,14 +2012,14 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "1.0.0"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
+checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
 
 [[package]]
 name = "codespan-reporting"
@@ -2216,7 +2216,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -2247,7 +2247,7 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da46a9d5a8905cc538a4a5bceb6a4510de7a51049c5588c0114efce102bcbbe8"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "fontdb",
  "log",
  "rangemap",
@@ -2360,7 +2360,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "crossterm_winapi",
  "derive_more 2.1.1",
  "document-features",
@@ -2409,12 +2409,12 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.5.2"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
+checksum = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790"
 dependencies = [
  "dispatch2",
- "nix 0.31.1",
+ "nix 0.30.1",
  "windows-sys 0.61.2",
 ]
 
@@ -2455,7 +2455,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2468,7 +2468,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2479,7 +2479,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2490,7 +2490,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core 0.23.0",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2523,9 +2523,9 @@ checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4"
 
 [[package]]
 name = "deranged"
-version = "0.5.6"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
  "serde_core",
@@ -2556,7 +2556,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2578,7 +2578,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.116",
+ "syn 2.0.114",
  "unicode-xid",
 ]
 
@@ -2604,7 +2604,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.3",
@@ -2618,7 +2618,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2704,7 +2704,7 @@ checksum = "1796db3d892515842ca2dfb11124c4bb4a9e58d9f2c5c1072e5bca1b2334507b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2716,7 +2716,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2952,7 +2952,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2978,9 +2978,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2993,9 +2993,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -3003,15 +3003,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -3020,9 +3020,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -3039,32 +3039,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.32"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3074,6 +3074,7 @@ dependencies = [
  "futures-task",
  "memchr",
  "pin-project-lite",
+ "pin-utils",
  "slab",
 ]
 
@@ -3122,19 +3123,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi",
- "wasip2",
- "wasip3",
-]
-
 [[package]]
 name = "gilrs"
 version = "0.11.1"
@@ -3237,7 +3225,7 @@ dependencies = [
  "inflections",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3267,7 +3255,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "gpu-alloc-types",
 ]
 
@@ -3277,7 +3265,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -3298,7 +3286,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -3309,7 +3297,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -3566,12 +3554,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -3662,7 +3644,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "inotify-sys",
  "libc",
 ]
@@ -3686,7 +3668,7 @@ dependencies = [
  "indoc",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3713,15 +3695,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -3777,7 +3750,6 @@ dependencies = [
  "bevy_ratatui",
  "bevy_spacetimedb",
  "clap",
- "jong-db",
  "jong-types",
  "log",
  "rand 0.9.2",
@@ -3790,23 +3762,6 @@ dependencies = [
  "tui-logger",
 ]
 
-[[package]]
-name = "jong-db"
-version = "0.1.0"
-dependencies = [
- "jong-types",
- "spacetimedb-sdk",
-]
-
-[[package]]
-name = "jong-line"
-version = "0.1.0"
-dependencies = [
- "jong-types",
- "log",
- "spacetimedb",
-]
-
 [[package]]
 name = "jong-types"
 version = "0.1.0"
@@ -3817,6 +3772,15 @@ dependencies = [
  "strum 0.27.2",
 ]
 
+[[package]]
+name = "jongline"
+version = "0.1.0"
+dependencies = [
+ "jong-types",
+ "log",
+ "spacetimedb",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.85"
@@ -3840,9 +3804,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.6"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
@@ -3870,7 +3834,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff7f53bdf698e7aa7ec916411bbdc8078135da11b66db5182675b2227f6c0d07"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -3885,12 +3849,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
 [[package]]
 name = "lewton"
 version = "0.10.2"
@@ -3930,9 +3888,9 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "libc",
- "redox_syscall 0.7.1",
+ "redox_syscall 0.7.0",
 ]
 
 [[package]]
@@ -3951,7 +3909,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -4047,9 +4005,9 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "memmap2"
-version = "0.9.10"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
+checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490"
 dependencies = [
  "libc",
 ]
@@ -4075,7 +4033,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block",
  "core-graphics-types 0.2.0",
  "foreign-types 0.5.0",
@@ -4130,7 +4088,7 @@ checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c"
 dependencies = [
  "arrayvec",
  "bit-set 0.8.0",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cfg-if",
  "cfg_aliases",
  "codespan-reporting",
@@ -4168,9 +4126,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.16"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5d26952a508f321b4d3d2e80e78fc2603eaefcdf0c30783867f19586518bdc"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
 dependencies = [
  "libc",
  "log",
@@ -4189,7 +4147,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "jni-sys",
  "log",
  "ndk-sys 0.5.0+25.2.9519653",
@@ -4203,7 +4161,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "jni-sys",
  "log",
  "ndk-sys 0.6.0+11769913",
@@ -4242,7 +4200,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -4255,19 +4213,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
 dependencies = [
- "bitflags 2.11.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
-[[package]]
-name = "nix"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225e7cfe711e0ba79a68baeddb2982723e4235247aefce1482f2f16c27865b66"
-dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -4297,9 +4243,9 @@ checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
 
 [[package]]
 name = "ntapi"
-version = "0.4.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae"
+checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081"
 dependencies = [
  "winapi",
 ]
@@ -4327,7 +4273,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4359,7 +4305,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4411,7 +4357,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -4427,7 +4373,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -4451,7 +4397,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -4463,7 +4409,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -4502,7 +4448,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.5.1",
  "dispatch",
  "libc",
@@ -4515,7 +4461,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "libc",
  "objc2-core-foundation",
 ]
@@ -4538,7 +4484,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -4550,7 +4496,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation",
@@ -4573,7 +4519,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit",
@@ -4605,7 +4551,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location",
@@ -4681,7 +4627,7 @@ version = "0.10.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cfg-if",
  "foreign-types 0.3.2",
  "libc",
@@ -4698,14 +4644,14 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.2.1"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
@@ -4738,15 +4684,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "ordered-float"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2c1f9f56e534ac6a9b8a4600bdf0f530fb393b5f393e7b4d03489c3cf0c3f01"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "owned_ttf_parser"
 version = "0.25.1"
@@ -4833,7 +4770,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4899,7 +4836,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4928,7 +4865,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -4937,6 +4874,12 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "piper"
 version = "0.2.4"
@@ -4956,11 +4899,11 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "png"
-version = "0.18.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -5035,16 +4978,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
-[[package]]
-name = "prettyplease"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
-dependencies = [
- "proc-macro2",
- "syn 2.0.116",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.4.0"
@@ -5230,7 +5163,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "compact_str",
  "hashbrown 0.16.1",
  "indoc",
@@ -5282,7 +5215,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "hashbrown 0.16.1",
  "indoc",
  "instability",
@@ -5352,16 +5285,16 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.7.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35985aa610addc02e24fc232012c86fd11f14111180f902b67e2d5331f8ebf2b"
+checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -5381,7 +5314,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5436,7 +5369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "beceb6f7bf81c73e73aeef6dd1356d9a1b2b4909e1f0fc3e59b034f9572d7b7f"
 dependencies = [
  "base64 0.22.1",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "serde",
  "serde_derive",
  "unicode-ident",
@@ -5481,7 +5414,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -5494,7 +5427,7 @@ version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "errno",
  "libc",
  "linux-raw-sys 0.11.0",
@@ -5513,7 +5446,7 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "bytemuck",
  "libm",
  "smallvec",
@@ -5535,9 +5468,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.23"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
+checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984"
 
 [[package]]
 name = "same-file"
@@ -5614,12 +5547,12 @@ checksum = "4904c83c6e51f1b9b08bfa5a86f35a51798e8307186e6f5513852210a219c0bb"
 
 [[package]]
 name = "security-framework"
-version = "3.6.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d17b898a6d6948c3a8ee4372c17cb384f90d2e6e912ef00895b14fd7ab54ec38"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.11.0",
- "core-foundation 0.10.1",
+ "bitflags 2.10.0",
+ "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -5627,9 +5560,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.16.0"
+version = "2.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321c8673b092a9a42605034a9879d73cb79101ed5fd117bc9a597b89b4e9e61a"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5680,7 +5613,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5724,7 +5657,7 @@ dependencies = [
  "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5854,7 +5787,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
@@ -5925,7 +5858,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "spacetimedb-primitives",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -5980,7 +5913,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f7284d48bcfddc7c091756c6d5d3cc9a847b95778c636fdd03b9538d74a57c7"
 dependencies = [
  "anyhow",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "blake3",
  "chrono",
  "derive_more 0.99.20",
@@ -6014,7 +5947,7 @@ version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff2dc124963dd166ecde2b4d8f0e5ed4cfd27a20d7f6bb9e84d7eff46cc520b5"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "either",
  "enum-as-inner",
  "itertools 0.12.1",
@@ -6029,7 +5962,7 @@ checksum = "df06586ffc862efd795425854cc2469c561aca5b95f5df2212aa29ef14a56f8a"
 dependencies = [
  "anyhow",
  "arrayvec",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "bytemuck",
  "bytes",
  "bytestring",
@@ -6096,7 +6029,7 @@ version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
@@ -6160,7 +6093,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6172,7 +6105,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6205,9 +6138,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.116"
+version = "2.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3df424c70518695237746f84cede799c9c58fcb37450d7b23716568cc8bc69cb"
+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6222,7 +6155,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6262,12 +6195,12 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.25.0"
+version = "3.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1"
+checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
 dependencies = [
  "fastrand",
- "getrandom 0.4.1",
+ "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.3",
  "windows-sys 0.61.2",
@@ -6311,7 +6244,7 @@ checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "fancy-regex",
  "filedescriptor",
  "finl_unicode",
@@ -6324,7 +6257,7 @@ dependencies = [
  "nix 0.29.0",
  "num-derive",
  "num-traits",
- "ordered-float 4.6.0",
+ "ordered-float",
  "pest",
  "pest_derive",
  "phf",
@@ -6371,7 +6304,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6382,7 +6315,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6502,7 +6435,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6552,9 +6485,9 @@ dependencies = [
 
 [[package]]
 name = "toml_parser"
-version = "1.0.8+spec-1.1.0"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0742ff5ff03ea7e67c8ae6c93cac239e0d9784833362da3f9a9c1da8dfefcbdc"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
 dependencies = [
  "winnow",
 ]
@@ -6578,7 +6511,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6757,9 +6690,9 @@ checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.24"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unicode-linebreak"
@@ -6798,9 +6731,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-width"
-version = "0.2.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
 [[package]]
 name = "unicode-xid"
@@ -6840,12 +6773,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.21.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b672338555252d43fd2240c714dc444b8c6fb0a5c5335e65a07bba7742735ddb"
+checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
 dependencies = [
  "atomic",
- "getrandom 0.4.1",
+ "getrandom 0.3.4",
  "js-sys",
  "serde_core",
  "wasm-bindgen",
@@ -6865,7 +6798,7 @@ checksum = "41b6d82be61465f97d42bd1d15bf20f3b0a3a0905018f38f9d6f6962055b0b5c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -6920,15 +6853,6 @@ dependencies = [
  "wit-bindgen",
 ]
 
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
-dependencies = [
- "wit-bindgen",
-]
-
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.108"
@@ -6975,7 +6899,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
  "wasm-bindgen-shared",
 ]
 
@@ -6988,40 +6912,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "wasm-encoder"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
-dependencies = [
- "leb128fmt",
- "wasmparser",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap 2.13.0",
- "wasm-encoder",
- "wasmparser",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags 2.11.0",
- "hashbrown 0.15.5",
- "indexmap 2.13.0",
- "semver",
-]
-
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
@@ -7042,7 +6932,7 @@ version = "0.31.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "rustix 1.1.3",
  "wayland-backend",
  "wayland-scanner",
@@ -7054,7 +6944,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cursor-icon",
  "wayland-backend",
 ]
@@ -7076,7 +6966,7 @@ version = "0.32.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -7088,7 +6978,7 @@ version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa98634619300a535a9a97f338aed9a5ff1e01a461943e8346ff4ae26007306b"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -7101,7 +6991,7 @@ version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -7192,7 +7082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f2ab60e120fd6eaa68d9567f3226e876684639d22a4219b313ff69ec0ccd5ac"
 dependencies = [
  "log",
- "ordered-float 4.6.0",
+ "ordered-float",
  "strsim",
  "thiserror 1.0.69",
  "wezterm-dynamic-derive",
@@ -7229,7 +7119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798"
 dependencies = [
  "arrayvec",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cfg-if",
  "cfg_aliases",
  "document-features",
@@ -7258,7 +7148,7 @@ dependencies = [
  "arrayvec",
  "bit-set 0.8.0",
  "bit-vec 0.8.0",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "cfg_aliases",
  "document-features",
  "hashbrown 0.15.5",
@@ -7317,7 +7207,7 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set 0.8.0",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block",
  "bytemuck",
  "cfg-if",
@@ -7338,7 +7228,7 @@ dependencies = [
  "naga",
  "ndk-sys 0.6.0+11769913",
  "objc",
- "ordered-float 5.0.0",
+ "ordered-float",
  "parking_lot",
  "portable-atomic",
  "portable-atomic-util",
@@ -7361,7 +7251,7 @@ version = "26.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "bytemuck",
  "js-sys",
  "log",
@@ -7543,7 +7433,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7554,7 +7444,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7565,7 +7455,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7576,7 +7466,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7933,7 +7823,7 @@ dependencies = [
  "ahash",
  "android-activity",
  "atomic-waker",
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "block2 0.5.1",
  "bytemuck",
  "calloop",
@@ -7990,88 +7880,6 @@ name = "wit-bindgen"
 version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-dependencies = [
- "wit-bindgen-rust-macro",
-]
-
-[[package]]
-name = "wit-bindgen-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "indexmap 2.13.0",
- "prettyplease",
- "syn 2.0.116",
- "wasm-metadata",
- "wit-bindgen-core",
- "wit-component",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn 2.0.116",
- "wit-bindgen-core",
- "wit-bindgen-rust",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
-dependencies = [
- "anyhow",
- "bitflags 2.11.0",
- "indexmap 2.13.0",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder",
- "wasm-metadata",
- "wasmparser",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap 2.13.0",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
 
 [[package]]
 name = "writeable"
@@ -8123,7 +7931,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.11.0",
+ "bitflags 2.10.0",
  "dlib",
  "log",
  "once_cell",
@@ -8167,7 +7975,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
  "synstructure",
 ]
 
@@ -8194,7 +8002,7 @@ checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -8214,7 +8022,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
  "synstructure",
 ]
 
@@ -8248,11 +8056,11 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.116",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "zmij"
-version = "1.0.21"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
diff --git a/Cargo.toml b/Cargo.toml
index 03b5cd3..eb2e720 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "3"
-members = ["jong", "jong-types", "jong-line", "jong-db"]
+members = ["jong", "jong-types", "spacetimedb"]
 
 [workspace.dependencies]
 jong = { version = "0.1.0", path = "jong" }
diff --git a/devenv.lock b/devenv.lock
index 4ccffe2..9711b70 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1771157881,
+        "lastModified": 1770666213,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "b0b3dfa70ec90fa49f672e579f186faf4f61bd4b",
+        "rev": "d4ffee46c9088df6e000470b998a2d2c16517f62",
         "type": "github"
       },
       "original": {
@@ -40,10 +40,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1770726378,
+        "lastModified": 1769939035,
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
+        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
         "type": "github"
       },
       "original": {
@@ -125,10 +125,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1771211437,
+        "lastModified": 1770606655,
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f",
+        "rev": "11a396520bf911e4ed01e78e11633d3fc63b350e",
         "type": "github"
       },
       "original": {
diff --git a/devenv.nix b/devenv.nix
index ea36f0b..36d9034 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -7,7 +7,7 @@
     # processes.lspmux.exec = "lspmux server";
     processes.spacetimedb_start.exec = "spacetime start";
     processes.spacetimedb_dev = {
-        exec = "spacetime dev --module-bindings-path jong-db/src/db jong-line --delete-data=always";
+        exec = "spacetime dev --module-bindings-path jong/src/stdb jongline --delete-data=always";
         # notify.enable = true;
         # TODO features not yet supp???
         # restart = "always";
diff --git a/jong-db/Cargo.toml b/jong-db/Cargo.toml
deleted file mode 100644
index 9e77deb..0000000
--- a/jong-db/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "jong-db"
-version = "0.1.0"
-edition = "2024"
-
-[lib]
-
-[dependencies]
-jong-types.workspace = true
-spacetimedb-sdk.workspace = true
diff --git a/jong-db/src/lib.rs b/jong-db/src/lib.rs
deleted file mode 100644
index c6f9297..0000000
--- a/jong-db/src/lib.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-pub mod db;
-pub use db::*;
-
-impl From<GameState> for jong_types::GameState {
-    fn from(value: GameState) -> Self {
-        Self::from_repr(value as usize).unwrap()
-    }
-}
-
-impl From<TurnState> for jong_types::TurnState {
-    fn from(value: TurnState) -> Self {
-        Self::from_repr(value as usize).unwrap()
-    }
-}
-
-impl From<&Tile> for jong_types::Tile {
-    fn from(value: &tile_type::Tile) -> Self {
-        Self {
-            suit: value.suit.clone().into(),
-        }
-    }
-}
-
-impl From<Suit> for jong_types::Suit {
-    fn from(value: Suit) -> Self {
-        match value {
-            Suit::Man(rank) => Self::Man(rank.into()),
-            Suit::Pin(rank) => Self::Pin(rank.into()),
-            Suit::Sou(rank) => Self::Sou(rank.into()),
-            Suit::Wind(wind) => Self::Wind(wind.into()),
-            Suit::Dragon(dragon) => Self::Dragon(dragon.into()),
-        }
-    }
-}
-
-impl From<Rank> for jong_types::Rank {
-    fn from(value: Rank) -> Self {
-        Self {
-            number: value.number,
-        }
-    }
-}
-
-impl From<Wind> for jong_types::Wind {
-    fn from(value: Wind) -> Self {
-        Self::from_repr(value as usize).unwrap()
-    }
-}
-
-impl From<Dragon> for jong_types::Dragon {
-    fn from(value: Dragon) -> Self {
-        Self::from_repr(value as usize).unwrap()
-    }
-}
diff --git a/jong-line/Cargo.toml b/jong-line/Cargo.toml
deleted file mode 100644
index 2eccaf0..0000000
--- a/jong-line/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "jong-line"
-version = "0.1.0"
-edition = "2024"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-jong-types.workspace = true
-spacetimedb.workspace = true
-log.workspace = true
diff --git a/jong-types/Cargo.toml b/jong-types/Cargo.toml
index 9b5ef99..e4d5d42 100644
--- a/jong-types/Cargo.toml
+++ b/jong-types/Cargo.toml
@@ -8,8 +8,6 @@ edition = "2024"
 [dependencies]
 bevy.workspace = true
 bevy.features = ["bevy_state"]
-
-spacetimedb.workspace = true
-
-strum.workspace = true
 derive_aliases = "0.4.7"
+spacetimedb.workspace = true
+strum.workspace = true
diff --git a/jong/Cargo.toml b/jong/Cargo.toml
index e44613d..a579d2f 100644
--- a/jong/Cargo.toml
+++ b/jong/Cargo.toml
@@ -10,30 +10,21 @@ readme = false
 [lib]
 
 [dependencies]
-# jong
 jong-types.workspace = true
-jong-db.path = "../jong-db"
 
-# bevy
-bevy.workspace = true
-bevy.features = ["default", "dynamic_linking"]
+bevy = { workspace = true, features = ["default", "dynamic_linking"] }
 bevy_ratatui.workspace = true
-
-# spacetimedb
+bevy_spacetimedb.workspace = true
+clap = { workspace = true, features = ["derive"] }
+log = { workspace = true, features = [
+  "release_max_level_error",
+  "max_level_trace",
+] }
+rand.workspace = true
+ratatui.workspace = true
 spacetimedb-sdk.workspace = true
 spacetimedb.workspace = true
-bevy_spacetimedb.workspace = true
-
-# tui
-ratatui.workspace = true
-tui-logger.workspace = true
-tui-logger.features = ["tracing-support", "crossterm"]
-
-clap.features = ["derive"]
-clap.workspace = true
-log.features = ["release_max_level_error", "max_level_trace"]
-log.workspace = true
-rand.workspace = true
 strum.workspace = true
-tracing-subscriber.workspace = true
 tracing.workspace = true
+tracing-subscriber.workspace = true
+tui-logger = { workspace = true, features = ["tracing-support", "crossterm"] }
diff --git a/jong/src/game.rs b/jong/src/game.rs
index 344d5f3..571e066 100644
--- a/jong/src/game.rs
+++ b/jong/src/game.rs
@@ -4,12 +4,15 @@ use bevy_spacetimedb::{
 };
 use spacetimedb_sdk::{DbContext, Table};
 
+use crate::stdb::{self, DbConnection, LobbyTableAccess, PlayerTableAccess, RemoteTables};
+use crate::stdb::{
+    add_bot, draw_tile, set_ready, shuffle_deal,
+    skip_call, start_game,
+};
 use crate::{
     SpacetimeDB, creds_store,
     game::hand::{Drawn, Hand, Pond},
 };
-use jong_db::{self, DbConnection, LobbyTableAccess, PlayerTableAccess, RemoteTables};
-use jong_db::{add_bot, draw_tile, set_ready, shuffle_deal, skip_call, start_game};
 use jong_types::*;
 
 pub mod hand;
@@ -105,7 +108,7 @@ pub struct TileId(pub u32);
 
 fn on_player_insert_update(
     _stdb: SpacetimeDB,
-    mut messages: ReadInsertUpdateMessage<jong_db::Player>,
+    mut messages: ReadInsertUpdateMessage<stdb::Player>,
 
     mut commands: Commands,
 
@@ -161,7 +164,7 @@ fn on_player_insert_update(
 
 fn on_lobby_insert_update(
     stdb: SpacetimeDB,
-    mut messages: ReadInsertUpdateMessage<jong_db::Lobby>,
+    mut messages: ReadInsertUpdateMessage<stdb::Lobby>,
 
     _commands: Commands,
     mut next_gamestate: ResMut<NextState<GameState>>,
@@ -179,10 +182,10 @@ fn on_lobby_insert_update(
 
         next_gamestate.set(msg.new.game_state.into());
         match msg.new.game_state {
-            jong_db::GameState::None => {
+            stdb::GameState::None => {
                 trace!("game entered none");
             }
-            jong_db::GameState::Lobby => {
+            stdb::GameState::Lobby => {
                 trace!("game entered lobby");
                 if !player.ready {
                     for _ in 0..3 {
@@ -192,31 +195,31 @@ fn on_lobby_insert_update(
                     stdb.reducers().start_game().unwrap();
                 }
             }
-            jong_db::GameState::Setup => {
+            stdb::GameState::Setup => {
                 trace!("game entered setup");
                 stdb.reducers().shuffle_deal(player.lobby_id).unwrap();
             }
-            jong_db::GameState::Deal => {
+            stdb::GameState::Deal => {
                 trace!("game entered deal");
             }
-            jong_db::GameState::Play => {
+            stdb::GameState::Play => {
                 trace!("game entered play");
                 match msg.new.turn_state {
-                    jong_db::TurnState::None => {}
-                    jong_db::TurnState::Tsumo => {
+                    stdb::TurnState::None => {}
+                    stdb::TurnState::Tsumo => {
                         stdb.reducers().draw_tile().unwrap();
                     }
-                    jong_db::TurnState::Menzen => todo!(),
-                    jong_db::TurnState::RiichiKan => todo!(),
-                    jong_db::TurnState::RonChiiPonKan => {
+                    stdb::TurnState::Menzen => todo!(),
+                    stdb::TurnState::RiichiKan => todo!(),
+                    stdb::TurnState::RonChiiPonKan => {
                         stdb.reducers().skip_call().unwrap();
                     }
-                    jong_db::TurnState::End => todo!(),
+                    stdb::TurnState::End => todo!(),
                     // _ => todo!(),
                 }
                 next_turnstate.set(msg.new.turn_state.into());
             }
-            jong_db::GameState::Exit => {
+            stdb::GameState::Exit => {
                 trace!("game enetered exit");
             }
         }
diff --git a/jong/src/lib.rs b/jong/src/lib.rs
index 1d548af..e6a3fe9 100644
--- a/jong/src/lib.rs
+++ b/jong/src/lib.rs
@@ -5,6 +5,7 @@ use bevy_spacetimedb::StdbConnection;
 use spacetimedb_sdk::credentials;
 
 pub mod game;
+pub mod stdb;
 pub mod tile;
 pub mod yakus;
 
@@ -12,9 +13,60 @@ trait EnumNextCycle {
     fn next(&self) -> Self;
 }
 
-pub type SpacetimeDB<'a> = Res<'a, StdbConnection<jong_db::DbConnection>>;
+pub type SpacetimeDB<'a> = Res<'a, StdbConnection<stdb::DbConnection>>;
 
 fn creds_store() -> credentials::File {
     credentials::File::new("jongline")
 }
 
+impl From<stdb::GameState> for jong_types::GameState {
+    fn from(value: stdb::GameState) -> Self {
+        Self::from_repr(value as usize).unwrap()
+    }
+}
+
+impl From<stdb::TurnState> for jong_types::TurnState {
+    fn from(value: stdb::TurnState) -> Self {
+        Self::from_repr(value as usize).unwrap()
+    }
+}
+
+impl From<&stdb::Tile> for jong_types::Tile {
+    fn from(value: &stdb::tile_type::Tile) -> Self {
+        Self {
+            suit: value.suit.clone().into(),
+        }
+    }
+}
+
+impl From<stdb::Suit> for jong_types::Suit {
+    fn from(value: stdb::Suit) -> Self {
+        match value {
+            stdb::Suit::Man(rank) => Self::Man(rank.into()),
+            stdb::Suit::Pin(rank) => Self::Pin(rank.into()),
+            stdb::Suit::Sou(rank) => Self::Sou(rank.into()),
+            stdb::Suit::Wind(wind) => Self::Wind(wind.into()),
+            stdb::Suit::Dragon(dragon) => Self::Dragon(dragon.into()),
+        }
+    }
+}
+
+impl From<stdb::Rank> for jong_types::Rank {
+    fn from(value: stdb::Rank) -> Self {
+        Self {
+            number: value.number,
+        }
+    }
+}
+
+impl From<stdb::Wind> for jong_types::Wind {
+    fn from(value: stdb::Wind) -> Self {
+        Self::from_repr(value as usize).unwrap()
+    }
+}
+
+impl From<stdb::Dragon> for jong_types::Dragon {
+    fn from(value: stdb::Dragon) -> Self {
+        Self::from_repr(value as usize).unwrap()
+    }
+}
diff --git a/jong-db/src/db/add_bot_reducer.rs b/jong/src/stdb/add_bot_reducer.rs
similarity index 100%
rename from jong-db/src/db/add_bot_reducer.rs
rename to jong/src/stdb/add_bot_reducer.rs
diff --git a/jong-db/src/db/bot_table.rs b/jong/src/stdb/bot_table.rs
similarity index 100%
rename from jong-db/src/db/bot_table.rs
rename to jong/src/stdb/bot_table.rs
diff --git a/jong-db/src/db/bot_type.rs b/jong/src/stdb/bot_type.rs
similarity index 100%
rename from jong-db/src/db/bot_type.rs
rename to jong/src/stdb/bot_type.rs
diff --git a/jong-db/src/db/clear_all_reducer.rs b/jong/src/stdb/clear_all_reducer.rs
similarity index 100%
rename from jong-db/src/db/clear_all_reducer.rs
rename to jong/src/stdb/clear_all_reducer.rs
diff --git a/jong-db/src/db/db_tile_type.rs b/jong/src/stdb/db_tile_type.rs
similarity index 100%
rename from jong-db/src/db/db_tile_type.rs
rename to jong/src/stdb/db_tile_type.rs
diff --git a/jong-db/src/db/db_wall_type.rs b/jong/src/stdb/db_wall_type.rs
similarity index 100%
rename from jong-db/src/db/db_wall_type.rs
rename to jong/src/stdb/db_wall_type.rs
diff --git a/jong-db/src/db/discard_tile_reducer.rs b/jong/src/stdb/discard_tile_reducer.rs
similarity index 100%
rename from jong-db/src/db/discard_tile_reducer.rs
rename to jong/src/stdb/discard_tile_reducer.rs
diff --git a/jong-db/src/db/dragon_type.rs b/jong/src/stdb/dragon_type.rs
similarity index 100%
rename from jong-db/src/db/dragon_type.rs
rename to jong/src/stdb/dragon_type.rs
diff --git a/jong-db/src/db/draw_tile_reducer.rs b/jong/src/stdb/draw_tile_reducer.rs
similarity index 100%
rename from jong-db/src/db/draw_tile_reducer.rs
rename to jong/src/stdb/draw_tile_reducer.rs
diff --git a/jong-db/src/db/game_state_type.rs b/jong/src/stdb/game_state_type.rs
similarity index 100%
rename from jong-db/src/db/game_state_type.rs
rename to jong/src/stdb/game_state_type.rs
diff --git a/jong-db/src/db/join_or_create_lobby_reducer.rs b/jong/src/stdb/join_or_create_lobby_reducer.rs
similarity index 100%
rename from jong-db/src/db/join_or_create_lobby_reducer.rs
rename to jong/src/stdb/join_or_create_lobby_reducer.rs
diff --git a/jong-db/src/db/lobby_table.rs b/jong/src/stdb/lobby_table.rs
similarity index 100%
rename from jong-db/src/db/lobby_table.rs
rename to jong/src/stdb/lobby_table.rs
diff --git a/jong-db/src/db/lobby_type.rs b/jong/src/stdb/lobby_type.rs
similarity index 100%
rename from jong-db/src/db/lobby_type.rs
rename to jong/src/stdb/lobby_type.rs
diff --git a/jong-db/src/db/login_or_add_player_reducer.rs b/jong/src/stdb/login_or_add_player_reducer.rs
similarity index 100%
rename from jong-db/src/db/login_or_add_player_reducer.rs
rename to jong/src/stdb/login_or_add_player_reducer.rs
diff --git a/jong-db/src/db/mod.rs b/jong/src/stdb/mod.rs
similarity index 100%
rename from jong-db/src/db/mod.rs
rename to jong/src/stdb/mod.rs
diff --git a/jong-db/src/db/player_or_bot_type.rs b/jong/src/stdb/player_or_bot_type.rs
similarity index 100%
rename from jong-db/src/db/player_or_bot_type.rs
rename to jong/src/stdb/player_or_bot_type.rs
diff --git a/jong-db/src/db/player_table.rs b/jong/src/stdb/player_table.rs
similarity index 100%
rename from jong-db/src/db/player_table.rs
rename to jong/src/stdb/player_table.rs
diff --git a/jong-db/src/db/player_type.rs b/jong/src/stdb/player_type.rs
similarity index 100%
rename from jong-db/src/db/player_type.rs
rename to jong/src/stdb/player_type.rs
diff --git a/jong-db/src/db/rank_type.rs b/jong/src/stdb/rank_type.rs
similarity index 100%
rename from jong-db/src/db/rank_type.rs
rename to jong/src/stdb/rank_type.rs
diff --git a/jong-db/src/db/set_ready_reducer.rs b/jong/src/stdb/set_ready_reducer.rs
similarity index 100%
rename from jong-db/src/db/set_ready_reducer.rs
rename to jong/src/stdb/set_ready_reducer.rs
diff --git a/jong-db/src/db/shuffle_deal_reducer.rs b/jong/src/stdb/shuffle_deal_reducer.rs
similarity index 100%
rename from jong-db/src/db/shuffle_deal_reducer.rs
rename to jong/src/stdb/shuffle_deal_reducer.rs
diff --git a/jong-db/src/db/skip_call_reducer.rs b/jong/src/stdb/skip_call_reducer.rs
similarity index 100%
rename from jong-db/src/db/skip_call_reducer.rs
rename to jong/src/stdb/skip_call_reducer.rs
diff --git a/jong-db/src/db/start_game_reducer.rs b/jong/src/stdb/start_game_reducer.rs
similarity index 100%
rename from jong-db/src/db/start_game_reducer.rs
rename to jong/src/stdb/start_game_reducer.rs
diff --git a/jong-db/src/db/suit_type.rs b/jong/src/stdb/suit_type.rs
similarity index 100%
rename from jong-db/src/db/suit_type.rs
rename to jong/src/stdb/suit_type.rs
diff --git a/jong-db/src/db/tile_table.rs b/jong/src/stdb/tile_table.rs
similarity index 100%
rename from jong-db/src/db/tile_table.rs
rename to jong/src/stdb/tile_table.rs
diff --git a/jong-db/src/db/tile_type.rs b/jong/src/stdb/tile_type.rs
similarity index 100%
rename from jong-db/src/db/tile_type.rs
rename to jong/src/stdb/tile_type.rs
diff --git a/jong-db/src/db/turn_state_type.rs b/jong/src/stdb/turn_state_type.rs
similarity index 100%
rename from jong-db/src/db/turn_state_type.rs
rename to jong/src/stdb/turn_state_type.rs
diff --git a/jong-db/src/db/wall_table.rs b/jong/src/stdb/wall_table.rs
similarity index 100%
rename from jong-db/src/db/wall_table.rs
rename to jong/src/stdb/wall_table.rs
diff --git a/jong-db/src/db/wind_type.rs b/jong/src/stdb/wind_type.rs
similarity index 100%
rename from jong-db/src/db/wind_type.rs
rename to jong/src/stdb/wind_type.rs
diff --git a/jong/src/tui.rs b/jong/src/tui.rs
index f58fb51..4c6c664 100644
--- a/jong/src/tui.rs
+++ b/jong/src/tui.rs
@@ -9,6 +9,7 @@ use jong::game::player::MainPlayer;
 use tui_logger::TuiWidgetState;
 
 use crate::tui::{input::ConfirmSelect, states::ConsoleWidget};
+use jong::stdb::{self, discard_tile as _};
 use jong::{
     SpacetimeDB,
     game::{
@@ -16,7 +17,6 @@ use jong::{
         player::{CurrentPlayer, Player},
     },
 };
-use jong_db::{self, discard_tile as _};
 use jong_types::{GameState, TurnState};
 
 mod input;
diff --git a/jong/src/tui/input/keyboard.rs b/jong/src/tui/input/keyboard.rs
index 3e75e64..722d6fb 100644
--- a/jong/src/tui/input/keyboard.rs
+++ b/jong/src/tui/input/keyboard.rs
@@ -1,9 +1,9 @@
 use bevy::prelude::*;
 use bevy_ratatui::crossterm::event::KeyCode;
 use bevy_ratatui::event::KeyMessage;
-use jong_db::PlayerTableAccess;
-use jong_db::join_or_create_lobby;
-use jong_db::start_game;
+use jong::stdb::PlayerTableAccess;
+use jong::stdb::join_or_create_lobby;
+use jong::stdb::start_game;
 use tui_logger::TuiWidgetEvent;
 
 use jong::SpacetimeDB;
diff --git a/justfile b/justfile
index 1e14034..da1758e 100644
--- a/justfile
+++ b/justfile
@@ -4,11 +4,16 @@ alias rt := run-tui
 alias s := spacetime
 alias g := spacetime_generate-bindings
 
+rrt:
+    just spacetime_restart_dev
+    sleep 3sec
+    just run-tui
+
 default:
     just --list
 
 run-tui:
-    spacetime call jong-line "clear_all"
+    spacetime call jongline "clear_all"
     cargo run -- run-tui
 
 update:
@@ -19,16 +24,11 @@ spacetime:
     devenv up
 
 spacetime_dev:
-    spacetime dev --module-bindings-path jong-db/src/db jong-line --delete-data=always
+    spacetime dev --module-bindings-path jong/src/stdb jongline --delete-data=always
 
 spacetime_generate-bindings:
-    spacetime generate --lang rust --out-dir jong-db/src/db --project-path jong-line
+    spacetime generate --lang rust --out-dir jong/src/stdb --project-path spacetimedb
 
 spacetime_restart_dev:
     mprocs -s localhost:4050 --ctl $"({c: restart-proc, name: spacetimedb_dev} | to yaml)"
     
-rrt:
-    just spacetime_restart_dev
-    sleep 3sec
-    just run-tui
-
diff --git a/spacetimedb/Cargo.toml b/spacetimedb/Cargo.toml
new file mode 100644
index 0000000..60070ef
--- /dev/null
+++ b/spacetimedb/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "jongline"
+version = "0.1.0"
+edition = "2024"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+spacetimedb = { workspace = true }
+log = { workspace = true }
+jong-types = { workspace = true }
diff --git a/jong-line/src/lib.rs b/spacetimedb/src/lib.rs
similarity index 100%
rename from jong-line/src/lib.rs
rename to spacetimedb/src/lib.rs
diff --git a/jong-line/src/reducers/game.rs b/spacetimedb/src/reducers/game.rs
similarity index 100%
rename from jong-line/src/reducers/game.rs
rename to spacetimedb/src/reducers/game.rs
diff --git a/jong-line/src/reducers/game/bot.rs b/spacetimedb/src/reducers/game/bot.rs
similarity index 100%
rename from jong-line/src/reducers/game/bot.rs
rename to spacetimedb/src/reducers/game/bot.rs
diff --git a/jong-line/src/reducers/game/deal.rs b/spacetimedb/src/reducers/game/deal.rs
similarity index 100%
rename from jong-line/src/reducers/game/deal.rs
rename to spacetimedb/src/reducers/game/deal.rs
diff --git a/jong-line/src/reducers/game/hand.rs b/spacetimedb/src/reducers/game/hand.rs
similarity index 100%
rename from jong-line/src/reducers/game/hand.rs
rename to spacetimedb/src/reducers/game/hand.rs
diff --git a/jong-line/src/tables.rs b/spacetimedb/src/tables.rs
similarity index 100%
rename from jong-line/src/tables.rs
rename to spacetimedb/src/tables.rs
diff --git a/jong-line/src/tables/player.rs b/spacetimedb/src/tables/player.rs
similarity index 100%
rename from jong-line/src/tables/player.rs
rename to spacetimedb/src/tables/player.rs