diff --git a/.cargo/config.toml b/.cargo/config.toml
index c96af2ee..7268f091 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -5,8 +5,8 @@ rustflags = ["-C", "link-arg=-fuse-ld=/usr/bin/mold"]
 [unstable]
 codegen-backend = true
 
-[profile.dev]
-codegen-backend = "cranelift"
+# [profile.dev]
+# codegen-backend = "cranelift"
 
 [profile.dev.package."*"]
 codegen-backend = "llvm"
diff --git a/Cargo.lock b/Cargo.lock
index ebbb2185..59844e3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -85,109 +85,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
-[[package]]
-name = "aead"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
-dependencies = [
- "crypto-common",
- "generic-array",
-]
-
-[[package]]
-name = "aeronet_io"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d50ca460ea143f90a3c1ecf36709b9cbb49752d5ddfbf2d67623b465fbfb81"
-dependencies = [
- "anyhow",
- "bevy_app",
- "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
- "bytes",
- "derive_more",
- "log",
-]
-
-[[package]]
-name = "aeronet_steam"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c9fea14c3de9d1f8c4cb7bdd8be3e304ae4a45be9f3a8c02008b033165df976"
-dependencies = [
- "aeronet_io",
- "anyhow",
- "bevy_app",
- "bevy_ecs",
- "bevy_platform",
- "blocking",
- "bytes",
- "derive_more",
- "oneshot",
- "steamworks",
- "sync_wrapper",
- "tracing",
-]
-
-[[package]]
-name = "aeronet_websocket"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab40ded6412a153f6e189620251f44cb74dc43a218eddea9f4fe4ba55a72e763"
-dependencies = [
- "aeronet_io",
- "bevy_app",
- "bevy_ecs",
- "bevy_platform",
- "bytes",
- "cfg-if",
- "derive_more",
- "futures",
- "js-sys",
- "rcgen",
- "rustls",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls",
- "tokio-tungstenite",
- "tracing",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "aeronet_webtransport"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4243f8320cca7bf4ce0e1e41aea4553007279685e181e3d566325260a49822"
-dependencies = [
- "aeronet_io",
- "base64 0.22.1",
- "bevy_app",
- "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
- "bytes",
- "cfg-if",
- "derive_more",
- "futures",
- "gloo-timers",
- "js-sys",
- "spki",
- "tokio",
- "tracing",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wtransport",
- "x509-cert",
- "xwt-core",
- "xwt-web",
- "xwt-wtransport",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -342,45 +239,6 @@ dependencies = [
  "libloading",
 ]
 
-[[package]]
-name = "asn1-rs"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60"
-dependencies = [
- "asn1-rs-derive",
- "asn1-rs-impl",
- "displaydoc",
- "nom",
- "num-traits",
- "rusticata-macros",
- "thiserror 2.0.18",
- "time",
-]
-
-[[package]]
-name = "asn1-rs-derive"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "asn1-rs-impl"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "assert_type_match"
 version = "0.1.1"
@@ -517,29 +375,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
-[[package]]
-name = "avian2d"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060ae40aced85ed01296f556ed1909fcafe81a5e5059889bed126339ccd55b43"
-dependencies = [
- "approx",
- "arrayvec",
- "avian_derive",
- "bevy",
- "bevy_heavy",
- "bevy_math",
- "bevy_transform_interpolation",
- "bitflags 2.11.0",
- "derive_more",
- "disqualified",
- "glam_matrix_extras",
- "itertools 0.13.0",
- "slab",
- "smallvec",
- "thiserror 2.0.18",
-]
-
 [[package]]
 name = "avian3d"
 version = "0.5.0"
@@ -592,34 +427,6 @@ dependencies = [
  "bevy_rerecast_core",
 ]
 
-[[package]]
-name = "aws-lc-rs"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a7b350e3bb1767102698302bc37256cbd48422809984b98d292c40e2579aa9"
-dependencies = [
- "aws-lc-sys",
- "zeroize",
-]
-
-[[package]]
-name = "aws-lc-sys"
-version = "0.37.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549"
-dependencies = [
- "cc",
- "cmake",
- "dunce",
- "fs_extra",
-]
-
-[[package]]
-name = "az"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be5eb007b7cacc6c660343e96f650fedf4b5a77512399eb952ca6642cf8d13f7"
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -638,17 +445,11 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "base64ct"
-version = "1.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
-
 [[package]]
 name = "bevy"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec689b5a79452b6f777b889bbff22d3216b82a8d2ab7814d4a0eb571e9938d97"
+checksum = "1fd310426290cec560221f9750c2f4484be4a8eeea7de3483c423329b465c40e"
 dependencies = [
  "bevy_dylib",
  "bevy_internal",
@@ -1153,32 +954,6 @@ dependencies = [
  "encase_derive_impl",
 ]
 
-[[package]]
-name = "bevy_enhanced_input"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5e4981e85546349e7ccce7e68aaf9c36e6eed556f7f29087dee184ee7941fb9"
-dependencies = [
- "bevy",
- "bevy_enhanced_input_macros",
- "bitflags 2.11.0",
- "log",
- "serde",
- "smallvec",
- "variadics_please",
-]
-
-[[package]]
-name = "bevy_enhanced_input_macros"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4680cc23f335f1b768caf91a94b1aa1d786149788644043fe8d49e5708b5cbcc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "bevy_gilrs"
 version = "0.18.0"
@@ -2290,10 +2065,20 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
 dependencies = [
+ "bincode_derive",
  "serde",
  "unty",
 ]
 
+[[package]]
+name = "bincode_derive"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09"
+dependencies = [
+ "virtue",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.72.1"
@@ -2363,15 +2148,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "block2"
 version = "0.5.1"
@@ -2457,10 +2233,6 @@ name = "bytes"
 version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
-dependencies = [
- "portable-atomic",
- "serde",
-]
 
 [[package]]
 name = "calloop"
@@ -2533,54 +2305,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
-[[package]]
-name = "chacha20"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "chacha20poly1305"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
-dependencies = [
- "aead",
- "chacha20",
- "cipher",
- "poly1305",
- "zeroize",
-]
-
-[[package]]
-name = "chrono"
-version = "0.4.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-link 0.2.1",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
- "zeroize",
-]
-
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -2607,7 +2331,7 @@ dependencies = [
  "bevy_skein",
  "dirs",
  "game_core",
- "lightyear",
+ "netvy",
  "rand",
  "serde",
  "serde_json",
@@ -2624,15 +2348,6 @@ dependencies = [
  "error-code",
 ]
 
-[[package]]
-name = "cmake"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.12.0"
@@ -2680,12 +2395,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
 
-[[package]]
-name = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
 [[package]]
 name = "const_panic"
 version = "0.2.15"
@@ -2958,17 +2667,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
-[[package]]
-name = "crypto-common"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
-dependencies = [
- "generic-array",
- "rand_core 0.6.4",
- "typenum",
-]
-
 [[package]]
 name = "ctrlc"
 version = "3.5.1"
@@ -2986,20 +2684,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
 
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
 [[package]]
 name = "dasp_sample"
 version = "0.11.0"
@@ -3012,53 +2696,6 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
 
-[[package]]
-name = "der"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
-dependencies = [
- "const-oid",
- "der_derive",
- "flagset",
- "pem-rfc7468",
- "zeroize",
-]
-
-[[package]]
-name = "der-parser"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6"
-dependencies = [
- "asn1-rs",
- "displaydoc",
- "nom",
- "num-bigint",
- "num-traits",
- "rusticata-macros",
-]
-
-[[package]]
-name = "der_derive"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "deranged"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2163a0e204a148662b6b6816d4b5d5668a5f2f8df498ccbd5cd0e864e78fecba"
-dependencies = [
- "powerfmt",
-]
-
 [[package]]
 name = "derive_more"
 version = "2.1.1"
@@ -3083,20 +2720,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "digest"
-version = "0.10.7"
+name = "dirs"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "dirs"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
 dependencies = [
  "dirs-sys",
 ]
@@ -3137,17 +2764,6 @@ dependencies = [
  "objc2 0.6.3",
 ]
 
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "disqualified"
 version = "1.0.0"
@@ -3206,30 +2822,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
-[[package]]
-name = "dunce"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
-
-[[package]]
-name = "dyn-eq"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c2d035d21af5cde1a6f5c7b444a5bf963520a9f142e5d06931178433d7d5388"
-
-[[package]]
-name = "dyn-hash"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fdab65db9274e0168143841eb8f864a0a21f8b1b8d2ba6812bbe6024346e99e"
-
 [[package]]
 name = "earcutr"
 version = "0.4.3"
@@ -3331,24 +2923,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "endian-type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
-
-[[package]]
-name = "enum_dispatch"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
-dependencies = [
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "enumn"
 version = "0.1.14"
@@ -3497,31 +3071,12 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
-[[package]]
-name = "fixed"
-version = "1.30.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c566da967934c6c7ee0458a9773de9b2a685bd2ce26a3b28ddfc740e640182f5"
-dependencies = [
- "az",
- "bytemuck",
- "half",
- "serde",
- "typenum",
-]
-
 [[package]]
 name = "fixedbitset"
 version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
-[[package]]
-name = "flagset"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
-
 [[package]]
 name = "flate2"
 version = "1.1.9"
@@ -3629,21 +3184,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
 
-[[package]]
-name = "form_urlencoded"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
 [[package]]
 name = "fsevent-sys"
 version = "4.1.0"
@@ -3653,21 +3193,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "futures"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-channel"
 version = "0.3.32"
@@ -3675,7 +3200,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
- "futures-sink",
 ]
 
 [[package]]
@@ -3684,17 +3208,6 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
-[[package]]
-name = "futures-executor"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-io"
 version = "0.3.32"
@@ -3725,37 +3238,21 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "futures-sink"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
-
 [[package]]
 name = "futures-task"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-
 [[package]]
 name = "futures-util"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
- "futures-channel",
  "futures-core",
- "futures-io",
  "futures-macro",
- "futures-sink",
  "futures-task",
- "memchr",
  "pin-project-lite",
  "slab",
 ]
@@ -3780,23 +3277,13 @@ dependencies = [
  "bevy_landmass",
  "bevy_rerecast",
  "landmass_rerecast",
- "lightyear",
+ "netvy",
  "rand",
  "serde",
  "serde_json",
  "shared",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "geo"
 version = "0.31.0"
@@ -3854,10 +3341,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -4053,18 +3538,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
-[[package]]
-name = "gloo-timers"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "glow"
 version = "0.16.0"
@@ -4125,29 +3598,6 @@ dependencies = [
  "gl_generator",
 ]
 
-[[package]]
-name = "governor"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9efcab3c1958580ff1f25a2a41be1668f7603d849bb63af523b208a3cc1223b8"
-dependencies = [
- "cfg-if",
- "dashmap",
- "futures-sink",
- "futures-timer",
- "futures-util",
- "getrandom 0.3.4",
- "hashbrown 0.16.1",
- "nonzero_ext",
- "parking_lot",
- "portable-atomic",
- "quanta",
- "rand",
- "smallvec",
- "spinning_top",
- "web-time",
-]
-
 [[package]]
 name = "gpu-alloc"
 version = "0.6.0"
@@ -4249,12 +3699,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
 [[package]]
 name = "hashbrown"
 version = "0.15.5"
@@ -4272,7 +3716,6 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
- "allocator-api2",
  "equivalent",
  "foldhash 0.2.0",
  "serde",
@@ -4335,12 +3778,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 
-[[package]]
-name = "httlib-huffman"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9fcbcc408c5526c3ab80d534e5c86e7967c1fb7aa0a8c76abd1edc27deb877"
-
 [[package]]
 name = "http"
 version = "1.4.0"
@@ -4450,138 +3887,12 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35e6d558e6d4c7b82bc51d9c771e7a927862a161a7d87bf2b0541450e0e20915"
 
-[[package]]
-name = "iana-time-zone"
-version = "0.1.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "log",
- "wasm-bindgen",
- "windows-core 0.62.2",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "icu_collections"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
-dependencies = [
- "displaydoc",
- "potential_utf",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locale_core"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
-dependencies = [
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
-
-[[package]]
-name = "icu_properties"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
-dependencies = [
- "icu_collections",
- "icu_locale_core",
- "icu_properties_data",
- "icu_provider",
- "zerotrie",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
-
-[[package]]
-name = "icu_provider"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
-dependencies = [
- "displaydoc",
- "icu_locale_core",
- "writeable",
- "yoke",
- "zerofrom",
- "zerotrie",
- "zerovec",
-]
-
 [[package]]
 name = "id-arena"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
-[[package]]
-name = "idna"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
 [[package]]
 name = "image"
 version = "0.25.9"
@@ -4636,15 +3947,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "inout"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "inventory"
 version = "0.3.22"
@@ -4822,34 +4124,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "leafwing-input-manager"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed83d1d7334e742aab3409782cdbb2bc96cc017df9ff342dd5aeb80eed1b784"
-dependencies = [
- "bevy",
- "dyn-clone",
- "dyn-eq",
- "dyn-hash",
- "itertools 0.14.0",
- "leafwing_input_manager_macros",
- "serde",
- "serde_flexitos",
-]
-
-[[package]]
-name = "leafwing_input_manager_macros"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2226cb83129176a6c634f2ce0828c2c29896ea0898fc198636f98696b8056890"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "leb128fmt"
 version = "0.1.0"
@@ -4911,658 +4185,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "lightyear"
-version = "0.26.4"
+name = "linebender_resource_handle"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be51d4b8fe01a81efe7b0e53f1d5577719a507ca3bbd40cadcbf3ccaea82030d"
-dependencies = [
- "aeronet_io",
- "bevy_app",
- "bevy_ecs",
- "console_error_panic_hook",
- "document-features",
- "lightyear_aeronet",
- "lightyear_avian2d",
- "lightyear_avian3d",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_frame_interpolation",
- "lightyear_inputs",
- "lightyear_inputs_bei",
- "lightyear_inputs_leafwing",
- "lightyear_inputs_native",
- "lightyear_interpolation",
- "lightyear_link",
- "lightyear_messages",
- "lightyear_metrics",
- "lightyear_netcode",
- "lightyear_prediction",
- "lightyear_raw_connection",
- "lightyear_replication",
- "lightyear_serde",
- "lightyear_steam",
- "lightyear_sync",
- "lightyear_transport",
- "lightyear_udp",
- "lightyear_ui",
- "lightyear_utils",
- "lightyear_web",
- "lightyear_websocket",
- "lightyear_webtransport",
- "serde",
- "thiserror 2.0.18",
- "tracing",
-]
+checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
 
 [[package]]
-name = "lightyear_aeronet"
-version = "0.26.4"
+name = "linux-raw-sys"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a8e7f2b66a63bba410403708bf9c98a7c8e0834a0a069db010e63e669e6735b"
-dependencies = [
- "aeronet_io",
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "lightyear_core",
- "lightyear_link",
- "tracing",
-]
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
-name = "lightyear_avian2d"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3229fb076a2750bcf41037c6af553a8cb1dc59e3cdd1f7c8e0d6ae7cd855dc03"
-dependencies = [
- "avian2d",
- "bevy_app",
- "bevy_ecs",
- "bevy_math",
- "bevy_time",
- "bevy_transform",
- "bevy_utils",
- "lightyear_core",
- "lightyear_frame_interpolation",
- "lightyear_interpolation",
- "lightyear_link",
- "lightyear_prediction",
- "lightyear_replication",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_avian3d"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca582724703dccafe64991bbe0d480e616de7e1056b07cd9c6862a48196b9ce0"
-dependencies = [
- "avian3d",
- "bevy_app",
- "bevy_ecs",
- "bevy_math",
- "bevy_time",
- "bevy_transform",
- "bevy_utils",
- "lightyear_core",
- "lightyear_frame_interpolation",
- "lightyear_interpolation",
- "lightyear_link",
- "lightyear_prediction",
- "lightyear_replication",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_connection"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad7fa5c7b928074895a56e96d0154e78cbc4e751f37e1a9b0b5fda469eb28c74"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
- "bytes",
- "lightyear_core",
- "lightyear_link",
- "lightyear_serde",
- "serde",
- "smallvec",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_core"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a310d13cb0059fd20f59ec60b24056403ffc2388daabbc663c8eb1d4a08ddf4"
-dependencies = [
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
- "bevy_time",
- "chrono",
- "fixed",
- "lightyear_serde",
- "lightyear_utils",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_frame_interpolation"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66ce32814bfcd07d1b694443dd988d3e842976e87223ec48fc18283e8e0046ab"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_time",
- "bevy_transform",
- "bevy_utils",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_interpolation",
- "lightyear_replication",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_inputs"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4bbfad8e59fbd0d569a2e359be47a7a1b28fc8e494ae124eb2b5efbec54b8e2"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
- "bevy_utils",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_link",
- "lightyear_messages",
- "lightyear_prediction",
- "lightyear_replication",
- "lightyear_sync",
- "lightyear_transport",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_inputs_bei"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2266633e2eeebfe5fcd5d3cea8984bc26b24b13942fd9c1aa9123da4de6c1a02"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_enhanced_input",
- "bevy_reflect",
- "bevy_utils",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_inputs",
- "lightyear_link",
- "lightyear_messages",
- "lightyear_replication",
- "lightyear_serde",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_inputs_leafwing"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2cfbd794d8a42f06796acc6b8d4274d3fb53cd58f480881d2dd59176f076e49"
-dependencies = [
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_input",
- "bevy_math",
- "bevy_platform",
- "bevy_reflect",
- "bevy_utils",
- "leafwing-input-manager",
- "lightyear_core",
- "lightyear_inputs",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_inputs_native"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c992924e07b463528f34987fbd6b2248f37a66cfd41757dd9b9f8b5085765cdc"
-dependencies = [
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_reflect",
- "lightyear_core",
- "lightyear_inputs",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_interpolation"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4545cb52f0232da161dd93836e5b4f23816850330ef322ba6bd3abba2a20f21"
-dependencies = [
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_math",
- "bevy_platform",
- "bevy_reflect",
- "bevy_time",
- "bevy_utils",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_messages",
- "lightyear_replication",
- "lightyear_serde",
- "lightyear_sync",
- "lightyear_utils",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_link"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ede74a86374f21606be56aaf1c1bf9dd333f473866bd780ab449653f0caca24"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_utils",
- "bytes",
- "lightyear_core",
- "lightyear_utils",
- "rand",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_messages"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1141fb3d9895f5c9e8aa5d723d9b9bf9db800fd044ba8c8b542ac660beeab47"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_utils",
- "bytes",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_link",
- "lightyear_serde",
- "lightyear_transport",
- "lightyear_utils",
- "serde",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_metrics"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3264ac1729043c949bf2c9526bfa712a1c7e683e4e0034ce7cac0f233c19db"
-dependencies = [
- "bevy_app",
- "bevy_color",
- "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
- "bevy_text",
- "bevy_time",
- "bevy_ui",
- "bevy_utils",
- "metrics",
- "metrics-util",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_netcode"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db834d08f6826a2c25c9a355a33bb0db036da2da98b5f43b3982e6b5c41a0f4e"
-dependencies = [
- "aeronet_io",
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_time",
- "bytes",
- "chacha20poly1305",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_link",
- "lightyear_serde",
- "lightyear_transport",
- "lightyear_utils",
- "no_std_io2",
- "rand",
- "thiserror 2.0.18",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "lightyear_prediction"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ddda7d875590a2f91c082dd339507b79eb3221661f50fca18e6c2fdafbcc6c"
-dependencies = [
- "bevy_app",
- "bevy_derive",
- "bevy_diagnostic",
- "bevy_ecs",
- "bevy_math",
- "bevy_platform",
- "bevy_reflect",
- "bevy_time",
- "bevy_utils",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_frame_interpolation",
- "lightyear_interpolation",
- "lightyear_messages",
- "lightyear_replication",
- "lightyear_sync",
- "lightyear_utils",
- "parking_lot",
- "seahash",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_raw_connection"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "631b5527b4f11d1e199f823ecdcd02585136fc55dd3261d5280e03bbcc29cdd3"
-dependencies = [
- "aeronet_io",
- "bevy_app",
- "bevy_ecs",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_link",
- "lightyear_transport",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_replication"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a451536b73e618035472548e8d7f1af51e193649f556318f7836ddc70e6f73d2"
-dependencies = [
- "avian2d",
- "avian3d",
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_math",
- "bevy_platform",
- "bevy_ptr",
- "bevy_reflect",
- "bevy_time",
- "bevy_transform",
- "bevy_utils",
- "bytes",
- "dashmap",
- "indexmap",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_link",
- "lightyear_messages",
- "lightyear_serde",
- "lightyear_sync",
- "lightyear_transport",
- "lightyear_utils",
- "seahash",
- "serde",
- "smallvec",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_serde"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c00dfe55ea4ba8413424616564b36c64d404fe9f5c68e4d71c4a97193da3d6e"
-dependencies = [
- "bevy_derive",
- "bevy_ecs",
- "bevy_platform",
- "bevy_ptr",
- "bevy_reflect",
- "bevy_utils",
- "bincode",
- "bytes",
- "no_std_io2",
- "serde",
- "thiserror 2.0.18",
- "tracing",
- "variadics_please",
-]
-
-[[package]]
-name = "lightyear_steam"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b513c7aaeeaee3fbfe82e4ab7698cc3360d42526d167054af357920a166566"
-dependencies = [
- "aeronet_io",
- "aeronet_steam",
- "bevy_app",
- "bevy_ecs",
- "lightyear_aeronet",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_link",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_sync"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "834af4e025c9d7954c9684d82255e5ed639e0ce4482e3c674582687ce1f2dbfd"
-dependencies = [
- "bevy_app",
- "bevy_derive",
- "bevy_diagnostic",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_time",
- "bevy_utils",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_link",
- "lightyear_messages",
- "lightyear_serde",
- "lightyear_transport",
- "lightyear_utils",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_transport"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "272b66fae233f66887cbef40c30d2a7673d299d327a9fdd2becbd3b2ae59336b"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
- "bevy_time",
- "bevy_utils",
- "bytes",
- "crossbeam-channel",
- "enum_dispatch",
- "governor",
- "indexmap",
- "lightyear_connection",
- "lightyear_core",
- "lightyear_link",
- "lightyear_serde",
- "lightyear_utils",
- "nonzero_ext",
- "ringbuffer",
- "serde",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_udp"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "367cdb2e11ac6448bec036a26ce1aa7a97a695e1a50a28e2d3d4e3f8ae34c670"
-dependencies = [
- "aeronet_io",
- "bevy_app",
- "bevy_ecs",
- "bevy_platform",
- "bytes",
- "lightyear_core",
- "lightyear_link",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_ui"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd20cb05463553dd19006a2e318b86b2afb6db8e9e8e46931fc6592d8069e3c2"
-dependencies = [
- "bevy_app",
- "bevy_color",
- "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
- "bevy_text",
- "bevy_time",
- "bevy_ui",
- "bevy_utils",
- "lightyear_metrics",
- "metrics",
- "metrics-util",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_utils"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9a54a63441f9001dc834fc8e6b4bb23eeb8f6b2ef28db8c65b4bfbf9496b139"
-dependencies = [
- "bevy_ecs",
- "bevy_platform",
- "bevy_reflect",
- "bevy_utils",
- "hashbrown 0.16.1",
- "paste",
- "seahash",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_web"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72450d46e6c5052c174e3723e14fd78726ffca7e00e64b6f9342cdd642621eb6"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_winit",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "lightyear_websocket"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e5ee75b46e0be8f9e746f1b53464376715d400fbddb4a3faf8fb348eec2919"
-dependencies = [
- "aeronet_io",
- "aeronet_websocket",
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "lightyear_aeronet",
- "lightyear_link",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "lightyear_webtransport"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c100a3f88ced77327f04ab3e583ecca627e53d93031c5aaf7c2260d6c9faf25"
-dependencies = [
- "aeronet_io",
- "aeronet_webtransport",
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "lightyear_aeronet",
- "lightyear_link",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "linebender_resource_handle"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.11.0"
+name = "linux-raw-sys"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
-[[package]]
-name = "litemap"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
-
 [[package]]
 name = "litrs"
 version = "1.0.0"
@@ -5584,12 +4223,6 @@ version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
-[[package]]
-name = "lru-slab"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
-
 [[package]]
 name = "mach2"
 version = "0.4.3"
@@ -5657,36 +4290,6 @@ dependencies = [
  "paste",
 ]
 
-[[package]]
-name = "metrics"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8"
-dependencies = [
- "ahash",
- "portable-atomic",
-]
-
-[[package]]
-name = "metrics-util"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdfb1365fea27e6dd9dc1dbc19f570198bc86914533ad639dae939635f096be4"
-dependencies = [
- "aho-corasick",
- "crossbeam-epoch",
- "crossbeam-utils",
- "hashbrown 0.16.1",
- "indexmap",
- "metrics",
- "ordered-float",
- "quanta",
- "radix_trie",
- "rand",
- "rand_xoshiro",
- "sketches-ddsketch",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -5867,12 +4470,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "nibble_vec"
+name = "netvy"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
 dependencies = [
- "smallvec",
+ "bevy",
+ "bincode",
+ "serde",
 ]
 
 [[package]]
@@ -5887,15 +4490,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "no_std_io2"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b51ed7824b6e07d354605f4abb3d9d300350701299da96642ee084f5ce631550"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
@@ -5918,12 +4512,6 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
 
-[[package]]
-name = "nonzero_ext"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
-
 [[package]]
 name = "normpath"
 version = "1.5.0"
@@ -6011,12 +4599,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "num-conv"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
-
 [[package]]
 name = "num-derive"
 version = "0.4.2"
@@ -6393,12 +4975,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "octets"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba5d98c13e549f6f26f7d70808688ab85c6b42eb350ba2524d96c24ebde27e9"
-
 [[package]]
 name = "offset-allocator"
 version = "0.2.0"
@@ -6418,33 +4994,12 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "oid-registry"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7"
-dependencies = [
- "asn1-rs",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
-[[package]]
-name = "oneshot"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "269bca4c2591a28585d6bf10d9ed0332b7d76900a1b02bec41bdc3a2cdcda107"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
-
 [[package]]
 name = "opener"
 version = "0.8.4"
@@ -6456,12 +5011,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "openssl-probe"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -6592,31 +5141,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
-[[package]]
-name = "pastey"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec"
-
-[[package]]
-name = "pem"
-version = "3.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
-dependencies = [
- "base64 0.22.1",
- "serde_core",
-]
-
-[[package]]
-name = "pem-rfc7468"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
-dependencies = [
- "base64ct",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -6712,17 +5236,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "poly1305"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
-dependencies = [
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
 [[package]]
 name = "portable-atomic"
 version = "1.13.1"
@@ -6738,21 +5251,6 @@ dependencies = [
  "portable-atomic",
 ]
 
-[[package]]
-name = "potential_utf"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
-dependencies = [
- "zerovec",
-]
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
 [[package]]
 name = "pp-rs"
 version = "0.2.1"
@@ -6834,27 +5332,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
 
 [[package]]
-name = "pxfm"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "quanta"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
-dependencies = [
- "crossbeam-utils",
- "libc",
- "once_cell",
- "raw-cpuid",
- "wasi",
- "web-sys",
- "winapi",
+name = "pxfm"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
+dependencies = [
+ "num-traits",
 ]
 
 [[package]]
@@ -6872,61 +5355,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "quinn"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
-dependencies = [
- "bytes",
- "cfg_aliases",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash 2.1.1",
- "rustls",
- "socket2 0.6.2",
- "thiserror 2.0.18",
- "tokio",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
-dependencies = [
- "bytes",
- "getrandom 0.3.4",
- "lru-slab",
- "rand",
- "ring",
- "rustc-hash 2.1.1",
- "rustls",
- "rustls-pki-types",
- "slab",
- "thiserror 2.0.18",
- "tinyvec",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
-dependencies = [
- "cfg_aliases",
- "libc",
- "once_cell",
- "socket2 0.6.2",
- "tracing",
- "windows-sys 0.60.2",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.44"
@@ -6942,16 +5370,6 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
-[[package]]
-name = "radix_trie"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
-dependencies = [
- "endian-type",
- "nibble_vec",
-]
-
 [[package]]
 name = "radsort"
 version = "0.1.1"
@@ -6965,7 +5383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha",
- "rand_core 0.9.5",
+ "rand_core",
 ]
 
 [[package]]
@@ -6975,16 +5393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.5",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.17",
+ "rand_core",
 ]
 
 [[package]]
@@ -7012,16 +5421,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b48ac3f7ffaab7fac4d2376632268aa5f89abdb55f7ebf8f4d11fffccb2320f7"
 dependencies = [
- "rand_core 0.9.5",
-]
-
-[[package]]
-name = "rand_xoshiro"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41"
-dependencies = [
- "rand_core 0.9.5",
+ "rand_core",
 ]
 
 [[package]]
@@ -7036,15 +5436,6 @@ version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68"
 
-[[package]]
-name = "raw-cpuid"
-version = "11.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
-dependencies = [
- "bitflags 2.11.0",
-]
-
 [[package]]
 name = "raw-window-handle"
 version = "0.6.2"
@@ -7077,19 +5468,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "rcgen"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2"
-dependencies = [
- "pem",
- "ring",
- "rustls-pki-types",
- "time",
- "yasna",
-]
-
 [[package]]
 name = "read-fonts"
 version = "0.35.0"
@@ -7206,26 +5584,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "ring"
-version = "0.17.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom 0.2.17",
- "libc",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "ringbuffer"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b0b88a509053cbfd535726dcaaceee631313cef981266119527a1d110f6d2b"
-
 [[package]]
 name = "robust"
 version = "1.2.0"
@@ -7307,15 +5665,6 @@ dependencies = [
  "semver",
 ]
 
-[[package]]
-name = "rusticata-macros"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.44"
@@ -7342,65 +5691,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.23.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
-dependencies = [
- "aws-lc-rs",
- "log",
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
-dependencies = [
- "openssl-probe",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
-dependencies = [
- "web-time",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.103.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
-dependencies = [
- "aws-lc-rs",
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -7451,15 +5741,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "schannel"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -7485,35 +5766,6 @@ dependencies = [
  "tiny-skia",
 ]
 
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-
-[[package]]
-name = "security-framework"
-version = "3.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
-dependencies = [
- "bitflags 2.11.0",
- "core-foundation 0.10.1",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "self_cell"
 version = "1.2.2"
@@ -7571,16 +5823,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "serde_flexitos"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3323d093d7597660758b742dd7a1525539613f6182b306a4e1dd6e01a89bada9"
-dependencies = [
- "erased-serde",
- "serde",
-]
-
 [[package]]
 name = "serde_json"
 version = "1.0.149"
@@ -7606,35 +5848,13 @@ dependencies = [
  "dotenvy",
  "game_core",
  "hex",
- "lightyear",
+ "netvy",
  "rand",
  "serde_json",
  "shared",
  "tokio",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -7651,7 +5871,7 @@ dependencies = [
  "avian3d",
  "bevy",
  "hex",
- "lightyear",
+ "netvy",
  "rand",
  "serde",
 ]
@@ -7681,12 +5901,6 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
 
-[[package]]
-name = "sketches-ddsketch"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
-
 [[package]]
 name = "skrifa"
 version = "0.37.0"
@@ -7779,16 +5993,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "socket2"
 version = "0.6.2"
@@ -7821,15 +6025,6 @@ dependencies = [
  "portable-atomic",
 ]
 
-[[package]]
-name = "spinning_top"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
-dependencies = [
- "lock_api",
-]
-
 [[package]]
 name = "spirv"
 version = "0.3.0+sdk-1.3.268.0"
@@ -7839,17 +6034,6 @@ dependencies = [
  "bitflags 2.11.0",
 ]
 
-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-dependencies = [
- "base64ct",
- "der",
- "sha2",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -7871,36 +6055,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "steamworks"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "722f54c70818b8debdc25b18618b77a0a69fa280012c29e7904d32f9136299fc"
-dependencies = [
- "bitflags 2.11.0",
- "paste",
- "steamworks-sys",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "steamworks-sys"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42862065c9e685d08cc3d9f6c609d4b46bd9684ec7e9420688eb979213469582"
-
 [[package]]
 name = "strict-num"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
 
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
 [[package]]
 name = "svg_fmt"
 version = "0.4.5"
@@ -7978,23 +6138,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
-
-[[package]]
-name = "synstructure"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "sys-locale"
 version = "0.3.2"
@@ -8083,54 +6226,23 @@ dependencies = [
 name = "thread_local"
 version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "tiff"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f"
-dependencies = [
- "fax",
- "flate2",
- "half",
- "quick-error",
- "weezl",
- "zune-jpeg 0.4.21",
-]
-
-[[package]]
-name = "time"
-version = "0.3.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde_core",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+dependencies = [
+ "cfg-if",
+]
 
 [[package]]
-name = "time-macros"
-version = "0.2.27"
+name = "tiff"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
+checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f"
 dependencies = [
- "num-conv",
- "time-core",
+ "fax",
+ "flate2",
+ "half",
+ "quick-error",
+ "weezl",
+ "zune-jpeg 0.4.21",
 ]
 
 [[package]]
@@ -8158,16 +6270,6 @@ dependencies = [
  "strict-num",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.10.0"
@@ -8183,27 +6285,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
-[[package]]
-name = "tls_codec"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de2e01245e2bb89d6f05801c564fa27624dbd7b1846859876c7dad82e90bf6b"
-dependencies = [
- "tls_codec_derive",
- "zeroize",
-]
-
-[[package]]
-name = "tls_codec_derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tokio"
 version = "1.49.0"
@@ -8214,48 +6295,10 @@ dependencies = [
  "libc",
  "mio",
  "pin-project-lite",
- "socket2 0.6.2",
- "tokio-macros",
+ "socket2",
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "tokio-macros"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
-dependencies = [
- "rustls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
-dependencies = [
- "futures-util",
- "log",
- "rustls",
- "rustls-native-certs",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tungstenite",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.7.5+spec-1.1.0"
@@ -8391,25 +6434,6 @@ dependencies = [
  "core_maths",
 ]
 
-[[package]]
-name = "tungstenite"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
-dependencies = [
- "bytes",
- "data-encoding",
- "http",
- "httparse",
- "log",
- "rand",
- "rustls",
- "rustls-pki-types",
- "sha1",
- "thiserror 2.0.18",
- "utf-8",
-]
-
 [[package]]
 name = "twox-hash"
 version = "2.1.2"
@@ -8518,58 +6542,18 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
-[[package]]
-name = "universal-hash"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
-dependencies = [
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
 [[package]]
 name = "unty"
 version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
 
-[[package]]
-name = "url"
-version = "2.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
 [[package]]
 name = "urlencoding"
 version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "uuid"
 version = "1.21.0"
@@ -8611,6 +6595,12 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
+[[package]]
+name = "virtue"
+version = "0.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1"
+
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -8856,31 +6846,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "web-sys-async-io"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65a1ea96a932ec2252276bc517eb4fccaebc0ecfea2faa49e242de769d188409"
-dependencies = [
- "js-sys",
- "tokio",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys-stream-utils"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90a913a6d558dbf153010d8add2f27bf5964427aa395299b57a7680a5e971cc7"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "web-time"
 version = "1.1.0"
@@ -8891,19 +6856,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "web-wt-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2793e7e95a0f1564bf1e029e4f8ff397b95998fe03fa7f9dd72682f127473c68"
-dependencies = [
- "js-sys",
- "pastey",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "weezl"
 version = "0.1.12"
@@ -9773,49 +7725,6 @@ dependencies = [
  "wasmparser",
 ]
 
-[[package]]
-name = "writeable"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
-
-[[package]]
-name = "wtransport"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5e745c8789c20095c9061d292098d4106660efe2d172efd8ae7a369fe28e3e"
-dependencies = [
- "bytes",
- "pem",
- "quinn",
- "rcgen",
- "rustls",
- "rustls-native-certs",
- "rustls-pemfile",
- "rustls-pki-types",
- "sha2",
- "socket2 0.5.10",
- "thiserror 2.0.18",
- "time",
- "tokio",
- "tracing",
- "url",
- "wtransport-proto",
- "x509-parser",
-]
-
-[[package]]
-name = "wtransport-proto"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a09d89a8dba201c2439d9d5eca55a0faa08909d69da50decdb5ec00be0ac504"
-dependencies = [
- "httlib-huffman",
- "octets",
- "thiserror 2.0.18",
- "url",
-]
-
 [[package]]
 name = "x11-dl"
 version = "2.21.0"
@@ -9848,35 +7757,6 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
 
-[[package]]
-name = "x509-cert"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94"
-dependencies = [
- "const-oid",
- "der",
- "spki",
- "tls_codec",
-]
-
-[[package]]
-name = "x509-parser"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569f339c0c402346d4a75a9e39cf8dad310e287eef1ff56d4c68e5067f53460"
-dependencies = [
- "asn1-rs",
- "data-encoding",
- "der-parser",
- "lazy_static",
- "nom",
- "oid-registry",
- "rusticata-macros",
- "thiserror 2.0.18",
- "time",
-]
-
 [[package]]
 name = "xcursor"
 version = "0.3.10"
@@ -9908,79 +7788,12 @@ version = "0.8.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
 
-[[package]]
-name = "xwt-core"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "647e17b66bd49bfebe8fe73d327358432f298bb41227600f47fb07fa4f7c1eef"
-
-[[package]]
-name = "xwt-web"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f80997b90d89451537f2866130f52b1e4be4d29cfadf9183081b24542f1abdf0"
-dependencies = [
- "js-sys",
- "thiserror 2.0.18",
- "tokio",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "web-sys-async-io",
- "web-sys-stream-utils",
- "web-wt-sys",
- "xwt-core",
-]
-
-[[package]]
-name = "xwt-wtransport"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8623c2ddff8a7321feb12b484094be0341a9203dc46eb4060fc2e852841d8786"
-dependencies = [
- "thiserror 2.0.18",
- "wtransport",
- "xwt-core",
-]
-
-[[package]]
-name = "yasna"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
-dependencies = [
- "time",
-]
-
 [[package]]
 name = "yazi"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5"
 
-[[package]]
-name = "yoke"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
-dependencies = [
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
 [[package]]
 name = "zeno"
 version = "0.3.3"
@@ -10007,80 +7820,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "zerofrom"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zerotrie"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "zmij"
 version = "1.0.21"
diff --git a/Cargo.toml b/Cargo.toml
index 3477b9fd..b0d7ec03 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,27 +13,17 @@ async-compat = "0.2.5"
 avian3d = "0.5.0"
 bevy = "0.18.0"
 bevy-inspector-egui = "0.36.0"
-lightyear = { version = "0.26.0", default-features = false, features = [
-  "client",
-  "netcode",
-  "replication",
-  "server",
-  "std",
-  "trace",
-  "udp"
-] }
+netvy = { path = "../netvy/crates/plugin/" }
 rand = "0.9.2"
 serde = "1.0.228"
 serde_json = "1.0.145"
 shared = { path = "./crates/shared", version = "0.1.0" }
 tokio = { version = "1.49.0", features = ["io-util", "net"] }
 
-# [patch.crates-io]
-# lightyear = { path = "../lightyear/lightyear/" }
-
 # Enable a small amount of optimization in the dev profile.
 [profile.dev]
-opt-level = 1
+opt-level = 0
+debug = true
 
 # Enable a large amount of optimization in the dev profile for dependencies.
 [profile.dev.package."*"]
diff --git a/README.md b/README.md
index 80750fe0..27d5b2ca 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# fun-shooter
+# arena-shooter
 
 ## Features
 - [x] User interface
@@ -99,4 +99,3 @@ uses:
 - bevy for game engine
 - avian3d for physics
 - skein for bevy <-> blender integration (work with bevy components in blender)
-- lightyear for multiplayer
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 457dfebd..caa5a49a 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -22,7 +22,7 @@ bevy_rich_text3d = "0.6.0"
 bevy_skein = "0.5.0"
 dirs = "6.0.0"
 game_core = { path = "../game_core", version = "0.1.0" }
-lightyear = { workspace = true }
+netvy = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/crates/client/src/audio/mod.rs b/crates/client/src/audio/mod.rs
index e6655bf8..a83d0335 100644
--- a/crates/client/src/audio/mod.rs
+++ b/crates/client/src/audio/mod.rs
@@ -1,5 +1,5 @@
 use bevy::{audio::Volume, prelude::*};
-use lightyear::prelude::Controlled;
+use netvy::prelude::*;
 use rand::seq::IndexedRandom;
 use shared::{
     character_controller::components::Grounded,
@@ -177,7 +177,7 @@ fn play_footstep_sound(
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mut last_play: Local<f32>,
     time: Res<Time>,
-    grounded: Single<&Grounded, With<Controlled>>,
+    grounded: Single<&Grounded, With<Owned>>,
     mut play_sound_message_writer: MessageWriter<PlaySoundMessage>,
 ) {
     *last_play += time.delta_secs();
diff --git a/crates/client/src/auth.rs b/crates/client/src/auth.rs
index aceca4fa..7b5facd4 100644
--- a/crates/client/src/auth.rs
+++ b/crates/client/src/auth.rs
@@ -3,9 +3,6 @@ use std::net::SocketAddr;
 use bevy::prelude::*;
 use bevy::tasks::futures_lite::future;
 use bevy::tasks::{Task, block_on};
-use lightyear::netcode::{CONNECT_TOKEN_BYTES, ConnectToken};
-use lightyear::prelude::client::*;
-use lightyear::prelude::*;
 
 use crate::game_flow::states::AppState;
 
diff --git a/crates/client/src/character_controller/systems.rs b/crates/client/src/character_controller/systems.rs
index 238da89b..1fc3b705 100644
--- a/crates/client/src/character_controller/systems.rs
+++ b/crates/client/src/character_controller/systems.rs
@@ -1,6 +1,6 @@
 use avian3d::prelude::*;
 use bevy::prelude::*;
-use lightyear::prelude::Controlled;
+use netvy::prelude::*;
 use shared::{
     GRAVITY,
     character_controller::{
@@ -200,7 +200,7 @@ pub fn apply_gravity(
 }
 
 pub fn zero_player_velocity(
-    mut player_velocity: Single<&mut LinearVelocity, With<Controlled>>,
+    mut player_velocity: Single<&mut LinearVelocity, With<Owned>>,
 ) {
     player_velocity.x = 0.0;
     player_velocity.z = 0.0;
diff --git a/crates/client/src/game_flow/mod.rs b/crates/client/src/game_flow/mod.rs
index 50c16f83..fe3c3694 100644
--- a/crates/client/src/game_flow/mod.rs
+++ b/crates/client/src/game_flow/mod.rs
@@ -1,9 +1,10 @@
 use bevy::prelude::*;
+use shared::GameMode;
 
 use crate::{
     game_flow::{
         states::{
-            AppState, ClientLoadingState, GameModeClient, InGameState,
+            AppState, ClientLoadingState, GameConfigClient, InGameState,
             MainMenuState,
         },
         systems::{
@@ -26,7 +27,6 @@ pub struct GameFlowPlugin;
 impl Plugin for GameFlowPlugin {
     fn build(&self, app: &mut App) {
         app.init_state::<AppState>()
-            .init_state::<GameModeClient>()
             .add_sub_state::<InGameState>()
             .add_sub_state::<MainMenuState>()
             .add_sub_state::<ClientLoadingState>()
@@ -47,6 +47,7 @@ impl Plugin for GameFlowPlugin {
                     handle_escape_in_game,
                     manual_mouse_grab_toggle,
                     handle_player_death_event,
+                    // check_connection_state,
                 ),
             )
             .add_systems(
@@ -56,8 +57,11 @@ impl Plugin for GameFlowPlugin {
             )
             .add_systems(
                 Update,
-                handle_request_next_wave
-                    .run_if(in_state(GameModeClient::Waves)),
+                handle_request_next_wave.run_if(is_waves_game_mode),
             );
     }
 }
+
+fn is_waves_game_mode(config: Res<GameConfigClient>) -> bool {
+    config.game_mode == GameMode::Waves
+}
diff --git a/crates/client/src/game_flow/states.rs b/crates/client/src/game_flow/states.rs
index bf7d0dc2..c8673084 100644
--- a/crates/client/src/game_flow/states.rs
+++ b/crates/client/src/game_flow/states.rs
@@ -1,4 +1,5 @@
 use bevy::prelude::*;
+use shared::GameMode;
 use std::fmt::Display;
 
 #[derive(States, Eq, Debug, PartialEq, Hash, Clone, Default)]
@@ -11,16 +12,20 @@ pub enum AppState {
     Disconnected,
 }
 
+// TODO
 /// The current loading state of the client.
+/// Note that it only really has connection states, because the client itself only connects to the
+/// server. Map spawning etc is done by game_core. (which basically also runs in client... hmm)
 #[derive(SubStates, Eq, Debug, PartialEq, Hash, Clone, Default)]
 #[source(AppState = AppState::LoadingGame)]
 pub enum ClientLoadingState {
     /// This state is set when the client is starting local server to play Singleplayer on
     /// It is skipped in case of connecting to the official dedicated server, e.g. multiplayer
-    #[default]
     StartingServer,
     /// This state is set when the client connects to the game server
+    #[default]
     ConnectingToServer,
+    ConnectedToServer,
 }
 
 impl Display for ClientLoadingState {
@@ -28,6 +33,7 @@ impl Display for ClientLoadingState {
         match self {
             Self::StartingServer => f.write_str("Starting local server"),
             Self::ConnectingToServer => f.write_str("Connecting to the server"),
+            Self::ConnectedToServer => f.write_str("Connected to server!"),
         }
     }
 }
@@ -54,11 +60,9 @@ pub enum InGameState {
     PlayerDead,
 }
 
-// The current game mode on the client
-#[derive(States, Eq, Debug, PartialEq, Hash, Clone, Default, Copy)]
-pub enum GameModeClient {
-    #[default]
-    FreeRoam,
-    Waves,
-    Multiplayer,
+/// The current "configuration" of the game, on the client. It stores intermediate values such as
+/// game mode selected, map selected, until this gets sent to the server/game_core.
+#[derive(Resource, Debug, Default)]
+pub struct GameConfigClient {
+    pub game_mode: GameMode,
 }
diff --git a/crates/client/src/game_flow/systems.rs b/crates/client/src/game_flow/systems.rs
index bbaf206c..5ef4b836 100644
--- a/crates/client/src/game_flow/systems.rs
+++ b/crates/client/src/game_flow/systems.rs
@@ -3,14 +3,11 @@ use bevy::{
     window::{CursorGrabMode, CursorOptions, PrimaryWindow},
 };
 use game_core::RequestNewWave;
-use lightyear::prelude::MessageSender;
-use shared::{
-    GameStateServer, multiplayer_messages::ChangeGameServerStateRequest,
-    protocol::OrderedReliableChannel,
-};
+use netvy::prelude::*;
+use shared::{GameStateServer, multiplayer_messages::ClientCommand};
 
 use crate::{
-    game_flow::states::{AppState, InGameState},
+    game_flow::states::{AppState, ClientLoadingState, InGameState},
     player::{
         PlayerDeathMessage,
         camera::{components::MainMenuCamera, get_main_menu_camera_transform},
@@ -124,20 +121,16 @@ pub fn handle_player_death_event(
 
 pub fn send_update_game_server_state_request_on_in_game_state_change(
     current_in_game_state: If<Res<State<InGameState>>>,
-    mut message_sender: Single<
-        &mut MessageSender<ChangeGameServerStateRequest>,
-    >,
+    mut message_sender: Single<&mut NetMessageWriter<ClientCommand>>,
 ) {
     match *current_in_game_state.get() {
         InGameState::Playing => {
-            message_sender.send::<OrderedReliableChannel>(
-                ChangeGameServerStateRequest(GameStateServer::Running),
-            );
+            message_sender
+                .write(ClientCommand::SetState(GameStateServer::Running));
         }
         InGameState::Paused | InGameState::PlayerDead => {
-            message_sender.send::<OrderedReliableChannel>(
-                ChangeGameServerStateRequest(GameStateServer::Paused),
-            );
+            message_sender
+                .write(ClientCommand::SetState(GameStateServer::Paused));
         }
     }
 }
@@ -150,3 +143,25 @@ pub fn handle_request_next_wave(
         message_writer.write(RequestNewWave);
     }
 }
+
+// NOTE: only our client has the ConnectionState component present
+pub fn check_connection_state(
+    query: Query<&ConnectionState, Changed<ConnectionState>>,
+    mut client_loading_state: ResMut<NextState<ClientLoadingState>>,
+) {
+    for connection_state in query {
+        info!(
+            "ConnectionState changed, updating our ClientLoadingState. new \
+             connection_state: {connection_state:?}"
+        );
+        match connection_state {
+            ConnectionState::Connecting => {
+                client_loading_state
+                    .set(ClientLoadingState::ConnectingToServer);
+            }
+            ConnectionState::Connected => {
+                client_loading_state.set(ClientLoadingState::ConnectedToServer);
+            }
+        }
+    }
+}
diff --git a/crates/client/src/gameplay_debug/states_overlay.rs b/crates/client/src/gameplay_debug/states_overlay.rs
index 56013131..cdf83eab 100644
--- a/crates/client/src/gameplay_debug/states_overlay.rs
+++ b/crates/client/src/gameplay_debug/states_overlay.rs
@@ -1,9 +1,9 @@
 use bevy::prelude::*;
-use shared::GameModeServer;
 
 use crate::{
     game_flow::states::{
-        AppState, ClientLoadingState, InGameState, MainMenuState,
+        AppState, ClientLoadingState, GameConfigClient, InGameState,
+        MainMenuState,
     },
     gameplay_debug::AppDebugState,
 };
@@ -23,8 +23,8 @@ impl Plugin for DebugOverlayPlugin {
                 update_current_in_game_state_text,
                 update_current_main_menu_state,
                 update_loading_game_state_text,
-                update_current_server_game_mode_text
-                    .run_if(state_changed::<GameModeServer>),
+                update_current_game_config_client_text
+                    .run_if(resource_changed::<GameConfigClient>),
             ),
         );
     }
@@ -43,7 +43,7 @@ struct CurrentMainMenuStateText;
 struct CurrentServerGameModeText;
 
 #[derive(Component)]
-struct CurrentLoadingGameStateText;
+struct CurrentClientLoadingState;
 
 #[derive(Component)]
 struct CurrentConnectionStateText;
@@ -51,6 +51,9 @@ struct CurrentConnectionStateText;
 #[derive(Component)]
 struct DebugOverlayRoot;
 
+#[derive(Component)]
+struct CurrentGameConfigClientText;
+
 fn spawn_debug_overlay(mut commands: Commands) {
     commands
         .spawn((
@@ -89,14 +92,19 @@ fn spawn_debug_overlay(mut commands: Commands) {
             ));
 
             parent.spawn(build_debug_overlay_state_item_text(
-                "LoadingGameState",
-                CurrentLoadingGameStateText,
+                "ClientLoadingState",
+                CurrentClientLoadingState,
             ));
 
             parent.spawn(build_debug_overlay_state_item_text(
                 "ConnectionState",
                 CurrentConnectionStateText,
             ));
+
+            parent.spawn(build_debug_overlay_state_item_text(
+                "GameModeClient",
+                CurrentGameConfigClientText,
+            ));
         });
 }
 
@@ -172,21 +180,17 @@ fn update_current_in_game_state_text(
     }
 }
 
-fn update_current_server_game_mode_text(
-    mut current_server_game_mode_text: Single<
-        &mut Text,
-        With<CurrentServerGameModeText>,
-    >,
-    server_game_mode: Res<State<GameModeServer>>,
+fn update_current_game_config_client_text(
+    mut text: Single<&mut Text, With<CurrentGameConfigClientText>>,
+    client_game_mode: Res<GameConfigClient>,
 ) {
-    **current_server_game_mode_text =
-        Text::new(format!("{:?}", *server_game_mode));
+    **text = Text::new(format!("{:?}", *client_game_mode));
 }
 
 fn update_loading_game_state_text(
     mut current_loading_game_state_text: Single<
         &mut Text,
-        With<CurrentLoadingGameStateText>,
+        With<CurrentClientLoadingState>,
     >,
     loading_game_state: Option<Res<State<ClientLoadingState>>>,
 ) {
diff --git a/crates/client/src/main.rs b/crates/client/src/main.rs
index 05ae12a7..80adc13e 100644
--- a/crates/client/src/main.rs
+++ b/crates/client/src/main.rs
@@ -14,12 +14,13 @@ use bevy_inspector_egui::{
     quick::WorldInspectorPlugin,
 };
 use bevy_skein::SkeinPlugin;
+use netvy::prelude::*;
 
 use crate::{
     audio::AudioPlugin,
     character_controller::CharacterControllerPlugin,
     enemy_visuals::EnemyVisualsPlugin,
-    game_flow::GameFlowPlugin,
+    game_flow::{GameFlowPlugin, states::GameConfigClient},
     game_settings::get_or_create_game_settings,
     gameplay_debug::GameplayDebugPlugin,
     network::NetworkPlugin,
@@ -31,7 +32,7 @@ use crate::{
 };
 
 mod audio;
-mod auth;
+// mod auth;
 mod character_controller;
 mod enemy_visuals;
 mod game_flow;
@@ -66,13 +67,15 @@ fn main() {
         WindowMode::Windowed
     };
 
+    app.init_resource::<GameConfigClient>();
+
     // bevy-builtin plugins
     app.add_plugins(
         DefaultPlugins
             .set(WindowPlugin {
                 primary_window: Some(Window {
-                    title: "Fun Shooter".into(),
-                    name: Some("fun-shooter".into()),
+                    title: "Arena Shooter".into(),
+                    name: Some("arena-shooter".into()),
                     present_mode: PresentMode::AutoVsync,
                     mode: window_mode,
                     ..default()
@@ -85,6 +88,8 @@ fn main() {
             }),
     );
 
+    app.add_plugins(NetvyPlugin(AppType::Client));
+
     // per default, a client is AppRole::ClientOnly. only when player clicks on Singleplayer,
     // AppRole gets set to AppRole::ClientAndServer. once we enter main menu root again, we set it
     // back to ClientOnly
@@ -92,9 +97,6 @@ fn main() {
 
     app.add_plugins(game_core::GameCorePlugin);
 
-    // lightyear plugins
-    app.add_plugins(lightyear::prelude::client::ClientPlugins::default());
-
     app.add_plugins(SharedPlugin);
 
     app.add_plugins((UiWidgetsPlugins, InputDispatchPlugin));
@@ -149,3 +151,16 @@ fn main() {
 
     app.run();
 }
+
+// fn trigger_connect(mut commands: Commands) {
+//     let client_entity = commands
+//         .spawn((
+//             Client,
+//             TargetAddress {
+//                 address: "0.0.0.0".to_string(),
+//                 port: SERVER_PORT,
+//             },
+//         ))
+//         .id();
+//     commands.trigger(ConnectToServer { client_entity });
+// }
diff --git a/crates/client/src/network.rs b/crates/client/src/network.rs
index 1fd58328..b830a51e 100644
--- a/crates/client/src/network.rs
+++ b/crates/client/src/network.rs
@@ -1,40 +1,21 @@
-use std::net::{Ipv6Addr, SocketAddr};
-
-use async_compat::Compat;
 use avian3d::prelude::*;
 use bevy::color::palettes::css::WHITE;
 use bevy::prelude::*;
-use bevy::tasks::IoTaskPool;
 use game_core::start_server;
-use lightyear::prelude::client::*;
-use lightyear::prelude::*;
-use shared::AppRole;
+use netvy::prelude::*;
 use shared::character_controller::{
     CHARACTER_CAPSULE_LENGTH, CHARACTER_CAPSULE_RADIUS,
 };
-use shared::components::EntityPositionServer;
-use shared::multiplayer_messages::{
-    ClientUpdatePositionMessage, ConfirmRespawn, PlayerHitMessage,
-};
+use shared::multiplayer_messages::{ConfirmRespawn, PlayerHitMessage};
 use shared::player::Player;
-use shared::protocol::OrderedReliableChannel;
-use shared::utils::lightyear::{
-    DisconnectReason, parse_lightyear_disconnect_reason,
-};
-use shared::utils::network::{
-    get_auth_backend_socket_addr_client_side,
-    get_dedicated_server_socket_addr_client_side,
-};
+use shared::utils::network::SERVER_PORT;
 
-use crate::auth::{
-    ConnectTokenRequestTask, fetch_connect_token,
-    get_connect_token_from_auth_backend,
-};
+// use crate::auth::{
+//     ConnectTokenRequestTask, fetch_connect_token,
+//     get_connect_token_from_auth_backend,
+// };
 use crate::character_controller::components::CharacterControllerBundle;
-use crate::game_flow::states::{
-    AppState, ClientLoadingState, GameModeClient, InGameState,
-};
-use crate::utils::query_filters::OurPlayerFilter;
+use crate::game_flow::states::{AppState, ClientLoadingState, InGameState};
 
 const CLIENT_PORT: u16 = 0;
 
@@ -56,278 +37,165 @@ impl Plugin for NetworkPlugin {
             OnEnter(ClientLoadingState::ConnectingToServer),
             on_enter_connecting_to_server,
         );
+        // app.add_systems(
+        //     Update,
+        //     fetch_connect_token
+        //         .run_if(resource_exists::<ConnectTokenRequestTask>),
+        // );
         app.add_systems(
-            Update,
-            fetch_connect_token
-                .run_if(resource_exists::<ConnectTokenRequestTask>),
-        );
-        app.add_systems(
-            Update,
+            FixedUpdate,
             (
                 handle_confirm_respawn_message,
                 handle_hit_message,
                 handle_new_player,
+                handle_added_owned_player,
             ),
         );
-        app.add_systems(
-            Update,
-            (
-                send_client_update_position,
-                apply_server_position_other_clients,
-            )
-                .run_if(in_state(GameModeClient::Multiplayer)),
-        );
-
-        app.add_observer(handle_added_server);
-        app.add_observer(handle_disconnect);
+        // app.add_observer(handle_added_server);
+        // app.add_observer(handle_disconnect);
     }
 }
 
-fn handle_added_server(
-    trigger: On<Add, Server>,
-    app_role: Res<State<AppRole>>,
-    mut next_client_loading_state: ResMut<NextState<ClientLoadingState>>,
-) {
-    info!("Server {} now added!", trigger.entity);
-    if *app_role.get() == AppRole::ClientAndServer {
-        info!(
-            "Server was added and AppRole::ClientAndServer, setting \
-             LoadingState to ConnectingToServer"
-        );
-        next_client_loading_state.set(ClientLoadingState::ConnectingToServer);
-    }
+// fn handle_added_server(
+//     trigger: On<Add, Server>,
+//     app_role: Res<State<AppRole>>,
+//     mut next_client_loading_state: ResMut<NextState<ClientLoadingState>>,
+// ) {
+//     info!("Server {} now added!", trigger.entity);
+//     if *app_role.get() == AppRole::ClientAndServer {
+//         info!(
+//             "Server was added and AppRole::ClientAndServer, setting \
+//              LoadingState to ConnectingToServer"
+//         );
+//         next_client_loading_state.set(ClientLoadingState::ConnectingToServer);
+//     }
+// }
+
+fn on_enter_connecting_to_server(mut commands: Commands) {
+    info!("Spawning a client and connecting to server...");
+
+    let client_entity = commands
+        .spawn((
+            Name::new("Host Client"),
+            Client,
+            TargetAddress {
+                address: "0.0.0.0".to_string(),
+                port: SERVER_PORT,
+            },
+        ))
+        .id();
+
+    commands.trigger(ConnectToServer { client_entity });
 }
 
-fn on_enter_connecting_to_server(
+fn handle_new_player(
     mut commands: Commands,
-    connected_query: Query<Has<Connected>>,
-    game_mode: Res<State<GameModeClient>>,
-    server_entity: Query<Entity, With<Server>>,
-    mut next_app_state: ResMut<NextState<AppState>>,
+    player_query: Query<Entity, Added<Player>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    mut meshes: ResMut<Assets<Mesh>>,
 ) {
-    // Connected component only present on our own client
-    for connected in connected_query {
-        if connected {
-            warn!("Already connected to the game server");
-            continue;
-        }
-    }
-
-    let is_singleplayer = *game_mode.get() != GameModeClient::Multiplayer;
-
-    // FIXME: following code is so insanely unreadable
-    if let Ok(server_entity) = server_entity.single()
-        && is_singleplayer
-    {
-        info!("Spawning a host client, we have single player mode");
-
-        let client = commands
-            .spawn((
-                Name::new("Host Client"),
-                LinkOf {
-                    server: server_entity,
-                },
-                Client::default(),
-            ))
-            .id();
-
-        // NOTE: We only trigger the Connect in this system for host client, as the connect for a
-        // client connecting to the official dedicated server triggers only when we received a
-        // ConnectToken. this happens in auth.rs
-        commands.trigger(Connect { entity: client });
-    } else {
+    for player_entity in player_query {
         info!(
-            "Connecting to official dedicated server, Spawning a 'normal' \
-             client"
+            "A player was added! Spawning visuals (entity={})",
+            player_entity
         );
-        let auth_backend_addr = get_auth_backend_socket_addr_client_side();
-        if let Some(auth_backend_addr) = auth_backend_addr {
-            debug!(
-                "Starting task to get auth ConnectToken via AuthBackend at {}",
-                auth_backend_addr
-            );
-            let task = IoTaskPool::get().spawn_local(Compat::new(async move {
-                get_connect_token_from_auth_backend(auth_backend_addr).await
-            }));
-            commands
-                .insert_resource(ConnectTokenRequestTask { task: Some(task) });
-            debug!("Inserted ConnectTokenRequestTask");
-        } else {
-            next_app_state.set(AppState::Disconnected);
-        }
 
-        if let Some(server_address) =
-            get_dedicated_server_socket_addr_client_side()
-        {
-            commands.spawn((
-                Name::new("Client"),
-                Client::default(),
-                LocalAddr(SocketAddr::new(
-                    Ipv6Addr::UNSPECIFIED.into(),
-                    CLIENT_PORT,
-                )),
-                PeerAddr(server_address),
-                Link::new(None),
-                ReplicationReceiver::default(),
-                UdpIo::default(),
-            ));
-        } else {
-            info!(
-                "Could not resolve server address, setting AppState to \
-                 Disconnected"
-            );
-            next_app_state.set(AppState::Disconnected);
-        }
+        commands.entity(player_entity).insert((
+            Mesh3d(meshes.add(Capsule3d::new(
+                CHARACTER_CAPSULE_RADIUS,
+                CHARACTER_CAPSULE_LENGTH,
+            ))),
+            MeshMaterial3d(materials.add(StandardMaterial {
+                base_color: WHITE.into(),
+                ..Default::default()
+            })),
+            Name::new("Remote Player"),
+            RigidBody::Kinematic,
+            Collider::capsule(
+                CHARACTER_CAPSULE_RADIUS,
+                CHARACTER_CAPSULE_LENGTH,
+            ),
+        ));
     }
 }
 
-fn handle_new_player(
+fn handle_added_owned_player(
     mut commands: Commands,
-    player_query: Query<(Entity, Has<Controlled>), Added<Player>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    mut meshes: ResMut<Assets<Mesh>>,
+    player_entity: Single<Entity, (With<Player>, Added<Owned>)>,
     mut next_app_state: ResMut<NextState<AppState>>,
 ) {
-    for (player_entity, has_controlled) in player_query {
-        info!("A player was added! {}", player_entity);
-
-        if has_controlled {
-            // we insert the character controller locally on our client, as it should only run on the
-            // client.
-            commands.entity(player_entity).insert((
-                CharacterControllerBundle::default(),
-                DespawnOnExit(AppState::InGame),
-                Visibility::Visible,
-                Transform::from_translation(vec3(0.0, 20.0, 0.0)),
-                Name::new("Our Player"),
-                Mesh3d(meshes.add(Capsule3d::new(
-                    CHARACTER_CAPSULE_RADIUS,
-                    CHARACTER_CAPSULE_LENGTH,
-                ))),
-                MeshMaterial3d(materials.add(StandardMaterial {
-                    base_color: WHITE.into(),
-                    ..Default::default()
-                })),
-            ));
-
-            // TODO: is this a good idea? we assume that if our player is
-            // present, it means GameCore is ready.
-            info!("Our player was added, setting AppState to InGame");
-            next_app_state.set(AppState::InGame);
-        } else {
-            commands.entity(player_entity).insert((
-                Mesh3d(meshes.add(Capsule3d::new(
-                    CHARACTER_CAPSULE_RADIUS,
-                    CHARACTER_CAPSULE_LENGTH,
-                ))),
-                MeshMaterial3d(materials.add(StandardMaterial {
-                    base_color: WHITE.into(),
-                    ..Default::default()
-                })),
-                Name::new("Remote Player"),
-                RigidBody::Kinematic,
-                Collider::capsule(
-                    CHARACTER_CAPSULE_RADIUS,
-                    CHARACTER_CAPSULE_LENGTH,
-                ),
-            ));
-        }
-    }
-}
-
-fn send_client_update_position(
-    // With<Client> also ensures its the messagesender from our local client, as client component
-    // only gets inserted into our own client
-    mut message_sender: Single<
-        &mut MessageSender<ClientUpdatePositionMessage>,
-        With<Client>,
-    >,
-    player_transform: Single<&Transform, OurPlayerFilter>,
-) {
-    message_sender.send::<OrderedReliableChannel>(
-        ClientUpdatePositionMessage {
-            new_translation: player_transform.translation,
-        },
-    );
+    // we insert the character controller locally on our client, as it should only run on the
+    // client.
+    commands.entity(*player_entity).insert((
+        CharacterControllerBundle::default(),
+        DespawnOnExit(AppState::InGame),
+        Visibility::Visible,
+        Transform::from_translation(vec3(0.0, 20.0, 0.0)),
+        Name::new("Our Player"),
+    ));
+
+    // TODO: is this a good idea? we assume that if our player is
+    // present, it means GameCore is ready.
+    info!("Our player was added, setting AppState to InGame");
+    next_app_state.set(AppState::InGame);
 }
 
-fn apply_server_position_other_clients(
-    time: Res<Time>,
-    mut query: Query<(
-        &mut Transform,
-        &EntityPositionServer,
-        Has<Controlled>, // present only on own player
-    )>,
-) {
-    for (mut transform, server_pos, controlled) in &mut query {
-        // Skip our own transform
-        if controlled {
-            continue;
-        }
-
-        let target = server_pos.translation;
-        let current = transform.translation;
-
-        let lerp_factor = 10.0 * time.delta_secs();
-        transform.translation = current.lerp(target, lerp_factor);
-    }
-}
-
-fn handle_disconnect(
-    trigger: On<Add, Disconnected>,
-    disconnected: Query<&Disconnected>,
-    mut next_app_state: ResMut<NextState<AppState>>,
-) {
-    match disconnected.get(trigger.entity) {
-        // NOTE: The library inserts Disconnected component per default, as that is the default state,
-        // even if we weren't even connected in the first place. So, for now,
-        // we check if there is a reason, if not, we weren't actually disconnected.
-        // https://github.com/cBournhonesque/lightyear/discussions/1375
-        Ok(disconnected) => {
-            if let Some(disconnected_reason) = &disconnected.reason {
-                info!(
-                    "Disconnected from server, reason: {:?}",
-                    disconnected_reason
-                );
-
-                let parsed_reason =
-                    parse_lightyear_disconnect_reason(disconnected_reason);
-
-                match parsed_reason {
-                    DisconnectReason::ClientTriggered => {
-                        next_app_state.set(AppState::MainMenu);
-                    }
-                    DisconnectReason::Unknown => {
-                        next_app_state.set(AppState::Disconnected);
-                    }
-                }
-            }
-        }
-        Err(error) => {
-            warn!(
-                "Disconnected from server, but could not retrieve \
-                 Disconnected component to get reason for disconnect: {}",
-                error
-            );
-        }
-    }
-}
+// FIXME: reimplement
+// fn handle_disconnect(
+//     trigger: On<Add, Disconnected>,
+//     disconnected: Query<&Disconnected>,
+//     mut next_app_state: ResMut<NextState<AppState>>,
+// ) {
+//     match disconnected.get(trigger.entity) {
+//         // NOTE: The library inserts Disconnected component per default, as that is the default state,
+//         // even if we weren't even connected in the first place. So, for now,
+//         // we check if there is a reason, if not, we weren't actually disconnected.
+//         // https://github.com/cBournhonesque/lightyear/discussions/1375
+//         Ok(disconnected) => {
+//             if let Some(disconnected_reason) = &disconnected.reason {
+//                 info!(
+//                     "Disconnected from server, reason: {:?}",
+//                     disconnected_reason
+//                 );
+//
+//                 let parsed_reason =
+//                     parse_lightyear_disconnect_reason(disconnected_reason);
+//
+//                 match parsed_reason {
+//                     DisconnectReason::ClientTriggered => {
+//                         next_app_state.set(AppState::MainMenu);
+//                     }
+//                     DisconnectReason::Unknown => {
+//                         next_app_state.set(AppState::Disconnected);
+//                     }
+//                 }
+//             }
+//         }
+//         Err(error) => {
+//             warn!(
+//                 "Disconnected from server, but could not retrieve \
+//                  Disconnected component to get reason for disconnect: {}",
+//                 error
+//             );
+//         }
+//     }
+// }
 
 fn handle_confirm_respawn_message(
-    mut message_receiver: Single<&mut MessageReceiver<ConfirmRespawn>>,
+    mut message_receiver: Single<&mut NetMessageReader<ConfirmRespawn>>,
     mut next_in_game_state: ResMut<NextState<InGameState>>,
 ) {
-    for _ in message_receiver.receive() {
+    for _ in message_receiver.read() {
         info!("Respawn request was confirmed by server!");
         next_in_game_state.set(InGameState::Playing);
     }
 }
 
 fn handle_hit_message(
-    mut message_receiver: Single<&mut MessageReceiver<PlayerHitMessage>>,
+    mut message_receiver: Single<&mut NetMessageReader<PlayerHitMessage>>,
     mut message_sender: MessageWriter<PlayerHitMessage>,
 ) {
-    for message in message_receiver.receive() {
+    for message in message_receiver.read() {
         message_sender.write(PlayerHitMessage {
             origin: message.origin,
         });
diff --git a/crates/client/src/player/camera/systems.rs b/crates/client/src/player/camera/systems.rs
index 7812e540..bed52a13 100644
--- a/crates/client/src/player/camera/systems.rs
+++ b/crates/client/src/player/camera/systems.rs
@@ -3,7 +3,7 @@ use bevy::{
     camera::visibility::RenderLayers, core_pipeline::Skybox,
     input::mouse::AccumulatedMouseMotion, prelude::*,
 };
-use lightyear::prelude::Controlled;
+use netvy::prelude::*;
 use shared::{
     components::DespawnTimer,
     player::{AimType, Player, PlayerState},
@@ -36,8 +36,7 @@ use crate::{
 const PITCH_LIMIT: f32 = FRAC_PI_2 - 0.01;
 
 pub fn setup_player_cameras(
-    // using With<Controlled> ensures we only add cameras to our own player
-    added_players: Query<Entity, (Added<Player>, With<Controlled>)>,
+    added_players: Query<Entity, (Added<Owned>, With<Player>)>,
     mut message_writer: MessageWriter<SpawnPlayerCamera>,
 ) {
     for added_player in added_players {
diff --git a/crates/client/src/player/shooting/systems.rs b/crates/client/src/player/shooting/systems.rs
index bc5f1137..a4301c2a 100644
--- a/crates/client/src/player/shooting/systems.rs
+++ b/crates/client/src/player/shooting/systems.rs
@@ -2,12 +2,11 @@ use std::f32::consts::TAU;
 
 use avian3d::prelude::*;
 use bevy::{input::mouse::MouseWheel, prelude::*};
-use lightyear::prelude::*;
+use netvy::prelude::*;
 use shared::{
     components::{DespawnTimer, Health},
     multiplayer_messages::ShootRequest,
     player::{AimType, PlayerState},
-    protocol::OrderedReliableChannel,
     shooting::{
         MAX_SHOOTING_DISTANCE, PlayerWeapons, WeaponKind, WeaponSlotType,
     },
@@ -50,7 +49,7 @@ type WorldModelCameraQuery<'w, 's> = Single<
 >;
 
 pub fn setup_new_players(
-    added_players: Query<Entity, (Added<Player>, With<Controlled>)>,
+    added_players: Query<Entity, (Added<Player>, With<Owned>)>,
     mut commands: Commands,
 ) {
     for player_entity in added_players {
@@ -151,7 +150,7 @@ pub fn handle_input(
 pub fn send_shoot_request_on_weapon_fired(
     mut message_reader: MessageReader<PlayerWeaponFiredMessage>,
     mut shoot_request_sender: Single<
-        &mut MessageSender<ShootRequest>,
+        &mut NetMessageWriter<ShootRequest>,
         With<Client>,
     >,
     world_model_camera_query: WorldModelCameraQuery,
@@ -160,8 +159,7 @@ pub fn send_shoot_request_on_weapon_fired(
         let origin = world_model_camera_query.1.translation();
         let direction = world_model_camera_query.1.forward();
 
-        shoot_request_sender
-            .send::<OrderedReliableChannel>(ShootRequest { direction, origin });
+        shoot_request_sender.write(ShootRequest { direction, origin });
     }
 }
 
@@ -374,7 +372,7 @@ pub fn handle_weapon_slot_change(
     mut commands: Commands,
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mut mouse_scroll_message_reader: MessageReader<MouseWheel>,
-    mut player_state: Single<&mut PlayerState, With<Controlled>>,
+    mut player_state: Single<&mut PlayerState, With<Owned>>,
     mut message_writer: MessageWriter<PlayerWeaponSlotChangeMessage>,
     existing_change_weapon_cooldown: Option<Res<ChangeWeaponCooldown>>,
     mut update_player_weapon_model_message_writer: MessageWriter<
@@ -434,7 +432,7 @@ pub fn reset_aim_type_on_pause(mut aim_type: Single<&mut AimType>) {
 }
 
 pub fn check_if_player_dead(
-    player_health: Single<&Health, (Changed<Health>, With<Controlled>)>,
+    player_health: Single<&Health, (Changed<Health>, With<Owned>)>,
     mut player_death_message_writer: MessageWriter<PlayerDeathMessage>,
 ) {
     if player_health.0 <= 0.0 {
@@ -446,7 +444,7 @@ pub fn handle_player_scope_aim(
     mouse_input: Res<ButtonInput<MouseButton>>,
     player_query: Single<
         (&mut AimType, &PlayerState, &PlayerWeapons),
-        With<Controlled>,
+        With<Owned>,
     >,
 ) {
     let (mut aim_type, player_state, player_weapons) =
diff --git a/crates/client/src/ui/common.rs b/crates/client/src/ui/common.rs
index a17bed40..dbca878c 100644
--- a/crates/client/src/ui/common.rs
+++ b/crates/client/src/ui/common.rs
@@ -1,5 +1,5 @@
 use bevy::{prelude::*, ui::InteractionDisabled};
-use lightyear::prelude::*;
+use netvy::prelude::*;
 use shared::StopGame;
 
 use crate::{
@@ -98,7 +98,8 @@ fn handle_common_ui_button_press(
 
                 debug!("Sending StopGame message and triggering disconnect");
                 message_writer.write(StopGame);
-                commands.trigger(Disconnect { entity: own_client });
+                // FIXME: implement in netvy
+                // commands.trigger(Disconnect { entity: own_client });
             }
             CommonUiButton::ToGameModeSelection => {
                 next_main_menu_state.set(MainMenuState::GameModeSelection);
diff --git a/crates/client/src/ui/hud/mod.rs b/crates/client/src/ui/hud/mod.rs
index 48efe667..7fea2608 100644
--- a/crates/client/src/ui/hud/mod.rs
+++ b/crates/client/src/ui/hud/mod.rs
@@ -3,7 +3,7 @@ use game_core::GameStateWave;
 use shared::NextWaveTimer;
 
 use crate::{
-    game_flow::states::{GameModeClient, InGameState},
+    game_flow::states::{AppState, InGameState},
     ui::{
         UiState,
         hud::systems::{
@@ -51,7 +51,7 @@ impl Plugin for PlayerHudPlugin {
                 .run_if(in_state(InGameState::Playing)),
         );
         app.add_systems(Update, spawn_player_hud);
-        app.add_systems(OnEnter(GameModeClient::Waves), spawn_wave_hud);
+        app.add_systems(OnEnter(AppState::InGame), spawn_wave_hud);
         app.add_systems(
             Update,
             (update_wave_hud)
diff --git a/crates/client/src/ui/hud/systems.rs b/crates/client/src/ui/hud/systems.rs
index 6062da7e..f25cbe84 100644
--- a/crates/client/src/ui/hud/systems.rs
+++ b/crates/client/src/ui/hud/systems.rs
@@ -1,8 +1,8 @@
 use bevy::{color::palettes::css::WHITE, prelude::*};
 use game_core::GameStateWave;
-use lightyear::prelude::{Controlled, MessageReceiver};
+use netvy::prelude::*;
 use shared::{
-    NextWaveTimer, WaveFinishedMessage,
+    GameMode, NextWaveTimer, WaveFinishedMessage,
     components::{DespawnTimer, Health},
     multiplayer_messages::PlayerHitMessage,
     player::{AimType, Player, PlayerCash, PlayerReady, PlayerState},
@@ -10,7 +10,7 @@ use shared::{
 };
 
 use crate::{
-    game_flow::states::{AppState, InGameState},
+    game_flow::states::{AppState, GameConfigClient, InGameState},
     player::{
         camera::components::WorldCamera,
         shooting::messages::{PlayerBulletHit, PlayerWeaponSlotChangeMessage},
@@ -37,7 +37,7 @@ pub fn spawn_player_hud(
     mut commands: Commands,
     player_query: Query<
         (&Health, &PlayerWeapons, &PlayerState),
-        (Added<PlayerReady>, With<Controlled>),
+        (Added<PlayerReady>, With<Owned>),
     >,
 ) {
     let Ok((player_health, player_weapons, player_state)) =
@@ -167,7 +167,7 @@ pub fn spawn_player_hud(
 pub fn spawn_player_crosshair(
     asset_server: Res<AssetServer>,
     mut commands: Commands,
-    player_query: Query<Entity, (Added<Player>, With<Controlled>)>,
+    player_query: Query<Entity, (Added<Player>, With<Owned>)>,
 ) {
     for _ in player_query {
         commands
@@ -219,7 +219,7 @@ pub fn on_ui_state_change(
 }
 
 pub fn update_player_health_text(
-    player_health: Single<&Health, (Changed<Health>, With<Controlled>)>,
+    player_health: Single<&Health, (Changed<Health>, With<Owned>)>,
     mut player_health_text: Single<&mut Text, With<PlayerHealthText>>,
 ) {
     debug!("Updated player health text");
@@ -277,7 +277,14 @@ pub fn spawn_bullet_hit_crosshair(
     }
 }
 
-pub fn spawn_wave_hud(mut commands: Commands) {
+pub fn spawn_wave_hud(
+    mut commands: Commands,
+    game_config_client: Res<GameConfigClient>,
+) {
+    if game_config_client.game_mode != GameMode::Waves {
+        return;
+    }
+
     commands
         .spawn((
             DespawnOnExit(AppState::InGame),
@@ -340,10 +347,10 @@ pub fn spawn_damage_indicator(
     mut message_reader: MessageReader<PlayerHitMessage>,
     player_transform: Single<&Transform, OurPlayerFilter>,
     camera_transform: Single<&Transform, With<WorldCamera>>,
-    mut network_message_reader: Single<&mut MessageReceiver<PlayerHitMessage>>,
+    mut network_message_reader: Single<&mut NetMessageReader<PlayerHitMessage>>,
 ) {
     let internal_messages = message_reader.read().copied();
-    let network_messages = network_message_reader.receive();
+    let network_messages = network_message_reader.read();
 
     let combined_messages = internal_messages.chain(network_messages);
 
diff --git a/crates/client/src/ui/menus/game_mode_selection.rs b/crates/client/src/ui/menus/game_mode_selection.rs
index b7ff2914..c31d3eba 100644
--- a/crates/client/src/ui/menus/game_mode_selection.rs
+++ b/crates/client/src/ui/menus/game_mode_selection.rs
@@ -1,8 +1,8 @@
 use bevy::prelude::*;
-use shared::{GameMap, GameModeServer, StartGame};
+use shared::{GameMap, GameMode, StartGame};
 
 use crate::{
-    game_flow::states::{AppState, GameModeClient, MainMenuState},
+    game_flow::states::{AppState, GameConfigClient, MainMenuState},
     ui::{
         common::{
             DEFAULT_FONT_SIZE, DEFAULT_GAME_FONT_PATH, DEFAULT_ROW_GAP,
@@ -34,7 +34,7 @@ impl Plugin for GameModeSelectionUIPlugin {
 struct GameModeSelectionScreen;
 
 #[derive(Component)]
-struct GameModeSelectionButton(GameModeClient);
+struct GameModeSelectionButton(GameMode);
 
 #[derive(Component)]
 enum GameModeSelectionActionButton {
@@ -83,12 +83,12 @@ fn spawn_game_mode_selection_screen(
             parent.spawn(build_common_button(
                 "Waves",
                 asset_server.load(DEFAULT_GAME_FONT_PATH),
-                GameModeSelectionButton(GameModeClient::Waves),
+                GameModeSelectionButton(GameMode::Waves),
             ));
             parent.spawn(build_common_button(
                 "Free Roam",
                 asset_server.load(DEFAULT_GAME_FONT_PATH),
-                GameModeSelectionButton(GameModeClient::FreeRoam),
+                GameModeSelectionButton(GameMode::FreeRoam),
             ));
             parent.spawn(build_common_button(
                 "Go back",
@@ -103,27 +103,18 @@ fn handle_game_mode_selection_button_press(
         (&Interaction, &GameModeSelectionButton),
         Changed<Interaction>,
     >,
-    mut next_game_mode_state: ResMut<NextState<GameModeClient>>,
     mut next_app_state: ResMut<NextState<AppState>>,
     mut message_writer: MessageWriter<StartGame>,
     current_map: Res<State<GameMap>>,
+    mut game_config_client: ResMut<GameConfigClient>,
 ) {
     for (interaction, game_mode_selection_button) in query {
         if let Interaction::Pressed = interaction {
-            let pressed_game_mode = game_mode_selection_button.0;
-            next_game_mode_state.set(pressed_game_mode);
             next_app_state.set(AppState::LoadingGame);
 
-            let game_mode = match pressed_game_mode {
-                GameModeClient::FreeRoam => GameModeServer::FreeRoam,
-                GameModeClient::Waves => GameModeServer::Waves,
-                GameModeClient::Multiplayer => GameModeServer::FreeRoam,
-            };
+            game_config_client.game_mode = game_mode_selection_button.0;
 
-            message_writer.write(StartGame {
-                map: current_map.get().clone(),
-                game_mode,
-            });
+            message_writer.write(StartGame);
         }
     }
 }
diff --git a/crates/client/src/ui/menus/main_menu.rs b/crates/client/src/ui/menus/main_menu.rs
index 0080199e..81ead23e 100644
--- a/crates/client/src/ui/menus/main_menu.rs
+++ b/crates/client/src/ui/menus/main_menu.rs
@@ -1,10 +1,8 @@
 use bevy::prelude::*;
-use shared::{AppRole, GameMap, GameModeServer, StartGame};
+use shared::{AppRole, StartGame};
 
 use crate::{
-    game_flow::states::{
-        AppState, ClientLoadingState, GameModeClient, MainMenuState,
-    },
+    game_flow::states::{AppState, ClientLoadingState, MainMenuState},
     ui::{
         common::{
             CommonUiButton, DEFAULT_GAME_FONT_PATH, DEFAULT_ROW_GAP,
@@ -60,7 +58,7 @@ fn spawn_main_menu(asset_server: Res<AssetServer>, mut commands: Commands) {
                     ..default()
                 })
                 .with_child((
-                    Text::new("Fun Shooter"),
+                    Text::new("Arena Shooter"),
                     TextFont {
                         font: asset_server.load(DEFAULT_GAME_FONT_PATH),
                         font_size: TITLE_FONT_SIZE,
@@ -101,7 +99,6 @@ fn handle_main_menu_button_pressed(
         Changed<Interaction>,
     >,
     mut next_main_menu_state: ResMut<NextState<MainMenuState>>,
-    mut next_game_mode_state: ResMut<NextState<GameModeClient>>,
     mut next_app_state: ResMut<NextState<AppState>>,
     mut next_app_role: ResMut<NextState<AppRole>>,
     mut next_client_loading_state: ResMut<NextState<ClientLoadingState>>,
@@ -114,10 +111,10 @@ fn handle_main_menu_button_pressed(
         match main_menu_button {
             MainMenuButton::Singleplayer => {
                 next_main_menu_state.set(MainMenuState::MapSelection);
-                next_app_role.set(AppRole::ClientAndServer);
+                // next_app_role.set(AppRole::ClientAndServer);
             }
             MainMenuButton::Multiplayer => {
-                next_game_mode_state.set(GameModeClient::Multiplayer);
+                // next_game_mode_state.set(GameModeClient::Multiplayer);
                 next_app_state.set(AppState::LoadingGame);
                 next_app_role.set(AppRole::ClientOnly);
                 // NOTE: we skip state StartingServer, because in multiplayer we dont start a
@@ -125,11 +122,7 @@ fn handle_main_menu_button_pressed(
                 next_client_loading_state
                     .set(ClientLoadingState::ConnectingToServer);
 
-                info!("Writing StartGame message!");
-                message_writer.write(StartGame {
-                    game_mode: GameModeServer::FreeForAll,
-                    map: GameMap::MediumPlastic,
-                });
+                message_writer.write(StartGame);
             }
             MainMenuButton::SettingsMainMenu => {
                 next_main_menu_state.set(MainMenuState::Settings);
diff --git a/crates/client/src/ui/screens/buy_overlay.rs b/crates/client/src/ui/screens/buy_overlay.rs
index 98561194..12ecc8f1 100644
--- a/crates/client/src/ui/screens/buy_overlay.rs
+++ b/crates/client/src/ui/screens/buy_overlay.rs
@@ -16,9 +16,8 @@ use shared::{
 };
 
 use crate::{
-    game_flow::states::{GameModeClient, InGameState},
-    player::camera::messages::UpdatePlayerWeaponModel,
-    ui::UiState,
+    game_flow::states::InGameState,
+    player::camera::messages::UpdatePlayerWeaponModel, ui::UiState,
 };
 
 #[derive(Component)]
@@ -53,10 +52,7 @@ impl Plugin for BuyScreenPlugin {
                     update_disabled_enabled_shop_item_buttons,
                     update_texts_on_player_weapons_change,
                 )
-                    .run_if(
-                        in_state(InGameState::Playing)
-                            .and(not(in_state(GameModeClient::Multiplayer))),
-                    ),
+                    .run_if(in_state(InGameState::Playing)),
             );
     }
 }
diff --git a/crates/client/src/ui/screens/death_screen.rs b/crates/client/src/ui/screens/death_screen.rs
index aee1399d..6ec07c00 100644
--- a/crates/client/src/ui/screens/death_screen.rs
+++ b/crates/client/src/ui/screens/death_screen.rs
@@ -1,11 +1,10 @@
 use avian3d::prelude::*;
 use bevy::prelude::*;
 use game_core::{GameStateWave, RetryWaveGameMode};
-use lightyear::prelude::*;
+use netvy::prelude::*;
 use shared::{
     AppRole, DEFAULT_HEALTH, SPAWN_POINT_MEDIUM_PLASTIC_MAP,
     components::Health, multiplayer_messages::ClientRespawnRequest,
-    protocol::OrderedReliableChannel,
 };
 
 use crate::{
@@ -153,17 +152,10 @@ fn spawn_wave_game_mode_death_screen(
 }
 
 fn handle_button_press(
-    mut commands: Commands,
     query: Query<(&Interaction, &DeathScreenButton), Changed<Interaction>>,
     mut respawn_request_message_sender: Single<
-        &mut MessageSender<ClientRespawnRequest>,
-    >,
-    mut player_query: Single<
-        (&mut Health, &mut Transform, Entity, &mut LinearVelocity),
-        With<Controlled>,
+        &mut NetMessageWriter<ClientRespawnRequest>,
     >,
-    mut next_in_game_state: ResMut<NextState<InGameState>>,
-    app_role: Res<State<AppRole>>,
     mut retry_wave_game_mode_message_writer: MessageWriter<RetryWaveGameMode>,
 ) {
     for (interaction, button) in query {
@@ -172,36 +164,10 @@ fn handle_button_press(
         }
         match button {
             DeathScreenButton::Respawn => {
-                // we can always write this message even if we arent evven playing wave game mode,
+                // we can always write this message even if we arent even playing wave game mode,
                 // because then the message handler just wont do anything
                 retry_wave_game_mode_message_writer.write(RetryWaveGameMode);
-                // https://github.com/cBournhonesque/lightyear/issues/1417
-                // TODO: i really hate this
-                // unfortunately in HostClient setup (e.g. AppRole::ClientAndServer) we never
-                // receive the ConfirmRespawn message from server, so we just do the stuff that we
-                // would normally do manually
-                if *app_role.get() == AppRole::ClientAndServer {
-                    let (
-                        player_health,
-                        player_transform,
-                        player_entity,
-                        velocity,
-                    ) = &mut *player_query;
-
-                    player_health.0 = DEFAULT_HEALTH;
-                    player_transform.translation =
-                        SPAWN_POINT_MEDIUM_PLASTIC_MAP;
-                    next_in_game_state.set(InGameState::Playing);
-                    commands
-                        .entity(*player_entity)
-                        .remove::<ColliderDisabled>();
-                    // velocity may be very high if we died because we fell off the map into the
-                    // deathzone
-                    velocity.0 = Vec3::ZERO;
-                } else {
-                    respawn_request_message_sender
-                        .send::<OrderedReliableChannel>(ClientRespawnRequest);
-                }
+                respawn_request_message_sender.write(ClientRespawnRequest);
             }
         }
     }
diff --git a/crates/client/src/utils/query_filters.rs b/crates/client/src/utils/query_filters.rs
index 1932cdde..14ce99cf 100644
--- a/crates/client/src/utils/query_filters.rs
+++ b/crates/client/src/utils/query_filters.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
-use lightyear::prelude::*;
+use netvy::prelude::*;
 use shared::{enemy::components::Enemy, player::Player};
 
-pub type OurPlayerFilter = (With<Player>, With<Controlled>);
+pub type OurPlayerFilter = (With<Player>, With<Owned>);
 
 pub type PlayerOrEnemyFilter = Or<(With<Enemy>, With<Player>)>;
diff --git a/crates/game_core/Cargo.toml b/crates/game_core/Cargo.toml
index ba35838e..0470a2bb 100644
--- a/crates/game_core/Cargo.toml
+++ b/crates/game_core/Cargo.toml
@@ -13,7 +13,7 @@ bevy_rerecast = { version = "0.4.0", default-features = false, features = [
   "editor_integration"
 ] }
 landmass_rerecast = "0.2.0"
-lightyear = { workspace = true }
+netvy = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/crates/game_core/src/enemy/shooting/systems.rs b/crates/game_core/src/enemy/shooting/systems.rs
index f36a95cf..9c0808b8 100644
--- a/crates/game_core/src/enemy/shooting/systems.rs
+++ b/crates/game_core/src/enemy/shooting/systems.rs
@@ -1,6 +1,5 @@
 use avian3d::prelude::*;
 use bevy::prelude::*;
-use lightyear::prelude::*;
 use shared::{
     EnemyKilledMessage,
     components::{DespawnTimer, Health},
@@ -25,7 +24,7 @@ pub fn enemy_shoot_player(
     player_query: Query<&Transform, With<Player>>,
     spatial_query: SpatialQuery,
     mut health_query: Query<&mut Health>,
-    client_query: Query<&RemoteId, With<Connected>>,
+    // client_query: Query<&RemoteId, With<Connected>>,
     mut game_score: Single<&mut GameScore>,
     mut message_writer: MessageWriter<PlayerHitMessage>,
 ) {
@@ -98,22 +97,23 @@ pub fn enemy_shoot_player(
                     enemy_game_score.kills += 1;
                 };
 
-                match client_query.single() {
-                    Ok(remote_id) => {
-                        if let Some(game_score_player) =
-                            game_score.players.get_mut(&remote_id.to_bits())
-                        {
-                            game_score_player.deaths += 1;
-                        };
-                    }
-                    Err(error) => {
-                        warn!(
-                            "Failed to get game score of player that was \
-                             killed: {}",
-                            error
-                        );
-                    }
-                }
+                // FIXME: reimplement
+                // match client_query.single() {
+                //     Ok(remote_id) => {
+                //         if let Some(game_score_player) =
+                //             game_score.players.get_mut(&remote_id.to_bits())
+                //         {
+                //             game_score_player.deaths += 1;
+                //         };
+                //     }
+                //     Err(error) => {
+                //         warn!(
+                //             "Failed to get game score of player that was \
+                //              killed: {}",
+                //             error
+                //         );
+                //     }
+                // }
             }
         }
     }
diff --git a/crates/game_core/src/enemy/spawn/mod.rs b/crates/game_core/src/enemy/spawn/mod.rs
index 1935730d..0ea83d34 100644
--- a/crates/game_core/src/enemy/spawn/mod.rs
+++ b/crates/game_core/src/enemy/spawn/mod.rs
@@ -6,6 +6,7 @@ use bevy::prelude::*;
 use bevy_landmass::{
     Agent, Agent3dBundle, AgentSettings, AgentTarget3d, ArchipelagoRef3d,
 };
+use netvy::prelude::*;
 use rand::Rng;
 use shared::{
     DEFAULT_HEALTH, GameMap,
@@ -13,7 +14,7 @@ use shared::{
         CHARACTER_CAPSULE_LENGTH, CHARACTER_CAPSULE_RADIUS, CHARACTER_FEET,
         MAX_DISTANCE_GROUNDED_SHAPE_CAST, components::Grounded,
     },
-    components::{EntityPositionServer, Health},
+    components::Health,
     enemy::components::{Enemy, EnemyLastStateUpdate, EnemyState},
     game_score::{GameScore, LivingEntityStats},
 };
@@ -162,9 +163,7 @@ fn handle_spawn_enemies_message(
                             Health(DEFAULT_HEALTH),
                             EnemyState::default(),
                             Grounded::default(),
-                            EntityPositionServer {
-                                translation: enemy_spawn_location,
-                            },
+                            SyncPosition::default(),
                             RigidBody::Kinematic,
                             Collider::capsule(
                                 CHARACTER_CAPSULE_RADIUS,
diff --git a/crates/game_core/src/game_flow/mod.rs b/crates/game_core/src/game_flow/mod.rs
index 5b28b0e7..7c74fc0e 100644
--- a/crates/game_core/src/game_flow/mod.rs
+++ b/crates/game_core/src/game_flow/mod.rs
@@ -1,5 +1,4 @@
 use bevy::prelude::*;
-use lightyear::{connection::host::HostClient, prelude::RemoteId};
 use shared::{
     EnemyKilledMessage, GameStateServer, NextWaveTimer, WaveFinishedMessage,
     enemy::components::Enemy,
@@ -31,7 +30,7 @@ impl Plugin for GameFlowPlugin {
                 handle_enemy_killed_message,
                 handle_retry_wave_game_mode_message,
                 handle_despawn_enemy_message,
-                update_game_score_on_retry_wave_game_mode,
+                // update_game_score_on_retry_wave_game_mode,
                 add_cash_on_enemy_killed,
                 handle_request_new_wave_message,
                 add_cash_on_wave_finished,
@@ -102,20 +101,21 @@ fn handle_retry_wave_game_mode_message(
     }
 }
 
-fn update_game_score_on_retry_wave_game_mode(
-    mut message_reader: MessageReader<RetryWaveGameMode>,
-    mut game_score: Single<&mut GameScore>,
-    host_client: Single<&RemoteId, With<HostClient>>,
-) {
-    for _ in message_reader.read() {
-        if let Some(player_score) =
-            game_score.players.get_mut(&host_client.to_bits())
-        {
-            player_score.kills = 0;
-            player_score.deaths = 0;
-        }
-    }
-}
+// FIXME: reimplement
+// fn update_game_score_on_retry_wave_game_mode(
+//     mut message_reader: MessageReader<RetryWaveGameMode>,
+//     mut game_score: Single<&mut GameScore>,
+//     // host_client: Single<&RemoteId, With<HostClient>>,
+// ) {
+//     for _ in message_reader.read() {
+//         if let Some(player_score) =
+//             game_score.players.get_mut(&host_client.to_bits())
+//         {
+//             player_score.kills = 0;
+//             player_score.deaths = 0;
+//         }
+//     }
+// }
 
 fn handle_despawn_enemy_message(
     mut commands: Commands,
diff --git a/crates/game_core/src/lib.rs b/crates/game_core/src/lib.rs
index cf0cbec1..7740b3ca 100644
--- a/crates/game_core/src/lib.rs
+++ b/crates/game_core/src/lib.rs
@@ -1,4 +1,4 @@
-use std::time::Duration;
+use netvy::prelude::*;
 
 use avian3d::prelude::*;
 use bevy::{
@@ -6,34 +6,16 @@ use bevy::{
     prelude::*, reflect::TypePath,
 };
 use bevy_common_assets::json::JsonAssetPlugin;
-use lightyear::{
-    netcode::NetcodeServer,
-    prelude::{
-        server::{NetcodeConfig, ServerUdpIo, Start},
-        *,
-    },
-};
 use serde::{Deserialize, Serialize};
 use shared::{
-    AppRole, DEFAULT_HEALTH, GameMap, GameModeServer, GameStateServer,
-    MEDIUM_PLASTIC_MAP_PATH, SPAWN_POINT_MEDIUM_PLASTIC_MAP, StartGame,
-    StopGame, TINY_TOWN_MAP_PATH,
-    components::{EntityPositionServer, Health},
+    AppRole, GameConfigServer, GameMap, GameMode, GameStateServer,
+    MEDIUM_PLASTIC_MAP_PATH, StartGame, StopGame, TINY_TOWN_MAP_PATH,
+    components::Health,
     enemy::components::Enemy,
     game_score::GameScore,
-    multiplayer_messages::{
-        ChangeGameServerStateRequest, ClientRespawnRequest,
-        ClientUpdatePositionMessage, ConfirmRespawn,
-    },
+    multiplayer_messages::ClientCommand,
     player::Player,
-    protocol::OrderedReliableChannel,
-    utils::{
-        auth::{LOCAL_SERVER_PRIVATE_KEY, load_private_key_from_env},
-        network::{
-            NETCODE_PROTOCOL_VERSION, SERVER_SOCKET_ADDR_DEDICATED_SERVER,
-            SERVER_SOCKET_ADDR_SINGLEPLAYER,
-        },
-    },
+    utils::network::{SERVER_PORT, SERVER_SOCKET_ADDR_DEDICATED_SERVER},
     world_object::{
         WorldObjectCollectibleKind, WorldObjectCollectibleServerSide,
     },
@@ -80,6 +62,7 @@ pub struct GameStateWave {
     pub enemies_left_from_current_wave: usize,
 }
 
+// TODO: maybe just one universal retry message
 #[derive(Message)]
 pub struct RetryWaveGameMode;
 
@@ -100,7 +83,6 @@ impl Plugin for GameCorePlugin {
         app.init_state::<GameCoreLoadingState>();
         app.init_state::<GameStateServer>();
         app.init_state::<GameMap>();
-        app.init_state::<GameModeServer>();
 
         // any files loaded via the asset server, that end with `spawn_locations.json`, will be
         // parsed into SpawnLocationFile struct, and can then be retrieved via the handle
@@ -108,8 +90,6 @@ impl Plugin for GameCorePlugin {
             "spawn_locations.json",
         ]));
 
-        app.add_plugins(lightyear::prelude::server::ServerPlugins::default());
-
         app.add_plugins(EnemyPlugin);
         app.add_plugins(NavMeshPathfindingPlugin);
         app.add_plugins(GameFlowPlugin);
@@ -119,12 +99,9 @@ impl Plugin for GameCorePlugin {
         app.add_systems(
             Update,
             (
-                receive_and_apply_client_update_position
-                    .run_if(in_state(AppRole::DedicatedServer)),
-                handle_client_respawn_requests,
-                handle_game_server_state_update_request,
                 read_stop_game_message,
                 check_world_scene_loaded,
+                handle_client_commands,
             ),
         );
         app.add_systems(
@@ -145,7 +122,7 @@ impl Plugin for GameCorePlugin {
             spawn_map,
         );
 
-        app.add_observer(handle_new_connection);
+        // app.add_observer(handle_new_connection);
         app.add_observer(check_collider_constructor_hierarchy_ready);
 
         app.add_systems(
@@ -162,15 +139,15 @@ pub fn start_server(mut commands: Commands, app_role: Res<State<AppRole>>) {
             info!("Skipping starting of server, AppRole is ClientOnly");
             return;
         }
-        AppRole::ClientAndServer => "Local Server for singleplayer",
-        AppRole::DedicatedServer => "Server from server Binary",
+        // AppRole::ClientAndServer => "Local Server for singleplayer",
+        AppRole::DedicatedServer => "Dedicated Server",
     };
 
     let local_addr = match app_role.get() {
         AppRole::ClientOnly => {
             return;
         }
-        AppRole::ClientAndServer => SERVER_SOCKET_ADDR_SINGLEPLAYER,
+        // AppRole::ClientAndServer => SERVER_SOCKET_ADDR_SINGLEPLAYER,
         AppRole::DedicatedServer => SERVER_SOCKET_ADDR_DEDICATED_SERVER,
     };
 
@@ -180,29 +157,18 @@ pub fn start_server(mut commands: Commands, app_role: Res<State<AppRole>>) {
         app_role.get()
     );
 
-    let private_key = match app_role.get() {
-        AppRole::ClientOnly => {
-            return;
-        }
-        AppRole::ClientAndServer => LOCAL_SERVER_PRIVATE_KEY,
-        AppRole::DedicatedServer => load_private_key_from_env().unwrap(),
-    };
-
-    let server = commands
+    let server_entity = commands
         .spawn((
-            NetcodeServer::new(NetcodeConfig {
-                protocol_id: NETCODE_PROTOCOL_VERSION,
-                private_key,
-                ..default()
-            }),
-            LocalAddr(local_addr),
-            ServerUdpIo::default(),
+            Server,
+            TargetAddress {
+                address: "0.0.0.0".to_string(),
+                port: SERVER_PORT,
+            },
             Name::new(entity_name),
-            DespawnOnExit(AppRole::ClientAndServer),
         ))
         .id();
 
-    commands.trigger(Start { entity: server });
+    commands.trigger(StartServer { server_entity });
 }
 
 fn handle_start_game_message(
@@ -210,30 +176,19 @@ fn handle_start_game_message(
     mut next_server_loading_state: ResMut<NextState<GameCoreLoadingState>>,
     app_role: Res<State<AppRole>>,
     mut start_game_message_reader: MessageReader<StartGame>,
-    mut next_current_map: ResMut<NextState<GameMap>>,
-    mut game_mode_server: ResMut<NextState<GameModeServer>>,
 ) {
-    for message in start_game_message_reader.read() {
+    for _ in start_game_message_reader.read() {
         info!("Received StartGame message");
-        next_current_map.set(message.map.clone());
 
         if *app_role.get() != AppRole::ClientOnly {
-            game_mode_server.set(message.game_mode.clone());
-            info!(
-                "Updated GameModeServer to {:?}, read from StartGame message.",
-                message.game_mode
-            );
-            commands
-                .spawn((
-                    GameScore {
-                        players: HashMap::new(),
-                        enemies: HashMap::new(),
-                    },
-                    Name::new("Game Score"),
-                ))
-                .insert_if(Replicate::to_clients(NetworkTarget::All), || {
-                    *app_role.get() == AppRole::DedicatedServer
-                });
+            commands.spawn((
+                GameScore {
+                    players: HashMap::new(),
+                    enemies: HashMap::new(),
+                },
+                Name::new("Game Score"),
+                ReplicateEntity,
+            ));
         }
 
         // NOTE: theoretically the game score entity is not necessarily already spawned here, but we
@@ -243,71 +198,37 @@ fn handle_start_game_message(
     }
 }
 
-fn handle_new_connection(trigger: On<Add, LinkOf>, mut commands: Commands) {
-    commands
-        .entity(trigger.entity)
-        .insert((ReplicationSender::new(
-            Duration::from_millis(100),
-            SendUpdatesMode::SinceLastAck,
-            false,
-        ),));
-}
-
-/// This systems receives a message from clients, that their position has changed.
-/// The server will then apply it to the `PlayerPositionServer` component, which then gets
-/// replicated to all clients. All clients receive the updates from `PlayerPositionServer`, and
-/// update the Transform locally.
-fn receive_and_apply_client_update_position(
-    mut receivers: Query<(
-        &mut MessageReceiver<ClientUpdatePositionMessage>,
-        Entity,
-    )>,
-    mut players: Query<
-        (&mut EntityPositionServer, &mut Transform, &ControlledBy),
-        With<Player>,
-    >,
-) {
-    for (mut message_receiver, remote_id) in receivers.iter_mut() {
-        for message in message_receiver.receive() {
-            if let Some((mut server_position, mut transform, _)) = players
-                .iter_mut()
-                .find(|(_, _, controlled_by)| controlled_by.owner == remote_id)
-            {
-                server_position.translation = message.new_translation;
-                transform.translation = message.new_translation;
-            } else {
-                warn!(
-                    "Received a ClientUpdatePositionMessage but couldnt find \
-                     the corresponding Player entity on the server"
-                );
-            }
-        }
-    }
-}
-
 fn on_game_core_loading_state_done(
     mut commands: Commands,
-    game_mode_server: Res<State<GameModeServer>>,
     mut spawn_enemies: MessageWriter<SpawnEnemiesMessage>,
     enemy_query: Query<Entity, With<Enemy>>,
+    game_config_server: Option<Res<GameConfigServer>>,
     app_role: Res<State<AppRole>>,
 ) {
+    // we dont want to spawn enemies, etc, if this is client. the server handles that.
+    // this will change ofc once we implement HostClient mode in netvy
     if *app_role.get() == AppRole::ClientOnly {
-        info!(
-            "Not doing actions depending on GameModeServer, this is ClientOnly"
-        );
         return;
     }
-    // TODO: This would mean GameCore is not fully done? We still spawn enemies, so theoretically
-    // GameCoreLoadingState should not be done, e.g. we should add another state
+
+    let Some(game_config_server) = game_config_server else {
+        warn!(
+            "GameConfigServer doesn't exist, cant execute actions depending \
+             on it, like spawning enemies!"
+        );
+        return;
+    };
+
+    let game_mode_server = &game_config_server.game_mode;
+
     info!(
         "GameCoreLoadingState is done, now doing actions corresponding to \
          game mode. Game mode is: {:?}",
-        *game_mode_server
+        game_mode_server
     );
 
-    match *game_mode_server.get() {
-        GameModeServer::Waves => {
+    match game_mode_server {
+        GameMode::Waves => {
             let wave = 1;
             let enemy_count = get_enemy_count_per_wave(wave);
             commands.insert_resource(GameStateWave {
@@ -320,7 +241,7 @@ fn on_game_core_loading_state_done(
                 spawn_strategy: EnemySpawnStrategy::RandomSelection,
             });
         }
-        GameModeServer::FreeForAll | GameModeServer::FreeRoam => {
+        GameMode::FreeForAll | GameMode::FreeRoam => {
             commands.remove_resource::<GameStateWave>();
             for enemy in enemy_query {
                 commands.entity(enemy).despawn();
@@ -329,100 +250,88 @@ fn on_game_core_loading_state_done(
     };
 }
 
-fn handle_client_respawn_requests(
-    mut commands: Commands,
-    receivers: Query<(
-        &mut MessageReceiver<ClientRespawnRequest>,
-        &ControlledByRemote,
-        &RemoteId,
-    )>,
-    mut player_query: Query<(Entity, &mut Health, &mut EntityPositionServer)>,
-    mut server_multi_message_sender: ServerMultiMessageSender,
-    server: Single<&Server>,
-) {
-    for (mut message_receiver, controlled_by, remote_id) in receivers {
-        for _ in message_receiver.receive() {
-            info!("Received ClientRespawnRequest!");
-            match controlled_by.iter().next() {
-                Some(controlling_player) => {
-                    match player_query.get_mut(controlling_player) {
-                        Ok((
-                            player_entity,
-                            mut player_health,
-                            mut entity_position_server,
-                        )) => {
-                            player_health.0 = DEFAULT_HEALTH;
-                            entity_position_server.translation =
-                                SPAWN_POINT_MEDIUM_PLASTIC_MAP;
-
-                            commands
-                                .entity(player_entity)
-                                .remove::<ColliderDisabled>();
-
-                            info!(
-                                "Sending confirm respawn message to client \
-                                 with remote_id: {}",
-                                remote_id.0
-                            );
-                            let network_target =
-                                &NetworkTarget::Single(remote_id.0);
-
-                            let message_sent_result = server_multi_message_sender
-                                .send::<ConfirmRespawn, OrderedReliableChannel>(
-                                    &ConfirmRespawn,
-                                    &server,
-                                    network_target,
-                                );
-                            match message_sent_result {
-                                Ok(_) => {
-                                    info!(
-                                        "Succesfully sent ConfirmRespawn \
-                                         message to client"
-                                    );
-                                }
-                                Err(error) => {
-                                    error!(
-                                        "Failed to send ConfirmRespawn \
-                                         message to client: {}",
-                                        error
-                                    );
-                                }
-                            }
-                        }
-                        Err(error) => {
-                            error!(
-                                "Failed to find controlling player: {}",
-                                error
-                            );
-                        }
-                    }
-                }
-                None => {
-                    error!(
-                        "Received a ClientRespawnRequest but no \
-                         'ControlledByRemote' exists"
-                    );
-                }
-            }
-        }
-    }
-}
-
-fn handle_game_server_state_update_request(
-    mut message_receiver: Single<
-        &mut MessageReceiver<ChangeGameServerStateRequest>,
-    >,
-    app_role: Res<State<AppRole>>,
+// FIXME: reintroduce
+// fn handle_client_respawn_requests(
+//     mut commands: Commands,
+//     receivers: Query<(&mut NetMessageReader<ClientRespawnRequest>, &PeerId)>,
+//     mut player_query: Query<(Entity, &mut Health, &OwnedBy)>,
+//     mut server_multi_message_sender: Single<
+//         &mut NetMessageWriter<ConfirmRespawn>,
+//     >,
+//     server: Single<&Server>,
+// ) {
+//     for (mut message_receiver, peer_id) in receivers {
+//         for _ in message_receiver.read() {
+//             info!("Received ClientRespawnRequest!");
+//             let Some((player_entity, mut player_health, _)) = player_query
+//                 .iter_mut()
+//                 .find(|(entity, health, owned_by)| owned_by.0 == *peer_id)
+//             else {
+//                 warn!(
+//                     "Read a ClientRespawnRequest but couldn't figure out to \
+//                      which player this belongs to"
+//                 );
+//                 continue;
+//             };
+//
+//             player_health.0 = DEFAULT_HEALTH;
+//
+//             // TODO: use transform directly
+//             // entity_position_server.translation = SPAWN_POINT_MEDIUM_PLASTIC_MAP;
+//
+//             commands.entity(player_entity).remove::<ColliderDisabled>();
+//
+//             info!(
+//                 "Sending confirm respawn message to client with remote_id: {}",
+//                 peer_id.0
+//             );
+//             // let network_target = &NetworkTarget::Single(peer_id.0);
+//
+//             let message_sent_result = server_multi_message_sender
+//                 .send::<ConfirmRespawn, OrderedReliableChannel>(
+//                 &ConfirmRespawn,
+//                 &server,
+//                 network_target,
+//             );
+//             match message_sent_result {
+//                 Ok(_) => {
+//                     info!("Succesfully sent ConfirmRespawn message to client");
+//                 }
+//                 Err(error) => {
+//                     error!(
+//                         "Failed to send ConfirmRespawn message to client: {}",
+//                         error
+//                     );
+//                 }
+//             }
+//         }
+//     }
+// }
+
+fn handle_client_commands(
+    mut net_message_reader: Single<&mut NetMessageReader<ClientCommand>>,
+    mut game_config_server: Option<ResMut<GameConfigServer>>,
     mut game_state_server: ResMut<NextState<GameStateServer>>,
 ) {
-    for message in message_receiver.receive() {
-        if *app_role.get() != AppRole::ClientAndServer {
-            info!("Ignored ChangeGameServerStateRequest");
+    for message in net_message_reader.read() {
+        let Some(ref mut game_config_server) = game_config_server else {
+            warn!(
+                "Received a ClientCommand but GameConfigServer resource \
+                 doesnt exist, can't handle ClientCommand."
+            );
             return;
+        };
+        match message {
+            ClientCommand::SetGameMode(game_mode) => {
+                game_config_server.game_mode = game_mode;
+            }
+            ClientCommand::SetMap(game_map) => {
+                game_config_server.game_map = game_map;
+            }
+            ClientCommand::SetState(new_game_state_server) => {
+                game_state_server.set(new_game_state_server);
+            }
         }
-
-        info!("GameStateServer updated to {:?}", message.0);
-        game_state_server.set(message.0);
     }
 }
 
@@ -446,7 +355,7 @@ const COLLIDER_CONSTRUCTOR_COUNT_TINY_TOWN: usize = 2;
 
 fn check_collider_constructor_hierarchy_ready(
     _trigger: On<ColliderConstructorHierarchyReady>,
-    mut next_server_loading_state: ResMut<NextState<GameCoreLoadingState>>,
+    mut game_core_loading_state: ResMut<NextState<GameCoreLoadingState>>,
     mut local_count: Local<usize>,
     current_map: Res<State<GameMap>>,
 ) {
@@ -465,10 +374,10 @@ fn check_collider_constructor_hierarchy_ready(
 
     info!(
         "All ColliderConstructorHierarchies are ready, setting \
-         ServerLoadingState::CollidersSpawned"
+         GameCoreLoadingState::CollidersSpawned"
     );
 
-    next_server_loading_state.set(GameCoreLoadingState::CollidersSpawned);
+    game_core_loading_state.set(GameCoreLoadingState::CollidersSpawned);
 
     // Reset back to zero to prepare for next GameStart
     *local_count = 0;
@@ -507,9 +416,6 @@ fn spawn_map(
     app_role: Res<State<AppRole>>,
     current_map: Res<State<GameMap>>,
 ) {
-    // FIXME: not spawning the map actually has the problem that the MedkitSpawnLocations and
-    // AmmunitionPackSpawnLocations are never spawned. so dedicated server will never have those
-    // we need another way of storing information on where to spawn medkits, etc
     if *app_role.get() == AppRole::DedicatedServer {
         info!("Skipping spawning map, AppRole is DedicatedServer");
         return;
@@ -564,8 +470,8 @@ fn log_updates_to_game_core_loading_state(
 type EntitiesToDespawnQueryFilter = Or<(
     With<GameMapLight>,
     With<Enemy>,
-    With<Server>,
-    With<Client>,
+    // With<Server>,
+    // With<Client>,
     With<GameScore>,
     With<MapModel>,
     With<WorldObjectCollectibleServerSide>,
diff --git a/crates/game_core/src/nav_mesh_pathfinding/mod.rs b/crates/game_core/src/nav_mesh_pathfinding/mod.rs
index 6392f33c..0199f8fa 100644
--- a/crates/game_core/src/nav_mesh_pathfinding/mod.rs
+++ b/crates/game_core/src/nav_mesh_pathfinding/mod.rs
@@ -55,7 +55,7 @@ fn generate_navmesh_on_map_colliders_ready(
 ) {
     // NOTE: We only do nav mesh generation in case this is ClientAndServer. no use on dedicated
     // server currently
-    if *app_role.get() != AppRole::ClientAndServer {
+    if *app_role.get() != AppRole::ClientOnly {
         next_server_loading_state.set(GameCoreLoadingState::Done);
         return;
     }
@@ -100,7 +100,7 @@ fn generate_navmesh_on_map_colliders_ready(
 fn on_navmesh_ready(
     trigger: On<NavmeshReady>,
     mut commands: Commands,
-    mut next_server_loading_state: ResMut<NextState<GameCoreLoadingState>>,
+    mut game_core_loading_state: ResMut<NextState<GameCoreLoadingState>>,
     mut nav_meshes: ResMut<Assets<Navmesh>>,
 ) {
     let Some(nav_mesh_handle) = nav_meshes.get_strong_handle(trigger.0) else {
@@ -112,8 +112,8 @@ fn on_navmesh_ready(
 
     commands.insert_resource(NavMeshHandle(nav_mesh_handle));
 
-    info!("NavMesh is now ready, updating ServerLoadingState to Done");
-    next_server_loading_state.set(GameCoreLoadingState::Done);
+    info!("NavMesh is now ready, updating GameCoreLoadingState to Done");
+    game_core_loading_state.set(GameCoreLoadingState::Done);
 }
 
 // fn log_agent_state(agent_state: Query<&AgentState>) {
diff --git a/crates/game_core/src/player/mod.rs b/crates/game_core/src/player/mod.rs
index 493acac6..51a275e1 100644
--- a/crates/game_core/src/player/mod.rs
+++ b/crates/game_core/src/player/mod.rs
@@ -1,17 +1,16 @@
 use avian3d::prelude::*;
 use bevy::{color::palettes::css::WHITE, prelude::*};
-use lightyear::prelude::{server::ClientOf, *};
+use netvy::prelude::*;
 use shared::{
-    AppRole, GameModeServer,
+    AppRole, GameConfigServer, GameMode,
     character_controller::{
         CHARACTER_CAPSULE_LENGTH, CHARACTER_CAPSULE_RADIUS,
     },
-    components::{EntityPositionServer, Health},
+    components::Health,
     enemy::components::Enemy,
     game_score::{GameScore, LivingEntityStats},
     multiplayer_messages::{PlayerHitMessage, ShootRequest},
     player::{Player, PlayerBundle},
-    protocol::OrderedReliableChannel,
     shooting::MAX_SHOOTING_DISTANCE,
 };
 
@@ -21,40 +20,111 @@ pub struct PlayerPlugin;
 
 impl Plugin for PlayerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_observer(spawn_player_on_new_client);
-        app.add_systems(Update, handle_shoot_requests);
+        app.add_systems(
+            Update,
+            (handle_shoot_requests, spawn_player_on_new_client),
+        );
+    }
+}
+
+fn spawn_player_on_new_client(
+    clients_query: Query<&PeerId, Added<PeerId>>,
+    mut commands: Commands,
+    mut materials: Option<ResMut<Assets<StandardMaterial>>>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut game_score: Query<&mut GameScore>,
+    app_role: Res<State<AppRole>>,
+) {
+    if *app_role.get() == AppRole::ClientOnly {
+        return;
+    }
+
+    for peer_id in clients_query {
+        match game_score.single_mut() {
+            Ok(mut game_score) => {
+                game_score.players.insert(
+                    peer_id.0,
+                    LivingEntityStats {
+                        username: format!("Player {}", peer_id.0),
+                        ..default()
+                    },
+                );
+            }
+            Err(error) => {
+                error!("Failed to add player to game score: {}", error);
+            }
+        }
+
+        info!(
+            "Spawning a player for fully connected Client. (peer_id={})",
+            peer_id.0
+        );
+
+        let player_entity = commands
+            .spawn((
+                PlayerBundle::default(),
+                Name::new("Player"),
+                ReplicateEntity,
+                SyncPosition::default(),
+                Visibility::Visible,
+                OwnedBy(*peer_id),
+                Collider::capsule(
+                    CHARACTER_CAPSULE_RADIUS,
+                    CHARACTER_CAPSULE_LENGTH,
+                ),
+                RigidBody::Kinematic,
+            ))
+            .id();
+
+        if *app_role.get() == AppRole::DedicatedServer {
+            // on headless setup, materials doesnt exist
+            if let Some(ref mut materials) = materials {
+                commands.entity(player_entity).insert((
+                    Mesh3d(meshes.add(Capsule3d::new(
+                        CHARACTER_CAPSULE_RADIUS,
+                        CHARACTER_CAPSULE_LENGTH,
+                    ))),
+                    MeshMaterial3d(materials.add(StandardMaterial {
+                        base_color: WHITE.into(),
+                        ..Default::default()
+                    })),
+                ));
+            }
+        }
     }
 }
 
 fn handle_shoot_requests(
     mut commands: Commands,
-    receivers: Query<(&mut MessageReceiver<ShootRequest>, Entity, &RemoteId)>,
+    message_readers: Query<(&mut NetMessageReader<ShootRequest>, &PeerId)>,
     mut health_query: Query<&mut Health>,
     spatial_query: SpatialQuery,
-    player_query: Query<(Entity, &ControlledBy), With<Player>>,
+    player_query: Query<(Entity, &OwnedBy), With<Player>>,
     mut game_score: Single<&mut GameScore>,
-    game_mode_server: Res<State<GameModeServer>>,
-    client_query: Query<&RemoteId, With<ClientOf>>,
-    mut server_multi_message_sender: ServerMultiMessageSender,
-    server: Single<&Server>,
+    client_query: Query<&PeerId, With<Client>>,
     enemy_query: Query<Entity, With<Enemy>>,
     mut player_hit_enemy_message_writer: MessageWriter<PlayerHitEnemy>,
+    mut server_net_message_writer: Single<
+        &mut NetMessageWriter<PlayerHitMessage>,
+        With<Server>,
+    >,
+    game_config_server: Res<GameConfigServer>,
 ) {
-    for (mut message_receiver, client_entity_server_side, remote_id) in
-        receivers
-    {
-        for message in message_receiver.receive() {
+    let game_mode = &game_config_server.game_mode;
+
+    for (mut message_reader, peer_id) in message_readers {
+        for message in message_reader.read() {
             // the player entity that sent this ShootRequest
             let Some(shooter_entity) = player_query
                 .iter()
-                .find(|(_, controlled_by)| {
-                    controlled_by.owner == client_entity_server_side
-                })
+                .find(|(_, controlled_by)| controlled_by.0.0 == peer_id.0)
                 .map(|i| i.0)
             else {
                 warn!(
                     "Received a ShootRequest but couldn't determine from \
-                     which player this came from"
+                     which player this came from. (peer_id={peer_id:?}, \
+                     player_query={:?})",
+                    player_query
                 );
                 continue;
             };
@@ -87,19 +157,22 @@ fn handle_shoot_requests(
                 });
             } else {
                 if let Ok(client_entity_that_was_hit) =
-                    player_query.get(entity_hit).map(|i| i.1)
+                    player_query.get(entity_hit).map(|i| i.0)
                     && let Ok(client) =
-                        client_query.get(client_entity_that_was_hit.owner)
+                        client_query.get(client_entity_that_was_hit)
                 {
-                    server_multi_message_sender
-                        .send::<PlayerHitMessage, OrderedReliableChannel>(
-                            &PlayerHitMessage {
-                                origin: message.origin,
-                            },
-                            &server,
-                            &NetworkTarget::Single(client.0),
-                        )
-                        .ok();
+                    server_net_message_writer.write(PlayerHitMessage {
+                        origin: message.origin,
+                    });
+                    // server_multi_message_sender
+                    //     .send::<PlayerHitMessage, OrderedReliableChannel>(
+                    //         &PlayerHitMessage {
+                    //             origin: message.origin,
+                    //         },
+                    //         &server,
+                    //         &NetworkTarget::Single(client.0),
+                    //     )
+                    //     .ok();
                 } else {
                     error!("Could not find client that was hit by the bullet");
                 }
@@ -109,133 +182,34 @@ fn handle_shoot_requests(
                 let entity_killed = first_hit.entity;
                 commands.entity(entity_killed).insert(ColliderDisabled);
 
-                match game_score.players.get_mut(&remote_id.to_bits()) {
+                match game_score.players.get_mut(&peer_id.0) {
                     Some(player) => {
                         debug!(
-                            "increased kill count of player with remote_id: {}",
-                            remote_id.to_bits()
+                            "increased kill count of player with peer_id: {}",
+                            peer_id.0
                         );
                         player.kills += 1;
                     }
                     None => {
                         warn!(
-                            "Failed to find player in game score by remote_id \
+                            "Failed to find player in game score by peer_id \
                              {}\nGame score: {:?}",
-                            remote_id.to_bits(),
-                            *game_score
+                            peer_id.0, *game_score
                         )
                     }
                 }
 
                 // if we have game mode wave, the entity killed will always be an enemy. so we
                 // skip this case
-                if **game_mode_server == GameModeServer::Waves {
+                if *game_mode == GameMode::Waves {
                     return;
                 };
-                match player_query.get(entity_killed) {
-                    Ok((_, controlled_by)) => {
-                        if let Ok(remote_id) =
-                            client_query.get(controlled_by.owner)
-                            && let Some(player_score) =
-                                game_score.players.get_mut(&remote_id.to_bits())
-                        {
-                            player_score.deaths += 1;
-                        } else {
-                            warn!(
-                                "Failed to find client of player that was \
-                                 killed"
-                            );
-                        };
-                    }
-                    Err(error) => {
-                        warn!(
-                            "Failed to find player that was killed: {}",
-                            error
-                        );
-                    }
-                }
-            }
-        }
-    }
-}
-
-fn spawn_player_on_new_client(
-    trigger: On<Add, Connected>,
-    clients_query: Query<&RemoteId, With<ClientOf>>,
-    mut commands: Commands,
-    materials: Option<ResMut<Assets<StandardMaterial>>>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut game_score: Query<&mut GameScore>,
-    app_role: Res<State<AppRole>>,
-) {
-    if let Ok(remote_id) = clients_query.get(trigger.entity) {
-        let peer_id = remote_id.0;
-
-        match game_score.single_mut() {
-            Ok(mut game_score) => {
-                game_score.players.insert(
-                    peer_id.to_bits(),
-                    LivingEntityStats {
-                        username: format!("Player {}", peer_id.to_bits()),
-                        ..default()
-                    },
-                );
-            }
-            Err(error) => {
-                error!("Failed to add player to game score: {}", error);
-            }
-        }
-
-        info!(
-            "Spawning a player for fully connected Client entity: {} | \
-             peer_id: {}",
-            trigger.entity, peer_id
-        );
-
-        // NOTE: The replicate component gets inserted into the player entity, but only registered
-        // components will be replicated to all other clients
-        let player_entity = commands
-            .spawn((
-                PlayerBundle::default(),
-                Name::new("Player"),
-                Replicate::to_clients(NetworkTarget::All),
-                // TODO: think we could override replication behaviour for this component and only
-                // replicate to all other clients than the current client
-                EntityPositionServer {
-                    translation: vec3(0.0, 20.0, 0.0),
-                },
-                Visibility::Visible,
-                // we add the ControlledBy on the server, with the client entity as the owner of this
-                // player, so on the client we can then filter by players that have the `Controlled`
-                // component and those are the players that are actually owned by that client
-                ControlledBy {
-                    owner: trigger.entity,
-                    lifetime: Lifetime::SessionBased,
-                },
-                Collider::capsule(
-                    CHARACTER_CAPSULE_RADIUS,
-                    CHARACTER_CAPSULE_LENGTH,
-                ),
-                RigidBody::Kinematic,
-            ))
-            .insert_if(Controlled, || {
-                *app_role.get() == AppRole::ClientAndServer
-            })
-            .id();
-
-        if *app_role.get() == AppRole::DedicatedServer {
-            // on headless setup, materials doesnt exist
-            if let Some(mut materials) = materials {
-                commands.entity(player_entity).insert((
-                    Mesh3d(meshes.add(Capsule3d::new(
-                        CHARACTER_CAPSULE_RADIUS,
-                        CHARACTER_CAPSULE_LENGTH,
-                    ))),
-                    MeshMaterial3d(materials.add(StandardMaterial {
-                        base_color: WHITE.into(),
-                        ..Default::default()
-                    })),
-                ));
+                let Some(player_score) = game_score.players.get_mut(&peer_id.0)
+                else {
+                    warn!("Failed to find client of player that was killed");
+                    continue;
+                };
+                player_score.deaths += 1;
             }
         }
     }
diff --git a/crates/game_core/src/world_objects/systems.rs b/crates/game_core/src/world_objects/systems.rs
index 47111d77..aa4eabb0 100644
--- a/crates/game_core/src/world_objects/systems.rs
+++ b/crates/game_core/src/world_objects/systems.rs
@@ -1,6 +1,6 @@
 use avian3d::prelude::*;
 use bevy::prelude::*;
-use lightyear::prelude::*;
+use netvy::prelude::*;
 use shared::{
     AppRole, DEFAULT_HEALTH, GameMap,
     components::Health,
@@ -51,14 +51,16 @@ pub fn spawn_world_objects(
     let Some(spawn_location) =
         spawn_locations.get(current_spawn_location_handle.0.id())
     else {
-        // TODO: the handle will exist with an extremely very high chance at this point.
-        // the json file is just about 1KB big, so no way it wont be loaded at this point.
-        // the spawn location file gets loaded when player clicks on a map
-        panic!(
-            "Failed to load spawn locations, the asset hasnt been loaded yet \
-             or resource doesnt exist yet. Handle we wanted to retrieve: {}",
+        error!(
+            "Failed to load spawn locations, no SpawnLocations will be spawned. (spawn_location_handle={})",
             current_spawn_location_handle.0.id()
         );
+        return;
+        // panic!(
+        //     "Failed to load spawn locations, the asset hasnt been loaded yet \
+        //      or resource doesnt exist yet. Handle we wanted to retrieve: {}",
+        //     current_spawn_location_handle.0.id()
+        // );
     };
 
     info!("Loaded spawn locations for world objects, spawning...");
@@ -66,7 +68,7 @@ pub fn spawn_world_objects(
     for spawn_location in &spawn_location.positions {
         commands.spawn((
             Transform::from_translation(spawn_location.position),
-            Replicate::to_clients(NetworkTarget::All),
+            ReplicateEntity,
             Collider::cuboid(0.2, 0.2, 0.2),
             WorldObjectCollectibleServerSide {
                 kind: spawn_location.kind,
diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml
index 9b608084..4e055dc8 100644
--- a/crates/server/Cargo.toml
+++ b/crates/server/Cargo.toml
@@ -12,7 +12,7 @@ bevy-inspector-egui = { workspace = true }
 dotenvy = "0.15.7"
 game_core = { path = "../game_core", version = "0.1.0" }
 hex = "0.4.3"
-lightyear = { workspace = true }
+netvy = { workspace = true }
 rand = { workspace = true }
 serde_json = { workspace = true }
 shared = { workspace = true }
diff --git a/crates/server/src/auth.rs b/crates/server/src/auth.rs
index 1d2172bb..5dcc51ac 100644
--- a/crates/server/src/auth.rs
+++ b/crates/server/src/auth.rs
@@ -2,10 +2,9 @@ use std::net::SocketAddr;
 use std::sync::{Arc, RwLock};
 
 use async_compat::Compat;
+use bevy::platform::collections::HashSet;
 use bevy::prelude::*;
 use bevy::tasks::IoTaskPool;
-use lightyear::netcode::ConnectToken;
-use lightyear::utils::collections::HashSet;
 use shared::utils::network::NETCODE_PROTOCOL_VERSION;
 use tokio::io::AsyncWriteExt;
 
diff --git a/crates/server/src/main.rs b/crates/server/src/main.rs
index 100f4a3d..c711140d 100644
--- a/crates/server/src/main.rs
+++ b/crates/server/src/main.rs
@@ -1,5 +1,3 @@
-use std::sync::{Arc, RwLock};
-
 use bevy::log::LogPlugin;
 use bevy::mesh::MeshPlugin;
 use bevy::prelude::*;
@@ -7,22 +5,15 @@ use bevy::state::app::StatesPlugin;
 use bevy_inspector_egui::bevy_egui::{self, EguiPlugin};
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use game_core::{GameCoreLoadingState, start_server};
-use lightyear::utils::collections::HashSet;
-use shared::ServerRunMode;
-use shared::utils::auth::load_private_key_from_env;
-use shared::utils::network::{
-    AUTH_BACKEND_ADDRESS_SERVER_SIDE,
-    get_dedicated_server_socket_addr_client_side,
-};
-use shared::{AppRole, SharedPlugin};
-
-use crate::auth::start_netcode_authentication_task;
-use crate::systems::{
-    spawn_map_colliders, spawn_server_camera, write_start_game_message,
-};
+use netvy::prelude::*;
+use shared::{AppRole, GameMap, GameMode, SharedPlugin};
+use shared::{GameConfigServer, ServerRunMode};
+
+// use crate::auth::start_netcode_authentication_task;
+use crate::systems::{spawn_map_colliders, spawn_server_camera, start_game};
 use crate::utils::get_run_mode;
 
-mod auth;
+// mod auth;
 mod systems;
 mod utils;
 
@@ -32,6 +23,7 @@ struct HeadlessServerPlugin;
 impl Plugin for HeadlessServerPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins(MinimalPlugins);
+        app.add_plugins(StatesPlugin);
         app.add_plugins(AssetPlugin {
             file_path: "../../assets".to_string(),
             ..default()
@@ -69,10 +61,6 @@ fn main() {
     let run_mode_str = std::env::args().nth(1);
     let run_mode = get_run_mode(run_mode_str.as_ref());
 
-    app.add_plugins(StatesPlugin);
-
-    app.insert_state(AppRole::DedicatedServer);
-
     match run_mode {
         ServerRunMode::Headless => {
             app.add_plugins(HeadlessServerPlugin);
@@ -84,10 +72,19 @@ fn main() {
         }
     }
 
+    app.insert_state(AppRole::DedicatedServer);
+
+    app.add_plugins(NetvyPlugin(AppType::Server));
+
     app.add_plugins(game_core::GameCorePlugin);
     app.add_plugins(SharedPlugin);
 
-    app.add_systems(Startup, (start_server, write_start_game_message));
+    app.insert_resource(GameConfigServer {
+        game_mode: GameMode::FreeForAll,
+        game_map: GameMap::MediumPlastic,
+    });
+
+    app.add_systems(Startup, (start_server, start_game));
 
     // mimic the normal flow, because on the dedicated server we do things a bit differently, e.g.
     // we dont spawn the entire map with the collider constructors, but we only spawn the map
@@ -103,20 +100,20 @@ fn main() {
 
     app.insert_resource(run_mode);
 
-    // authentication
-    let client_ids = Arc::new(RwLock::new(HashSet::default()));
-
-    start_netcode_authentication_task(
-        // this must be client side because it will be contained in the token that the client
-        // receives and uses to connect
-        get_dedicated_server_socket_addr_client_side().expect(
-            "Could not resolve game server address. Please make sure you have \
-             a working internet connection. Game server may be currently down",
-        ),
-        AUTH_BACKEND_ADDRESS_SERVER_SIDE,
-        client_ids.clone(),
-        load_private_key_from_env().unwrap(),
-    );
+    // // authentication
+    // let client_ids = Arc::new(RwLock::new(HashSet::default()));
+
+    // start_netcode_authentication_task(
+    //     // this must be client side because it will be contained in the token that the client
+    //     // receives and uses to connect
+    //     get_dedicated_server_socket_addr_client_side().expect(
+    //         "Could not resolve game server address. Please make sure you have \
+    //          a working internet connection. Game server may be currently down",
+    //     ),
+    //     AUTH_BACKEND_ADDRESS_SERVER_SIDE,
+    //     client_ids.clone(),
+    //     load_private_key_from_env().unwrap(),
+    // );
 
     app.run();
 }
diff --git a/crates/server/src/systems.rs b/crates/server/src/systems.rs
index 682fe38d..769cd162 100644
--- a/crates/server/src/systems.rs
+++ b/crates/server/src/systems.rs
@@ -3,7 +3,7 @@ use std::{fs::File, io::Read};
 use avian3d::prelude::Collider;
 use bevy::prelude::*;
 use game_core::GameCoreLoadingState;
-use shared::{GameMap, GameModeServer, StartGame};
+use shared::StartGame;
 
 use crate::utils::get_path_to_collider_json;
 
@@ -42,11 +42,8 @@ pub fn spawn_map_colliders(
     next_game_core_loading_state.set(GameCoreLoadingState::CollidersSpawned);
 }
 
-pub fn write_start_game_message(mut message_writer: MessageWriter<StartGame>) {
-    message_writer.write(StartGame {
-        map: GameMap::MediumPlastic,
-        game_mode: GameModeServer::FreeForAll,
-    });
+pub fn start_game(mut message_writer: MessageWriter<StartGame>) {
+    message_writer.write(StartGame);
 }
 
 pub fn spawn_server_camera(mut commands: Commands) {
diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml
index c12bea50..5efa1e9f 100644
--- a/crates/shared/Cargo.toml
+++ b/crates/shared/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2024"
 avian3d = { workspace = true, features = ["serialize"] }
 bevy = { workspace = true }
 hex = "0.4.3"
-lightyear = { workspace = true, features = ["client", "server", "trace"] }
+netvy = { workspace = true }
 rand = { workspace = true }
-serde = "1.0.228"
+serde = { workspace = true }
diff --git a/crates/shared/src/components.rs b/crates/shared/src/components.rs
index 1d0a1fd5..d52abb0c 100644
--- a/crates/shared/src/components.rs
+++ b/crates/shared/src/components.rs
@@ -8,10 +8,3 @@ pub struct Health(pub f32);
 /// reached its end. The timer will be automatically ticked in `src/common/systems.rs`
 #[derive(Component)]
 pub struct DespawnTimer(pub Timer);
-
-/// This component indicates the current location of an entity on the server. It is replicated to
-/// all clients. All clients interpolate the local transform of this entity to this component
-#[derive(Component, Clone, Copy, PartialEq, Serialize, Deserialize)]
-pub struct EntityPositionServer {
-    pub translation: Vec3,
-}
diff --git a/crates/shared/src/game_score.rs b/crates/shared/src/game_score.rs
index 4bffbc2f..869978ac 100644
--- a/crates/shared/src/game_score.rs
+++ b/crates/shared/src/game_score.rs
@@ -1,13 +1,12 @@
 use bevy::{platform::collections::HashMap, prelude::*};
-use lightyear::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(
     Component, Serialize, Deserialize, PartialEq, Clone, Reflect, Debug,
 )]
 pub struct GameScore {
-    // for players, we use remote_id converted into bits (remote_id.to_bits()) as entities will differ on client and server
-    pub players: HashMap<u64, LivingEntityStats>,
+    // for players, we use peer_id as entities will differ on client and server
+    pub players: HashMap<u32, LivingEntityStats>,
     // as enemies only exists in singleplayer, we can just use Entity
     pub enemies: HashMap<Entity, LivingEntityStats>,
 }
@@ -19,85 +18,85 @@ pub struct LivingEntityStats {
     pub deaths: u64,
 }
 
-pub struct GameScoreDelta {
-    updated_players: HashMap<u64, LivingEntityStats>,
-    removed_players: Vec<u64>,
-    updated_enemies: HashMap<Entity, LivingEntityStats>,
-    removed_enemies: Vec<Entity>,
-}
-
-impl Diffable<GameScoreDelta> for GameScore {
-    fn base_value() -> Self {
-        Self {
-            players: HashMap::new(),
-            enemies: HashMap::new(),
-        }
-    }
-
-    fn diff(&self, new: &Self) -> GameScoreDelta {
-        let mut updated_players = HashMap::new();
-        let mut removed_players = Vec::new();
-
-        let mut updated_enemies = HashMap::new();
-        let mut removed_enemies = Vec::new();
-
-        for (entity, new_score) in &new.players {
-            match self.players.get(entity) {
-                // no change to score
-                Some(old_score) if old_score == new_score => {}
-                _ => {
-                    // either new player or score was updated
-                    updated_players.insert(*entity, new_score.clone());
-                }
-            }
-        }
-
-        for peer_id in self.players.keys() {
-            if !new.players.contains_key(peer_id) {
-                removed_players.push(*peer_id);
-            }
-        }
-
-        for (entity, new_score) in &new.enemies {
-            match self.enemies.get(entity) {
-                // no change to score
-                Some(old_score) if old_score == new_score => {}
-                _ => {
-                    // either new enemy or score was updated
-                    updated_enemies.insert(*entity, new_score.clone());
-                }
-            }
-        }
+// pub struct GameScoreDelta {
+//     updated_players: HashMap<u64, LivingEntityStats>,
+//     removed_players: Vec<u64>,
+//     updated_enemies: HashMap<Entity, LivingEntityStats>,
+//     removed_enemies: Vec<Entity>,
+// }
 
-        for entity in self.enemies.keys() {
-            if !new.enemies.contains_key(entity) {
-                removed_enemies.push(*entity);
-            }
-        }
-
-        GameScoreDelta {
-            updated_players,
-            removed_players,
-            updated_enemies,
-            removed_enemies,
-        }
-    }
-
-    fn apply_diff(&mut self, delta: &GameScoreDelta) {
-        for (peer_id, new_score) in &delta.updated_players {
-            self.players.insert(*peer_id, new_score.clone());
-        }
-
-        for peer_id in &delta.removed_players {
-            self.players.remove(peer_id);
-        }
-
-        for (entity, new_score) in &delta.updated_enemies {
-            self.enemies.insert(*entity, new_score.clone());
-        }
-
-        for entity in &delta.removed_enemies {
-            self.enemies.remove(entity);
-        }
-    }
-}
+// impl Diffable<GameScoreDelta> for GameScore {
+//     fn base_value() -> Self {
+//         Self {
+//             players: HashMap::new(),
+//             enemies: HashMap::new(),
+//         }
+//     }
+//
+//     fn diff(&self, new: &Self) -> GameScoreDelta {
+//         let mut updated_players = HashMap::new();
+//         let mut removed_players = Vec::new();
+//
+//         let mut updated_enemies = HashMap::new();
+//         let mut removed_enemies = Vec::new();
+//
+//         for (entity, new_score) in &new.players {
+//             match self.players.get(entity) {
+//                 // no change to score
+//                 Some(old_score) if old_score == new_score => {}
+//                 _ => {
+//                     // either new player or score was updated
+//                     updated_players.insert(*entity, new_score.clone());
+//                 }
+//             }
+//         }
+//
+//         for peer_id in self.players.keys() {
+//             if !new.players.contains_key(peer_id) {
+//                 removed_players.push(*peer_id);
+//             }
+//         }
+//
+//         for (entity, new_score) in &new.enemies {
+//             match self.enemies.get(entity) {
+//                 // no change to score
+//                 Some(old_score) if old_score == new_score => {}
+//                 _ => {
+//                     // either new enemy or score was updated
+//                     updated_enemies.insert(*entity, new_score.clone());
+//                 }
+//             }
+//         }
+//
+//         for entity in self.enemies.keys() {
+//             if !new.enemies.contains_key(entity) {
+//                 removed_enemies.push(*entity);
+//             }
+//         }
+//
+//         GameScoreDelta {
+//             updated_players,
+//             removed_players,
+//             updated_enemies,
+//             removed_enemies,
+//         }
+//     }
+//
+//     fn apply_diff(&mut self, delta: &GameScoreDelta) {
+//         for (peer_id, new_score) in &delta.updated_players {
+//             self.players.insert(*peer_id, new_score.clone());
+//         }
+//
+//         for peer_id in &delta.removed_players {
+//             self.players.remove(peer_id);
+//         }
+//
+//         for (entity, new_score) in &delta.updated_enemies {
+//             self.enemies.insert(*entity, new_score.clone());
+//         }
+//
+//         for entity in &delta.removed_enemies {
+//             self.enemies.remove(entity);
+//         }
+//     }
+// }
diff --git a/crates/shared/src/lib.rs b/crates/shared/src/lib.rs
index 819122c4..faadb9be 100644
--- a/crates/shared/src/lib.rs
+++ b/crates/shared/src/lib.rs
@@ -31,25 +31,21 @@ pub enum ServerRunMode {
 pub enum AppRole {
     /// This app is a client that is connecting to multiplayer server
     ClientOnly,
-    /// This app is a client that is also hosting a local server, e.g. Singleplayer
-    ClientAndServer,
+    // /// This app is a client that is also hosting a local server, e.g. Singleplayer
+    // ClientAndServer,
     /// This app is the server binary
     DedicatedServer,
 }
 
-/// The game mode that is running on the server
-#[derive(
-    States, Clone, PartialEq, Eq, Hash, Debug, Serialize, Deserialize, Default,
-)]
-pub enum GameModeServer {
-    #[default]
-    FreeForAll,
-    Waves,
-    FreeRoam,
+/// The currently active game configuration on the server
+#[derive(Resource, Serialize, Deserialize)]
+pub struct GameConfigServer {
+    pub game_mode: GameMode,
+    pub game_map: GameMap,
 }
 
 #[derive(
-    States, Clone, PartialEq, Eq, Hash, Debug, Default, Serialize, Deserialize,
+    States, Serialize, Deserialize, PartialEq, Clone, Eq, Hash, Debug, Default,
 )]
 pub enum GameStateServer {
     #[default]
@@ -109,7 +105,9 @@ impl Plugin for SharedPlugin {
 }
 
 // The current game map
-#[derive(States, Eq, Debug, PartialEq, Hash, Clone, Default)]
+#[derive(
+    States, Eq, Debug, PartialEq, Hash, Clone, Default, Serialize, Deserialize,
+)]
 pub enum GameMap {
     #[default]
     MediumPlastic,
@@ -129,13 +127,12 @@ pub fn handle_despawn_timer(
     }
 }
 
+// FIXME: im kinda confused about the flow. we have the GameCoreLoadingState which also does stuff,
+// but this StartGame message also causes stuff.
 /// game_core listens for this message. Upon receiving, game_core will spawn the map, spawn colliders,
 /// spawn enemies, etc...
 #[derive(Message)]
-pub struct StartGame {
-    pub map: GameMap,
-    pub game_mode: GameModeServer,
-}
+pub struct StartGame;
 
 /// A client can send this message to game_core, and game_core will despawn the map,
 /// despawn enemies, etc
@@ -153,3 +150,14 @@ pub struct NextWaveTimer(pub Timer);
 /// corresponding wave are killed
 #[derive(Message)]
 pub struct WaveFinishedMessage;
+
+#[derive(Debug, PartialEq, Serialize, Deserialize, Copy, Clone, Default)]
+pub enum GameMode {
+    /// Every wave more enemies get spawned
+    Waves,
+    /// Player can move around the map freely
+    #[default]
+    FreeRoam,
+    /// Every player against every other player, no teams
+    FreeForAll,
+}
diff --git a/crates/shared/src/multiplayer_messages.rs b/crates/shared/src/multiplayer_messages.rs
index 7be63f0c..4a604359 100644
--- a/crates/shared/src/multiplayer_messages.rs
+++ b/crates/shared/src/multiplayer_messages.rs
@@ -1,30 +1,32 @@
 use bevy::prelude::*;
 use serde::{Deserialize, Serialize};
 
-use crate::GameStateServer;
+use crate::{GameMap, GameMode, GameStateServer};
 
-#[derive(Serialize, Deserialize)]
-pub struct ClientUpdatePositionMessage {
-    pub new_translation: Vec3,
-}
-
-#[derive(Serialize, Deserialize)]
+#[derive(Message, Serialize, Deserialize)]
 pub struct ShootRequest {
     pub origin: Vec3,
     pub direction: Dir3,
     // pub client_tick: u32,
 }
 
+/// A client can send this to the server to request update of the game config on the server, such as
+/// the current map or game mode.
+// TODO: needs a more descriptive name
 #[derive(Serialize, Deserialize)]
-pub struct ChangeGameServerStateRequest(pub GameStateServer);
+pub enum ClientCommand {
+    SetGameMode(GameMode),
+    SetMap(GameMap),
+    SetState(GameStateServer),
+}
 
 /// A client can send this message to the server indicating that the player requested a respawn.
 /// The server will then update the players health and the players position.
 #[derive(Serialize, Deserialize)]
 pub struct ClientRespawnRequest;
 
-/// This message is sent from server to client, so the client can spawn the damage indicator
-/// TODO: Explain when this message gets sent
+/// This message is sent from server to client, whenever another player/enemy shot the player of
+/// that client
 #[derive(Serialize, Deserialize, Message, Copy, Clone)]
 pub struct PlayerHitMessage {
     pub origin: Vec3,
diff --git a/crates/shared/src/player.rs b/crates/shared/src/player.rs
index a25739b4..e592c601 100644
--- a/crates/shared/src/player.rs
+++ b/crates/shared/src/player.rs
@@ -9,7 +9,7 @@ use crate::{
     },
 };
 
-#[derive(Component, Debug, Reflect, Serialize, PartialEq, Deserialize)]
+#[derive(Component, Debug, Reflect, PartialEq, Serialize, Deserialize)]
 #[reflect(Component)]
 pub struct Player;
 
@@ -27,7 +27,7 @@ pub struct PlayerBundle {
     player_cash: PlayerCash,
 }
 
-#[derive(Component, Serialize, Deserialize, Clone, Default, PartialEq)]
+#[derive(Component, Clone, Default, PartialEq, Serialize, Deserialize)]
 pub struct PlayerState {
     pub shooting: bool,
     pub reloading: bool,
diff --git a/crates/shared/src/protocol.rs b/crates/shared/src/protocol.rs
index ff713292..b3ff8e1f 100644
--- a/crates/shared/src/protocol.rs
+++ b/crates/shared/src/protocol.rs
@@ -1,13 +1,12 @@
 use bevy::prelude::*;
-use lightyear::prelude::*;
+use netvy::prelude::*;
 
 use crate::{
-    components::{EntityPositionServer, Health},
+    components::Health,
     enemy::components::{Enemy, EnemyState},
     game_score::GameScore,
     multiplayer_messages::{
-        ChangeGameServerStateRequest, ClientRespawnRequest,
-        ClientUpdatePositionMessage, ConfirmRespawn, PlayerHitMessage,
+        ClientCommand, ClientRespawnRequest, ConfirmRespawn, PlayerHitMessage,
         ShootRequest,
     },
     player::{Player, PlayerState},
@@ -15,48 +14,50 @@ use crate::{
     world_object::WorldObjectCollectibleServerSide,
 };
 
-pub struct OrderedReliableChannel;
-pub struct SequencedUnreliableChannel;
-
 pub struct ProtocolPlugin;
 
 impl Plugin for ProtocolPlugin {
     fn build(&self, app: &mut App) {
-        app.add_channel::<SequencedUnreliableChannel>(ChannelSettings {
-            mode: ChannelMode::SequencedUnreliable,
-            ..default()
-        })
-        .add_direction(NetworkDirection::Bidirectional);
-
-        app.add_channel::<OrderedReliableChannel>(ChannelSettings {
-            mode: ChannelMode::OrderedReliable(ReliableSettings::default()),
-            ..default()
-        })
-        .add_direction(NetworkDirection::Bidirectional);
-
-        app.register_message::<ClientUpdatePositionMessage>()
-            .add_direction(NetworkDirection::ClientToServer);
-
-        app.register_message::<ShootRequest>()
-            .add_direction(NetworkDirection::ClientToServer);
-
-        app.register_message::<ClientRespawnRequest>()
-            .add_direction(NetworkDirection::ClientToServer);
-        app.register_message::<ConfirmRespawn>()
-            .add_direction(NetworkDirection::ServerToClient);
-
-        app.register_message::<ChangeGameServerStateRequest>()
-            .add_direction(NetworkDirection::ClientToServer);
-
-        app.register_message::<PlayerHitMessage>()
-            .add_direction(NetworkDirection::ServerToClient);
+        // app.add_channel::<SequencedUnreliableChannel>(ChannelSettings {
+        //     mode: ChannelMode::SequencedUnreliable,
+        //     ..default()
+        // })
+        // .add_direction(NetworkDirection::Bidirectional);
+        //
+        // app.add_channel::<OrderedReliableChannel>(ChannelSettings {
+        //     mode: ChannelMode::OrderedReliable(ReliableSettings::default()),
+        //     ..default()
+        // })
+        // .add_direction(NetworkDirection::Bidirectional);
+        //
+        app.register_net_message::<ShootRequest>(
+            MessageDirection::ClientToServer,
+        );
+
+        app.register_net_message::<ClientRespawnRequest>(
+            MessageDirection::ClientToServer,
+        );
+
+        app.register_net_message::<ConfirmRespawn>(
+            MessageDirection::ServerToClient,
+        );
+
+        app.register_net_message::<ClientCommand>(
+            MessageDirection::ClientToServer,
+        );
+
+        app.register_net_message::<PlayerHitMessage>(
+            MessageDirection::ServerToClient,
+        );
+
+        app.register_net_message::<ClientCommand>(
+            MessageDirection::ClientToServer,
+        );
 
         app.register_component::<Player>();
         app.register_component::<PlayerState>();
         app.register_component::<PlayerWeapons>();
 
-        app.register_component::<EntityPositionServer>();
-
         app.register_component::<Health>();
 
         app.register_component::<Enemy>();
diff --git a/crates/shared/src/utils/lightyear.rs b/crates/shared/src/utils/lightyear.rs
deleted file mode 100644
index ac292d97..00000000
--- a/crates/shared/src/utils/lightyear.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-pub enum DisconnectReason {
-    ClientTriggered,
-    Unknown,
-}
-
-pub fn parse_lightyear_disconnect_reason(
-    disconnect_reason: &str,
-) -> DisconnectReason {
-    if disconnect_reason.contains("Client trigger") {
-        return DisconnectReason::ClientTriggered;
-    }
-    DisconnectReason::Unknown
-}
diff --git a/crates/shared/src/utils/mod.rs b/crates/shared/src/utils/mod.rs
index afc7c555..fb7ce2e4 100644
--- a/crates/shared/src/utils/mod.rs
+++ b/crates/shared/src/utils/mod.rs
@@ -1,5 +1,4 @@
 pub mod auth;
-pub mod lightyear;
 pub mod network;
 pub mod random;
 pub mod transform;
diff --git a/crates/shared/src/world_object.rs b/crates/shared/src/world_object.rs
index 952237a7..1a710126 100644
--- a/crates/shared/src/world_object.rs
+++ b/crates/shared/src/world_object.rs
@@ -4,14 +4,14 @@ use serde::{Deserialize, Serialize};
 /// info about the world object collectible. this gets synced to all clients.
 /// if active == false, then this world object collectible is on cooldown,
 /// and clients will react to this change and hide the 3d model
-#[derive(Component, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Component, Debug, PartialEq, Serialize, Deserialize)]
 pub struct WorldObjectCollectibleServerSide {
     pub active: bool,
     pub kind: WorldObjectCollectibleKind,
     pub position: Vec3,
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Copy, Clone, Serialize, Deserialize)]
 pub enum WorldObjectCollectibleKind {
     Medkit,
     Ammunition,
diff --git a/flake.nix b/flake.nix
index bc90cfca..31a5fde0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,18 +36,18 @@
                 wayland
                 alsa-lib
                 libudev-zero
-                xorg.libX11
-                xorg.libXcursor
-                xorg.libXi
-                xorg.libXrandr
+                libX11
+                libXcursor
+                libXi
+                libXrandr
                 libxkbcommon
               ];
             RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
             LD_LIBRARY_PATH = lib.makeLibraryPath [
               vulkan-loader
-              xorg.libX11
-              xorg.libXi
-              xorg.libXcursor
+              libX11
+              libXi
+              libXcursor
               libxkbcommon
             ];
           };
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index f779a3fe..1693a95b 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
 channel = "nightly"
-components = ["rustc-codegen-cranelift-preview"]
+components = ["rustc-codegen-cranelift-preview", "rust-analyzer"]