diff --git a/.github/workflows/master.yml b/.github/workflows/main.yml
similarity index 58%
rename from .github/workflows/master.yml
rename to .github/workflows/main.yml
index 938fafc..868a79d 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/main.yml
@@ -6,52 +6,43 @@ jobs:
   update:
     name: Update
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: nightly
           override: true
       - uses: actions-rs/cargo@v1
         with:
           command: update
-
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    needs: update
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-
   test:
     name: Test Suite
     runs-on: ubuntu-latest
-    needs: update
     steps:
-      - uses: actions/checkout@v2
-      - name: Update apt
-        run: sudo apt update
-      - name: Install libudev
-        run: sudo apt install libudev-dev
-      - name: Install libxkbcommon
-        run: sudo apt install libxkbcommon-dev
-      - name: Install libwayland
-        run: sudo apt install libwayland-dev
-      - uses: actions-rs/toolchain@v1
+      - name: Checkout sources
+        uses: actions/checkout@v2
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.toml') }}
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
           override: true
-      - uses: actions-rs/cargo@v1
+      - name: Install Dependencies
+        run: sudo apt-get update; sudo apt-get install pkg-config libx11-dev libwayland-dev libxkbcommon-dev libasound2-dev libudev-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
         with:
           command: test
 
@@ -74,7 +65,6 @@ jobs:
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
-    needs: update
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -82,6 +72,8 @@ jobs:
           profile: minimal
           toolchain: stable
           override: true
+      - name: Install Dependencies
+        run: sudo apt-get update; sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev
       - run: rustup component add clippy
       - uses: actions-rs/cargo@v1
         with:
diff --git a/.gitignore b/.gitignore
index 8d935a6..088ba6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-#Cargo.lock
+Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
diff --git a/Cargo.lock b/Cargo.lock
deleted file mode 100644
index f84bead..0000000
--- a/Cargo.lock
+++ /dev/null
@@ -1,2486 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android_log-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
-
-[[package]]
-name = "android_logger"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9ed09b18365ed295d722d0b5ed59c01b79a826ff2d2a8f73d5ecca8e6fb2f66"
-dependencies = [
- "android_log-sys",
- "env_logger",
- "lazy_static",
- "log",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
-
-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
-
-[[package]]
-name = "ash"
-version = "0.34.0+1.2.203"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0f780da53d0063880d45554306489f09dd8d1bda47688b4a57bc579119356df"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "async-channel"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
-dependencies = [
- "concurrent-queue",
- "event-listener",
- "futures-core",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
-dependencies = [
- "async-task",
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "once_cell",
- "slab",
-]
-
-[[package]]
-name = "async-task"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9"
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bevy"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fce306d40a111309ee61d4626efbafccdd46bb80657122c38061fa7264c08e4"
-dependencies = [
- "bevy_internal",
-]
-
-[[package]]
-name = "bevy-crevice-derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "191a752a01c3402deb24320acf42288bf822e5d22f19ae1d903797f02e9b0c33"
-dependencies = [
- "bevy_macro_utils",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "bevy_app"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32660ae99fa3498ca379de28b7e2f447e6531b0e432bf200901efeec075553c1"
-dependencies = [
- "bevy_derive",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_utils",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "bevy_asset"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2afd395240087924ba49c8cae2b00d007aeb1db53ee726a543b1e90dce2d3ab"
-dependencies = [
- "anyhow",
- "bevy_app",
- "bevy_diagnostic",
- "bevy_ecs",
- "bevy_log",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
- "crossbeam-channel",
- "downcast-rs",
- "js-sys",
- "ndk-glue",
- "parking_lot",
- "rand",
- "serde",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "bevy_config_cam"
-version = "0.3.0"
-dependencies = [
- "bevy",
- "rand",
- "strum",
- "strum_macros",
-]
-
-[[package]]
-name = "bevy_core"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12c0f8614b6014671ab60bacb8bf681373d08b0bb15633b8ef72b895cf966d29"
-dependencies = [
- "bevy_app",
- "bevy_derive",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
- "bytemuck",
-]
-
-[[package]]
-name = "bevy_core_pipeline"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d570bc9310196190910a5b1ffd8c8c35bd6b73f918d0651ae3c3d4e57be9a7"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_ecs",
- "bevy_render",
- "bevy_utils",
-]
-
-[[package]]
-name = "bevy_crevice"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3da0a284fb26c02cb96ef4d5bbf4de5fad7e1a901730035a61813bf64e28482e"
-dependencies = [
- "bevy-crevice-derive",
- "bytemuck",
- "glam",
- "mint",
-]
-
-[[package]]
-name = "bevy_derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6abddf2ed415f31d28a9bf9ab3c0bc857e98a722858d38dba65bdda481f8d714"
-dependencies = [
- "bevy_macro_utils",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "bevy_diagnostic"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ebf72ea058cfc379756e9da7de6861174e1860504f41e3e5a46d5b1c35d6644"
-dependencies = [
- "bevy_app",
- "bevy_core",
- "bevy_ecs",
- "bevy_log",
- "bevy_utils",
-]
-
-[[package]]
-name = "bevy_ecs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e67dd06b14e787d2026fe6e2b63f67482afcc62284f20ea2784d8b0662e95f"
-dependencies = [
- "async-channel",
- "bevy_ecs_macros",
- "bevy_reflect",
- "bevy_tasks",
- "bevy_utils",
- "downcast-rs",
- "fixedbitset",
- "fxhash",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "bevy_ecs_macros"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718923a491490bd81074492d61fc08134f9c62a29ba8666818cd7a6630421246"
-dependencies = [
- "bevy_macro_utils",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "bevy_gltf"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e07bda7721091c1a683343d466132dc69dec65aa83d8c9e328a2fb3431f03be"
-dependencies = [
- "anyhow",
- "base64",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_log",
- "bevy_math",
- "bevy_pbr",
- "bevy_reflect",
- "bevy_render",
- "bevy_scene",
- "bevy_transform",
- "bevy_utils",
- "gltf",
- "percent-encoding",
- "thiserror",
-]
-
-[[package]]
-name = "bevy_hierarchy"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f407f152f35541a099484200afe3b0ca09ce625469e8233dcdc264d6f88e01a"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_reflect",
- "bevy_utils",
- "smallvec",
-]
-
-[[package]]
-name = "bevy_input"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4ec4f6e38ef1b41ff68ec7badd6afc5c9699191e61e511c4abee91a5888afc"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_math",
- "bevy_utils",
-]
-
-[[package]]
-name = "bevy_internal"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d518a8e5f526a9537fc8408a284caec7af22b23c3b23c0dee08bacc0930e2f1a"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_derive",
- "bevy_diagnostic",
- "bevy_ecs",
- "bevy_gltf",
- "bevy_hierarchy",
- "bevy_input",
- "bevy_log",
- "bevy_math",
- "bevy_pbr",
- "bevy_reflect",
- "bevy_render",
- "bevy_scene",
- "bevy_tasks",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "bevy_winit",
- "ndk-glue",
-]
-
-[[package]]
-name = "bevy_log"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943ec496720ded2ff62b292d8e5fc845817a504915f41b7c5fd12b1380300f75"
-dependencies = [
- "android_log-sys",
- "bevy_app",
- "bevy_utils",
- "console_error_panic_hook",
- "tracing-log",
- "tracing-subscriber",
- "tracing-wasm",
-]
-
-[[package]]
-name = "bevy_macro_utils"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ddfc33a99547e36718e56e414541e461c74ec318ff987a1e9f4ff46d0dacbb"
-dependencies = [
- "cargo-manifest",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "bevy_math"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20288df0f70ff258bbaffaf55209f1271a7436438591bbffc3d81e4d84b423f2"
-dependencies = [
- "bevy_reflect",
- "glam",
-]
-
-[[package]]
-name = "bevy_pbr"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06adee54840f18cfeda7af4cdc57608644fa840be076a562353f896bfdb9c694"
-dependencies = [
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_core_pipeline",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_render",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "bitflags",
- "bytemuck",
-]
-
-[[package]]
-name = "bevy_reflect"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d0793107bc4b7c6bd04232d739fc8d70aa5fb313bfad6e850f91f79b2557eed"
-dependencies = [
- "bevy_reflect_derive",
- "bevy_utils",
- "downcast-rs",
- "erased-serde",
- "glam",
- "parking_lot",
- "serde",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "bevy_reflect_derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81c88de8067d19dfde31662ee78e3ee6971e2df27715799f91b515b37a636677"
-dependencies = [
- "bevy_macro_utils",
- "proc-macro2",
- "quote",
- "syn",
- "uuid",
-]
-
-[[package]]
-name = "bevy_render"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a358da8255b704153913c3499b3693fa5cfe13a48725ac6e76b043fa5633bc8"
-dependencies = [
- "anyhow",
- "bevy_app",
- "bevy_asset",
- "bevy_core",
- "bevy_crevice",
- "bevy_derive",
- "bevy_ecs",
- "bevy_math",
- "bevy_reflect",
- "bevy_transform",
- "bevy_utils",
- "bevy_window",
- "bitflags",
- "codespan-reporting",
- "copyless",
- "downcast-rs",
- "futures-lite",
- "hex",
- "hexasphere",
- "image",
- "naga",
- "once_cell",
- "parking_lot",
- "regex",
- "serde",
- "smallvec",
- "thiserror",
- "wgpu",
-]
-
-[[package]]
-name = "bevy_scene"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ea240f2ffce9f58a5601cc5ead24111f577dc4c656452839eb1fdf4b7a28529"
-dependencies = [
- "anyhow",
- "bevy_app",
- "bevy_asset",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_reflect",
- "bevy_utils",
- "ron",
- "serde",
- "thiserror",
- "uuid",
-]
-
-[[package]]
-name = "bevy_tasks"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2b0f0b86c8f78c53a2d4c669522f45e725ed9d9c3d734f54ec30876494e04e"
-dependencies = [
- "async-channel",
- "async-executor",
- "event-listener",
- "futures-lite",
- "num_cpus",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "bevy_transform"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2f7a77900fb23f24ca312c1f8df3eb47a45161326f41e9b4ef05b039793503"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_hierarchy",
- "bevy_math",
- "bevy_reflect",
-]
-
-[[package]]
-name = "bevy_utils"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f354c584812996febd48cc885f36b23004b49d6680e73fc95a69a2bb17a48e5"
-dependencies = [
- "ahash",
- "bevy_derive",
- "getrandom",
- "hashbrown",
- "instant",
- "tracing",
- "uuid",
-]
-
-[[package]]
-name = "bevy_window"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04fe33d177e10b2984fa90c1d19496fc6f6e7b36d4442699d359e2b4b507873d"
-dependencies = [
- "bevy_app",
- "bevy_ecs",
- "bevy_math",
- "bevy_utils",
- "raw-window-handle",
- "web-sys",
-]
-
-[[package]]
-name = "bevy_winit"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7c0e3b94cc73907f8a9f82945ca006a39ed2ab401aca0974b47a007a468509f"
-dependencies = [
- "approx",
- "bevy_app",
- "bevy_ecs",
- "bevy_input",
- "bevy_math",
- "bevy_utils",
- "bevy_window",
- "raw-window-handle",
- "wasm-bindgen",
- "web-sys",
- "winit",
-]
-
-[[package]]
-name = "bit-set"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "bumpalo"
-version = "3.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
-
-[[package]]
-name = "bytemuck"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc"
-dependencies = [
- "bytemuck_derive",
-]
-
-[[package]]
-name = "bytemuck_derive"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
-[[package]]
-name = "calloop"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82"
-dependencies = [
- "log",
- "nix",
-]
-
-[[package]]
-name = "cargo-manifest"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af6d65c7592744998c67947ec771c62687c76f00179a83ffd563c0482046bb98"
-dependencies = [
- "serde",
- "serde_derive",
- "toml",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
-[[package]]
-name = "cocoa"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832"
-dependencies = [
- "bitflags",
- "block",
- "cocoa-foundation",
- "core-foundation 0.9.3",
- "core-graphics 0.22.3",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
-dependencies = [
- "bitflags",
- "block",
- "core-foundation 0.9.3",
- "core-graphics-types",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "concurrent-queue"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
-dependencies = [
- "cache-padded",
-]
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "copyless"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536"
-
-[[package]]
-name = "core-foundation"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys 0.8.3",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "core-graphics"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923"
-dependencies = [
- "bitflags",
- "core-foundation 0.7.0",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-graphics"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
-dependencies = [
- "bitflags",
- "core-foundation 0.9.3",
- "core-graphics-types",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
-dependencies = [
- "bitflags",
- "core-foundation 0.9.3",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-video-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828"
-dependencies = [
- "cfg-if 0.1.10",
- "core-foundation-sys 0.7.0",
- "core-graphics 0.19.2",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
-dependencies = [
- "cfg-if 1.0.0",
- "lazy_static",
-]
-
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
-[[package]]
-name = "d3d12"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c"
-dependencies = [
- "bitflags",
- "libloading",
- "winapi",
-]
-
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
-[[package]]
-name = "dlib"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "downcast-rs"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
-
-[[package]]
-name = "env_logger"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "erased-serde"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "event-listener"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
-
-[[package]]
-name = "fastrand"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "futures-core"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
-
-[[package]]
-name = "futures-io"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
-
-[[package]]
-name = "futures-lite"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "glam"
-version = "0.20.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f"
-dependencies = [
- "bytemuck",
- "mint",
- "serde",
-]
-
-[[package]]
-name = "glow"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "gltf"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e0a0eace786193fc83644907097285396360e9e82e30f81a21e9b1ba836a3e"
-dependencies = [
- "byteorder",
- "gltf-json",
- "lazy_static",
-]
-
-[[package]]
-name = "gltf-derive"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd53d6e284bb2bf02a6926e4cc4984978c1990914d6cd9deae4e31cf37cd113"
-dependencies = [
- "inflections",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "gltf-json"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9949836a9ec5e7f83f76fb9bbcbc77f254a577ebbdb0820867bc11979ef97cad"
-dependencies = [
- "gltf-derive",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "gpu-alloc"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d"
-dependencies = [
- "bitflags",
- "gpu-alloc-types",
-]
-
-[[package]]
-name = "gpu-alloc-types"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "gpu-descriptor"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a538f217be4d405ff4719a283ca68323cc2384003eca5baaa87501e821c81dda"
-dependencies = [
- "bitflags",
- "gpu-descriptor-types",
- "hashbrown",
-]
-
-[[package]]
-name = "gpu-descriptor-types"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
- "serde",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hexasphere"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04ab9d20ba513ff1582a7d885e91839f62cf28bef7c56b1b0428ca787315979b"
-dependencies = [
- "glam",
- "lazy_static",
-]
-
-[[package]]
-name = "hexf-parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "image"
-version = "0.23.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "inflections"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
-
-[[package]]
-name = "inplace_it"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90953f308a79fe6d62a4643e51f848fbfddcd05975a38e69fdf4ab86a7baf7ca"
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "js-sys"
-version = "0.3.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "khronos-egl"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
-dependencies = [
- "libc",
- "libloading",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.124"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
-
-[[package]]
-name = "libloading"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
-dependencies = [
- "cfg-if 1.0.0",
- "winapi",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "memchr"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
-
-[[package]]
-name = "memmap2"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "metal"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0514f491f4cc03632ab399ee01e2c1c1b12d3e1cf2d667c1ff5f87d6dcd2084"
-dependencies = [
- "bitflags",
- "block",
- "core-graphics-types",
- "foreign-types",
- "log",
- "objc",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "mint"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
-
-[[package]]
-name = "mio"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
-dependencies = [
- "libc",
- "log",
- "miow",
- "ntapi",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "miow"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "naga"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3012f2dbcc79e8e0b5825a4836a7106a75dd9b2fe42c528163be0f572538c705"
-dependencies = [
- "bit-set",
- "bitflags",
- "codespan-reporting",
- "hexf-parse",
- "indexmap",
- "log",
- "num-traits",
- "petgraph",
- "pp-rs",
- "rustc-hash",
- "spirv",
- "thiserror",
-]
-
-[[package]]
-name = "ndk"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d"
-dependencies = [
- "bitflags",
- "jni-sys",
- "ndk-sys",
- "num_enum",
- "thiserror",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-glue"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71bee8ea72d685477e28bd004cfe1bf99c754d688cd78cad139eae4089484d4"
-dependencies = [
- "android_logger",
- "lazy_static",
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-macro",
- "ndk-sys",
-]
-
-[[package]]
-name = "ndk-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
-dependencies = [
- "darling",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ndk-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
-
-[[package]]
-name = "nix"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "ntapi"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
- "objc_exception",
-]
-
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
-
-[[package]]
-name = "parking"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "petgraph"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
-
-[[package]]
-name = "pp-rs"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
-dependencies = [
- "thiserror",
- "toml",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "profiling"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9145ac0af1d93c638c98c40cf7d25665f427b2a44ad0a99b1dccf3e2f25bb987"
-
-[[package]]
-name = "quote"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "range-alloc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6"
-
-[[package]]
-name = "raw-window-handle"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
-dependencies = [
- "cty",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
-[[package]]
-name = "renderdoc-sys"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
-
-[[package]]
-name = "ron"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678"
-dependencies = [
- "base64",
- "bitflags",
- "serde",
-]
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustversion"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
-
-[[package]]
-name = "ryu"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "serde"
-version = "1.0.136"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.136"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
-
-[[package]]
-name = "slotmap"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3"
-dependencies = [
- "bitflags",
- "calloop",
- "dlib",
- "lazy_static",
- "log",
- "memmap2",
- "nix",
- "pkg-config",
- "wayland-client",
- "wayland-cursor",
- "wayland-protocols",
-]
-
-[[package]]
-name = "spirv"
-version = "0.2.0+1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
-dependencies = [
- "bitflags",
- "num-traits",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strum"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8"
-
-[[package]]
-name = "strum_macros"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "indexmap",
- "serde",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
-dependencies = [
- "cfg-if 1.0.0",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
-dependencies = [
- "lazy_static",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
-dependencies = [
- "ansi_term",
- "lazy_static",
- "matchers",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "tracing-wasm"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07"
-dependencies = [
- "tracing",
- "tracing-subscriber",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom",
- "serde",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
-
-[[package]]
-name = "wayland-client"
-version = "0.29.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91223460e73257f697d9e23d401279123d36039a3f7a449e983f123292d4458f"
-dependencies = [
- "bitflags",
- "downcast-rs",
- "libc",
- "nix",
- "scoped-tls",
- "wayland-commons",
- "wayland-scanner",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-commons"
-version = "0.29.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f6e5e340d7c13490eca867898c4cec5af56c27a5ffe5c80c6fc4708e22d33e"
-dependencies = [
- "nix",
- "once_cell",
- "smallvec",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-cursor"
-version = "0.29.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd"
-dependencies = [
- "nix",
- "wayland-client",
- "xcursor",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.29.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741"
-dependencies = [
- "bitflags",
- "wayland-client",
- "wayland-commons",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.29.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a1ed3143f7a143187156a2ab52742e89dac33245ba505c17224df48939f9e0"
-dependencies = [
- "proc-macro2",
- "quote",
- "xml-rs",
-]
-
-[[package]]
-name = "wayland-sys"
-version = "0.29.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9341df79a8975679188e37dab3889bfa57c44ac2cb6da166f519a81cbe452d4"
-dependencies = [
- "dlib",
- "pkg-config",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "wgpu"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97cd781ff044d6d697b632a2e212032c2e957d1afaa21dbf58069cbb8f78567"
-dependencies = [
- "arrayvec",
- "js-sys",
- "log",
- "naga",
- "parking_lot",
- "raw-window-handle",
- "smallvec",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4688c000eb841ca55f7b35db659b78d6e1cd77d7caf8fb929f4e181f754047d"
-dependencies = [
- "arrayvec",
- "bitflags",
- "cfg_aliases",
- "codespan-reporting",
- "copyless",
- "fxhash",
- "log",
- "naga",
- "parking_lot",
- "profiling",
- "raw-window-handle",
- "smallvec",
- "thiserror",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "wgpu-hal"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93b1a9400e8d7f32dd4dd909bb9a391015d70633d639775ddd3f14d1104bc970"
-dependencies = [
- "arrayvec",
- "ash",
- "bit-set",
- "bitflags",
- "block",
- "core-graphics-types",
- "d3d12",
- "foreign-types",
- "fxhash",
- "glow",
- "gpu-alloc",
- "gpu-descriptor",
- "inplace_it",
- "js-sys",
- "khronos-egl",
- "libloading",
- "log",
- "metal",
- "naga",
- "objc",
- "parking_lot",
- "profiling",
- "range-alloc",
- "raw-window-handle",
- "renderdoc-sys",
- "thiserror",
- "wasm-bindgen",
- "web-sys",
- "wgpu-types",
- "winapi",
-]
-
-[[package]]
-name = "wgpu-types"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "winit"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a"
-dependencies = [
- "bitflags",
- "cocoa",
- "core-foundation 0.9.3",
- "core-graphics 0.22.3",
- "core-video-sys",
- "dispatch",
- "instant",
- "lazy_static",
- "libc",
- "log",
- "mio",
- "ndk",
- "ndk-glue",
- "ndk-sys",
- "objc",
- "parking_lot",
- "percent-encoding",
- "raw-window-handle",
- "smithay-client-toolkit",
- "wasm-bindgen",
- "wayland-client",
- "wayland-protocols",
- "web-sys",
- "winapi",
- "x11-dl",
-]
-
-[[package]]
-name = "x11-dl"
-version = "2.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59"
-dependencies = [
- "lazy_static",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "xcursor"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
diff --git a/Cargo.toml b/Cargo.toml
index b864604..9c9f0c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_config_cam"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Black Phlox <bphlox@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
@@ -22,16 +22,18 @@ resolver = "2"
 name = "bevy_config_cam"
 
 [dependencies]
-rand = "0.8.0"
-strum = "0.24.0"
-strum_macros = "0.24.0"
+rand = "0.8"
+strum = "0.25"
+strum_macros = "0.25"
+bevy_dolly = "0.0.1"
+config_cam_derive = { path = "config_cam_derive" }
 
 [dependencies.bevy]
-version = "0.7"
+version = "0.11"
 features = ["bevy_render","bevy_pbr"]
 default-features = false
 
 [dev-dependencies.bevy]
-version = "0.7"
-features = ["bevy_core_pipeline", "bevy_pbr", "bevy_gltf", "x11", "wayland"]
+version = "0.11"
+features = ["bevy_core_pipeline", "bevy_asset", "bevy_scene", "bevy_pbr", "bevy_gltf", "x11", "wayland"]
 default-features = false
\ No newline at end of file
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
index d807a6c..261eeb9 100644
--- a/LICENSE-APACHE
+++ b/LICENSE-APACHE
@@ -1,13 +1,201 @@
-Copyright 2022 Mikkel Rasmussen
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   1. Definitions.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/README.md b/README.md
index ad3465c..fa069ea 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,11 @@
 <div align="left">
 <a href="https://github.com/BlackPhlox/bevy_config_cam"><img src="https://raw.githubusercontent.com/BlackPhlox/BlackPhlox/master/config_cam.svg" width="970" height="200" alt="bevy config cam"></a>
 </div>
-</br>
 <div align="center">
 <a href="https://crates.io/crates/bevy_config_cam"><img src="https://img.shields.io/crates/v/bevy_config_cam" alt="link to crates.io"></a>
 <a href="https://docs.rs/bevy_config_cam"><img src="https://docs.rs/bevy_config_cam/badge.svg" alt="link to docs.rs"></a>
 <a href="https://github.com/BlackPhlox/bevy_config_cam/blob/master/credits/CREDITS.md"><img src="https://img.shields.io/crates/l/bevy_config_cam" alt="link to license"></a>
-<a href="https://crates.io/crates/bevy_config_cam"><img src="https://img.shields.io/crates/d/bevy_config_cam" alt="downloads/link to crates.io"></a>   
+<a href="https://crates.io/crates/bevy_config_cam"><img src="https://img.shields.io/crates/d/bevy_config_cam" alt="downloads/link to crates.io"></a>
 <a href="https://github.com/BlackPhlox/bevy_config_cam"><img src="https://img.shields.io/github/stars/BlackPhlox/bevy_config_cam" alt="stars/github repo"></a>
 <a href="https://github.com/BlackPhlox/bevy_config_cam/actions/workflows/master.yml"><img src="https://github.com/BlackPhlox/bevy_config_cam/actions/workflows/master.yml/badge.svg" alt="github actions"></a>
 <a href="https://github.com/bevyengine/bevy/blob/main/docs/plugins_guidelines.md#main-branch-tracking"><img src="https://img.shields.io/badge/Bevy%20tracking-released%20version-lightblue" alt="tracking bevy release branch"></a>
@@ -15,33 +14,59 @@
 An easy plug-n-play multifunctional camera controller that allows for easy setup of a camera and player for a scene.
 
 Add a few lines of code to your existing project allows you to test a wide variety of cameras by attaching it to
-your player asset or the default red player entity. 
+your player asset or the default red player entity.
 
 Inspired and extended on [bevy_flycam](https://github.com/sburris0/bevy_flycam), this plugin is fairly simple but should be a neat help for developers looking for a camera implementation without going the hassle of reinventing the wheel.
 
-# Future Plans
+# Backend
 
-The main goal of this plugin is to first and foremost provide the user with a configurable, extendable and easy-to-use API. [`dolly`](https://github.com/h3r2tic/dolly) by @h3r2tic is a crate that provides an framework for which to create, combine and modify camera positioning, exactly what `bevy_config_cam` is looking for. So a migration to `dolly` is in the works in order to improve this plugin main goal. 
+The main goal of this plugin is to first and foremost provide the user with a configurable, extendable and easy-to-use API. [`dolly`](https://github.com/h3r2tic/dolly) by @h3r2tic is a crate that provides an framework for which to create, combine and modify camera positioning, exactly what `bevy_config_cam` is looking for.
+[bevy_dolly](https://github.com/BlackPhlox/bevy_dolly) is the backend for `bevy_config_cam`.
 
 # Showcase
 
 ## Camera Modes
 
-LookAt | FollowStatic
-:-------------------------:|:-------------------------:
-<img src="https://user-images.githubusercontent.com/25123512/119991088-5fb59700-bfc9-11eb-88d1-44a2b2a47cfa.png" style="width:700px;height:300px;" alt="LookAt">  |  <img src="https://user-images.githubusercontent.com/25123512/119991121-6cd28600-bfc9-11eb-9fcd-89fa9d591d4b.png" style="width:700px;height:300px;" alt="FollowStatic">
-
-TopDown | TopDownDirection
-:-------------------------:|:-------------------------:
-<img src="https://user-images.githubusercontent.com/25123512/119991141-71973a00-bfc9-11eb-90ee-377ffe656ae2.png" style="width:700px;height:300px;" alt="TopDown"> |  <img src="https://user-images.githubusercontent.com/25123512/119991151-7360fd80-bfc9-11eb-9d41-1947c997b98a.png" style="width:700px;height:300px;" alt="TopDownDirection">
-
-FollowBehind | Fps
-:-------------------------:|:-------------------------:
-<img src="https://user-images.githubusercontent.com/25123512/119991175-7956de80-bfc9-11eb-901c-0164152dd97d.png" style="width:600px;height:300px;" alt="FollowBehind">  |  <img src="https://user-images.githubusercontent.com/25123512/119991187-7bb93880-bfc9-11eb-9739-598e01ba214f.png" style="width:700px;height:300px;" alt="Fps">
-
-Free | ?
-:-------------------------:|:-------------------------:
-<img src="https://user-images.githubusercontent.com/25123512/119991199-7fe55600-bfc9-11eb-9ae6-b29cec3a3cd7.png" alt="Free" >  |  Any suggestions on other camera modes you want? Let me know by creating an issue :)
+<div align="center">
+<table>
+  <tr>
+    <th><h2>Static</h2></th>
+    <th><h2>Pinned</h2></th>
+  </tr>
+    <tr>
+    <th>FollowStatic</th>
+    <th>Fps</th>
+  </tr>
+  <tr>
+    <td><img src="https://user-images.githubusercontent.com/25123512/119991121-6cd28600-bfc9-11eb-9fcd-89fa9d591d4b.png" style="height:350px;" alt="FollowStatic"></td>
+    <td><img src="https://user-images.githubusercontent.com/25123512/119991187-7bb93880-bfc9-11eb-9739-598e01ba214f.png" style="height:350px;" alt="Fps"></td>
+  </tr>
+  <tr>
+    <th>LookAt</th>
+    <th>FollowBehind</th>
+  </tr>
+  <tr>
+    <td><img src="https://user-images.githubusercontent.com/25123512/119991088-5fb59700-bfc9-11eb-88d1-44a2b2a47cfa.png" style="height:350px;" alt="LookAt"></td>
+    <td><img src="https://user-images.githubusercontent.com/25123512/119991175-7956de80-bfc9-11eb-901c-0164152dd97d.png" style="height:350px;" alt="FollowBehind"></td></td>
+    </td>
+</tr>
+  <tr>
+    <th>Free</th>
+    <th>TopDown</th>
+  </tr>
+  <tr>
+    <td><img src="https://user-images.githubusercontent.com/25123512/119991199-7fe55600-bfc9-11eb-9ae6-b29cec3a3cd7.png" style="height:350px;" alt="Free" ></td>
+    <td><img src="https://user-images.githubusercontent.com/25123512/119991141-71973a00-bfc9-11eb-90ee-377ffe656ae2.png" style="height:350px;" alt="TopDown"></td>
+</tr>
+  <tr>
+    <th>?</th>
+    <th>TopDownDirection</th>
+  </tr>
+  <tr>
+    <td>Any suggestions on other camera modes you want?</br>Let me know by creating an issue or </br>by creating your own using <a href="/examples/simple.rs">this example</a>.</td>
+    <td><img src="https://user-images.githubusercontent.com/25123512/119991151-7360fd80-bfc9-11eb-9d41-1947c997b98a.png" style="height:350px;" alt="TopDownDirection"></td>
+</table>
+</div>
 
 ## Settings
 
@@ -57,7 +82,7 @@ Free | ?
 
 ## Test the project
 
-Before I start using a plugin, I all ways like to run the examples prior to setting it up for my own project. Just to see if the plugin satisfy my needs. 
+Before I start using a plugin, I all ways like to run the examples prior to setting it up for my own project. Just to see if the plugin satisfy my needs.
 If you're like me then this is for you.
 
 1. Clone this repo to your local machine
@@ -71,16 +96,17 @@ Settings: <kbd>E</kbd> and use the mouse-scroll to change the selected settings
 
 ## Add to your own project
 
-Adding this plugin to your project is *very* simple, it only requires you to write 2 lines of code. 
+Adding this plugin to your project is *very* simple, it only requires you to write 2 lines of code.
 
 ### Step 1. - Setup
-    
+
 Add the correct version to your `Cargo.toml`, you can find the version you are looking for under the support section. The thing you should be adding should look like this (only add the line marked by `# <--`):
+
 ```toml
 [dependencies]
-bevy = { version = "0.7"}
+bevy = { version = "0.8"}
 # ...
-bevy_config_cam = { version = "0.3.0"} # <-- 
+bevy_config_cam = { version = "0.4.0"} # <-- 
 ```
 
 ### Step 2. - Add to project
@@ -115,9 +141,11 @@ Now, there is a reason for the name `bevy_config_cam`. It is most likely that yo
         ..Default::default()
     })
 ```
+
 Note: That some of them are overwritten by accessing the settings or the changing the camera type. Feedback on this is high appreciated, just create a new issue and I'll look into it when I have the time.
 
 # Support
+
 [![Bevy tracking](https://img.shields.io/badge/Bevy%20tracking-released%20version-lightblue)](https://github.com/bevyengine/bevy/blob/main/docs/plugins_guidelines.md#main-branch-tracking)
 
 |bevy|bevy_config_cam|
@@ -125,9 +153,12 @@ Note: That some of them are overwritten by accessing the settings or the changin
 |0.5|0.1.X|
 |0.6|0.2.X|
 |0.7|0.3.X|
+|0.11|0.4.X|
 
 # Licensing
+
 The project is under dual license MIT and Apache-2.0, so yoink to your hearts content, just remember the license agreements.
 
 # Contributing
+
 Yes this project is still very much WIP, so PRs are very welcome
diff --git a/assets/models/cam.blend b/assets/models/cam.blend
new file mode 100644
index 0000000..20ea36d
Binary files /dev/null and b/assets/models/cam.blend differ
diff --git a/assets/models/cam.gltf b/assets/models/cam.gltf
new file mode 100644
index 0000000..558c28f
--- /dev/null
+++ b/assets/models/cam.gltf
@@ -0,0 +1,122 @@
+{
+    "asset" : {
+        "generator" : "Khronos glTF Blender I/O v3.2.43",
+        "version" : "2.0"
+    },
+    "scene" : 0,
+    "scenes" : [
+        {
+            "name" : "Scene",
+            "nodes" : [
+                0
+            ]
+        }
+    ],
+    "nodes" : [
+        {
+            "mesh" : 0,
+            "name" : "Camera",
+            "scale" : [
+                0.5,
+                0.5,
+                0.5
+            ]
+        }
+    ],
+    "materials" : [
+        {
+            "doubleSided" : true,
+            "name" : "Material",
+            "pbrMetallicRoughness" : {
+                "baseColorFactor" : [
+                    0.800000011920929,
+                    0.800000011920929,
+                    0.800000011920929,
+                    1
+                ],
+                "metallicFactor" : 0,
+                "roughnessFactor" : 0.4000000059604645
+            }
+        }
+    ],
+    "meshes" : [
+        {
+            "name" : "Cube",
+            "primitives" : [
+                {
+                    "attributes" : {
+                        "POSITION" : 0,
+                        "NORMAL" : 1,
+                        "TEXCOORD_0" : 2
+                    },
+                    "indices" : 3,
+                    "material" : 0
+                }
+            ]
+        }
+    ],
+    "accessors" : [
+        {
+            "bufferView" : 0,
+            "componentType" : 5126,
+            "count" : 58,
+            "max" : [
+                1,
+                2,
+                1.7000000476837158
+            ],
+            "min" : [
+                -1.0014973878860474,
+                -1,
+                -1.7000000476837158
+            ],
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 1,
+            "componentType" : 5126,
+            "count" : 58,
+            "type" : "VEC3"
+        },
+        {
+            "bufferView" : 2,
+            "componentType" : 5126,
+            "count" : 58,
+            "type" : "VEC2"
+        },
+        {
+            "bufferView" : 3,
+            "componentType" : 5123,
+            "count" : 72,
+            "type" : "SCALAR"
+        }
+    ],
+    "bufferViews" : [
+        {
+            "buffer" : 0,
+            "byteLength" : 696,
+            "byteOffset" : 0
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 696,
+            "byteOffset" : 696
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 464,
+            "byteOffset" : 1392
+        },
+        {
+            "buffer" : 0,
+            "byteLength" : 144,
+            "byteOffset" : 1856
+        }
+    ],
+    "buffers" : [
+        {
+            "byteLength" : 2000,
+            "uri" : "data:application/octet-stream;base64,AACAvwAAgD+amdm/AACAvwAAgD+amdm/AACAvwAAgD+amdm/AACAvwAAgD+amdm/AACAvwAAgL+amdm/AACAvwAAgL+amdm/AACAvwAAgL+amdm/AACAvwAAgL+amdm/AACAvwAAgD+amdk/AACAvwAAgD+amdk/AACAvwAAgD+amdk/AACAvwAAgD+amdk/AACAvwAAgL+amdk/AACAvwAAgL+amdk/AACAvwAAgL+amdk/AACAvwAAgL+amdk/AACAPwAAAAAAAACAAACAPwAAAAAAAACAAACAPwAAAAAAAACAAACAPwAAAAAAAACA33x/v2Zmpj+amVm/33x/v2Zmpj+amVm/33x/v2Zmpj+amVm/33x/v2Zmpj+amVk/33x/v2Zmpj+amVk/33x/v2Zmpj+amVk/33x/vwAAAEAAAACA33x/vwAAAEAAAACA33x/vwAAAEAAAACAAACAvwAAAEAAAACAAACAvwAAAEAAAACAAACAvwAAAEAAAACAAACAv2Zmpj+amVm/AACAv2Zmpj+amVm/AACAv2Zmpj+amVm/AACAv2Zmpj+amVk/AACAv2Zmpj+amVk/AACAv2Zmpj+amVk/ETGAvwAAgL+amdm/ETGAvwAAgL+amdm/ETGAvwAAgL+amdm/ETGAvwAAgL+amdm/ETGAvwAAgL+amdk/ETGAvwAAgL+amdk/ETGAvwAAgL+amdk/ETGAvwAAgL+amdk/ETGAvwAAgD+amdk/ETGAvwAAgD+amdk/ETGAvwAAgD+amdk/ETGAvwAAgD+amdk/ETGAvwAAgD+amdm/ETGAvwAAgD+amdm/ETGAvwAAgD+amdm/ETGAvwAAgD+amdm/3p1/PwAAAAAAAACA3p1/PwAAAAAAAACA3p1/PwAAAAAAAACA3p1/PwAAAAAAAACAScwlvwAAAAB0DkM/MPnkvi/5ZL8AAACAAAAAAAAAgL8AAACAAAAAAAAAAAAAAIA/ScwlvwAAAAB0DkM/MPnkvi/5ZD8AAACAAAAAAAAAAAAAAIA/AAAAAAAAgD8AAACAScwlvwAAAAB0DkO/MPnkvi/5ZL8AAACAAAAAAAAAgL8AAACAAAAAAAAAAAAAAIC/ScwlvwAAAAB0DkO/MPnkvi/5ZD8AAACAAAAAAAAAAAAAAIC/AAAAAAAAgD8AAACAScwlvwAAAAB0DkO/ScwlvwAAAAB0DkM/MPnkvi/5ZL8AAACAMPnkvi/5ZD8AAACAAACAvwAAAAAAAACAAAAAAHudRb9lvSI/AAAAAP//fz8AAACAAACAvwAAAAAAAACAAAAAAHudRb9lvSK/AAAAAP//fz8AAACAAACAvwAAAAAAAACAAAAAAHudRb9lvSK/AAAAAHudRb9lvSI/AAAAAHudRb9lvSK/AAAAAHudRb9lvSI/AACAPwAAAAAAAACAAAAAAHudRb9lvSI/AAAAAP//fz8AAACAAACAPwAAAAAAAACAAAAAAHudRb9lvSK/AAAAAP//fz8AAACAAACAPwAAAAAAAACAAAAAAAAAAAAAAIA/AAAAAAAAgD8AAACAMPnkPi/5ZL8AAACASswlPwAAAAB0DkO/AAAAAAAAAAAAAIC/AAAAAAAAgD8AAACAMPnkPi/5ZL8AAACASswlPwAAAAB0DkM/AAAAAAAAgL8AAACAAAAAAAAAAAAAAIC/MPnkPi/5ZD8AAACASswlPwAAAAB0DkM/AAAAAAAAgL8AAACAAAAAAAAAAAAAAIA/MPnkPi/5ZD8AAACASswlPwAAAAB0DkO/MPnkPi/5ZL8AAACAMPnkPi/5ZD8AAACASswlPwAAAAB0DkO/SswlPwAAAAB0DkM/AAAgPwAAQD8AACA/AABAPwAAID8AAEA/AAAgPwAAQD8AAMA+AABAPwAAwD4AAEA/AADAPgAAQD8AAMA+AABAPwAAID8AAIA/AAAgPwAAgD8AACA/AACAPwAAID8AAIA/AADAPgAAgD8AAMA+AACAPwAAwD4AAIA/AADAPgAAgD8AAAAAAACAPwAAAAAAAIA/AAAAAAAAgD8AAAAAAACAPwAAID8AAEA/AAAgPwAAQD8AACA/AABAPwAAID8AAIA/AAAgPwAAgD8AACA/AACAPwAAID8AAGA/AAAgPwAAYD8AACA/AABgPwAAID8AAGA/AAAgPwAAYD8AACA/AABgPwAAID8AAEA/AAAgPwAAQD8AACA/AABAPwAAID8AAIA/AAAgPwAAgD8AACA/AACAPwAAwD4AAEA/AADAPgAAQD8AAMA+AABAPwAAwD4AAEA/AADAPgAAgD8AAMA+AACAPwAAwD4AAIA/AADAPgAAgD8AACA/AACAPwAAID8AAIA/AAAgPwAAgD8AACA/AACAPwAAID8AAEA/AAAgPwAAQD8AACA/AABAPwAAID8AAEA/AAAAAAAAgD8AAAAAAACAPwAAAAAAAIA/AAAAAAAAgD8EABEAAAANABMABQAIABAADAABABIACQAaABQAFwAfACUAIgAZABYAIQAZACEAJAAbABgAIwAbACMAHQAVABwAHgAVAB4AIAApADUAOAAsACgANgAxAC0AOQA0ADAANwACAAoALgACAC4AMgALAA4AKgALACoALwAGAAMAMwAGADMAJgAPAAcAJwAPACcAKwA="
+        }
+    ]
+}
diff --git a/config_cam_derive/Cargo.toml b/config_cam_derive/Cargo.toml
new file mode 100644
index 0000000..87adaa2
--- /dev/null
+++ b/config_cam_derive/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "config_cam_derive"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "1.0"
+quote = "1.0"
+#bevy_ecs = "0.8"
+#bevy_ecs_macros = "0.8"
+#macro_rules_attribute = "0.1.2"
\ No newline at end of file
diff --git a/config_cam_derive/src/driver_marker.rs b/config_cam_derive/src/driver_marker.rs
new file mode 100644
index 0000000..f2fcbe3
--- /dev/null
+++ b/config_cam_derive/src/driver_marker.rs
@@ -0,0 +1,41 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn;
+
+pub fn driver_marker_derive(input: TokenStream) -> TokenStream {
+    // Construct a representation of Rust code as a syntax tree
+    // that we can manipulate
+    let ast = syn::parse(input).unwrap();
+
+    // Build the trait implementation
+    impl_driver_marker_macro(&ast)
+}
+
+fn impl_driver_marker_macro(ast: &syn::DeriveInput) -> TokenStream {
+    let name = &ast.ident;
+    let f = format!("{}", name);
+    let gen = quote! {
+        impl DriverMarker for #name {
+            fn get_id(&self) -> TypeId {
+                TypeId::of::<#name>()
+            }
+
+            fn get_name(&self) -> &str {
+                #f
+            }
+
+            fn add_to(&self, commands: &mut Commands, entity: Entity){
+                commands
+                    .entity(entity)
+                    .insert(#name);
+            }
+
+            fn remove_from(&self, commands: &mut Commands, entity: Entity){
+                commands
+                    .entity(entity)
+                    .remove::<#name>();
+            }
+        }
+    };
+    gen.into()
+}
diff --git a/config_cam_derive/src/lib.rs b/config_cam_derive/src/lib.rs
new file mode 100644
index 0000000..74bebda
--- /dev/null
+++ b/config_cam_derive/src/lib.rs
@@ -0,0 +1,10 @@
+use proc_macro::TokenStream;
+
+extern crate proc_macro;
+
+mod driver_marker;
+
+#[proc_macro_derive(DriverMarker)]
+pub fn driver_marker_derive(input: TokenStream) -> TokenStream {
+    driver_marker::driver_marker_derive(input)
+}
diff --git a/examples/minimal.rs b/examples/minimal.rs
index 2b1ed9d..132a808 100644
--- a/examples/minimal.rs
+++ b/examples/minimal.rs
@@ -1,13 +1,11 @@
-//Base
 use bevy::prelude::*;
 use bevy_config_cam::*;
 
 fn main() {
     App::new()
-        .insert_resource(Msaa { samples: 4 })
         .add_plugins(DefaultPlugins)
-        .add_plugin(ConfigCam)
-        .add_startup_system(setup)
+        .add_plugins(ConfigCam)
+        .add_systems(Startup, setup)
         .run();
 }
 
@@ -16,29 +14,27 @@ fn setup(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
-    mut cl: ResMut<CamLogic>,
 ) {
     // plane
-    commands.spawn_bundle(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Plane { size: 5.0 })),
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(Mesh::from(shape::Plane {
+            size: 5.0,
+            ..Default::default()
+        })),
         material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
         ..Default::default()
     });
 
-    // cube, set as target
-    cl.target = Some(
-        commands
-            .spawn_bundle(PbrBundle {
-                mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-                material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
-                transform: Transform::from_xyz(0.0, 0.5, 0.0),
-                ..Default::default()
-            })
-            .id(),
-    );
+    // cube
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        transform: Transform::from_xyz(0.0, 0.5, 0.0),
+        ..Default::default()
+    });
 
     // light
-    commands.spawn_bundle(PointLightBundle {
+    commands.spawn(PointLightBundle {
         transform: Transform::from_xyz(4.0, 8.0, 4.0),
         ..Default::default()
     });
diff --git a/examples/multiple_targets.rs b/examples/multiple_targets.rs
index c5ecf57..79682ac 100644
--- a/examples/multiple_targets.rs
+++ b/examples/multiple_targets.rs
@@ -1,31 +1,35 @@
-//Base
 use bevy::prelude::*;
-use bevy_config_cam::*;
+use bevy_config_cam::{driver::driver_core::DriverMarker, *};
+use bevy_dolly::prelude::*;
+use config_cam_derive::DriverMarker;
 
 fn main() {
     App::new()
-        .insert_resource(Msaa { samples: 4 })
+        .insert_resource(Msaa::default())
         .add_plugins(DefaultPlugins)
-        .add_plugin(ConfigCam)
-        .insert_resource(MovementSettings {
+        .add_plugins(ConfigCam)
+        .add_rig_component(T1)
+        .add_dolly_component(MainCamera)
+        /*.insert_resource(MovementSettings {
             sensitivity: 0.00015, // default: 0.00012
             speed: 12.0,          // default: 12.0
             ..Default::default()
-        })
-        .insert_resource(PlayerSettings {
+        })*/
+        /*.insert_resource(PlayerSettings {
             pos: Vec3::new(2., 0., 0.),
             player_asset: "models/craft_speederA.glb#Scene0",
             ..Default::default()
-        })
+        })*/
         .add_startup_system(setup)
-        .add_system(set_closest_target)
+        //.add_system(set_closest_target)
         .run();
 }
 
 #[derive(Component)]
+struct MainCamera;
+
+#[derive(DriverMarker, Component, Clone, Copy, Debug)]
 struct T1;
-#[derive(Component)]
-struct T2;
 
 /// set up a simple 3D scene
 fn setup(
@@ -34,39 +38,45 @@ fn setup(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     // plane
-    commands.spawn_bundle(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Plane { size: 11.0 })),
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(Mesh::from(shape::Plane {
+            size: 11.0,
+            ..Default::default()
+        })),
         material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
         ..Default::default()
     });
 
     //Target 1
-    commands
-        .spawn_bundle(PbrBundle {
+    commands.spawn((
+        PbrBundle {
             mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
             material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
             transform: Transform::from_xyz(-5.0, 0.5, 0.0),
             ..Default::default()
-        })
-        .insert(T1);
+        },
+        Target,
+    ));
 
     //Target 2
-    commands
-        .spawn_bundle(PbrBundle {
+    commands.spawn((
+        PbrBundle {
             mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
             material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
             transform: Transform::from_xyz(5.0, 0.5, 0.0),
             ..Default::default()
-        })
-        .insert(T2);
+        },
+        Target,
+    ));
 
     // light
-    commands.spawn_bundle(PointLightBundle {
+    commands.spawn(PointLightBundle {
         transform: Transform::from_xyz(4.0, 8.0, 4.0),
         ..Default::default()
     });
 }
 
+/*
 fn set_closest_target(
     mut cl: ResMut<CamLogic>,
     mut transforms: Query<(&PlayerMove, &Transform)>,
@@ -97,3 +107,4 @@ fn set_closest_target(
         cl.target = None;
     }
 }
+*/
diff --git a/examples/simple.rs b/examples/simple.rs
index 878574f..eccd348 100644
--- a/examples/simple.rs
+++ b/examples/simple.rs
@@ -1,55 +1,230 @@
-//Base
-use bevy::prelude::*;
+use std::f32::consts::PI;
+
+use bevy::{
+    pbr::wireframe::{Wireframe, WireframePlugin},
+    prelude::*,
+};
+use bevy_config_cam::driver::driver_core::DriverMarker;
 use bevy_config_cam::*;
 
+use config_cam_derive::DriverMarker;
+
 fn main() {
     App::new()
-        .insert_resource(Msaa { samples: 4 })
         .add_plugins(DefaultPlugins)
-        .add_plugin(ConfigCam)
-        .insert_resource(MovementSettings {
-            sensitivity: 0.00015, // default: 0.00012
-            speed: 12.0,          // default: 12.0
-            ..Default::default()
-        })
-        .insert_resource(PlayerSettings {
-            pos: Vec3::new(2., 0., 0.),
-            player_asset: "models/craft_speederA.glb#Scene0",
-            ..Default::default()
-        })
-        .add_startup_system(setup)
+        .add_plugins(WireframePlugin)
+        .add_plugins(ConfigCam)
+        .add_systems(Startup, setup)
+        .add_systems(
+            Update,
+            (
+                rotator_system,
+                add_target_system,
+                remove_target_system,
+                switch_camera,
+            ),
+        )
         .run();
 }
 
+#[derive(DriverMarker, Component, Clone, Copy, Debug)]
+pub struct Pinned2;
+
 /// set up a simple 3D scene
 fn setup(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
-    mut cl: ResMut<CamLogic>,
+    asset_server: Res<AssetServer>,
 ) {
     // plane
-    commands.spawn_bundle(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Plane { size: 5.0 })),
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(Mesh::from(shape::Plane {
+            size: 5.0,
+            ..Default::default()
+        })),
         material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
         ..Default::default()
     });
 
-    // cube, set as target
-    cl.target = Some(
-        commands
-            .spawn_bundle(PbrBundle {
-                mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-                material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
-                transform: Transform::from_xyz(0.0, 0.5, 0.0),
-                ..Default::default()
-            })
-            .id(),
-    );
+    // cube
+
+    commands
+        .spawn(SpatialBundle::from_transform(Transform {
+            rotation: Quat::IDENTITY,
+            translation: Vec3::new(2., 0., 0.),
+            ..default()
+        }))
+        .with_children(|cell| {
+            cell.spawn((
+                Rotates,
+                Target,
+                PbrBundle {
+                    mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+                    material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+                    transform: Transform::from_xyz(0.0, 0.5, 0.0),
+                    ..Default::default()
+                },
+            ));
+        });
+
+    commands
+        .spawn(SpatialBundle::from_transform(Transform {
+            rotation: Quat::IDENTITY,
+            translation: Vec3::new(-2., 0., 0.),
+            ..default()
+        }))
+        .with_children(|cell| {
+            cell.spawn((
+                Target,
+                PbrBundle {
+                    mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+                    material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+                    transform: Transform::from_xyz(0.0, 0.5, 0.0),
+                    ..Default::default()
+                },
+            ));
+        });
 
     // light
-    commands.spawn_bundle(PointLightBundle {
+    commands.spawn(PointLightBundle {
         transform: Transform::from_xyz(4.0, 8.0, 4.0),
         ..Default::default()
     });
+
+    let cam: Handle<Mesh> = asset_server.load("models/cam.gltf#Mesh0/Primitive0");
+
+    /*commands.spawn_bundle(SceneBundle {
+        scene: asset_server.load("models/cam.gltf#Scene0"),
+        ..default()
+    }).insert(Wireframe);*/
+
+    commands
+        .spawn(PbrBundle {
+            mesh: cam,
+            material: materials.add(
+                Color::Rgba {
+                    red: 0.,
+                    green: 0.,
+                    blue: 0.,
+                    alpha: 0.,
+                }
+                .into(),
+            ),
+            transform: Transform {
+                translation: Vec3 {
+                    x: 0.0,
+                    y: 0.5,
+                    z: 0.0,
+                },
+                scale: Vec3::new(0.5, 0.5, 0.5),
+                ..Default::default()
+            },
+            ..Default::default()
+        })
+        .insert(Wireframe);
+
+    /*
+        commands.spawn((
+            Camera3dBundle {
+            camera: Camera {
+                is_active: true,
+                ..Default::default()
+            },
+            projection: OrthographicProjection {
+                scale: 3.0,
+                scaling_mode: ScalingMode::FixedVertical(1.0),
+                ..default()
+            }
+            .into(),
+            ..Default::default()
+        },
+        Rig::builder()
+        .with(Fpv::from_position_target(Transform::default()))
+        .build(),
+        CCFpv,
+    ));
+
+    commands.spawn(Camera3dBundle {
+        camera: Camera {
+            is_active: false,
+            ..Default::default()
+        },
+        projection: OrthographicProjection {
+            scale: 3.0,
+            scaling_mode: ScalingMode::FixedVertical(1.0),
+            ..default()
+        }
+        .into(),
+        ..Default::default()
+    });
+    */
+
+    commands.spawn(CameraCount { total: 2, index: 0 });
+}
+
+#[derive(Component)]
+struct CameraCount {
+    total: u16,
+    index: usize,
+}
+
+#[derive(Component)]
+struct Rotates;
+
+#[derive(Component)]
+struct Selected;
+
+fn rotator_system(time: Res<Time>, mut query: Query<&mut Transform, With<Rotates>>) {
+    for mut transform in query.iter_mut() {
+        *transform = Transform::from_rotation(Quat::from_rotation_y(
+            (4.0 * PI / 20.0) * time.delta_seconds(),
+        )) * *transform;
+    }
+}
+
+fn remove_target_system(
+    keys: Res<Input<KeyCode>>,
+    mut commands: Commands,
+    q: Query<Entity, (With<Selected>, Without<Target>)>,
+) {
+    if keys.just_pressed(KeyCode::G) {
+        for e in &q {
+            commands.entity(e).remove::<Target>();
+            commands.entity(e).remove::<Rotates>();
+            println!("Removed Target");
+        }
+    }
+}
+
+fn add_target_system(
+    keys: Res<Input<KeyCode>>,
+    mut commands: Commands,
+    q: Query<Entity, (Without<Selected>, With<Target>)>,
+) {
+    if keys.just_pressed(KeyCode::H) {
+        for e in &q {
+            commands.entity(e).insert(Target);
+            commands.entity(e).insert(Rotates);
+            println!("Added Target");
+        }
+    }
+}
+
+fn switch_camera(
+    keys: Res<Input<KeyCode>>,
+    _commands: Commands,
+    mut q: Query<&Camera>,
+    mut q2: Query<&CameraCount>,
+) {
+    let cc = q2.single_mut();
+    if keys.just_pressed(KeyCode::V) {
+        for (i, _c) in &mut q.iter_mut().enumerate() {
+            if i + 1 > (cc.total - 1).into() {
+                //cc.index = 0;
+                //c.is_active = true;
+            }
+            if i.eq(&(cc.index + 1_usize)) {}
+        }
+    }
 }
diff --git a/examples/switch.rs b/examples/switch.rs
index 39f7876..8d309ed 100644
--- a/examples/switch.rs
+++ b/examples/switch.rs
@@ -1,3 +1,5 @@
+fn main() {}
+/*
 use bevy::{
     prelude::*,
     render::camera::{ActiveCamera, Camera3d},
@@ -52,7 +54,7 @@ fn setup(
 
     // cube camera
     commands
-        .spawn_bundle(PerspectiveCameraBundle {
+        .spawn_bundle(Camera3dBundle {
             transform: Transform::from_xyz(-2.0, 5.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
             ..Default::default()
         })
@@ -60,7 +62,7 @@ fn setup(
 
     // topdown camera
     commands
-        .spawn_bundle(PerspectiveCameraBundle {
+        .spawn_bundle(Camera3dBundle {
             transform: Transform::from_xyz(0.0, 10.0, 0.1).looking_at(Vec3::ZERO, Vec3::Y),
             ..Default::default()
         })
@@ -93,3 +95,4 @@ fn cycle_camera_state(
         keys.reset(KeyCode::E);
     }
 }
+*/
diff --git a/examples/yp.rs b/examples/yp.rs
new file mode 100644
index 0000000..e4427ed
--- /dev/null
+++ b/examples/yp.rs
@@ -0,0 +1,84 @@
+use bevy::{input::Input, prelude::*, DefaultPlugins};
+use bevy_config_cam::driver::driver_core::DriverMarker;
+use bevy_config_cam::{
+    driver::driver_core::{DriverRigs, Drivers},
+    drivers::{fpv::CCFpv, orbit::CCOrbit},
+    ConfigCam,
+};
+use bevy_config_cam::{driver_vec, type_vec, MainCamera};
+use bevy_dolly::prelude::*;
+use config_cam_derive::DriverMarker;
+
+pub use std::any::TypeId;
+
+fn main() {
+    App::new()
+        .add_plugins(DefaultPlugins)
+        .add_plugins(ConfigCam)
+        .add_dolly_component(YP)
+        .insert_resource(Drivers::new(
+            driver_vec![CCOrbit, CCFpv, YP],
+            type_vec![MainCamera],
+        ))
+        .add_systems(Startup, setup)
+        .add_systems(Update, update_yaw_driver)
+        .run();
+}
+
+#[derive(DriverMarker, Component, Clone, Copy, Debug)]
+pub struct YP;
+
+fn setup(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    //Should be default player entity
+    //Default player entity : Cone
+    //commands.spawn().insert(Target);
+
+    commands.spawn((
+        Rig::builder()
+            .with(YawPitch::new().yaw_degrees(45.0).pitch_degrees(-45.0))
+            .with(Smooth::new_rotation(1.5))
+            .with(Arm::new(Vec3::Z * 4.0))
+            .with(LookAt::new(Vec3::new(0., 0., 0.)))
+            .build(),
+        YP,
+    ));
+
+    // plane
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(Mesh::from(shape::Plane {
+            size: 5.0,
+            ..Default::default()
+        })),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        ..Default::default()
+    });
+
+    // cube
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
+        material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+        transform: Transform::from_xyz(0.0, 0.5, 0.0),
+        ..Default::default()
+    });
+
+    // light
+    commands.spawn(PointLightBundle {
+        transform: Transform::from_xyz(4.0, 8.0, 4.0),
+        ..Default::default()
+    });
+}
+
+pub(crate) fn update_yaw_driver(keys: Res<Input<KeyCode>>, mut rigs: DriverRigs) {
+    rigs.try_for_each_driver_mut::<YawPitch>(|yp| {
+        if keys.just_pressed(KeyCode::Z) {
+            yp.rotate_yaw_pitch(-90.0, 0.0);
+        }
+        if keys.just_pressed(KeyCode::X) {
+            yp.rotate_yaw_pitch(90.0, 0.0);
+        }
+    });
+}
diff --git a/src/driver/driver_core.rs b/src/driver/driver_core.rs
new file mode 100644
index 0000000..1e641c0
--- /dev/null
+++ b/src/driver/driver_core.rs
@@ -0,0 +1,106 @@
+use std::any::TypeId;
+
+use bevy::{
+    ecs::{component::TableStorage, system::SystemParam},
+    prelude::{Commands, Component, Entity, Query, Resource},
+};
+use bevy_dolly::prelude::*;
+
+use crate::{
+    drivers::{fpv::CCFpv, orbit::CCOrbit},
+    MainCamera,
+};
+
+pub trait DriverMarker: Component<Storage = TableStorage> + Sync + Send + 'static {
+    fn get_id(&self) -> TypeId;
+    fn get_name(&self) -> &str;
+    fn add_to(&self, commands: &mut Commands, entity: Entity);
+    fn remove_from(&self, commands: &mut Commands, entity: Entity);
+}
+
+#[derive(Resource)]
+pub struct Drivers {
+    // access must happen in this folder or children
+    pub enabled_drivers: Vec<Box<dyn DriverMarker>>,
+    driver_index: usize,
+    pub cameras: Vec<TypeId>,
+    camera_index: usize,
+}
+
+impl Default for Drivers {
+    fn default() -> Self {
+        Self {
+            enabled_drivers: vec![Box::new(CCOrbit), Box::new(CCFpv)],
+            cameras: vec![TypeId::of::<MainCamera>()],
+            driver_index: Default::default(),
+            camera_index: Default::default(),
+        }
+    }
+}
+
+impl Drivers {
+    pub fn new(enabled_drivers: Vec<Box<dyn DriverMarker>>, cameras: Vec<TypeId>) -> Self {
+        Self {
+            enabled_drivers,
+            driver_index: Default::default(),
+            cameras,
+            camera_index: Default::default(),
+        }
+    }
+
+    pub fn next(&mut self) {
+        if self.driver_index >= self.enabled_drivers.len() - 1 {
+            self.driver_index = 0;
+        } else {
+            self.driver_index += 1;
+        }
+    }
+
+    pub fn change_camera<T: 'static>(&mut self) {
+        let type_id = TypeId::of::<T>();
+        self.cameras.push(type_id);
+        self.cameras.dedup();
+        if let Some((x, _)) = self
+            .cameras
+            .iter()
+            .enumerate()
+            .find(|(_, id)| (*id).clone().eq(&type_id))
+        {
+            self.camera_index = x;
+        }
+    }
+
+    pub fn index(&self) -> usize {
+        self.driver_index
+    }
+}
+
+#[derive(SystemParam)]
+pub struct DriverRigs<'w, 's> {
+    rigs: Query<'w, 's, &'static mut Rig>,
+}
+
+impl<'w, 's> DriverRigs<'w, 's> {
+    pub fn try_for_each_driver_mut<T>(&mut self, f: impl FnOnce(&mut T) + std::marker::Copy)
+    where
+        T: RigDriver,
+    {
+        for mut rig in &mut self.rigs {
+            if let Some(camera_driver) = rig.try_driver_mut::<T>() {
+                f(camera_driver);
+            }
+        }
+    }
+
+    pub fn driver_exists<T>(self) -> bool
+    where
+        T: RigDriver,
+    {
+        for rig in &self.rigs {
+            if rig.try_driver::<T>().is_some() {
+                return true;
+            }
+        }
+        false
+    }
+}
diff --git a/src/driver/driver_resources.rs b/src/driver/driver_resources.rs
new file mode 100644
index 0000000..44ce55d
--- /dev/null
+++ b/src/driver/driver_resources.rs
@@ -0,0 +1,45 @@
+use bevy::prelude::{Camera, Commands, DetectChanges, Entity, Input, KeyCode, Query, Res, ResMut};
+
+use super::driver_core::Drivers;
+
+// TODO documentation
+
+//Use collection with and keeping an index component or the like
+pub fn change_driver_system(mut drivers: ResMut<Drivers>, keys: Res<Input<KeyCode>>) {
+    if keys.just_pressed(KeyCode::T) {
+        drivers.next();
+    }
+}
+
+pub fn update_driver_system(
+    q: Query<(Entity, &Camera)>,
+    mut commands: Commands,
+    drivers: Res<Drivers>,
+) {
+    if drivers.is_changed() {
+        for box_component in &drivers.enabled_drivers {
+            let component = box_component.as_ref();
+            let component_id = component.get_id();
+
+            if let Some(h) = drivers.enabled_drivers.get(drivers.index()) {
+                if component_id.eq(&h.get_id()) {
+                    //Add new driver component
+                    //Remove old driver component
+                    for (entity, camera) in q.iter() {
+                        if camera.is_active {
+                            component.add_to(&mut commands, entity);
+                            println!("Adding {} to Camera {:?}", component.get_name(), entity);
+                        }
+                    }
+                } else {
+                    for (entity, camera) in q.iter() {
+                        if camera.is_active {
+                            component.remove_from(&mut commands, entity);
+                            println!("Remove {} from Camera {:?}", component.get_name(), entity);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/driver/mod.rs b/src/driver/mod.rs
new file mode 100644
index 0000000..4246b72
--- /dev/null
+++ b/src/driver/mod.rs
@@ -0,0 +1,2 @@
+pub mod driver_core;
+pub mod driver_resources;
diff --git a/src/drivers/fpv.rs b/src/drivers/fpv.rs
new file mode 100644
index 0000000..fcc51c6
--- /dev/null
+++ b/src/drivers/fpv.rs
@@ -0,0 +1,118 @@
+use crate::Commands;
+use bevy::ecs::entity::Entity;
+use bevy::prelude::Component;
+use bevy::window::PrimaryWindow;
+use config_cam_derive::DriverMarker;
+use std::any::TypeId;
+
+use crate::driver::driver_core::{DriverMarker, DriverRigs};
+use bevy::input::mouse::MouseMotion;
+use bevy::prelude::*;
+use bevy_dolly::prelude::*;
+
+#[derive(DriverMarker, Component, Clone, Copy, Debug)]
+pub struct CCFpv;
+impl Plugin for CCFpv {
+    fn build(&self, app: &mut App) {
+        app.add_rig_component(CCFpv)
+            .add_systems(Startup, setup_fpv)
+            .add_state::<MovementType>()
+            .add_systems(Update, update_fpv_camera);
+    }
+}
+
+fn setup_fpv(mut commands: Commands) {
+    commands.spawn((
+        Rig::builder()
+            .with(Fpv::from_position_target(
+                Transform::from_xyz(2.0, 2.0, 2.0).looking_at(Vec3::ZERO, Vec3::Y),
+            ))
+            .build(),
+        CCFpv,
+    ));
+}
+
+#[derive(States, Default, Clone, Debug, Eq, PartialEq, Hash)]
+pub enum MovementType {
+    #[default]
+    FirstPerson,
+    Free,
+}
+
+/*
+Example :
+commands.spawn((
+    MainCamera,
+    Rig::builder()
+        .with(Fpv::from_position_target(transform))
+        .build(),
+    Camera3dBundle {
+        transform,
+        ..default()
+    },
+));
+*/
+
+pub fn update_fpv_camera(
+    time: Res<Time>,
+    keys: Res<Input<KeyCode>>,
+    windows: Query<&Window, With<PrimaryWindow>>,
+    fps_state: Res<State<MovementType>>,
+    mut mouse_motion_events: EventReader<MouseMotion>,
+    mut rigs: DriverRigs,
+) {
+    let time_delta_seconds: f32 = time.delta_seconds();
+    let boost_mult = 5.0f32;
+    let _sensitivity = Vec2::splat(1.0);
+
+    let mut move_vec = Vec3::ZERO;
+
+    // Q: Is dolly left-handed so z is flipped?
+    if keys.pressed(KeyCode::W) {
+        move_vec.z -= 1.0;
+    }
+    if keys.pressed(KeyCode::S) {
+        move_vec.z += 1.0;
+    }
+    if keys.pressed(KeyCode::A) {
+        move_vec.x -= 1.0;
+    }
+    if keys.pressed(KeyCode::D) {
+        move_vec.x += 1.0;
+    }
+
+    if keys.pressed(KeyCode::E) || keys.pressed(KeyCode::Space) {
+        move_vec.y += 1.0;
+    }
+    if keys.pressed(KeyCode::Q) {
+        move_vec.y -= 1.0;
+    }
+
+    let boost: f32 = if keys.pressed(KeyCode::ShiftLeft) {
+        1.
+    } else {
+        0.
+    };
+
+    let mut delta = Vec2::ZERO;
+    for event in mouse_motion_events.iter() {
+        delta += event.delta;
+    }
+
+    rigs.try_for_each_driver_mut::<Fpv>(|r| {
+        let move_vec = r.set_position(
+            move_vec,
+            boost,
+            boost_mult,
+            fps_state.get().eq(&MovementType::FirstPerson),
+        );
+
+        if let Ok(window) = windows.get_single() {
+            if !window.cursor.visible {
+                if let Some(fpv) = r.try_driver_mut::<Fpv>() {
+                    fpv.set_rotation(delta, move_vec, time_delta_seconds);
+                }
+            }
+        }
+    });
+}
diff --git a/src/drivers/mod.rs b/src/drivers/mod.rs
new file mode 100644
index 0000000..669eaf9
--- /dev/null
+++ b/src/drivers/mod.rs
@@ -0,0 +1,2 @@
+pub mod fpv;
+pub mod orbit;
diff --git a/src/drivers/orbit.rs b/src/drivers/orbit.rs
new file mode 100644
index 0000000..e231990
--- /dev/null
+++ b/src/drivers/orbit.rs
@@ -0,0 +1,120 @@
+use crate::{CCSetupLabel, Commands, MainCamera};
+use bevy::ecs::entity::Entity;
+use bevy::prelude::Component;
+use config_cam_derive::DriverMarker;
+use std::any::TypeId;
+
+use crate::driver::driver_core::DriverMarker;
+use bevy::input::mouse::{MouseMotion, MouseWheel};
+use bevy::prelude::*;
+use bevy_dolly::prelude::*;
+
+#[derive(DriverMarker, Component, Clone, Copy, Debug)]
+pub struct CCOrbit;
+impl Plugin for CCOrbit {
+    fn build(&self, app: &mut App) {
+        app.add_rig_component(CCOrbit)
+            .add_state::<Pan>()
+            .add_systems(Startup, setup_orbit.after(CCSetupLabel))
+            .add_systems(Update, handle_mouse_scroll)
+            .add_systems(Update, update_orbit_camera);
+    }
+}
+
+fn setup_orbit(mut commands: Commands) {
+    commands.spawn((
+        Rig::builder()
+            .with(Position::new(Vec3::ZERO))
+            .with(YawPitch::new().yaw_degrees(45.0).pitch_degrees(-30.0))
+            .with(Smooth::new_position(0.3))
+            .with(Smooth::new_rotation(0.3))
+            .with(Arm::new(Vec3::Z * 4.0))
+            .build(),
+        CCOrbit,
+    ));
+}
+
+#[derive(States, Default, PartialEq, Eq, Debug, Clone, Copy, Hash)]
+enum Pan {
+    #[default]
+    Mouse,
+    Keys,
+}
+
+fn handle_mouse_scroll(
+    mut mouse_wheel_events: EventReader<MouseWheel>,
+    mut q_main: Query<&mut Projection, With<MainCamera>>,
+) {
+    for mouse_wheel_event in mouse_wheel_events.iter() {
+        for mut projection in &mut q_main.iter_mut() {
+            match &mut projection.as_mut() {
+                Projection::Perspective(pers) => {
+                    pers.fov = (pers.fov - mouse_wheel_event.y * 0.01).abs();
+                }
+                Projection::Orthographic(orth) => {
+                    orth.scale = (orth.scale - mouse_wheel_event.y * 0.1).abs();
+                }
+            }
+        }
+    }
+}
+
+#[allow(unused_must_use)]
+fn update_orbit_camera(
+    keys: Res<Input<KeyCode>>,
+    mut pan: ResMut<State<Pan>>,
+    mut mouse_motion_events: EventReader<MouseMotion>,
+    mut rig_q: Query<&mut Rig, With<CCOrbit>>,
+    transform: Query<Option<&Transform>, With<DollyPosCtrlMove>>,
+    mut config: ResMut<DollyPosCtrlConfig>,
+    grab_config: Res<DollyCursorGrabConfig>,
+) {
+    if let Ok(mut rig) = rig_q.get_single_mut() {
+        let camera_driver = rig.driver_mut::<YawPitch>();
+        let sensitivity = Vec2::splat(2.0);
+
+        let mut delta = Vec2::ZERO;
+        for event in mouse_motion_events.iter() {
+            delta += event.delta;
+        }
+
+        config.transform.rotation = Quat::from_rotation_y(delta.x);
+
+        if pan.get().eq(&Pan::Keys) {
+            if keys.just_pressed(KeyCode::Z) {
+                camera_driver.rotate_yaw_pitch(-90.0, 0.0);
+            }
+            if keys.just_pressed(KeyCode::X) {
+                camera_driver.rotate_yaw_pitch(90.0, 0.0);
+            }
+        } else if !grab_config.visible {
+            camera_driver.rotate_yaw_pitch(
+                -0.1 * delta.x * sensitivity.x,
+                -0.1 * delta.y * sensitivity.y,
+            );
+        }
+
+        if keys.just_pressed(KeyCode::E) {
+            let result = if pan.get().eq(&Pan::Keys) {
+                Pan::Mouse
+            } else {
+                Pan::Keys
+            };
+            *pan = State::new(result);
+            println!("State:{result:?}");
+        }
+
+        if keys.just_pressed(KeyCode::P) {
+            config.pin = !config.pin;
+            println!("Pinned:{:?}", config.pin);
+        }
+
+        if config.pin {
+            let camera_driver_2 = rig.driver_mut::<Position>();
+
+            for opt_transform in transform.iter().flatten() {
+                camera_driver_2.position = opt_transform.translation;
+            }
+        }
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index aeb0dde..a6f60f8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,709 +1,172 @@
+pub mod driver;
+pub mod drivers;
+
 use bevy::{
-    ecs::{
-        event::{Events, ManualEventReader},
-        schedule::SystemSet,
-    },
-    input::mouse::{MouseMotion, MouseWheel},
-    prelude::*,
-    render::{
-        camera::Camera,
-        camera::CameraProjection,
-        camera::{ActiveCamera, Camera3d, PerspectiveProjection},
+    prelude::{
+        default, App, Camera, Camera2dBundle, Camera3dBundle, Commands, Component,
+        IntoSystemConfigs, OrthographicProjection, Plugin, Query, Res, Resource, Startup,
+        SystemSet, Transform, Update, Vec3, With,
     },
-    window::Windows,
+    render::camera::ScalingMode,
 };
+use bevy_dolly::prelude::*;
+use driver::{
+    driver_core::{DriverRigs, Drivers},
+    driver_resources::{change_driver_system, update_driver_system},
+};
+use drivers::{fpv::CCFpv, orbit::CCOrbit};
+pub use std::any::TypeId;
 
-use strum::IntoEnumIterator;
-use strum_macros::EnumIter;
-
-#[macro_export]
-macro_rules! next_enum {
-    ($l:ident, $k:expr) => {
-        $l::iter()
-            .enumerate()
-            .nth(
-                $l::iter()
-                    .enumerate()
-                    .find(|a| a.1 == *$k.current())
-                    .map(|(i, _)| {
-                        if i + 1 > $l::iter().count() - 1 {
-                            0usize
-                        } else {
-                            i + 1
-                        }
-                    })
-                    .unwrap(),
-            )
-            .unwrap()
-            .1
-    };
-}
-
-#[derive(Component)]
-pub struct PlayerMove;
-#[derive(Clone, Eq, PartialEq, Debug, Hash)]
-enum PluginState {
-    Enabled,
-    //Disabled,
-}
-
-#[derive(Clone, Eq, PartialEq, Debug, Hash, EnumIter)]
-enum ScrollType {
-    MovementSpeed,
-    Zoom,
-    Sensitivity,
-    Lerp,
-    CamFwd,
-}
-#[derive(Clone, Eq, PartialEq, Debug, Hash, EnumIter)]
-pub enum CameraState {
-    //Look at player and other targets if set
-    LookAt,
-    //Follow the player only
-    FollowStatic,
-    //Camera is moved above and pointed down, rotation bound to one axis
-    TopDown,
-    TopDownDirection,
-    //Follows behind the player a certain distance
-    FollowBehind,
-    //Camera at same position as player, enables to use the mouse to look (WIP)
-    Fps,
-    //Use the mouse to look and move the camera freely
-    Free,
-}
-
-pub struct PlayerKeyMap {
-    pub forward: &'static [KeyCode],
-    pub backward: &'static [KeyCode],
-    pub left: &'static [KeyCode],
-    pub right: &'static [KeyCode],
-    pub up: &'static [KeyCode],
-    pub down: &'static [KeyCode],
-    pub rot_left: &'static [KeyCode],
-    pub rot_right: &'static [KeyCode],
-}
-
-pub struct PlayerSettings {
-    pub player_asset: &'static str,
-    pub speed: f32,
-    pub map: PlayerKeyMap,
-    pub pos: Vec3,
-    pub cam_fwd: bool,
-}
-
-impl Default for PlayerKeyMap {
-    fn default() -> Self {
-        Self {
-            forward: &[KeyCode::Up],
-            backward: &[KeyCode::Down],
-            left: &[KeyCode::Comma],
-            right: &[KeyCode::Period],
-            up: &[KeyCode::RShift],
-            down: &[KeyCode::Minus],
-            rot_left: &[KeyCode::Left],
-            rot_right: &[KeyCode::Right],
-        }
-    }
-}
-
-impl Default for PlayerSettings {
-    fn default() -> Self {
-        Self {
-            player_asset: "",
-            speed: 12.0,
-            map: PlayerKeyMap::default(),
-            pos: Default::default(),
-            cam_fwd: false,
-        }
-    }
-}
-
-#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemLabel)]
-struct MovementUpdate;
+// TODO documentation
 
 pub struct ConfigCam;
 impl Plugin for ConfigCam {
     fn build(&self, app: &mut App) {
-        app.init_resource::<CamLogic>()
-            .add_plugin(NoCameraPlayerPlugin)
-            .init_resource::<PlayerSettings>()
-            .add_state(PluginState::Enabled)
-            .add_state(CameraState::FollowBehind)
-            .add_state(ScrollType::MovementSpeed)
-            .add_system(toggle_camera_parent.after(MovementUpdate))
-            .add_system(switch_scroll_type.after(MovementUpdate))
-            .add_system(scroll.after(MovementUpdate))
-            .add_system(cycle_cam_state.after(MovementUpdate))
-            .add_system_set(SystemSet::on_enter(PluginState::Enabled).with_system(setup))
-            .add_system_set(
-                SystemSet::on_update(PluginState::Enabled)
-                    .with_system(move_player.after(MovementUpdate))
-                    .with_system(move_camera.label(MovementUpdate)),
-            );
-    }
-}
-
-#[derive(Default)]
-pub struct Player {
-    entity: Option<Entity>,
-}
-
-#[derive(Default)]
-pub struct CamLogic {
-    player: Player,
-    camera_should_focus: Vec3,
-    camera_is_focus: Vec3,
-    pub target: Option<Entity>,
-}
-
-const RESET_FOCUS: [f32; 3] = [0., 0., 0.];
-
-#[allow(unused_must_use)]
-fn cycle_cam_state(
-    mut cam_state: ResMut<State<CameraState>>,
-    settings: Res<MovementSettings>,
-    keyboard_input: Res<Input<KeyCode>>,
-) {
-    if keyboard_input
-        .get_just_pressed()
-        .any(|m| settings.map.next_cam.iter().any(|nc| m == nc))
-    {
-        let result = next_enum!(CameraState, cam_state);
-
-        println!("Camera: {:?}", result);
-        cam_state.set(result);
-    }
-}
-
-fn setup(
-    mut commands: Commands,
-    asset_server: Res<AssetServer>,
-    mut _cl: ResMut<CamLogic>,
-    settings: Res<PlayerSettings>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<StandardMaterial>>,
-) {
-    let mut a = if settings.player_asset.is_empty() {
-        commands.spawn_bundle(PbrBundle {
-            mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-            material: materials.add(Color::rgb(0.7, 0.3, 0.3).into()),
-            transform: Transform::from_xyz(0.0, 0.5, 0.0),
-            ..Default::default()
-        })
-    } else {
-        commands.spawn_bundle((
-            Transform {
-                translation: settings.pos,
-                rotation: Quat::from_rotation_y(-std::f32::consts::FRAC_PI_2),
+        app.init_resource::<Drivers>()
+            .init_resource::<CCConfig>()
+            .add_plugins(DollyPosCtrl)
+            .add_plugins(DollyCursorGrab)
+            .insert_resource(DollyPosCtrlConfig {
+                player: Player::None,
                 ..Default::default()
-            },
-            GlobalTransform::identity(),
-        ))
-    };
-
-    let b = if settings.player_asset.is_empty() {
-        a.with_children(|_| {})
-    } else {
-        a.with_children(|cell| {
-            cell.spawn_scene(asset_server.load(settings.player_asset));
-        })
-    };
-
-    _cl.player.entity = Some(
-        b.insert(PlayerMove)
-            .with_children(|parent| {
-                parent
-                    .spawn_bundle(PerspectiveCameraBundle {
-                        transform: Transform::from_xyz(-2.0, 5.0, 5.0)
-                            .looking_at(Vec3::ZERO, Vec3::Y),
-                        ..Default::default()
-                    })
-                    .insert(PlayerCam);
             })
-            .id(),
-    );
-
-    // camera
-    commands
-        .spawn_bundle(PerspectiveCameraBundle {
-            camera: Camera {
-                ..Default::default()
-            },
-            transform: Transform::from_xyz(-2.0, 5.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-            ..Default::default()
-        })
-        .insert(FlyCam);
-}
-
-// control the cam logic character
-fn move_player(
-    keys: Res<Input<KeyCode>>,
-    time: Res<Time>,
-    settings: Res<PlayerSettings>,
-    mut transforms: Query<(&PlayerMove, &mut Transform)>,
-) {
-    for (_player, mut transform) in transforms.iter_mut() {
-        let (_, mut rotation) = transform.rotation.to_axis_angle();
-        let mut velocity = Vec3::ZERO;
-        let local_z = transform.local_z();
-        //Forward should be togglable either xyz or cam direction xyz
-        let forward = if settings.cam_fwd {
-            Vec3::new(local_z.x, 0., local_z.z)
-        } else {
-            -Vec3::new(local_z.x, 0., local_z.z)
-        };
-
-        let right = Vec3::new(local_z.z, 0., -local_z.x);
-
-        for key in keys.get_pressed() {
-            if validate_key(settings.map.forward, key) {
-                velocity += forward
-            }
-            if validate_key(settings.map.backward, key) {
-                velocity -= forward
-            }
-            if validate_key(settings.map.left, key) {
-                velocity -= right
-            }
-            if validate_key(settings.map.right, key) {
-                velocity += right
-            }
-            if validate_key(settings.map.up, key) {
-                velocity += Vec3::Y
-            }
-            if validate_key(settings.map.down, key) {
-                velocity -= Vec3::Y
-            }
-            if validate_key(settings.map.rot_left, key) {
-                //Wrapping around
-                if rotation > std::f32::consts::FRAC_PI_2 * 4.0 - 0.05 {
-                    rotation = 0.0;
-                }
-                rotation += 0.1
-            }
-            if validate_key(settings.map.rot_right, key) {
-                //Wrapping around
-                if rotation < 0.05 {
-                    rotation = std::f32::consts::FRAC_PI_2 * 4.0;
-                }
-                rotation -= 0.1
-            }
-        }
-
-        velocity = velocity.normalize();
-
-        transform.rotation = Quat::from_rotation_y(rotation);
-
-        if !velocity.is_nan() {
-            transform.translation += velocity * time.delta_seconds() * 4.0;
-        }
+            .add_systems(
+                Startup,
+                camera_setup.run_if(is_init_cameras).in_set(CCSetupLabel),
+            )
+            .add_plugins(CCFpv)
+            .add_plugins(CCOrbit)
+            .add_systems(Update, change_driver_system)
+            .add_systems(Update, update_driver_system)
+            .add_systems(Update, update_look_at);
     }
 }
 
-// change the focus of the camera
-#[allow(clippy::type_complexity)]
-fn move_camera(
-    time: Res<Time>,
-    state: Res<State<CameraState>>,
-    mut cl: ResMut<CamLogic>,
-    mut settings: ResMut<MovementSettings>,
-    mut transforms: ParamSet<(Query<&mut Transform, With<Camera3d>>, Query<&Transform>)>,
-) {
-    let mut delta_trans = Transform::identity();
-    settings.disable_look = true;
-    settings.disable_move = false;
-    settings.locked_to_player = false;
-
-    match *state.current() {
-        CameraState::Free => {
-            settings.disable_look = false;
-            return;
-        }
-        CameraState::LookAt => {
-            // if there is both a player and a bonus, target the mid-point of them
-            if let (Some(player_entity), Some(bonus_entity)) = (cl.player.entity, cl.target) {
-                let transform_query = transforms.p1();
-                if let (Ok(player_transform), Ok(bonus_transform)) = (
-                    transform_query.get(player_entity),
-                    transform_query.get(bonus_entity),
-                ) {
-                    cl.camera_should_focus = player_transform
-                        .translation
-                        .lerp(bonus_transform.translation, settings.lerp);
-                }
-            // otherwise, if there is only a player, target the player
-            } else if let Some(player_entity) = cl.player.entity {
-                if let Ok(player_transform) = transforms.p1().get(player_entity) {
-                    cl.camera_should_focus = player_transform.translation;
-                }
-            // otherwise, target the middle
-            } else {
-                cl.camera_should_focus = Vec3::from(RESET_FOCUS);
-            }
-        }
-        _ => {
-            if let Some(player_entity) = cl.player.entity {
-                if let Ok(player_transform) = transforms.p1().get(player_entity) {
-                    match *state.current() {
-                        CameraState::Fps => {
-                            delta_trans.translation = player_transform.translation;
-                            settings.disable_move = true;
-
-                            settings.disable_look = false;
-                            delta_trans.rotation = player_transform.rotation;
-                            delta_trans.translation += Vec3::new(/*-4.*/ 0., 1., 0.);
-                        }
-                        CameraState::TopDown => {
-                            delta_trans.translation = player_transform.translation;
-                            settings.disable_move = true;
-
-                            delta_trans.translation +=
-                                Vec3::new(/*-4.*/ 0., settings.dist, 0.);
-                            delta_trans.rotation =
-                                Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)
-                        }
-                        CameraState::TopDownDirection => {
-                            settings.disable_move = true;
-                            settings.locked_to_player = true;
-
-                            delta_trans.translation +=
-                                Vec3::new(/*-4.*/ 0., settings.dist, 0.);
-                            delta_trans.rotation =
-                                Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2);
-                        }
-                        CameraState::FollowBehind => {
-                            settings.disable_move = true;
-
-                            settings.locked_to_player = true;
-
-                            delta_trans.translation += Vec3::new(/*-4.*/ 0., 1., 4.);
-                        }
-                        _ => {}
-                    }
-                    cl.camera_should_focus = player_transform.translation;
-                }
-            // otherwise, target the middle
-            } else {
-                cl.camera_should_focus = Vec3::from(RESET_FOCUS);
-            }
-        }
-    }
-
-    const SPEED: f32 = 2.0;
-
-    // calculate the camera motion based on the difference between where the camera is looking
-    // and where it should be looking; the greater the distance, the faster the motion;
-    // smooth out the camera movement using the frame time
-    let mut camera_motion = cl.camera_should_focus - cl.camera_is_focus;
-    if camera_motion.length() > 0.2 {
-        camera_motion *= SPEED * time.delta_seconds();
-        // set the new camera's actual focus
-        cl.camera_is_focus += camera_motion;
-    }
-    // look at that new camera's actual focus
-    for mut transform in transforms.p0().iter_mut() {
-        if delta_trans.translation != Vec3::ZERO {
-            *transform = delta_trans
-        } else {
-            *transform = transform.looking_at(cl.camera_is_focus, Vec3::Y)
+#[macro_export]
+macro_rules! type_vec {
+    ( $( $x:ident ),* ) => {
+        {
+            let mut temp_vec = Vec::new();
+            $(
+                temp_vec.push(TypeId::of::<$x>());
+            )*
+            temp_vec
         }
-    }
-}
-
-#[allow(clippy::type_complexity)]
-fn toggle_camera_parent(
-    mut act_cams: ResMut<ActiveCamera<Camera3d>>,
-    mut settings: ResMut<MovementSettings>,
-    mut query: ParamSet<(Query<(&FlyCam, Entity)>, Query<(&PlayerCam, Entity)>)>,
-) {
-    if settings.locked_to_player && !settings.ltp {
-        let p1 = query.p1();
-        let (_, b) = p1.single();
-        act_cams.set(b);
-
-        settings.ltp = true;
-    } else if !settings.locked_to_player && settings.ltp {
-        let pr = query.p0();
-        let (_, b) = pr.single();
-        act_cams.set(b);
-        settings.ltp = false;
-    }
-}
-
-// Listens for Z key being pressed and toggles between the scroll-type states
-#[allow(unused_must_use)]
-fn switch_scroll_type(
-    mut scroll_type: ResMut<State<ScrollType>>,
-    keyboard_input: Res<Input<KeyCode>>,
-) {
-    if keyboard_input.just_pressed(KeyCode::E) {
-        let result = next_enum!(ScrollType, scroll_type);
-
-        println!("{:?}", result);
-        scroll_type.set(result);
-    }
+    };
 }
 
-// Depending on the state, the mouse-scroll changes either the movement speed or the field-of-view of the camera
-fn scroll(
-    mut settings: ResMut<MovementSettings>,
-    mut p_settings: ResMut<PlayerSettings>,
-    scroll_type: Res<State<ScrollType>>,
-    mut mouse_wheel_events: EventReader<MouseWheel>,
-    windows: Res<Windows>,
-    mut query: Query<(&FlyCam, &mut Camera, &mut PerspectiveProjection)>,
-) {
-    for event in mouse_wheel_events.iter() {
-        match *scroll_type.current() {
-            ScrollType::MovementSpeed => {
-                settings.speed = (settings.speed + event.y * 0.1).abs();
-                println!("Speed: {:?}", settings.speed);
-            }
-            ScrollType::Sensitivity => {
-                settings.sensitivity = (settings.sensitivity + event.y * 0.000001).abs();
-                println!("Sensitivity: {:?}", settings.sensitivity);
-            }
-            ScrollType::Zoom => {
-                for (_camera, mut camera, mut project) in query.iter_mut() {
-                    project.fov = (project.fov - event.y * 0.01).abs();
-                    let prim = windows.get_primary().unwrap();
-
-                    //Calculate projection with new fov
-                    project.update(prim.width(), prim.height());
-
-                    //Update camera with the new fov
-                    camera.projection_matrix = project.get_projection_matrix();
-                    camera.depth_calculation = project.depth_calculation();
-
-                    println!("FOV: {:?}", project.fov);
-                }
-            }
-            ScrollType::Lerp => {
-                settings.lerp = (settings.lerp + event.y * 0.01).abs();
-                println!("Lerp: {:?}", settings.lerp);
-            }
-            ScrollType::CamFwd => {
-                if event.y > 0.01 {
-                    p_settings.cam_fwd = !p_settings.cam_fwd;
-                }
-                println!("CamFwd: {:?}", p_settings.cam_fwd);
-            }
+#[macro_export]
+macro_rules! driver_vec {
+    ( $( $x:ident ),* ) => {
+        {
+            let mut temp_vec: Vec<Box<dyn DriverMarker>> = Vec::new();
+            $(
+                temp_vec.push(Box::new($x));
+            )*
+            temp_vec
         }
-    }
-}
-
-//bevy_flycam by sburris0 - https://github.com/sburris0/bevy_flycam
-
-/// Keeps track of mouse motion events, pitch, and yaw
-#[derive(Default)]
-struct InputState {
-    reader_motion: ManualEventReader<MouseMotion>,
-    pitch: f32,
-    yaw: f32,
+    };
 }
 
-pub struct CamKeyMap {
-    pub forward: &'static [KeyCode],
-    pub backward: &'static [KeyCode],
-    pub left: &'static [KeyCode],
-    pub right: &'static [KeyCode],
-    pub up: &'static [KeyCode],
-    pub down: &'static [KeyCode],
-    pub next_cam: &'static [KeyCode],
-    pub next_setting: &'static [KeyCode],
+#[derive(Resource)]
+pub struct CCConfig {
+    pub init_cameras: bool,
+    pub features: Vec<String>,
 }
 
-impl Default for CamKeyMap {
+impl Default for CCConfig {
     fn default() -> Self {
         Self {
-            forward: &[KeyCode::W],
-            backward: &[KeyCode::S],
-            left: &[KeyCode::A],
-            right: &[KeyCode::D],
-            up: &[KeyCode::Space],
-            down: &[KeyCode::LShift],
-            next_cam: &[KeyCode::C],
-            next_setting: &[KeyCode::E],
+            init_cameras: true,
+            features: vec![],
         }
     }
 }
 
-/// Mouse sensitivity and movement speed
-pub struct MovementSettings {
-    pub sensitivity: f32,
-    pub speed: f32,
-    pub dist: f32,
-    pub map: CamKeyMap,
-    //pub force_cam: &'static[CameraState],
-    pub disable_move: bool,
-    pub disable_look: bool,
-    pub locked_to_player: bool,
-    pub lerp: f32,
-
-    pub ltp: bool,
+fn is_init_cameras(config: Res<CCConfig>) -> bool {
+    config.init_cameras
 }
 
-impl Default for MovementSettings {
-    fn default() -> Self {
-        Self {
-            sensitivity: 0.00012,
-            speed: 12.,
-            dist: 10.,
-            map: CamKeyMap::default(),
-            disable_move: false,
-            disable_look: false,
-            locked_to_player: false,
-            lerp: 0.5,
-            ltp: false,
-        }
-    }
+fn camera_setup(mut commands: Commands, _config: Res<CCConfig>) {
+    commands.spawn((
+        MainCamera,
+        PerspectiveCamera,
+        Camera3dBundle {
+            transform: Transform::from_xyz(2.0, 2.0, 2.0).looking_at(Vec3::ZERO, Vec3::Y),
+            ..Default::default()
+        },
+    ));
+    commands.spawn((
+        OrthographicCamera,
+        Camera3dBundle {
+            projection: OrthographicProjection {
+                scale: 3.0,
+                scaling_mode: ScalingMode::FixedVertical(2.0),
+                ..default()
+            }
+            .into(),
+            camera: Camera {
+                is_active: false,
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+    ));
+    commands.spawn((
+        TwoDimensionalCamera,
+        Camera2dBundle {
+            camera: Camera {
+                is_active: false,
+                ..Default::default()
+            },
+            ..Default::default()
+        },
+    ));
 }
 
-/// Used in queries when you want flycams and not other cameras
+#[derive(Debug, Clone, PartialEq, Eq, Hash, SystemSet)]
+pub struct CCSetupLabel;
 
 #[derive(Component)]
-struct FlyCam;
-#[derive(Component)]
-struct PlayerCam;
-
-/// Grabs/ungrabs mouse cursor
-fn toggle_grab_cursor(window: &mut Window) {
-    window.set_cursor_lock_mode(!window.cursor_locked());
-    window.set_cursor_visibility(!window.cursor_visible());
-}
-
-/// Grabs the cursor when game first starts
-fn initial_grab_cursor(mut windows: ResMut<Windows>) {
-    toggle_grab_cursor(windows.get_primary_mut().unwrap());
-}
+pub struct MainCamera;
 
-/// Spawns the `Camera3dBundle` to be controlled
-fn setup_player(mut commands: Commands) {
-    commands
-        .spawn_bundle(PerspectiveCameraBundle {
-            transform: Transform::from_xyz(-2.0, 5.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-            ..Default::default()
-        })
-        .insert(FlyCam);
-}
-
-/// Handles keyboard input and movement
-fn player_move(
-    keys: Res<Input<KeyCode>>,
-    time: Res<Time>,
-    windows: Res<Windows>,
-    settings: Res<MovementSettings>,
-    mut query: Query<(&FlyCam, &mut Transform)>,
-) {
-    if settings.disable_move {
-        return;
-    }
-    let window = windows.get_primary().unwrap();
-    for (_camera, mut transform) in query.iter_mut() {
-        let mut velocity = Vec3::ZERO;
-        let local_z = transform.local_z();
-        let forward = -Vec3::new(local_z.x, 0., local_z.z);
-        let right = Vec3::new(local_z.z, 0., -local_z.x);
+#[derive(Component)]
+pub struct PerspectiveCamera;
 
-        for key in keys.get_pressed() {
-            if window.cursor_locked() {
-                if validate_key(settings.map.forward, key) {
-                    velocity += forward
-                }
-                if validate_key(settings.map.backward, key) {
-                    velocity -= forward
-                }
-                if validate_key(settings.map.left, key) {
-                    velocity -= right
-                }
-                if validate_key(settings.map.right, key) {
-                    velocity += right
-                }
-                if validate_key(settings.map.up, key) {
-                    velocity += Vec3::Y
-                }
-                if validate_key(settings.map.down, key) {
-                    velocity -= Vec3::Y
-                }
-            }
-        }
+#[derive(Component)]
+pub struct OrthographicCamera;
 
-        velocity = velocity.normalize();
+#[derive(Component)]
+pub struct TwoDimensionalCamera;
 
-        if !velocity.is_nan() {
-            transform.translation += velocity * time.delta_seconds() * settings.speed
+// Target at is just a valid option for Follow, Orbit and FPV
+// Have the camera point at one or the summed vector direction
+// of all entities with the Target Component
+#[derive(Component)]
+pub struct Target;
+
+pub(crate) fn update_look_at(targets: Query<(&Transform, With<Target>)>, mut rigs: DriverRigs) {
+    rigs.try_for_each_driver_mut::<LookAt>(|la| {
+        let it = targets.iter();
+        if it.len().eq(&0) {
+        } else if it.len().eq(&1) {
+            la.target = it.last().unwrap().0.translation;
+        } else {
+            la.target = get_center_point(it.map(|f| f.0.translation).collect());
         }
-    }
+    });
 }
 
-pub fn validate_key<T>(codes: &'static [T], key: &T) -> bool
-where
-    T: PartialEq<T>,
-{
-    codes.iter().any(|m| m == key)
-}
-
-/// Handles looking around if cursor is locked
-fn player_look(
-    settings: Res<MovementSettings>,
-    windows: Res<Windows>,
-    mut state: ResMut<InputState>,
-    motion: Res<Events<MouseMotion>>,
-    mut query: Query<(&FlyCam, &mut Transform)>,
-) {
-    if settings.disable_look {
-        return;
-    }
-    let window = windows.get_primary().unwrap();
-    let mut state_delta = state.as_mut();
-    for (_camera, mut transform) in query.iter_mut() {
-        for ev in state_delta.reader_motion.iter(&motion) {
-            if window.cursor_locked() {
-                state_delta.pitch -=
-                    (settings.sensitivity * ev.delta.y * window.height()).to_radians();
-                state_delta.yaw -=
-                    (settings.sensitivity * ev.delta.x * window.width()).to_radians();
-            }
-
-            state_delta.pitch = state_delta.pitch.clamp(-1.54, 1.54);
-
-            // Order is important to prevent unintended roll
-            transform.rotation = Quat::from_axis_angle(Vec3::Y, state_delta.yaw)
-                * Quat::from_axis_angle(Vec3::X, state_delta.pitch);
+fn get_center_point(targets: Vec<Vec3>) -> Vec3 {
+    if targets.is_empty() {
+        Vec3::ONE
+    } else if targets.len() == 1 {
+        *targets.first().unwrap()
+    } else {
+        let mut a = Vec3::ONE;
+        for t in targets {
+            a += t
         }
-    }
-}
-
-fn cursor_grab(keys: Res<Input<KeyCode>>, mut windows: ResMut<Windows>) {
-    let window = windows.get_primary_mut().unwrap();
-    if keys.just_pressed(KeyCode::Escape) {
-        toggle_grab_cursor(window);
-    }
-}
-
-/// Contains everything needed to add first-person fly camera behavior to your game
-pub struct PlayerPlugin;
-impl Plugin for PlayerPlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<InputState>()
-            .init_resource::<MovementSettings>()
-            .add_startup_system(setup_player)
-            .add_startup_system(initial_grab_cursor)
-            .add_system(player_move.before(MovementUpdate))
-            .add_system(player_look.after(MovementUpdate))
-            .add_system(cursor_grab.after(MovementUpdate));
-    }
-}
-
-/// Same as `PlayerPlugin` but does not spawn a camera
-pub struct NoCameraPlayerPlugin;
-impl Plugin for NoCameraPlayerPlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<InputState>()
-            .init_resource::<MovementSettings>()
-            .add_startup_system(initial_grab_cursor)
-            .add_system(player_move.before(MovementUpdate))
-            .add_system(player_look.after(MovementUpdate))
-            .add_system(cursor_grab.after(MovementUpdate));
+        a * 0.5
     }
 }