diff --git a/Cargo.lock b/Cargo.lock
index 4a9925e..5565fdd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -434,9 +434,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bevy"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5cd3b24a5adb7c7378da7b3eea47639877643d11b6b087fc8a8094f2528615"
+checksum = "4b8369c16b7c017437021341521f8b4a0d98e1c70113fb358c3258ae7d661d79"
 dependencies = [
  "bevy_internal",
 ]
@@ -488,9 +488,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_a11y"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ed969a58fbe449ef35ebec58ab19578302537f34ee8a35d04e5a038b3c40f5"
+checksum = "ed3561712cf49074d89e9989bfc2e6c6add5d33288f689db9a0c333300d2d004"
 dependencies = [
  "accesskit",
  "bevy_app",
@@ -501,9 +501,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_animation"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3647b67c6bfd456922b2720ccef980dec01742d155d0eb454dc3d8fdc65e7aff"
+checksum = "49796627726d0b9a722ad9a0127719e7c1868f474d6575ec0f411e8299c4d7bb"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -535,9 +535,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_app"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2b6267ac23a9947d5b2725ff047a1e1add70076d85fa9fb73d044ab9bea1f3c"
+checksum = "4491cc4c718ae76b4c6883df58b94cc88b32dcd894ea8d5b603c7c7da72ca967"
 dependencies = [
  "bevy_derive",
  "bevy_ecs",
@@ -558,9 +558,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0698040d63199391ea77fd02e039630748e3e335c3070c6d932fd96cbf80f5d6"
+checksum = "f56111d9b88d8649f331a667d9d72163fb26bd09518ca16476d238653823db1e"
 dependencies = [
  "async-broadcast",
  "async-fs",
@@ -599,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_asset_macros"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf8c00b5d532f8e5ac7b49af10602f9f7774a2d522cf0638323b5dfeee7b31c"
+checksum = "a4cca3e67c0ec760d8889d42293d987ce5da92eaf9c592bf5d503728a63b276d"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -611,9 +611,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_audio"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74e54154e6369abdbaf5098e20424d59197c9b701d4f79fe8d0d2bde03d25f12"
+checksum = "f2b4f6f2a5c6c0e7c6825e791d2a061c76c2d6784f114c8f24382163fabbfaaa"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -629,9 +629,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_color"
-version = "0.16.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf6a5ad35496bbc41713efbcf06ab72b9a310fabcab0f9db1debb56e8488c6e"
+checksum = "5c101cbe1e26b8d701eb77263b14346e2e0cbbd2a6e254b9b1aead814e5ca8d3"
 dependencies = [
  "bevy_math",
  "bevy_reflect",
@@ -645,9 +645,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_core_pipeline"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55c2310717b9794e4a45513ee5946a7be0838852a4c1e185884195e1a8688ff3"
+checksum = "59ed46363cad80dc00f08254c3015232bd6f640738403961c6d63e7ecfc61625"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -675,9 +675,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_derive"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f626531b9c05c25a758ede228727bd11c2c2c8498ecbed9925044386d525a2a3"
+checksum = "1b837bf6c51806b10ebfa9edf1844ad80a3a0760d6c5fac4e90761df91a8901a"
 dependencies = [
  "bevy_macro_utils",
  "quote",
@@ -685,10 +685,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "bevy_diagnostic"
-version = "0.16.0"
+name = "bevy_dev_tools"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048a1ff3944a534b8472516866284181eef0a75b6dd4d39b6e5925715e350766"
+checksum = "8f29a3abf7b8e0148ef4f74a4ec63f4efb00a3d62aba361921a5d259410556d5"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_color",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_picking",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_state",
+ "bevy_text",
+ "bevy_time",
+ "bevy_ui",
+ "bevy_utils",
+ "bevy_window",
+ "tracing",
+]
+
+[[package]]
+name = "bevy_diagnostic"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48797366f312a8f31e237d08ce3ee70162591282d2bfe7c5ad8be196fb263e55"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -704,9 +728,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9e807b5d9aab3bb8dfe47e7a44c9ff088bad2ceefe299b80ac77609a87fe9d4"
+checksum = "3c2bf6521aae57a0ec3487c4bfb59e36c4a378e834b626a4bea6a885af2fdfe7"
 dependencies = [
  "arrayvec",
  "bevy_ecs_macros",
@@ -732,9 +756,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ecs_macros"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "467d7bb98aeb8dd30f36e6a773000c12a891d4f1bee2adc3841ec89cc8eaf54e"
+checksum = "38748d6f3339175c582d751f410fb60a93baf2286c3deb7efebb0878dce7f413"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -779,9 +803,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_encase_derive"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8bb31dc1090c6f8fabbf6b21994d19a12766e786885ee48ffc547f0f1fa7863"
+checksum = "8148f4edee470a2ea5cad010184c492a4c94c36d7a7158ea28e134ea87f274ab"
 dependencies = [
  "bevy_macro_utils",
  "encase_derive_impl",
@@ -789,9 +813,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gilrs"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "950c84596dbff8a9691a050c37bb610ef9398af56369c2c2dd6dc41ef7b717a5"
+checksum = "97efef87c631949e67d06bb5d7dfd2a5f936b3b379afb6b1485b08edbb219b87"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -806,9 +830,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54af8145b35ab2a830a6dd1058e23c1e1ddc4b893db79d295259ef82f51c7520"
+checksum = "7823154a9682128c261d8bddb3a4d7192a188490075c527af04520c2f0f8aad6"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -831,9 +855,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gizmos_macros"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40137ace61f092b7a09eba41d7d1e6aef941f53a7818b06ef86dcce7b6a1fd3f"
+checksum = "f378f3b513218ddc78254bbe76536d9de59c1429ebd0c14f5d8f2a25812131ad"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -843,9 +867,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_gltf"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa25b809ee024ef2682bafc1ca22ca8275552edb549dc6f69a030fdffd976c63"
+checksum = "10a080237c0b8842ccc15a06d3379302c68580eeea4497b1c7387e470eda1f07"
 dependencies = [
  "base64 0.22.1",
  "bevy_animation",
@@ -888,9 +912,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_image"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "840b25f7f58894c641739f756959028a04f519c448db7e2cd3e2e29fc5fd188d"
+checksum = "65e6e900cfecadbc3149953169e36b9e26f922ed8b002d62339d8a9dc6129328"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -916,9 +940,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763410715714f3d4d2dcdf077af276e2e4ea93fd8081b183d446d060ea95baaa"
+checksum = "18d6b6516433f6f7d680f648d04eb1866bb3927a1782d52f74831b62042f3cd1"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -934,9 +958,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_input_focus"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e7b4ed65e10927a39a987cf85ef98727dd319aafb6e6835f2cb05b883c6d66"
+checksum = "2e2d079fda74d1416e0a57dac29ea2b79ff77f420cd6b87f833d3aa29a46bc4d"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -950,9 +974,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_internal"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "526ffd64c58004cb97308826e896c07d0e23dc056c243b97492e31cdf72e2830"
+checksum = "857da8785678fde537d02944cd20dec9cafb7d4c447efe15f898dc60e733cacd"
 dependencies = [
  "bevy_a11y",
  "bevy_animation",
@@ -962,6 +986,7 @@ dependencies = [
  "bevy_color",
  "bevy_core_pipeline",
  "bevy_derive",
+ "bevy_dev_tools",
  "bevy_diagnostic",
  "bevy_ecs",
  "bevy_gilrs",
@@ -993,9 +1018,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_log"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7156df8d2f11135cf71c03eb4c11132b65201fd4f51648571e59e39c9c9ee2f6"
+checksum = "d7a61ee8aef17a974f5ca481dcedf0c2bd52670e231d4c4bc9ddef58328865f9"
 dependencies = [
  "android_log-sys",
  "bevy_app",
@@ -1010,9 +1035,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_macro_utils"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2473db70d8785b5c75d6dd951a2e51e9be2c2311122db9692c79c9d887517b"
+checksum = "052eeebcb8e7e072beea5031b227d9a290f8a7fbbb947573ab6ec81df0fb94be"
 dependencies = [
  "parking_lot",
  "proc-macro2",
@@ -1023,9 +1048,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_math"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a3a926d02dc501c6156a047510bdb538dcb1fa744eeba13c824b73ba88de55"
+checksum = "68553e0090fe9c3ba066c65629f636bd58e4ebd9444fdba097b91af6cd3e243f"
 dependencies = [
  "approx",
  "bevy_reflect",
@@ -1043,9 +1068,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_mesh"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12af58280c7453e32e2f083d86eaa4c9b9d03ea8683977108ded8f1930c539f2"
+checksum = "b10399c7027001edbc0406d7d0198596b1f07206c1aae715274106ba5bdcac40"
 dependencies = [
  "bevy_asset",
  "bevy_derive",
@@ -1068,18 +1093,18 @@ dependencies = [
 
 [[package]]
 name = "bevy_mikktspace"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75e0258423c689f764556e36b5d9eebdbf624b29a1fd5b33cd9f6c42dcc4d5f3"
+checksum = "8bb60c753b968a2de0fd279b76a3d19517695e771edb4c23575c7f92156315de"
 dependencies = [
  "glam",
 ]
 
 [[package]]
 name = "bevy_pbr"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9fe0de43b68bf9e5090a33efc963f125e9d3f9d97be9ebece7bcfdde1b6da80"
+checksum = "d5e0b4eb871f364a0d217f70f6c41d7fdc6f9f931fa1abbf222180c03d0ae410"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1111,9 +1136,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_picking"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73674f62b1033006bd75c89033f5d3516386cfd7d43bb9f7665012c0ab14d22"
+checksum = "8ed04757938655ed8094ea1efb533f99063a8b22abffc22010c694d291522850"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1136,9 +1161,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_platform"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704db2c11b7bc31093df4fbbdd3769f9606a6a5287149f4b51f2680f25834ebc"
+checksum = "f7573dc824a1b08b4c93fdbe421c53e1e8188e9ca1dd74a414455fe571facb47"
 dependencies = [
  "cfg-if",
  "critical-section",
@@ -1154,15 +1179,15 @@ dependencies = [
 
 [[package]]
 name = "bevy_ptr"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f1275dfb4cfef4ffc90c3fa75408964864facf833acc932413d52aa5364ba4"
+checksum = "df7370d0e46b60e071917711d0860721f5347bc958bf325975ae6913a5dfcf01"
 
 [[package]]
 name = "bevy_reflect"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "607ebacc31029cf2f39ac330eabf1d4bc411b159528ec08dbe6b0593eaccfd41"
+checksum = "daeb91a63a1a4df00aa58da8cc4ddbd4b9f16ab8bb647c5553eb156ce36fa8c2"
 dependencies = [
  "assert_type_match",
  "bevy_platform",
@@ -1187,9 +1212,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_reflect_derive"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf35e45e4eb239018369f63f2adc2107a54c329f9276d020e01eee1625b0238b"
+checksum = "40ddadc55fe16b45faaa54ab2f9cb00548013c74812e8b018aa172387103cce6"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -1200,9 +1225,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_render"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a7306235b3343b032801504f3e884b93abfb7ba58179fc555c479df509f349"
+checksum = "ef91fed1f09405769214b99ebe4390d69c1af5cdd27967deae9135c550eb1667"
 dependencies = [
  "async-channel",
  "bevy_app",
@@ -1252,9 +1277,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_render_macros"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b85c4fb26b66d3a257b655485d11b9b6df9d3c85026493ba8092767a5edfc1b2"
+checksum = "abd42cf6c875bcf38da859f8e731e119a6aff190d41dd0a1b6000ad57cf2ed3d"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -1264,9 +1289,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_scene"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7b628f560f2d2fe9f35ecd4526627ba3992f082de03fd745536e4053a0266fe"
+checksum = "5c52ca165200995fe8afd2a1a6c03e4ffee49198a1d4653d32240ea7f217d4ab"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1285,9 +1310,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_sprite"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01f97bf54fb1c37a1077139b59bb32bc77f7ca53149cfcaa512adbb69a2d492c"
+checksum = "6ccae7bab2cb956fb0434004c359e432a3a1a074a6ef4eb471f1fb099f0b620b"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1315,9 +1340,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_state"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "682c343c354b191fe6669823bce3b0695ee1ae4ac36f582e29c436a72b67cdd5"
+checksum = "155d3cd97b900539008cdcaa702f88b724d94b08977b8e591a32536ce66faa8c"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1331,9 +1356,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_state_macros"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55b4bf3970c4f0e60572901df4641656722172c222d71a80c430d36b0e31426c"
+checksum = "2481c1304fd2a1851a0d4cb63a1ce6421ae40f3f0117cbc9882963ee4c9bb609"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -1343,9 +1368,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_tasks"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444c450b65e108855f42ecb6db0c041a56ea7d7f10cc6222f0ca95e9536a7d19"
+checksum = "5b674242641cab680688fc3b850243b351c1af49d4f3417a576debd6cca8dcf5"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -1365,9 +1390,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_text"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ef071262c5a9afbc39caba4c0b282c7d045fbb5cf33bdab1924bd2343403833"
+checksum = "1d76c85366159f5f54110f33321c76d8429cfd8f39638f26793a305dae568b60"
 dependencies = [
  "bevy_app",
  "bevy_asset",
@@ -1395,9 +1420,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_time"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456369ca10f8e039aaf273332744674844827854833ee29e28f9e161702f2f55"
+checksum = "bc98eb356c75be04fbbc77bb3d8ffa24c8bacd99f76111cee23d444be6ac8c9c"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1410,9 +1435,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_transform"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8479cdd5461246943956a7c8347e4e5d6ff857e57add889fb50eee0b5c26ab48"
+checksum = "df218e440bb9a19058e1b80a68a031c887bcf7bd3a145b55f361359a2fa3100d"
 dependencies = [
  "bevy_app",
  "bevy_ecs",
@@ -1437,9 +1462,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_ui"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "110dc5d0059f112263512be8cd7bfe0466dfb7c26b9bf4c74529355249fd23f9"
+checksum = "ea4a4d2ba51865bc3039af29a26b4f52c48b54cc758369f52004caf4b6f03770"
 dependencies = [
  "accesskit",
  "bevy_a11y",
@@ -1472,9 +1497,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_utils"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2da3b3c1f94dadefcbe837aaa4aa119fcea37f7bdc5307eb05b4ede1921e24"
+checksum = "94f7a8905a125d2017e8561beefb7f2f5e67e93ff6324f072ad87c5fd6ec3b99"
 dependencies = [
  "bevy_platform",
  "thread_local",
@@ -1482,9 +1507,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_window"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d83327cc5584da463d12b7a88ddb97f9e006828832287e1564531171fffdeb4"
+checksum = "df7e8ad0c17c3cc23ff5566ae2905c255e6986037fb041f74c446216f5c38431"
 dependencies = [
  "android-activity",
  "bevy_app",
@@ -1502,9 +1527,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_winit"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b14928923ae4274f4b867dce3d0e7b2c8a31bebcb0f6e65a4261c3e0765064"
+checksum = "6a5e7f00c6b3b6823df5ec2a5e9067273607208919bc8c211773ebb9643c87f0"
 dependencies = [
  "accesskit",
  "accesskit_winit",
diff --git a/Cargo.toml b/Cargo.toml
index 420ddb2..0c5e26f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,11 +4,35 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-avian3d = { version = "0.3.0", features = ["debug-plugin"] }
-bevy = { version = "0.16.0", features = ["file_watcher"] }
+avian3d = { version = "0.3.0", features = [] }
+bevy = { version = "0.16.1", features = [] }
 # bevy_rapier3d = { version = "0.29.0", features = ["simd-stable", "parallel"] }
 bevy-inspector-egui = "0.31.0"
 
+[features]
+default = ["dev"]
+dev = [
+	"avian3d/debug-plugin",
+	"bevy/bevy_dev_tools",
+	"bevy/bevy_ui_debug",
+	"bevy/track_location",
+	"bevy/file_watcher",
+	"bevy/embedded_watcher",
+	"dev-viz"
+]
+dev-viz = []
+dev-phsy = []
+
+[lints.clippy]
+# Bevy supplies arguments to systems via dependency injection, so it's natural for systems to
+# request more than 7 arguments, which would undesirably trigger this lint.
+too_many_arguments = "allow"
+# Queries may access many components, which would undesirably trigger this lint.
+type_complexity = "allow"
+# Make sure macros use their standard braces, such as `[]` for `bevy_ecs::children!`.
+nonstandard_macro_braces = "warn"
+needless_return = "allow"
+
 # Enable a small amount of optimization in debug mode
 [profile.dev]
 opt-level = 1
diff --git a/src/components/camera.rs b/src/components/camera.rs
new file mode 100644
index 0000000..e07c408
--- /dev/null
+++ b/src/components/camera.rs
@@ -0,0 +1,39 @@
+use bevy::prelude::*;
+
+#[derive(Component, Reflect)]
+pub struct FreeCam(pub bool);
+
+#[derive(Component, Default, Reflect)]
+pub struct MainCamera;
+
+#[derive(Component, Default, Reflect)]
+pub struct CameraRoot;
+#[derive(Component, Default, Reflect)]
+pub struct CameraPitch(pub f32);
+#[derive(Component, Reflect)]
+pub struct Unfocused;
+
+#[derive(Component, Reflect)]
+#[require(FollowTarget)]
+pub struct FollowCam {
+	pub target: Entity,
+	pub distance: f32,
+	pub height: f32,
+}
+
+#[derive(Component, Reflect)]
+pub struct FollowTarget {
+	pub pos: Vec3,
+	pub rot: Quat,
+	pub up: Dir3,
+}
+
+impl Default for FollowTarget {
+	fn default() -> Self {
+		return Self {
+			pos: default(),
+			rot: default(),
+			up: Dir3::Y,
+		};
+	}
+}
diff --git a/src/components/mod.rs b/src/components/mod.rs
new file mode 100644
index 0000000..3296553
--- /dev/null
+++ b/src/components/mod.rs
@@ -0,0 +1,2 @@
+pub mod camera;
+pub mod tags;
diff --git a/src/components/tags.rs b/src/components/tags.rs
new file mode 100644
index 0000000..c740c39
--- /dev/null
+++ b/src/components/tags.rs
@@ -0,0 +1,7 @@
+use bevy::prelude::*;
+
+#[derive(Component, Reflect)]
+pub struct Player;
+
+#[derive(Component, Reflect)]
+pub struct Ship;
diff --git a/src/main.rs b/src/main.rs
index 5a9581a..03235d0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,10 @@
 mod plugins;
+mod utils;
 use bevy::{prelude::*, window::PresentMode};
 use bevy_inspector_egui::{bevy_egui::EguiPlugin, quick::WorldInspectorPlugin};
 use plugins::game::GamePlugin;
+mod components;
+mod resources;
 
 fn main() {
 	App::new()
@@ -29,7 +32,7 @@ fn main() {
 				enable_multipass_for_primary_context: true,
 			},
 			WorldInspectorPlugin::new(),
-			GamePlugin::default(),
+			GamePlugin,
 		))
 		.run();
 }
diff --git a/src/plugins/follow_cam.rs b/src/plugins/follow_cam.rs
new file mode 100644
index 0000000..24ed8ff
--- /dev/null
+++ b/src/plugins/follow_cam.rs
@@ -0,0 +1,28 @@
+use bevy::prelude::*;
+
+use crate::components::camera::{FollowCam, FollowTarget};
+
+pub struct FollowCamPlugin;
+
+impl Plugin for FollowCamPlugin {
+	fn build(&self, app: &mut App) {
+		app.add_systems(Update, (set_cam_target, follow_cam).chain());
+	}
+}
+
+fn set_cam_target(transforms: Query<&GlobalTransform>, cam_target: Single<(&mut FollowTarget, &FollowCam)>) {
+	let (mut tgt, cam) = cam_target.into_inner();
+	if let Ok(tgt_transform) = transforms.get(cam.target) {
+		tgt.pos = tgt_transform.translation();
+		tgt.rot = tgt_transform.rotation();
+		tgt.up = tgt_transform.up();
+	}
+}
+
+fn follow_cam(cam: Single<(&mut Transform, &FollowTarget, &FollowCam)>) {
+	let (mut transform, tgt, cam) = cam.into_inner();
+
+	let offset = tgt.rot * Vec3::new(0.0, cam.height, cam.distance);
+	transform.translation = offset + tgt.pos;
+	*transform = transform.looking_at(tgt.pos, tgt.up);
+}
diff --git a/src/plugins/free_cam.rs b/src/plugins/free_cam.rs
new file mode 100644
index 0000000..b3426f7
--- /dev/null
+++ b/src/plugins/free_cam.rs
@@ -0,0 +1,71 @@
+use std::f32::consts::FRAC_PI_2;
+
+use bevy::{input::mouse::MouseMotion, prelude::*};
+
+use crate::{components::camera::*, utils::input::get_mouse_delta};
+
+pub struct FreeCamPlugin;
+
+impl Plugin for FreeCamPlugin {
+	fn build(&self, app: &mut App) {
+		app.add_systems(Update, ((camera_yaw, camera_pitch).chain(), free_camera));
+	}
+}
+
+const FLY_SPEED: f32 = 10.0;
+pub fn free_camera(
+	cam_query: Single<(&mut Transform, &FreeCam), (With<CameraRoot>, Without<Unfocused>)>,
+	cam_pitch: Single<&CameraPitch>,
+	key: Res<ButtonInput<KeyCode>>,
+	time: Res<Time>,
+) {
+	let mut move_dir = Vec3::ZERO;
+	let pitch = cam_pitch.0;
+	let (mut cam_transform, freecam) = cam_query.into_inner();
+	if !freecam.0 {
+		return;
+	}
+	if key.pressed(KeyCode::KeyW) {
+		move_dir.z = -1.0;
+	} else if key.pressed(KeyCode::KeyS) {
+		move_dir.z = 1.0;
+	}
+
+	if key.pressed(KeyCode::KeyD) {
+		move_dir.x = 1.0;
+	} else if key.pressed(KeyCode::KeyA) {
+		move_dir.x = -1.0;
+	}
+
+	move_dir = cam_transform.rotation
+		* Quat::from_rotation_x(pitch)
+		* move_dir.normalize_or_zero()
+		* time.delta_secs()
+		* FLY_SPEED;
+
+	cam_transform.translation += move_dir;
+}
+
+pub fn camera_yaw(
+	cam_yaw_query: Single<(&mut Transform, &FreeCam), (With<CameraRoot>, Without<Unfocused>)>,
+	cam_query: Single<&mut CameraPitch>,
+	mouse_motion: EventReader<MouseMotion>,
+	time: Res<Time>,
+) {
+	let (mut yaw_transform, freecam) = cam_yaw_query.into_inner();
+	if !freecam.0 {
+		return;
+	}
+	let mut pitch = cam_query.into_inner();
+
+	let delta = get_mouse_delta(mouse_motion) * -time.delta_secs();
+
+	yaw_transform.rotate_y(delta.x);
+
+	pitch.0 = (pitch.0 + delta.y).clamp(-FRAC_PI_2 + 0.001, FRAC_PI_2 - 0.001);
+}
+
+pub fn camera_pitch(cam_query: Single<(&mut Transform, &CameraPitch)>) {
+	let (mut cam_transform, pitch) = cam_query.into_inner();
+	cam_transform.rotation = Quat::from_rotation_x(pitch.0);
+}
diff --git a/src/plugins/game.rs b/src/plugins/game.rs
index fedb649..9c33c8a 100644
--- a/src/plugins/game.rs
+++ b/src/plugins/game.rs
@@ -1,38 +1,33 @@
-use std::f32::consts::FRAC_PI_2;
-
 use avian3d::{PhysicsPlugins, prelude::*};
 use bevy::{
-	input::mouse::MouseMotion,
 	prelude::*,
 	window::{CursorGrabMode, PrimaryWindow},
 };
+
+use crate::{
+	components::{
+		camera::{CameraPitch, CameraRoot, FollowCam, MainCamera, Unfocused},
+		tags::Ship,
+	},
+	plugins::{follow_cam::FollowCamPlugin, free_cam::FreeCamPlugin, ship::ShipPlugin, types::TypesPlugin},
+};
 // use bevy_rapier3d::prelude::*;
 
 #[derive(Default)]
 pub struct GamePlugin;
 
-#[derive(Component, Default)]
-pub struct MainCamera;
-
-#[derive(Component, Default)]
-pub struct CameraRoot;
-#[derive(Component, Default)]
-pub struct CameraPitch(pub f32);
-#[derive(Component)]
-pub struct Unfocused;
-
-#[derive(Component)]
-pub struct Ship;
-
 impl Plugin for GamePlugin {
 	fn build(&self, app: &mut bevy::app::App) {
-		// app.add_plugins(RapierPhysicsPlugin::<NoUserData>::default());
-		app.add_plugins((PhysicsPlugins::default(), PhysicsDebugPlugin::default()));
+		app.add_plugins((FollowCamPlugin, ShipPlugin, TypesPlugin));
+		app.add_plugins((
+			PhysicsPlugins::default(),
+			#[cfg(feature = "dev-phys")]
+			PhysicsDebugPlugin::default(),
+		));
 		app.insert_resource(Gravity::ZERO);
-		app.add_systems(Startup, (setup_scene, spawn_ship));
+		app.add_systems(Startup, (setup_scene, spawn_ship).chain());
 
-		app.add_systems(Update, ((camera_yaw, camera_pitch).chain(), camera_toggle, fly_camera));
-		app.add_systems(Update, ship_controls);
+		app.add_systems(Update, camera_toggle);
 	}
 }
 
@@ -48,12 +43,12 @@ fn setup_scene(
 	commands.spawn((
 		Name::new("Camera Root"),
 		Transform::from_xyz(0.0, 1.3, 0.0),
-		CameraRoot::default(),
+		CameraRoot,
 		Visibility::default(),
 		children![(
 			Camera3d::default(),
 			CameraPitch::default(),
-			MainCamera::default(),
+			MainCamera,
 			Transform::default()
 		)],
 	));
@@ -84,58 +79,67 @@ fn spawn_ship(
 	mut commands: Commands,
 	mut meshes: ResMut<Assets<Mesh>>,
 	mut materials: ResMut<Assets<StandardMaterial>>,
+	camera: Single<Entity, With<MainCamera>>,
 ) {
-	let window_material = materials.add(Color::lcha(1.0, 0.0, 1.0, 0.5));
+	let window_material = materials.add(Color::linear_rgba(1.0, 0.0, 1.0, 0.5));
 
 	let material = materials.add(Color::BLACK);
 
-	commands.spawn((
-		Mesh3d(meshes.add(Cuboid::new(3.0, 0.1, 6.0))),
-		MeshMaterial3d(material.clone()),
-		Name::new("Ship"),
-		Ship,
-		LinearDamping::default(),
-		AngularDamping::default(),
-		Transform::from_xyz(0.0, 1.0, 0.0),
-		RigidBody::Dynamic,
-		children![
-			(
-				Name::new("Back Wall"),
-				Mesh3d(meshes.add(Cuboid::new(3.0, 2.0, 0.1))),
-				Collider::cuboid(3.0, 2.0, 0.1),
-				MeshMaterial3d(material.clone()),
-				Transform::from_xyz(0.0, 1.0, 6.0 / 2.0),
-			),
-			(
-				Name::new("Front Window"),
-				Mesh3d(meshes.add(Cuboid::new(3.0, 2.0, 0.1))),
-				Collider::cuboid(3.0, 2.0, 0.1),
-				MeshMaterial3d(window_material),
-				Transform::from_xyz(0.0, 1.0, -6.0 / 2.0),
-			),
-			(
-				Name::new("Right Wall"),
-				Mesh3d(meshes.add(Cuboid::new(0.1, 2.0, 6.0))),
-				Collider::cuboid(0.1, 2.0, 6.0),
-				MeshMaterial3d(material.clone()),
-				Transform::from_xyz(3.0 / 2.0, 1.0, 0.0),
-			),
-			(
-				Name::new("Left Wall"),
-				Mesh3d(meshes.add(Cuboid::new(0.1, 2.0, 6.0))),
-				Collider::cuboid(0.1, 2.0, 6.0),
-				MeshMaterial3d(material.clone()),
-				Transform::from_xyz(-3.0 / 2.0, 1.0, 0.0),
-			),
-			(
-				Name::new("Roof"),
-				Mesh3d(meshes.add(Cuboid::new(3.0, 0.1, 6.0))),
-				Collider::cuboid(3.0, 0.1, 6.0),
-				MeshMaterial3d(material.clone()),
-				Transform::from_xyz(0.0, 2.0, 0.0),
-			)
-		],
-	));
+	let ship = commands
+		.spawn((
+			Mesh3d(meshes.add(Cuboid::new(3.0, 0.1, 6.0))),
+			MeshMaterial3d(material.clone()),
+			Name::new("Ship"),
+			Ship,
+			LinearDamping::default(),
+			AngularDamping::default(),
+			Transform::from_xyz(0.0, 1.0, 0.0),
+			RigidBody::Dynamic,
+			children![
+				(
+					Name::new("Back Wall"),
+					Mesh3d(meshes.add(Cuboid::new(3.0, 2.0, 0.1))),
+					Collider::cuboid(3.0, 2.0, 0.1),
+					MeshMaterial3d(material.clone()),
+					Transform::from_xyz(0.0, 1.0, 6.0 / 2.0),
+				),
+				(
+					Name::new("Front Window"),
+					Mesh3d(meshes.add(Cuboid::new(3.0, 2.0, 0.1))),
+					Collider::cuboid(3.0, 2.0, 0.1),
+					MeshMaterial3d(window_material),
+					Transform::from_xyz(0.0, 1.0, -6.0 / 2.0),
+				),
+				(
+					Name::new("Right Wall"),
+					Mesh3d(meshes.add(Cuboid::new(0.1, 2.0, 6.0))),
+					Collider::cuboid(0.1, 2.0, 6.0),
+					MeshMaterial3d(material.clone()),
+					Transform::from_xyz(3.0 / 2.0, 1.0, 0.0),
+				),
+				(
+					Name::new("Left Wall"),
+					Mesh3d(meshes.add(Cuboid::new(0.1, 2.0, 6.0))),
+					Collider::cuboid(0.1, 2.0, 6.0),
+					MeshMaterial3d(material.clone()),
+					Transform::from_xyz(-3.0 / 2.0, 1.0, 0.0),
+				),
+				(
+					Name::new("Roof"),
+					Mesh3d(meshes.add(Cuboid::new(3.0, 0.1, 6.0))),
+					Collider::cuboid(3.0, 0.1, 6.0),
+					MeshMaterial3d(material.clone()),
+					Transform::from_xyz(0.0, 2.0, 0.0),
+				)
+			],
+		))
+		.id();
+
+	commands.entity(camera.into_inner()).insert(FollowCam {
+		distance: 20.,
+		height: 10.,
+		target: ship,
+	});
 }
 
 pub fn camera_toggle(
@@ -156,117 +160,3 @@ pub fn camera_toggle(
 		}
 	}
 }
-
-const FLY_SPEED: f32 = 10.0;
-pub fn fly_camera(
-	cam_query: Single<&mut Transform, (With<CameraRoot>, Without<Unfocused>)>,
-	cam_pitch: Single<&CameraPitch>,
-	key: Res<ButtonInput<KeyCode>>,
-	time: Res<Time>,
-) {
-	let mut move_dir = Vec3::ZERO;
-	let pitch = cam_pitch.0;
-	let mut cam_transform = cam_query.into_inner();
-
-	if key.pressed(KeyCode::KeyW) {
-		move_dir.z = -1.0;
-	} else if key.pressed(KeyCode::KeyS) {
-		move_dir.z = 1.0;
-	}
-
-	if key.pressed(KeyCode::KeyD) {
-		move_dir.x = 1.0;
-	} else if key.pressed(KeyCode::KeyA) {
-		move_dir.x = -1.0;
-	}
-
-	move_dir = cam_transform.rotation
-		* Quat::from_rotation_x(pitch)
-		* move_dir.normalize_or_zero()
-		* time.delta_secs()
-		* FLY_SPEED;
-
-	cam_transform.translation += move_dir;
-}
-
-pub fn camera_yaw(
-	cam_yaw_query: Single<&mut Transform, (With<CameraRoot>, Without<Unfocused>)>,
-	cam_query: Single<&mut CameraPitch>,
-	mouse_motion: EventReader<MouseMotion>,
-	time: Res<Time>,
-) {
-	let mut yaw_transform = cam_yaw_query.into_inner();
-	let mut pitch = cam_query.into_inner();
-
-	let delta = get_mouse_delta(mouse_motion) * -time.delta_secs();
-
-	yaw_transform.rotate_y(delta.x);
-
-	pitch.0 = (pitch.0 + delta.y).clamp(-FRAC_PI_2 + 0.001, FRAC_PI_2 - 0.001);
-}
-
-pub fn camera_pitch(cam_query: Single<(&mut Transform, &CameraPitch)>) {
-	let (mut cam_transform, pitch) = cam_query.into_inner();
-	cam_transform.rotation = Quat::from_rotation_x(pitch.0);
-}
-
-fn get_mouse_delta(mut mouse_motion: EventReader<MouseMotion>) -> Vec2 {
-	let mut delta = Vec2::ZERO;
-	for e in mouse_motion.read() {
-		delta += e.delta;
-	}
-	return delta;
-}
-
-fn ship_controls(
-	ship_query: Single<
-		(
-			&Transform,
-			&mut LinearVelocity,
-			&mut AngularVelocity,
-			&mut LinearDamping,
-			&mut AngularDamping,
-		),
-		With<Ship>,
-	>,
-	window: Single<&Window, With<PrimaryWindow>>,
-	key: Res<ButtonInput<KeyCode>>,
-	time: Res<Time>,
-) {
-	if !window.cursor_options.visible {
-		return;
-	}
-	let (transform, mut vel, mut ang, mut ldamp, mut adamp) = ship_query.into_inner();
-
-	let mut move_vec = Vec3::ZERO;
-
-	if key.pressed(KeyCode::KeyW) {
-		move_vec.z = -1.0;
-	} else if key.pressed(KeyCode::KeyS) {
-		move_vec.z = 1.0;
-	}
-
-	if key.pressed(KeyCode::KeyA) {
-		move_vec.x = -1.0;
-	} else if key.pressed(KeyCode::KeyD) {
-		move_vec.x = 1.0;
-	}
-
-	if key.pressed(KeyCode::Space) {
-		move_vec.y = 1.0;
-	} else if key.pressed(KeyCode::ShiftLeft) {
-		move_vec.y = -1.0;
-	}
-
-	if key.pressed(KeyCode::ControlLeft) {
-		ldamp.0 = 0.8;
-		adamp.0 = 0.8;
-	} else {
-		ldamp.0 = 0.0;
-		adamp.0 = 0.0;
-	}
-
-	move_vec = transform.rotation * move_vec.normalize_or_zero();
-
-	vel.0 += move_vec * time.delta_secs();
-}
diff --git a/src/plugins/mod.rs b/src/plugins/mod.rs
index f7ee1cd..7926daf 100644
--- a/src/plugins/mod.rs
+++ b/src/plugins/mod.rs
@@ -1 +1,6 @@
+pub mod follow_cam;
+pub mod free_cam;
 pub mod game;
+pub mod ship;
+pub mod ship_cam;
+pub mod types;
diff --git a/src/plugins/ship.rs b/src/plugins/ship.rs
new file mode 100644
index 0000000..2f29899
--- /dev/null
+++ b/src/plugins/ship.rs
@@ -0,0 +1,112 @@
+use avian3d::prelude::*;
+use bevy::{input::mouse::MouseMotion, prelude::*};
+
+use crate::{components::tags::Ship, utils::input::get_mouse_delta};
+
+pub struct ShipPlugin;
+
+impl Plugin for ShipPlugin {
+	fn build(&self, app: &mut App) {
+		app.add_systems(Update, ship_controls);
+		#[cfg(feature = "dev-viz")]
+		app.add_systems(Update, ship_debug);
+	}
+}
+
+fn ship_controls(
+	ship_query: Single<
+		(
+			&Transform,
+			&mut LinearVelocity,
+			&mut AngularVelocity,
+			&mut LinearDamping,
+			&mut AngularDamping,
+		),
+		With<Ship>,
+	>,
+	key: Res<ButtonInput<KeyCode>>,
+	time: Res<Time>,
+	mut mouse_motion: EventReader<MouseMotion>,
+) {
+	let (transform, mut vel, mut ang, mut ldamp, mut adamp) = ship_query.into_inner();
+
+	let mut move_vec = Vec3::ZERO;
+
+	if key.pressed(KeyCode::KeyW) {
+		move_vec.z = -1.0;
+	} else if key.pressed(KeyCode::KeyS) {
+		move_vec.z = 1.0;
+	}
+
+	if key.pressed(KeyCode::KeyA) {
+		move_vec.x = -1.0;
+	} else if key.pressed(KeyCode::KeyD) {
+		move_vec.x = 1.0;
+	}
+
+	if key.pressed(KeyCode::Space) {
+		move_vec.y = 1.0;
+	} else if key.pressed(KeyCode::ShiftLeft) {
+		move_vec.y = -1.0;
+	}
+
+	if key.pressed(KeyCode::ControlLeft) {
+		ldamp.0 = 0.8;
+		adamp.0 = 0.8;
+	} else {
+		ldamp.0 = 0.0;
+		adamp.0 = 0.0;
+	}
+
+	const ROLL_SPEED: f32 = 1.0;
+	const DEAD_ZONE: f32 = 0.1;
+	const INPUT_CURVE: f32 = 3.0;
+	let yaw = if key.pressed(KeyCode::KeyQ) {
+		Vec3::Y * ROLL_SPEED
+	} else if key.pressed(KeyCode::KeyE) {
+		Vec3::Y * -ROLL_SPEED
+	} else {
+		Vec3::ZERO
+	};
+
+	let mouse_delta = get_mouse_delta(mouse_motion).normalize_or_zero();
+	let mouse_input = mouse_delta
+		.abs()
+		.map(|v| if v < DEAD_ZONE { 0.0 } else { v })
+		.powf(INPUT_CURVE)
+		* mouse_delta.signum();
+
+	let roll = Vec3::NEG_Z * mouse_input.x;
+	let pitch = Vec3::X * mouse_input.y;
+
+	ang.0 += (transform.rotation * (roll + yaw + pitch)) * time.delta_secs();
+
+	move_vec = transform.rotation * move_vec.normalize_or_zero();
+
+	vel.0 += move_vec * time.delta_secs();
+}
+
+#[cfg(feature = "dev-viz")]
+fn ship_debug(mut gizmos: Gizmos, ship: Single<&Transform, With<Ship>>) {
+	use std::ops::Range;
+
+	let base = ship.translation.floor();
+	const GRID: Range<i32> = -10..10;
+	for x in GRID {
+		for y in GRID {
+			for z in GRID {
+				let p = base + Vec3::new(x as f32, y as f32, z as f32);
+				let color = if x == 0 && y == 0 {
+					LinearRgba::BLUE
+				} else if x == 0 && z == 0 {
+					LinearRgba::GREEN
+				} else if y == 0 && z == 0 {
+					LinearRgba::RED
+				} else {
+					LinearRgba::gray(0.2).with_alpha(0.2)
+				};
+				gizmos.sphere(p, 0.01, color);
+			}
+		}
+	}
+}
diff --git a/src/plugins/ship_cam.rs b/src/plugins/ship_cam.rs
new file mode 100644
index 0000000..d348a3f
--- /dev/null
+++ b/src/plugins/ship_cam.rs
@@ -0,0 +1,9 @@
+use bevy::prelude::*;
+
+pub struct ShipCamPlugin;
+
+impl Plugin for ShipCamPlugin {
+	fn build(&self, app: &mut App) {
+		todo!()
+	}
+}
diff --git a/src/plugins/types.rs b/src/plugins/types.rs
new file mode 100644
index 0000000..6a5451e
--- /dev/null
+++ b/src/plugins/types.rs
@@ -0,0 +1,12 @@
+use bevy::prelude::*;
+
+use crate::components::camera::{FollowCam, FollowTarget};
+
+pub struct TypesPlugin;
+
+impl Plugin for TypesPlugin {
+	fn build(&self, app: &mut App) {
+		app.register_type::<FollowTarget>();
+		app.register_type::<FollowCam>();
+	}
+}
diff --git a/src/resources/mod.rs b/src/resources/mod.rs
new file mode 100644
index 0000000..e69de29
diff --git a/src/utils/input.rs b/src/utils/input.rs
new file mode 100644
index 0000000..111e7f8
--- /dev/null
+++ b/src/utils/input.rs
@@ -0,0 +1,9 @@
+use bevy::{input::mouse::MouseMotion, prelude::*};
+
+pub fn get_mouse_delta(mut mouse_motion: EventReader<MouseMotion>) -> Vec2 {
+	let mut delta = Vec2::ZERO;
+	for e in mouse_motion.read() {
+		delta += e.delta;
+	}
+	return delta;
+}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
new file mode 100644
index 0000000..7839bc5
--- /dev/null
+++ b/src/utils/mod.rs
@@ -0,0 +1 @@
+pub mod input;