diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..fac71227c9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+/target
+/web-target
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..91822b69e1
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# EditorConfig file: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[*.ts]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2
+
+[*.yml]
+indent_size = 2
\ No newline at end of file
diff --git a/.github/workflows/build-matchmaker.yml b/.github/workflows/build-matchmaker.yml
new file mode 100644
index 0000000000..6d1188e741
--- /dev/null
+++ b/.github/workflows/build-matchmaker.yml
@@ -0,0 +1,67 @@
+#
+# Builds the matchmaking server docker image
+#
+name: Build & Publish Matchmaker Docker Image
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v*"
+
+env:
+  RELEASE_VERSION: ${{ github.ref_name }}
+
+jobs:
+  build-and-publish:
+    name: Build and Publish Container
+    runs-on: ubuntu-latest
+    env:
+      DEPLOY_HOOK: ${{ secrets.DEPLOY_HOOK }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            ghcr.io/${{ github.repository }}-matchmaker
+
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=schedule
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+    
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Re-deploy Container
+        run: |
+          $DEPLOY_HOOK
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f2770e1474..7a4516d172 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,94 +1,70 @@
-name: Continuous integration
+name: CI
 
 on:
   push:
     branches:
-      - main
-    paths-ignore:
-      - "**.md"
-      - "**.json"
+      - master
+      - staging
+      - trying
   pull_request:
-    paths-ignore:
-      - "**.md"
-      - "**.json"
 
 jobs:
-  fmt:
+  check_formatting:
     runs-on: ubuntu-latest
-    name: Formatting
+    name: Check Rust formatting
     steps:
-      - uses: actions/checkout@v2
-      - name: Check Rust formatting
-        uses: actions-rs/cargo@v1
+      - uses: actions/checkout@v3
+      - name: Install Rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          components: rustfmt
+      - uses: actions-rs/cargo@v1
         with:
           command: fmt
           args: --all -- --check
 
-  clippy:
+  clippy_correctness_checks:
     runs-on: ubuntu-latest
-    name: Linting
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install \
-            --allow-unauthenticated -y -qq \
-              libasound2-dev \
-              libgl1-mesa-dev \
-              libx11-dev \
-              libxi-dev \
-              libudev-dev
-      - name: Install Clippy
-        run: rustup component add clippy
-
-      - name: Run Clippy
-        run: cargo clippy -- -W clippy::correctness -D warnings
-
-  build:
-    name: Build
-    runs-on: ${{ matrix.config.os }}
+    name: Clippy correctness checks
     strategy:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-latest, target: "x86_64-unknown-linux-gnu" }
-          - { os: macos-latest, target: "x86_64-apple-darwin" }
-          - { os: macos-latest, target: "aarch64-apple-darwin" }
-          - { os: windows-latest, target: "x86_64-pc-windows-msvc" }
-          - { os: windows-latest, target: "i686-pc-windows-msvc" }
-        profile: ["--release"]
-
+          - { target: 'x86_64-unknown-linux-gnu', target_dir: 'target' }
+          # Disable WASM Target until we fix WASM compile
+          # - { target: 'wasm32-unknown-unknown', target_dir: 'web-target' }
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
       - name: Install dependencies
-        if: matrix.config.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install \
-            --allow-unauthenticated -y -qq \
+          sudo apt-get install -y -q \
               libasound2-dev \
-              libgl1-mesa-dev \
-              libx11-dev \
-              libxi-dev \
               libudev-dev
-      - name: Cache Cargo dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}
-      - name: Setup Rust
+      - uses: actions/checkout@v3
+      - name: Install WASM Target
+        if: matrix.config.target == 'wasm32-unknown-unknown'
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
-          override: true
-          profile: minimal
           target: ${{ matrix.config.target }}
+          components: clippy
+      - name: Install Clippy
+        if: matrix.config.target != 'wasm32-unknown-unknown'
+        uses: actions-rs/toolchain@v1
+        with:
+          components: clippy
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+            web-target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - uses: actions-rs/cargo@v1
+        env:
+          CARGO_TARGET_DIR: ${{ matrix.config.target_dir }}
         with:
-          command: build
-          args: --locked --target ${{ matrix.config.target }} ${{ matrix.profile }}
+          command: clippy
+          args: --target ${{ matrix.config.target }} -- -W clippy::correctness -D warnings
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 18ec30a368..2675dd61f0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,11 +1,14 @@
-# This action will generate Windows|Linux|MacOS binary releases
-
-name: Release
+name: CD
 
 on:
   push:
+    branches:
+      - main
     tags:
-      - "v*"
+      - 'v*'
+
+env:
+  RELEASE_VERSION: ${{ github.ref_name }}
 
 jobs:
   build_release:
@@ -16,38 +19,31 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-latest, target: "x86_64-unknown-linux-gnu" }
-          - { os: macos-latest, target: "x86_64-apple-darwin" }
-          - { os: macos-latest, target: "aarch64-apple-darwin" }
-          - { os: windows-latest, target: "x86_64-pc-windows-msvc" }
-          - { os: windows-latest, target: "i686-pc-windows-msvc" }
+          - { os: ubuntu-latest, target: 'x86_64-unknown-linux-gnu' }
+          - { os: macos-latest, target: 'x86_64-apple-darwin' }
+          - { os: macos-latest, target: 'aarch64-apple-darwin' }
+          - { os: windows-latest, target: 'x86_64-pc-windows-msvc' }
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set the release version
-        shell: bash
-        run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
+        uses: actions/checkout@v3
 
       - name: Install dependencies
         if: matrix.config.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install \
-            --allow-unauthenticated -y -qq \
+          sudo apt-get install -y -q \
               libasound2-dev \
-              libgl1-mesa-dev \
-              libx11-dev \
-              libxi-dev \
               libudev-dev
 
-      - name: Cache Cargo
-        uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
-            ~/.cargo/registry
-            ~/.cargo/git
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Setup Rust
@@ -60,9 +56,6 @@ jobs:
 
       - name: Build
         uses: actions-rs/cargo@v1
-        env:
-          SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
-          RUSTFLAGS: -L /usr/lib/x86_64-linux-gnu
         with:
           command: build
           args: --release --locked --target ${{ matrix.config.target }}
@@ -76,10 +69,8 @@ jobs:
           echo "ARTIFACT_PATH=$artifact_path" >> $GITHUB_ENV
           mkdir $release_dir
           cp target/${{ matrix.config.target }}/release/jumpy.exe $release_dir/
-          strip $release_dir/jumpy.exe
-          find assets -name "*.schema.json" -exec rm -f {} \;
-          cp -R assets/ mods/ licenses/ $release_dir/
-          cp LICENSE $release_dir/licenses/
+          cp -R assets/ $release_dir/
+          cp LICENSE $release_dir/
           7z a -tzip $artifact_path $release_dir/
 
       - name: Prepare artifacts [Unix]
@@ -91,10 +82,8 @@ jobs:
           echo "ARTIFACT_PATH=$artifact_path" >> $GITHUB_ENV
           mkdir $release_dir
           cp target/${{ matrix.config.target }}/release/jumpy $release_dir/
-          strip $release_dir/jumpy || true
-          find assets -name "*.schema.json" -exec rm -f {} \;
-          cp -R assets mods licenses $release_dir
-          cp LICENSE $release_dir/licenses
+          cp -R assets $release_dir
+          cp LICENSE $release_dir
           tar -czvf $artifact_path $release_dir/
 
       - name: Deploy | Upload artifacts
@@ -111,14 +100,20 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Download Artifacts
         uses: actions/download-artifact@v2
 
-      - name: Set the release version
+      - name: Set stable release name
+        shell: bash
+        if: env.release_VERSION != 'main'
+        run: echo "RELEASE_NAME=Jumpy ${GITHUB_REF:10}" >> $GITHUB_ENV
+
+      - name: Set pre-release name
         shell: bash
-        run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
+        if: env.release_VERSION == 'main'
+        run: echo "RELEASE_NAME=Jumpy Dev Snapshot" >> $GITHUB_ENV
 
       - name: Generate Checksums
         run: for file in jumpy-*/jumpy-*; do openssl dgst -sha256 -r "$file" | awk '{print $1}' > "${file}.sha256"; done
@@ -130,6 +125,7 @@ jobs:
           file: jumpy-*/jumpy-*
           file_glob: true
           overwrite: true
-          body: "Fish Folk: Jumpy ${{ env.RELEASE_VERSION }} 🐟"
+          prerelease: ${{ env.RELEASE_VERSION == 'main' }}
+          body: '${{ env.RELEASE_NAME }}'
           tag: ${{ github.ref }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
deleted file mode 100644
index 6a33f44e20..0000000000
--- a/.github/workflows/validation.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "**.json"
-  pull_request:
-    paths:
-      - "**.json"
-
-name: Format validation check
-
-jobs:
-  json-validation:
-    runs-on: ubuntu-latest
-    name: Validate JSON files
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Install ajv-cli
-        run: npm install -g ajv-cli
-
-      - name: Validate files
-        shell: bash
-        run: ./scripts/validate_json.sh
diff --git a/.github/workflows/web-demo.yml b/.github/workflows/web-demo.yml
new file mode 100644
index 0000000000..bf01f17e38
--- /dev/null
+++ b/.github/workflows/web-demo.yml
@@ -0,0 +1,67 @@
+name: Publish Web Demo
+
+on:
+  - workflow_dispatch
+  # Disable temporarily while web build is broken
+  #
+  # push:
+  #   tags:
+  #     - "v*"
+  #   branches:
+  #     - bevy-rewrite
+  #     - main
+
+jobs:
+  publish-web-demo:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Just ⚙️
+        run: curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | sudo bash -s -- --to /usr/local/bin
+
+      - name: Cargo Registry Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry/index
+            ~/.cargo/registry/cache
+            ~/.cargo/git/db
+          key: cargo-registry
+
+      - name: Rust Toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+          override: true
+
+      - uses: jetli/wasm-bindgen-action@v0.1.0
+        with:
+          version: "0.2.83"
+
+      - name: Build WASM Release 🔨
+        run: just build-release-web
+
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@4.1.3
+        with:
+          branch: gh-pages
+          folder: web-target/wasm-release
+          target-folder: player/${{ github.ref_name }}
+          ssh-key: ${{ secrets.MASTER_GH_PAGES_DEPLOY_KEY }}
+
+    #   - name: Symlink Latest Build
+    #     run: |
+    #       mkdir latest-symlink-dir
+    #       ln -s ./${{ github.ref_name }} latest
+    #       mv latest latest-symlink-dir
+
+    #   - name: Deploy Symlinked Latest Build 🚀
+    #     uses: JamesIves/github-pages-deploy-action@4.1.3
+    #     with:
+    #       branch: gh-pages
+    #       folder: latest-symlink-dir
+    #       clean: false
+    #       target-folder: player
+    #       ssh-key: ${{ secrets.MASTER_GH_PAGES_DEPLOY_KEY }}
diff --git a/.gitignore b/.gitignore
index 02718a78e9..5487562ee7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 /web
 /target
-Cargo.toml
+/web-target
 src/.DS_Store
 .DS_Store
 /.idea/
 book/book
-.vscode
+.vscode
\ No newline at end of file
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
deleted file mode 100644
index fdb6321d1d..0000000000
--- a/ARCHITECTURE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Project Architecture
-
-This project use [Macroquad](https://github.com/not-fl3/macroquad) for rendering and context handling and
-[Hecs](https://github.com/Ralith/hecs) as its ECS. The game loop is also handled using Macroquad, with a `Node`
-implementation (`crate::game::Game`) that calls the various systems in the appropriate frame phase.
-
-Modules should separate code by context, and we keep both component types and system function implementations
-together, separated by concern, based on this context.
-
-The overarching design philosophy, on a code level, will be to keep to the ECS paradigm. Meaning that we implement
-logic in systems and keep component types as pure data types. The exception is in cases where manipulating
-data on a component depends on several steps and this manipulation happens in more than one step, making a setter
-type method on the component type to avoid code duplication.
-
-Types will often have companion types with a `Metadata` suffix, which are the types used to serialize and
-deserialize the type to json.
-
-There is also the `assets` folder, which contains all assets, both containing data files and the game's graphics.
-Every asset type is usually accompanied by a data file, where the assets are declared for dynamic loading.
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 7822317f82..9f3a9798bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,38 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
+[[package]]
+name = "ab_glyph"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04a9283dace1c41c265496614998d5b9c4a97b3eb770e804f007c5144bf03f2b"
+dependencies = [
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser",
+]
+
+[[package]]
+name = "ab_glyph_rasterizer"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330223a1aecc308757b9926e9391c9b47f8ef2dbd8aea9df88312aea18c5e8d6"
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "adler32"
 version = "1.2.0"
@@ -10,851 +42,5662 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
 
 [[package]]
 name = "ahash"
-version = "0.4.7"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "57e6e951cfbb2db8de1828d49073a113a29fd7117b1596caa781a258c7e38d72"
 dependencies = [
+ "cfg-if 1.0.0",
  "getrandom",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
-name = "async-trait"
-version = "0.1.56"
+name = "aho-corasick"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "memchr",
 ]
 
 [[package]]
-name = "audir-sles"
-version = "0.1.0"
+name = "alsa"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea47348666a8edb7ad80cbee3940eb2bccf70df0e6ce09009abe1a836cb779f5"
+checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b"
+dependencies = [
+ "alsa-sys",
+ "bitflags",
+ "libc",
+ "nix 0.23.1",
+]
 
 [[package]]
-name = "audrey"
-version = "0.3.0"
+name = "alsa-sys"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58b92a84e89497e3cd25d3672cd5d1c288abaac02c18ff21283f17d118b889b8"
+checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
 dependencies = [
- "dasp_frame",
- "dasp_sample",
- "hound",
- "lewton",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.1.0"
+name = "android_log-sys"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
 
 [[package]]
-name = "bitflags"
-version = "1.3.2"
+name = "android_logger"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "d9ed09b18365ed295d722d0b5ed59c01b79a826ff2d2a8f73d5ecca8e6fb2f66"
+dependencies = [
+ "android_log-sys",
+ "env_logger",
+ "lazy_static",
+ "log",
+]
 
 [[package]]
-name = "bumpalo"
-version = "3.10.0"
+name = "android_system_properties"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
 
 [[package]]
-name = "bytemuck"
-version = "1.9.1"
+name = "anyhow"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc"
+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
 
 [[package]]
-name = "byteorder"
-version = "1.4.3"
+name = "approx"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+dependencies = [
+ "num-traits",
+]
 
 [[package]]
-name = "cc"
-version = "1.0.73"
+name = "arboard"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "dc120354d1b5ec6d7aaf4876b602def75595937b5e15d356eb554ab5177e08bb"
+dependencies = [
+ "clipboard-win",
+ "core-graphics 0.22.3",
+ "image 0.23.14",
+ "log",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "parking_lot 0.12.1",
+ "thiserror",
+ "winapi",
+ "x11rb",
+]
 
 [[package]]
-name = "cfg-if"
-version = "1.0.0"
+name = "arrayvec"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
-name = "color_quant"
-version = "1.1.0"
+name = "arrayvec"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
 [[package]]
-name = "core-foundation"
-version = "0.9.3"
+name = "ash"
+version = "0.37.0+1.3.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "006ca68e0f2b03f22d6fa9f2860f85aed430d257fec20f8879b2145e7c7ae1a6"
 dependencies = [
- "core-foundation-sys",
- "libc",
+ "libloading",
 ]
 
 [[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
+name = "ast_node"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "cf94863c5fdfee166d0907c44e5fee970123b2b7307046d35d1e671aa93afbba"
 dependencies = [
- "cfg-if",
+ "darling",
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn",
 ]
 
 [[package]]
-name = "dasp_frame"
-version = "0.11.0"
+name = "async-channel"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a3937f5fe2135702897535c8d4a5553f8b116f76c1529088797f2eee7c5cd6"
+checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
 dependencies = [
- "dasp_sample",
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
 ]
 
 [[package]]
-name = "dasp_sample"
-version = "0.11.0"
+name = "async-executor"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "once_cell",
+ "slab",
+]
 
 [[package]]
-name = "deflate"
-version = "0.8.6"
+name = "async-io"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
+checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7"
 dependencies = [
- "adler32",
- "byteorder",
+ "autocfg",
+ "concurrent-queue",
+ "futures-lite",
+ "libc",
+ "log",
+ "once_cell",
+ "parking",
+ "polling",
+ "slab",
+ "socket2",
+ "waker-fn",
+ "winapi",
 ]
 
 [[package]]
-name = "ff-particles"
-version = "0.1.2"
+name = "async-task"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456005c433b73c5268369b27894cd5fa94a0abb3e0489540152383849f1045c0"
-dependencies = [
- "macroquad",
- "serde",
-]
+checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
-name = "fishsticks"
-version = "0.2.3"
-source = "git+https://github.com/fishfolks/fishsticks#25bd7676c85064ad976c449317f30b623f5e7515"
-dependencies = [
- "cfg-if",
- "gilrs",
-]
+name = "atomic-arena"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10"
 
 [[package]]
-name = "fnv"
-version = "1.0.7"
+name = "atomic-waker"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
 
 [[package]]
-name = "fontdue"
-version = "0.5.2"
+name = "atomic_refcell"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75712fff1702bac51b7eaa5a5ca9f9853b8055ef5906088a32f4fe196595a1d"
-dependencies = [
- "hashbrown 0.9.1",
- "ttf-parser",
-]
+checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d"
 
 [[package]]
-name = "getrandom"
-version = "0.2.7"
+name = "atty"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "cfg-if",
- "js-sys",
+ "hermit-abi",
  "libc",
- "wasi",
- "wasm-bindgen",
+ "winapi",
 ]
 
 [[package]]
-name = "gilrs"
-version = "0.9.0"
+name = "autocfg"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ba7c37bf8ea7ba0c3e3795dfa1a7771b1e47c4bb417c4d27c7b338d79685f"
-dependencies = [
- "fnv",
- "gilrs-core",
- "log",
- "uuid",
- "vec_map",
-]
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
-name = "gilrs-core"
-version = "0.4.1"
+name = "base64"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a8d94a7fc5afd27e894e08a4cfe5a49237f85bcc7140e90721bad3399c7d02"
-dependencies = [
- "core-foundation",
- "io-kit-sys",
- "js-sys",
- "libc",
- "libudev-sys",
- "log",
- "nix",
- "rusty-xinput",
- "uuid",
- "vec_map",
- "wasm-bindgen",
- "web-sys",
- "winapi",
-]
+checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 
 [[package]]
-name = "glam"
-version = "0.14.0"
+name = "base64"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "333928d5eb103c5d4050533cec0384302db6be8ef7d3cebd30ec6a35350353da"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
-name = "hashbrown"
-version = "0.9.1"
+name = "better_scoped_tls"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+checksum = "b73e8ecdec39e98aa3b19e8cd0b8ed8f77ccb86a6b0b2dc7cd86d105438a2123"
 dependencies = [
- "ahash 0.4.7",
+ "scoped-tls",
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.12.1"
+name = "bevy"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+checksum = "fea147ef1ebb92d41294cfad804c40de151b174c711ce6e0a4a40eba23eae1a4"
 dependencies = [
- "ahash 0.7.6",
+ "bevy_internal",
 ]
 
 [[package]]
-name = "hecs"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ae6c6368add4cc6592ed9b48a270b35cf3a52d429355aaeb55822935526e94"
+name = "bevy-has-load-progress"
+version = "0.1.0"
 dependencies = [
- "hashbrown 0.12.1",
- "spin",
+ "bevy",
+ "bevy-has-load-progress-macros",
+ "bevy_egui",
 ]
 
 [[package]]
-name = "hound"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
+name = "bevy-has-load-progress-macros"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
-name = "image"
-version = "0.23.14"
+name = "bevy-inspector-egui"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
+checksum = "3e18f673a7040930e20c899ad5e98d62f5db702a742c9cd96b5862d051a7b5da"
 dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-iter",
- "num-rational",
- "num-traits",
- "png",
+ "bevy",
+ "bevy-inspector-egui-derive",
+ "bevy_egui",
+ "image 0.23.14",
+ "pretty-type-name",
 ]
 
 [[package]]
-name = "io-kit-sys"
-version = "0.2.0"
+name = "bevy-inspector-egui-derive"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7789f7f3c9686f96164f5109d69152de759e76e284f736bd57661c6df5091919"
+checksum = "2ce0a659fdb2c31c2ae7f2ee8020fa758aff458a4ae4dc4e55bc27dcc31ef487"
 dependencies = [
- "core-foundation-sys",
- "mach",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.2"
+name = "bevy-parallax"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+checksum = "848290b802a0315343b65eba37dc258194689b5df40fbd808aa2dec75bf812a3"
+dependencies = [
+ "bevy",
+ "serde",
+]
 
 [[package]]
-name = "js-sys"
-version = "0.3.58"
+name = "bevy_app"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
+checksum = "9e4ae0a6ed2adf3b153511b4645241660a93f747c05ecd1e5a909dafc803cad4"
 dependencies = [
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
  "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
-name = "jumpy"
-version = "0.4.3"
+name = "bevy_asset"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ec773c861a7e9d9978771f59f385500ec6da3a1ab5487705cddb054393d3d19"
 dependencies = [
- "ff-particles",
- "fishsticks",
- "hecs",
- "jumpy-core",
- "macroquad",
- "macroquad-platformer",
+ "anyhow",
+ "bevy_app",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
+ "crossbeam-channel",
+ "downcast-rs",
+ "fastrand",
+ "js-sys",
+ "ndk-glue 0.5.2",
+ "notify",
+ "parking_lot 0.12.1",
  "serde",
- "serde_json",
+ "thiserror",
  "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
 ]
 
 [[package]]
-name = "jumpy-core"
-version = "0.4.3"
+name = "bevy_core"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c53172003d5cde7780870b5403c66c8ede3581faf3e510e916d8b4baa5b538d2"
 dependencies = [
- "async-trait",
- "fishsticks",
- "getrandom",
- "hecs",
- "macroquad",
- "serde",
- "serde_json",
- "toml",
- "wasm-bindgen",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
+ "bytemuck",
 ]
 
 [[package]]
-name = "lazy_static"
-version = "1.4.0"
+name = "bevy_core_pipeline"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "5e60efd10d593f6d122f2687f74c09ad55835a8f999c35bed6380ddd8e6ff7f2"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
+ "radsort",
+ "serde",
+]
 
 [[package]]
-name = "lewton"
-version = "0.9.4"
+name = "bevy_derive"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0"
+checksum = "0e6345431bbe6d7b6c165cd860ecd0b35da929779571259c5df970ac256d45f9"
 dependencies = [
- "byteorder",
- "ogg",
- "smallvec",
+ "bevy_macro_utils",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "libc"
-version = "0.2.126"
+name = "bevy_diagnostic"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "58ac9f4c2815f412be4b6e21e4b299cdafa710f651d064f6d40b2a8377a0d17c"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_time",
+ "bevy_utils",
+]
 
 [[package]]
-name = "libudev-sys"
-version = "0.1.4"
+name = "bevy_ecs"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+checksum = "c174066a24ed8a14d15ea58b0aea1c1f5c763f4bb36ebdc2b1dc78026007d0f5"
 dependencies = [
- "libc",
- "pkg-config",
+ "async-channel",
+ "bevy_ecs_macros",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_tasks",
+ "bevy_utils",
+ "downcast-rs",
+ "fixedbitset",
+ "fxhash",
+ "serde",
+ "thread_local",
 ]
 
 [[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+name = "bevy_ecs_dynamic"
+version = "0.1.0"
+source = "git+https://github.com/jakobhellermann/bevy_ecs_dynamic#aa7a051a49bd134cfd8c169542e16526bf2b36b3"
 dependencies = [
- "cfg-if",
+ "bevy_ecs",
+ "bevy_reflect",
+ "fixedbitset",
 ]
 
 [[package]]
-name = "mach"
-version = "0.3.2"
+name = "bevy_ecs_macros"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+checksum = "cc50c39e49e8febccc74e8e731680adb0cb4aef1f53275740cbaa95c6da71f4f"
 dependencies = [
- "libc",
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "macroquad"
-version = "0.3.16"
+name = "bevy_ecs_tilemap"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b723ade71357d07177c769af9ae42beff73c854e827ee5a4ec765dd2beb95e1"
+checksum = "5ef56c77808aa1fc7379ce538bd9a1e4048794203b4f591f2d06131fc613a1cc"
 dependencies = [
- "bumpalo",
- "fontdue",
- "glam",
- "image",
- "macroquad_macro",
- "miniquad",
- "quad-rand",
- "quad-snd",
+ "bevy",
+ "log",
+ "regex",
 ]
 
 [[package]]
-name = "macroquad-platformer"
-version = "0.1.3"
+name = "bevy_egui"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927301bceb8c2781043a18611304b7b0a9d034b402321d4e099ef01c58ac0793"
+checksum = "d365761fd6a5c227b1f88f38b560287334accb69cfe938443e27615464edc897"
 dependencies = [
- "macroquad",
+ "arboard",
+ "bevy",
+ "egui",
+ "thread_local",
+ "webbrowser",
 ]
 
 [[package]]
-name = "macroquad_macro"
-version = "0.1.7"
+name = "bevy_encase_derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68bc194009c5e9b97da64a08142dd183c264885d99c985cf849868103018adf1"
+dependencies = [
+ "bevy_macro_utils",
+ "encase_derive_impl",
+]
+
+[[package]]
+name = "bevy_fluent"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97073140587e1d731a583695c64b3a4410ba5edf9b3f79aae56ab63d0aab0384"
+dependencies = [
+ "anyhow",
+ "bevy",
+ "fluent",
+ "fluent-langneg",
+ "globset",
+ "indexmap",
+ "intl-memoizer",
+ "ron",
+ "serde",
+ "serde_yaml",
+ "thiserror",
+ "tracing",
+ "unic-langid",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_gilrs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb15a3427d9707be92b457e5d66900b02d853b475c21dd8662bdda387ba9f24e"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_utils",
+ "gilrs",
+]
+
+[[package]]
+name = "bevy_hierarchy"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eb1ec76099ea5a716de08ea42ff41f036ebe2502df1d569168b58f16458a85e"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
+ "smallvec",
+]
+
+[[package]]
+name = "bevy_input"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1821c4b760ba6ddb4fe61806e9cc33f40b09a884557aca4553a29b8c7d73c6b4"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_utils",
+ "serde",
+]
+
+[[package]]
+name = "bevy_internal"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee63ad1e3f95a26ff2c227fadb1534a7bfe3a098e0e45c347f2f2575a573d9bc"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_diagnostic",
+ "bevy_ecs",
+ "bevy_gilrs",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_ptr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_tasks",
+ "bevy_text",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_ui",
+ "bevy_utils",
+ "bevy_window",
+ "bevy_winit",
+ "ndk-glue 0.5.2",
+]
+
+[[package]]
+name = "bevy_kira_audio"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0379febb94c497ac6f6b5c0ef27775f7302f65dc780a33dbcec0c743a474b5f4"
+dependencies = [
+ "anyhow",
+ "bevy",
+ "kira",
+ "parking_lot 0.12.1",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_log"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "092daf498887814a064331dfcd1cf487a5ddab01fd38629b84a35b8b664462a1"
+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.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43fb5137e5198302d7c6c33d1e454cf48a586e7c6fd12f4860f12863951e16b9"
+dependencies = [
+ "quote",
+ "syn",
+ "toml",
+]
+
+[[package]]
+name = "bevy_math"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "531f2b90c7e861a96f418b3d560131b3354c5e67a67eba3953a45a56ea0114d2"
+dependencies = [
+ "glam",
+]
+
+[[package]]
+name = "bevy_mikktspace"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "941e7d3d4e1dbb735f040e4cdc1558be1d3c38d43f1d9fdbb039c39a7849a00b"
+dependencies = [
+ "glam",
+]
+
+[[package]]
+name = "bevy_mod_js_scripting"
+version = "0.1.0"
+source = "git+https://github.com/zicklag/bevy_mod_js_scripting.git?branch=jumpy#c86212a29be7475b0c2b1ffeaa60d13b0f6f2706"
+dependencies = [
+ "anyhow",
+ "bevy",
+ "bevy_ecs_dynamic",
+ "bevy_reflect",
+ "bevy_reflect_fns",
+ "deno_core",
+ "fixedbitset",
+ "js-sys",
+ "pollster",
+ "serde",
+ "serde-wasm-bindgen",
+ "serde_json",
+ "slotmap",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_codegen",
+ "swc_ecma_parser",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_typescript",
+ "swc_ecma_visit",
+ "type-map 0.5.0",
+ "wasm-bindgen",
+ "wasm_mutex",
+]
+
+[[package]]
+name = "bevy_pbr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "176073021a4caeb8b448f24ce790fb57fde74b114f345064a8b102d2f7bed905"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "bitflags",
+ "bytemuck",
+ "radsort",
+]
+
+[[package]]
+name = "bevy_prototype_lyon"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9e44f5ffcbac7114ed9377e6bc875e845c76e5ebb3a5a018169dc37ba5b78d0"
+dependencies = [
+ "bevy",
+ "lyon_tessellation",
+ "svgtypes",
+]
+
+[[package]]
+name = "bevy_ptr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9960c19e582b43cebe1894b6679520a4f50802d1cc5b6fa432f8d685ed232f09"
+
+[[package]]
+name = "bevy_reflect"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fc689dd7a7df3b3768884a4754711d406aa302ea48da483c03b52715fa95045"
+dependencies = [
+ "bevy_ptr",
+ "bevy_reflect_derive",
+ "bevy_utils",
+ "downcast-rs",
+ "erased-serde",
+ "glam",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "serde",
+ "smallvec",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_reflect_derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c36fa5100832c787c10558d31632ddc454c221e8dfacbbef836938f59614754"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_reflect_fns"
+version = "0.1.0"
+source = "git+https://github.com/jakobhellermann/bevy_reflect_fns#22e85021851e0cfe27b87e428f6313dd8c26abde"
+dependencies = [
+ "bevy_reflect",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_render"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "600bcef85c7efac6e38ed725707f0e5b7c59b510430034ba2f743f472493f845"
+dependencies = [
+ "anyhow",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_encase_derive",
+ "bevy_hierarchy",
+ "bevy_log",
+ "bevy_math",
+ "bevy_mikktspace",
+ "bevy_reflect",
+ "bevy_render_macros",
+ "bevy_time",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "bitflags",
+ "codespan-reporting",
+ "copyless",
+ "downcast-rs",
+ "encase",
+ "futures-lite",
+ "hex",
+ "hexasphere",
+ "image 0.24.4",
+ "naga",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "regex",
+ "serde",
+ "smallvec",
+ "thiserror",
+ "thread_local",
+ "wgpu",
+]
+
+[[package]]
+name = "bevy_render_macros"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1be90adc9e5d5808833e363670818da5fe68ccafd7ca983a457f90957d2a430b"
+dependencies = [
+ "bevy_macro_utils",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "bevy_sprite"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69c419f3db09d7ac1f4d45e0874d349d5d6f47f48bc10d55cd0da36413e2331e"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core_pipeline",
+ "bevy_ecs",
+ "bevy_log",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_transform",
+ "bevy_utils",
+ "bitflags",
+ "bytemuck",
+ "copyless",
+ "fixedbitset",
+ "guillotiere",
+ "rectangle-pack",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_tasks"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b753acb3d5b9dbfd77038560fe1893c17d4ee0a4242c2ee70da9d59430537"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "event-listener",
+ "futures-lite",
+ "num_cpus",
+ "once_cell",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "bevy_text"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c265b7515faf55a3b92fd6ce0ab65dd246f247e11d737d6f5cdaf49c2be42c63"
+dependencies = [
+ "ab_glyph",
+ "anyhow",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "glyph_brush_layout",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "bevy_time"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22830665b8476292b861216383fd79922aef2b540f9fd09d49144e3e5e94550e"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
+ "crossbeam-channel",
+]
+
+[[package]]
+name = "bevy_transform"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4bb8760f03e9667e7499a5ceec1f7630fc3e45702781ac0df56cb969e8ae668"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_math",
+ "bevy_reflect",
+]
+
+[[package]]
+name = "bevy_tweening"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "164bcb41708fa1aeb435b6bba6cae61777b9f8cf3e18b207bb6209ca5b970e77"
+dependencies = [
+ "bevy",
+ "interpolation",
+]
+
+[[package]]
+name = "bevy_ui"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "062ce086de1a4a470e5df48cb5c16a1dc97ab610e635cafabdef26c4a1ef5756"
+dependencies = [
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core_pipeline",
+ "bevy_derive",
+ "bevy_ecs",
+ "bevy_hierarchy",
+ "bevy_input",
+ "bevy_log",
+ "bevy_math",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_sprite",
+ "bevy_text",
+ "bevy_transform",
+ "bevy_utils",
+ "bevy_window",
+ "bytemuck",
+ "serde",
+ "smallvec",
+ "taffy",
+]
+
+[[package]]
+name = "bevy_utils"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6e9aa1866c1cf7ee000f281ce9e90d02d701f5c7380a107252017e58e2f5246"
+dependencies = [
+ "ahash 0.7.6",
+ "getrandom",
+ "hashbrown",
+ "instant",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "bevy_window"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707dbbebfac72b1e63e874e7a11a345feab8c440355c0bd71e6dff26709fba9a"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_math",
+ "bevy_utils",
+ "raw-window-handle",
+ "web-sys",
+]
+
+[[package]]
+name = "bevy_winit"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98b15fee4b75472e3441b0c7221467303e4ce59b342a94a328e447e7cdb5a43c"
+dependencies = [
+ "approx",
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_math",
+ "bevy_utils",
+ "bevy_window",
+ "crossbeam-channel",
+ "raw-window-handle",
+ "wasm-bindgen",
+ "web-sys",
+ "winit",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.59.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "peeking_take_while",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+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 = "block-buffer"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "atomic-waker",
+ "fastrand",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "bstr"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+
+[[package]]
+name = "bytemuck"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9e1f5fa78f69496407a27ae9ed989e3c3b072310286f5ef385525e4cbc24a9"
+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 = "bytes"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
+
+[[package]]
+name = "cache-padded"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
+
+[[package]]
+name = "cc"
+version = "1.0.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+dependencies = [
+ "jobserver",
+]
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[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 = "clang-sys"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b"
+dependencies = [
+ "atty",
+ "bitflags",
+ "clap_derive",
+ "clap_lex",
+ "once_cell",
+ "strsim",
+ "termcolor",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16a1b0f6422af32d5da0c58e2703320f379216ee70198241c84173a8c5ac28f3"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "clipboard-win"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219"
+dependencies = [
+ "error-code",
+ "str-buf",
+ "winapi",
+]
+
+[[package]]
+name = "cobs"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
+
+[[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 = "combine"
+version = "4.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "1.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
+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 = "const_panic"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed2b28323eee4fb66bb824401daa3e46bd445b9a9298a3d382b320710ba69dd"
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
+name = "copyless"
+version = "0.1.5"
+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 = "coreaudio-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88"
+dependencies = [
+ "bitflags",
+ "coreaudio-sys",
+]
+
+[[package]]
+name = "coreaudio-sys"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dff444d80630d7073077d38d40b4501fd518bd2b922c2a55edcc8b0f7be57e6"
+dependencies = [
+ "bindgen",
+]
+
+[[package]]
+name = "cpal"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116"
+dependencies = [
+ "alsa",
+ "core-foundation-sys 0.8.3",
+ "coreaudio-rs",
+ "jni",
+ "js-sys",
+ "lazy_static",
+ "libc",
+ "mach",
+ "ndk 0.6.0",
+ "ndk-glue 0.6.2",
+ "nix 0.23.1",
+ "oboe",
+ "parking_lot 0.11.2",
+ "stdweb",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "cstr_core"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd98742e4fdca832d40cab219dc2e3048de17d873248f83f17df47c1bea70956"
+dependencies = [
+ "cty",
+ "memchr",
+]
+
+[[package]]
+name = "cty"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
+
+[[package]]
+name = "d3d12"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759"
+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 = "dashmap"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+dependencies = [
+ "cfg-if 1.0.0",
+ "hashbrown",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.3",
+]
+
+[[package]]
+name = "debug_unreachable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3"
+dependencies = [
+ "unreachable",
+]
+
+[[package]]
+name = "deflate"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
+dependencies = [
+ "adler32",
+ "byteorder",
+]
+
+[[package]]
+name = "deno_core"
+version = "0.146.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88475da37fe0544b7372fd4705560df496498eb5eeb40ce19bfe7787ed0600ca"
+dependencies = [
+ "anyhow",
+ "deno_ops",
+ "futures",
+ "indexmap",
+ "libc",
+ "log",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "serde_v8",
+ "sourcemap",
+ "url",
+ "v8",
+]
+
+[[package]]
+name = "deno_ops"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e217fd2f9a61bc581f6b13868a46ef800efb7532348fd86cc4fe49204d203ea6"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version 0.4.0",
+ "syn",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "directories"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dispatch"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+
+[[package]]
+name = "egui"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc9fcd393c3daaaf5909008a1d948319d538b79c51871e4df0993260260a94e4"
+dependencies = [
+ "ahash 0.8.0",
+ "epaint",
+ "nohash-hasher",
+]
+
+[[package]]
+name = "egui_extras"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f698f685bb0ad39e87109e2f695ded0bccde77d5d40bbf7590cb5561c1e3039d"
+dependencies = [
+ "egui",
+]
+
+[[package]]
+name = "either"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+
+[[package]]
+name = "emath"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9542a40106fdba943a055f418d1746a050e1a903a049b030c2b097d4686a33cf"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "encase"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9"
+dependencies = [
+ "const_panic",
+ "encase_derive",
+ "glam",
+ "thiserror",
+]
+
+[[package]]
+name = "encase_derive"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5b802412eea315f29f2bb2da3a5963cd6121f56eaa06aebcdc0c54eea578f22"
+dependencies = [
+ "encase_derive_impl",
+]
+
+[[package]]
+name = "encase_derive_impl"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "enum_kind"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b940da354ae81ef0926c5eaa428207b8f4f091d3956c891dfbd124162bed99"
+dependencies = [
+ "pmutil",
+ "proc-macro2",
+ "swc_macros_common",
+ "syn",
+]
+
+[[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 = "epaint"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ba04741be7f6602b1a1b28f1082cce45948a7032961c52814f8946b28493300"
+dependencies = [
+ "ab_glyph",
+ "ahash 0.8.0",
+ "atomic_refcell",
+ "bytemuck",
+ "emath",
+ "nohash-hasher",
+ "parking_lot 0.12.1",
+]
+
+[[package]]
+name = "erased-serde"
+version = "0.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54558e0ba96fbe24280072642eceb9d7d442e32c7ec0ea9e7ecd7b4ea2cf4e11"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "error-code"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
+dependencies = [
+ "libc",
+ "str-buf",
+]
+
+[[package]]
+name = "euclid"
+version = "0.22.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "fastrand"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "windows-sys 0.36.1",
+]
+
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
+[[package]]
+name = "flate2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide 0.5.4",
+]
+
+[[package]]
+name = "float-cmp"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e"
+
+[[package]]
+name = "float_next_after"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "fluent"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7"
+dependencies = [
+ "fluent-bundle",
+ "unic-langid",
+]
+
+[[package]]
+name = "fluent-bundle"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd"
+dependencies = [
+ "fluent-langneg",
+ "fluent-syntax",
+ "intl-memoizer",
+ "intl_pluralrules",
+ "rustc-hash",
+ "self_cell",
+ "smallvec",
+ "unic-langid",
+]
+
+[[package]]
+name = "fluent-langneg"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94"
+dependencies = [
+ "unic-langid",
+]
+
+[[package]]
+name = "fluent-syntax"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78"
+dependencies = [
+ "thiserror",
+]
+
+[[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 = "form_urlencoded"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "from_variant"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0981e470d2ab9f643df3921d54f1952ea100c39fdb6a3fdc820e20d2291df6c"
+dependencies = [
+ "pmutil",
+ "proc-macro2",
+ "swc_macros_common",
+ "syn",
+]
+
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "fslock"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57eafdd0c16f57161105ae1b98a1238f97645f2f588438b2949c99a2af9616bf"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+
+[[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 = "futures-macro"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+
+[[package]]
+name = "futures-task"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+
+[[package]]
+name = "futures-util"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "gethostname"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+dependencies = [
+ "cfg-if 1.0.0",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gilrs"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d6ba7c37bf8ea7ba0c3e3795dfa1a7771b1e47c4bb417c4d27c7b338d79685f"
+dependencies = [
+ "fnv",
+ "gilrs-core",
+ "log",
+ "uuid",
+ "vec_map",
+]
+
+[[package]]
+name = "gilrs-core"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a8d94a7fc5afd27e894e08a4cfe5a49237f85bcc7140e90721bad3399c7d02"
+dependencies = [
+ "core-foundation 0.9.3",
+ "io-kit-sys",
+ "js-sys",
+ "libc",
+ "libudev-sys",
+ "log",
+ "nix 0.24.2",
+ "rusty-xinput",
+ "uuid",
+ "vec_map",
+ "wasm-bindgen",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "glam"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815"
+dependencies = [
+ "bytemuck",
+ "serde",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+
+[[package]]
+name = "globset"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
+dependencies = [
+ "aho-corasick",
+ "bstr",
+ "fnv",
+ "log",
+ "regex",
+]
+
+[[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 = "glyph_brush_layout"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38"
+dependencies = [
+ "ab_glyph",
+ "approx",
+ "xi-unicode",
+]
+
+[[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.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a"
+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 = "guillotiere"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782"
+dependencies = [
+ "euclid",
+ "svg_fmt",
+]
+
+[[package]]
+name = "hash32"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "hash32-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59d2aba832b60be25c1b169146b27c64115470981b128ed84c8db18c1b03c6ff"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.6",
+ "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.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaadafd1beb6ad34cff5521987017ece5848f9ad5401fdb039bff896a643add4"
+dependencies = [
+ "glam",
+ "once_cell",
+]
+
+[[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 = "idna"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "if_chain"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
+
+[[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 0.3.2",
+ "num-traits",
+ "png 0.16.8",
+ "tiff",
+]
+
+[[package]]
+name = "image"
+version = "0.24.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "num-rational 0.4.1",
+ "num-traits",
+ "png 0.17.6",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+ "serde",
+]
+
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "inplace_it"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e567468c50f3d4bc7397702e09b380139f9b9288b4e909b070571007f8b5bf78"
+
+[[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 = "interpolation"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3b7357d2bbc5ee92f8e899ab645233e43d21407573cceb37fed8bc3dede2c02"
+
+[[package]]
+name = "intl-memoizer"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f"
+dependencies = [
+ "type-map 0.4.0",
+ "unic-langid",
+]
+
+[[package]]
+name = "intl_pluralrules"
+version = "7.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b18f988384267d7066cc2be425e6faf352900652c046b6971d2e228d3b1c5ecf"
+dependencies = [
+ "tinystr",
+ "unic-langid",
+]
+
+[[package]]
+name = "io-kit-sys"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7789f7f3c9686f96164f5109d69152de759e76e284f736bd57661c6df5091919"
+dependencies = [
+ "core-foundation-sys 0.8.3",
+ "mach",
+]
+
+[[package]]
+name = "is-macro"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c068d4c6b922cd6284c609cfa6dec0e41615c9c5a1a4ba729a970d8daba05fb"
+dependencies = [
+ "Inflector",
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+
+[[package]]
+name = "iyes_loopless"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fec251a82c60be9e282aec12056fa153666d5730b21d124655d7c22114d342c8"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_time",
+ "bevy_utils",
+]
+
+[[package]]
+name = "jni"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+dependencies = [
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
+[[package]]
+name = "jobserver"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "jpeg-decoder"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
+
+[[package]]
+name = "js-sys"
+version = "0.3.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jumpy"
+version = "0.4.3"
+dependencies = [
+ "anyhow",
+ "async-channel",
+ "base64 0.13.0",
+ "bevy",
+ "bevy-has-load-progress",
+ "bevy-inspector-egui",
+ "bevy-parallax",
+ "bevy_ecs_dynamic",
+ "bevy_ecs_tilemap",
+ "bevy_egui",
+ "bevy_fluent",
+ "bevy_kira_audio",
+ "bevy_mod_js_scripting",
+ "bevy_prototype_lyon",
+ "bevy_tweening",
+ "blocking",
+ "bytes",
+ "clap",
+ "directories",
+ "egui_extras",
+ "either",
+ "fluent",
+ "fnv",
+ "futures-lite",
+ "getrandom",
+ "iyes_loopless",
+ "jumpy-matchmaker-proto",
+ "leafwing-input-manager",
+ "normalize-path",
+ "once_cell",
+ "postcard 1.0.2 (git+https://github.com/zicklag/postcard.git?branch=custom-error-messages)",
+ "quinn",
+ "quinn-bevy",
+ "rand",
+ "rustls",
+ "serde",
+ "serde_yaml",
+ "sys-locale",
+ "thiserror",
+ "ulid",
+ "unic-langid",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "jumpy-matchmaker"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-executor",
+ "async-io",
+ "bevy_tasks",
+ "blocking",
+ "clap",
+ "either",
+ "futures-lite",
+ "jumpy",
+ "jumpy-matchmaker-proto",
+ "once_cell",
+ "postcard 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quinn",
+ "quinn-bevy",
+ "rcgen",
+ "rustls",
+ "scc",
+ "serde",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "jumpy-matchmaker-proto"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "ulid",
+]
+
+[[package]]
+name = "khronos-egl"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"
+dependencies = [
+ "libc",
+ "libloading",
+ "pkg-config",
+]
+
+[[package]]
+name = "kira"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "556d90f602ffc4996630769a645035b041786d1b927a17cfbc6a9c3000e62de9"
+dependencies = [
+ "atomic-arena",
+ "cpal",
+ "ringbuf",
+ "symphonia",
+]
+
+[[package]]
+name = "kqueue"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d6112e8f37b59803ac47a42d14f1f3a59bbf72fc6857ffc5be455e28a691f8e"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587"
+dependencies = [
+ "bitflags",
+ "libc",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "leafwing-input-manager"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc0e2dd6c5d8c0bc64951036855bb3fb8f4ed88442cb6c02ed490b29cae5c186"
+dependencies = [
+ "bevy",
+ "derive_more",
+ "itertools",
+ "leafwing_input_manager_macros",
+ "petitset",
+ "serde",
+]
+
+[[package]]
+name = "leafwing_input_manager_macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38676bbe26f336c5554150be0050a7033c72e882f8df4be5a2b3b1e6b2929cd"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "lexical"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6"
+dependencies = [
+ "lexical-core",
+]
+
+[[package]]
+name = "lexical-core"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+dependencies = [
+ "lexical-parse-float",
+ "lexical-parse-integer",
+ "lexical-util",
+ "lexical-write-float",
+ "lexical-write-integer",
+]
+
+[[package]]
+name = "lexical-parse-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+dependencies = [
+ "lexical-parse-integer",
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-parse-integer"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-util"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+dependencies = [
+ "lexical-util",
+ "lexical-write-integer",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-integer"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.135"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
+
+[[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 = "libudev-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "lyon_geom"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d89ccbdafd83d259403e22061be27bccc3254bba65cdc5303250c4227c8c8e"
+dependencies = [
+ "arrayvec 0.5.2",
+ "euclid",
+ "num-traits",
+]
+
+[[package]]
+name = "lyon_path"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b0a59fdf767ca0d887aa61d1b48d4bbf6a124c1a45503593f7d38ab945bfbc0"
+dependencies = [
+ "lyon_geom",
+]
+
+[[package]]
+name = "lyon_tessellation"
+version = "0.17.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7230e08dd0638048e46f387f255dbe7a7344a3e6705beab53242b5af25635760"
+dependencies = [
+ "float_next_after",
+ "lyon_path",
+]
+
+[[package]]
+name = "mach"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+dependencies = [
+ "libc",
+]
+
+[[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.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[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.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060"
+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 = "miniz_oxide"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
+dependencies = [
+ "adler32",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+dependencies = [
+ "adler",
+ "autocfg",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.36.1",
+]
+
+[[package]]
+name = "naga"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f50357e1167a3ab92d6b3c7f4bf5f7fd13fde3f4b28bf0d5ea07b5100fdb6c0"
+dependencies = [
+ "bit-set",
+ "bitflags",
+ "codespan-reporting",
+ "hexf-parse",
+ "indexmap",
+ "log",
+ "num-traits",
+ "petgraph",
+ "pp-rs",
+ "rustc-hash",
+ "spirv",
+ "termcolor",
+ "thiserror",
+ "unicode-xid",
+]
+
+[[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 0.2.2",
+ "num_enum",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+dependencies = [
+ "bitflags",
+ "jni-sys",
+ "ndk-sys 0.3.0",
+ "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 0.5.0",
+ "ndk-context",
+ "ndk-macro",
+ "ndk-sys 0.2.2",
+]
+
+[[package]]
+name = "ndk-glue"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "ndk 0.6.0",
+ "ndk-context",
+ "ndk-macro",
+ "ndk-sys 0.3.0",
+]
+
+[[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 = "ndk-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+dependencies = [
+ "jni-sys",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
+[[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 = "nix"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nix"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+dependencies = [
+ "bitflags",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
+[[package]]
+name = "nohash-hasher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+
+[[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 = "normalize-path"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf22e319b2e3cb517350572e3b70c6822e0a520abfb5c78f690e829a73e8d9f2"
+
+[[package]]
+name = "notify"
+version = "5.0.0-pre.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "553f9844ad0b0824605c20fb55a661679782680410abfb1a8144c2e7e437e7a7"
+dependencies = [
+ "bitflags",
+ "crossbeam-channel",
+ "filetime",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "mio",
+ "walkdir",
+ "winapi",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+ "serde",
+]
+
+[[package]]
+name = "num-derive"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+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-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+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 = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
+]
+
+[[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-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
+[[package]]
+name = "objc_exception"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "objc_id"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+dependencies = [
+ "objc",
+]
+
+[[package]]
+name = "oboe"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1"
+dependencies = [
+ "jni",
+ "ndk 0.6.0",
+ "ndk-context",
+ "num-derive",
+ "num-traits",
+ "oboe-sys",
+]
+
+[[package]]
+name = "oboe-sys"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "os_str_bytes"
+version = "6.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "owned_ttf_parser"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb"
+dependencies = [
+ "ttf-parser",
+]
+
+[[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 0.8.5",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.3",
+]
+
+[[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 = "parking_lot_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys 0.36.1",
+]
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "pem"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4"
+dependencies = [
+ "base64 0.13.0",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+
+[[package]]
+name = "petgraph"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
+dependencies = [
+ "fixedbitset",
+ "indexmap",
+]
+
+[[package]]
+name = "petitset"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1a50d821a2526af6d5756c23c68e453532a986e361a3e12c9cc7fe61d862ac"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "phf"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher 0.3.10",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+
+[[package]]
+name = "pmutil"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "png"
+version = "0.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
+dependencies = [
+ "bitflags",
+ "crc32fast",
+ "deflate",
+ "miniz_oxide 0.3.7",
+]
+
+[[package]]
+name = "png"
+version = "0.17.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c"
+dependencies = [
+ "bitflags",
+ "crc32fast",
+ "flate2",
+ "miniz_oxide 0.5.4",
+]
+
+[[package]]
+name = "polling"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
+dependencies = [
+ "autocfg",
+ "cfg-if 1.0.0",
+ "libc",
+ "log",
+ "wepoll-ffi",
+ "winapi",
+]
+
+[[package]]
+name = "pollster"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7"
+
+[[package]]
+name = "postcard"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c2b180dc0bade59f03fd005cb967d3f1e5f69b13922dad0cd6e047cb8af2363"
+dependencies = [
+ "cobs",
+ "serde",
+]
+
+[[package]]
+name = "postcard"
+version = "1.0.2"
+source = "git+https://github.com/zicklag/postcard.git?branch=custom-error-messages#c6c081107909bb84a901210d6aa6b3d83a3eadc8"
+dependencies = [
+ "cobs",
+ "serde",
+]
+
+[[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 = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "pretty-type-name"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8815d101cfb4cb491154896bdab292a395a7ac9ab185a9941a2f5be0135900d"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+dependencies = [
+ "once_cell",
+ "thiserror",
+ "toml",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "profiling"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df"
+
+[[package]]
+name = "quinn"
+version = "0.8.0"
+source = "git+https://github.com/quinn-rs/quinn.git#feca8abebf2b358141a675931b98043c355d4271"
+dependencies = [
+ "bytes",
+ "futures-io",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "webpki",
+]
+
+[[package]]
+name = "quinn-bevy"
+version = "0.1.0"
+dependencies = [
+ "async-executor",
+ "async-io",
+ "bevy_tasks",
+ "futures-lite",
+ "pin-project",
+ "quinn",
+ "quinn-proto",
+ "quinn-udp",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.8.0"
+source = "git+https://github.com/quinn-rs/quinn.git#feca8abebf2b358141a675931b98043c355d4271"
+dependencies = [
+ "bytes",
+ "rand",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "rustls-native-certs",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+ "webpki",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.2.0"
+source = "git+https://github.com/quinn-rs/quinn.git#feca8abebf2b358141a675931b98043c355d4271"
+dependencies = [
+ "libc",
+ "quinn-proto",
+ "socket2",
+ "tracing",
+ "windows-sys 0.42.0",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radsort"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b"
+
+[[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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+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 = "rcgen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
+dependencies = [
+ "pem",
+ "ring",
+ "time",
+ "yasna",
+]
+
+[[package]]
+name = "rectangle-pack"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb"
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+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.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+
+[[package]]
+name = "renderdoc-sys"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ringbuf"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f65af18d50f789e74aaf23bbb3f65dcd22a3cb6e029b5bced149f6bd57c5c2a2"
+dependencies = [
+ "cache-padded",
+]
+
+[[package]]
+name = "ron"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
+dependencies = [
+ "base64 0.13.0",
+ "bitflags",
+ "serde",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver 1.0.14",
+]
+
+[[package]]
+name = "rustls"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+dependencies = [
+ "log",
+ "ring",
+ "sct",
+ "webpki",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+dependencies = [
+ "base64 0.13.0",
+]
+
+[[package]]
+name = "rusty-xinput"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb"
+dependencies = [
+ "lazy_static",
+ "log",
+ "winapi",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scc"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054da6411906a6cfa45a4b5cc922a4fdfd395f4fd17d98ef4603d334b83d3639"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+dependencies = [
+ "lazy_static",
+ "windows-sys 0.36.1",
+]
+
+[[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 = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+dependencies = [
+ "bitflags",
+ "core-foundation 0.9.3",
+ "core-foundation-sys 0.8.3",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+dependencies = [
+ "core-foundation-sys 0.8.3",
+ "libc",
+]
+
+[[package]]
+name = "self_cell"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_v8"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3c3efa9cff97d5a543df0508c37af619e422fb92eb525f38d255d46df7a0eb7"
+dependencies = [
+ "bytes",
+ "derive_more",
+ "serde",
+ "serde_bytes",
+ "smallvec",
+ "v8",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8613d593412a0deb7bbd8de9d908efff5a0cb9ccd8f62c641e7b2ed2f57291d1"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+
+[[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 = "shlex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
+[[package]]
+name = "slab"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "slotmap"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
+dependencies = [
+ "serde",
+ "version_check",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "socket2"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "sourcemap"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e031f2463ecbdd5f34c950f89f5c1e1032f22c0f8e3dc4bdb2e8b6658cf61eb"
+dependencies = [
+ "base64 0.11.0",
+ "if_chain",
+ "lazy_static",
+ "regex",
+ "rustc_version 0.2.3",
+ "serde",
+ "serde_json",
+ "url",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[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 = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "stdweb"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
+
+[[package]]
+name = "str-buf"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
+
+[[package]]
+name = "string_cache"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "phf_shared",
+ "precomputed-hash",
+ "serde",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "string_enum"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "994453cd270ad0265796eb24abf5540091ed03e681c5f3c12bc33e4db33253e1"
+dependencies = [
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "svg_fmt"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
+
+[[package]]
+name = "svgtypes"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c536faaff1a10837cfe373142583f6e27d81e96beba339147e77b67c9f260ff"
+dependencies = [
+ "float-cmp",
+ "siphasher 0.2.3",
+]
+
+[[package]]
+name = "swc_atoms"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5ffecde9d1a937a61b4799478d598121b539eb7da6127c16af86a044017e1e5"
+dependencies = [
+ "once_cell",
+ "rustc-hash",
+ "serde",
+ "string_cache",
+ "string_cache_codegen",
+ "triomphe",
+]
+
+[[package]]
+name = "swc_common"
+version = "0.27.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49b0b6107e44797d0549bdb5b47a97682c3b914140269c01d2acdb16a1b885f6"
+dependencies = [
+ "ahash 0.7.6",
+ "ast_node",
+ "better_scoped_tls",
+ "cfg-if 1.0.0",
+ "debug_unreachable",
+ "either",
+ "from_variant",
+ "num-bigint",
+ "once_cell",
+ "rustc-hash",
+ "serde",
+ "siphasher 0.3.10",
+ "string_cache",
+ "swc_atoms",
+ "swc_eq_ignore_macros",
+ "swc_visit",
+ "tracing",
+ "unicode-width",
+ "url",
+]
+
+[[package]]
+name = "swc_config"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4de36224eb9498fccd4e68971f0b83326ccf8592c2d424f257f3a1c76b2b211"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_json",
+ "swc_config_macro",
+]
+
+[[package]]
+name = "swc_config_macro"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb64bc03d90fd5c90d6ab917bb2b1d7fbd31957df39e31ea24a3f554b4372251"
+dependencies = [
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn",
+]
+
+[[package]]
+name = "swc_ecma_ast"
+version = "0.90.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f712949db06518bec7b7e050aa3bcde749a74fbf79f4f520ab179d0445b63593"
+dependencies = [
+ "bitflags",
+ "is-macro",
+ "num-bigint",
+ "scoped-tls",
+ "serde",
+ "string_enum",
+ "swc_atoms",
+ "swc_common",
+ "unicode-id",
+]
+
+[[package]]
+name = "swc_ecma_codegen"
+version = "0.121.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fa47424bed05de6077eda3271d6764f87c2735a8f3798dea23c95898e5e0deb"
+dependencies = [
+ "memchr",
+ "num-bigint",
+ "once_cell",
+ "rustc-hash",
+ "serde",
+ "sourcemap",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_codegen_macros",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_codegen_macros"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0159c99f81f52e48fe692ef7af1b0990b45d3006b14c6629be0b1ffee1b23aea"
+dependencies = [
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn",
+]
+
+[[package]]
+name = "swc_ecma_parser"
+version = "0.117.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d88ffca99514bc8bfa8bf4f2d74fb673caa844e521b55035b8cfd10472b801d4"
+dependencies = [
+ "either",
+ "enum_kind",
+ "lexical",
+ "num-bigint",
+ "serde",
+ "smallvec",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "tracing",
+ "typed-arena",
+]
+
+[[package]]
+name = "swc_ecma_transforms_base"
+version = "0.103.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4aad7af4a1ae307e547a0f5ab6b081ffa6a22af89abe2f8a953a735a398ba9d"
+dependencies = [
+ "better_scoped_tls",
+ "bitflags",
+ "num_cpus",
+ "once_cell",
+ "phf",
+ "rustc-hash",
+ "serde",
+ "smallvec",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_transforms_macros"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebf907935ec5492256b523ae7935a824d9fdc0368dcadc41375bad0dca91cd8b"
+dependencies = [
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn",
+]
+
+[[package]]
+name = "swc_ecma_transforms_react"
+version = "0.141.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b57461fea819904faf5aeac39e49229995701a31fa5041929b7909885a69cc0a"
+dependencies = [
+ "ahash 0.7.6",
+ "base64 0.13.0",
+ "dashmap",
+ "indexmap",
+ "once_cell",
+ "regex",
+ "serde",
+ "sha-1",
+ "string_enum",
+ "swc_atoms",
+ "swc_common",
+ "swc_config",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+]
+
+[[package]]
+name = "swc_ecma_transforms_typescript"
+version = "0.145.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc0cba6d14b04900e5068d69c7492149c4e9320a9fcf79fca0e7224811c1d14"
+dependencies = [
+ "serde",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_react",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+]
+
+[[package]]
+name = "swc_ecma_utils"
+version = "0.99.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d92cff624945ded0b2bb07e9dfb44d57745abcc415b6025c6c3d2dc3a7af5396"
+dependencies = [
+ "indexmap",
+ "once_cell",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_visit",
+ "tracing",
+ "unicode-id",
+]
+
+[[package]]
+name = "swc_ecma_visit"
+version = "0.76.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da9fbd418ce4dc3c7b10e74a919ecc6f56c376d63a6a03766655c6c2283475d"
+dependencies = [
+ "num-bigint",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_visit",
+ "tracing",
+]
+
+[[package]]
+name = "swc_eq_ignore_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6"
+dependencies = [
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "swc_macros_common"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4be988307882648d9bc7c71a6a73322b7520ef0211e920489a98f8391d8caa2"
+dependencies = [
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "swc_visit"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82f2bcb7223e185c4c7cbf5e0c1207dec6d2bfd5e72e3fb7b3e8d179747e9130"
+dependencies = [
+ "either",
+ "swc_visit_macros",
+]
+
+[[package]]
+name = "swc_visit_macros"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fb1f3561674d84947694d41fb6d5737d19539222779baeac1b3a071a2b29428"
+dependencies = [
+ "Inflector",
+ "pmutil",
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn",
+]
+
+[[package]]
+name = "symphonia"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17033fe05e4f7f10a6ad602c272bafd2520b2e5cdd9feb61494d9cdce08e002f"
+dependencies = [
+ "lazy_static",
+ "symphonia-bundle-mp3",
+ "symphonia-codec-vorbis",
+ "symphonia-core",
+ "symphonia-format-ogg",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-bundle-mp3"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db5d3d53535ae2b7d0e39e82f683cac5398a6c8baca25ff1183e107d13959d3e"
+dependencies = [
+ "bitflags",
+ "lazy_static",
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-codec-vorbis"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "323b94435a1a807e1001e29490aeaef2660fb72b145d47497e8429a6cb1d67c3"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-utils-xiph",
+]
+
+[[package]]
+name = "symphonia-core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "199a6417cd4115bac79289b64b859358ea050b7add0ceb364dc991f628c5b347"
+dependencies = [
+ "arrayvec 0.7.2",
+ "bitflags",
+ "bytemuck",
+ "lazy_static",
+ "log",
+]
+
+[[package]]
+name = "symphonia-format-ogg"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d2f741469a0f103607ed1f2605f7f00b13ba044ea9ddc616764558c6d3d9b7d"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+ "symphonia-utils-xiph",
+]
+
+[[package]]
+name = "symphonia-metadata"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed71acf6b5e6e8bee1509597b86365a06b78c1d73218df47357620a6fe5997b"
+dependencies = [
+ "encoding_rs",
+ "lazy_static",
+ "log",
+ "symphonia-core",
+]
+
+[[package]]
+name = "symphonia-utils-xiph"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73cbb0766ce77a8aef535f9438db645e7b6f1b2c4cf3be9bf246b4e11a7d5531"
+dependencies = [
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sys-locale"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658ee915b6c7b73ec4c1ffcd838506b5c5a4087eadc1ec8f862f1066cf2c8132"
+dependencies = [
+ "cc",
+ "cstr_core",
+ "js-sys",
+ "libc",
+ "wasm-bindgen",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "taffy"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec27dea659b100d489dffa57cf0efc6d7bfefb119af817b92cc14006c0b214e3"
+dependencies = [
+ "arrayvec 0.7.2",
+ "hash32",
+ "hash32-derive",
+ "num-traits",
+ "typenum",
+]
+
+[[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.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+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 = "tiff"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437"
+dependencies = [
+ "jpeg-decoder",
+ "miniz_oxide 0.4.4",
+ "weezl",
+]
+
+[[package]]
+name = "time"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c"
+dependencies = [
+ "libc",
+ "num_threads",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1"
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+
+[[package]]
+name = "tokio"
+version = "1.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
+dependencies = [
+ "autocfg",
+ "bytes",
+ "libc",
+ "memchr",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "winapi",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if 1.0.0",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "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 = "triomphe"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1ee9bd9239c339d714d657fac840c6d2a4f9c45f4f9ec7b0975113458be78db"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "ttf-parser"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd"
+
+[[package]]
+name = "type-map"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46"
+dependencies = [
+ "rustc-hash",
+]
+
+[[package]]
+name = "type-map"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f"
+dependencies = [
+ "rustc-hash",
+]
+
+[[package]]
+name = "typed-arena"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae"
+
+[[package]]
+name = "typenum"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+
+[[package]]
+name = "ulid"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd"
+dependencies = [
+ "rand",
+ "serde",
+]
+
+[[package]]
+name = "unic-langid"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73328fcd730a030bdb19ddf23e192187a6b01cd98be6d3140622a89129459ce5"
+dependencies = [
+ "unic-langid-impl",
+]
+
+[[package]]
+name = "unic-langid-impl"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a4a8eeaf0494862c1404c95ec2f4c33a2acff5076f64314b465e3ddae1b934d"
+dependencies = [
+ "serde",
+ "tinystr",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+
+[[package]]
+name = "unicode-id"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
+[[package]]
+name = "unreachable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91"
+dependencies = [
+ "void",
+]
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "url"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "uuid"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83"
+dependencies = [
+ "getrandom",
+ "serde",
+ "sha1_smol",
+]
+
+[[package]]
+name = "v8"
+version = "0.47.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be156dece7a023d5959a72dc0d398d6c95100ec601a2cea10d868da143e85166"
+dependencies = [
+ "bitflags",
+ "fslock",
+ "lazy_static",
+ "libc",
+ "which",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5cecfede1e530599c8686f7f2d609489101d3d63741a6dc423afc997ce3fcc8"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
-name = "maybe-uninit"
-version = "2.0.0"
+name = "void"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
-name = "miniquad"
-version = "0.3.0-alpha.46"
+name = "waker-fn"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1462459fb1813decc7115ab4aed8f41183612557b08bf604bfb46b05286d703"
-dependencies = [
- "sapp-android",
- "sapp-darwin",
- "sapp-dummy",
- "sapp-ios",
- "sapp-linux",
- "sapp-wasm",
- "sapp-windows",
-]
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
-name = "miniz_oxide"
-version = "0.3.7"
+name = "walkdir"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
 dependencies = [
- "adler32",
+ "same-file",
+ "winapi",
+ "winapi-util",
 ]
 
 [[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.24.1"
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
-]
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
+name = "wasm-bindgen"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
- "autocfg",
- "num-traits",
+ "cfg-if 1.0.0",
+ "wasm-bindgen-macro",
 ]
 
 [[package]]
-name = "num-iter"
-version = "0.1.43"
+name = "wasm-bindgen-backend"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "num-rational"
-version = "0.3.2"
+name = "wasm-bindgen-futures"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
+checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
+ "cfg-if 1.0.0",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
-name = "num-traits"
-version = "0.2.15"
+name = "wasm-bindgen-macro"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
- "autocfg",
+ "quote",
+ "wasm-bindgen-macro-support",
 ]
 
 [[package]]
-name = "ogg"
-version = "0.7.1"
+name = "wasm-bindgen-macro-support"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e571c3517af9e1729d4c63571a27edd660ade0667973bfc74a67c660c2b651"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
- "byteorder",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "once_cell"
-version = "1.12.0"
+name = "wasm-bindgen-shared"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
-name = "pkg-config"
-version = "0.3.25"
+name = "wasm_mutex"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "efbdddc3b163fc2d639800b3411a5428d1e151ba2a400a560b1545e39f1e68cd"
+dependencies = [
+ "serde",
+]
 
 [[package]]
-name = "png"
-version = "0.16.8"
+name = "web-sys"
+version = "0.3.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
+checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
 dependencies = [
- "bitflags",
- "crc32fast",
- "deflate",
- "miniz_oxide",
+ "js-sys",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.40"
+name = "webbrowser"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "fc6a3cffdb686fbb24d9fb8f03a213803277ed2300f11026a3afe1f108dc021b"
 dependencies = [
- "unicode-ident",
+ "jni",
+ "ndk-glue 0.6.2",
+ "url",
+ "web-sys",
+ "widestring",
+ "winapi",
 ]
 
 [[package]]
-name = "quad-alsa-sys"
-version = "0.3.2"
+name = "webpki"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66c2f04a6946293477973d85adc251d502da51c57b08cd9c997f0cfd8dcd4b5"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
 dependencies = [
- "libc",
+ "ring",
+ "untrusted",
 ]
 
 [[package]]
-name = "quad-rand"
-version = "0.2.1"
+name = "weezl"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88"
+checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
 
 [[package]]
-name = "quad-snd"
-version = "0.2.3"
+name = "wepoll-ffi"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86e0b4259cfd6a317a46df7b7cb4c09a08ba150642e6f6fb7df5a6b3450a0a29"
+checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
 dependencies = [
- "audir-sles",
- "audrey",
- "libc",
- "quad-alsa-sys",
- "winapi",
+ "cc",
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.20"
+name = "wgpu"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "277e967bf8b7820a76852645a6bce8bbd31c32fda2042e82d8e3ea75fda8892d"
 dependencies = [
- "proc-macro2",
+ "arrayvec 0.7.2",
+ "js-sys",
+ "log",
+ "naga",
+ "parking_lot 0.12.1",
+ "raw-window-handle",
+ "smallvec",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
-name = "rusty-xinput"
-version = "1.2.0"
+name = "wgpu-core"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb"
+checksum = "89b92788dec9d0c1bed849a1b83f01b2ee12819bf04a79c90f68e4173f7b5ba2"
 dependencies = [
- "lazy_static",
+ "arrayvec 0.7.2",
+ "bit-vec",
+ "bitflags",
+ "cfg_aliases",
+ "codespan-reporting",
+ "copyless",
+ "fxhash",
  "log",
- "winapi",
+ "naga",
+ "parking_lot 0.12.1",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "thiserror",
+ "web-sys",
+ "wgpu-hal",
+ "wgpu-types",
 ]
 
 [[package]]
-name = "ryu"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
-
-[[package]]
-name = "sapp-android"
-version = "0.1.10"
+name = "wgpu-hal"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c0d0e6f562c01c533f693ac9c045d69cbeab24d2e16caaaa0e67d06ae6e0940"
+checksum = "20cbdfc3d0637dba3d5536b93adef3d26023a0b96f0e1ee5ee9560a401d9f646"
 dependencies = [
- "libc",
- "ndk-sys",
+ "android_system_properties",
+ "arrayvec 0.7.2",
+ "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 0.12.1",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle",
+ "renderdoc-sys",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+ "wgpu-types",
+ "winapi",
 ]
 
 [[package]]
-name = "sapp-darwin"
-version = "0.1.8"
+name = "wgpu-types"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1282369f486bc334efa2d76fa4d54c20b37664d83da14fc60afbe941814e374"
+checksum = "1f762cbc08e1a51389859cf9c199c7aef544789cf3510889aab12c607f701604"
 dependencies = [
- "cc",
+ "bitflags",
 ]
 
 [[package]]
-name = "sapp-dummy"
-version = "0.1.5"
+name = "which"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66f1ad26a5b6c682b9ca27c66db9aa91002b8d98a82ac7101ded57285215a478"
+checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
 dependencies = [
+ "either",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
-name = "sapp-ios"
-version = "0.1.2"
+name = "widestring"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081e6e5261c9ac2e938979b6a854a53b439f065fc3c897205ce7e69d3028b4a9"
-dependencies = [
- "cc",
-]
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
 
 [[package]]
-name = "sapp-linux"
-version = "0.1.14"
+name = "winapi"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc71510a7781d8f31d58046a9117682c8e8546ad43f52c0e31275db214495c3d"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "libc",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]
 
 [[package]]
-name = "sapp-wasm"
-version = "0.1.26"
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e859e8645a3bcb85aecd40bab883438e4105f21b21bccbeac2348760f508bb"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
-name = "sapp-windows"
-version = "0.2.20"
+name = "winapi-util"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "088f921b591fdcabf5f2dc17237be5203b6a1a6988f252d36e153f1442a8138e"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
  "winapi",
 ]
 
 [[package]]
-name = "serde"
-version = "1.0.137"
+name = "winapi-wsapoll"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
 dependencies = [
- "serde_derive",
+ "winapi",
 ]
 
 [[package]]
-name = "serde_derive"
-version = "1.0.137"
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "serde_json"
-version = "1.0.81"
+name = "windows-sys"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
 dependencies = [
- "itoa",
- "ryu",
- "serde",
+ "windows_aarch64_msvc 0.36.1",
+ "windows_i686_gnu 0.36.1",
+ "windows_i686_msvc 0.36.1",
+ "windows_x86_64_gnu 0.36.1",
+ "windows_x86_64_msvc 0.36.1",
 ]
 
 [[package]]
-name = "smallvec"
-version = "0.6.14"
+name = "windows-sys"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
- "maybe-uninit",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.0",
+ "windows_i686_gnu 0.42.0",
+ "windows_i686_msvc 0.42.0",
+ "windows_x86_64_gnu 0.42.0",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.0",
 ]
 
 [[package]]
-name = "spin"
-version = "0.9.3"
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
 
 [[package]]
-name = "syn"
-version = "1.0.98"
+name = "windows_aarch64_msvc"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
 
 [[package]]
-name = "toml"
-version = "0.5.9"
+name = "windows_aarch64_msvc"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
 [[package]]
-name = "ttf-parser"
-version = "0.12.3"
+name = "windows_i686_gnu"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.1"
+name = "windows_i686_gnu"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
 [[package]]
-name = "uuid"
-version = "1.1.2"
+name = "windows_i686_msvc"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
 
 [[package]]
-name = "vec_map"
-version = "0.8.2"
+name = "windows_i686_msvc"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "windows_x86_64_gnu"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
 
 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "windows_x86_64_gnu"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.81"
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
 [[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.81"
+name = "windows_x86_64_msvc"
+version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
 [[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.81"
+name = "windows_x86_64_msvc"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
 
 [[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.81"
+name = "winit"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
+checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
+ "bitflags",
+ "cocoa",
+ "core-foundation 0.9.3",
+ "core-graphics 0.22.3",
+ "core-video-sys",
+ "dispatch",
+ "instant",
+ "lazy_static",
+ "libc",
+ "log",
+ "mio",
+ "ndk 0.5.0",
+ "ndk-glue 0.5.2",
+ "ndk-sys 0.2.2",
+ "objc",
+ "parking_lot 0.11.2",
+ "percent-encoding",
+ "raw-window-handle",
+ "wasm-bindgen",
+ "web-sys",
+ "winapi",
+ "x11-dl",
 ]
 
 [[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
-
-[[package]]
-name = "web-sys"
-version = "0.3.58"
+name = "x11-dl"
+version = "2.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
+checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6"
 dependencies = [
- "js-sys",
- "wasm-bindgen",
+ "lazy_static",
+ "libc",
+ "pkg-config",
 ]
 
 [[package]]
-name = "winapi"
-version = "0.3.9"
+name = "x11rb"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "gethostname",
+ "nix 0.22.3",
+ "winapi",
+ "winapi-wsapoll",
 ]
 
 [[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
+name = "xi-unicode"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
+name = "yasna"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c"
+dependencies = [
+ "time",
+]
diff --git a/Cargo.toml b/Cargo.toml
index e7c970b8ac..120f971d89 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,29 +5,88 @@ description = "A tactical 2D shooter"
 authors = ["The Fish Fight Game & Spicy Lobster Developers"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
+default-run = "jumpy"
 
-[target.'cfg(target_arch = "wasm32")'.lib]
-crate-type = ["cdylib"]
+[workspace]
+resolver = "2"
+members = [
+    ".",
+    "crates/*"
+]
 
 [features]
-default = []
-
-[workspace]
-members = ["core"]
+default = ["render"]
+render = [
+    "bevy/x11",
+    "bevy/png",
+    "bevy/filesystem_watcher",
+    "bevy/bevy_gilrs",
+]
 
-[profile.dev.package."*"]
-opt-level = 3
+[dependencies.bevy]
+version = "0.8"
+default-features = false
+features = [
+    "x11",
+    "png",
+    "filesystem_watcher",
+    "bevy_gilrs"
+]
 
 [dependencies]
-core = { path = "./core", package = "jumpy-core" }
-ff-particles = { version = "0.1", features = ["serde"] }
-fishsticks = { git = "https://github.com/fishfolks/fishsticks", default-features = false, features = ["gilrs"] }
-macroquad = { version = "=0.3.16" } # Newer versions break is_key_pressed detection
-macroquad-platformer = "0.1.3"
-hecs = "0.7.1"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+blocking = "1.2.0"
+anyhow = "1.0.58"
+bevy-parallax = "0.2.0"
+bevy_egui = "0.16.1"
+egui_extras = "0.19.0"
+bevy_kira_audio = { version = "0.12.0", features = ["mp3"] }
+iyes_loopless = "0.7.0"
+serde = { version = "1.0.137", features = ["derive"] }
+serde_yaml = "0.9.2"
+thiserror = "1.0.31"
+clap = { version = "4.0.18", features = ["derive", "env"] }
+rand = "0.8.5"
+getrandom = { version = "0.2", features = ["js"] }
+bevy-has-load-progress = { path = "crates/bevy-has-load-progress", features = ["bevy_egui"] }
+leafwing-input-manager = { version = "0.5.2", default-features = false }
+unic-langid = "0.9.0"
+bevy_fluent = "0.4.0"
+sys-locale = "0.2.1"
+fluent = "0.16.0"
+directories = "4.0.1"
+async-channel = "1.7.1"
+once_cell = "1.13.0"
+bevy_mod_js_scripting = { git = "https://github.com/zicklag/bevy_mod_js_scripting.git", branch = "jumpy" }
+bevy_ecs_tilemap = { version = "0.7.0", features = ["atlas"] }
+bevy_prototype_lyon = "0.6.0"
+fnv = "1.0.7"
+base64 = "0.13.0"
+bevy_ecs_dynamic = { git = "https://github.com/jakobhellermann/bevy_ecs_dynamic" }
+postcard = { git = "https://github.com/zicklag/postcard.git", branch = "custom-error-messages", default-features = false, features = ["alloc", "use-std"] }
+futures-lite = "1.12.0"
+either = "1.8.0"
+jumpy-matchmaker-proto = { path = "crates/matchmaker-proto" }
+bevy_tweening = { version= "0.5", default-features = false }
+
+# Debug tools
+bevy-inspector-egui = { version = "0.13.0" }
+ulid = { version = "1.0.0", features = ["serde"] }
+bytes = "1.2.1"
+rustls = { version = "0.20.7", features = ["dangerous_configuration", "quic"] }
+normalize-path = "0.2.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = "0.2.74"
+wasm-bindgen = "0.2.83"
+web-sys = { version = "0.3", features = ["Window","Location","Storage"] } 
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+quinn = { git = "https://github.com/quinn-rs/quinn.git", default-features = false, features = ["futures-io", "native-certs", "tls-rustls"] }
+quinn-bevy = { path = "crates/quinn-bevy" }
+
+[profile.dev.package."*"]
+opt-level = 1 # Set this to 3 if the game becomes slow to respond during gameplay
+debug = false
 
+[profile.release]
+lto = true
+codegen-units = 1 # Improved rapier physics perf, so it might help other stuff, too
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..70cd81514b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,37 @@
+# syntax=docker/dockerfile:1.4
+
+
+#
+# Jumpy Matchmaker Docker image
+#
+
+FROM rust:1.64-slim as builder
+
+RUN apt-get update && \
+    apt-get install -y \
+        curl \
+        pkg-config \
+        libudev-dev \
+        libasound2-dev && \
+        rm -rf /var/lib/apt/lists/*
+
+WORKDIR /usr/src/jumpy
+COPY . .
+RUN --mount=type=cache,target=/usr/local/cargo/registry/cache \
+    --mount=type=cache,target=/usr/local/cargo/registry/index \
+    --mount=type=cache,target=/usr/local/cargo/git/db \
+    --mount=type=cache,target=/usr/src/jumpy/target \
+    cargo build -p jumpy-matchmaker
+
+RUN --mount=type=cache,target=/usr/src/jumpy/target \
+    cp target/debug/jumpy-matchmaker /usr/local/bin/jumpy-matchmaker
+
+# TODO: Slim down this container. We need to try and strip all unneeded deps from Bevy for the
+# matchmaker.
+FROM debian:bullseye
+RUN apt-get update && apt-get install -y libasound2 && rm -rf /var/lib/apt/lists/*
+COPY --from=builder /usr/local/bin/jumpy-matchmaker /usr/local/bin/jumpy-matchmaker
+COPY --from=builder /usr/src/jumpy/assets /usr/local/share/jumpy/assets
+ENV JUMPY_ASSET_DIR=/usr/local/share/jumpy/assets
+EXPOSE 8943/udp
+ENTRYPOINT /usr/local/bin/jumpy-matchmaker
\ No newline at end of file
diff --git a/PACKAGING.md b/PACKAGING.md
index 61ecefaa86..f37fe3e06b 100644
--- a/PACKAGING.md
+++ b/PACKAGING.md
@@ -1,54 +1,3 @@
 ## Packaging Fish Folk: Jumpy
 
-### Dependencies
-
-#### Build dependencies
-
-- [Rust](https://www.rust-lang.org/tools/install) (`1.53.0+`)
-- [libudev](https://www.freedesktop.org/software/systemd/man/libudev.html)
-
-#### Runtime dependencies
-
-- [libX11](https://gitlab.freedesktop.org/xorg/lib/libx11)
-- [libXi](https://gitlab.freedesktop.org/xorg/lib/libxi)
-- [Mesa](https://www.mesa3d.org/) - [OpenGL](https://www.opengl.org) (`3.2+`)
-- [alsa-lib](https://github.com/alsa-project/alsa-lib)
-
-Also see [macroquad#linux](https://github.com/not-fl3/macroquad#linux).
-
-### Build
-
-```sh
-# export CARGO_TARGET_DIR=target
-cargo run --release --locked
-```
-
-### Environment variables
-
-- `JUMPY_CONFIG`: configuration file (default: `config.json`)
-- `JUMPY_ASSETS`: assets directory (default: `assets/`)
-- `JUMPY_MODS`: mods directory (default: `mods/`)
-
-### Package
-
-Binary will be located at `target/release/jumpy` after [build](#build). To run it, `assets` directory should be placed in the same directory or a path can be specified via `JUMPY_ASSETS` environment variable.
-
-For example:
-
-```sh
-export JUMPY_ASSETS=/opt/jumpy/assets/
-export JUMPY_MODS=/opt/jumpy/mods/
-target/release/jumpy
-```
-
-The desktop file in the contrib/ directory can be installed to allow running the game from your desktop's app launcher.
-
-Also see [README.md#distro-packages](./README.md#distro-packages)
-
-### Binary releases
-
-Binary releases are automated via [Continuous Deployment](./.github/workflows/release.yml) workflow and they can be downloaded from the [releases](https://github.com/fishfolks/jumpy/releases) page. Release artifacts are named in the following format:
-
-- `jumpy-<version>-<target>.<ext>`
-
-A single archive includes the `jumpy` binary and `assets` directory. It can be verified by using a SHA256 hash file that has the same name as the artifact except it ends with ".sha256". Release artifacts are not signed at this time.
+TODO: Rewrite for Bevy refactor.
\ No newline at end of file
diff --git a/README.md b/README.md
index 075aceaa70..2685a7d6a7 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,9 @@ Fish Folk: Jumpy is a tactical 2D shooter, played by up to 4 players online or o
 
 ### Status
 
-The game is fully playable: \
-https://twitter.com/spicylobsterfam/status/1424084016467226624
+The game is currently under re-construction as it is being rewritten to use the [Bevy] game engine. The game is playable, but some maps have not been fully ported, many items are missing, and there are several bugs.
+
+[Bevy]: https://bevyengine.org
 
 ## Community
 
@@ -65,10 +66,6 @@ pacman -S jumpy
 2. Clone this repository: `git clone https://github.com/fishfolks/jumpy.git`
 3. `cargo run`
 
-## Default Keybindings
-
-You can view and modify the default keybindings in [config.toml](./config.toml).
-
 ## Credits
 
 - [Fish Folk: Jumpy Credits](./CREDITS.md)
diff --git a/assets/default.game.yaml b/assets/default.game.yaml
new file mode 100644
index 0000000000..051a2d7112
--- /dev/null
+++ b/assets/default.game.yaml
@@ -0,0 +1,310 @@
+camera_height: 448
+clear_color: 27233B
+physics:
+  terminal_velocity: 20
+  friction_lerp: 0.96
+  stop_threshold: 1.0
+
+players:
+  - player/skins/catty/catty.player.yaml
+  - player/skins/fishy/fishy.player.yaml
+  - player/skins/lionfishy/lionfishy.player.yaml
+  - player/skins/orcy/orcy.player.yaml
+  - player/skins/sharky/sharky.player.yaml
+  - player/skins/pescy/pescy.player.yaml
+
+maps:
+  - map/levels/lev01.map.json
+  - map/levels/lev02.map.json
+  - map/levels/lev03.map.json
+  - map/levels/lev04.map.json
+  - map/levels/lev05.map.json
+  - map/levels/lev06.map.json
+  - map/levels/lev07.map.json
+  - map/levels/zyrafa01.map.json
+  - map/levels/zyrafa02.map.json
+  - map/levels/zyrafa03.map.json
+  - map/levels/zyrafa04.map.json
+  - map/levels/zyrafa05.map.json
+  - map/levels/zyrafa06.map.json
+
+scripts:
+  - map/scripts/kill_out_of_bounds.ts
+  - player/states/default.ts
+  - player/states/dead.ts
+  - player/states/idle.ts
+  - player/states/walk.ts
+  - player/states/midair.ts
+  - player/states/crouch.ts
+
+client_scripts:
+  - game/camera_controller.ts
+  - ui/menu-background-zoom.ts
+
+main_menu:
+  title_font:
+    family: fairfax
+    color: FFFFFF
+    size: 85
+  subtitle_font:
+    family: fairfax
+    color: FFFFFF
+    size: 60
+
+  background_image:
+    image: ui/menu-background.png
+    image_size: [896, 480]
+
+  menu_width: 350
+
+default_settings:
+  matchmaking_server: localhost:8943
+  player_controls:
+    # Gamepad controls
+    gamepad:
+      movement:
+        up: !SingleAxis
+          axis_type: !Gamepad LeftStickY
+          positive_low: 0.1
+          negative_low: -1.0
+
+        left: !SingleAxis
+          axis_type: !Gamepad LeftStickX
+          positive_low: 1.0
+          negative_low: -0.1
+
+        down: !SingleAxis
+          axis_type: !Gamepad LeftStickY
+          positive_low: 1.0
+          negative_low: -0.1
+
+        right: !SingleAxis
+          axis_type: !Gamepad LeftStickX
+          positive_low: 0.1
+          negative_low: -1.0
+      jump: !GamepadButton South
+      grab: !GamepadButton East
+      shoot: !GamepadButton West
+      slide: !GamepadButton North
+
+    # Controls for the first keyboard player ( left side )
+    keyboard1:
+      movement:
+        up: !Keyboard W
+        down: !Keyboard S
+        left: !Keyboard A
+        right: !Keyboard D
+      jump: !Keyboard Space
+      grab: !Keyboard V
+      shoot: !Keyboard C
+      slide: !Keyboard B
+
+    # Controls for the second keyboard player ( right side )
+    keyboard2:
+      movement:
+        up: !Keyboard Up
+        down: !Keyboard Down
+        left: !Keyboard Left
+        right: !Keyboard Right
+      jump: !Keyboard Comma
+      grab: !Keyboard RShift
+      shoot: !Keyboard Period
+      slide: !Keyboard Slash
+
+ui_theme:
+  scale: 0.65
+  colors:
+    positive: 3EC761
+
+  widgets:
+    border_radius: 1.5
+    default: &default
+      bg_fill: 3A4444
+      bg_stroke: &default-stroke 181425
+      text: FFFFFF
+    hovered:
+      bg_fill: 566363
+      bg_stroke: *default-stroke
+      text: FFFFFF
+    active:
+      bg_fill: 566363
+      bg_stroke: 86809B
+      text: FFFFFF
+    noninteractive:
+      bg_fill: 262B44
+      bg_stroke: 181425
+      text: FFFFFF
+    menu: *default
+
+  font_families:
+    fairfax: ui/FairfaxSM.ttf
+    ark: ui/ark-pixel-16px-latin.ttf
+
+  font_styles:
+    heading:
+      family: ark
+      size: 40
+      color: FFFFFF
+    bigger:
+      family: ark
+      size: 25
+      color: FFFFFF
+    normal:
+      family: ark
+      size: 20
+      color: FFFFFF
+    smaller:
+      family: ark
+      size: 15
+      color: FFFFFF
+
+  editor:
+    icons:
+      select:
+        image: ui/editor/Cursor.png
+        image_size: [64, 64]
+      tile:
+        image: ui/editor/Tile.png
+        image_size: [64, 64]
+      spawn:
+        image: ui/editor/Pointer and Map.png
+        image_size: [64, 64]
+      erase:
+        image: ui/editor/Eraser.png
+        image_size: [64, 64]
+
+  hud:
+    font:
+      family: ark
+      size: 15
+      color: FFFFFF
+
+    player_hud_width: 165
+
+    portrait_frame:
+      image: ui/panel.png
+      image_size: [32, 32]
+      border_size:
+        top: 8
+        left: 8
+        right: 8
+        bottom: 8
+
+    lifebar:
+      height: 16
+      background_image:
+        image: ui/lifebar.png
+        image_size: [19, 7]
+        border_size:
+          left: 3
+          right: 3
+          top: 3
+          bottom: 3
+        scale: 2
+      progress_image:
+        image: ui/lifebar-progress.png
+        image_size: [1, 1]
+
+  panel:
+    font_color: FFFFFF
+    padding:
+      top: 25
+      bottom: 25
+      left: 25
+      right: 25
+    border:
+      image: ui/panel.png
+      image_size: [38, 34]
+      border_size:
+        top: 11
+        bottom: 11
+        left: 12
+        right: 21
+      scale: 4
+
+  button_styles:
+    normal:
+      font:
+        family: ark
+        color: FFFFFF
+        size: 20
+      padding:
+        top: 6
+        left: 6
+        right: 6
+        bottom: 9
+      borders:
+        default:
+          image: ui/button.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+        focused:
+          image: ui/button-focused.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+        clicked:
+          image: ui/button-down.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+
+    small:
+      font:
+        family: ark
+        color: FFFFFF
+        size: 17
+      padding:
+        top: 4
+        left: 4
+        right: 4
+        bottom: 6
+      borders:
+        default:
+          image: ui/button.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+        focused:
+          image: ui/button-focused.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+        clicked:
+          image: ui/button-down.png
+          image_size: [14, 14]
+          border_size:
+            top: 5
+            bottom: 5
+            right: 5
+            left: 5
+          scale: 2
+
+translations:
+  # This is the locale that we will fallback to if the selected locale doesn't have
+  # translation for a certain message.
+  default_locale: en-US
+  locales:
+    - locales/en-US/en-US.ftl.yml
+    - locales/fr-FR/fr-FR.ftl.yml
diff --git a/assets/game/camera_controller.ts b/assets/game/camera_controller.ts
new file mode 100644
index 0000000000..bc791740c6
--- /dev/null
+++ b/assets/game/camera_controller.ts
@@ -0,0 +1,46 @@
+const lerpFactor = 0.1;
+
+export default {
+  postUpdateInGame() {
+    const mapQuery = world.query(MapMeta)[0];
+    if (!mapQuery) return;
+
+    const playerComponents = world
+      .query(PlayerIdx, Transform)
+      .map((x) => x.components);
+
+    const [_, cameraTransform, projection] = world.query(
+      GameCamera,
+      Transform,
+      OrthographicProjection
+    )[0].components;
+
+    let middlePoint = { x: 0, y: 0 };
+    let min = { x: 100000, y: 100000 };
+    let max = { x: -100000, y: -100000 };
+
+    const player_count = playerComponents.length;
+
+    for (const [_, playerTransform] of playerComponents) {
+      const playerPos = playerTransform.translation;
+      middlePoint.x += playerPos.x;
+      middlePoint.y += playerPos.y;
+
+      min.x = Math.min(playerPos.x, min.x);
+      min.y = Math.min(playerPos.y, min.y);
+      max.x = Math.max(playerPos.x, max.x);
+      max.y = Math.max(playerPos.y, max.y);
+    }
+
+    middlePoint.x /= Math.max(player_count, 1);
+    middlePoint.y /= Math.max(player_count, 1);
+
+    for (const dim of ["x", "y"]) {
+      let delta = cameraTransform.translation[dim] - middlePoint[dim];
+      let dist = delta * lerpFactor;
+      cameraTransform.translation[dim] -= dist;
+    }
+
+    projection.scale = 1.25;
+  },
+};
diff --git a/assets/locales/en-US/branding.ftl b/assets/locales/en-US/branding.ftl
new file mode 100644
index 0000000000..2289d25dda
--- /dev/null
+++ b/assets/locales/en-US/branding.ftl
@@ -0,0 +1,2 @@
+title = Fish Folk
+subtitle = Jumpy
diff --git a/assets/locales/en-US/controls.ftl b/assets/locales/en-US/controls.ftl
new file mode 100644
index 0000000000..287b16320b
--- /dev/null
+++ b/assets/locales/en-US/controls.ftl
@@ -0,0 +1,8 @@
+move-up = Move Up
+move-down = Move Down
+move-left = Move Left
+move-right = Move Right
+jump = Jump
+grab-drop = Grab / Drop
+shoot = Shoot
+slide = Slide
\ No newline at end of file
diff --git a/assets/locales/en-US/debug-tools.ftl b/assets/locales/en-US/debug-tools.ftl
new file mode 100644
index 0000000000..2babfc65a7
--- /dev/null
+++ b/assets/locales/en-US/debug-tools.ftl
@@ -0,0 +1,10 @@
+debug-tools = Debug Tools
+show-collision-shapes = Show Collision Shapes
+show-world-inspector = Show World Inspector
+show-frame-time-diagnostics = Show Frame Time Diagnostics
+show-network-visualizer = Show Network Visualizer
+
+frame-diagnostics = Frame Diagnostics
+frames-per-second = Frames Per Second
+frame-time = Frame Time
+reset-min-max = Reset Min/Max
\ No newline at end of file
diff --git a/assets/locales/en-US/editor.ftl b/assets/locales/en-US/editor.ftl
new file mode 100644
index 0000000000..1dbdc7362c
--- /dev/null
+++ b/assets/locales/en-US/editor.ftl
@@ -0,0 +1,29 @@
+layers = Layers
+create-layer = Create a New Layer
+
+map-info = Map Info
+map-export = Map Export
+tiles = Tiles
+tile = Tile
+tile-layer = Tile Layer
+tile-layer-icon = T
+element = Element
+element-layer = Element Layer
+element-layer-icon = E
+toggle-visibility = Toggle Visibility
+
+create = Create
+layer-kind = Layer Kind
+create-map = Create Map
+name = Name
+grid-size = Grid Size
+
+tilemap-path = Tilemap Path
+
+open-map = Open Map
+no-map-loaded = No map loaded
+
+view-zoom = Zoom { $percent }%
+view-offset = Camera Offset [ { $x }, { $y } ]
+view-reset = Reset View
+show-grid = Show Grid
\ No newline at end of file
diff --git a/assets/locales/en-US/en-US.ftl.yml b/assets/locales/en-US/en-US.ftl.yml
new file mode 100644
index 0000000000..b1d88b6462
--- /dev/null
+++ b/assets/locales/en-US/en-US.ftl.yml
@@ -0,0 +1,13 @@
+locale: en-US
+resources:
+  - branding.ftl
+  - menu.ftl
+  - debug-tools.ftl
+
+  - matchmaking.ftl
+  - settings.ftl
+  - editor.ftl
+  - player-select.ftl
+  - map-select.ftl
+
+  - controls.ftl
\ No newline at end of file
diff --git a/assets/locales/en-US/map-select.ftl b/assets/locales/en-US/map-select.ftl
new file mode 100644
index 0000000000..01f32de818
--- /dev/null
+++ b/assets/locales/en-US/map-select.ftl
@@ -0,0 +1,2 @@
+map-select-title = Map Select
+waiting-for-map = Waiting for other player to select map...
\ No newline at end of file
diff --git a/assets/locales/en-US/matchmaking.ftl b/assets/locales/en-US/matchmaking.ftl
new file mode 100644
index 0000000000..568ded7b50
--- /dev/null
+++ b/assets/locales/en-US/matchmaking.ftl
@@ -0,0 +1,8 @@
+configure-match = Configure Match
+player-count = Player Count
+search-for-match = Search for Match
+connecting = Connecting...
+connected-and-querying = Connected
+waiting-for-players = Waiting for Players: { $current } / { $total }
+match-ready = Match Ready!
+error = Error
\ No newline at end of file
diff --git a/assets/locales/en-US/menu.ftl b/assets/locales/en-US/menu.ftl
new file mode 100644
index 0000000000..8eed40ad3b
--- /dev/null
+++ b/assets/locales/en-US/menu.ftl
@@ -0,0 +1,22 @@
+# Menu Pages
+local-game = Local Game
+online-game = Online Game
+main-menu = Main Menu
+map-editor = Map Editor
+editor = Map Editor
+settings = Settings
+paused = Paused
+
+# Actions
+close = Close
+save = Save
+reset = Reset
+cancel = Cancel
+back = Back
+continue = Continue
+edit = Edit
+play = Play
+quit = Quit
+export = Export
+reload = Reload
+restart = Restart
\ No newline at end of file
diff --git a/assets/locales/en-US/player-select.ftl b/assets/locales/en-US/player-select.ftl
new file mode 100644
index 0000000000..18bb3a12e5
--- /dev/null
+++ b/assets/locales/en-US/player-select.ftl
@@ -0,0 +1,6 @@
+keyboard = Keyboard
+press-jump-to-join = Press Jump Button to Join
+player-select-title = Player Select
+pick-a-fish = Pick a Fish
+player-select-ready = Ready!
+you-marker = < You >
\ No newline at end of file
diff --git a/assets/locales/en-US/settings.ftl b/assets/locales/en-US/settings.ftl
new file mode 100644
index 0000000000..a63c0e9257
--- /dev/null
+++ b/assets/locales/en-US/settings.ftl
@@ -0,0 +1,14 @@
+# Controller Settings
+
+controls = Controls
+bind-input = Make an input to bind or press Escape to cancel
+
+keyboard-1 = Keyboard 1
+keyboard-2 = Keyboard 2
+gamepad = Gamepad
+
+action = Action
+
+# Networking settings
+networking = Networking
+matchmaking-server = Matchmaking Server
diff --git a/assets/locales/fr-FR/fr-FR.ftl.yml b/assets/locales/fr-FR/fr-FR.ftl.yml
new file mode 100644
index 0000000000..d59f8ddb47
--- /dev/null
+++ b/assets/locales/fr-FR/fr-FR.ftl.yml
@@ -0,0 +1,3 @@
+locale: fr-FR
+resources:
+  - main.ftl
\ No newline at end of file
diff --git a/assets/locales/fr-FR/main.ftl b/assets/locales/fr-FR/main.ftl
new file mode 100644
index 0000000000..78999207cd
--- /dev/null
+++ b/assets/locales/fr-FR/main.ftl
@@ -0,0 +1,7 @@
+# Main Menu
+start-game = Démarrer Jeu
+
+# Pause Menu
+paused = En Pause
+continue = Continuez
+main-menu = Menu Principal
\ No newline at end of file
diff --git a/assets/map/elements/decoration/anemones/anemones.atlas.yaml b/assets/map/elements/decoration/anemones/anemones.atlas.yaml
new file mode 100644
index 0000000000..db0776e716
--- /dev/null
+++ b/assets/map/elements/decoration/anemones/anemones.atlas.yaml
@@ -0,0 +1,4 @@
+image: ./anemones.png
+tile_size: [48, 51]
+rows: 1
+columns: 5
\ No newline at end of file
diff --git a/assets/map/elements/decoration/anemones/anemones.element.yaml b/assets/map/elements/decoration/anemones/anemones.element.yaml
new file mode 100644
index 0000000000..cad59b7e7a
--- /dev/null
+++ b/assets/map/elements/decoration/anemones/anemones.element.yaml
@@ -0,0 +1,7 @@
+name: Anemones
+category: Decorations
+scripts:
+  - ./anemones.ts
+editor_size: [48, 51]
+preload_assets:
+  - ./anemones.atlas.yaml
\ No newline at end of file
diff --git a/assets/map/elements/decoration/anemones/anemones.png b/assets/map/elements/decoration/anemones/anemones.png
new file mode 100644
index 0000000000..73f340f404
Binary files /dev/null and b/assets/map/elements/decoration/anemones/anemones.png differ
diff --git a/assets/map/elements/decoration/anemones/anemones.ts b/assets/map/elements/decoration/anemones/anemones.ts
new file mode 100644
index 0000000000..b1e20e89b8
--- /dev/null
+++ b/assets/map/elements/decoration/anemones/anemones.ts
@@ -0,0 +1,18 @@
+export default {
+  preUpdate() {
+    for (const entity of MapElement.getSpawnedEntities()) {
+      world.insert(
+        entity,
+        Value.create(AnimatedSprite, {
+          start: 0,
+          end: 4,
+          repeat: true,
+          fps: 6,
+          atlas: {
+            id: Assets.getHandleId("./anemones.atlas.yaml"),
+          },
+        })
+      );
+    }
+  },
+};
diff --git a/assets/map/elements/decoration/seaweed/seaweed.atlas.yaml b/assets/map/elements/decoration/seaweed/seaweed.atlas.yaml
new file mode 100644
index 0000000000..48feec64af
--- /dev/null
+++ b/assets/map/elements/decoration/seaweed/seaweed.atlas.yaml
@@ -0,0 +1,4 @@
+image: ./seaweed.png
+tile_size: [48, 51]
+rows: 1
+columns: 5
\ No newline at end of file
diff --git a/assets/map/elements/decoration/seaweed/seaweed.element.yaml b/assets/map/elements/decoration/seaweed/seaweed.element.yaml
new file mode 100644
index 0000000000..05d8221ebc
--- /dev/null
+++ b/assets/map/elements/decoration/seaweed/seaweed.element.yaml
@@ -0,0 +1,7 @@
+name: Seaweed
+category: Decorations
+scripts:
+  - ./seaweed.ts
+editor_size: [48, 51]
+preload_assets:
+  - ./seaweed.atlas.yaml
diff --git a/assets/map/elements/decoration/seaweed/seaweed.png b/assets/map/elements/decoration/seaweed/seaweed.png
new file mode 100644
index 0000000000..45fdd6de1b
Binary files /dev/null and b/assets/map/elements/decoration/seaweed/seaweed.png differ
diff --git a/assets/map/elements/decoration/seaweed/seaweed.ts b/assets/map/elements/decoration/seaweed/seaweed.ts
new file mode 100644
index 0000000000..87829d1b9f
--- /dev/null
+++ b/assets/map/elements/decoration/seaweed/seaweed.ts
@@ -0,0 +1,17 @@
+export default {
+  preUpdate() {
+    for (const entity of MapElement.getSpawnedEntities()) {
+      let animated_sprite = Value.create(AnimatedSprite, {
+        start: 0,
+        end: 4,
+        repeat: true,
+        fps: 6,
+        atlas: {
+          id: Assets.getHandleId("./seaweed.atlas.yaml"),
+        },
+      });
+
+      world.insert(entity, animated_sprite);
+    }
+  },
+};
diff --git a/assets/map/elements/environment/crab/crab.atlas.yaml b/assets/map/elements/environment/crab/crab.atlas.yaml
new file mode 100644
index 0000000000..7d8617ce71
--- /dev/null
+++ b/assets/map/elements/environment/crab/crab.atlas.yaml
@@ -0,0 +1,4 @@
+image: ./crab.png
+tile_size: [17, 12]
+rows: 1
+columns: 2
diff --git a/assets/map/elements/environment/crab/crab.element.yaml b/assets/map/elements/environment/crab/crab.element.yaml
new file mode 100644
index 0000000000..4457b44bc0
--- /dev/null
+++ b/assets/map/elements/environment/crab/crab.element.yaml
@@ -0,0 +1,7 @@
+name: Crab
+category: Critters
+scripts:
+  - ./crab.ts
+editor_size: [17, 12]
+preload_assets:
+  - ./crab.atlas.yaml
diff --git a/assets/textures/items/Crab(17x12).png b/assets/map/elements/environment/crab/crab.png
similarity index 100%
rename from assets/textures/items/Crab(17x12).png
rename to assets/map/elements/environment/crab/crab.png
diff --git a/assets/map/elements/environment/crab/crab.ts b/assets/map/elements/environment/crab/crab.ts
new file mode 100644
index 0000000000..0c3d104a0b
--- /dev/null
+++ b/assets/map/elements/environment/crab/crab.ts
@@ -0,0 +1,88 @@
+const initState: { crabs: JsEntity[] } = {
+  crabs: [],
+};
+
+const MapMeta: BevyType<unknown> = {
+  typeName: "jumpy::metadata::map::MapMeta",
+};
+
+let i = 0;
+
+const state = Script.state(initState);
+
+export default {
+  preUpdateInGame() {
+    const mapQuery = world.query(MapMeta)[0];
+    if (!mapQuery) {
+      state.crabs = [];
+      return;
+    }
+
+    const spawnedEntities = MapElement.getSpawnedEntities();
+    if (spawnedEntities.length > 0) {
+      state.crabs = [];
+    }
+
+    // Handle newly spawned map entities
+    for (const spanwer_entity of spawnedEntities) {
+      const [transform, global_transform, computed_visibility] = world
+        .query(Transform, GlobalTransform, ComputedVisibility)
+        .get(spanwer_entity);
+
+      // Spawn a new entity for the crab and copy the transform and visibility from the map element
+      const entity = world.spawn();
+      state.crabs.push(EntityRef.toJs(entity));
+
+      world.insert(entity, Value.create(EntityName, ["Critter: Crab"]));
+      world.insert(entity, transform);
+      world.insert(entity, global_transform);
+      world.insert(entity, computed_visibility);
+      world.insert(entity, Value.create(Visibility));
+
+      // Add the animated sprite
+      world.insert(
+        entity,
+        Value.create(AnimatedSprite, {
+          start: 0,
+          end: 1,
+          repeat: true,
+          fps: 3,
+          atlas: {
+            id: Assets.getHandleId("crab.atlas.yaml"),
+          },
+        })
+      );
+
+      // And the kinematic body
+      world.insert(
+        entity,
+        Value.create(KinematicBody, {
+          size: {
+            x: 18,
+            y: 12,
+          },
+          gravity: 1,
+          has_friction: true,
+          has_mass: true,
+        })
+      );
+    }
+  },
+
+  updateInGame() {
+    i++;
+    const query = world.query(KinematicBody);
+
+    for (const crab of state.crabs) {
+      const components = query.get(EntityRef.fromJs(crab));
+      if (!components) continue;
+      const [kinematicBody] = components;
+
+      if (i % 100 == 0) {
+        i = 0;
+        kinematicBody.velocity.x =
+          Math.random() * 3 * (Math.random() >= 0.5 ? -1 : 1);
+      }
+    }
+  },
+};
diff --git a/assets/map/elements/environment/fish_school/fish_school.element.yaml b/assets/map/elements/environment/fish_school/fish_school.element.yaml
new file mode 100644
index 0000000000..7534ee65c5
--- /dev/null
+++ b/assets/map/elements/environment/fish_school/fish_school.element.yaml
@@ -0,0 +1,4 @@
+name: Fish School
+category: Critters
+scripts:
+  - ./sproinger.ts
diff --git a/assets/map/elements/environment/fish_school/sproinger.ts b/assets/map/elements/environment/fish_school/sproinger.ts
new file mode 100644
index 0000000000..56004c9f9e
--- /dev/null
+++ b/assets/map/elements/environment/fish_school/sproinger.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/assets/map/elements/environment/player_spawner/player_spawner.element.yaml b/assets/map/elements/environment/player_spawner/player_spawner.element.yaml
new file mode 100644
index 0000000000..573eb54f84
--- /dev/null
+++ b/assets/map/elements/environment/player_spawner/player_spawner.element.yaml
@@ -0,0 +1,5 @@
+name: Player Spawner
+category: Gampelay
+scripts:
+  - ./player_spawner.ts
+editor_size: [16, 32]
diff --git a/assets/map/elements/environment/player_spawner/player_spawner.ts b/assets/map/elements/environment/player_spawner/player_spawner.ts
new file mode 100644
index 0000000000..eb1dbb9f3f
--- /dev/null
+++ b/assets/map/elements/environment/player_spawner/player_spawner.ts
@@ -0,0 +1,51 @@
+const initState: { spawners: JsEntity[]; currentSpawner: number } = {
+  currentSpawner: 0,
+  spawners: [],
+};
+
+const state = Script.state(initState);
+
+export default {
+  preUpdate() {
+    if (NetInfo.get().is_client) return;
+
+    const player_inputs = world.resource(PlayerInputs);
+
+    const mapQuery = world.query(MapMeta)[0];
+    if (!mapQuery) {
+      state.spawners = [];
+      return;
+    }
+
+    const spawnedEntities = MapElement.getSpawnedEntities();
+    if (spawnedEntities.length > 0) {
+      state.spawners = spawnedEntities.map((e) => EntityRef.toJs(e));
+    }
+
+    // Collect all the alive players on the map
+    const alive_players = world.query(PlayerIdx).map((x) => x.components[0][0]);
+
+    // For every player
+    for (let i = 0; i < 4; i++) {
+      // Get the player input
+      const player = player_inputs.players[i];
+
+      // If the player is active, but not alive
+      if (player.active && !alive_players.includes(i)) {
+        // Get the next spawner
+        state.currentSpawner += 1;
+        state.currentSpawner %= state.spawners.length;
+
+        const spawner = EntityRef.fromJs(state.spawners[state.currentSpawner]);
+
+        // Get the spawner transform
+        const [spawnerTransform] = world.query(Transform).get(spawner);
+
+        // Spawn the player
+        const player = world.spawn();
+        world.insert(player, Value.create(PlayerIdx, [i]));
+        world.insert(player, spawnerTransform);
+      }
+    }
+  },
+};
diff --git a/assets/map/elements/environment/sproinger/sproinger.atlas.yaml b/assets/map/elements/environment/sproinger/sproinger.atlas.yaml
new file mode 100644
index 0000000000..698ceb46a7
--- /dev/null
+++ b/assets/map/elements/environment/sproinger/sproinger.atlas.yaml
@@ -0,0 +1,4 @@
+image: ./sproinger.png
+tile_size: [32, 20]
+rows: 3
+columns: 2
diff --git a/assets/map/elements/environment/sproinger/sproinger.element.yaml b/assets/map/elements/environment/sproinger/sproinger.element.yaml
new file mode 100644
index 0000000000..f42a17486f
--- /dev/null
+++ b/assets/map/elements/environment/sproinger/sproinger.element.yaml
@@ -0,0 +1,6 @@
+name: Sproinger
+category: Gameplay
+scripts:
+  - ./sproinger.ts
+preload_assets:
+  - ./sproinger.atlas.yaml
\ No newline at end of file
diff --git a/assets/textures/items/Sproinger(31x20).png b/assets/map/elements/environment/sproinger/sproinger.png
similarity index 100%
rename from assets/textures/items/Sproinger(31x20).png
rename to assets/map/elements/environment/sproinger/sproinger.png
diff --git a/assets/map/elements/environment/sproinger/sproinger.ts b/assets/map/elements/environment/sproinger/sproinger.ts
new file mode 100644
index 0000000000..bb49f57745
--- /dev/null
+++ b/assets/map/elements/environment/sproinger/sproinger.ts
@@ -0,0 +1,135 @@
+// Define the sproinger state types
+type SproingerState = {
+  sproinging: boolean;
+  frame: number;
+};
+
+// Initialize script state.
+//
+// This will be used to keep track of which entities in the world are sproingers.
+const initState: { sproingers: JsEntity[] } = {
+  sproingers: [],
+};
+const state = Script.state(initState);
+
+// Add our constants
+const FORCE = 25;
+
+export default {
+  preUpdateInGame() {
+    // Check for the existence of the map
+    const map = world.query(MapMeta)[0];
+    // If there is no map
+    if (!map) {
+      // lear our sproinger list
+      state.sproingers = [];
+      return;
+    }
+
+    // Get the list of spawned entities
+    const spawnedEntities = MapElement.getSpawnedEntities();
+    // If there are spawned entities, that means the map was loaded or reloaded.
+    if (spawnedEntities.length > 0) {
+      // So clear our sproinger list
+      state.sproingers = [];
+    }
+
+    // For every new sproinger entity
+    for (const entity of spawnedEntities) {
+      // Add this entity to our list of sproingers.
+      //
+      // Note: Because we cannot persist entity refs across frames,
+      // we must first convert the entity to a JSON representation.
+      state.sproingers.push(EntityRef.toJs(entity));
+
+      // Add the sprite
+      world.insert(
+        entity,
+        Value.create(AnimatedSprite, {
+          start: 0,
+          end: 6,
+          repeat: false,
+          fps: 0,
+          atlas: {
+            id: Assets.getHandleId("./sproinger.atlas.yaml"),
+          },
+        })
+      );
+      // And the physics body
+      world.insert(
+        entity,
+        Value.create(KinematicBody, {
+          size: {
+            x: 32,
+            y: 8,
+          },
+          offset: {
+            y: -6,
+          },
+          has_mass: false,
+        })
+      );
+    }
+  },
+
+  updateInGame() {
+    const bodies = world.query(KinematicBody);
+    const animatedSprites = world.query(AnimatedSprite);
+
+    // Loop over all our sproingers
+    for (const jsEntity of state.sproingers) {
+      // We must convert our JsEntities to entity refs to use in world queries.
+      const entity = EntityRef.fromJs(jsEntity);
+
+      // Get our sproinger sprite
+      const [sprite] = animatedSprites.get(entity);
+
+      // Get the script-local state for the sproinger entity
+      const entState = Script.getEntityState<SproingerState>(entity, {
+        frame: 0,
+        sproinging: false,
+      });
+
+      // If the sproinger is currently sproinging
+      if (entState.sproinging) {
+        // Play the sproinging animation
+        switch (entState.frame) {
+          case 0:
+            sprite.index = 2;
+            break;
+          case 4:
+            sprite.index = 3;
+            break;
+          case 8:
+            sprite.index = 4;
+            break;
+          case 12:
+            sprite.index = 5;
+            break;
+          case 20:
+            sprite.index = 0;
+            entState.sproinging = false;
+            entState.frame = 0;
+            break;
+        }
+        entState.frame += 1;
+      }
+
+      // See if the spoinger has any collisions
+      for (const collidedEntity of CollisionWorld.actorCollisions(entity)) {
+        // Get the kinematic body of the collided entity
+        const components = bodies.get(collidedEntity);
+        if (!components) continue;
+        const [body] = components;
+
+        if (!entState.sproinging) {
+          // Apply the sproing force to the body
+          body.velocity.y = FORCE;
+
+          // Go into a sproinging state
+          entState.sproinging = true;
+        }
+      }
+    }
+  },
+};
diff --git a/assets/map/elements/item/blunderbass/blunderbass.element.yaml b/assets/map/elements/item/blunderbass/blunderbass.element.yaml
new file mode 100644
index 0000000000..1dc32194b5
--- /dev/null
+++ b/assets/map/elements/item/blunderbass/blunderbass.element.yaml
@@ -0,0 +1,4 @@
+name: Blunderbass
+category: Weapons
+scripts:
+  - ./sproinger.ts
diff --git a/assets/map/elements/item/blunderbass/sproinger.ts b/assets/map/elements/item/blunderbass/sproinger.ts
new file mode 100644
index 0000000000..56004c9f9e
--- /dev/null
+++ b/assets/map/elements/item/blunderbass/sproinger.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/assets/map/elements/item/cannon/cannon.element.yaml b/assets/map/elements/item/cannon/cannon.element.yaml
new file mode 100644
index 0000000000..c1a53b802a
--- /dev/null
+++ b/assets/map/elements/item/cannon/cannon.element.yaml
@@ -0,0 +1,4 @@
+name: Canon
+category: Weapons
+scripts:
+  - ./sproinger.ts
diff --git a/assets/map/elements/item/cannon/sproinger.ts b/assets/map/elements/item/cannon/sproinger.ts
new file mode 100644
index 0000000000..56004c9f9e
--- /dev/null
+++ b/assets/map/elements/item/cannon/sproinger.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/assets/map/elements/item/crate/crate.element.yaml b/assets/map/elements/item/crate/crate.element.yaml
new file mode 100644
index 0000000000..a546ff8855
--- /dev/null
+++ b/assets/map/elements/item/crate/crate.element.yaml
@@ -0,0 +1,4 @@
+name: Crate
+category: Weapons
+scripts:
+  - ./sproinger.ts
diff --git a/assets/map/elements/item/crate/sproinger.ts b/assets/map/elements/item/crate/sproinger.ts
new file mode 100644
index 0000000000..56004c9f9e
--- /dev/null
+++ b/assets/map/elements/item/crate/sproinger.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/assets/map/elements/item/grenades/grenades.element.yaml b/assets/map/elements/item/grenades/grenades.element.yaml
new file mode 100644
index 0000000000..cdaac718c9
--- /dev/null
+++ b/assets/map/elements/item/grenades/grenades.element.yaml
@@ -0,0 +1,4 @@
+name: Grenades
+category: Weapons
+scripts:
+  - ./sproinger.ts
diff --git a/assets/map/elements/item/grenades/sproinger.ts b/assets/map/elements/item/grenades/sproinger.ts
new file mode 100644
index 0000000000..56004c9f9e
--- /dev/null
+++ b/assets/map/elements/item/grenades/sproinger.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/assets/map/elements/item/kick_bomb/explosion.atlas.yaml b/assets/map/elements/item/kick_bomb/explosion.atlas.yaml
new file mode 100644
index 0000000000..703175da65
--- /dev/null
+++ b/assets/map/elements/item/kick_bomb/explosion.atlas.yaml
@@ -0,0 +1,4 @@
+image: ./explosion.png
+tile_size: [144, 112]
+rows: 1
+columns: 11
diff --git a/assets/textures/explosions/Medium(144x112).png b/assets/map/elements/item/kick_bomb/explosion.png
similarity index 100%
rename from assets/textures/explosions/Medium(144x112).png
rename to assets/map/elements/item/kick_bomb/explosion.png
diff --git a/assets/map/elements/item/kick_bomb/kick_bomb.atlas.yaml b/assets/map/elements/item/kick_bomb/kick_bomb.atlas.yaml
new file mode 100644
index 0000000000..18201d40c0
--- /dev/null
+++ b/assets/map/elements/item/kick_bomb/kick_bomb.atlas.yaml
@@ -0,0 +1,4 @@
+image: ./kick_bomb.png
+tile_size: [32, 63]
+rows: 2
+columns: 3
diff --git a/assets/map/elements/item/kick_bomb/kick_bomb.element.yaml b/assets/map/elements/item/kick_bomb/kick_bomb.element.yaml
new file mode 100644
index 0000000000..ee9f04b385
--- /dev/null
+++ b/assets/map/elements/item/kick_bomb/kick_bomb.element.yaml
@@ -0,0 +1,8 @@
+name: Kick Bomb
+category: Weapons
+scripts:
+  - ./kick_bomb_spawner.ts
+  - ./kick_bomb.ts
+preload_assets:
+  - ./kick_bomb.atlas.yaml
+  - ./explosion.atlas.yaml
\ No newline at end of file
diff --git a/assets/textures/items/KickBomb(32x64).png b/assets/map/elements/item/kick_bomb/kick_bomb.png
similarity index 100%
rename from assets/textures/items/KickBomb(32x64).png
rename to assets/map/elements/item/kick_bomb/kick_bomb.png
diff --git a/assets/map/elements/item/kick_bomb/kick_bomb.ts b/assets/map/elements/item/kick_bomb/kick_bomb.ts
new file mode 100644
index 0000000000..dbf6d9c22b
--- /dev/null
+++ b/assets/map/elements/item/kick_bomb/kick_bomb.ts
@@ -0,0 +1,257 @@
+const scriptPath = Script.getInfo().path;
+
+type LitBombState = {
+  frames: number;
+};
+type ScriptState = {
+  litBombs: JsEntity[];
+};
+const scriptState = Script.state<ScriptState>({
+  litBombs: [],
+});
+
+export default {
+  preUpdateInGame() {
+    // Hydrate newly spawned sword items
+    const names = world.query(EntityName);
+    const items = world.query(Item);
+    for (const { entity, components } of items) {
+      const [item] = components;
+
+      // If this is one of our items without a name
+      if (item.script == scriptPath && !names.get(entity)) {
+        // Hydrate the entity
+        world.insert(entity, Value.create(EntityName, ["Item: Kick Bomb"]));
+
+        // Add the animated sprite
+        world.insert(
+          entity,
+          Value.create(AnimatedSprite, {
+            start: 0,
+            end: 5,
+            repeat: false,
+            fps: 0,
+            atlas: {
+              id: Assets.getHandleId("kick_bomb.atlas.yaml"),
+            },
+          })
+        );
+        // And the kinematic body
+        world.insert(
+          entity,
+          Value.create(KinematicBody, {
+            size: {
+              x: 26,
+              y: 26,
+            },
+            gravity: 1,
+            has_friction: true,
+            has_mass: true,
+          })
+        );
+      }
+    }
+  },
+
+  updateInGame() {
+    const players = world.query(
+      AnimatedSprite,
+      Transform,
+      PlayerIdx,
+      GlobalTransform,
+      ComputedVisibility
+    );
+    const parents = world.query(Parent);
+    const items = world.query(
+      Item,
+      Transform,
+      KinematicBody,
+      AnimatedSprite,
+      GlobalTransform
+    );
+    const transforms = world.query(
+      Transform,
+      GlobalTransform,
+      Visibility,
+      ComputedVisibility
+    );
+
+    // Update items that are being held
+    //
+    // This section will make the item follow the player around and match the player's facing
+    // direction.
+    for (const { entity: itemEnt, components } of items) {
+      const [item, itemTransform, body, sprite] = components;
+      if (item.script != scriptPath) continue;
+
+      let parentComponents = parents.get(itemEnt);
+      // If this item isn't being held, skip the item
+      if (!parentComponents) continue;
+
+      const [parent] = parentComponents;
+      const [playerSprite] = players.get(parent[0]);
+
+      // Deactivate item collision
+      body.is_deactivated = true;
+
+      // Set animation to default position if we are being held
+      sprite.index = 0;
+
+      // Flip the sprite to match our player orientation
+      const flip = playerSprite.flip_x;
+      sprite.flip_x = flip;
+      const flipFactor = flip ? -1 : 1;
+      // Align the sprite with the player's position
+      itemTransform.translation = Value.create(Vec3, {
+        x: 13 * flipFactor,
+        y: 0,
+      });
+    }
+
+    // For every item that is being used
+    for (const event of Items.useEvents()) {
+      let parentComponents = parents.get(event.item);
+      // If this item isn't being held, skip the item
+      if (!parentComponents) continue;
+
+      // Get the player info
+      const [parent] = parentComponents;
+      const [
+        playerSprite,
+        transform,
+        _idx,
+        globalTransform,
+        computedVisibility,
+      ] = players.get(parent[0]);
+      const flip = playerSprite.flip_x;
+      const flipFactor = flip ? -1 : 1;
+
+      // Despawn the item from the player's hand
+      WorldTemp.despawnRecursive(event.item);
+
+      // Spawn a new, lit bomb to the map
+      const entity = world.spawn();
+      scriptState.litBombs.push(EntityRef.toJs(entity));
+      world.insert(entity, transform);
+      world.insert(entity, globalTransform);
+      world.insert(entity, computedVisibility);
+      world.insert(entity, Value.create(Visibility));
+
+      // Add the animated sprite
+      world.insert(
+        entity,
+        Value.create(AnimatedSprite, {
+          start: 3,
+          end: 5,
+          repeat: true,
+          fps: 8,
+          atlas: {
+            id: Assets.getHandleId("kick_bomb.atlas.yaml"),
+          },
+        })
+      );
+      // And the kinematic body
+      world.insert(
+        entity,
+        Value.create(KinematicBody, {
+          size: {
+            x: 26,
+            y: 26,
+          },
+          velocity: {
+            x: 10 * flipFactor,
+          },
+          gravity: 1,
+          has_friction: true,
+          has_mass: true,
+        })
+      );
+    }
+
+    // Handle lit bombs
+    const litBombs = scriptState.litBombs;
+    scriptState.litBombs = [];
+    for (const jsEntity of litBombs) {
+      const bombEntity = EntityRef.fromJs(jsEntity);
+
+      // Get the bomb's state
+      const state = Script.getEntityState<LitBombState>(bombEntity, {
+        frames: 0,
+      });
+      const [transform, globalTransform, visibility, computedVisibility] =
+        transforms.get(bombEntity);
+
+      if (state.frames >= 60) {
+        // Spawn damage region entity
+        const damageRegionEnt = world.spawn();
+        world.insert(damageRegionEnt, transform);
+        world.insert(damageRegionEnt, globalTransform);
+        world.insert(damageRegionEnt, visibility);
+        world.insert(damageRegionEnt, computedVisibility);
+        world.insert(
+          damageRegionEnt,
+          Value.create(DamageRegion, {
+            size: {
+              x: 26 * 3.5,
+              y: 26 * 3.5,
+            },
+          })
+        );
+        world.insert(
+          damageRegionEnt,
+          Value.create(Lifetime, {
+            lifetime: 1 / 9 * 4,
+          })
+        );
+        // Spawn explosion sprite entity
+        const explosionSpriteEnt = world.spawn();
+        world.insert(explosionSpriteEnt, transform);
+        world.insert(explosionSpriteEnt, globalTransform);
+        world.insert(explosionSpriteEnt, visibility);
+        world.insert(explosionSpriteEnt, computedVisibility);
+        world.insert(
+          explosionSpriteEnt,
+          Value.create(AnimatedSprite, {
+            start: 0,
+            end: 11,
+            repeat: false,
+            fps: 9,
+            atlas: {
+              id: Assets.getHandleId("explosion.atlas.yaml"),
+            },
+          })
+        );
+        world.insert(
+          explosionSpriteEnt,
+          Value.create(Lifetime, {
+            lifetime: 1 / 9 * 11,
+          })
+        );
+
+        // Despawn the lit bomb
+        WorldTemp.despawnRecursive(bombEntity);
+      } else {
+        state.frames += 1;
+        scriptState.litBombs.push(jsEntity);
+      }
+    }
+
+    // Update dropped items
+    for (const event of Items.dropEvents()) {
+      const [_item, itemTransform, body, sprite] = items.get(event.item);
+      let flip = sprite.flip_x;
+      let flipFactor = flip ? -1 : 1;
+
+      // Re-activate physics body on the item
+      body.is_deactivated = false;
+      // Make sure item maintains player velocity
+      body.velocity = event.velocity;
+      body.is_spawning = true;
+
+      // Drop item at the middle of the player
+      itemTransform.translation.y = event.position.y;
+      itemTransform.translation.x = event.position.x + 13 * flipFactor;
+      itemTransform.translation.z = event.position.z;
+    }
+  },
+};
diff --git a/assets/map/elements/item/kick_bomb/kick_bomb_spawner.ts b/assets/map/elements/item/kick_bomb/kick_bomb_spawner.ts
new file mode 100644
index 0000000000..993455b857
--- /dev/null
+++ b/assets/map/elements/item/kick_bomb/kick_bomb_spawner.ts
@@ -0,0 +1,28 @@
+export default {
+  preUpdate() {
+    // Clients may not spawn items
+    if (NetInfo.get().is_client) return;
+
+    const spawnedEntities = MapElement.getSpawnedEntities();
+
+    // Handle newly spawned map entities
+    for (const spanwer_entity of spawnedEntities) {
+      const [transform, global_transform, computed_visibility] = world
+        .query(Transform, GlobalTransform, ComputedVisibility)
+        .get(spanwer_entity);
+
+      // Spawn a new entity for the bomb item and copy the transform from the map element
+      const entity = world.spawn();
+      world.insert(
+        entity,
+        Value.create(Item, {
+          script: Assets.getAbsolutePath("kick_bomb.ts"),
+        })
+      );
+      world.insert(entity, transform);
+      world.insert(entity, global_transform);
+      world.insert(entity, computed_visibility);
+      world.insert(entity, Value.create(Visibility));
+    }
+  },
+};
diff --git a/assets/map/elements/item/machine_gun/machine_gun.element.yaml b/assets/map/elements/item/machine_gun/machine_gun.element.yaml
new file mode 100644
index 0000000000..a9d409eea8
--- /dev/null
+++ b/assets/map/elements/item/machine_gun/machine_gun.element.yaml
@@ -0,0 +1,4 @@
+name: Machine Gun
+category: Weapons
+scripts:
+  - ./sproinger.ts
diff --git a/assets/map/elements/item/machine_gun/sproinger.ts b/assets/map/elements/item/machine_gun/sproinger.ts
new file mode 100644
index 0000000000..56004c9f9e
--- /dev/null
+++ b/assets/map/elements/item/machine_gun/sproinger.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/assets/map/elements/item/mines/mines.element.yaml b/assets/map/elements/item/mines/mines.element.yaml
new file mode 100644
index 0000000000..1f2ecac688
--- /dev/null
+++ b/assets/map/elements/item/mines/mines.element.yaml
@@ -0,0 +1,4 @@
+name: Mines
+category: Weapons
+scripts:
+  - ./sproinger.ts
diff --git a/assets/map/elements/item/mines/sproinger.ts b/assets/map/elements/item/mines/sproinger.ts
new file mode 100644
index 0000000000..56004c9f9e
--- /dev/null
+++ b/assets/map/elements/item/mines/sproinger.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/assets/map/elements/item/musket/musket.element.yaml b/assets/map/elements/item/musket/musket.element.yaml
new file mode 100644
index 0000000000..e0917b5f8d
--- /dev/null
+++ b/assets/map/elements/item/musket/musket.element.yaml
@@ -0,0 +1,4 @@
+name: Musket
+category: Weapons
+scripts:
+  - ./musket.ts
diff --git a/assets/map/elements/item/musket/musket.ts b/assets/map/elements/item/musket/musket.ts
new file mode 100644
index 0000000000..56004c9f9e
--- /dev/null
+++ b/assets/map/elements/item/musket/musket.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/assets/map/elements/item/sniper_rifle/sniper_rifle.element.yaml b/assets/map/elements/item/sniper_rifle/sniper_rifle.element.yaml
new file mode 100644
index 0000000000..2985d0bf15
--- /dev/null
+++ b/assets/map/elements/item/sniper_rifle/sniper_rifle.element.yaml
@@ -0,0 +1,4 @@
+name: Sniper Rifle
+category: Weapons
+scripts:
+  - ./sproinger.ts
diff --git a/assets/map/elements/item/sniper_rifle/sproinger.ts b/assets/map/elements/item/sniper_rifle/sproinger.ts
new file mode 100644
index 0000000000..56004c9f9e
--- /dev/null
+++ b/assets/map/elements/item/sniper_rifle/sproinger.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/assets/map/elements/item/sword/sword.atlas.yaml b/assets/map/elements/item/sword/sword.atlas.yaml
new file mode 100644
index 0000000000..3232aa133c
--- /dev/null
+++ b/assets/map/elements/item/sword/sword.atlas.yaml
@@ -0,0 +1,4 @@
+image: ./sword.png
+tile_size: [65, 93]
+rows: 4
+columns: 4
diff --git a/assets/map/elements/item/sword/sword.element.yaml b/assets/map/elements/item/sword/sword.element.yaml
new file mode 100644
index 0000000000..cad9647d32
--- /dev/null
+++ b/assets/map/elements/item/sword/sword.element.yaml
@@ -0,0 +1,7 @@
+name: Sword
+category: Weapons
+scripts:
+  - ./sword_spawner.ts
+  - ./sword.ts
+preload_assets:
+  - ./sword.atlas.yaml
diff --git a/assets/textures/items/Sword(65x93).png b/assets/map/elements/item/sword/sword.png
similarity index 100%
rename from assets/textures/items/Sword(65x93).png
rename to assets/map/elements/item/sword/sword.png
diff --git a/assets/map/elements/item/sword/sword.ts b/assets/map/elements/item/sword/sword.ts
new file mode 100644
index 0000000000..1265afc97d
--- /dev/null
+++ b/assets/map/elements/item/sword/sword.ts
@@ -0,0 +1,249 @@
+const scriptPath = Script.getInfo().path;
+
+type Idle = { status: "idle" };
+type Swinging = { status: "swinging"; frame: number };
+type Cooldown = { status: "cooldown"; frame: number };
+type ItemState = Idle | Swinging | Cooldown;
+const itemStateInit: ItemState = { status: "idle" };
+
+const COOLDOWN_FRAMES = 15;
+const ATTACK_FPS = 10;
+
+export default {
+  preUpdateInGame() {
+    // Hydrate newly spawned sword items
+    const names = world.query(EntityName);
+    const items = world.query(Item);
+    for (const { entity, components } of items) {
+      const [item] = components;
+
+      // If this is one of our items without a name
+      if (item.script == scriptPath && !names.get(entity)) {
+        // Hydrate the entity
+        world.insert(entity, Value.create(EntityName, ["Item: Sword"]));
+
+        // Add the animated sprite
+        world.insert(
+          entity,
+          Value.create(AnimatedSprite, {
+            start: 0,
+            end: 0,
+            repeat: false,
+            fps: ATTACK_FPS,
+            atlas: {
+              id: Assets.getHandleId("sword.atlas.yaml"),
+            },
+          })
+        );
+        // And the kinematic body
+        world.insert(
+          entity,
+          Value.create(KinematicBody, {
+            size: {
+              x: 64,
+              y: 16,
+            },
+            offset: {
+              y: 38,
+            },
+            gravity: 1,
+            has_friction: true,
+            has_mass: true,
+          })
+        );
+      }
+    }
+  },
+
+  updateInGame() {
+    const players = world.query(AnimatedSprite, Transform, PlayerIdx);
+    const parents = world.query(Parent);
+    const items = world.query(
+      Item,
+      Transform,
+      KinematicBody,
+      AnimatedSprite,
+      GlobalTransform,
+    );
+
+    // Helper to spawn a damage region
+    const spawnDamageRegion = (
+      owner: Entity,
+      x: number,
+      y: number,
+      width: number,
+      height: number
+    ) => {
+      /// This is a hack to get a global transform because scripts can't construct it with
+      /// Value.create(). ( Fixed in Bevy 0.9 )
+      const globalTransform = items[0].components[3];
+
+      // Spawn damage region entity
+      let entity = world.spawn();
+      world.insert(
+        entity,
+        Value.create(Transform, {
+          translation: {
+            x,
+            y,
+          },
+        })
+      );
+      world.insert(entity, globalTransform);
+      world.insert(
+        entity,
+        Value.create(DamageRegion, {
+          size: {
+            x: width,
+            y: height,
+          },
+        })
+      );
+      world.insert(entity, Value.create(DamageRegionOwner, [owner]));
+      world.insert(
+        entity,
+        Value.create(Lifetime, {
+          lifetime: 1 / 60,
+        })
+      );
+    };
+
+    // Update items that are being held
+    //
+    // This section will make the item follow the player around and match the player's facing
+    // direction.
+    for (const { entity: itemEnt, components } of items) {
+      const [item, itemTransform, body, sprite] = components;
+      if (item.script != scriptPath) continue;
+
+      const state = Script.getEntityState<ItemState>(itemEnt, itemStateInit);
+
+      let parentComponents = parents.get(itemEnt);
+      // If this item isn't being held, skip the item
+      if (!parentComponents) continue;
+
+      const [parent] = parentComponents;
+      const [playerSprite, playerTransform] = players.get(parent[0]);
+
+      // Deactivate item collision
+      body.is_deactivated = true;
+
+      // Set animation to default position if we aren't swinging
+      if (state.status != "swinging") {
+        sprite.start = 4;
+        sprite.end = 4;
+        sprite.index = 0;
+        sprite.repeat = false;
+      }
+
+      // Flip the sprite to match our player orientation
+      const flip = playerSprite.flip_x;
+      sprite.flip_x = flip;
+      const flipFactor = flip ? -1 : 1;
+      // Align the sprite with the player's position
+      itemTransform.translation = Value.create(Vec3, {
+        x: 13 * (flip ? -1 : 1),
+        y: 21,
+      });
+
+      // If we're swinging the weapon
+      if (state.status == "swinging") {
+        // If we are at the end of the swing animation
+        if (sprite.index >= sprite.end - sprite.start - 1) {
+          // Go to cooldown frames
+          Script.setEntityState<ItemState>(itemEnt, {
+            status: "cooldown",
+            frame: 0,
+          });
+
+          // Set the current attack frame to the animation frame index
+        } else {
+          state.frame = sprite.index;
+        }
+
+        // Trigger frame collisions for each sword animation position
+        switch (state.frame) {
+          case 0:
+            spawnDamageRegion(
+              parent[0],
+              playerTransform.translation.x + 20 * flipFactor,
+              playerTransform.translation.y + 20,
+              30,
+              70
+            );
+            break;
+          case 1:
+            spawnDamageRegion(
+              parent[0],
+              playerTransform.translation.x + 25 * flipFactor,
+              playerTransform.translation.y + 20,
+              40,
+              50
+            );
+            break;
+          case 2:
+            spawnDamageRegion(
+              parent[0],
+              playerTransform.translation.x + 20 * flipFactor,
+              playerTransform.translation.y,
+              40,
+              50
+            );
+            break;
+        }
+
+        state.frame += 1;
+
+        // If we are in cooldown frames
+      } else if (state.status == "cooldown") {
+        // If cooldown frames have finished
+        if (state.frame >= COOLDOWN_FRAMES) {
+          // Go back to idle state
+          Script.setEntityState<ItemState>(itemEnt, { status: "idle" });
+        } else {
+          state.frame += 1;
+        }
+      }
+    }
+
+    // For every item that is being used
+    for (const event of Items.useEvents()) {
+      // Get the current item state
+      const state = Script.getEntityState<ItemState>(event.item, itemStateInit);
+
+      if (state.status == "idle") {
+        const [_item, _itemTransform, _body, sprite] = items.get(event.item);
+
+        // Start attacking animation
+        sprite.index = 0;
+        sprite.start = 8;
+        sprite.end = 12;
+
+        // And move to an attacking state
+        Script.setEntityState<ItemState>(event.item, {
+          status: "swinging",
+          frame: 0,
+        });
+      }
+    }
+
+    // Update dropped items
+    for (const event of Items.dropEvents()) {
+      const [_item, itemTransform, body, sprite] = items.get(event.item);
+
+      // Re-activate physics body on the item
+      body.is_deactivated = false;
+      // Put sword in rest position
+      sprite.start = 0;
+      sprite.end = 0;
+      // Make sure item maintains player velocity
+      body.velocity = event.velocity;
+      body.is_spawning = true;
+
+      // Drop item at the middle of the player
+      itemTransform.translation.y = event.position.y - 30;
+      itemTransform.translation.x = event.position.x;
+      itemTransform.translation.z = event.position.z;
+    }
+  },
+};
diff --git a/assets/map/elements/item/sword/sword_spawner.ts b/assets/map/elements/item/sword/sword_spawner.ts
new file mode 100644
index 0000000000..469d1363d7
--- /dev/null
+++ b/assets/map/elements/item/sword/sword_spawner.ts
@@ -0,0 +1,28 @@
+export default {
+  preUpdate() {
+    // Clients may not spawn items
+    if (NetInfo.get().is_client) return;
+
+    const spawnedEntities = MapElement.getSpawnedEntities();
+
+    // Handle newly spawned map entities
+    for (const spanwer_entity of spawnedEntities) {
+      const [transform, global_transform, computed_visibility] = world
+        .query(Transform, GlobalTransform, ComputedVisibility)
+        .get(spanwer_entity);
+
+      // Spawn a new entity for the sword and copy the transform and visibility from the map element
+      const entity = world.spawn();
+      world.insert(
+        entity,
+        Value.create(Item, {
+          script: Assets.getAbsolutePath("./sword.ts"),
+        })
+      );
+      world.insert(entity, transform);
+      world.insert(entity, global_transform);
+      world.insert(entity, computed_visibility);
+      world.insert(entity, Value.create(Visibility));
+    }
+  },
+};
diff --git a/assets/map/levels/lev01.map.json b/assets/map/levels/lev01.map.json
new file mode 100644
index 0000000000..8cf69f993f
--- /dev/null
+++ b/assets/map/levels/lev01.map.json
@@ -0,0 +1,1889 @@
+{
+  "name": "lev01",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    27,
+    21
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                20
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                20
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                17
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                8,
+                17
+              ],
+              "idx": 32
+            },
+            {
+              "pos": [
+                9,
+                17
+              ],
+              "idx": 34
+            },
+            {
+              "pos": [
+                17,
+                17
+              ],
+              "idx": 32
+            },
+            {
+              "pos": [
+                18,
+                17
+              ],
+              "idx": 34
+            },
+            {
+              "pos": [
+                25,
+                17
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                16
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                8,
+                16
+              ],
+              "idx": 39
+            },
+            {
+              "pos": [
+                9,
+                16
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                10,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                11,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                12,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                13,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                15,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                16,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                16
+              ],
+              "idx": 39
+            },
+            {
+              "pos": [
+                18,
+                16
+              ],
+              "idx": 41
+            },
+            {
+              "pos": [
+                25,
+                16
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                15
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                7,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                15
+              ],
+              "idx": 46
+            },
+            {
+              "pos": [
+                9,
+                15
+              ],
+              "idx": 48
+            },
+            {
+              "pos": [
+                17,
+                15
+              ],
+              "idx": 46
+            },
+            {
+              "pos": [
+                18,
+                15
+              ],
+              "idx": 48
+            },
+            {
+              "pos": [
+                19,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                15
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                2,
+                14
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                24,
+                14
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                2,
+                11
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                3,
+                11
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                4,
+                11
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                11
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                21,
+                11
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                22,
+                11
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                23,
+                11
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                24,
+                11
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                11,
+                10
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                12,
+                10
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                10
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                10
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                10
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                25,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                11,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                12,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                7,
+                8
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                9,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                11,
+                8
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                12,
+                8
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                13,
+                8
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                14,
+                8
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                15,
+                8
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                16,
+                8
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                8
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                7
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                7
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                6
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                6
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                5
+              ],
+              "idx": 20
+            },
+            {
+              "pos": [
+                2,
+                5
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                3,
+                5
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                4,
+                5
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                22,
+                5
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                23,
+                5
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                24,
+                5
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                25,
+                5
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                26,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                10,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                12,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                22,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                24,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                25,
+                2
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                26,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                9,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                12,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                13,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                16,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                17,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                25,
+                0
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 15
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                434.74872000000005,
+                361.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                84.00005999999999,
+                201.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                787.7431999999999,
+                201.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                90.666664,
+                121.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                776,
+                121.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                672,
+                121.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                192,
+                121.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                448,
+                121.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                437.2876,
+                377.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                608,
+                313.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                441.66668000000004,
+                569.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                256,
+                313.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                291.83331999999996,
+                601.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                777.6371999999999,
+                409.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                576,
+                601.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                88,
+                409.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                536,
+                309.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                292.22720000000004,
+                609.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                552,
+                289.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                496,
+                545.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                184,
+                155.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                772.4570000000001,
+                425.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                312.0556,
+                311.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                132.024688,
+                121.5
+              ],
+              "element": "../elements/item/machine_gun/machine_gun.element.yaml"
+            },
+            {
+              "pos": [
+                561,
+                599.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                272,
+                593.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                171.57139999999998,
+                409.5
+              ],
+              "element": "../elements/item/kick_bomb/kick_bomb.element.yaml"
+            },
+            {
+              "pos": [
+                712,
+                393.5
+              ],
+              "element": "../elements/item/mines/mines.element.yaml"
+            },
+            {
+              "pos": [
+                720.9998,
+                121.5
+              ],
+              "element": "../elements/item/cannon/cannon.element.yaml"
+            },
+            {
+              "pos": [
+                312,
+                105.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                576,
+                105.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                268.33334,
+                640
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                124.16667,
+                224.50002999999998
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                701.74677,
+                225.11905000000002
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                559.6667,
+                640
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/lev02.map.json b/assets/map/levels/lev02.map.json
new file mode 100644
index 0000000000..2c0e52501e
--- /dev/null
+++ b/assets/map/levels/lev02.map.json
@@ -0,0 +1,1511 @@
+{
+  "name": "lev02",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    27,
+    21
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                20
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                20
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                20
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                20
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                18
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                7,
+                18
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                8,
+                18
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                9,
+                18
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                18
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                11,
+                18
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                17
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                17,
+                17
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                18,
+                17
+              ],
+              "idx": 25
+            },
+            {
+              "pos": [
+                19,
+                17
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                20,
+                17
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                21,
+                17
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                22,
+                17
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                26,
+                17
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                16,
+                16
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                17,
+                16
+              ],
+              "idx": 45
+            },
+            {
+              "pos": [
+                18,
+                16
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                26,
+                16
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                2,
+                15
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                3,
+                15
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                4,
+                15
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                5,
+                15
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                6,
+                15
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                7,
+                15
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                8,
+                15
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                9,
+                15
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                10,
+                15
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                14,
+                15
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                15,
+                15
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                16,
+                15
+              ],
+              "idx": 19
+            },
+            {
+              "pos": [
+                17,
+                15
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                24,
+                15
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                2,
+                12
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                23,
+                12
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                24,
+                12
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                25,
+                12
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                26,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                11
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                11
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                25,
+                11
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                26,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                10
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                10
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                25,
+                10
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                26,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                2,
+                9
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                9
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                9
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                23,
+                9
+              ],
+              "idx": 39
+            },
+            {
+              "pos": [
+                24,
+                9
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                25,
+                9
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                26,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                8
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                8
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                25,
+                8
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                26,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                7
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                12,
+                7
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                13,
+                7
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                7
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                23,
+                7
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                7
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                25,
+                7
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                26,
+                7
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                6
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                6
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                2,
+                6
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                23,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                6
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                25,
+                6
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                26,
+                6
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                5
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                7,
+                5
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                5
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                9,
+                5
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                23,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                5
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                25,
+                5
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                26,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                22,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                23,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                4
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                25,
+                4
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                26,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                2,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                3,
+                3
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                20,
+                3
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                21,
+                3
+              ],
+              "idx": 28
+            },
+            {
+              "pos": [
+                22,
+                3
+              ],
+              "idx": 29
+            },
+            {
+              "pos": [
+                23,
+                3
+              ],
+              "idx": 39
+            },
+            {
+              "pos": [
+                24,
+                3
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                25,
+                3
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                26,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                22,
+                2
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                23,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                2
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                25,
+                2
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                26,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 28
+            },
+            {
+              "pos": [
+                16,
+                1
+              ],
+              "idx": 29
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 28
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 29
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                1
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                25,
+                1
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                26,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                0
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 35
+            },
+            {
+              "pos": [
+                16,
+                0
+              ],
+              "idx": 36
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 39
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 40
+            },
+            {
+              "pos": [
+                25,
+                0
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 7
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                792,
+                441.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                56,
+                153.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                238.5,
+                537.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                480,
+                537.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                709.8334,
+                185.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                272,
+                217.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                517.09736,
+                121.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                56,
+                345.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                593.0972999999999,
+                345.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                654.43066,
+                601.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                828.2152000000001,
+                535.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                432,
+                265.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                629.8823199999999,
+                585.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                154.72724,
+                521.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                272,
+                231.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                794.5715399999999,
+                441.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                232.00011999999998,
+                545.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                600,
+                593.5
+              ],
+              "element": "../elements/item/sniper_rifle/sniper_rifle.element.yaml"
+            },
+            {
+              "pos": [
+                64,
+                425.5
+              ],
+              "element": "../elements/item/mines/mines.element.yaml"
+            },
+            {
+              "pos": [
+                592,
+                349.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                230.33337999999998,
+                209.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                727.3334,
+                169.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                162.37097999999997,
+                49.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                423.3406,
+                283.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                296,
+                617.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                98.210815,
+                149.42273
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                271.61115,
+                538.24544
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                787.6791,
+                444.16577
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                650.2078,
+                181.11685
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/lev03.map.json b/assets/map/levels/lev03.map.json
new file mode 100644
index 0000000000..f0ec82174f
--- /dev/null
+++ b/assets/map/levels/lev03.map.json
@@ -0,0 +1,6137 @@
+{
+  "name": "lev03",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    35,
+    35
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                34
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                34
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                22,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                34
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                33
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                33
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                22,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                33
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                32
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                6,
+                32
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                7,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                32
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                32
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                22,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                32
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                26,
+                32
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                27,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                32
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                31
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                6,
+                31
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                7,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                31
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                31
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                22,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                31
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                26,
+                31
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                27,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                31
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                30
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                10,
+                30
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                11,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                30
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                30
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                22,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                30
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                29
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                10,
+                29
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                11,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                29
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                29
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                22,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                29
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                33,
+                29
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                34,
+                29
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                28
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                28
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                22,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                28
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                33,
+                28
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                34,
+                28
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                27
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                6,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                7,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                8,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                9,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                10,
+                27
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                11,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                12,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                13,
+                27
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                21,
+                27
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                22,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                23,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                24,
+                27
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                25,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                26,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                27,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                28,
+                27
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                29,
+                27
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                30,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                27
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                26
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                26
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                26
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                25,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                26
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                26
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                25
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                25
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                25
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                25,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                25
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                24
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                3,
+                24
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                4,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                24
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                24
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                24
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                25,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                24
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                23
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                3,
+                23
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                4,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                23
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                23
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                24,
+                23
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                25,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                23
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                22
+              ],
+              "idx": 20
+            },
+            {
+              "pos": [
+                6,
+                22
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                7,
+                22
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                22
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                22
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                10,
+                22
+              ],
+              "idx": 48
+            },
+            {
+              "pos": [
+                24,
+                22
+              ],
+              "idx": 46
+            },
+            {
+              "pos": [
+                25,
+                22
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                26,
+                22
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                27,
+                22
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                28,
+                22
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                29,
+                22
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                30,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                21
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                16,
+                21
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                17,
+                21
+              ],
+              "idx": 3
+            },
+            {
+              "pos": [
+                18,
+                21
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                29,
+                21
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                20
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                15,
+                20
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                16,
+                20
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                17,
+                20
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                18,
+                20
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                19,
+                20
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                29,
+                20
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                14,
+                19
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                15,
+                19
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                16,
+                19
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                17,
+                19
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                18,
+                19
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                19,
+                19
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                20,
+                19
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                29,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                18
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                14,
+                18
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                15,
+                18
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                16,
+                18
+              ],
+              "idx": 44
+            },
+            {
+              "pos": [
+                17,
+                18
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                18,
+                18
+              ],
+              "idx": 45
+            },
+            {
+              "pos": [
+                19,
+                18
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                20,
+                18
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                21,
+                18
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                29,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                17
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                17
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                7,
+                17
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                8,
+                17
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                9,
+                17
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                10,
+                17
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                11,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                13,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                14,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                15,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                16,
+                17
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                17,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                17
+              ],
+              "idx": 20
+            },
+            {
+              "pos": [
+                19,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                21,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                22,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                17
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                25,
+                17
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                26,
+                17
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                27,
+                17
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                28,
+                17
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                29,
+                17
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                16
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                16
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                14,
+                16
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                15,
+                16
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                16,
+                16
+              ],
+              "idx": 45
+            },
+            {
+              "pos": [
+                17,
+                16
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                18,
+                16
+              ],
+              "idx": 44
+            },
+            {
+              "pos": [
+                19,
+                16
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                20,
+                16
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                21,
+                16
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                29,
+                16
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                15
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                2,
+                15
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                3,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                14,
+                15
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                15,
+                15
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                16,
+                15
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                17,
+                15
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                18,
+                15
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                19,
+                15
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                20,
+                15
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                29,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                15
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                33,
+                15
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                34,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                14
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                2,
+                14
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                3,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                15,
+                14
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                16,
+                14
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                17,
+                14
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                18,
+                14
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                19,
+                14
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                29,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                14
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                33,
+                14
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                34,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                13
+              ],
+              "idx": 20
+            },
+            {
+              "pos": [
+                6,
+                13
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                7,
+                13
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                8,
+                13
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                9,
+                13
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                10,
+                13
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                16,
+                13
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                17,
+                13
+              ],
+              "idx": 17
+            },
+            {
+              "pos": [
+                18,
+                13
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                24,
+                13
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                25,
+                13
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                26,
+                13
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                27,
+                13
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                28,
+                13
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                29,
+                13
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                30,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                9
+              ],
+              "idx": 20
+            },
+            {
+              "pos": [
+                6,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                7,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                9
+              ],
+              "idx": 34
+            },
+            {
+              "pos": [
+                10,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                11,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                12,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                13,
+                9
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                21,
+                9
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                22,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                23,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                24,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                25,
+                9
+              ],
+              "idx": 32
+            },
+            {
+              "pos": [
+                26,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                27,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                28,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                29,
+                9
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                30,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                8
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                25,
+                8
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                26,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                7
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                6,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                7
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                10,
+                7
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                24,
+                7
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                25,
+                7
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                26,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                27,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                28,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                29,
+                7
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                30,
+                7
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                31,
+                7
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                32,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                6
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                7,
+                6
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                8,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                6
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                24,
+                6
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                25,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                6
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                31,
+                6
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                32,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                5
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                7,
+                5
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                8,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                5
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                11,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                12,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                5
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                20,
+                5
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                21,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                22,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                24,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                25,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                3
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                26,
+                3
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                27,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                2
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                10,
+                2
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                11,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                2
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                26,
+                2
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                27,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                1
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                10,
+                1
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                11,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                0
+              ],
+              "idx": 8
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                720,
+                217.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                808.5,
+                345.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                266.5,
+                473.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                896,
+                761.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                560,
+                729.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                832,
+                761.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                288,
+                761.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                407.33331999999996,
+                217.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                395.16668000000004,
+                601.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                880,
+                601.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                224,
+                761.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                800,
+                273.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                248.51263999999998,
+                329.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                872,
+                337.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                376,
+                641.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                808,
+                587.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                256,
+                481.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                249.27784000000003,
+                801.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                869.5455400000001,
+                793.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                792,
+                377.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                543.6886,
+                713.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                552,
+                745.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                450.66668000000004,
+                249.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                301.33331999999996,
+                623.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                896,
+                625.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                746.6666,
+                257.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                255.66667,
+                351.3333
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                367.83334,
+                611.83334
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                864.6515,
+                352.1667
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                751,
+                608.33334
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/lev04.map.json b/assets/map/levels/lev04.map.json
new file mode 100644
index 0000000000..34a5cc6e45
--- /dev/null
+++ b/assets/map/levels/lev04.map.json
@@ -0,0 +1,1885 @@
+{
+  "name": "lev04",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    35,
+    15
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                9,
+                12
+              ],
+              "idx": 32
+            },
+            {
+              "pos": [
+                10,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                11,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                12
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                13,
+                12
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                15,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                16,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                21,
+                12
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                22,
+                12
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                23,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                25,
+                12
+              ],
+              "idx": 34
+            },
+            {
+              "pos": [
+                33,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                9,
+                11
+              ],
+              "idx": 17
+            },
+            {
+              "pos": [
+                25,
+                11
+              ],
+              "idx": 17
+            },
+            {
+              "pos": [
+                33,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 20
+            },
+            {
+              "pos": [
+                33,
+                10
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                34,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                2,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                3,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                4,
+                9
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                30,
+                9
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                31,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                32,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                33,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                7
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                14,
+                7
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                15,
+                7
+              ],
+              "idx": 45
+            },
+            {
+              "pos": [
+                16,
+                7
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                7
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                7
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                7
+              ],
+              "idx": 44
+            },
+            {
+              "pos": [
+                20,
+                7
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                33,
+                7
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                6
+              ],
+              "idx": 20
+            },
+            {
+              "pos": [
+                2,
+                6
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                3,
+                6
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                4,
+                6
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                5,
+                6
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                6,
+                6
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                13,
+                6
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                14,
+                6
+              ],
+              "idx": 45
+            },
+            {
+              "pos": [
+                15,
+                6
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                19,
+                6
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                20,
+                6
+              ],
+              "idx": 44
+            },
+            {
+              "pos": [
+                21,
+                6
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                28,
+                6
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                29,
+                6
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                30,
+                6
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                31,
+                6
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                32,
+                6
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                33,
+                6
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                34,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                12,
+                5
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                13,
+                5
+              ],
+              "idx": 45
+            },
+            {
+              "pos": [
+                14,
+                5
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                20,
+                5
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                21,
+                5
+              ],
+              "idx": 44
+            },
+            {
+              "pos": [
+                22,
+                5
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                33,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                11,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                12,
+                4
+              ],
+              "idx": 45
+            },
+            {
+              "pos": [
+                13,
+                4
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                21,
+                4
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                22,
+                4
+              ],
+              "idx": 44
+            },
+            {
+              "pos": [
+                23,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                33,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                11,
+                3
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                12,
+                3
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                13,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                22,
+                3
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                23,
+                3
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                33,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                34,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                2
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 37
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 33
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                7,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                10,
+                2
+              ],
+              "idx": 33
+            },
+            {
+              "pos": [
+                11,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                2
+              ],
+              "idx": 33
+            },
+            {
+              "pos": [
+                13,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                17,
+                2
+              ],
+              "idx": 33
+            },
+            {
+              "pos": [
+                18,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                22,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                25,
+                2
+              ],
+              "idx": 33
+            },
+            {
+              "pos": [
+                26,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                27,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                28,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                29,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                30,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                31,
+                2
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                32,
+                2
+              ],
+              "idx": 33
+            },
+            {
+              "pos": [
+                33,
+                2
+              ],
+              "idx": 38
+            },
+            {
+              "pos": [
+                34,
+                2
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                0,
+                1
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 3
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 20
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                1
+              ],
+              "idx": 3
+            },
+            {
+              "pos": [
+                11,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                1
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                13,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                1
+              ],
+              "idx": 3
+            },
+            {
+              "pos": [
+                18,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                1
+              ],
+              "idx": 3
+            },
+            {
+              "pos": [
+                26,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                1
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                30,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                1
+              ],
+              "idx": 3
+            },
+            {
+              "pos": [
+                33,
+                1
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                34,
+                1
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                0,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                0
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                13,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 20
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 13
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                0
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                30,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                33,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                34,
+                0
+              ],
+              "idx": 8
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                984.5712799999999,
+                247.5
+              ],
+              "element": "../elements/item/sniper_rifle/sniper_rifle.element.yaml"
+            },
+            {
+              "pos": [
+                107.42859999999999,
+                225.5
+              ],
+              "element": "../elements/item/blunderbass/blunderbass.element.yaml"
+            },
+            {
+              "pos": [
+                560,
+                271.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                480,
+                427.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                888,
+                139.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                88,
+                353.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                896,
+                121.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                496,
+                121.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                1000,
+                121.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                288,
+                121.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                112,
+                121.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                736.3635999999999,
+                441.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                96,
+                345.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                328,
+                441.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                968,
+                257.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                120.40002000000001,
+                129.5
+              ],
+              "element": "../elements/item/crate/crate.element.yaml"
+            },
+            {
+              "pos": [
+                1024,
+                137.5
+              ],
+              "element": "../elements/item/crate/crate.element.yaml"
+            },
+            {
+              "pos": [
+                111.40014,
+                337.5
+              ],
+              "element": "../elements/item/crate/crate.element.yaml"
+            },
+            {
+              "pos": [
+                1043.9714,
+                329.5
+              ],
+              "element": "../elements/item/crate/crate.element.yaml"
+            },
+            {
+              "pos": [
+                392,
+                433.5
+              ],
+              "element": "../elements/item/crate/crate.element.yaml"
+            },
+            {
+              "pos": [
+                677.2236,
+                433.5
+              ],
+              "element": "../elements/item/crate/crate.element.yaml"
+            },
+            {
+              "pos": [
+                616,
+                111.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                808,
+                463.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                536.1025999999999,
+                441.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                884,
+                145.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                277.7143,
+                121.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                800,
+                425.5
+              ],
+              "element": "../elements/item/mines/mines.element.yaml"
+            },
+            {
+              "pos": [
+                564.9702,
+                105.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                176.83333,
+                120.83334000000002
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                947,
+                119.33334000000002
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                137.42857,
+                346.71428000000003
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                973.857,
+                347.85715
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/lev05.map.json b/assets/map/levels/lev05.map.json
new file mode 100644
index 0000000000..f676429f07
--- /dev/null
+++ b/assets/map/levels/lev05.map.json
@@ -0,0 +1,1748 @@
+{
+  "name": "lev05",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    45,
+    15
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                9,
+                12
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                10,
+                12
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                11,
+                12
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                12,
+                12
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                13,
+                12
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                14,
+                12
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                15,
+                12
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                16,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                17,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                18,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                12
+              ],
+              "idx": 34
+            },
+            {
+              "pos": [
+                25,
+                12
+              ],
+              "idx": 32
+            },
+            {
+              "pos": [
+                26,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                27,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                28,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                29,
+                12
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                30,
+                12
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                31,
+                12
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                32,
+                12
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                33,
+                12
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                34,
+                12
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                35,
+                12
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                17,
+                11
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                18,
+                11
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                19,
+                11
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                25,
+                11
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                26,
+                11
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                27,
+                11
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                2,
+                10
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                3,
+                10
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                4,
+                10
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                18,
+                10
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                19,
+                10
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                25,
+                10
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                26,
+                10
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                40,
+                10
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                41,
+                10
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                42,
+                10
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                2,
+                9
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                9
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                4,
+                9
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                19,
+                9
+              ],
+              "idx": 46
+            },
+            {
+              "pos": [
+                20,
+                9
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                21,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                22,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                23,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                24,
+                9
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                25,
+                9
+              ],
+              "idx": 48
+            },
+            {
+              "pos": [
+                40,
+                9
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                9
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                42,
+                9
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                2,
+                8
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                8
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                4,
+                8
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                40,
+                8
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                8
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                42,
+                8
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                2,
+                7
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                7
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                4,
+                7
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                8,
+                7
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                9,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                10,
+                7
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                34,
+                7
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                35,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                36,
+                7
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                40,
+                7
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                7
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                42,
+                7
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                2,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                6
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                4,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                8,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                9,
+                6
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                10,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                34,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                35,
+                6
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                36,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                40,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                6
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                42,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                2,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                5
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                4,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                8,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                9,
+                5
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                10,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                34,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                35,
+                5
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                36,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                40,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                5
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                42,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                2,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                4
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                4,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                8,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                9,
+                4
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                10,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                14,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                15,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                20,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                21,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                22,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                24,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                28,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                29,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                30,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                34,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                35,
+                4
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                36,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                40,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                4
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                42,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                2,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                3
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                4,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                8,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                9,
+                3
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                10,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                14,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                15,
+                3
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                16,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                20,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                3
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                22,
+                3
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                23,
+                3
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                24,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                28,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                29,
+                3
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                30,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                34,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                35,
+                3
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                36,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                40,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                3
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                42,
+                3
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                8,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                9,
+                2
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                10,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                22,
+                2
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                23,
+                2
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                24,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                28,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                29,
+                2
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                30,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                34,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                35,
+                2
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                36,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                40,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                2
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                42,
+                2
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                9,
+                1
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                10,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                16,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                20,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                28,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                29,
+                1
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                30,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                34,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                35,
+                1
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                36,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                40,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                1
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                42,
+                1
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                9,
+                0
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                16,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                28,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                29,
+                0
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                30,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                34,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                35,
+                0
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                36,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                40,
+                0
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                41,
+                0
+              ],
+              "idx": 27
+            },
+            {
+              "pos": [
+                42,
+                0
+              ],
+              "idx": 10
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                723.2670800000001,
+                169.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                664,
+                185.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                1357,
+                377.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                776.3334,
+                345.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                496,
+                185.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                1008,
+                441.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                104,
+                377.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                328,
+                441.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                1136.3332,
+                281.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                859.96912,
+                437.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                952,
+                185.5
+              ],
+              "element": "../elements/item/kick_bomb/kick_bomb.element.yaml"
+            },
+            {
+              "pos": [
+                376,
+                437.5
+              ],
+              "element": "../elements/item/sniper_rifle/sniper_rifle.element.yaml"
+            },
+            {
+              "pos": [
+                1104.6666,
+                441.5
+              ],
+              "element": "../elements/item/cannon/cannon.element.yaml"
+            },
+            {
+              "pos": [
+                918.5881400000001,
+                427.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                461.2156,
+                429.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                1012.6668,
+                449.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                740,
+                335.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                496,
+                203.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                480.72724000000005,
+                169.5
+              ],
+              "element": "../elements/item/mines/mines.element.yaml"
+            },
+            {
+              "pos": [
+                686.0571199999999,
+                329.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                1123,
+                273.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                579.6668,
+                433.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                907,
+                433.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                288,
+                273.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                114.5,
+                399
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                1334.3334,
+                399
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/lev06.map.json b/assets/map/levels/lev06.map.json
new file mode 100644
index 0000000000..5d1439b354
--- /dev/null
+++ b/assets/map/levels/lev06.map.json
@@ -0,0 +1,1737 @@
+{
+  "name": "lev06",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    25,
+    20
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                1,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                2,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                3,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                4,
+                17
+              ],
+              "idx": 34
+            },
+            {
+              "pos": [
+                10,
+                17
+              ],
+              "idx": 32
+            },
+            {
+              "pos": [
+                11,
+                17
+              ],
+              "idx": 34
+            },
+            {
+              "pos": [
+                12,
+                17
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                17
+              ],
+              "idx": 32
+            },
+            {
+              "pos": [
+                14,
+                17
+              ],
+              "idx": 34
+            },
+            {
+              "pos": [
+                20,
+                17
+              ],
+              "idx": 32
+            },
+            {
+              "pos": [
+                21,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                22,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                17
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                16
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                5,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                7,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                9,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                16
+              ],
+              "idx": 46
+            },
+            {
+              "pos": [
+                11,
+                16
+              ],
+              "idx": 48
+            },
+            {
+              "pos": [
+                12,
+                16
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                13,
+                16
+              ],
+              "idx": 46
+            },
+            {
+              "pos": [
+                14,
+                16
+              ],
+              "idx": 48
+            },
+            {
+              "pos": [
+                15,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                16,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                16
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                15
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                2,
+                15
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                3,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                15
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                20,
+                15
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                15
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                24,
+                15
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                14
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                2,
+                14
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                3,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                14
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                20,
+                14
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                14
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                24,
+                14
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                13
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                20,
+                13
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                13
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                22,
+                13
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                23,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                1,
+                12
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                2,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                12
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                5,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                7,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                12
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                16,
+                12
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                12
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                12
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                22,
+                12
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                23,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                1,
+                11
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                2,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                11
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                20,
+                11
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                10
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                3,
+                10
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                4,
+                10
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                11,
+                10
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                12,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                13,
+                10
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                10
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                10
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                23,
+                10
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                24,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                9
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                3,
+                9
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                4,
+                9
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                20,
+                9
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                21,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                9
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                23,
+                9
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                24,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                1,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                2,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                3,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                4,
+                8
+              ],
+              "idx": 48
+            },
+            {
+              "pos": [
+                5,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                7,
+                8
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                8
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                8
+              ],
+              "idx": 46
+            },
+            {
+              "pos": [
+                21,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                22,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                6
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                6
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                6
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                15,
+                6
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                1,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                2,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                3,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                4,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                18,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                19,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                22,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                18,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                19,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                18,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                19,
+                2
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                22,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                18,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                19,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                12,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                0
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 9
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                743.6666,
+                377.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                585.2456,
+                441.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                400,
+                377.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                96,
+                377.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                396,
+                601.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                200,
+                569.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                677.3334,
+                185.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                97.333328,
+                185.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                760,
+                585.5
+              ],
+              "element": "../elements/item/crate/crate.element.yaml"
+            },
+            {
+              "pos": [
+                221.48572000000001,
+                319.5
+              ],
+              "element": "../elements/item/kick_bomb/kick_bomb.element.yaml"
+            },
+            {
+              "pos": [
+                179.0589,
+                425.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                630.4404,
+                425.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                599.3334,
+                297.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                403,
+                395.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                192,
+                587.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                664,
+                203.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                282.00012000000004,
+                559.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                562.7273,
+                553.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                251.57886000000002,
+                431.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                56,
+                593.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                708,
+                177.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                152.00006000000002,
+                177.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                477.3334,
+                585.5
+              ],
+              "element": "../elements/item/mines/mines.element.yaml"
+            },
+            {
+              "pos": [
+                401.64703999999995,
+                41.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                161.33333,
+                186
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                641.3333,
+                184
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                671.6667,
+                604.3333333
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                129.33333,
+                606
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/lev07.map.json b/assets/map/levels/lev07.map.json
new file mode 100644
index 0000000000..2d772d6d69
--- /dev/null
+++ b/assets/map/levels/lev07.map.json
@@ -0,0 +1,2239 @@
+{
+  "name": "lev07",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    27,
+    22
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                20
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                1,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                2,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                3,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                4,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                5,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                6,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                7,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                8,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                9,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                10,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                11,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                12,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                13,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                14,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                15,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                16,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                17,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                18,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                19,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                20,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                21,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                22,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                23,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                24,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                25,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                26,
+                20
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                0,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                2,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                3,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                4,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                7,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                9,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                11,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                12,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                13,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                15,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                16,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                21,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                22,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                23,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                24,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                19
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                17
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                17
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                16
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                13
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                2,
+                13
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                13
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                7,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                10,
+                13
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                16,
+                13
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                17,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                18,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                13
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                24,
+                13
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                13
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                2,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                3,
+                10
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                23,
+                10
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                24,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                8
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                7,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                9,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                11,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                12,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                13,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                15,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                16,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                8
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                7
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                7
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                6
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                1,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                2,
+                6
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                24,
+                6
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                25,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                26,
+                6
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                0,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                5
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                3,
+                5
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                23,
+                5
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                24,
+                5
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                25,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                24,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                3
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                4,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                10,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                12,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                22,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                3
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                24,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 8
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                48,
+                233.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                820,
+                233.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                792,
+                249.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                48,
+                249.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                312,
+                153.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                312,
+                473.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                248,
+                473.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                600,
+                473.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                536,
+                153.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                65.399994,
+                471.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                824,
+                469.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                441.41045999999994,
+                143.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                310.07714,
+                203.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                528,
+                203.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                304,
+                525.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                592,
+                513.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                560,
+                299.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                296,
+                303.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                568,
+                137.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                328.11425999999994,
+                145.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                416,
+                369.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                568,
+                483.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                308,
+                479.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                253.37262,
+                487.27
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                572.10425,
+                478.44417999999996
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                195.5694,
+                173.61493000000002
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                628.5847,
+                161.02252
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/test_level.map.json b/assets/map/levels/test_level.map.json
new file mode 100644
index 0000000000..de3756c350
--- /dev/null
+++ b/assets/map/levels/test_level.map.json
@@ -0,0 +1,1845 @@
+{
+  "name": "test_level",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    31,
+    23
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                22
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                30,
+                22
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                21
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                30,
+                21
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                20
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                4,
+                20
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                20
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                7,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                10,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                11,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                13,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                14,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                15,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                16,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                17,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                18,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                21,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                22,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                20
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                25,
+                20
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                20
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                30,
+                20
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                30,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                30,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                17
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                30,
+                17
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                4,
+                16
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                7,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                10,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                11,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                13,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                14,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                15,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                16,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                17,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                18,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                21,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                22,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                16
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                25,
+                16
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                16
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                30,
+                16
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                30,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                30,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                30,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                4,
+                12
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                7,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                10,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                11,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                13,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                14,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                15,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                16,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                17,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                18,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                21,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                22,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                12
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                25,
+                12
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                12
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                30,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                30,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                29,
+                10
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                30,
+                10
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                4,
+                8
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                7,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                10,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                11,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                13,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                14,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                15,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                16,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                17,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                18,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                21,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                22,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                8
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                25,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                8
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                29,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                7
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                7
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                6
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                6
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                4,
+                4
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                4
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                7,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                10,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                11,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                13,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                14,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                15,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                16,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                17,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                18,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                21,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                22,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                4
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                25,
+                4
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                4
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                29,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                29,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                30,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                12,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                25,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                27,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                28,
+                0
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                29,
+                0
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                30,
+                0
+              ],
+              "idx": 8
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                336,
+                441.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                667.6116999999999,
+                441.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                813.7638,
+                43.5
+              ],
+              "element": "../elements/item/starfish_launcher/starfish_launcher.element.yaml"
+            },
+            {
+              "pos": [
+                336,
+                97.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                488,
+                223.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                653.7488000000001,
+                465.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                505.7092,
+                555.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                661.04712,
+                303.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                433.38,
+                427.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                624,
+                425.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                544,
+                49.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                732.7508,
+                425.5
+              ],
+              "element": "../elements/item/trident/trident.element.yaml"
+            },
+            {
+              "pos": [
+                550.0372,
+                305.5
+              ],
+              "element": "../elements/item/crown_hat/crown_hat.element.yaml"
+            },
+            {
+              "pos": [
+                328,
+                325.5
+              ],
+              "element": "../elements/item/cowboy_hat/cowboy_hat.element.yaml"
+            },
+            {
+              "pos": [
+                451,
+                345.5
+              ],
+              "element": "../elements/item/chest_hat/chest_hat.element.yaml"
+            },
+            {
+              "pos": [
+                752,
+                153.5
+              ],
+              "element": "../elements/item/chefs_hat/chefs_hat.element.yaml"
+            },
+            {
+              "pos": [
+                680,
+                169.5
+              ],
+              "element": "../elements/item/bucket_hat/bucket_hat.element.yaml"
+            },
+            {
+              "pos": [
+                361,
+                179.5
+              ],
+              "element": "../elements/item/pirate_hat/pirate_hat.element.yaml"
+            },
+            {
+              "pos": [
+                80,
+                41.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                48,
+                361.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                913.75,
+                41.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                944,
+                361.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                200,
+                209.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                208,
+                585.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                208,
+                459.5
+              ],
+              "element": "../elements/item/turtle_shell/turtle_shell.element.yaml"
+            },
+            {
+              "pos": [
+                208,
+                329.5
+              ],
+              "element": "../elements/item/machine_gun/machine_gun.element.yaml"
+            },
+            {
+              "pos": [
+                793.3334,
+                669.5
+              ],
+              "element": "../elements/item/cannon/cannon.element.yaml"
+            },
+            {
+              "pos": [
+                804,
+                315.5
+              ],
+              "element": "../elements/item/mines/mines.element.yaml"
+            },
+            {
+              "pos": [
+                445.77790000000005,
+                51.5
+              ],
+              "element": "../elements/item/sniper_rifle/sniper_rifle.element.yaml"
+            },
+            {
+              "pos": [
+                792,
+                161.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                624,
+                57.5
+              ],
+              "element": "../elements/item/kick_bomb/kick_bomb.element.yaml"
+            },
+            {
+              "pos": [
+                200,
+                57.5
+              ],
+              "element": "../elements/item/blunderbuss/blunderbuss.element.yaml"
+            },
+            {
+              "pos": [
+                303.9424,
+                183.5
+              ],
+              "element": "../elements/item/crate/crate.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                255.66667,
+                63
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                715.6667,
+                64.33330000000001
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/zyrafa01.map.json b/assets/map/levels/zyrafa01.map.json
new file mode 100644
index 0000000000..cbd8ca6b75
--- /dev/null
+++ b/assets/map/levels/zyrafa01.map.json
@@ -0,0 +1,1213 @@
+{
+  "name": "zyrafa01",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    27,
+    21
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                1,
+                16
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                25,
+                16
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                26,
+                16
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                1,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                1,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                1,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                1,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                25,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                1,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                7,
+                11
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                11
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                11
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                11
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                11,
+                10
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                12,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                13,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                15,
+                10
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                25,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                1,
+                9
+              ],
+              "idx": 18
+            },
+            {
+              "pos": [
+                2,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                3,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                4,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                5,
+                9
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                21,
+                9
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                22,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                23,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                24,
+                9
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                25,
+                9
+              ],
+              "idx": 19
+            },
+            {
+              "pos": [
+                26,
+                9
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                9,
+                7
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                7
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                11,
+                7
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                7
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                13,
+                7
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                14,
+                7
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                15,
+                7
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                16,
+                7
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                17,
+                7
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                6,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                10,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                12,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                5,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                6,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                10,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                12,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                9,
+                1
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                10,
+                1
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                11,
+                1
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                12,
+                1
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                13,
+                1
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                16,
+                1
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                17,
+                1
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                18,
+                1
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                19,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 9
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                344,
+                185.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                152,
+                345.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                760,
+                345.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                376,
+                281.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                664,
+                185.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                728,
+                341.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                97,
+                345.5
+              ],
+              "element": "../elements/item/kick_bomb/kick_bomb.element.yaml"
+            },
+            {
+              "pos": [
+                448,
+                209.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                440,
+                365.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                787.846,
+                345.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                656,
+                209.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                152.92298,
+                373.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                704,
+                345.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                271.76469999999995,
+                393.5
+              ],
+              "element": "../elements/item/mines/mines.element.yaml"
+            },
+            {
+              "pos": [
+                95.42862,
+                337.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                432,
+                169.5
+              ],
+              "element": "../elements/item/blunderbass/blunderbass.element.yaml"
+            },
+            {
+              "pos": [
+                616,
+                393.5
+              ],
+              "element": "../elements/item/mines/mines.element.yaml"
+            },
+            {
+              "pos": [
+                439.05884000000003,
+                361.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                128,
+                352
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                736,
+                352
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                256,
+                192
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                608,
+                192
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/zyrafa02.map.json b/assets/map/levels/zyrafa02.map.json
new file mode 100644
index 0000000000..81df1f5b0f
--- /dev/null
+++ b/assets/map/levels/zyrafa02.map.json
@@ -0,0 +1,2766 @@
+{
+  "name": "zyrafa02",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    23,
+    26
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                25
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                24
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                23
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                22
+              ],
+              "idx": 3
+            },
+            {
+              "pos": [
+                1,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                22
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                4,
+                22
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                5,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                6,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                7,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                8,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                9,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                10,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                11,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                12,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                13,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                14,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                15,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                16,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                17,
+                22
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                18,
+                22
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                19,
+                22
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                20,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                22
+              ],
+              "idx": 3
+            },
+            {
+              "pos": [
+                0,
+                21
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                21
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                3,
+                21
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                4,
+                21
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                18,
+                21
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                19,
+                21
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                20,
+                21
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                21,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                21
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                20
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                20
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                3,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                4,
+                20
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                18,
+                20
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                19,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                20,
+                20
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                21,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                20
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                19
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                19
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                18
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                18
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                17
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                17
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                17
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                17
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                16
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                16
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                16
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                7,
+                15
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                9,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                11,
+                15
+              ],
+              "idx": 24
+            },
+            {
+              "pos": [
+                12,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                13,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                15,
+                15
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                15
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                14
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                3,
+                13
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                4,
+                13
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                13
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                13
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                13
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                12
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                11
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                10
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                7,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                9,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                10
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                11,
+                10
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                12,
+                10
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                13,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                15,
+                10
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                16,
+                10
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                10
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                10,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                11,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                9
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                10,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                11,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                8
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                7
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                7
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                3,
+                7
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                4,
+                7
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                10,
+                7
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                11,
+                7
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                12,
+                7
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                18,
+                7
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                19,
+                7
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                20,
+                7
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                7
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                6
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                6
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                1,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                3,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                4,
+                5
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                18,
+                5
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                19,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                21,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                0,
+                4
+              ],
+              "idx": 17
+            },
+            {
+              "pos": [
+                1,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                4
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                3,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                4,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                10,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                12,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                4
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                21,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                4
+              ],
+              "idx": 17
+            },
+            {
+              "pos": [
+                0,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 8
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                440,
+                185.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                216,
+                185.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                376,
+                377.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                600,
+                217.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                120,
+                473.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                436.90920000000006,
+                363.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                373.33326,
+                513.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                381.99987999999996,
+                401.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                216.49993999999998,
+                209.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                264,
+                521.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                455.11120000000005,
+                521.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                232.22222,
+                367.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                488,
+                361.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                352,
+                177.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                128,
+                480
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                608,
+                480
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                128,
+                288
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                608,
+                288
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/zyrafa03.map.json b/assets/map/levels/zyrafa03.map.json
new file mode 100644
index 0000000000..09b50190ca
--- /dev/null
+++ b/assets/map/levels/zyrafa03.map.json
@@ -0,0 +1,2077 @@
+{
+  "name": "zyrafa03",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    27,
+    22
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                20
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                1,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                2,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                3,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                4,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                5,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                6,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                7,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                8,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                9,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                10,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                11,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                12,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                13,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                14,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                15,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                16,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                17,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                18,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                19,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                20,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                21,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                22,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                23,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                24,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                25,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                26,
+                20
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                0,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                2,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                3,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                4,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                5,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                6,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                7,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                8,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                9,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                10,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                11,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                12,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                13,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                14,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                15,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                16,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                17,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                18,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                19,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                20,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                21,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                22,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                23,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                24,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                25,
+                19
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                26,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                17
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                17
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                16
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                6,
+                13
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                7,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                8,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                9,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                10,
+                13
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                16,
+                13
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                17,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                18,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                13
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                13
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                26,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                2,
+                10
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                12,
+                10
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                13,
+                10
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                14,
+                10
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                24,
+                10
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                25,
+                10
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                26,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                7
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                7
+              ],
+              "idx": 3
+            },
+            {
+              "pos": [
+                26,
+                7
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                0,
+                6
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                1,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                2,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                3,
+                6
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                13,
+                6
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                23,
+                6
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                24,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                25,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                26,
+                6
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                0,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                5
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                3,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                5
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                23,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                24,
+                5
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                25,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                4
+              ],
+              "idx": 10
+            },
+            {
+              "pos": [
+                23,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                24,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                3
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                4,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                10,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                12,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                3
+              ],
+              "idx": 6
+            },
+            {
+              "pos": [
+                14,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                22,
+                3
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                3
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                24,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                2
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 8
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                52,
+                233.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                792,
+                249.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                88,
+                249.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                312,
+                153.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                312,
+                473.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                248,
+                473.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                600,
+                473.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                536,
+                153.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                607.8462,
+                481.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                313.81812,
+                491.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                528,
+                181.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                403.41186000000005,
+                137.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                468.28576,
+                137.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                822.3335,
+                233.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                568,
+                137.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                288,
+                143.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                416,
+                369.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                584.25,
+                465.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                308,
+                479.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                64,
+                384
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                800,
+                384
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                192,
+                160
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                672,
+                160
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/zyrafa04.map.json b/assets/map/levels/zyrafa04.map.json
new file mode 100644
index 0000000000..77dd5b02ee
--- /dev/null
+++ b/assets/map/levels/zyrafa04.map.json
@@ -0,0 +1,2980 @@
+{
+  "name": "zyrafa04",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    34,
+    23
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                0,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                22
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                22
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                22
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                14,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                22
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                22
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                22
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                22
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                21
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                3,
+                21
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                4,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                21
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                21
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                21
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                14,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                21
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                21
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                21
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                21
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                31,
+                21
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                32,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                21
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                20
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                20
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                20
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                14,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                20
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                16,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                17,
+                20
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                18,
+                20
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                19,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                20
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                20
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                20
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                20
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                19
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                4,
+                19
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                5,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                14,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                19
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                16,
+                19
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                19
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                19
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                19,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                19
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                19
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                19
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                30,
+                19
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                31,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                19
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                18
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                1,
+                18
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                2,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                14,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                18
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                18
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                18
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                18
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                33,
+                18
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                0,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                17
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                17
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                17
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                14,
+                17
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                15,
+                17
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                16,
+                17
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                17,
+                17
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                18,
+                17
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                19,
+                17
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                20,
+                17
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                26,
+                17
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                17
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                17
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                16
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                16
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                3,
+                16
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                4,
+                16
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                5,
+                16
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                6,
+                16
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                7,
+                16
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                26,
+                16
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                27,
+                16
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                28,
+                16
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                29,
+                16
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                30,
+                16
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                31,
+                16
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                32,
+                16
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                16
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                31,
+                15
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                15
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                15
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                31,
+                14
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                14
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                14
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                13
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                14,
+                13
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                15,
+                13
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                16,
+                13
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                17,
+                13
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                18,
+                13
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                19,
+                13
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                20,
+                13
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                31,
+                13
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                13
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                13
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                31,
+                12
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                12
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                12
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                31,
+                11
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                11
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                11
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                31,
+                10
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                10
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                10
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                3,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                4,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                5,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                6,
+                9
+              ],
+              "idx": 60
+            },
+            {
+              "pos": [
+                27,
+                9
+              ],
+              "idx": 56
+            },
+            {
+              "pos": [
+                28,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                29,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                30,
+                9
+              ],
+              "idx": 58
+            },
+            {
+              "pos": [
+                31,
+                9
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                9
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                9
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                31,
+                8
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                8
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                8
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                7
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                7
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                7
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                14,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                7
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                31,
+                7
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                7
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                7
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                6
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                6
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                6
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                14,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                6
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                31,
+                6
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                32,
+                6
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                2,
+                5
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                3,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                4,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                5
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                13,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                14,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                5
+              ],
+              "idx": 4
+            },
+            {
+              "pos": [
+                16,
+                5
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                17,
+                5
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                18,
+                5
+              ],
+              "idx": 5
+            },
+            {
+              "pos": [
+                19,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                5
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                27,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                28,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                29,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                30,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                31,
+                5
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                32,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                33,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                4
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                5,
+                4
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                6,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                14,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                4
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                16,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                4
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                19,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                4
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                29,
+                4
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                30,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                3
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                2,
+                3
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                3,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                14,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                3
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                32,
+                3
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                33,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                13,
+                2
+              ],
+              "idx": 14
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                17,
+                2
+              ],
+              "idx": 15
+            },
+            {
+              "pos": [
+                18,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                19,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                20,
+                2
+              ],
+              "idx": 16
+            },
+            {
+              "pos": [
+                26,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                18,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                19,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                1
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                30,
+                1
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                31,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                0,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                1,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                27,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                32,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                33,
+                0
+              ],
+              "idx": 8
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                472,
+                281.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                168,
+                217.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                440,
+                473.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                888,
+                217.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                952,
+                345.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                116.28711000000001,
+                201.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                982,
+                201.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                608,
+                465.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                173.83886,
+                233.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                880,
+                243.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                432,
+                481.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                900.6666,
+                329.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                251.00006000000002,
+                209.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                155.33334000000002,
+                337.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                548.2855999999999,
+                265.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                864,
+                209.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                616,
+                275.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                488,
+                279.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                126.57143,
+                348.2857
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                959.2857,
+                353.28568
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                896,
+                224
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                192,
+                224
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/zyrafa05.map.json b/assets/map/levels/zyrafa05.map.json
new file mode 100644
index 0000000000..49449f3168
--- /dev/null
+++ b/assets/map/levels/zyrafa05.map.json
@@ -0,0 +1,1102 @@
+{
+  "name": "zyrafa05",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    32,
+    23
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                4,
+                15
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                5,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                15
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                11,
+                15
+              ],
+              "idx": 21
+            },
+            {
+              "pos": [
+                12,
+                15
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                13,
+                15
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                14,
+                15
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                15,
+                15
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                16,
+                15
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                17,
+                15
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                18,
+                15
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                19,
+                15
+              ],
+              "idx": 22
+            },
+            {
+              "pos": [
+                20,
+                15
+              ],
+              "idx": 23
+            },
+            {
+              "pos": [
+                25,
+                15
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                26,
+                15
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                27,
+                15
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                13,
+                9
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                14,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                15,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                16,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                17,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                18,
+                9
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                2,
+                6
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                3,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                4,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                6
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                23,
+                6
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                24,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                25,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                26,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                27,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                28,
+                6
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                29,
+                6
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                2,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                3,
+                5
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                4,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                5
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                8,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                24,
+                5
+              ],
+              "idx": 12
+            },
+            {
+              "pos": [
+                25,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                5
+              ],
+              "idx": 11
+            },
+            {
+              "pos": [
+                29,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                2,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                3,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                5,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                7,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                24,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                26,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                27,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                28,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                2,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                3,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                5,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                7,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                24,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                2,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                3,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                7,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                24,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                24,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                1
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                1
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                1
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                0
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                28,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                0
+              ],
+              "idx": 9
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                778.3076000000001,
+                265.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                440,
+                345.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                107.14286000000001,
+                249.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                472,
+                537.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                786.5715399999999,
+                249.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                568,
+                537.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                96,
+                281.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                512,
+                331.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                464,
+                557.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                181.53846,
+                233.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                848.9231,
+                233.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                536,
+                329.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                384.00005999999996,
+                535.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                608,
+                535.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                216,
+                533.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            },
+            {
+              "pos": [
+                888,
+                535.5
+              ],
+              "element": "../elements/item/grenades/grenades.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                172.61539,
+                533.69228
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                224,
+                256
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                800,
+                256
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                842.1539,
+                531.38458
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/map/levels/zyrafa06.map.json b/assets/map/levels/zyrafa06.map.json
new file mode 100644
index 0000000000..bd981f429c
--- /dev/null
+++ b/assets/map/levels/zyrafa06.map.json
@@ -0,0 +1,1271 @@
+{
+  "name": "zyrafa06",
+  "background_color": "7EA8A6",
+  "grid_size": [
+    34,
+    14
+  ],
+  "tile_size": [
+    32,
+    32
+  ],
+  "layers": [
+    {
+      "id": "main layer",
+      "kind": {
+        "tile": {
+          "has_collision": true,
+          "tiles": [
+            {
+              "pos": [
+                21,
+                9
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                22,
+                9
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                23,
+                9
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                6,
+                8
+              ],
+              "idx": 56,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                7,
+                8
+              ],
+              "idx": 58,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                8,
+                8
+              ],
+              "idx": 60,
+              "jump_through": true
+            },
+            {
+              "pos": [
+                11,
+                7
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                12,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                7
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                7
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                11,
+                6
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                12,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                6
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                6
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                11,
+                5
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                12,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                5
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                5
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                24,
+                5
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                25,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                26,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                27,
+                5
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                28,
+                5
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                4,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                5,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                11,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                12,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                4
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                16,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                4
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                4
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                24,
+                4
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                25,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                4
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                4
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                4,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                5,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                11,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                12,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                16,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                24,
+                3
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                25,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                3
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                3
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                4,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                5,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                11,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                12,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                16,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                24,
+                2
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                25,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                2
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                2
+              ],
+              "idx": 9
+            },
+            {
+              "pos": [
+                2,
+                1
+              ],
+              "idx": 0
+            },
+            {
+              "pos": [
+                3,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                4,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                5,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                6,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                7,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                8,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                9,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                10,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                11,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                12,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                13,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                14,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                15,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                16,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                17,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                18,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                19,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                20,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                21,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                22,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                23,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                24,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                25,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                26,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                27,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                28,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                29,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                30,
+                1
+              ],
+              "idx": 1
+            },
+            {
+              "pos": [
+                31,
+                1
+              ],
+              "idx": 2
+            },
+            {
+              "pos": [
+                2,
+                0
+              ],
+              "idx": 7
+            },
+            {
+              "pos": [
+                3,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                4,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                5,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                6,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                7,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                8,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                9,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                10,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                11,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                12,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                13,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                14,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                15,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                16,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                17,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                18,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                19,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                20,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                21,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                22,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                23,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                24,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                25,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                26,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                27,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                28,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                29,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                30,
+                0
+              ],
+              "idx": 8
+            },
+            {
+              "pos": [
+                31,
+                0
+              ],
+              "idx": 9
+            }
+          ],
+          "tilemap": "../resources/default_tileset.png"
+        }
+      }
+    },
+    {
+      "id": "decorations",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                536,
+                185.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                216,
+                89.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                440,
+                89.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                888,
+                217.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                760,
+                89.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                408,
+                281.5
+              ],
+              "element": "../elements/decoration/seaweed/seaweed.element.yaml"
+            },
+            {
+              "pos": [
+                920,
+                89.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            },
+            {
+              "pos": [
+                120,
+                89.5
+              ],
+              "element": "../elements/decoration/anemones/anemones.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "items",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                222.66680000000002,
+                127.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                446,
+                185.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                712.0001199999999,
+                73.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                891.3332,
+                241.5
+              ],
+              "element": "../elements/environment/fish_school/fish_school.element.yaml"
+            },
+            {
+              "pos": [
+                478.66668000000004,
+                265.5
+              ],
+              "element": "../elements/environment/crab/crab.element.yaml"
+            },
+            {
+              "pos": [
+                256,
+                73.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                652.5714,
+                73.5
+              ],
+              "element": "../elements/item/musket/musket.element.yaml"
+            },
+            {
+              "pos": [
+                456,
+                285.5
+              ],
+              "element": "../elements/item/kick_bomb/kick_bomb.element.yaml"
+            },
+            {
+              "pos": [
+                1015.1428000000001,
+                95.5
+              ],
+              "element": "../elements/item/kick_bomb/kick_bomb.element.yaml"
+            },
+            {
+              "pos": [
+                343.11120000000005,
+                73.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                758.1110799999999,
+                73.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                949.4359199999999,
+                73.5
+              ],
+              "element": "../elements/environment/sproinger/sproinger.element.yaml"
+            },
+            {
+              "pos": [
+                706.8571999999999,
+                337.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            },
+            {
+              "pos": [
+                224,
+                311.5
+              ],
+              "element": "../elements/item/sword/sword.element.yaml"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "spawners",
+      "kind": {
+        "element": {
+          "elements": [
+            {
+              "pos": [
+                160,
+                192
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                320,
+                96
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                576,
+                192
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                704,
+                96
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                800,
+                224
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            },
+            {
+              "pos": [
+                960,
+                96
+              ],
+              "element": "../elements/environment/player_spawner/player_spawner.element.yaml"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "background_layers": [
+    {
+      "image": "../resources/background_04.png",
+      "speed": 0,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -110,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_03.png",
+      "speed": 0.74,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -109,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_02.png",
+      "speed": 0.82,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -108,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    },
+    {
+      "image": "../resources/background_01.png",
+      "speed": 100,
+      "tile_size": [
+        896,
+        480
+      ],
+      "z": -107,
+      "position": [
+        0,
+        360
+      ],
+      "scale": 2
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/textures/map/background_01.png b/assets/map/resources/background_01.png
similarity index 100%
rename from assets/textures/map/background_01.png
rename to assets/map/resources/background_01.png
diff --git a/assets/textures/map/background_02.png b/assets/map/resources/background_02.png
similarity index 100%
rename from assets/textures/map/background_02.png
rename to assets/map/resources/background_02.png
diff --git a/assets/textures/map/background_03.png b/assets/map/resources/background_03.png
similarity index 100%
rename from assets/textures/map/background_03.png
rename to assets/map/resources/background_03.png
diff --git a/assets/textures/map/background_04.png b/assets/map/resources/background_04.png
similarity index 100%
rename from assets/textures/map/background_04.png
rename to assets/map/resources/background_04.png
diff --git a/assets/textures/map/default_tileset.png b/assets/map/resources/default_tileset.png
similarity index 100%
rename from assets/textures/map/default_tileset.png
rename to assets/map/resources/default_tileset.png
diff --git a/assets/map/scripts/kill_out_of_bounds.ts b/assets/map/scripts/kill_out_of_bounds.ts
new file mode 100644
index 0000000000..d8c8750c01
--- /dev/null
+++ b/assets/map/scripts/kill_out_of_bounds.ts
@@ -0,0 +1,33 @@
+const killZoneBorder = 500;
+
+export default {
+  updateInGame() {
+    let netInfo = NetInfo.get();
+    let map = world.query(MapMeta).map((x) => x.components[0])[0];
+    if (!map) return;
+
+    let mapWidth = map.grid_size.x * map.tile_size.x;
+    let leftKillZone = -killZoneBorder;
+    let rightKillZone = killZoneBorder + mapWidth;
+    let bottomKillZone = -killZoneBorder;
+
+    for (const { entity, components } of world.query(PlayerIdx, Transform)) {
+      let [player_idx, transform] = components;
+
+      if (
+        (netInfo.is_client && player_idx[0] == netInfo.player_idx) ||
+        !netInfo.is_client
+      ) {
+        let pos = transform.translation;
+
+        if (
+          pos.x < leftKillZone ||
+          pos.x > rightKillZone ||
+          pos.y < bottomKillZone
+        ) {
+          Player.kill(entity);
+        }
+      }
+    }
+  },
+};
diff --git a/assets/player/skins/catty/catty.player.yaml b/assets/player/skins/catty/catty.player.yaml
new file mode 100644
index 0000000000..a438acd14a
--- /dev/null
+++ b/assets/player/skins/catty/catty.player.yaml
@@ -0,0 +1,28 @@
+name: Catty
+
+spritesheet:
+  image: catty.png
+  tile_size: [96, 80]
+  columns: 14
+  rows: 7
+
+  animation_fps: 9
+  animations:
+    idle:
+      frames: [0, 13]
+      repeat: true
+    fall:
+      frames: [42, 42]
+      repeat: false
+    rise:
+      frames: [28, 28]
+      repeat: false
+    walk:
+      frames: [14, 19]
+      repeat: true
+    crouch:
+      frames: [56, 56]
+      repeat: false
+    death_1:
+      frames: [70, 76]
+      repeat: false
diff --git a/assets/textures/player/PlayerCatty(96x80).png b/assets/player/skins/catty/catty.png
similarity index 100%
rename from assets/textures/player/PlayerCatty(96x80).png
rename to assets/player/skins/catty/catty.png
diff --git a/assets/player/skins/fishy/fishy.player.yaml b/assets/player/skins/fishy/fishy.player.yaml
new file mode 100644
index 0000000000..a0096e679c
--- /dev/null
+++ b/assets/player/skins/fishy/fishy.player.yaml
@@ -0,0 +1,28 @@
+name: Fishy
+
+spritesheet:
+  image: fishy.png
+  tile_size: [96, 80]
+  columns: 14
+  rows: 7
+
+  animation_fps: 9
+  animations:
+    idle:
+      frames: [0, 13]
+      repeat: true
+    fall:
+      frames: [42, 42]
+      repeat: false
+    rise:
+      frames: [28, 28]
+      repeat: false
+    walk:
+      frames: [14, 19]
+      repeat: true
+    crouch:
+      frames: [56, 56]
+      repeat: false
+    death_1:
+      frames: [70, 76]
+      repeat: false
diff --git a/assets/textures/player/PlayerFishy(96x80).png b/assets/player/skins/fishy/fishy.png
similarity index 100%
rename from assets/textures/player/PlayerFishy(96x80).png
rename to assets/player/skins/fishy/fishy.png
diff --git a/assets/player/skins/lionfishy/lionfishy.player.yaml b/assets/player/skins/lionfishy/lionfishy.player.yaml
new file mode 100644
index 0000000000..b2ca4919fd
--- /dev/null
+++ b/assets/player/skins/lionfishy/lionfishy.player.yaml
@@ -0,0 +1,28 @@
+name: Lionfishy
+
+spritesheet:
+  image: lionfishy.png
+  tile_size: [96, 80]
+  columns: 14
+  rows: 7
+
+  animation_fps: 9
+  animations:
+    idle:
+      frames: [0, 13]
+      repeat: true
+    fall:
+      frames: [42, 42]
+      repeat: false
+    rise:
+      frames: [28, 28]
+      repeat: false
+    walk:
+      frames: [14, 19]
+      repeat: true
+    crouch:
+      frames: [56, 56]
+      repeat: false
+    death_1:
+      frames: [70, 76]
+      repeat: false
diff --git a/assets/textures/player/PlayerLionfishy(96x80).png b/assets/player/skins/lionfishy/lionfishy.png
similarity index 100%
rename from assets/textures/player/PlayerLionfishy(96x80).png
rename to assets/player/skins/lionfishy/lionfishy.png
diff --git a/assets/player/skins/orcy/orcy.player.yaml b/assets/player/skins/orcy/orcy.player.yaml
new file mode 100644
index 0000000000..bed21c9112
--- /dev/null
+++ b/assets/player/skins/orcy/orcy.player.yaml
@@ -0,0 +1,28 @@
+name: Orcy
+
+spritesheet:
+  image: orcy.png
+  tile_size: [96, 80]
+  columns: 14
+  rows: 7
+
+  animation_fps: 9
+  animations:
+    idle:
+      frames: [0, 13]
+      repeat: true
+    fall:
+      frames: [42, 42]
+      repeat: false
+    rise:
+      frames: [28, 28]
+      repeat: false
+    walk:
+      frames: [14, 19]
+      repeat: true
+    crouch:
+      frames: [56, 56]
+      repeat: false
+    death_1:
+      frames: [70, 76]
+      repeat: false
diff --git a/assets/textures/player/PlayerOrcy(96x80).png b/assets/player/skins/orcy/orcy.png
similarity index 100%
rename from assets/textures/player/PlayerOrcy(96x80).png
rename to assets/player/skins/orcy/orcy.png
diff --git a/assets/player/skins/pescy/pescy.player.yaml b/assets/player/skins/pescy/pescy.player.yaml
new file mode 100644
index 0000000000..12ec12d6cf
--- /dev/null
+++ b/assets/player/skins/pescy/pescy.player.yaml
@@ -0,0 +1,28 @@
+name: Pescy
+
+spritesheet:
+  image: pescy.png
+  tile_size: [96, 80]
+  columns: 14
+  rows: 7
+
+  animation_fps: 9
+  animations:
+    idle:
+      frames: [0, 13]
+      repeat: true
+    fall:
+      frames: [42, 42]
+      repeat: false
+    rise:
+      frames: [28, 28]
+      repeat: false
+    walk:
+      frames: [14, 19]
+      repeat: true
+    crouch:
+      frames: [56, 56]
+      repeat: false
+    death_1:
+      frames: [70, 76]
+      repeat: false
diff --git a/assets/textures/player/PlayerPescy(96x80).png b/assets/player/skins/pescy/pescy.png
similarity index 100%
rename from assets/textures/player/PlayerPescy(96x80).png
rename to assets/player/skins/pescy/pescy.png
diff --git a/assets/player/skins/sharky/sharky.player.yaml b/assets/player/skins/sharky/sharky.player.yaml
new file mode 100644
index 0000000000..c1b8ebedae
--- /dev/null
+++ b/assets/player/skins/sharky/sharky.player.yaml
@@ -0,0 +1,29 @@
+name: Sharky
+
+spritesheet:
+  image: sharky.png
+  tile_size: [96, 80]
+  columns: 14
+  rows: 7
+
+  animation_fps: 9
+  animations:
+    idle:
+      frames: [0, 13]
+      repeat: true
+    fall:
+      frames: [42, 42]
+      repeat: false
+    rise:
+      frames: [28, 28]
+      repeat: false
+    walk:
+      frames: [14, 19]
+      repeat: true
+    crouch:
+      frames: [56, 56]
+      repeat: false
+    death_1:
+      frames: [70, 76]
+      repeat: false
+
diff --git a/assets/textures/player/PlayerSharky(96x80).png b/assets/player/skins/sharky/sharky.png
similarity index 100%
rename from assets/textures/player/PlayerSharky(96x80).png
rename to assets/player/skins/sharky/sharky.png
diff --git a/assets/player/states/crouch.ts b/assets/player/states/crouch.ts
new file mode 100644
index 0000000000..3c5b27ab9d
--- /dev/null
+++ b/assets/player/states/crouch.ts
@@ -0,0 +1,49 @@
+const scriptId = Script.getInfo().path;
+
+export default {
+  playerStateTransition() {
+    const player_inputs = world.resource(PlayerInputs);
+    const playerComponents = world
+      .query(PlayerState, PlayerIdx, KinematicBody)
+      .map((x) => x.components);
+
+    for (const [playerState, playerIdx, body] of playerComponents) {
+      if (playerState.id != scriptId) continue;
+
+      const control = player_inputs.players[playerIdx[0]].control;
+
+      if (!body.is_on_ground || !(control.move_direction.y < -0.5)) {
+        playerState.id = Assets.getAbsolutePath("./idle.ts");
+      }
+    }
+  },
+  handlePlayerState() {
+    const player_inputs = world.resource(PlayerInputs);
+
+    // For every player
+    const playerComponents = world
+      .query(PlayerState, PlayerIdx, AnimationBankSprite, KinematicBody)
+      .map((x) => x.components);
+    for (const [
+      playerState,
+      playerIdx,
+      animationBankSprite,
+      body,
+    ] of playerComponents) {
+      // In this state
+      if (playerState.id != scriptId) continue;
+
+      // Set the current animation
+      if (playerState.age == 0) {
+        animationBankSprite.current_animation = "crouch";
+      }
+
+      // Add basic physics controls
+      const control = player_inputs.players[playerIdx[0]].control;
+
+      if (control.jump_just_pressed) {
+        body.fall_through = true;
+      }
+    }
+  },
+};
diff --git a/assets/player/states/dead.ts b/assets/player/states/dead.ts
new file mode 100644
index 0000000000..aa8e4258bb
--- /dev/null
+++ b/assets/player/states/dead.ts
@@ -0,0 +1,36 @@
+const scriptId = Script.getInfo().path;
+
+/** Responsible for transitioning players to the dead state whenever they are killed */
+export default {
+  playerStateTransition() {
+    const players = world.query(PlayerState);
+
+    // Transition all players tht have been killed to this state
+    for (const event of Player.killEvents()) {
+      const [playerState] = players.get(event.player);
+      playerState.id = Assets.getAbsolutePath("./dead.ts");
+    }
+  },
+  handlePlayerState() {
+    const players = world.query(PlayerState, AnimationBankSprite);
+
+    for (const {
+      entity,
+      components: [playerState, animationBankSprite],
+    } of players) {
+      // In this state
+      if (playerState.id != scriptId) continue;
+
+      // Set animation when we enter the state
+      if (playerState.age == 0) {
+        animationBankSprite.current_animation = "death_1";
+      }
+
+      // Despawn player after 1.5 seconds ( 90 frames )
+      if (playerState.age >= 90) {
+        Player.despawn(entity);
+        Script.setEntityState(entity, undefined);
+      }
+    }
+  },
+};
diff --git a/assets/player/states/default.ts b/assets/player/states/default.ts
new file mode 100644
index 0000000000..694c80ca86
--- /dev/null
+++ b/assets/player/states/default.ts
@@ -0,0 +1,14 @@
+/** Responsible for transitioning players in the default, meaningless state to "idle" */
+export default {
+  playerStateTransition() {
+    for (const [playerState] of world
+      .query(PlayerState)
+      .map((x) => x.components)) {
+      // Loop over players in the default state
+      if (playerState.id !== "") continue;
+
+      // Transition to the idle state
+      playerState.id = Assets.getAbsolutePath("./idle.ts");
+    }
+  },
+};
diff --git a/assets/player/states/idle.ts b/assets/player/states/idle.ts
new file mode 100644
index 0000000000..2c8d77b31a
--- /dev/null
+++ b/assets/player/states/idle.ts
@@ -0,0 +1,79 @@
+const scriptId = Script.getInfo().path;
+
+export default {
+  playerStateTransition() {
+    const player_inputs = world.resource(PlayerInputs);
+    const playerComponents = world
+      .query(PlayerState, PlayerIdx, KinematicBody)
+      .map((x) => x.components);
+
+    for (const [playerState, playerIdx, body] of playerComponents) {
+      if (playerState.id != scriptId) continue;
+
+      const control = player_inputs.players[playerIdx[0]].control;
+
+      if (!body.is_on_ground) {
+        playerState.id = Assets.getAbsolutePath("./midair.ts");
+      } else if (control.move_direction.y < -0.5) {
+        playerState.id = Assets.getAbsolutePath("./crouch.ts");
+      } else if (control.move_direction.x != 0) {
+        playerState.id = Assets.getAbsolutePath("./walk.ts");
+      }
+    }
+  },
+  handlePlayerState() {
+    const player_inputs = world.resource(PlayerInputs);
+
+    let items = world.query(Item);
+
+    // For every player
+    for (const { entity: playerEnt, components } of world.query(
+      PlayerState,
+      PlayerIdx,
+      AnimationBankSprite,
+      KinematicBody
+    )) {
+      const [playerState, playerIdx, animationBankSprite, body] = components;
+
+      // In this state
+      if (playerState.id != scriptId) continue;
+
+      // Set the current animation
+      if (playerState.age == 0) {
+        animationBankSprite.current_animation = "idle";
+      }
+
+      // Add basic physics controls
+      const control = player_inputs.players[playerIdx[0]].control;
+
+      // If we are grabbing
+      if (control.grab_just_pressed) {
+        // Get inventory
+        const currentInventory = Player.getInventory(playerEnt);
+
+        if (!currentInventory) {
+          // For each actor colliding with the player
+          for (const collider of CollisionWorld.actorCollisions(playerEnt)) {
+            const item = items.get(collider);
+            if (!!item) {
+              Player.setInventory(playerEnt, collider);
+              break;
+            }
+          }
+        } else {
+          Player.setInventory(playerEnt, null);
+        }
+      }
+
+      // Use item if we have one
+      if (control.shoot_just_pressed && Player.getInventory(playerEnt)) {
+        Player.useItem(playerEnt);
+      }
+
+      if (control.jump_just_pressed) {
+        body.velocity.y = 15;
+      }
+      body.velocity.x = 0;
+    }
+  },
+};
diff --git a/assets/player/states/midair.ts b/assets/player/states/midair.ts
new file mode 100644
index 0000000000..94a670dd2f
--- /dev/null
+++ b/assets/player/states/midair.ts
@@ -0,0 +1,80 @@
+const scriptId = Script.getInfo().path;
+
+export default {
+  playerStateTransition() {
+    const playerComponents = world
+      .query(PlayerState, KinematicBody)
+      .map((x) => x.components);
+
+    for (const [playerState, body] of playerComponents) {
+      if (playerState.id != scriptId) continue;
+
+      if (body.is_on_ground) {
+        playerState.id = Assets.getAbsolutePath("./idle.ts");
+      }
+    }
+  },
+  handlePlayerState() {
+    const player_inputs = world.resource(PlayerInputs);
+    const items = world.query(Item);
+
+    // For every player
+    for (const { entity: playerEnt, components } of world.query(
+      PlayerState,
+      PlayerIdx,
+      AnimationBankSprite,
+      KinematicBody
+    )) {
+      const [playerState, playerIdx, animationBankSprite, body] = components;
+      if (playerState.id != scriptId) continue;
+
+      // Set the current animation
+      if (body.velocity.y > 0) {
+        animationBankSprite.current_animation = "rise";
+      } else {
+        animationBankSprite.current_animation = "fall";
+      }
+
+      const control = player_inputs.players[playerIdx[0]].control;
+
+      // If we are grabbing
+      if (control.grab_just_pressed) {
+        const current_inventory = Player.getInventory(playerEnt);
+        if (!current_inventory) {
+          // For each actor colliding with the player
+          for (const collider of CollisionWorld.actorCollisions(playerEnt)) {
+            const item = items.get(collider);
+            if (!!item) {
+              const [_item] = item;
+              Player.setInventory(playerEnt, collider);
+              break;
+            }
+          }
+        } else {
+          Player.setInventory(playerEnt, null);
+        }
+      }
+
+      // Use item if we have one
+      if (control.shoot_just_pressed && Player.getInventory(playerEnt)) {
+        Player.useItem(playerEnt);
+      }
+
+      // Add controls
+      body.velocity.x = control.move_direction.x * 5;
+
+      // Fall through platforms when pressing down
+      if (control.move_direction.y < -0.5 && control.jump_pressed) {
+        body.fall_through = true;
+      } else {
+        body.fall_through = false;
+      }
+
+      if (body.velocity.x > 0) {
+        animationBankSprite.flip_x = false;
+      } else if (body.velocity.x < 0) {
+        animationBankSprite.flip_x = true;
+      }
+    }
+  },
+};
diff --git a/assets/player/states/walk.ts b/assets/player/states/walk.ts
new file mode 100644
index 0000000000..e17cb76752
--- /dev/null
+++ b/assets/player/states/walk.ts
@@ -0,0 +1,83 @@
+const scriptId = Script.getInfo().path;
+
+export default {
+  playerStateTransition() {
+    const player_inputs = world.resource(PlayerInputs);
+    const playerComponents = world
+      .query(PlayerState, PlayerIdx, KinematicBody)
+      .map((x) => x.components);
+
+    for (const [playerState, playerIdx, body] of playerComponents) {
+      if (playerState.id != scriptId) continue;
+
+      const control = player_inputs.players[playerIdx[0]].control;
+
+      if (!body.is_on_ground) {
+        playerState.id = Assets.getAbsolutePath("./midair.ts");
+      } else if (body.is_on_ground && control.move_direction.y < -0.5) {
+        playerState.id = Assets.getAbsolutePath("./crouch.ts");
+      } else if (control.move_direction.x == 0) {
+        playerState.id = Assets.getAbsolutePath("./idle.ts");
+      }
+    }
+  },
+  handlePlayerState() {
+    const player_inputs = world.resource(PlayerInputs);
+
+    const items = world.query(Item);
+
+    // For every player
+    for (const { entity: playerEnt, components } of world.query(
+      PlayerState,
+      PlayerIdx,
+      AnimationBankSprite,
+      KinematicBody
+    )) {
+      const [playerState, playerIdx, animationBankSprite, body] = components;
+
+      // Add basic physics controls
+      const control = player_inputs.players[playerIdx[0]].control;
+
+      // In this state
+      if (playerState.id != scriptId) continue;
+
+      // Set the current animation
+      if (playerState.age == 0) {
+        animationBankSprite.current_animation = "walk";
+      }
+
+      // If we are grabbing
+      if (control.grab_just_pressed) {
+        const current_inventory = Player.getInventory(playerEnt);
+        if (!current_inventory) {
+          // For each actor colliding with the player
+          for (const collider of CollisionWorld.actorCollisions(playerEnt)) {
+            const item = items.get(collider);
+            if (!!item) {
+              Player.setInventory(playerEnt, collider);
+              break;
+            }
+          }
+        } else {
+          Player.setInventory(playerEnt, null);
+        }
+      }
+
+      // Use item if we have one
+      if (control.shoot_just_pressed && Player.getInventory(playerEnt)) {
+        Player.useItem(playerEnt);
+      }
+
+      // Add jump
+      if (control.jump_just_pressed) {
+        body.velocity.y = 15;
+      }
+      body.velocity.x = control.move_direction.x * 5;
+      if (control.move_direction.x > 0) {
+        animationBankSprite.flip_x = false;
+      } else if (control.move_direction.x < 0) {
+        animationBankSprite.flip_x = true;
+      }
+    }
+  },
+};
diff --git a/assets/sounds/.DS_Store b/assets/sounds/.DS_Store
deleted file mode 100644
index b309d5b7d1..0000000000
Binary files a/assets/sounds/.DS_Store and /dev/null differ
diff --git a/assets/textures/map/default_decoration.png b/assets/textures/map/default_decoration.png
deleted file mode 100644
index d39320dac6..0000000000
Binary files a/assets/textures/map/default_decoration.png and /dev/null differ
diff --git a/assets/ui/FairfaxSM.ttf b/assets/ui/FairfaxSM.ttf
new file mode 100644
index 0000000000..049920e016
Binary files /dev/null and b/assets/ui/FairfaxSM.ttf differ
diff --git a/assets/ui/FairfaxSM.ttf.license.txt b/assets/ui/FairfaxSM.ttf.license.txt
new file mode 100644
index 0000000000..d3484cad44
--- /dev/null
+++ b/assets/ui/FairfaxSM.ttf.license.txt
@@ -0,0 +1,93 @@
+Copyright (c) 2008-2020 Kreative Software.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/assets/ui/ark-pixel-16-px-latin-LICENSE.txt b/assets/ui/ark-pixel-16-px-latin-LICENSE.txt
new file mode 100644
index 0000000000..f8ab107639
--- /dev/null
+++ b/assets/ui/ark-pixel-16-px-latin-LICENSE.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2021, TakWolf (https://ark-pixel-font.takwolf.com),
+with Reserved Font Name 'Ark Pixel'.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/assets/ui/ark-pixel-16px-latin.ttf b/assets/ui/ark-pixel-16px-latin.ttf
new file mode 100644
index 0000000000..430e856220
Binary files /dev/null and b/assets/ui/ark-pixel-16px-latin.ttf differ
diff --git a/assets/ui/button_background_clicked.png b/assets/ui/button-down.png
similarity index 100%
rename from assets/ui/button_background_clicked.png
rename to assets/ui/button-down.png
diff --git a/assets/ui/button-focused.png b/assets/ui/button-focused.png
new file mode 100644
index 0000000000..9d186d1185
Binary files /dev/null and b/assets/ui/button-focused.png differ
diff --git a/assets/ui/button_background.png b/assets/ui/button.png
similarity index 100%
rename from assets/ui/button_background.png
rename to assets/ui/button.png
diff --git a/assets/textures/ui/editor_icons/Cursor.png b/assets/ui/editor/Cursor.png
similarity index 100%
rename from assets/textures/ui/editor_icons/Cursor.png
rename to assets/ui/editor/Cursor.png
diff --git a/assets/textures/ui/editor_icons/Eraser.png b/assets/ui/editor/Eraser.png
similarity index 100%
rename from assets/textures/ui/editor_icons/Eraser.png
rename to assets/ui/editor/Eraser.png
diff --git a/assets/textures/ui/editor_icons/Object.png b/assets/ui/editor/Object.png
similarity index 100%
rename from assets/textures/ui/editor_icons/Object.png
rename to assets/ui/editor/Object.png
diff --git a/assets/textures/ui/editor_icons/Pointer and Map.png b/assets/ui/editor/Pointer and Map.png
similarity index 100%
rename from assets/textures/ui/editor_icons/Pointer and Map.png
rename to assets/ui/editor/Pointer and Map.png
diff --git a/assets/textures/ui/editor_icons/Pointer.png b/assets/ui/editor/Pointer.png
similarity index 100%
rename from assets/textures/ui/editor_icons/Pointer.png
rename to assets/ui/editor/Pointer.png
diff --git a/assets/textures/ui/editor_icons/Tile.png b/assets/ui/editor/Tile.png
similarity index 100%
rename from assets/textures/ui/editor_icons/Tile.png
rename to assets/ui/editor/Tile.png
diff --git a/assets/ui/lifebar-progress.png b/assets/ui/lifebar-progress.png
new file mode 100755
index 0000000000..1d37d035e6
Binary files /dev/null and b/assets/ui/lifebar-progress.png differ
diff --git a/assets/ui/lifebar.png b/assets/ui/lifebar.png
new file mode 100644
index 0000000000..50a8029d24
Binary files /dev/null and b/assets/ui/lifebar.png differ
diff --git a/assets/ui/menu-background-zoom.ts b/assets/ui/menu-background-zoom.ts
new file mode 100644
index 0000000000..8ca513067a
--- /dev/null
+++ b/assets/ui/menu-background-zoom.ts
@@ -0,0 +1,22 @@
+type MenuBackground = unknown;
+const MenuBackground: BevyType<MenuBackground> = {
+  typeName: "jumpy::ui::main_menu::MainMenuBackground",
+};
+
+export default {
+  update() {
+    const time = world.resource(Time);
+    const query = world.query(MenuBackground, Transform);
+    for (const item of query) {
+      const [_, transform] = item.components;
+
+      let scale = 1.5 + Math.sin(time.seconds_since_startup * 0.8) * 0.2;
+      transform.scale.x = scale;
+      transform.scale.y = scale;
+
+      let offset = Math.sin(time.seconds_since_startup * 0.4) * 50;
+      transform.translation.x = offset + 60;
+      transform.translation.y = offset * 0.2 - 20;
+    }
+  },
+};
diff --git a/assets/ui/menu-background.png b/assets/ui/menu-background.png
new file mode 100644
index 0000000000..d3da3cb0be
Binary files /dev/null and b/assets/ui/menu-background.png differ
diff --git a/assets/ui/panel.png b/assets/ui/panel.png
new file mode 100644
index 0000000000..322d04b3c7
Binary files /dev/null and b/assets/ui/panel.png differ
diff --git a/book/src/introduction.md b/book/src/introduction.md
index 66a26a21b2..8748ed947e 100644
--- a/book/src/introduction.md
+++ b/book/src/introduction.md
@@ -1,2 +1,7 @@
 <!-- markdownlint-disable MD041 -->
+
+> **⚠️ Warning:** The information in this book is largely out of date with the work-in-progress Bevy
+> rewrite that was recently merged. Once the rewrite stabilizes a little bit we will begin updating
+> the documentation to match.
+
 {{#include ../../README.md}}
diff --git a/book/src/multiplayer.md b/book/src/multiplayer.md
index 78b11afe53..4af30b3c1a 100644
--- a/book/src/multiplayer.md
+++ b/book/src/multiplayer.md
@@ -1,39 +1,3 @@
 # Multiplayer
 
-Connection process in the FishFight is extremely low-level right now.  
-We do not have a matchmaking server and we want to collect data and network setups and possible problems before doing the process fully automatic.
-
-![image](https://user-images.githubusercontent.com/910977/133952684-19e7f10a-ed80-49e6-8a31-205f28a78c39.png)
-
-The only supported game mode right now: 1v1.
-
-## Connection Types
-
-### LAN
-
-When both computers are connected to the same router: are on the same wifi, home network etc.
-
-Send your local IP from "Self addr" field to your opponent, click "Probe connection" and if connection can be established - click "Connect".
-
-### STUN
-
-When each player is under a NAT. Usually when its two players over internet with different network providers.
-This option may work, but may not, it depends on the type of nat, router configs etc.
-
-Idea is exactly the same as with LAN: copy-paste your own "Self addr" over discord, probe connection, if it works - click "Connect"
-
-### Relay
-
-When both players are on remote computers over internet, but STUN connection did not work and router reconfiguration is not an option - there is a relay server available.
-
-Relay server will introduce additional LAG - each packet will be forwarded through a server.
-
-Connection idea is still the same, but instead of IP "Self addr" will be an ID on the relay server. Copy-paste it over internet, set "Opponent addr", push "Connect"
-
-## Router Configuration
-
-When STUN server failed, but Relay is too slow - there is a way to improve gameplay experience. Go to router settings and forward ports 3400, 3401, 3402, 3403 to computer with the FishFight.
-
-It still may depend on the internet provider, maybe the router itself is behind some global provider NAT or something.
-
-TODO: Make a better "Router configuration" section here.
+TODO: Update for Bevy Rewrite
diff --git a/config.toml b/config.toml
deleted file mode 100644
index 2a075c3131..0000000000
--- a/config.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[window]
-width = 955
-height = 600
-fullscreen = false
-high-dpi = false
-
-[input.keyboard-primary]
-left = 'Left'
-right = 'Right'
-fire = 'L'
-jump = 'Up'
-pickup = 'K'
-crouch = 'Down'
-slide = 'RightControl'
-
-[input.keyboard-secondary]
-left = 'A'
-right = 'D'
-fire = 'V'
-jump = 'W'
-pickup = 'C'
-crouch = 'S'
-slide = 'F'
-
-[[input.gamepads]]
-id = 0
-fire = 'X'
-jump = 'A'
-pickup = 'B'
-slide = 'Y'
diff --git a/core/Cargo.toml b/core/Cargo.toml
deleted file mode 100644
index 786dc56647..0000000000
--- a/core/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "jumpy-core"
-version = "0.4.3"
-authors = ["The Fish Fight Game & Spicy Lobster Developers"]
-license = "MIT OR Apache-2.0"
-edition = "2021"
-
-[dependencies]
-fishsticks = { version = "0.2.1", git = "https://github.com/fishfolks/fishsticks", default-features = false, features = ["gilrs"] }
-macroquad = { version = "=0.3.16" } # Newer versions break is_key_pressed detection
-hecs = "0.7.1"
-serde = { version = "1.0", package = "serde", features = ["derive"] }
-serde_json = { version = "1.0" }
-toml = "0.5"
-async-trait = "0.1.52"
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-getrandom = { version = "0.2", features = ["js"] }
-wasm-bindgen = "0.2.74"
\ No newline at end of file
diff --git a/core/src/channel.rs b/core/src/channel.rs
deleted file mode 100644
index ad484d6e96..0000000000
--- a/core/src/channel.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-//! This is just a wrapper for `std::sync::mpsc::channel` that is a bit tidier than the tuple
-//! provided by the std
-
-use std::sync::mpsc::{Receiver, Sender};
-
-pub struct Channel<T, R> {
-    pub tx: Sender<T>,
-    pub rx: Receiver<R>,
-}
-
-impl<T, R> Channel<T, R> {
-    pub fn new(tx: Sender<T>, rx: Receiver<R>) -> Self {
-        Channel { tx, rx }
-    }
-}
diff --git a/core/src/config.rs b/core/src/config.rs
deleted file mode 100644
index f1105a1aaa..0000000000
--- a/core/src/config.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use std::fs;
-use std::path::Path;
-
-use serde::{Deserialize, Serialize};
-
-use crate::input::mapping::InputMapping;
-use crate::Result;
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct Config {
-    #[serde(default)]
-    pub window: WindowConfig,
-    #[serde(default)]
-    pub input: InputMapping,
-}
-
-impl Config {
-    pub fn load<P: AsRef<Path>>(path: P) -> Result<Self> {
-        let path = path.as_ref();
-
-        let mut res = if path.exists() {
-            let bytes = fs::read(path)?;
-            toml::from_slice(&bytes)?
-        } else {
-            Config::default()
-        };
-
-        res.input.verify()?;
-
-        Ok(res)
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct WindowConfig {
-    pub width: u32,
-    pub height: u32,
-    #[serde(default, rename = "fullscreen")]
-    pub is_fullscreen: bool,
-    #[serde(default, rename = "high-dpi")]
-    pub is_high_dpi: bool,
-}
-
-impl Default for WindowConfig {
-    fn default() -> Self {
-        WindowConfig {
-            width: 955,
-            height: 600,
-            is_fullscreen: false,
-            is_high_dpi: false,
-        }
-    }
-}
diff --git a/core/src/data.rs b/core/src/data.rs
deleted file mode 100644
index f71a84110d..0000000000
--- a/core/src/data.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-use std::fmt::{self, Debug, Formatter};
-use std::path::Path;
-
-use macroquad::prelude::*;
-
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-
-use crate::text::ToStringHelper;
-use crate::Result;
-
-pub struct Error {
-    pub path: String,
-    pub err: Box<dyn std::error::Error + Send + Sync + 'static>,
-}
-
-impl Error {
-    pub fn new<E>(path: &str, err: E) -> Self
-    where
-        E: Into<Box<dyn std::error::Error + Send + Sync>>,
-    {
-        Error {
-            path: path.to_string(),
-            err: err.into(),
-        }
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "File error: {}: {}", &self.path, &self.err)
-    }
-}
-
-impl Debug for Error {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "File error: {}: {}", &self.path, &self.err)
-    }
-}
-
-impl std::error::Error for Error {}
-
-/// Serialize a value into a string of JSON.
-/// Will return a `serde_json::Error` if a parsing error is encountered.
-pub fn serialize_json_string<T>(value: &T) -> std::result::Result<String, serde_json::Error>
-where
-    T: Serialize,
-{
-    let res = serde_json::to_string_pretty(value)?;
-    Ok(res)
-}
-
-/// Serialize a value into a slice of JSON.
-/// Will return a `serde_json::Error` if a parsing error is encountered.
-pub fn serialize_json_bytes<T>(value: &T) -> std::result::Result<Vec<u8>, serde_json::Error>
-where
-    T: Serialize,
-{
-    let res = serde_json::to_string_pretty(value)?;
-    Ok(res.into_bytes())
-}
-
-/// Deserialize a slice of JSON into a value.
-/// Will return a `serde_json::Error` if a parsing error is encountered.
-pub fn deserialize_json_bytes<'a, T>(value: &'a [u8]) -> std::result::Result<T, serde_json::Error>
-where
-    T: Deserialize<'a>,
-{
-    let res = serde_json::from_slice(value)?;
-    Ok(res)
-}
-
-/// Deserialize a string of JSON into a value.
-/// Will return a `serde_json::Error` if a parsing error is encountered.
-pub fn deserialize_json_string<'a, T>(value: &'a str) -> std::result::Result<T, serde_json::Error>
-where
-    T: Deserialize<'a>,
-{
-    let res = serde_json::from_str(value)?;
-    Ok(res)
-}
-
-/// Deserialize a JSON file into a value
-pub async fn deserialize_json_file<T, P: AsRef<Path>>(path: P) -> Result<T>
-where
-    T: DeserializeOwned,
-{
-    let path_str = path.as_ref().to_string_helper();
-
-    let bytes = load_file(&path_str).await?;
-    match serde_json::from_slice(&bytes) {
-        Err(err) => Err(Error::new(path_str.as_str(), err).into()),
-        Ok(res) => Ok(res),
-    }
-}
-
-/// Serialize a value into a string of TOML.
-/// Will return a `toml::ser::Error` if a parsing error is encountered.
-pub fn serialize_toml_string<T>(value: &T) -> std::result::Result<String, toml::ser::Error>
-where
-    T: Serialize,
-{
-    let res = toml::to_string_pretty(value)?;
-    Ok(res)
-}
-
-/// Serialize a value into a slice of TOML.
-/// Will return a `toml::ser::Error` if a parsing error is encountered.
-pub fn serialize_toml_bytes<T>(value: &T) -> std::result::Result<Vec<u8>, toml::ser::Error>
-where
-    T: Serialize,
-{
-    let res = toml::to_string_pretty(value)?;
-    Ok(res.into_bytes())
-}
-
-/// Deserialize a slice of TOML into a value.
-/// Will return a `toml::de::Error` if a parsing error is encountered.
-pub fn deserialize_toml_bytes<'a, T>(value: &'a [u8]) -> std::result::Result<T, toml::de::Error>
-where
-    T: Deserialize<'a>,
-{
-    let res = toml::from_slice(value)?;
-    Ok(res)
-}
-
-/// Deserialize a string of TOML into a value.
-/// Will return a `toml::de::Error` if a parsing error is encountered.
-pub fn deserialize_toml_string<'a, T>(value: &'a str) -> std::result::Result<T, toml::de::Error>
-where
-    T: Deserialize<'a>,
-{
-    let res = toml::from_str(value)?;
-    Ok(res)
-}
-
-/// Deserialize a TOML file into a value
-pub async fn deserialize_toml_file<T, P: AsRef<Path>>(path: P) -> Result<T>
-where
-    T: DeserializeOwned,
-{
-    let path_str = path.as_ref().to_string_helper();
-
-    let bytes = load_file(&path_str).await?;
-    match toml::from_slice(&bytes) {
-        Err(err) => Err(Error::new(path_str.as_str(), err).into()),
-        Ok(res) => Ok(res),
-    }
-}
diff --git a/core/src/error.rs b/core/src/error.rs
deleted file mode 100644
index df75d28a5e..0000000000
--- a/core/src/error.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-//! This implements a simple Error and Result type, inspired by `io::Error` and `io::Result`, that
-//! enables us to work seamlessly with all the different `Error` implementations from our dependencies.
-//!
-//! Just implement `From` for `Error`, for any remote implementations of `Error` you encounter, and
-//! use the `Result` type alias, from this module, as return type when it is required.
-
-use std::sync::mpsc::SendError;
-use std::{error, fmt, io, result, string::FromUtf8Error};
-
-use macroquad::file::FileError;
-use macroquad::text::FontError;
-
-use crate::network::{NetworkMessage, RequestStatus};
-
-pub type Result<T> = result::Result<T, Error>;
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum ErrorKind {
-    General,
-    Config,
-    Ecs,
-    File,
-    Parsing,
-    Input,
-    Api,
-    Network,
-    EditorAction,
-}
-
-impl ErrorKind {
-    pub fn as_str(&self) -> &'static str {
-        match *self {
-            ErrorKind::General => "General error",
-            ErrorKind::Config => "Config error",
-            ErrorKind::Ecs => "ECS error",
-            ErrorKind::File => "File error",
-            ErrorKind::Parsing => "Parsing error",
-            ErrorKind::Input => "Input error",
-            ErrorKind::Api => "Api error",
-            ErrorKind::Network => "Network error",
-            ErrorKind::EditorAction => "Editor action error",
-        }
-    }
-}
-
-impl From<RequestStatus> for Error {
-    fn from(status: RequestStatus) -> Self {
-        Error::new_message(
-            ErrorKind::Api,
-            &format!("[{}]: {}", status.as_code(), status.as_str()),
-        )
-    }
-}
-
-enum Repr {
-    Simple(ErrorKind),
-    Message(ErrorKind, String),
-    SimpleMessage(ErrorKind, &'static &'static str),
-    Custom(Box<Custom>),
-}
-
-#[derive(Debug)]
-struct Custom {
-    kind: ErrorKind,
-    error: Box<dyn error::Error + Send + Sync>,
-}
-
-pub struct Error {
-    repr: Repr,
-}
-
-impl fmt::Debug for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Debug::fmt(&self.repr, f)
-    }
-}
-
-impl Error {
-    pub fn new<E>(kind: ErrorKind, error: E) -> Error
-    where
-        E: Into<Box<dyn error::Error + Send + Sync>>,
-    {
-        Error {
-            repr: Repr::Custom(Box::new(Custom {
-                kind,
-                error: error.into(),
-            })),
-        }
-    }
-
-    pub fn new_message(kind: ErrorKind, msg: &str) -> Self {
-        Error {
-            repr: Repr::Message(kind, msg.to_string()),
-        }
-    }
-
-    pub const fn new_const(kind: ErrorKind, msg: &'static &'static str) -> Self {
-        Error {
-            repr: Repr::SimpleMessage(kind, msg),
-        }
-    }
-
-    pub fn kind(&self) -> ErrorKind {
-        match self.repr {
-            Repr::Custom(ref c) => c.kind,
-            Repr::Simple(kind) => kind,
-            Repr::SimpleMessage(kind, _) => kind,
-            Repr::Message(kind, _) => kind,
-        }
-    }
-}
-
-impl From<ErrorKind> for Error {
-    fn from(kind: ErrorKind) -> Self {
-        Error {
-            repr: Repr::Simple(kind),
-        }
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match &self.repr {
-            Repr::Custom(ref c) => c.error.fmt(f),
-            Repr::Simple(kind) => write!(f, "{}", kind.as_str()),
-            Repr::SimpleMessage(_, &msg) => msg.fmt(f),
-            Repr::Message(_, msg) => msg.fmt(f),
-        }
-    }
-}
-
-impl fmt::Debug for Repr {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Repr::Simple(kind) => f.debug_tuple("Kind").field(kind).finish(),
-            Repr::SimpleMessage(kind, &message) => f
-                .debug_struct("Error")
-                .field("kind", kind)
-                .field("message", &message)
-                .finish(),
-            Repr::Message(kind, message) => f
-                .debug_struct("Error")
-                .field("kind", kind)
-                .field("message", &message)
-                .finish(),
-            Repr::Custom(ref c) => c.error.fmt(f),
-        }
-    }
-}
-
-impl error::Error for Error {
-    fn source(&self) -> Option<&(dyn error::Error + 'static)> {
-        match self.repr {
-            Repr::Simple(..) => None,
-            Repr::Message(..) => None,
-            Repr::SimpleMessage(..) => None,
-            Repr::Custom(ref c) => c.error.source(),
-        }
-    }
-}
-
-impl From<crate::data::Error> for Error {
-    fn from(err: crate::data::Error) -> Self {
-        Error::new(ErrorKind::Parsing, err)
-    }
-}
-
-impl From<fishsticks::error::Error> for Error {
-    fn from(err: fishsticks::error::Error) -> Error {
-        Error::new_message(ErrorKind::Input, &err)
-    }
-}
-
-impl From<io::Error> for Error {
-    fn from(err: io::Error) -> Error {
-        Error::new(ErrorKind::File, err)
-    }
-}
-
-impl From<SendError<NetworkMessage>> for Error {
-    fn from(err: SendError<NetworkMessage>) -> Self {
-        Error::new(ErrorKind::Network, err)
-    }
-}
-
-impl From<FromUtf8Error> for Error {
-    fn from(err: FromUtf8Error) -> Self {
-        Error::new(ErrorKind::Parsing, err)
-    }
-}
-
-impl From<FileError> for Error {
-    fn from(err: FileError) -> Self {
-        Error::new(ErrorKind::File, err)
-    }
-}
-
-impl From<FontError> for Error {
-    fn from(err: FontError) -> Self {
-        Error::new(ErrorKind::Parsing, err)
-    }
-}
-
-impl From<hecs::ComponentError> for Error {
-    fn from(err: hecs::ComponentError) -> Self {
-        Error::new(ErrorKind::Ecs, err)
-    }
-}
-
-impl From<hecs::NoSuchEntity> for Error {
-    fn from(err: hecs::NoSuchEntity) -> Self {
-        Error::new(ErrorKind::Ecs, err)
-    }
-}
-
-impl From<hecs::QueryOneError> for Error {
-    fn from(err: hecs::QueryOneError) -> Self {
-        Error::new(ErrorKind::Ecs, err)
-    }
-}
-
-impl From<serde_json::Error> for Error {
-    fn from(err: serde_json::Error) -> Self {
-        Error::new(ErrorKind::Parsing, err)
-    }
-}
-
-impl From<toml::ser::Error> for Error {
-    fn from(err: toml::ser::Error) -> Self {
-        Error::new(ErrorKind::Parsing, err)
-    }
-}
-
-impl From<toml::de::Error> for Error {
-    fn from(err: toml::de::Error) -> Self {
-        Error::new(ErrorKind::Parsing, err)
-    }
-}
-
-/// This will create an error based on the parameters you provide.
-/// It follows the same rules as `format!`, only this takes an optional `ErrorKind`, as its
-/// first argument (before the format string), which will be the kind of `Error` returned.
-/// If no `ErrorKind` is specified, the default variant `ErrorKind::General` will be used.
-#[macro_export]
-macro_rules! formaterr {
-    ($kind:path, $($arg:tt)*) => ({
-        let res = format!($($arg)*);
-        $crate::error::Error::new_message($kind, &res)
-    });
-    ($($arg:tt)*) => ({
-        let res = format!($($arg)*);
-        $crate::error::Error::new_const($crate::error::ErrorKind::General, &res)
-    });
-}
diff --git a/core/src/input/mapping.rs b/core/src/input/mapping.rs
deleted file mode 100644
index 8064d5ba45..0000000000
--- a/core/src/input/mapping.rs
+++ /dev/null
@@ -1,631 +0,0 @@
-use fishsticks::GamepadId;
-
-use serde::{Deserialize, Serialize};
-
-use crate::error::ErrorKind;
-use crate::Result;
-
-#[derive(Debug, Copy, Clone, PartialEq, Hash, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub enum KeyCode {
-    Space,
-    Apostrophe,
-    Comma,
-    Minus,
-    Period,
-    Slash,
-    Key0,
-    Key1,
-    Key2,
-    Key3,
-    Key4,
-    Key5,
-    Key6,
-    Key7,
-    Key8,
-    Key9,
-    Semicolon,
-    Equal,
-    A,
-    B,
-    C,
-    D,
-    E,
-    F,
-    G,
-    H,
-    I,
-    J,
-    K,
-    L,
-    M,
-    N,
-    O,
-    P,
-    Q,
-    R,
-    S,
-    T,
-    U,
-    V,
-    W,
-    X,
-    Y,
-    Z,
-    LeftBracket,
-    Backslash,
-    RightBracket,
-    GraveAccent,
-    World1,
-    World2,
-    Escape,
-    Enter,
-    Tab,
-    Backspace,
-    Insert,
-    Delete,
-    Right,
-    Left,
-    Down,
-    Up,
-    PageUp,
-    PageDown,
-    Home,
-    End,
-    CapsLock,
-    ScrollLock,
-    NumLock,
-    PrintScreen,
-    Pause,
-    F1,
-    F2,
-    F3,
-    F4,
-    F5,
-    F6,
-    F7,
-    F8,
-    F9,
-    F10,
-    F11,
-    F12,
-    F13,
-    F14,
-    F15,
-    F16,
-    F17,
-    F18,
-    F19,
-    F20,
-    F21,
-    F22,
-    F23,
-    F24,
-    F25,
-    Kp0,
-    Kp1,
-    Kp2,
-    Kp3,
-    Kp4,
-    Kp5,
-    Kp6,
-    Kp7,
-    Kp8,
-    Kp9,
-    KpDecimal,
-    KpDivide,
-    KpMultiply,
-    KpSubtract,
-    KpAdd,
-    KpEnter,
-    KpEqual,
-    LeftShift,
-    LeftControl,
-    LeftAlt,
-    LeftSuper,
-    RightShift,
-    RightControl,
-    RightAlt,
-    RightSuper,
-    Menu,
-    Unknown,
-}
-
-impl From<macroquad::input::KeyCode> for KeyCode {
-    fn from(keycode: macroquad::input::KeyCode) -> Self {
-        match keycode {
-            macroquad::input::KeyCode::Space => Self::Space,
-            macroquad::input::KeyCode::Apostrophe => Self::Apostrophe,
-            macroquad::input::KeyCode::Comma => Self::Comma,
-            macroquad::input::KeyCode::Minus => Self::Minus,
-            macroquad::input::KeyCode::Period => Self::Period,
-            macroquad::input::KeyCode::Slash => Self::Slash,
-            macroquad::input::KeyCode::Key0 => Self::Key0,
-            macroquad::input::KeyCode::Key1 => Self::Key1,
-            macroquad::input::KeyCode::Key2 => Self::Key2,
-            macroquad::input::KeyCode::Key3 => Self::Key3,
-            macroquad::input::KeyCode::Key4 => Self::Key4,
-            macroquad::input::KeyCode::Key5 => Self::Key5,
-            macroquad::input::KeyCode::Key6 => Self::Key6,
-            macroquad::input::KeyCode::Key7 => Self::Key7,
-            macroquad::input::KeyCode::Key8 => Self::Key8,
-            macroquad::input::KeyCode::Key9 => Self::Key9,
-            macroquad::input::KeyCode::Semicolon => Self::Semicolon,
-            macroquad::input::KeyCode::Equal => Self::Equal,
-            macroquad::input::KeyCode::A => Self::A,
-            macroquad::input::KeyCode::B => Self::B,
-            macroquad::input::KeyCode::C => Self::C,
-            macroquad::input::KeyCode::D => Self::D,
-            macroquad::input::KeyCode::E => Self::E,
-            macroquad::input::KeyCode::F => Self::F,
-            macroquad::input::KeyCode::G => Self::G,
-            macroquad::input::KeyCode::H => Self::H,
-            macroquad::input::KeyCode::I => Self::I,
-            macroquad::input::KeyCode::J => Self::J,
-            macroquad::input::KeyCode::K => Self::K,
-            macroquad::input::KeyCode::L => Self::L,
-            macroquad::input::KeyCode::M => Self::M,
-            macroquad::input::KeyCode::N => Self::N,
-            macroquad::input::KeyCode::O => Self::O,
-            macroquad::input::KeyCode::P => Self::P,
-            macroquad::input::KeyCode::Q => Self::Q,
-            macroquad::input::KeyCode::R => Self::R,
-            macroquad::input::KeyCode::S => Self::S,
-            macroquad::input::KeyCode::T => Self::T,
-            macroquad::input::KeyCode::U => Self::U,
-            macroquad::input::KeyCode::V => Self::V,
-            macroquad::input::KeyCode::W => Self::W,
-            macroquad::input::KeyCode::X => Self::X,
-            macroquad::input::KeyCode::Y => Self::Y,
-            macroquad::input::KeyCode::Z => Self::Z,
-            macroquad::input::KeyCode::LeftBracket => Self::LeftBracket,
-            macroquad::input::KeyCode::Backslash => Self::Backslash,
-            macroquad::input::KeyCode::RightBracket => Self::RightBracket,
-            macroquad::input::KeyCode::GraveAccent => Self::GraveAccent,
-            macroquad::input::KeyCode::World1 => Self::World1,
-            macroquad::input::KeyCode::World2 => Self::World2,
-            macroquad::input::KeyCode::Escape => Self::Escape,
-            macroquad::input::KeyCode::Enter => Self::Enter,
-            macroquad::input::KeyCode::Tab => Self::Tab,
-            macroquad::input::KeyCode::Backspace => Self::Backspace,
-            macroquad::input::KeyCode::Insert => Self::Insert,
-            macroquad::input::KeyCode::Delete => Self::Delete,
-            macroquad::input::KeyCode::Right => Self::Right,
-            macroquad::input::KeyCode::Left => Self::Left,
-            macroquad::input::KeyCode::Down => Self::Down,
-            macroquad::input::KeyCode::Up => Self::Up,
-            macroquad::input::KeyCode::PageUp => Self::PageUp,
-            macroquad::input::KeyCode::PageDown => Self::PageDown,
-            macroquad::input::KeyCode::Home => Self::Home,
-            macroquad::input::KeyCode::End => Self::End,
-            macroquad::input::KeyCode::CapsLock => Self::CapsLock,
-            macroquad::input::KeyCode::ScrollLock => Self::ScrollLock,
-            macroquad::input::KeyCode::NumLock => Self::NumLock,
-            macroquad::input::KeyCode::PrintScreen => Self::PrintScreen,
-            macroquad::input::KeyCode::Pause => Self::Pause,
-            macroquad::input::KeyCode::F1 => Self::F1,
-            macroquad::input::KeyCode::F2 => Self::F2,
-            macroquad::input::KeyCode::F3 => Self::F3,
-            macroquad::input::KeyCode::F4 => Self::F4,
-            macroquad::input::KeyCode::F5 => Self::F5,
-            macroquad::input::KeyCode::F6 => Self::F6,
-            macroquad::input::KeyCode::F7 => Self::F7,
-            macroquad::input::KeyCode::F8 => Self::F8,
-            macroquad::input::KeyCode::F9 => Self::F9,
-            macroquad::input::KeyCode::F10 => Self::F10,
-            macroquad::input::KeyCode::F11 => Self::F11,
-            macroquad::input::KeyCode::F12 => Self::F12,
-            macroquad::input::KeyCode::F13 => Self::F13,
-            macroquad::input::KeyCode::F14 => Self::F14,
-            macroquad::input::KeyCode::F15 => Self::F15,
-            macroquad::input::KeyCode::F16 => Self::F16,
-            macroquad::input::KeyCode::F17 => Self::F17,
-            macroquad::input::KeyCode::F18 => Self::F18,
-            macroquad::input::KeyCode::F19 => Self::F19,
-            macroquad::input::KeyCode::F20 => Self::F20,
-            macroquad::input::KeyCode::F21 => Self::F21,
-            macroquad::input::KeyCode::F22 => Self::F22,
-            macroquad::input::KeyCode::F23 => Self::F23,
-            macroquad::input::KeyCode::F24 => Self::F24,
-            macroquad::input::KeyCode::F25 => Self::F25,
-            macroquad::input::KeyCode::Kp0 => Self::Kp0,
-            macroquad::input::KeyCode::Kp1 => Self::Kp1,
-            macroquad::input::KeyCode::Kp2 => Self::Kp2,
-            macroquad::input::KeyCode::Kp3 => Self::Kp3,
-            macroquad::input::KeyCode::Kp4 => Self::Kp4,
-            macroquad::input::KeyCode::Kp5 => Self::Kp5,
-            macroquad::input::KeyCode::Kp6 => Self::Kp6,
-            macroquad::input::KeyCode::Kp7 => Self::Kp7,
-            macroquad::input::KeyCode::Kp8 => Self::Kp8,
-            macroquad::input::KeyCode::Kp9 => Self::Kp9,
-            macroquad::input::KeyCode::KpDecimal => Self::KpDecimal,
-            macroquad::input::KeyCode::KpDivide => Self::KpDivide,
-            macroquad::input::KeyCode::KpMultiply => Self::KpMultiply,
-            macroquad::input::KeyCode::KpSubtract => Self::KpSubtract,
-            macroquad::input::KeyCode::KpAdd => Self::KpAdd,
-            macroquad::input::KeyCode::KpEnter => Self::KpEnter,
-            macroquad::input::KeyCode::KpEqual => Self::KpEqual,
-            macroquad::input::KeyCode::LeftShift => Self::LeftShift,
-            macroquad::input::KeyCode::LeftControl => Self::LeftControl,
-            macroquad::input::KeyCode::LeftAlt => Self::LeftAlt,
-            macroquad::input::KeyCode::LeftSuper => Self::LeftSuper,
-            macroquad::input::KeyCode::RightShift => Self::RightShift,
-            macroquad::input::KeyCode::RightControl => Self::RightControl,
-            macroquad::input::KeyCode::RightAlt => Self::RightAlt,
-            macroquad::input::KeyCode::RightSuper => Self::RightSuper,
-            macroquad::input::KeyCode::Menu => Self::Menu,
-            macroquad::input::KeyCode::Unknown => Self::Unknown,
-        }
-    }
-}
-
-impl From<KeyCode> for macroquad::input::KeyCode {
-    fn from(keycode: KeyCode) -> Self {
-        match keycode {
-            KeyCode::Space => Self::Space,
-            KeyCode::Apostrophe => Self::Apostrophe,
-            KeyCode::Comma => Self::Comma,
-            KeyCode::Minus => Self::Minus,
-            KeyCode::Period => Self::Period,
-            KeyCode::Slash => Self::Slash,
-            KeyCode::Key0 => Self::Key0,
-            KeyCode::Key1 => Self::Key1,
-            KeyCode::Key2 => Self::Key2,
-            KeyCode::Key3 => Self::Key3,
-            KeyCode::Key4 => Self::Key4,
-            KeyCode::Key5 => Self::Key5,
-            KeyCode::Key6 => Self::Key6,
-            KeyCode::Key7 => Self::Key7,
-            KeyCode::Key8 => Self::Key8,
-            KeyCode::Key9 => Self::Key9,
-            KeyCode::Semicolon => Self::Semicolon,
-            KeyCode::Equal => Self::Equal,
-            KeyCode::A => Self::A,
-            KeyCode::B => Self::B,
-            KeyCode::C => Self::C,
-            KeyCode::D => Self::D,
-            KeyCode::E => Self::E,
-            KeyCode::F => Self::F,
-            KeyCode::G => Self::G,
-            KeyCode::H => Self::H,
-            KeyCode::I => Self::I,
-            KeyCode::J => Self::J,
-            KeyCode::K => Self::K,
-            KeyCode::L => Self::L,
-            KeyCode::M => Self::M,
-            KeyCode::N => Self::N,
-            KeyCode::O => Self::O,
-            KeyCode::P => Self::P,
-            KeyCode::Q => Self::Q,
-            KeyCode::R => Self::R,
-            KeyCode::S => Self::S,
-            KeyCode::T => Self::T,
-            KeyCode::U => Self::U,
-            KeyCode::V => Self::V,
-            KeyCode::W => Self::W,
-            KeyCode::X => Self::X,
-            KeyCode::Y => Self::Y,
-            KeyCode::Z => Self::Z,
-            KeyCode::LeftBracket => Self::LeftBracket,
-            KeyCode::Backslash => Self::Backslash,
-            KeyCode::RightBracket => Self::RightBracket,
-            KeyCode::GraveAccent => Self::GraveAccent,
-            KeyCode::World1 => Self::World1,
-            KeyCode::World2 => Self::World2,
-            KeyCode::Escape => Self::Escape,
-            KeyCode::Enter => Self::Enter,
-            KeyCode::Tab => Self::Tab,
-            KeyCode::Backspace => Self::Backspace,
-            KeyCode::Insert => Self::Insert,
-            KeyCode::Delete => Self::Delete,
-            KeyCode::Right => Self::Right,
-            KeyCode::Left => Self::Left,
-            KeyCode::Down => Self::Down,
-            KeyCode::Up => Self::Up,
-            KeyCode::PageUp => Self::PageUp,
-            KeyCode::PageDown => Self::PageDown,
-            KeyCode::Home => Self::Home,
-            KeyCode::End => Self::End,
-            KeyCode::CapsLock => Self::CapsLock,
-            KeyCode::ScrollLock => Self::ScrollLock,
-            KeyCode::NumLock => Self::NumLock,
-            KeyCode::PrintScreen => Self::PrintScreen,
-            KeyCode::Pause => Self::Pause,
-            KeyCode::F1 => Self::F1,
-            KeyCode::F2 => Self::F2,
-            KeyCode::F3 => Self::F3,
-            KeyCode::F4 => Self::F4,
-            KeyCode::F5 => Self::F5,
-            KeyCode::F6 => Self::F6,
-            KeyCode::F7 => Self::F7,
-            KeyCode::F8 => Self::F8,
-            KeyCode::F9 => Self::F9,
-            KeyCode::F10 => Self::F10,
-            KeyCode::F11 => Self::F11,
-            KeyCode::F12 => Self::F12,
-            KeyCode::F13 => Self::F13,
-            KeyCode::F14 => Self::F14,
-            KeyCode::F15 => Self::F15,
-            KeyCode::F16 => Self::F16,
-            KeyCode::F17 => Self::F17,
-            KeyCode::F18 => Self::F18,
-            KeyCode::F19 => Self::F19,
-            KeyCode::F20 => Self::F20,
-            KeyCode::F21 => Self::F21,
-            KeyCode::F22 => Self::F22,
-            KeyCode::F23 => Self::F23,
-            KeyCode::F24 => Self::F24,
-            KeyCode::F25 => Self::F25,
-            KeyCode::Kp0 => Self::Kp0,
-            KeyCode::Kp1 => Self::Kp1,
-            KeyCode::Kp2 => Self::Kp2,
-            KeyCode::Kp3 => Self::Kp3,
-            KeyCode::Kp4 => Self::Kp4,
-            KeyCode::Kp5 => Self::Kp5,
-            KeyCode::Kp6 => Self::Kp6,
-            KeyCode::Kp7 => Self::Kp7,
-            KeyCode::Kp8 => Self::Kp8,
-            KeyCode::Kp9 => Self::Kp9,
-            KeyCode::KpDecimal => Self::KpDecimal,
-            KeyCode::KpDivide => Self::KpDivide,
-            KeyCode::KpMultiply => Self::KpMultiply,
-            KeyCode::KpSubtract => Self::KpSubtract,
-            KeyCode::KpAdd => Self::KpAdd,
-            KeyCode::KpEnter => Self::KpEnter,
-            KeyCode::KpEqual => Self::KpEqual,
-            KeyCode::LeftShift => Self::LeftShift,
-            KeyCode::LeftControl => Self::LeftControl,
-            KeyCode::LeftAlt => Self::LeftAlt,
-            KeyCode::LeftSuper => Self::LeftSuper,
-            KeyCode::RightShift => Self::RightShift,
-            KeyCode::RightControl => Self::RightControl,
-            KeyCode::RightAlt => Self::RightAlt,
-            KeyCode::RightSuper => Self::RightSuper,
-            KeyCode::Menu => Self::Menu,
-            KeyCode::Unknown => Self::Unknown,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub enum Button {
-    A,
-    B,
-    X,
-    Y,
-    Back,
-    Guide,
-    Start,
-    LeftStick,
-    RightStick,
-    LeftShoulder,
-    RightShoulder,
-    LeftTrigger,
-    RightTrigger,
-    DPadUp,
-    DPadDown,
-    DPadLeft,
-    DPadRight,
-    #[serde(skip)]
-    Unknown,
-}
-
-impl From<fishsticks::Button> for Button {
-    fn from(button: fishsticks::Button) -> Self {
-        match button {
-            fishsticks::Button::South => Self::A,
-            fishsticks::Button::East => Self::B,
-            fishsticks::Button::West => Self::X,
-            fishsticks::Button::North => Self::Y,
-            fishsticks::Button::Select => Self::Back,
-            fishsticks::Button::Mode => Self::Guide,
-            fishsticks::Button::Start => Self::Start,
-            fishsticks::Button::LeftThumb => Self::LeftStick,
-            fishsticks::Button::RightThumb => Self::RightStick,
-            fishsticks::Button::LeftTrigger => Self::LeftTrigger,
-            fishsticks::Button::RightTrigger => Self::RightTrigger,
-            fishsticks::Button::LeftTrigger2 => Self::LeftShoulder,
-            fishsticks::Button::RightTrigger2 => Self::RightShoulder,
-            fishsticks::Button::DPadUp => Self::DPadUp,
-            fishsticks::Button::DPadDown => Self::DPadDown,
-            fishsticks::Button::DPadLeft => Self::DPadLeft,
-            fishsticks::Button::DPadRight => Self::DPadRight,
-            _ => Self::Unknown,
-        }
-    }
-}
-
-impl From<Button> for fishsticks::Button {
-    fn from(button: Button) -> Self {
-        match button {
-            Button::A => Self::South,
-            Button::B => Self::East,
-            Button::X => Self::West,
-            Button::Y => Self::North,
-            Button::Back => Self::Select,
-            Button::Guide => Self::Mode,
-            Button::Start => Self::Start,
-            Button::LeftStick => Self::LeftThumb,
-            Button::RightStick => Self::RightThumb,
-            Button::LeftTrigger => Self::LeftTrigger,
-            Button::RightTrigger => Self::RightTrigger,
-            Button::LeftShoulder => Self::LeftTrigger2,
-            Button::RightShoulder => Self::RightTrigger2,
-            Button::DPadUp => Self::DPadUp,
-            Button::DPadDown => Self::DPadDown,
-            Button::DPadLeft => Self::DPadLeft,
-            Button::DPadRight => Self::DPadRight,
-            Button::Unknown => Self::Unknown,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct KeyMapping {
-    primary: KeyCode,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    secondary: Option<KeyCode>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct KeyboardMapping {
-    pub left: KeyCode,
-    pub right: KeyCode,
-    pub fire: KeyCode,
-    pub jump: KeyCode,
-    pub pickup: KeyCode,
-    pub crouch: KeyCode,
-    pub slide: KeyCode,
-}
-
-impl KeyboardMapping {
-    pub fn default_primary() -> KeyboardMapping {
-        KeyboardMapping {
-            left: KeyCode::Left,
-            right: KeyCode::Right,
-            fire: KeyCode::L,
-            jump: KeyCode::Up,
-            pickup: KeyCode::K,
-            crouch: KeyCode::Down,
-            slide: KeyCode::RightControl,
-        }
-    }
-
-    pub fn default_secondary() -> KeyboardMapping {
-        KeyboardMapping {
-            left: KeyCode::A,
-            right: KeyCode::D,
-            fire: KeyCode::V,
-            jump: KeyCode::W,
-            pickup: KeyCode::C,
-            crouch: KeyCode::S,
-            slide: KeyCode::F,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct GamepadMapping {
-    pub id: usize,
-    pub fire: Button,
-    pub jump: Button,
-    pub pickup: Button,
-    pub slide: Button,
-}
-
-impl From<usize> for GamepadMapping {
-    fn from(id: usize) -> Self {
-        GamepadMapping {
-            id,
-            fire: Button::B,
-            jump: Button::A,
-            pickup: Button::X,
-            slide: Button::Y,
-        }
-    }
-}
-
-impl From<&GamepadId> for GamepadMapping {
-    fn from(id: &GamepadId) -> Self {
-        let id: usize = (*id).into();
-        id.into()
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct InputMapping {
-    #[serde(
-        default = "KeyboardMapping::default_primary",
-        rename = "keyboard-primary"
-    )]
-    pub keyboard_primary: KeyboardMapping,
-    #[serde(
-        default = "KeyboardMapping::default_secondary",
-        rename = "keyboard-secondary"
-    )]
-    pub keyboard_secondary: KeyboardMapping,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub gamepads: Vec<GamepadMapping>,
-}
-
-impl InputMapping {
-    pub fn get_gamepad_mapping(&self, id: usize) -> Option<GamepadMapping> {
-        self.gamepads.iter().find_map(|gamepad| {
-            if gamepad.id == id {
-                Some(gamepad.clone())
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn verify(&mut self) -> Result<()> {
-        {
-            let mut used_keys = Vec::new();
-
-            let keyboards = [&self.keyboard_primary, &self.keyboard_secondary];
-
-            for keyboard in keyboards {
-                let actions = [
-                    keyboard.left,
-                    keyboard.right,
-                    keyboard.fire,
-                    keyboard.jump,
-                    keyboard.pickup,
-                    keyboard.crouch,
-                    keyboard.slide,
-                ];
-
-                for keycode in actions {
-                    if used_keys.contains(&keycode) {
-                        return Err(formaterr!(
-                            ErrorKind::Config,
-                            "Key '{:?}' is mapped twice!",
-                            keycode
-                        ));
-                    } else {
-                        used_keys.push(keycode);
-                    }
-                }
-            }
-        }
-
-        {
-            let mut used_buttons = Vec::new();
-
-            for gamepad in &self.gamepads {
-                let actions = [gamepad.fire, gamepad.jump, gamepad.pickup, gamepad.slide];
-
-                for button in actions {
-                    if used_buttons.contains(&button) {
-                        return Err(formaterr!(
-                            ErrorKind::Config,
-                            "Button '{:?}' on gamepad '{}' is mapped twice!",
-                            button,
-                            gamepad.id,
-                        ));
-                    } else {
-                        used_buttons.push(button);
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl Default for InputMapping {
-    fn default() -> Self {
-        InputMapping {
-            keyboard_primary: KeyboardMapping::default_primary(),
-            keyboard_secondary: KeyboardMapping::default_secondary(),
-            gamepads: Vec::new(),
-        }
-    }
-}
diff --git a/core/src/input/mod.rs b/core/src/input/mod.rs
deleted file mode 100644
index ef420f3243..0000000000
--- a/core/src/input/mod.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-pub mod mapping;
-
-pub use mapping::{Button, KeyCode};
-
-use fishsticks::Axis;
-
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-pub use fishsticks::GamepadContext;
-
-use crate::{Config, Result};
-
-#[derive(Default, Debug, Clone, Copy, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct PlayerInput {
-    pub left: bool,
-    pub right: bool,
-    pub fire: bool,
-    pub jump: bool,
-    pub pickup: bool,
-    pub float: bool,
-    pub crouch: bool,
-    pub slide: bool,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum GameInputScheme {
-    /// Left side of the keyboard, around WASD
-    KeyboardRight,
-    /// Left side of the keyboard, around Arrows
-    KeyboardLeft,
-    /// Gamepad index
-    Gamepad(fishsticks::GamepadId),
-}
-
-pub fn update_gamepad_context(context: Option<&mut GamepadContext>) -> Result<()> {
-    if let Some(context) = context {
-        context.update()?;
-    } else {
-        let mut context = storage::get_mut::<GamepadContext>();
-        context.update()?;
-    }
-
-    Ok(())
-}
-
-pub fn is_gamepad_btn_pressed(context: Option<&GamepadContext>, btn: fishsticks::Button) -> bool {
-    let check = |context: &GamepadContext| -> bool {
-        for (_, gamepad) in context.gamepads() {
-            if gamepad.digital_inputs.just_activated(btn) {
-                return true;
-            }
-        }
-
-        false
-    };
-
-    if let Some(context) = context {
-        check(context)
-    } else {
-        let context = storage::get::<GamepadContext>();
-        check(&context)
-    }
-}
-
-pub fn collect_local_input(input_scheme: GameInputScheme) -> PlayerInput {
-    let mut input = PlayerInput::default();
-
-    if let GameInputScheme::Gamepad(ix) = &input_scheme {
-        let gamepad_context = storage::get_mut::<GamepadContext>();
-        let gamepad = gamepad_context.gamepad(*ix);
-
-        if let Some(gamepad) = gamepad {
-            let input_mapping = {
-                let config = storage::get::<Config>();
-                config
-                    .input
-                    .get_gamepad_mapping((*ix).into())
-                    .unwrap_or_else(|| ix.into())
-            };
-
-            input.left = gamepad.digital_inputs.activated(Button::DPadLeft.into())
-                || gamepad.analog_inputs.digital_value(Axis::LeftStickX) < 0.0;
-
-            input.right = gamepad.digital_inputs.activated(Button::DPadRight.into())
-                || gamepad.analog_inputs.digital_value(Axis::LeftStickX) > 0.0;
-
-            input.fire = gamepad.digital_inputs.activated(input_mapping.fire.into());
-
-            input.jump = gamepad
-                .digital_inputs
-                .just_activated(input_mapping.jump.into());
-
-            input.float = gamepad.digital_inputs.activated(input_mapping.jump.into());
-
-            input.pickup = gamepad
-                .digital_inputs
-                .just_activated(input_mapping.pickup.into());
-
-            input.crouch = gamepad.digital_inputs.activated(Button::DPadDown.into())
-                || gamepad.analog_inputs.digital_value(Axis::LeftStickY) > 0.0;
-
-            input.slide = input.crouch
-                && gamepad
-                    .digital_inputs
-                    .just_activated(input_mapping.slide.into());
-        }
-    } else {
-        let input_mapping = {
-            let config = storage::get::<Config>();
-
-            if matches!(input_scheme, GameInputScheme::KeyboardRight) {
-                config.input.keyboard_primary.clone()
-            } else {
-                config.input.keyboard_secondary.clone()
-            }
-        };
-
-        input.left = is_key_down(input_mapping.left.into());
-        input.right = is_key_down(input_mapping.right.into());
-        input.fire = is_key_down(input_mapping.fire.into());
-        input.jump = is_key_pressed(input_mapping.jump.into());
-        input.pickup = is_key_pressed(input_mapping.pickup.into());
-        input.float = is_key_down(input_mapping.jump.into());
-        input.crouch = is_key_down(input_mapping.crouch.into());
-        input.slide = input.crouch && is_key_pressed(input_mapping.slide.into());
-    }
-
-    input
-}
diff --git a/core/src/json/helpers.rs b/core/src/json/helpers.rs
deleted file mode 100644
index c65404587b..0000000000
--- a/core/src/json/helpers.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-use std::collections::HashMap;
-
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-pub fn default_true() -> bool {
-    true
-}
-
-pub fn is_true(val: &bool) -> bool {
-    *val
-}
-
-pub fn is_false(val: &bool) -> bool {
-    !*val
-}
-
-/// This can be used to wrap types in order to make serde accept both a value and a vector of
-/// values for a field, when deserializing.
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(untagged)]
-pub enum OneOrMany<T: Clone> {
-    One(T),
-    Many(Vec<T>),
-}
-
-impl<T: Clone> Default for OneOrMany<T> {
-    fn default() -> Self {
-        Self::Many(Vec::new())
-    }
-}
-
-impl<T: Clone> OneOrMany<T> {
-    pub fn into_vec(self) -> Vec<T> {
-        match self {
-            Self::One(value) => vec![value],
-            Self::Many(values) => values,
-        }
-    }
-}
-
-impl<T: Clone> From<OneOrMany<T>> for Vec<T> {
-    fn from(v: OneOrMany<T>) -> Self {
-        match v {
-            OneOrMany::One(value) => vec![value],
-            OneOrMany::Many(values) => values,
-        }
-    }
-}
-
-/// This is used to allow values of different types for the same field in a JSON object.
-/// When an enum with only tuple-like variants, all with a single member each, is marked as untagged,
-/// serde will return the appropriate enum variant, depending on the type of the JSON value.
-/// Furthermore, you can use `GenericParam::Vec` and `GenericParam::HashMap` to allow members of
-/// different types in the same collection, in your JSON objects.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(untagged)]
-pub enum GenericParam {
-    Bool(bool),
-    Int(i32),
-    UInt(u32),
-    Float(f32),
-    String(String),
-    Color(#[serde(with = "super::ColorDef")] Color),
-    Vec2(#[serde(with = "super::vec2_def")] Vec2),
-    IVec2(#[serde(with = "super::ivec2_def")] IVec2),
-    UVec2(#[serde(with = "super::uvec2_def")] UVec2),
-    Vec(Vec<Self>),
-    HashMap(HashMap<String, Self>),
-}
-
-impl GenericParam {
-    pub fn get_value<T: GenericParamType>(&self) -> Option<&T> {
-        T::from_param(self)
-    }
-}
-
-pub trait GenericParamType: Clone {
-    fn from_param(param: &GenericParam) -> Option<&Self>;
-}
-
-impl GenericParamType for bool {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::Bool(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for i32 {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::Int(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for u32 {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::UInt(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for f32 {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::Float(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for String {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::String(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for Color {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::Color(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for Vec2 {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::Vec2(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for IVec2 {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::IVec2(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for UVec2 {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::UVec2(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for Vec<GenericParam> {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::Vec(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-impl GenericParamType for HashMap<String, GenericParam> {
-    fn from_param(param: &GenericParam) -> Option<&Self> {
-        if let GenericParam::HashMap(value) = param {
-            Some(value)
-        } else {
-            None
-        }
-    }
-}
-
-pub trait BoolHelpers {
-    fn is_true(&self) -> bool;
-    fn is_false(&self) -> bool;
-}
-
-impl BoolHelpers for bool {
-    fn is_true(&self) -> bool {
-        *self
-    }
-
-    fn is_false(&self) -> bool {
-        !*self
-    }
-}
diff --git a/core/src/json/math.rs b/core/src/json/math.rs
deleted file mode 100644
index 9386d921c1..0000000000
--- a/core/src/json/math.rs
+++ /dev/null
@@ -1,410 +0,0 @@
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-pub mod vec2_def {
-    use super::{vec2, Vec2};
-    use serde::{
-        de::{self, MapAccess, Visitor},
-        ser::SerializeStruct,
-        Deserialize, Deserializer, Serializer,
-    };
-    use std::fmt;
-
-    pub fn serialize<S>(value: &Vec2, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut state = serializer.serialize_struct(stringify!(Vec2), 2)?;
-        state.serialize_field("x", &value.x)?;
-        state.serialize_field("y", &value.y)?;
-        state.end()
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Vec2, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(deny_unknown_fields)]
-        #[serde(field_identifier, rename_all = "snake_case")]
-        enum Field {
-            X,
-            Y,
-        }
-
-        struct Vec2Visitor;
-
-        impl<'de> Visitor<'de> for Vec2Visitor {
-            type Value = Vec2;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-                formatter.write_str(concat!("struct ", stringify!(Vec2)))
-            }
-
-            fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
-            where
-                A: MapAccess<'de>,
-            {
-                let mut x = None;
-                let mut y = None;
-
-                while let Some(key) = map.next_key()? {
-                    match key {
-                        Field::X => {
-                            if x.is_some() {
-                                return Err(de::Error::duplicate_field("x"));
-                            }
-                            x = Some(map.next_value()?);
-                        }
-                        Field::Y => {
-                            if y.is_some() {
-                                return Err(de::Error::duplicate_field("y"));
-                            }
-                            y = Some(map.next_value()?);
-                        }
-                    }
-                }
-
-                let x = x.ok_or_else(|| de::Error::missing_field("x"))?;
-                let y = y.ok_or_else(|| de::Error::missing_field("y"))?;
-
-                Ok(vec2(x, y))
-            }
-        }
-
-        deserializer.deserialize_struct(stringify!(Vec2), &["x", "y"], Vec2Visitor)
-    }
-}
-
-pub mod uvec2_def {
-    use super::{uvec2, UVec2};
-    use serde::de::MapAccess;
-    use serde::{
-        de::{self, Visitor},
-        ser::SerializeStruct,
-        Deserialize, Deserializer, Serializer,
-    };
-
-    use std::fmt;
-
-    pub fn serialize<S>(value: &UVec2, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut state = serializer.serialize_struct(stringify!(UVec2), 2)?;
-        state.serialize_field("x", &value.x)?;
-        state.serialize_field("y", &value.y)?;
-        state.end()
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<UVec2, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(deny_unknown_fields)]
-        #[serde(field_identifier, rename_all = "snake_case")]
-        enum Field {
-            X,
-            Y,
-        }
-
-        struct UVec2Visitor;
-
-        impl<'de> Visitor<'de> for UVec2Visitor {
-            type Value = UVec2;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-                formatter.write_str(concat!("struct ", stringify!(UVec2)))
-            }
-
-            fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
-            where
-                A: MapAccess<'de>,
-            {
-                let mut x = None;
-                let mut y = None;
-
-                while let Some(key) = map.next_key()? {
-                    match key {
-                        Field::X => {
-                            if x.is_some() {
-                                return Err(de::Error::duplicate_field("x"));
-                            }
-                            x = Some(map.next_value()?);
-                        }
-                        Field::Y => {
-                            if y.is_some() {
-                                return Err(de::Error::duplicate_field("y"));
-                            }
-                            y = Some(map.next_value()?);
-                        }
-                    }
-                }
-
-                let x = x.ok_or_else(|| de::Error::missing_field("x"))?;
-                let y = y.ok_or_else(|| de::Error::missing_field("y"))?;
-
-                Ok(uvec2(x, y))
-            }
-        }
-
-        deserializer.deserialize_struct(stringify!(UVec2), &["x", "y"], UVec2Visitor)
-    }
-}
-
-pub mod ivec2_def {
-    use super::{ivec2, IVec2};
-    use serde::de::MapAccess;
-    use serde::{
-        de::{self, Visitor},
-        ser::SerializeStruct,
-        Deserialize, Deserializer, Serializer,
-    };
-
-    use std::fmt;
-
-    pub fn serialize<S>(value: &IVec2, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut state = serializer.serialize_struct(stringify!(UVec2), 2)?;
-        state.serialize_field("x", &value.x)?;
-        state.serialize_field("y", &value.y)?;
-        state.end()
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<IVec2, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(deny_unknown_fields)]
-        #[serde(field_identifier, rename_all = "snake_case")]
-        enum Field {
-            X,
-            Y,
-        }
-
-        struct IVec2Visitor;
-
-        impl<'de> Visitor<'de> for IVec2Visitor {
-            type Value = IVec2;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-                formatter.write_str(concat!("struct ", stringify!(IVec2)))
-            }
-
-            fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
-            where
-                A: MapAccess<'de>,
-            {
-                let mut x = None;
-                let mut y = None;
-
-                while let Some(key) = map.next_key()? {
-                    match key {
-                        Field::X => {
-                            if x.is_some() {
-                                return Err(de::Error::duplicate_field("x"));
-                            }
-                            x = Some(map.next_value()?);
-                        }
-                        Field::Y => {
-                            if y.is_some() {
-                                return Err(de::Error::duplicate_field("y"));
-                            }
-                            y = Some(map.next_value()?);
-                        }
-                    }
-                }
-
-                let x = x.ok_or_else(|| de::Error::missing_field("x"))?;
-                let y = y.ok_or_else(|| de::Error::missing_field("y"))?;
-
-                Ok(ivec2(x, y))
-            }
-        }
-
-        deserializer.deserialize_struct(stringify!(IVec2), &["x", "y"], IVec2Visitor)
-    }
-}
-
-pub mod vec2_opt {
-    use super::Vec2;
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-    pub fn serialize<S>(value: &Option<Vec2>, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        #[derive(Serialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper<'a>(#[serde(with = "super::vec2_def")] &'a Vec2);
-
-        value.as_ref().map(Helper).serialize(serializer)
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<Vec2>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper(#[serde(with = "super::vec2_def")] Vec2);
-
-        let helper = Option::deserialize(deserializer)?;
-        Ok(helper.map(|Helper(external)| external))
-    }
-}
-
-pub mod vec2_vec {
-    use super::Vec2;
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-    pub fn serialize<S>(value: &[Vec2], serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        #[derive(Serialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper<'a>(#[serde(with = "super::vec2_def")] &'a Vec2);
-
-        let helper: Vec<Helper> = value.iter().map(Helper).collect();
-        helper.serialize(serializer)
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Vec<Vec2>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper(#[serde(with = "super::vec2_def")] Vec2);
-
-        let helper = Vec::deserialize(deserializer)?;
-        Ok(helper
-            .into_iter()
-            .map(|Helper(external)| external)
-            .collect())
-    }
-}
-
-pub mod uvec2_opt {
-    use super::UVec2;
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-    pub fn serialize<S>(value: &Option<UVec2>, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        #[derive(Serialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper<'a>(#[serde(with = "super::uvec2_def")] &'a UVec2);
-
-        value.as_ref().map(Helper).serialize(serializer)
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<UVec2>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper(#[serde(with = "super::uvec2_def")] UVec2);
-
-        let helper = Option::deserialize(deserializer)?;
-        Ok(helper.map(|Helper(external)| external))
-    }
-}
-
-pub mod ivec2_opt {
-    use super::IVec2;
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-    pub fn serialize<S>(value: &Option<IVec2>, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        #[derive(Serialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper<'a>(#[serde(with = "super::ivec2_def")] &'a IVec2);
-
-        value.as_ref().map(Helper).serialize(serializer)
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<IVec2>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper(#[serde(with = "super::ivec2_def")] IVec2);
-
-        let helper = Option::deserialize(deserializer)?;
-        Ok(helper.map(|Helper(external)| external))
-    }
-}
-
-#[derive(Copy, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(remote = "Rect")]
-pub struct RectDef {
-    x: f32,
-    y: f32,
-    #[serde(rename = "width", alias = "w")]
-    w: f32,
-    #[serde(rename = "height", alias = "h")]
-    h: f32,
-}
-
-impl From<Rect> for RectDef {
-    fn from(other: Rect) -> Self {
-        RectDef {
-            x: other.x,
-            y: other.y,
-            w: other.w,
-            h: other.h,
-        }
-    }
-}
-
-impl From<RectDef> for Rect {
-    fn from(other: RectDef) -> Self {
-        Rect {
-            x: other.x,
-            y: other.y,
-            w: other.w,
-            h: other.h,
-        }
-    }
-}
-
-pub mod rect_opt {
-    use super::{Rect, RectDef};
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-    pub fn serialize<S>(value: &Option<Rect>, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        #[derive(Serialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper<'a>(#[serde(with = "RectDef")] &'a Rect);
-
-        value.as_ref().map(Helper).serialize(serializer)
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<Rect>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper(#[serde(with = "RectDef")] Rect);
-
-        let helper = Option::deserialize(deserializer)?;
-        Ok(helper.map(|Helper(external)| external))
-    }
-}
diff --git a/core/src/json/mod.rs b/core/src/json/mod.rs
deleted file mode 100644
index e91a0062b9..0000000000
--- a/core/src/json/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod helpers;
-mod math;
-mod render;
-
-pub use helpers::*;
-pub use math::*;
-pub use render::*;
diff --git a/core/src/json/render.rs b/core/src/json/render.rs
deleted file mode 100644
index 3cf76f998c..0000000000
--- a/core/src/json/render.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-pub fn default_scale() -> f32 {
-    1.0
-}
-
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(remote = "Color")]
-pub struct ColorDef {
-    #[serde(rename = "red", alias = "r")]
-    pub r: f32,
-    #[serde(rename = "green", alias = "g")]
-    pub g: f32,
-    #[serde(rename = "blue", alias = "b")]
-    pub b: f32,
-    #[serde(rename = "alpha", alias = "a")]
-    pub a: f32,
-}
-
-impl From<Color> for ColorDef {
-    fn from(other: Color) -> Self {
-        ColorDef {
-            r: other.r,
-            g: other.g,
-            b: other.b,
-            a: other.a,
-        }
-    }
-}
-
-impl From<ColorDef> for Color {
-    fn from(other: ColorDef) -> Self {
-        Color {
-            r: other.r,
-            g: other.g,
-            b: other.b,
-            a: other.a,
-        }
-    }
-}
-
-pub mod color_opt {
-    use super::Color;
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-    pub fn serialize<S>(value: &Option<Color>, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        #[derive(Serialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper<'a>(#[serde(with = "super::ColorDef")] &'a Color);
-
-        value.as_ref().map(Helper).serialize(serializer)
-    }
-
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<Color>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(deny_unknown_fields)]
-        struct Helper(#[serde(with = "super::ColorDef")] Color);
-
-        let helper = Option::deserialize(deserializer)?;
-        Ok(helper.map(|Helper(external)| external))
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(remote = "FilterMode")]
-pub enum FilterModeDef {
-    #[serde(rename = "linear")]
-    Linear,
-    #[serde(rename = "nearest_neighbor")]
-    Nearest,
-}
-
-pub fn default_filter_mode() -> FilterMode {
-    FilterMode::Nearest
-}
diff --git a/core/src/lib.rs b/core/src/lib.rs
deleted file mode 100644
index ed8f3cc21a..0000000000
--- a/core/src/lib.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-#[macro_use]
-pub mod error;
-pub mod config;
-pub mod data;
-pub mod input;
-pub mod json;
-pub mod math;
-pub mod network;
-pub mod noise;
-pub mod text;
-
-mod channel;
-mod transform;
-
-pub use channel::Channel;
-pub use config::{Config, WindowConfig};
-pub use error::{Error, Result};
-pub use transform::Transform;
-
-pub use async_trait::async_trait;
-pub use serde;
-pub use serde_json;
diff --git a/core/src/math.rs b/core/src/math.rs
deleted file mode 100644
index d71a89810a..0000000000
--- a/core/src/math.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct URect {
-    pub x: u32,
-    pub y: u32,
-    #[serde(rename = "width", alias = "w")]
-    pub w: u32,
-    #[serde(rename = "height", alias = "h")]
-    pub h: u32,
-}
-
-impl URect {
-    pub fn new(x: u32, y: u32, w: u32, h: u32) -> Self {
-        URect { x, y, w, h }
-    }
-
-    pub fn point(&self) -> UVec2 {
-        uvec2(self.x, self.y)
-    }
-
-    pub fn size(&self) -> UVec2 {
-        uvec2(self.w, self.h)
-    }
-
-    /// Returns the left edge of the `Rect`
-    pub fn left(&self) -> u32 {
-        self.x
-    }
-
-    /// Returns the right edge of the `Rect`
-    pub fn right(&self) -> u32 {
-        self.x + self.w
-    }
-
-    /// Returns the top edge of the `Rect`
-    pub fn top(&self) -> u32 {
-        self.y
-    }
-
-    /// Returns the bottom edge of the `Rect`
-    pub fn bottom(&self) -> u32 {
-        self.y + self.h
-    }
-
-    /// Moves the `Rect`'s origin to (x, y)
-    pub fn move_to(&mut self, destination: UVec2) {
-        self.x = destination.x;
-        self.y = destination.y;
-    }
-
-    /// Scales the `Rect` by a factor of (sx, sy),
-    /// growing towards the bottom-left
-    pub fn scale(&mut self, sx: u32, sy: u32) {
-        self.w *= sx;
-        self.h *= sy;
-    }
-
-    /// Checks whether the `Rect` contains a `Point`
-    pub fn contains(&self, point: UVec2) -> bool {
-        point.x >= self.left()
-            && point.x < self.right()
-            && point.y < self.bottom()
-            && point.y >= self.top()
-    }
-
-    /// Checks whether the `Rect` overlaps another `Rect`
-    pub fn overlaps(&self, other: &URect) -> bool {
-        self.left() <= other.right()
-            && self.right() >= other.left()
-            && self.top() <= other.bottom()
-            && self.bottom() >= other.top()
-    }
-
-    /// Returns a new `Rect` that includes all points of these two `Rect`s.
-    #[must_use]
-    pub fn combine_with(self, other: URect) -> Self {
-        let x = u32::min(self.x, other.x);
-        let y = u32::min(self.y, other.y);
-        let w = u32::max(self.right(), other.right()) - x;
-        let h = u32::max(self.bottom(), other.bottom()) - y;
-        URect { x, y, w, h }
-    }
-
-    /// Returns an intersection rect there is any intersection
-    pub fn intersect(&self, other: URect) -> Option<Self> {
-        let left = self.x.max(other.x);
-        let top = self.y.max(other.y);
-        let right = self.right().min(other.right());
-        let bottom = self.bottom().min(other.bottom());
-
-        if right < left || bottom < top {
-            return None;
-        }
-
-        Some(URect {
-            x: left,
-            y: top,
-            w: right - left,
-            h: bottom - top,
-        })
-    }
-
-    /// Translate rect origin be `offset` vector
-    #[must_use]
-    pub fn offset(self, offset: UVec2) -> Self {
-        URect::new(self.x + offset.x, self.y + offset.y, self.w, self.h)
-    }
-}
-
-impl From<Rect> for URect {
-    fn from(rect: Rect) -> Self {
-        URect {
-            x: rect.x as u32,
-            y: rect.y as u32,
-            w: rect.w as u32,
-            h: rect.h as u32,
-        }
-    }
-}
-
-impl From<(UVec2, UVec2)> for URect {
-    fn from((position, size): (UVec2, UVec2)) -> Self {
-        URect {
-            x: position.x,
-            y: position.y,
-            w: size.x,
-            h: size.y,
-        }
-    }
-}
-
-impl From<URect> for Rect {
-    fn from(other: URect) -> Rect {
-        Rect {
-            x: other.x as f32,
-            y: other.y as f32,
-            w: other.w as f32,
-            h: other.h as f32,
-        }
-    }
-}
-
-pub fn color_from_hex_string(str: &str) -> Color {
-    let str = if str.starts_with('#') {
-        str[1..str.len()].to_string()
-    } else {
-        str.to_string()
-    };
-
-    let r = u8::from_str_radix(&str[0..2], 16).unwrap();
-    let g = u8::from_str_radix(&str[2..4], 16).unwrap();
-    let b = u8::from_str_radix(&str[4..6], 16).unwrap();
-    let a = if str.len() > 6 {
-        u8::from_str_radix(&str[6..8], 16).unwrap()
-    } else {
-        255
-    };
-
-    Color::new(
-        r as f32 / 255.0,
-        g as f32 / 255.0,
-        b as f32 / 255.0,
-        a as f32 / 255.0,
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_color_from_hex_string_no_hash() {
-        assert_eq!(
-            color_from_hex_string("12ab6f"),
-            Color::new(
-                18 as f32 / 255.0,
-                171 as f32 / 255.0,
-                111 as f32 / 255.0,
-                255 as f32 / 255.0,
-            )
-        );
-    }
-
-    #[test]
-    fn test_color_from_hex_string_hash() {
-        assert_eq!(
-            color_from_hex_string("#12ab6f"),
-            Color::new(
-                18 as f32 / 255.0,
-                171 as f32 / 255.0,
-                111 as f32 / 255.0,
-                255 as f32 / 255.0,
-            )
-        );
-    }
-
-    #[test]
-    fn test_color_from_hex_string_alpha() {
-        assert_eq!(
-            color_from_hex_string("12ab6fb2"),
-            Color::new(
-                18 as f32 / 255.0,
-                171 as f32 / 255.0,
-                111 as f32 / 255.0,
-                178 as f32 / 255.0,
-            )
-        );
-    }
-}
-
-pub fn rotate_vector(vec: Vec2, rad: f32) -> Vec2 {
-    let sa = rad.sin();
-    let ca = rad.cos();
-    vec2(ca * vec.x - sa * vec.y, sa * vec.x + ca * vec.y)
-}
-
-pub fn deg_to_rad(deg: f32) -> f32 {
-    deg * std::f32::consts::PI / 180.0
-}
-
-pub fn rad_to_deg(rad: f32) -> f32 {
-    (rad * 180.0) / std::f32::consts::PI
-}
-
-/// Use this in serde tags to skip serialization for zero values
-pub trait IsZero {
-    fn is_zero(&self) -> bool;
-}
-
-impl IsZero for f32 {
-    fn is_zero(&self) -> bool {
-        *self == 0.0
-    }
-}
-
-impl IsZero for u32 {
-    fn is_zero(&self) -> bool {
-        *self == 0
-    }
-}
-
-impl IsZero for Vec2 {
-    fn is_zero(&self) -> bool {
-        *self == Vec2::ZERO
-    }
-}
diff --git a/core/src/network/api.rs b/core/src/network/api.rs
deleted file mode 100644
index 92ff5be2c3..0000000000
--- a/core/src/network/api.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use async_trait::async_trait;
-
-use crate::network::message::NetworkMessage;
-
-use crate::Result;
-
-use super::NetworkEvent;
-
-static mut API_INSTANCE: Option<Api> = None;
-
-pub struct Api {
-    backend: Box<dyn ApiBackend>,
-}
-
-impl Api {
-    fn try_take_instance() -> Option<Api> {
-        unsafe { API_INSTANCE.take() }
-    }
-
-    #[allow(dead_code)]
-    fn try_get_instance() -> Option<&'static mut Api> {
-        unsafe { API_INSTANCE.as_mut() }
-    }
-
-    #[allow(dead_code)]
-    fn get_instance() -> &'static mut Api {
-        Self::try_get_instance()
-            .unwrap_or_else(|| panic!("Api::get_instance was called before Api::init"))
-    }
-
-    pub async fn init<T: 'static + ApiBackend + ApiBackendConstructor>() -> Result<()> {
-        unsafe {
-            if API_INSTANCE.is_none() {
-                let backend = Box::new(T::init().await?);
-
-                API_INSTANCE = Some(Api { backend });
-            } else {
-                #[cfg(debug_assertions)]
-                println!("WARNING: Attempting to initiate api but it is already initiated!");
-            }
-        }
-
-        Ok(())
-    }
-
-    pub async fn close() -> Result<()> {
-        if let Some(mut api) = Self::try_take_instance() {
-            api.backend.close().await?;
-
-            drop(api);
-        }
-
-        Ok(())
-    }
-}
-
-/// Constructor for backend (needs to be separate from `ApiBackend` so that `ApiBackend` can be
-/// object safe
-#[async_trait]
-pub trait ApiBackendConstructor: Sized {
-    /// Init backend
-    async fn init() -> Result<Self>;
-}
-
-/// This trait should be implemented by all backend implementations
-#[async_trait]
-pub trait ApiBackend {
-    /// Close API connection
-    async fn close(&mut self) -> Result<()>;
-    /// Dispatch a network message
-    fn dispatch_message(&mut self, message: NetworkMessage) -> Result<()>;
-    /// Get next event from the queue
-    fn next_event(&mut self) -> Option<NetworkEvent>;
-}
diff --git a/core/src/network/event.rs b/core/src/network/event.rs
deleted file mode 100644
index a7f3bbb5bf..0000000000
--- a/core/src/network/event.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use super::PlayerId;
-use crate::network::Lobby;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum NetworkEvent {
-    LobbyCreated {
-        lobby_id: PlayerId,
-    },
-    LobbyChanged {
-        lobby: Lobby,
-    },
-    PlayerMarkedReady {
-        player_id: PlayerId,
-    },
-    PlayerMarkedNotReady {
-        player_id: PlayerId,
-    },
-    PlayerJoined {
-        player_id: PlayerId,
-        username: String,
-    },
-    PlayerLeft {
-        player_id: PlayerId,
-    },
-    PlayerReconnecting {
-        player_id: PlayerId,
-    },
-    GameStarted {
-        lobby_id: PlayerId,
-    },
-    GameEnded {
-        lobby_id: PlayerId,
-    },
-}
diff --git a/core/src/network/message.rs b/core/src/network/message.rs
deleted file mode 100644
index ddf7e3bbf5..0000000000
--- a/core/src/network/message.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use crate::input::PlayerInput;
-
-use super::PlayerId;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum NetworkMessage {
-    UpdatePlayerInput {
-        player_id: PlayerId,
-        input: PlayerInput,
-    },
-}
diff --git a/core/src/network/mod.rs b/core/src/network/mod.rs
deleted file mode 100644
index cbf5dc2905..0000000000
--- a/core/src/network/mod.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-mod api;
-mod event;
-mod message;
-mod status;
-
-pub use api::{Api, ApiBackend, ApiBackendConstructor};
-pub use event::NetworkEvent;
-pub use message::NetworkMessage;
-pub use status::RequestStatus;
-
-use std::net::SocketAddr;
-
-use serde::{Deserialize, Serialize};
-
-pub type LobbyId = String;
-pub type PlayerId = String;
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct Server {
-    pub http: SocketAddr,
-    pub udp: SocketAddr,
-    pub tcp: SocketAddr,
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum LobbyPrivacy {
-    Public,
-    Private,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct Lobby {
-    pub id: LobbyId,
-    pub name: String,
-    pub creator_player_id: PlayerId,
-    pub admin_player_id: PlayerId,
-    pub player_count: i32,
-    pub capacity: i32,
-    pub server: Option<Server>,
-    pub privacy: LobbyPrivacy,
-    pub state: LobbyState,
-    pub players: Vec<Player>,
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub enum LobbyState {
-    NotStarted,
-    Ready,
-    Starting,
-    Running,
-    Ending,
-    Ended,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct Player {
-    pub id: PlayerId,
-    pub username: String,
-    pub state: ClientState,
-}
-
-impl Player {
-    pub fn new(id: &PlayerId, username: &str) -> Self {
-        Player {
-            id: id.clone(),
-            username: username.to_string(),
-            state: ClientState::Unknown,
-        }
-    }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub enum ClientState {
-    Unknown,
-    Joined,
-    Ready,
-    Playing,
-    Left,
-    Done,
-}
diff --git a/core/src/network/status.rs b/core/src/network/status.rs
deleted file mode 100644
index ff20cfc1a5..0000000000
--- a/core/src/network/status.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum RequestStatus {
-    Ok,
-    Unauthorized,
-    NotFound,
-    RequestTimeout,
-    InternalServerError,
-    Unknown,
-}
-
-impl RequestStatus {
-    pub fn as_code(&self) -> u16 {
-        match *self {
-            RequestStatus::Ok => 200,
-            RequestStatus::Unauthorized => 401,
-            RequestStatus::NotFound => 404,
-            RequestStatus::RequestTimeout => 408,
-            RequestStatus::InternalServerError => 500,
-            RequestStatus::Unknown => 0,
-        }
-    }
-
-    pub fn as_str(&self) -> &'static str {
-        match *self {
-            RequestStatus::Ok => "ok",
-            RequestStatus::Unauthorized => "unauthorized",
-            RequestStatus::NotFound => "not found",
-            RequestStatus::RequestTimeout => "request timeout",
-            RequestStatus::InternalServerError => "internal server error",
-            RequestStatus::Unknown => "unknown",
-        }
-    }
-}
-
-impl From<u16> for RequestStatus {
-    fn from(code: u16) -> Self {
-        match code {
-            200 => RequestStatus::Ok,
-            401 => RequestStatus::Unauthorized,
-            404 => RequestStatus::NotFound,
-            408 => RequestStatus::RequestTimeout,
-            500 => RequestStatus::InternalServerError,
-            _ => RequestStatus::Unknown,
-        }
-    }
-}
diff --git a/core/src/noise.rs b/core/src/noise.rs
deleted file mode 100644
index 0afee678e8..0000000000
--- a/core/src/noise.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-// Perlin Stuff
-// Ported from https://github.com/josephg/noisejs/blob/master/perlin.js
-// This is all magic to me, don't ask me anything about it
-
-pub struct NoiseGenerator {
-    grad_p: [(i32, i32, i32); 512],
-    perm: [usize; 512],
-}
-
-impl NoiseGenerator {
-    const P: [i32; 256] = [
-        151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, 30,
-        69, 142, 8, 99, 37, 240, 21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94,
-        252, 219, 203, 117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171,
-        168, 68, 175, 74, 165, 71, 134, 139, 48, 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60,
-        211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102, 143, 54, 65, 25, 63, 161, 1,
-        216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, 159, 86,
-        164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118,
-        126, 255, 82, 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170,
-        213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39,
-        253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104, 218, 246, 97, 228, 251, 34,
-        242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249, 14, 239, 107, 49,
-        192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254,
-        138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, 180,
-    ];
-
-    const GRAD_3: [(i32, i32, i32); 12] = [
-        (1, 1, 0),
-        (-1, 1, 0),
-        (1, -1, 0),
-        (-1, -1, 0),
-        (1, 0, 1),
-        (-1, 0, 1),
-        (1, 0, -1),
-        (-1, 0, -1),
-        (0, 1, 1),
-        (0, -1, 1),
-        (0, 1, -1),
-        (0, -1, -1),
-    ];
-
-    pub fn new(seed: i32) -> NoiseGenerator {
-        let mut n = NoiseGenerator {
-            grad_p: [(0, 0, 0); 512],
-            perm: [0; 512],
-        };
-        n.seed(seed);
-
-        n
-    }
-
-    pub fn seed(&mut self, seed: i32) {
-        let mut seed = seed;
-        if seed > 0 && seed < 1 {
-            // Scale the seed out
-            seed *= 65536;
-        }
-
-        if seed < 256 {
-            seed |= seed << 8;
-        }
-
-        for i in 0..256 {
-            let v = if i & 1 > 0 {
-                NoiseGenerator::P[i] ^ (seed & 255)
-            } else {
-                NoiseGenerator::P[i] ^ ((seed >> 8) & 255)
-            };
-
-            //self.gradP[i] =
-            self.perm[i] = v as usize;
-            self.perm[i + 256] = v as usize;
-
-            self.grad_p[i + 256] = NoiseGenerator::GRAD_3[(v % 12) as usize];
-            self.grad_p[i] = self.grad_p[i + 256];
-            //noise_generator::gradP[i] = this::gradP[i + 256] = gradv
-        }
-    }
-
-    pub fn perlin_2d(&mut self, x: f32, y: f32) -> f32 {
-        // Generates values from -.5 to .5
-        let mut x_f = x.floor() as i32;
-        let mut y_f = y.floor() as i32;
-
-        let x = x - x_f as f32;
-        let y = y - y_f as f32;
-
-        x_f &= 255;
-        y_f &= 255;
-
-        let n00 = NoiseGenerator::dot2(self.grad_p[x_f as usize + self.perm[y_f as usize]], x, y);
-        let n01 = NoiseGenerator::dot2(
-            self.grad_p[x_f as usize + self.perm[(y_f + 1) as usize]],
-            x,
-            y - 1.0,
-        );
-        let n10 = NoiseGenerator::dot2(
-            self.grad_p[(x_f + 1) as usize + self.perm[y_f as usize]],
-            x - 1.0,
-            y,
-        );
-        let n11 = NoiseGenerator::dot2(
-            self.grad_p[(x_f + 1) as usize + self.perm[(y_f + 1) as usize]],
-            x - 1.0,
-            y - 1.0,
-        );
-
-        let u = NoiseGenerator::fade(x);
-
-        NoiseGenerator::lerp(
-            NoiseGenerator::lerp(n00, n10, u),
-            NoiseGenerator::lerp(n01, n11, u),
-            NoiseGenerator::fade(y),
-        )
-    }
-
-    fn dot2(tuple: (i32, i32, i32), x: f32, y: f32) -> f32 {
-        tuple.0 as f32 * x + tuple.1 as f32 * y
-    }
-
-    fn fade(t: f32) -> f32 {
-        t * t * t * (t * (t * 6. - 15.) + 10.)
-    }
-
-    fn lerp(a: f32, b: f32, t: f32) -> f32 {
-        (1. - t) * a + t * b
-    }
-}
diff --git a/core/src/text.rs b/core/src/text.rs
deleted file mode 100644
index 91b9d1fe20..0000000000
--- a/core/src/text.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use macroquad::prelude::*;
-use std::ffi::{OsStr, OsString};
-use std::path::{Path, PathBuf};
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum HorizontalAlignment {
-    Left,
-    Right,
-    Center,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum VerticalAlignment {
-    Top,
-    Center,
-    Bottom,
-}
-
-pub fn draw_aligned_text(
-    text: &str,
-    position: Vec2,
-    ha: HorizontalAlignment,
-    va: VerticalAlignment,
-    params: TextParams,
-) {
-    let measure = measure_text(text, Some(params.font), params.font_size, params.font_scale);
-
-    let x = match ha {
-        HorizontalAlignment::Left => position.x,
-        _ => {
-            if ha == HorizontalAlignment::Center {
-                position.x - (measure.width / 2.0)
-            } else {
-                position.x - measure.width
-            }
-        }
-    };
-
-    let y = match va {
-        VerticalAlignment::Top => position.y + measure.height,
-        VerticalAlignment::Center => position.y + measure.height / 2.0,
-        _ => position.y,
-    };
-
-    draw_text_ex(text, x, y, params);
-}
-
-/// This is used to implement `ToString` for non-crate types.
-/// It is mainly used for types like `Path`, to eliminate the extra steps introduced by the
-/// `to_string_lossy` method, as we are not that concerned with correctness in these settings.
-pub trait ToStringHelper {
-    fn to_string_helper(&self) -> String;
-}
-
-impl ToString for dyn ToStringHelper {
-    fn to_string(&self) -> String {
-        self.to_string_helper()
-    }
-}
-
-impl ToStringHelper for Path {
-    fn to_string_helper(&self) -> String {
-        self.to_string_lossy().into_owned()
-    }
-}
-
-impl ToStringHelper for PathBuf {
-    fn to_string_helper(&self) -> String {
-        self.to_string_lossy().into_owned()
-    }
-}
-
-impl ToStringHelper for OsStr {
-    fn to_string_helper(&self) -> String {
-        self.to_string_lossy().into_owned()
-    }
-}
-
-impl ToStringHelper for OsString {
-    fn to_string_helper(&self) -> String {
-        self.to_string_lossy().into_owned()
-    }
-}
diff --git a/core/src/transform.rs b/core/src/transform.rs
deleted file mode 100644
index f52e1babcd..0000000000
--- a/core/src/transform.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use macroquad::prelude::*;
-
-#[derive(Debug, Default)]
-pub struct Transform {
-    pub position: Vec2,
-    pub rotation: f32,
-}
-
-impl Transform {
-    pub fn new(position: Vec2, rotation: f32) -> Self {
-        Transform { position, rotation }
-    }
-}
-
-impl From<Vec2> for Transform {
-    fn from(position: Vec2) -> Self {
-        Transform {
-            position,
-            rotation: 0.0,
-        }
-    }
-}
diff --git a/crates/bevy-has-load-progress/Cargo.toml b/crates/bevy-has-load-progress/Cargo.toml
new file mode 100644
index 0000000000..f3eedc30f9
--- /dev/null
+++ b/crates/bevy-has-load-progress/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "bevy-has-load-progress"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies.bevy]
+version = "0.8.1"
+default-features = false
+features = [
+    "bevy_asset"
+]
+
+[dependencies]
+macros = { package = "bevy-has-load-progress-macros", path = "./macros" }
+bevy_egui = { version = "0.16.1", optional = true }
\ No newline at end of file
diff --git a/crates/bevy-has-load-progress/macros/Cargo.toml b/crates/bevy-has-load-progress/macros/Cargo.toml
new file mode 100644
index 0000000000..93efed91eb
--- /dev/null
+++ b/crates/bevy-has-load-progress/macros/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "bevy-has-load-progress-macros"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = { version = "1.0.100", features = ["extra-traits"] }
+quote = "1.0.21"
+proc-macro2 = "1.0.43"
diff --git a/crates/bevy-has-load-progress/macros/src/lib.rs b/crates/bevy-has-load-progress/macros/src/lib.rs
new file mode 100644
index 0000000000..c3101ef4b0
--- /dev/null
+++ b/crates/bevy-has-load-progress/macros/src/lib.rs
@@ -0,0 +1,111 @@
+use proc_macro::TokenStream;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::{quote, quote_spanned};
+use syn::{parse_quote, spanned::Spanned};
+
+/// Derive macro for `HasLoadProgress`
+///
+/// May be used to implement `HasLoadProgress` on structs where all fields implement
+/// `HasLoadProgress`.
+///
+/// Fields not implementing `HasLoadProgress` may be skipped with `#[has_load_progress(none)]` added
+/// to the field.
+///
+/// `#[has_load_progress(none)]` may also be added to the struct itself to use the default
+/// implementation of `HasLoadProgress` which returns no progress and nothing to load.
+///
+/// `#[has_load_progress(none)]` could also be added to enums to derive the default implementation
+/// with no load progress, but cannot be added to enum variants.
+#[proc_macro_derive(HasLoadProgress, attributes(has_load_progress))]
+pub fn has_load_progress(input: TokenStream) -> TokenStream {
+    let input = syn::parse(input).unwrap();
+
+    impl_has_load_progress(&input).into()
+}
+
+fn impl_has_load_progress(input: &syn::DeriveInput) -> TokenStream2 {
+    // The attribute that may be added to skip fields or use the default implementation.
+    let no_load_attr: syn::Attribute = parse_quote! {
+        #[has_load_progress(none)]
+    };
+
+    let item_ident = &input.ident;
+    let mut impl_function_body = quote! {};
+
+    // Check for `#[has_load_progress(none)]` on the item itself
+    let mut skip_all_fields = false;
+    for attr in &input.attrs {
+        if attr.path == parse_quote!(has_load_progress) {
+            if attr == &no_load_attr {
+                skip_all_fields = true;
+            } else {
+                return quote_spanned!(attr.span() =>
+                    compile_error!("Attribute must be `#[has_load_progress(none)]` if specified");
+                );
+            }
+        }
+    }
+
+    // If we are skipping all fields
+    if skip_all_fields {
+        impl_function_body = quote! {
+            bevy_has_load_progress::LoadProgress::default()
+        };
+
+    // If we should process struct fields
+    } else {
+        // Parse the struct
+        let in_struct = match &input.data {
+            syn::Data::Struct(s) => s,
+            syn::Data::Enum(_) | syn::Data::Union(_) => {
+                return quote_spanned! { input.ident.span() =>
+                    compile_error!("You may only derive HasLoadProgress on structs");
+                };
+            }
+        };
+
+        // Start a list of the progresses for each field
+        let mut progresses = Vec::new();
+        'field: for field in &in_struct.fields {
+            // Skip this field if it has `#[has_load_progress(none)]`
+            for attr in &field.attrs {
+                if attr.path == parse_quote!(has_load_progress) {
+                    if attr == &no_load_attr {
+                        continue 'field;
+                    } else {
+                        impl_function_body = quote_spanned! { attr.span() =>
+                            compile_error!("Attribute be `#[has_load_progress(none)]` if specified");
+                        }
+                    }
+                }
+            }
+
+            // Add this fields load progress to the list of progresses
+            let field_ident = field.ident.as_ref().expect("Field ident");
+            progresses.push(quote_spanned! { field_ident.span() =>
+                bevy_has_load_progress::HasLoadProgress::load_progress(
+                    &self.#field_ident,
+                    loading_resources
+                )
+            })
+        }
+
+        // Retrun the merged progress result
+        impl_function_body = quote! {
+            #impl_function_body
+            bevy_has_load_progress::LoadProgress::merged([ #( #progresses),* ])
+        };
+    }
+
+    // Fill out rest of impl block
+    quote! {
+        impl bevy_has_load_progress::HasLoadProgress for #item_ident {
+            fn load_progress(
+                &self,
+                loading_resources: &bevy_has_load_progress::LoadingResources
+            ) -> bevy_has_load_progress::LoadProgress {
+                #impl_function_body
+            }
+        }
+    }
+}
diff --git a/crates/bevy-has-load-progress/src/lib.rs b/crates/bevy-has-load-progress/src/lib.rs
new file mode 100644
index 0000000000..0c34eba97b
--- /dev/null
+++ b/crates/bevy-has-load-progress/src/lib.rs
@@ -0,0 +1,128 @@
+//! Loading progress helper for Bevy
+//!
+//! This crate exposes a trait [`HasLoadProgress`] that may be derived on structs that contain Bevy
+//! asset [`Handle`]s. The idea is that you may have a struct with asset handles contained somewhere
+//! inside, maybe deeply nested or stored in vectors, etc., and you need to be able to get the load
+//! progress of _all_ of the handles inside that struct.
+
+use std::marker::PhantomData;
+
+use bevy::{
+    asset::{Asset, LoadState},
+    ecs::system::SystemParam,
+    math::{UVec2, Vec2, Vec3},
+    prelude::{AssetServer, Entity, Handle, HandleUntyped, Res},
+    utils::HashMap,
+};
+
+// Export the derive macro
+pub use macros::HasLoadProgress;
+
+/// A progress indicator holding how many items must be loaded and how many items have been loaded
+#[derive(Clone, Copy, Default, Debug)]
+pub struct LoadProgress {
+    pub loaded: u32,
+    pub total: u32,
+}
+
+impl std::fmt::Display for LoadProgress {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{} / {}", self.loaded, self.total)
+    }
+}
+
+impl LoadProgress {
+    /// Get the load progress as a percentage
+    pub fn as_percent(&self) -> f32 {
+        self.loaded as f32 / self.total as f32
+    }
+
+    /// Get a total load progress from an iterator of [`LoadProgress`]s
+    pub fn merged<I>(iter: I) -> Self
+    where
+        I: IntoIterator<Item = LoadProgress>,
+    {
+        let mut loaded = 0;
+        let mut total = 0;
+        for progress in iter {
+            loaded += progress.loaded;
+            total += progress.total;
+        }
+
+        Self { loaded, total }
+    }
+}
+
+/// System param containing Bevy resources that may be used to determine load progress
+///
+/// Currently this only contains the bevy asset server, but this may additionally contain the
+/// scripting engine once script loading is implemented.
+#[derive(SystemParam)]
+pub struct LoadingResources<'w, 's> {
+    pub asset_server: Res<'w, AssetServer>,
+    #[system_param(ignore)]
+    _phantom: PhantomData<&'s ()>,
+}
+
+/// Trait implemented on items that can report their load progress from the [`LoadingResources`].
+pub trait HasLoadProgress {
+    // Default implementation returns no progress and nothing to load
+    fn load_progress(&self, _loading_resources: &LoadingResources) -> LoadProgress {
+        LoadProgress::default()
+    }
+}
+
+// Implement `HasLoadProgress` for asset handles
+impl<T: Asset> HasLoadProgress for Handle<T> {
+    fn load_progress(&self, loading_resources: &LoadingResources) -> LoadProgress {
+        let loaded = loading_resources.asset_server.get_load_state(self) == LoadState::Loaded;
+
+        LoadProgress {
+            loaded: if loaded { 1 } else { 0 },
+            total: 1,
+        }
+    }
+}
+
+impl HasLoadProgress for HandleUntyped {
+    fn load_progress(&self, loading_resources: &LoadingResources) -> LoadProgress {
+        let loaded = loading_resources.asset_server.get_load_state(self) == LoadState::Loaded;
+
+        LoadProgress {
+            loaded: if loaded { 1 } else { 0 },
+            total: 1,
+        }
+    }
+}
+
+// Impelement default `HasLoadProgress` for various basic types
+macro_rules! impl_default_load_progress {
+    ( $($type:ty),* ) => {
+        $(
+            impl HasLoadProgress for $type {}
+        )*
+    };
+}
+impl_default_load_progress!(String, f32, usize, u32, Vec2, Vec3, UVec2, bool, Entity);
+
+#[cfg(feature = "bevy_egui")]
+impl_default_load_progress!(bevy_egui::egui::TextureId);
+
+// Implement `HasLoadProgress` for container types
+impl<T: HasLoadProgress> HasLoadProgress for Option<T> {
+    fn load_progress(&self, loading_resources: &LoadingResources) -> LoadProgress {
+        self.as_ref()
+            .map(|x| x.load_progress(loading_resources))
+            .unwrap_or_default()
+    }
+}
+impl<T: HasLoadProgress> HasLoadProgress for Vec<T> {
+    fn load_progress(&self, loading_resources: &LoadingResources) -> LoadProgress {
+        LoadProgress::merged(self.iter().map(|x| x.load_progress(loading_resources)))
+    }
+}
+impl<K, T: HasLoadProgress> HasLoadProgress for HashMap<K, T> {
+    fn load_progress(&self, loading_resources: &LoadingResources) -> LoadProgress {
+        LoadProgress::merged(self.values().map(|x| x.load_progress(loading_resources)))
+    }
+}
diff --git a/crates/matchmaker-proto/Cargo.toml b/crates/matchmaker-proto/Cargo.toml
new file mode 100644
index 0000000000..dd89fb8853
--- /dev/null
+++ b/crates/matchmaker-proto/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "jumpy-matchmaker-proto"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = { version = "1.0.147", features = ["derive"] }
+ulid = { version = "1.0.0", features = ["serde"] }
diff --git a/crates/matchmaker-proto/src/lib.rs b/crates/matchmaker-proto/src/lib.rs
new file mode 100644
index 0000000000..aabce1eb46
--- /dev/null
+++ b/crates/matchmaker-proto/src/lib.rs
@@ -0,0 +1,20 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub enum MatchmakerRequest {
+    /// Request a match ID from the server
+    RequestMatch(MatchInfo),
+}
+
+/// Information about a match that is being requested
+#[derive(Serialize, Deserialize, Debug, Clone, Hash, Eq, PartialEq)]
+pub struct MatchInfo {
+    pub player_count: u8,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub enum MatchmakerResponse {
+    Accepted,
+    PlayerCount(u8),
+    Success,
+}
diff --git a/crates/matchmaker/Cargo.toml b/crates/matchmaker/Cargo.toml
new file mode 100644
index 0000000000..07b2e146c2
--- /dev/null
+++ b/crates/matchmaker/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "jumpy-matchmaker"
+version = "0.1.0"
+edition = "2021"
+authors = ["The Fish Fight Game & Spicy Lobster Developers"]
+
+[dependencies]
+jumpy = { path = "../../", default-features = false }
+jumpy-matchmaker-proto = { path = "../matchmaker-proto" }
+anyhow = "1.0.66"
+async-executor = "1.4.1"
+futures-lite = "1.12.0"
+once_cell = "1.15.0"
+quinn = { git = "https://github.com/quinn-rs/quinn.git", default-features = false, features = ["futures-io", "native-certs", "tls-rustls"] }
+quinn-bevy = { path = "../quinn-bevy" }
+bevy_tasks = "0.8.1"
+rcgen = "0.10.0"
+rustls = { version = "0.20.7", features = ["dangerous_configuration", "quic"] }
+postcard = { version = "1.0.2", default-features = false, features = ["alloc"] }
+serde = { version = "1.0.147", features = ["derive"] }
+tracing = "0.1.37"
+tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
+clap = { version = "4.0.18", features = ["derive", "env"] }
+tokio = { version = "1.0", features = ["full"] }
+either = "1.8.0"
+blocking = "1.2.0"
+scc = "0.11.1"
+
+[dev-dependencies]
+async-io = "1.9.0"
+
diff --git a/crates/matchmaker/examples/matchmaker_client.rs b/crates/matchmaker/examples/matchmaker_client.rs
new file mode 100644
index 0000000000..beab74470a
--- /dev/null
+++ b/crates/matchmaker/examples/matchmaker_client.rs
@@ -0,0 +1,158 @@
+use std::{net::SocketAddr, sync::Arc, time::Duration};
+
+use bevy_tasks::{IoTaskPool, TaskPool};
+use certs::SkipServerVerification;
+use jumpy::networking::proto::{Ping, Pong};
+use jumpy_matchmaker_proto::{MatchInfo, MatchmakerRequest, MatchmakerResponse};
+use quinn::{ClientConfig, Endpoint, EndpointConfig};
+use quinn_bevy::BevyIoTaskPoolExecutor;
+
+static SERVER_NAME: &str = "localhost";
+
+fn client_addr() -> SocketAddr {
+    "127.0.0.1:0".parse::<SocketAddr>().unwrap()
+}
+
+fn server_addr() -> SocketAddr {
+    "127.0.0.1:8943".parse::<SocketAddr>().unwrap()
+}
+
+mod certs {
+    use std::sync::Arc;
+
+    // Implementation of `ServerCertVerifier` that verifies everything as trustworthy.
+    pub struct SkipServerVerification;
+
+    impl SkipServerVerification {
+        pub fn new() -> Arc<Self> {
+            Arc::new(Self)
+        }
+    }
+
+    impl rustls::client::ServerCertVerifier for SkipServerVerification {
+        fn verify_server_cert(
+            &self,
+            _end_entity: &rustls::Certificate,
+            _intermediates: &[rustls::Certificate],
+            _server_name: &rustls::ServerName,
+            _scts: &mut dyn Iterator<Item = &[u8]>,
+            _ocsp_response: &[u8],
+            _now: std::time::SystemTime,
+        ) -> Result<rustls::client::ServerCertVerified, rustls::Error> {
+            Ok(rustls::client::ServerCertVerified::assertion())
+        }
+    }
+}
+
+fn configure_client() -> ClientConfig {
+    let crypto = rustls::ClientConfig::builder()
+        .with_safe_defaults()
+        .with_custom_certificate_verifier(SkipServerVerification::new())
+        .with_no_client_auth();
+
+    ClientConfig::new(Arc::new(crypto))
+}
+
+pub fn main() {
+    IoTaskPool::init(TaskPool::new);
+    let task_pool = IoTaskPool::get();
+    futures_lite::future::block_on(task_pool.spawn(async move {
+        if let Err(e) = client().await {
+            eprintln!("Error: {e}");
+        }
+    }));
+}
+
+async fn client() -> anyhow::Result<()> {
+    let client_config = configure_client();
+    let socket = std::net::UdpSocket::bind(client_addr())?;
+    // Bind this endpoint to a UDP socket on the given client address.
+    let endpoint = Endpoint::new(
+        EndpointConfig::default(),
+        None,
+        socket,
+        BevyIoTaskPoolExecutor,
+    )?
+    .0;
+
+    println!("Opened client on {}", endpoint.local_addr()?);
+
+    // Connect to the server passing in the server name which is supposed to be in the server certificate.
+    let conn = endpoint
+        .connect_with(client_config, server_addr(), SERVER_NAME)?
+        .await?;
+
+    // Send a match request to the server
+    let (mut send, recv) = conn.open_bi().await?;
+
+    let message = MatchmakerRequest::RequestMatch(MatchInfo {
+        player_count: std::env::args()
+            .nth(1)
+            .map(|x| x.parse().unwrap())
+            .unwrap_or(0),
+    });
+    println!("Sending match request: {message:?}");
+    let message = postcard::to_allocvec(&message)?;
+
+    send.write_all(&message).await?;
+    send.finish().await?;
+
+    println!("Waiting for response");
+
+    let message = recv.read_to_end(256).await?;
+    let message: MatchmakerResponse = postcard::from_bytes(&message)?;
+
+    if let MatchmakerResponse::Accepted = message {
+        println!("Request accepted, waiting for match");
+    } else {
+        panic!("Unexpected message from server!");
+    }
+
+    loop {
+        let recv = conn.accept_uni().await?;
+        let message = recv.read_to_end(256).await?;
+        let message: MatchmakerResponse = postcard::from_bytes(&message)?;
+
+        match message {
+            MatchmakerResponse::PlayerCount(count) => {
+                println!("{count} players in lobby");
+            }
+            MatchmakerResponse::Success => {
+                println!("Match is ready!");
+                break;
+            }
+            _ => panic!("Unexpected message from server"),
+        }
+    }
+
+    async_io::Timer::after(Duration::from_secs(2)).await;
+
+    for _ in 0..3 {
+        let mut sender = conn.open_uni().await?;
+
+        println!("Sending ping to server");
+        sender.write_all(&postcard::to_allocvec(&Ping)?).await?;
+        sender.write_all(&u32::to_le_bytes(0)).await?;
+        sender.finish().await?;
+
+        println!("Waiting for pong");
+        let recv = conn.accept_uni().await?;
+        let mut incomming = recv.read_to_end(256).await?;
+        let type_idx_bytes: [u8; 4] = incomming.split_off(incomming.len() - 4).try_into().unwrap();
+        let type_idx = u32::from_le_bytes(type_idx_bytes);
+        assert_eq!(type_idx, 1, "Invalid type");
+        let message: Pong = postcard::from_bytes(&incomming).unwrap();
+
+        println!("Got message: {:?}", message);
+    }
+
+    async_io::Timer::after(Duration::from_secs(4)).await;
+
+    println!("Closing connection");
+    conn.close(0u8.into(), b"done");
+
+    endpoint.close(0u8.into(), b"done");
+    endpoint.wait_idle().await;
+
+    Ok(())
+}
diff --git a/crates/matchmaker/src/certs.rs b/crates/matchmaker/src/certs.rs
new file mode 100644
index 0000000000..da79c901c0
--- /dev/null
+++ b/crates/matchmaker/src/certs.rs
@@ -0,0 +1,5 @@
+pub fn generate_self_signed_cert() -> anyhow::Result<(rustls::Certificate, rustls::PrivateKey)> {
+    let cert = rcgen::generate_simple_self_signed(vec!["localhost".to_string()])?;
+    let key = rustls::PrivateKey(cert.serialize_private_key_der());
+    Ok((rustls::Certificate(cert.serialize_der()?), key))
+}
diff --git a/crates/matchmaker/src/cli.rs b/crates/matchmaker/src/cli.rs
new file mode 100644
index 0000000000..00ed07cb20
--- /dev/null
+++ b/crates/matchmaker/src/cli.rs
@@ -0,0 +1,30 @@
+use bevy_tasks::{IoTaskPool, TaskPool};
+use clap::Parser;
+use tracing::metadata::LevelFilter;
+
+pub fn start() {
+    IoTaskPool::init(TaskPool::new);
+    let task_pool = IoTaskPool::get();
+    configure_logging();
+
+    let args = crate::Config::parse();
+
+    futures_lite::future::block_on(task_pool.spawn(async move {
+        if let Err(e) = super::server(args).await {
+            eprintln!("Error: {e}");
+        }
+    }));
+}
+
+fn configure_logging() {
+    tracing::subscriber::set_global_default(
+        tracing_subscriber::FmtSubscriber::builder()
+            .with_env_filter(
+                tracing_subscriber::EnvFilter::builder()
+                    .with_default_directive(LevelFilter::INFO.into())
+                    .from_env_lossy(),
+            )
+            .finish(),
+    )
+    .unwrap();
+}
diff --git a/crates/matchmaker/src/game_server.rs b/crates/matchmaker/src/game_server.rs
new file mode 100644
index 0000000000..3cc703ef83
--- /dev/null
+++ b/crates/matchmaker/src/game_server.rs
@@ -0,0 +1,24 @@
+use blocking::unblock;
+use jumpy::networking::server::NetServer;
+use jumpy_matchmaker_proto::MatchInfo;
+use quinn::Connection;
+
+pub async fn start_game_server(match_info: MatchInfo, clients: Vec<Connection>) {
+    info!(?match_info, "Starting match");
+    let client_ids = clients.iter().map(|x| x.stable_id()).collect::<Vec<_>>();
+
+    if let Err(e) = impl_game_server(match_info.clone(), clients).await {
+        error!(?match_info, ?client_ids, "Error running match: {e}");
+    }
+}
+
+async fn impl_game_server(match_info: MatchInfo, clients: Vec<Connection>) -> anyhow::Result<()> {
+    unblock(|| {
+        jumpy::build_app(Some(NetServer::new(clients))).run();
+    })
+    .await;
+
+    info!(?match_info, "Game server finished");
+
+    Ok(())
+}
diff --git a/crates/matchmaker/src/lib.rs b/crates/matchmaker/src/lib.rs
new file mode 100644
index 0000000000..b5338dc4f3
--- /dev/null
+++ b/crates/matchmaker/src/lib.rs
@@ -0,0 +1,83 @@
+#[macro_use]
+extern crate tracing;
+
+use std::{net::SocketAddr, sync::Arc, time::Duration};
+
+use bevy_tasks::IoTaskPool;
+use quinn::{Endpoint, EndpointConfig, ServerConfig, TransportConfig};
+use quinn_bevy::BevyIoTaskPoolExecutor;
+
+pub mod cli;
+
+mod certs;
+mod game_server;
+mod matchmaker;
+
+#[derive(clap::Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+struct Config {
+    /// The server address to listen on
+    #[clap(short, long = "listen", default_value = "0.0.0.0:8943")]
+    listen_addr: SocketAddr,
+
+    /// The directory containing the bevy assets
+    #[clap(short, long, env = "JUMPY_ASSET_DIR")]
+    asset_dir: String,
+}
+
+async fn server(args: Config) -> anyhow::Result<()> {
+    let task_pool = IoTaskPool::get();
+
+    // Put Jumpy in server mode
+    std::env::set_var(jumpy::config::SERVER_MODE_ENV_VAR, "true");
+    std::env::set_var(jumpy::config::ASSET_DIR_ENV_VAR, args.asset_dir);
+
+    // Set allowed threads for blocking thread pool. This value represents the maxiumum number of
+    // matches that can run at the same time.
+    //
+    // 10000 is the max the `blocking` crate supports.
+    std::env::set_var("BLOCKING_MAX_THREADS", "5000");
+
+    // Generate certificate
+    let (cert, key) = certs::generate_self_signed_cert()?;
+
+    let mut transport_config = TransportConfig::default();
+    transport_config.keep_alive_interval(Some(Duration::from_secs(5)));
+
+    let mut server_config = ServerConfig::with_single_cert([cert].to_vec(), key)?;
+    server_config.transport = Arc::new(transport_config);
+
+    // Open Socket and create endpoint
+    let socket = std::net::UdpSocket::bind(args.listen_addr)?;
+    let (endpoint, mut incoming) = Endpoint::new(
+        EndpointConfig::default(),
+        Some(server_config),
+        socket,
+        BevyIoTaskPoolExecutor,
+    )?;
+    info!(address=%endpoint.local_addr()?, "Started server");
+
+    // Listen for incomming connections
+    while let Some(connecting) = incoming.next().await {
+        let connection = connecting.await;
+
+        match connection {
+            Ok(conn) => {
+                info!(
+                    connection_id = conn.stable_id(),
+                    "Accepted connection from client"
+                );
+
+                // Spawn a task to handle the new connection
+                task_pool
+                    .spawn(matchmaker::handle_connection(conn))
+                    .detach();
+            }
+            Err(e) => error!("Error opening client connection: {e:?}"),
+        }
+    }
+
+    info!("Server shutdown");
+
+    Ok(())
+}
diff --git a/crates/matchmaker/src/main.rs b/crates/matchmaker/src/main.rs
new file mode 100644
index 0000000000..4fe573df56
--- /dev/null
+++ b/crates/matchmaker/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    jumpy_matchmaker::cli::start();
+}
diff --git a/crates/matchmaker/src/matchmaker.rs b/crates/matchmaker/src/matchmaker.rs
new file mode 100644
index 0000000000..bb201a9046
--- /dev/null
+++ b/crates/matchmaker/src/matchmaker.rs
@@ -0,0 +1,189 @@
+use bevy_tasks::IoTaskPool;
+use futures_lite::future;
+use jumpy_matchmaker_proto::{MatchInfo, MatchmakerRequest, MatchmakerResponse};
+use once_cell::sync::Lazy;
+use quinn::{Connection, ConnectionError};
+use scc::HashMap;
+
+use crate::game_server::start_game_server;
+
+pub async fn handle_connection(conn: Connection) {
+    let connection_id = conn.stable_id();
+    debug!(connection_id, "Accepted matchmaker connection");
+
+    if let Err(e) = impl_matchmaker(conn).await {
+        match e.downcast::<ConnectionError>() {
+            Ok(conn_err) => match conn_err {
+                ConnectionError::ApplicationClosed(e) => {
+                    debug!(connection_id, "Application close connection: {e:?}");
+                }
+                e => {
+                    error!(connection_id, "Error in matchmaker connection: {e:?}");
+                }
+            },
+            Err(e) => {
+                error!(connection_id, "Error in matchmaker connection: {e:?}");
+            }
+        }
+    }
+}
+
+/// The matchmaker state
+#[derive(Default)]
+struct State {
+    /// The mapping of match info to the vector connected clients in the waiting room.
+    rooms: HashMap<MatchInfo, Vec<Connection>>,
+}
+
+static STATE: Lazy<State> = Lazy::new(State::default);
+
+/// After a matchmaker connection is established, it will open a bi-directional channel with the
+/// client.
+///
+/// At this point the client is free to engage in the matchmaking protocol over that channel.
+async fn impl_matchmaker(conn: Connection) -> anyhow::Result<()> {
+    let connection_id = conn.stable_id();
+
+    loop {
+        // Get the next channel open or connection close event
+        let event = future::or(async { either::Left(conn.closed().await) }, async {
+            either::Right(conn.accept_bi().await)
+        })
+        .await;
+
+        match event {
+            either::Either::Left(close) => {
+                debug!("Connection closed {close:?}");
+                return Ok(());
+            }
+            either::Either::Right(bi) => {
+                let (mut send, recv) = bi?;
+
+                // Parse matchmaker request
+                let request: MatchmakerRequest =
+                    postcard::from_bytes(&recv.read_to_end(256).await?)?;
+
+                match request {
+                    MatchmakerRequest::RequestMatch(match_info) => {
+                        debug!(connection_id, ?match_info, "Got request for match");
+
+                        // Accept request
+                        let message = postcard::to_allocvec(&MatchmakerResponse::Accepted)?;
+                        send.write_all(&message).await?;
+                        send.finish().await?;
+
+                        let player_count = match_info.player_count;
+
+                        let mut members_to_join = Vec::new();
+                        let mut members_to_notify = Vec::new();
+
+                        // Make sure room exists
+                        STATE
+                            .rooms
+                            .insert_async(match_info.clone(), Vec::new())
+                            .await
+                            .ok();
+
+                        STATE
+                            .rooms
+                            .update_async(&match_info, |match_info, members| {
+                                // Add the current client to the room
+                                members.push(conn.clone());
+
+                                // Spawn task to wait for connction to close and remove it from the room if it does
+                                let conn = conn.clone();
+                                let info = match_info.clone();
+                                IoTaskPool::get()
+                                    .spawn(async move {
+                                        conn.closed().await;
+                                        let members = STATE
+                                            .rooms
+                                            .update_async(&info, |_, members| {
+                                                let mut was_removed = false;
+                                                members.retain(|x| {
+                                                    if x.stable_id() != conn.stable_id() {
+                                                        true
+                                                    } else {
+                                                        was_removed = true;
+                                                        false
+                                                    }
+                                                });
+
+                                                if was_removed {
+                                                    Some(members.clone())
+                                                } else {
+                                                    None
+                                                }
+                                            })
+                                            .await
+                                            .flatten();
+                                        if let Some(members) = members {
+                                            let result = async {
+                                                let message = postcard::to_allocvec(
+                                                    &MatchmakerResponse::PlayerCount(
+                                                        members.len() as u8
+                                                    ),
+                                                )?;
+                                                for conn in members {
+                                                    let mut send = conn.open_uni().await?;
+                                                    send.write_all(&message).await?;
+                                                    send.finish().await?;
+                                                }
+                                                Ok::<(), anyhow::Error>(())
+                                            };
+                                            result.await.ok();
+                                        }
+                                    })
+                                    .detach();
+
+                                let member_count = members.len();
+
+                                // If we have a complete room
+                                debug!(
+                                    ?match_info,
+                                    "Room now has {}/{} members", member_count, player_count
+                                );
+
+                                if member_count >= player_count as _ {
+                                    // Clear the room
+                                    members_to_join.append(members);
+                                } else {
+                                    members_to_notify = members.clone();
+                                }
+                            })
+                            .await;
+
+                        if !members_to_notify.is_empty() {
+                            let message = postcard::to_allocvec(&MatchmakerResponse::PlayerCount(
+                                members_to_notify.len() as u8,
+                            ))?;
+                            for conn in members_to_notify {
+                                let mut send = conn.open_uni().await?;
+                                send.write_all(&message).await?;
+                                send.finish().await?;
+                            }
+                        }
+
+                        if !members_to_join.is_empty() {
+                            // Respond with success
+                            let message = postcard::to_allocvec(&MatchmakerResponse::Success)?;
+
+                            // Send the match ID to all of the clients in the room
+                            let mut clients = Vec::with_capacity(player_count as usize);
+                            for conn in members_to_join.drain(..) {
+                                let mut send = conn.open_uni().await?;
+                                send.write_all(&message).await?;
+                                send.finish().await?;
+
+                                clients.push(conn);
+                            }
+
+                            // Hand the clients off to the game manager
+                            start_game_server(match_info, clients).await;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/crates/quinn-bevy/Cargo.toml b/crates/quinn-bevy/Cargo.toml
new file mode 100644
index 0000000000..07fa758f8a
--- /dev/null
+++ b/crates/quinn-bevy/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "quinn-bevy"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+quinn = { git = "https://github.com/quinn-rs/quinn.git", default-features = false, features = ["native-certs", "tls-rustls"] }
+quinn-udp = { git = "https://github.com/quinn-rs/quinn.git",  default-features = false }
+quinn-proto = { git = "https://github.com/quinn-rs/quinn.git",  default-features = false }
+bevy_tasks = "0.8.1"
+async-executor = "1.4.1"
+async-io = "1.9.0"
+pin-project = "1.0.12"
+futures-lite = "1.12.0"
\ No newline at end of file
diff --git a/crates/quinn-bevy/src/lib.rs b/crates/quinn-bevy/src/lib.rs
new file mode 100644
index 0000000000..9d18b6fd34
--- /dev/null
+++ b/crates/quinn-bevy/src/lib.rs
@@ -0,0 +1,122 @@
+use std::{
+    io,
+    ops::Deref,
+    sync::Arc,
+    task::{ready, Context, Poll},
+};
+
+use async_io::Async;
+use bevy_tasks::IoTaskPool;
+use quinn_proto::Transmit;
+
+#[derive(Clone, Debug)]
+pub struct BevyIoTaskPoolExecutor;
+
+#[derive(Clone, Debug)]
+pub struct AsyncExecutor<'a>(pub Arc<async_executor::Executor<'a>>);
+
+impl<'a> Deref for AsyncExecutor<'a> {
+    type Target = async_executor::Executor<'a>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+#[derive(Debug)]
+#[pin_project::pin_project]
+pub struct AsyncIoTimer(#[pin] pub async_io::Timer);
+
+impl quinn::AsyncTimer for AsyncIoTimer {
+    fn reset(mut self: std::pin::Pin<&mut Self>, i: std::time::Instant) {
+        self.0 = async_io::Timer::at(i);
+    }
+
+    fn poll(self: std::pin::Pin<&mut Self>, cx: &mut Context) -> Poll<()> {
+        let pinned_timer = self.project().0;
+        <async_io::Timer as std::future::Future>::poll(pinned_timer, cx).map(|_| ())
+    }
+}
+
+impl quinn::Runtime for AsyncExecutor<'static> {
+    fn new_timer(&self, i: std::time::Instant) -> std::pin::Pin<Box<dyn quinn::AsyncTimer>> {
+        Box::pin(AsyncIoTimer(async_io::Timer::at(i))) as _
+    }
+
+    fn spawn(&self, future: std::pin::Pin<Box<dyn std::future::Future<Output = ()> + Send>>) {
+        self.0.spawn(future).detach();
+    }
+
+    fn wrap_udp_socket(
+        &self,
+        sock: std::net::UdpSocket,
+    ) -> io::Result<Box<dyn quinn::AsyncUdpSocket>> {
+        quinn_udp::UdpSocketState::configure((&sock).into())?;
+        Ok(Box::new(AsyncIoUdpSocket {
+            io: Async::new(sock)?,
+            inner: quinn_udp::UdpSocketState::new(),
+        }))
+    }
+}
+
+impl quinn::Runtime for BevyIoTaskPoolExecutor {
+    fn new_timer(&self, i: std::time::Instant) -> std::pin::Pin<Box<dyn quinn::AsyncTimer>> {
+        Box::pin(AsyncIoTimer(async_io::Timer::at(i))) as _
+    }
+
+    fn spawn(&self, future: std::pin::Pin<Box<dyn futures_lite::Future<Output = ()> + Send>>) {
+        let io_pool = IoTaskPool::get();
+
+        io_pool.spawn(future).detach();
+    }
+
+    fn wrap_udp_socket(
+        &self,
+        sock: std::net::UdpSocket,
+    ) -> io::Result<Box<dyn quinn::AsyncUdpSocket>> {
+        Ok(Box::new(AsyncIoUdpSocket {
+            io: Async::new(sock)?,
+            inner: quinn_udp::UdpSocketState::new(),
+        }))
+    }
+}
+
+#[derive(Debug)]
+struct AsyncIoUdpSocket {
+    io: async_io::Async<std::net::UdpSocket>,
+    inner: quinn_udp::UdpSocketState,
+}
+
+impl quinn::AsyncUdpSocket for AsyncIoUdpSocket {
+    fn poll_send(
+        &mut self,
+        state: &quinn_udp::UdpState,
+        cx: &mut Context,
+        transmits: &[Transmit],
+    ) -> Poll<io::Result<usize>> {
+        loop {
+            ready!(self.io.poll_writable(cx))?;
+            if let Ok(res) = self.inner.send((&self.io).into(), state, transmits) {
+                return Poll::Ready(Ok(res));
+            }
+        }
+    }
+
+    fn poll_recv(
+        &self,
+        cx: &mut Context,
+        bufs: &mut [io::IoSliceMut<'_>],
+        meta: &mut [quinn_udp::RecvMeta],
+    ) -> Poll<io::Result<usize>> {
+        loop {
+            ready!(self.io.poll_readable(cx))?;
+            if let Ok(res) = self.inner.recv((&self.io).into(), bufs, meta) {
+                return Poll::Ready(Ok(res));
+            }
+        }
+    }
+
+    fn local_addr(&self) -> io::Result<std::net::SocketAddr> {
+        self.io.as_ref().local_addr()
+    }
+}
diff --git a/justfile b/justfile
new file mode 100644
index 0000000000..702207588f
--- /dev/null
+++ b/justfile
@@ -0,0 +1,31 @@
+# This is a justfile. See https://github.com/casey/just
+
+list:
+    just --list
+
+check:
+    cargo clippy -- -W clippy::correctness -D warnings
+    cargo fmt --check
+
+build:
+    cargo build
+
+build-release:
+    cargo build --release
+
+build-web basepath='':
+    ./scripts/build-web.sh
+
+build-release-web basepath='':
+    ./scripts/build-web.sh release
+
+run *args:
+    cargo run -- {{args}}
+
+run-web port='4000' host='127.0.0.1': build-web
+    @echo "Debug link: http://{{host}}:{{port}}?RUST_LOG=debug"
+    basic-http-server -a '{{host}}:{{port}}' -x web-target/wasm-debug
+
+run-release-web port='4000' host='127.0.0.1': build-release-web
+    @echo "Debug link: http://{{host}}:{{port}}?RUST_LOG=debug"
+    basic-http-server -a '{{host}}:{{port}}' -x web-target/wasm-release
\ No newline at end of file
diff --git a/lib.bevy.d.ts b/lib.bevy.d.ts
new file mode 100644
index 0000000000..68ffbd1f91
--- /dev/null
+++ b/lib.bevy.d.ts
@@ -0,0 +1,90 @@
+declare namespace Deno {
+  namespace core {
+    function opSync(op: string, ...args: any[]): any;
+  }
+}
+
+// log.s
+declare function trace(...args: any): void;
+declare function debug(...args: any): void;
+declare function info(...args: any): void;
+declare function warn(...args: any): void;
+declare function error(...args: any): void;
+
+// ecs.js
+declare interface BevyScript {
+  first?: () => void;
+  preUpdate?: () => void;
+  update?: () => void;
+  postUpdate?: () => void;
+  last?: () => void;
+}
+
+declare type RawValueRef = unknown;
+
+type RecursivePartial<T> = {
+    [P in keyof T]?: RecursivePartial<T[P]>;
+};
+
+declare interface ValueGlobal {
+  create<T>(t: BevyType<T>, patch?: RecursivePartial<T>): T;
+  patch<T>(value: any, patch: RecursivePartial<T>): T;
+}
+
+declare let Value: ValueGlobal;
+
+declare class ComponentId {
+  index: number;
+}
+
+type ComponentInfo = {
+  id: ComponentId;
+  name: string;
+  size: number;
+};
+
+type QueryDescriptor = {
+  components: ComponentId[];
+};
+
+type Primitive = number | string | boolean;
+interface Value {
+  [path: string | number]: Value | Primitive | undefined;
+}
+
+type BevyType<T> = {
+  typeName: string;
+};
+
+type ExtractBevyType<T> = T extends BevyType<infer U>
+  ? U
+  : T extends ComponentId
+  ? Value
+  : never;
+type MapQueryArgs<Q> = { [C in keyof Q]: ExtractBevyType<Q[C]> };
+
+type QueryParameter = BevyType<unknown> | ComponentId;
+type QueryItem<Q> = {
+  entity: Entity;
+  components: MapQueryArgs<Q>;
+};
+
+declare class QueryItems<Q> extends Array<QueryItem<Q>> {
+  get(entity: Entity): MapQueryArgs<Q> | undefined;
+}
+
+declare class World {
+  get components(): ComponentInfo[];
+  get resources(): ComponentInfo[];
+  get entities(): Entity[];
+
+  resource(componentId: ComponentId): Value | null;
+  resource<T>(type: BevyType<T>): T | null;
+
+  query<Q extends QueryParameter[]>(...query: Q): QueryItems<Q>;
+  get<T>(entity: Entity, component: BevyType<T>): T | undefined;
+  insert(entity: Entity, component: any): void;
+  spawn(): Entity;
+}
+
+declare let world: World;
diff --git a/lib.bevy.types.ts b/lib.bevy.types.ts
new file mode 100644
index 0000000000..3989b3c27c
--- /dev/null
+++ b/lib.bevy.types.ts
@@ -0,0 +1,613 @@
+// generated with https://github.com/jakobhellermann/bevy_reflect_ts_type_export
+// bevy_core
+type bool = boolean;
+type f32 = number;
+type f64 = number;
+type i8 = number;
+type i16 = number;
+type i32 = number;
+type i64 = number;
+type isize = number;
+type u8 = number;
+type u16 = number;
+type u32 = number;
+type u64 = number;
+type usize = number;
+type Cowstr = String;
+
+type Name = {
+  hash: number,
+  name: string,
+};
+
+const Name: BevyType<Name> = { typeName: "bevy_core::name::Name" };
+// core
+type Rangef32 = unknown;
+type Duration = unknown;
+
+const Rangef32: BevyType<Rangef32> = { typeName: "core::ops::range::Range<f32>" };
+const Duration: BevyType<Duration> = { typeName: "core::time::Duration" };
+// hashbrown
+type HashSetString = unknown;
+
+const HashSetString: BevyType<HashSetString> = { typeName: "hashbrown::set::HashSet<alloc::string::String>" };
+// bevy_math
+type Rect = {
+  min: Vec2,
+  max: Vec2,
+};
+
+const Rect: BevyType<Rect> = { typeName: "bevy_math::rect::Rect" };
+// std
+type Instant = unknown;
+
+const Instant: BevyType<Instant> = { typeName: "std::time::Instant" };
+// bevy_ecs
+type Entity = unknown;
+
+const Entity: BevyType<Entity> = { typeName: "bevy_ecs::entity::Entity" };
+// bevy_time
+type Stopwatch = {
+  elapsed: Duration,
+  paused: boolean,
+};
+type Time = {
+  delta: Duration,
+  last_update: Instant | null,
+  delta_seconds_f64: number,
+  delta_seconds: number,
+  seconds_since_startup: number,
+  time_since_startup: Duration,
+  startup: Instant,
+};
+type Timer = {
+  stopwatch: Stopwatch,
+  duration: Duration,
+  repeating: boolean,
+  finished: boolean,
+  times_finished_this_tick: number,
+};
+
+const Stopwatch: BevyType<Stopwatch> = { typeName: "bevy_time::stopwatch::Stopwatch" };
+const Time: BevyType<Time> = { typeName: "bevy_time::time::Time" };
+const Timer: BevyType<Timer> = { typeName: "bevy_time::timer::Timer" };
+// bevy_asset
+type HandleAnimationClip = {
+  id: HandleId,
+};
+type HandleAudioSink = {
+  id: HandleId,
+};
+type HandleAudioSource = {
+  id: HandleId,
+};
+type HandleGltf = {
+  id: HandleId,
+};
+type HandleGltfMesh = {
+  id: HandleId,
+};
+type HandleGltfNode = {
+  id: HandleId,
+};
+type HandleGltfPrimitive = {
+  id: HandleId,
+};
+type HandleStandardMaterial = {
+  id: HandleId,
+};
+type HandleMesh = {
+  id: HandleId,
+};
+type HandleSkinnedMeshInverseBindposes = {
+  id: HandleId,
+};
+type HandleShader = {
+  id: HandleId,
+};
+type HandleImage = {
+  id: HandleId,
+};
+type HandleDynamicScene = {
+  id: HandleId,
+};
+type HandleScene = {
+  id: HandleId,
+};
+type HandleColorMaterial = {
+  id: HandleId,
+};
+type HandleTextureAtlas = {
+  id: HandleId,
+};
+type HandleFont = {
+  id: HandleId,
+};
+type HandleFontAtlasSet = {
+  id: HandleId,
+};
+type HandleId = unknown;
+
+const HandleAnimationClip: BevyType<HandleAnimationClip> = { typeName: "bevy_asset::handle::Handle<bevy_animation::AnimationClip>" };
+const HandleAudioSink: BevyType<HandleAudioSink> = { typeName: "bevy_asset::handle::Handle<bevy_audio::audio_output::AudioSink>" };
+const HandleAudioSource: BevyType<HandleAudioSource> = { typeName: "bevy_asset::handle::Handle<bevy_audio::audio_source::AudioSource>" };
+const HandleGltf: BevyType<HandleGltf> = { typeName: "bevy_asset::handle::Handle<bevy_gltf::Gltf>" };
+const HandleGltfMesh: BevyType<HandleGltfMesh> = { typeName: "bevy_asset::handle::Handle<bevy_gltf::GltfMesh>" };
+const HandleGltfNode: BevyType<HandleGltfNode> = { typeName: "bevy_asset::handle::Handle<bevy_gltf::GltfNode>" };
+const HandleGltfPrimitive: BevyType<HandleGltfPrimitive> = { typeName: "bevy_asset::handle::Handle<bevy_gltf::GltfPrimitive>" };
+const HandleStandardMaterial: BevyType<HandleStandardMaterial> = { typeName: "bevy_asset::handle::Handle<bevy_pbr::pbr_material::StandardMaterial>" };
+const HandleMesh: BevyType<HandleMesh> = { typeName: "bevy_asset::handle::Handle<bevy_render::mesh::mesh::Mesh>" };
+const HandleSkinnedMeshInverseBindposes: BevyType<HandleSkinnedMeshInverseBindposes> = { typeName: "bevy_asset::handle::Handle<bevy_render::mesh::mesh::skinning::SkinnedMeshInverseBindposes>" };
+const HandleShader: BevyType<HandleShader> = { typeName: "bevy_asset::handle::Handle<bevy_render::render_resource::shader::Shader>" };
+const HandleImage: BevyType<HandleImage> = { typeName: "bevy_asset::handle::Handle<bevy_render::texture::image::Image>" };
+const HandleDynamicScene: BevyType<HandleDynamicScene> = { typeName: "bevy_asset::handle::Handle<bevy_scene::dynamic_scene::DynamicScene>" };
+const HandleScene: BevyType<HandleScene> = { typeName: "bevy_asset::handle::Handle<bevy_scene::scene::Scene>" };
+const HandleColorMaterial: BevyType<HandleColorMaterial> = { typeName: "bevy_asset::handle::Handle<bevy_sprite::mesh2d::color_material::ColorMaterial>" };
+const HandleTextureAtlas: BevyType<HandleTextureAtlas> = { typeName: "bevy_asset::handle::Handle<bevy_sprite::texture_atlas::TextureAtlas>" };
+const HandleFont: BevyType<HandleFont> = { typeName: "bevy_asset::handle::Handle<bevy_text::font::Font>" };
+const HandleFontAtlasSet: BevyType<HandleFontAtlasSet> = { typeName: "bevy_asset::handle::Handle<bevy_text::font_atlas_set::FontAtlasSet>" };
+const HandleId: BevyType<HandleId> = { typeName: "bevy_asset::handle::HandleId" };
+// bevy_gltf
+type GltfExtras = {
+  value: string,
+};
+
+const GltfExtras: BevyType<GltfExtras> = { typeName: "bevy_gltf::GltfExtras" };
+// bevy_core_pipeline
+type ClearColor = unknown;
+type ClearColorConfig = unknown;
+type Camera2d = {
+  clear_color: ClearColorConfig,
+};
+type Camera3d = {
+  clear_color: ClearColorConfig,
+  depth_load_op: Camera3dDepthLoadOp,
+};
+type Camera3dDepthLoadOp = unknown;
+
+const ClearColor: BevyType<ClearColor> = { typeName: "bevy_core_pipeline::clear_color::ClearColor" };
+const ClearColorConfig: BevyType<ClearColorConfig> = { typeName: "bevy_core_pipeline::clear_color::ClearColorConfig" };
+const Camera2d: BevyType<Camera2d> = { typeName: "bevy_core_pipeline::core_2d::camera_2d::Camera2d" };
+const Camera3d: BevyType<Camera3d> = { typeName: "bevy_core_pipeline::core_3d::camera_3d::Camera3d" };
+const Camera3dDepthLoadOp: BevyType<Camera3dDepthLoadOp> = { typeName: "bevy_core_pipeline::core_3d::camera_3d::Camera3dDepthLoadOp" };
+// bevy_pbr
+type CubemapVisibleEntities = {
+};
+type AmbientLight = {
+  color: Color,
+  brightness: number,
+};
+type DirectionalLight = {
+  color: Color,
+  illuminance: number,
+  shadows_enabled: boolean,
+  shadow_projection: OrthographicProjection,
+  shadow_depth_bias: number,
+  shadow_normal_bias: number,
+};
+type DirectionalLightShadowMap = {
+  size: number,
+};
+type PointLight = {
+  color: Color,
+  intensity: number,
+  range: number,
+  radius: number,
+  shadows_enabled: boolean,
+  shadow_depth_bias: number,
+  shadow_normal_bias: number,
+};
+type PointLightShadowMap = {
+  size: number,
+};
+type SpotLight = {
+  color: Color,
+  intensity: number,
+  range: number,
+  radius: number,
+  shadows_enabled: boolean,
+  shadow_depth_bias: number,
+  shadow_normal_bias: number,
+  outer_angle: number,
+  inner_angle: number,
+};
+
+const CubemapVisibleEntities: BevyType<CubemapVisibleEntities> = { typeName: "bevy_pbr::bundle::CubemapVisibleEntities" };
+const AmbientLight: BevyType<AmbientLight> = { typeName: "bevy_pbr::light::AmbientLight" };
+const DirectionalLight: BevyType<DirectionalLight> = { typeName: "bevy_pbr::light::DirectionalLight" };
+const DirectionalLightShadowMap: BevyType<DirectionalLightShadowMap> = { typeName: "bevy_pbr::light::DirectionalLightShadowMap" };
+const PointLight: BevyType<PointLight> = { typeName: "bevy_pbr::light::PointLight" };
+const PointLightShadowMap: BevyType<PointLightShadowMap> = { typeName: "bevy_pbr::light::PointLightShadowMap" };
+const SpotLight: BevyType<SpotLight> = { typeName: "bevy_pbr::light::SpotLight" };
+// bevy_render
+type Camera = {
+  viewport: Viewport | null,
+  priority: number,
+  is_active: boolean,
+};
+type CameraRenderGraph = unknown;
+type Viewport = {
+  physical_position: UVec2,
+  physical_size: UVec2,
+  depth: Rangef32,
+};
+type OrthographicProjection = {
+  left: number,
+  right: number,
+  bottom: number,
+  top: number,
+  near: number,
+  far: number,
+  window_origin: WindowOrigin,
+  scaling_mode: ScalingMode,
+  scale: number,
+};
+type PerspectiveProjection = {
+  fov: number,
+  aspect_ratio: number,
+  near: number,
+  far: number,
+};
+type Projection = unknown;
+type ScalingMode = unknown;
+type WindowOrigin = unknown;
+type Color = unknown;
+type SkinnedMesh = {
+  inverse_bindposes: HandleSkinnedMeshInverseBindposes,
+  joints: Entity[],
+};
+type Aabb = {
+  center: Vec3A,
+  half_extents: Vec3A,
+};
+type CubemapFrusta = {
+};
+type Frustum = {
+};
+type Msaa = {
+  samples: number,
+};
+type ComputedVisibility = {
+  is_visible_in_hierarchy: boolean,
+  is_visible_in_view: boolean,
+};
+type Visibility = {
+  is_visible: boolean,
+};
+type VisibleEntities = {
+};
+
+const Camera: BevyType<Camera> = { typeName: "bevy_render::camera::camera::Camera" };
+const CameraRenderGraph: BevyType<CameraRenderGraph> = { typeName: "bevy_render::camera::camera::CameraRenderGraph" };
+const Viewport: BevyType<Viewport> = { typeName: "bevy_render::camera::camera::Viewport" };
+const OrthographicProjection: BevyType<OrthographicProjection> = { typeName: "bevy_render::camera::projection::OrthographicProjection" };
+const PerspectiveProjection: BevyType<PerspectiveProjection> = { typeName: "bevy_render::camera::projection::PerspectiveProjection" };
+const Projection: BevyType<Projection> = { typeName: "bevy_render::camera::projection::Projection" };
+const ScalingMode: BevyType<ScalingMode> = { typeName: "bevy_render::camera::projection::ScalingMode" };
+const WindowOrigin: BevyType<WindowOrigin> = { typeName: "bevy_render::camera::projection::WindowOrigin" };
+const Color: BevyType<Color> = { typeName: "bevy_render::color::Color" };
+const SkinnedMesh: BevyType<SkinnedMesh> = { typeName: "bevy_render::mesh::mesh::skinning::SkinnedMesh" };
+const Aabb: BevyType<Aabb> = { typeName: "bevy_render::primitives::Aabb" };
+const CubemapFrusta: BevyType<CubemapFrusta> = { typeName: "bevy_render::primitives::CubemapFrusta" };
+const Frustum: BevyType<Frustum> = { typeName: "bevy_render::primitives::Frustum" };
+const Msaa: BevyType<Msaa> = { typeName: "bevy_render::view::Msaa" };
+const ComputedVisibility: BevyType<ComputedVisibility> = { typeName: "bevy_render::view::visibility::ComputedVisibility" };
+const Visibility: BevyType<Visibility> = { typeName: "bevy_render::view::visibility::Visibility" };
+const VisibleEntities: BevyType<VisibleEntities> = { typeName: "bevy_render::view::visibility::VisibleEntities" };
+// bevy_sprite
+type Mesh2dHandle = unknown;
+type Anchor = unknown;
+type Sprite = {
+  color: Color,
+  flip_x: boolean,
+  flip_y: boolean,
+  custom_size: Vec2 | null,
+  rect: Rect | null,
+  anchor: Anchor,
+};
+
+const Mesh2dHandle: BevyType<Mesh2dHandle> = { typeName: "bevy_sprite::mesh2d::mesh::Mesh2dHandle" };
+const Anchor: BevyType<Anchor> = { typeName: "bevy_sprite::sprite::Anchor" };
+const Sprite: BevyType<Sprite> = { typeName: "bevy_sprite::sprite::Sprite" };
+// bevy_hierarchy
+type Children = unknown;
+type Parent = unknown;
+
+const Children: BevyType<Children> = { typeName: "bevy_hierarchy::components::children::Children" };
+const Parent: BevyType<Parent> = { typeName: "bevy_hierarchy::components::parent::Parent" };
+// bevy_text
+type HorizontalAlign = unknown;
+type Text = {
+  sections: TextSection[],
+  alignment: TextAlignment,
+};
+type TextAlignment = {
+  vertical: VerticalAlign,
+  horizontal: HorizontalAlign,
+};
+type TextSection = {
+  value: string,
+  style: TextStyle,
+};
+type TextStyle = {
+  font: HandleFont,
+  font_size: number,
+  color: Color,
+};
+type VerticalAlign = unknown;
+
+const HorizontalAlign: BevyType<HorizontalAlign> = { typeName: "bevy_text::text::HorizontalAlign" };
+const Text: BevyType<Text> = { typeName: "bevy_text::text::Text" };
+const TextAlignment: BevyType<TextAlignment> = { typeName: "bevy_text::text::TextAlignment" };
+const TextSection: BevyType<TextSection> = { typeName: "bevy_text::text::TextSection" };
+const TextStyle: BevyType<TextStyle> = { typeName: "bevy_text::text::TextStyle" };
+const VerticalAlign: BevyType<VerticalAlign> = { typeName: "bevy_text::text::VerticalAlign" };
+// glam
+type BVec2 = {
+  x: boolean,
+  y: boolean,
+};
+type BVec3 = {
+  x: boolean,
+  y: boolean,
+  z: boolean,
+};
+type BVec4 = {
+  x: boolean,
+  y: boolean,
+  z: boolean,
+  w: boolean,
+};
+type BVec3A = unknown;
+type BVec4A = unknown;
+type Affine2 = {
+  matrix2: Mat2,
+  translation: Vec2,
+};
+type Affine3A = {
+  matrix3: Mat3A,
+  translation: Vec3A,
+};
+type Mat3 = {
+  x_axis: Vec3,
+  y_axis: Vec3,
+  z_axis: Vec3,
+};
+type Mat2 = {
+  x_axis: Vec2,
+  y_axis: Vec2,
+};
+type Mat3A = {
+  x_axis: Vec3A,
+  y_axis: Vec3A,
+  z_axis: Vec3A,
+};
+type Mat4 = {
+  x_axis: Vec4,
+  y_axis: Vec4,
+  z_axis: Vec4,
+  w_axis: Vec4,
+};
+type Quat = unknown;
+type Vec3A = {
+  x: number,
+  y: number,
+  z: number,
+};
+type Vec4 = {
+  x: number,
+  y: number,
+  z: number,
+  w: number,
+};
+type Vec2 = {
+  x: number,
+  y: number,
+};
+type Vec3 = {
+  x: number,
+  y: number,
+  z: number,
+};
+type DAffine2 = {
+  matrix2: DMat2,
+  translation: DVec2,
+};
+type DAffine3 = {
+  matrix3: DMat3,
+  translation: DVec3,
+};
+type DMat2 = {
+  x_axis: DVec2,
+  y_axis: DVec2,
+};
+type DMat3 = {
+  x_axis: DVec3,
+  y_axis: DVec3,
+  z_axis: DVec3,
+};
+type DMat4 = {
+  x_axis: DVec4,
+  y_axis: DVec4,
+  z_axis: DVec4,
+  w_axis: DVec4,
+};
+type DQuat = unknown;
+type DVec2 = {
+  x: number,
+  y: number,
+};
+type DVec3 = {
+  x: number,
+  y: number,
+  z: number,
+};
+type DVec4 = {
+  x: number,
+  y: number,
+  z: number,
+  w: number,
+};
+type IVec2 = {
+  x: number,
+  y: number,
+};
+type IVec3 = {
+  x: number,
+  y: number,
+  z: number,
+};
+type IVec4 = {
+  x: number,
+  y: number,
+  z: number,
+  w: number,
+};
+type UVec2 = {
+  x: number,
+  y: number,
+};
+type UVec3 = {
+  x: number,
+  y: number,
+  z: number,
+};
+type UVec4 = {
+  x: number,
+  y: number,
+  z: number,
+  w: number,
+};
+
+const BVec2: BevyType<BVec2> = { typeName: "glam::bool::bvec2::BVec2" };
+const BVec3: BevyType<BVec3> = { typeName: "glam::bool::bvec3::BVec3" };
+const BVec4: BevyType<BVec4> = { typeName: "glam::bool::bvec4::BVec4" };
+const BVec3A: BevyType<BVec3A> = { typeName: "glam::bool::sse2::bvec3a::BVec3A" };
+const BVec4A: BevyType<BVec4A> = { typeName: "glam::bool::sse2::bvec4a::BVec4A" };
+const Affine2: BevyType<Affine2> = { typeName: "glam::f32::affine2::Affine2" };
+const Affine3A: BevyType<Affine3A> = { typeName: "glam::f32::affine3a::Affine3A" };
+const Mat3: BevyType<Mat3> = { typeName: "glam::f32::mat3::Mat3" };
+const Mat2: BevyType<Mat2> = { typeName: "glam::f32::sse2::mat2::Mat2" };
+const Mat3A: BevyType<Mat3A> = { typeName: "glam::f32::sse2::mat3a::Mat3A" };
+const Mat4: BevyType<Mat4> = { typeName: "glam::f32::sse2::mat4::Mat4" };
+const Quat: BevyType<Quat> = { typeName: "glam::f32::sse2::quat::Quat" };
+const Vec3A: BevyType<Vec3A> = { typeName: "glam::f32::sse2::vec3a::Vec3A" };
+const Vec4: BevyType<Vec4> = { typeName: "glam::f32::sse2::vec4::Vec4" };
+const Vec2: BevyType<Vec2> = { typeName: "glam::f32::vec2::Vec2" };
+const Vec3: BevyType<Vec3> = { typeName: "glam::f32::vec3::Vec3" };
+const DAffine2: BevyType<DAffine2> = { typeName: "glam::f64::daffine2::DAffine2" };
+const DAffine3: BevyType<DAffine3> = { typeName: "glam::f64::daffine3::DAffine3" };
+const DMat2: BevyType<DMat2> = { typeName: "glam::f64::dmat2::DMat2" };
+const DMat3: BevyType<DMat3> = { typeName: "glam::f64::dmat3::DMat3" };
+const DMat4: BevyType<DMat4> = { typeName: "glam::f64::dmat4::DMat4" };
+const DQuat: BevyType<DQuat> = { typeName: "glam::f64::dquat::DQuat" };
+const DVec2: BevyType<DVec2> = { typeName: "glam::f64::dvec2::DVec2" };
+const DVec3: BevyType<DVec3> = { typeName: "glam::f64::dvec3::DVec3" };
+const DVec4: BevyType<DVec4> = { typeName: "glam::f64::dvec4::DVec4" };
+const IVec2: BevyType<IVec2> = { typeName: "glam::i32::ivec2::IVec2" };
+const IVec3: BevyType<IVec3> = { typeName: "glam::i32::ivec3::IVec3" };
+const IVec4: BevyType<IVec4> = { typeName: "glam::i32::ivec4::IVec4" };
+const UVec2: BevyType<UVec2> = { typeName: "glam::u32::uvec2::UVec2" };
+const UVec3: BevyType<UVec3> = { typeName: "glam::u32::uvec3::UVec3" };
+const UVec4: BevyType<UVec4> = { typeName: "glam::u32::uvec4::UVec4" };
+// bevy_transform
+type GlobalTransform = unknown;
+type Transform = {
+  translation: Vec3,
+  rotation: Quat,
+  scale: Vec3,
+};
+
+const GlobalTransform: BevyType<GlobalTransform> = { typeName: "bevy_transform::components::global_transform::GlobalTransform" };
+const Transform: BevyType<Transform> = { typeName: "bevy_transform::components::transform::Transform" };
+// bevy_animation
+type AnimationPlayer = {
+  paused: boolean,
+  repeat: boolean,
+  speed: number,
+  elapsed: number,
+  animation_clip: HandleAnimationClip,
+};
+
+const AnimationPlayer: BevyType<AnimationPlayer> = { typeName: "bevy_animation::AnimationPlayer" };
+// bevy_ui
+type FocusPolicy = unknown;
+type Interaction = unknown;
+type Size = {
+  width: Val,
+  height: Val,
+};
+type UiRect = {
+  left: Val,
+  right: Val,
+  top: Val,
+  bottom: Val,
+};
+type AlignContent = unknown;
+type AlignItems = unknown;
+type AlignSelf = unknown;
+type CalculatedSize = {
+  size: Size,
+};
+type Direction = unknown;
+type Display = unknown;
+type FlexDirection = unknown;
+type FlexWrap = unknown;
+type JustifyContent = unknown;
+type Node = {
+  size: Vec2,
+};
+type Overflow = unknown;
+type PositionType = unknown;
+type Style = {
+  display: Display,
+  position_type: PositionType,
+  direction: Direction,
+  flex_direction: FlexDirection,
+  flex_wrap: FlexWrap,
+  align_items: AlignItems,
+  align_self: AlignSelf,
+  align_content: AlignContent,
+  justify_content: JustifyContent,
+  position: UiRect,
+  margin: UiRect,
+  padding: UiRect,
+  border: UiRect,
+  flex_grow: number,
+  flex_shrink: number,
+  flex_basis: Val,
+  size: Size,
+  min_size: Size,
+  max_size: Size,
+  aspect_ratio: number | null,
+  overflow: Overflow,
+};
+type UiColor = unknown;
+type UiImage = unknown;
+type Val = unknown;
+type Button = {
+};
+type ImageMode = unknown;
+
+const FocusPolicy: BevyType<FocusPolicy> = { typeName: "bevy_ui::focus::FocusPolicy" };
+const Interaction: BevyType<Interaction> = { typeName: "bevy_ui::focus::Interaction" };
+const Size: BevyType<Size> = { typeName: "bevy_ui::geometry::Size" };
+const UiRect: BevyType<UiRect> = { typeName: "bevy_ui::geometry::UiRect" };
+const AlignContent: BevyType<AlignContent> = { typeName: "bevy_ui::ui_node::AlignContent" };
+const AlignItems: BevyType<AlignItems> = { typeName: "bevy_ui::ui_node::AlignItems" };
+const AlignSelf: BevyType<AlignSelf> = { typeName: "bevy_ui::ui_node::AlignSelf" };
+const CalculatedSize: BevyType<CalculatedSize> = { typeName: "bevy_ui::ui_node::CalculatedSize" };
+const Direction: BevyType<Direction> = { typeName: "bevy_ui::ui_node::Direction" };
+const Display: BevyType<Display> = { typeName: "bevy_ui::ui_node::Display" };
+const FlexDirection: BevyType<FlexDirection> = { typeName: "bevy_ui::ui_node::FlexDirection" };
+const FlexWrap: BevyType<FlexWrap> = { typeName: "bevy_ui::ui_node::FlexWrap" };
+const JustifyContent: BevyType<JustifyContent> = { typeName: "bevy_ui::ui_node::JustifyContent" };
+const Node: BevyType<Node> = { typeName: "bevy_ui::ui_node::Node" };
+const Overflow: BevyType<Overflow> = { typeName: "bevy_ui::ui_node::Overflow" };
+const PositionType: BevyType<PositionType> = { typeName: "bevy_ui::ui_node::PositionType" };
+const Style: BevyType<Style> = { typeName: "bevy_ui::ui_node::Style" };
+const UiColor: BevyType<UiColor> = { typeName: "bevy_ui::ui_node::UiColor" };
+const UiImage: BevyType<UiImage> = { typeName: "bevy_ui::ui_node::UiImage" };
+const Val: BevyType<Val> = { typeName: "bevy_ui::ui_node::Val" };
+const Button: BevyType<Button> = { typeName: "bevy_ui::widget::button::Button" };
+const ImageMode: BevyType<ImageMode> = { typeName: "bevy_ui::widget::image::ImageMode" };
diff --git a/lib.jumpy.d.ts b/lib.jumpy.d.ts
new file mode 100644
index 0000000000..5793ae4b48
--- /dev/null
+++ b/lib.jumpy.d.ts
@@ -0,0 +1,201 @@
+//
+// Core Jumpy script ops and namespaces
+//
+
+declare namespace MapElement {
+  function getSpawnedEntities(): Entity[];
+  function mapReset(): boolean;
+}
+
+/** We've added a reflect function for hashing the HandleId to a JS Number */
+interface HandleIdWithFuncs {
+  hash(): string;
+}
+
+declare namespace Assets {
+  function getHandleId(relative_path: string): HandleIdWithFuncs;
+  function getAbsolutePath(relative_path: string): string;
+}
+
+declare namespace WorldTemp {
+  function despawnRecursive(entity: Entity): void;
+}
+
+// All handles have the same type, so just alias here
+type HandleJsScript = HandleImage;
+
+declare interface ScriptInfo {
+  path: string;
+  handle: HandleJsScript;
+  handle_id_hash: string;
+}
+
+declare namespace Script {
+  function getInfo(): ScriptInfo;
+  function state<T>(init?: T): T;
+  function entityStates(): object;
+  function getEntityState<T>(entity: Entity, init?: T): T;
+  function setEntityState<T>(entity: Entity, value: T): void;
+}
+
+declare namespace NetCommands {
+  function insert(entity: Entity, component: any): void;
+  function spawn(): Entity;
+}
+
+declare type JsEntity = {
+  bits: number;
+};
+
+declare namespace EntityRef {
+  function fromJs(js_ent: JsEntity): Entity;
+  function toJs(ent: Entity): JsEntity;
+}
+
+interface NetInfo {
+  is_client: boolean;
+  is_server: boolean;
+  player_idx: usize;
+}
+
+declare namespace NetInfo {
+  function get(): NetInfo;
+}
+
+type PlayerKillEvent = {
+  player: Entity;
+  velocity: Vec2;
+  position: Vec3;
+};
+declare namespace Player {
+  function kill(entity: Entity): void;
+  function despawn(entity: Entity): void;
+  function killEvents(): PlayerKillEvent[];
+  function getInventory(player: Entity): Entity | null;
+  function setInventory(player: Entity, item: Entity): void;
+  function useItem(player: Entity): void;
+}
+
+declare namespace CollisionWorld {
+  function actorCollisions(entity: Entity): Entity[];
+}
+
+type ItemGrabEvent = {
+  player: Entity;
+  item: Entity;
+  position: Vec3;
+};
+type ItemDropEvent = {
+  player: Entity;
+  item: Entity;
+  position: Vec3;
+  velocity: Vec2;
+};
+type ItemUseEvent = {
+  player: Entity;
+  item: Entity;
+  position: Vec3;
+};
+declare namespace Items {
+  function grabEvents(): ItemGrabEvent[];
+  function dropEvents(): ItemDropEvent[];
+  function useEvents(): ItemUseEvent[];
+}
+
+//
+// Jumpy component types
+//
+
+type EntityName = [string];
+declare const EntityName: BevyType<EntityName>;
+
+type MapMeta = {
+  name: string;
+  grid_size: UVec2;
+  tile_size: UVec2;
+};
+declare const MapMeta: BevyType<MapMeta>;
+declare const GameCamera: BevyType<unknown>;
+
+type PlayerIdx = [usize];
+declare const PlayerIdx: BevyType<PlayerIdx>;
+declare const PlayerKilled: BevyType<unknown>;
+
+type PlayerState = { id: string; age: u64; previous_state: string };
+declare const PlayerState: BevyType<PlayerState>;
+
+type HandlePlayerMeta = HandleImage;
+type PlayerControl = {
+  move_direction: Vec2;
+  jump_pressed: boolean;
+  jump_just_pressed: boolean;
+  shoot_pressed: boolean;
+  shoot_just_pressed: boolean;
+  grab_pressed: boolean;
+  grab_just_pressed: boolean;
+  slide_pressed: boolean;
+  slide_just_pressed: boolean;
+};
+type PlayerInput = {
+  active: boolean;
+  selected_player: HandlePlayerMeta;
+  control: PlayerControl;
+  previous_control: PlayerControl;
+};
+type PlayerInputs = {
+  players: PlayerInput[];
+};
+declare const PlayerInputs: BevyType<PlayerInputs>;
+
+type Item = {
+  script: string;
+};
+declare const Item: BevyType<Item>;
+
+type DamageRegion = {
+  size: Vec2;
+};
+declare const DamageRegion: BevyType<DamageRegion>;
+declare const DamageRegionOwner: BevyType<[Entity]>;
+
+type Lifetime = {
+  lifetime: f32;
+  age: f32;
+};
+declare const Lifetime: BevyType<Lifetime>;
+
+type KinematicBody = {
+  offset: Vec2;
+  size: Vec2;
+  velocity: Vec2;
+  is_on_ground: boolean;
+  was_on_ground: boolean;
+  has_mass: boolean;
+  has_friction: boolean;
+  bouncyness: f32;
+  is_deactivated: boolean;
+  gravity: f32;
+  fall_through: boolean;
+  is_spawning: boolean;
+};
+declare const KinematicBody: BevyType<KinematicBody>;
+
+type AnimationBankSprite = {
+  current_animation: string;
+  flip_x: boolean;
+  flip_y: boolean;
+  animations: unknown;
+};
+declare const AnimationBankSprite: BevyType<AnimationBankSprite>;
+
+type AnimatedSprite = {
+  index: usize;
+  start: usize;
+  end: usize;
+  atlas: HandleTextureAtlas;
+  flip_x: boolean;
+  flip_y: boolean;
+  repeat: boolean;
+  fps: f32;
+};
+declare const AnimatedSprite: BevyType<AnimatedSprite>;
diff --git a/lib.jumpy.js b/lib.jumpy.js
new file mode 100644
index 0000000000..c6c5e5d149
--- /dev/null
+++ b/lib.jumpy.js
@@ -0,0 +1,42 @@
+const EntityName = {
+    typeName: "jumpy::name::EntityName"
+}
+const GameCamera = {
+    typeName: "jumpy::camera::GameCamera"
+}
+const MapMeta = {
+    typeName: "jumpy::metadata::map::MapMeta"
+}
+const PlayerIdx = {
+    typeName: "jumpy::player::PlayerIdx"
+}
+const PlayerKilled = {
+    typeName: "jumpy::player::PlayerKilled"
+}
+const PlayerState = {
+    typeName: "jumpy::player::state::PlayerState"
+}
+const PlayerInputs = {
+    typeName: "jumpy::player::input::PlayerInputs"
+}
+const Item = {
+    typeName: "jumpy::item::Item"
+}
+const DamageRegion = {
+    typeName: "jumpy::damage::DamageRegion"
+}
+const DamageRegionOwner = {
+    typeName: "jumpy::damage::DamageRegionOwner"
+}
+const Lifetime = {
+    typeName: "jumpy::lifetime::Lifetime"
+}
+const KinematicBody = {
+    typeName: "jumpy::physics::KinematicBody"
+}
+const AnimationBankSprite = {
+    typeName: "jumpy::animation::AnimationBankSprite"
+}
+const AnimatedSprite = {
+    typeName: "jumpy::animation::AnimatedSprite"
+}
\ No newline at end of file
diff --git a/mods/active_mods.json b/mods/active_mods.json
deleted file mode 100644
index dc3adf275f..0000000000
--- a/mods/active_mods.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  "test_mod_one",
-  "test_mod_two"
-]
\ No newline at end of file
diff --git a/mods/test_mod_one/jumpy_mod.json b/mods/test_mod_one/jumpy_mod.json
deleted file mode 100644
index d01c2faa1b..0000000000
--- a/mods/test_mod_one/jumpy_mod.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "id": "test_mod_one",
-  "name": "Test Mod One",
-  "description": "This is a mod meant for testing",
-  "version": "0.1.0",
-  "kind": "data_only"
-}
\ No newline at end of file
diff --git a/mods/test_mod_two/jumpy_mod.json b/mods/test_mod_two/jumpy_mod.json
deleted file mode 100644
index e8c5084aa7..0000000000
--- a/mods/test_mod_two/jumpy_mod.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "test_mod_two",
-  "name": "Test Mod Two",
-  "description": "This is another mod meant for testing",
-  "version": "0.1.0",
-  "kind": "data_only",
-  "dependencies": [
-    {
-      "id": "test_mod_one",
-      "version": "0.1.0"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/assets/decoration.json b/old_assets/decoration.json
similarity index 100%
rename from assets/decoration.json
rename to old_assets/decoration.json
diff --git a/assets/decoration/anemones.json b/old_assets/decoration/anemones.json
similarity index 100%
rename from assets/decoration/anemones.json
rename to old_assets/decoration/anemones.json
diff --git a/assets/decoration/seaweed.json b/old_assets/decoration/seaweed.json
similarity index 100%
rename from assets/decoration/seaweed.json
rename to old_assets/decoration/seaweed.json
diff --git a/assets/images.json b/old_assets/images.json
similarity index 100%
rename from assets/images.json
rename to old_assets/images.json
diff --git a/assets/images.schema.json b/old_assets/images.schema.json
similarity index 100%
rename from assets/images.schema.json
rename to old_assets/images.schema.json
diff --git a/assets/items.json b/old_assets/items.json
similarity index 100%
rename from assets/items.json
rename to old_assets/items.json
diff --git a/assets/items/blunderbass.json b/old_assets/items/blunderbass.json
similarity index 100%
rename from assets/items/blunderbass.json
rename to old_assets/items/blunderbass.json
diff --git a/assets/items/blunderbuss.json b/old_assets/items/blunderbuss.json
similarity index 100%
rename from assets/items/blunderbuss.json
rename to old_assets/items/blunderbuss.json
diff --git a/assets/items/bonnet_hat.json b/old_assets/items/bonnet_hat.json
similarity index 100%
rename from assets/items/bonnet_hat.json
rename to old_assets/items/bonnet_hat.json
diff --git a/assets/items/bucket_hat.json b/old_assets/items/bucket_hat.json
similarity index 100%
rename from assets/items/bucket_hat.json
rename to old_assets/items/bucket_hat.json
diff --git a/assets/items/cannon.json b/old_assets/items/cannon.json
similarity index 100%
rename from assets/items/cannon.json
rename to old_assets/items/cannon.json
diff --git a/assets/items/chefs_hat.json b/old_assets/items/chefs_hat.json
similarity index 100%
rename from assets/items/chefs_hat.json
rename to old_assets/items/chefs_hat.json
diff --git a/assets/items/chest_hat.json b/old_assets/items/chest_hat.json
similarity index 100%
rename from assets/items/chest_hat.json
rename to old_assets/items/chest_hat.json
diff --git a/assets/items/cowboy_hat.json b/old_assets/items/cowboy_hat.json
similarity index 100%
rename from assets/items/cowboy_hat.json
rename to old_assets/items/cowboy_hat.json
diff --git a/assets/items/crate.json b/old_assets/items/crate.json
similarity index 100%
rename from assets/items/crate.json
rename to old_assets/items/crate.json
diff --git a/assets/items/crown_hat.json b/old_assets/items/crown_hat.json
similarity index 100%
rename from assets/items/crown_hat.json
rename to old_assets/items/crown_hat.json
diff --git a/assets/items/grenades.json b/old_assets/items/grenades.json
similarity index 100%
rename from assets/items/grenades.json
rename to old_assets/items/grenades.json
diff --git a/assets/items/kick_bomb.json b/old_assets/items/kick_bomb.json
similarity index 100%
rename from assets/items/kick_bomb.json
rename to old_assets/items/kick_bomb.json
diff --git a/assets/items/machine_gun.json b/old_assets/items/machine_gun.json
similarity index 100%
rename from assets/items/machine_gun.json
rename to old_assets/items/machine_gun.json
diff --git a/assets/items/mines.json b/old_assets/items/mines.json
similarity index 100%
rename from assets/items/mines.json
rename to old_assets/items/mines.json
diff --git a/assets/items/musket.json b/old_assets/items/musket.json
similarity index 100%
rename from assets/items/musket.json
rename to old_assets/items/musket.json
diff --git a/assets/items/pirate_hat.json b/old_assets/items/pirate_hat.json
similarity index 100%
rename from assets/items/pirate_hat.json
rename to old_assets/items/pirate_hat.json
diff --git a/assets/items/sniper_rifle.json b/old_assets/items/sniper_rifle.json
similarity index 100%
rename from assets/items/sniper_rifle.json
rename to old_assets/items/sniper_rifle.json
diff --git a/assets/items/starfish.json b/old_assets/items/starfish.json
similarity index 100%
rename from assets/items/starfish.json
rename to old_assets/items/starfish.json
diff --git a/assets/items/starfish_launcher.json b/old_assets/items/starfish_launcher.json
similarity index 100%
rename from assets/items/starfish_launcher.json
rename to old_assets/items/starfish_launcher.json
diff --git a/assets/items/sword.json b/old_assets/items/sword.json
similarity index 100%
rename from assets/items/sword.json
rename to old_assets/items/sword.json
diff --git a/assets/items/trident.json b/old_assets/items/trident.json
similarity index 100%
rename from assets/items/trident.json
rename to old_assets/items/trident.json
diff --git a/assets/items/turtle_shell.json b/old_assets/items/turtle_shell.json
similarity index 100%
rename from assets/items/turtle_shell.json
rename to old_assets/items/turtle_shell.json
diff --git a/assets/maps.json b/old_assets/maps.json
similarity index 100%
rename from assets/maps.json
rename to old_assets/maps.json
diff --git a/assets/maps.schema.json b/old_assets/maps.schema.json
similarity index 100%
rename from assets/maps.schema.json
rename to old_assets/maps.schema.json
diff --git a/assets/maps/lev01.json b/old_assets/maps/lev01.json
similarity index 100%
rename from assets/maps/lev01.json
rename to old_assets/maps/lev01.json
diff --git a/assets/maps/lev01.png b/old_assets/maps/lev01.png
similarity index 100%
rename from assets/maps/lev01.png
rename to old_assets/maps/lev01.png
diff --git a/assets/maps/lev02.json b/old_assets/maps/lev02.json
similarity index 100%
rename from assets/maps/lev02.json
rename to old_assets/maps/lev02.json
diff --git a/assets/maps/lev02.png b/old_assets/maps/lev02.png
similarity index 100%
rename from assets/maps/lev02.png
rename to old_assets/maps/lev02.png
diff --git a/assets/maps/lev03.json b/old_assets/maps/lev03.json
similarity index 100%
rename from assets/maps/lev03.json
rename to old_assets/maps/lev03.json
diff --git a/assets/maps/lev03.png b/old_assets/maps/lev03.png
similarity index 100%
rename from assets/maps/lev03.png
rename to old_assets/maps/lev03.png
diff --git a/assets/maps/lev04.json b/old_assets/maps/lev04.json
similarity index 100%
rename from assets/maps/lev04.json
rename to old_assets/maps/lev04.json
diff --git a/assets/maps/lev04.png b/old_assets/maps/lev04.png
similarity index 100%
rename from assets/maps/lev04.png
rename to old_assets/maps/lev04.png
diff --git a/assets/maps/lev05.json b/old_assets/maps/lev05.json
similarity index 100%
rename from assets/maps/lev05.json
rename to old_assets/maps/lev05.json
diff --git a/assets/maps/lev05.png b/old_assets/maps/lev05.png
similarity index 100%
rename from assets/maps/lev05.png
rename to old_assets/maps/lev05.png
diff --git a/assets/maps/lev06.json b/old_assets/maps/lev06.json
similarity index 100%
rename from assets/maps/lev06.json
rename to old_assets/maps/lev06.json
diff --git a/assets/maps/lev06.png b/old_assets/maps/lev06.png
similarity index 100%
rename from assets/maps/lev06.png
rename to old_assets/maps/lev06.png
diff --git a/assets/maps/lev07.json b/old_assets/maps/lev07.json
similarity index 100%
rename from assets/maps/lev07.json
rename to old_assets/maps/lev07.json
diff --git a/assets/maps/lev07.png b/old_assets/maps/lev07.png
similarity index 100%
rename from assets/maps/lev07.png
rename to old_assets/maps/lev07.png
diff --git a/old_assets/maps/migrate-maps.ts b/old_assets/maps/migrate-maps.ts
new file mode 100644
index 0000000000..e21d9d845a
--- /dev/null
+++ b/old_assets/maps/migrate-maps.ts
@@ -0,0 +1,250 @@
+/**
+ * This is a deno script that converts the old Jumpy maps to the new map format.
+ */
+
+import { assert } from "https://deno.land/std@0.158.0/testing/asserts.ts";
+import { bufferToHex } from "https://deno.land/x/hextools@v1.0.0/mod.ts";
+
+export interface OldMap {
+  name: string;
+  background_color: BackgroundColor;
+  background_layers: BackgroundLayer[];
+  world_offset: GridSize;
+  grid_size: GridSize;
+  tile_size: GridSize;
+  layers: Layer[];
+  tilesets: Tileset[];
+  spawn_points: GridSize[];
+}
+
+export interface BackgroundColor {
+  red: number;
+  green: number;
+  blue: number;
+  alpha: number;
+}
+
+export interface BackgroundLayer {
+  texture_id: string;
+  depth: number;
+  offset: GridSize;
+}
+
+export interface GridSize {
+  x: number;
+  y: number;
+}
+
+export interface Layer {
+  id: string;
+  kind: string;
+  has_collision: boolean;
+  tiles?: number[];
+  is_visible: boolean;
+  objects?: Object[];
+}
+
+export interface Object {
+  id: string;
+  kind: Kind;
+  position: GridSize;
+}
+
+export enum Kind {
+  Decoration = "decoration",
+  Environment = "environment",
+  Item = "item",
+}
+
+export interface Tileset {
+  id: string;
+  texture_id: string;
+  texture_size: GridSize;
+  tile_size: GridSize;
+  grid_size: GridSize;
+  first_tile_id: number;
+  tile_cnt: number;
+  tile_subdivisions: GridSize;
+  autotile_mask: boolean[];
+  tile_attributes?: { [key: string]: string[] };
+}
+
+const dir = Deno.readDir(".");
+const inMaps: OldMap[] = [];
+
+for await (const item of dir) {
+  if (item.isFile && item.name.endsWith("json") && !item.name.includes("map")) {
+    const json = JSON.parse(await Deno.readTextFile(`./${item.name}`));
+    json.name = item.name.replace(".json", "");
+    inMaps.push(json);
+  }
+}
+
+const newMaps = [] as any;
+
+for (const map of inMaps) {
+  const newMap = {} as any;
+
+  newMap.name = map.name;
+
+  // newMap.background_color = bufferToHex(
+  //   new Uint8Array([
+  //     255 * map.background_color.red,
+  //     255 * map.background_color.green,
+  //     255 * map.background_color.blue,
+  //     255 * map.background_color.alpha,
+  //   ])
+  // );
+
+  // This is the background color all maps should have but only some of them actually had it set, so
+  // we set it manually instead of pulling it from the map JSON like the commented code above does.
+  newMap.background_color = "7EA8A6";
+  newMap.grid_size = [map.grid_size.x, map.grid_size.y];
+  newMap.tile_size = [map.tile_size.x, map.tile_size.y];
+  newMap.layers = [];
+
+  newMap.background_layers = [
+    {
+      image: "../resources/background_04.png",
+      speed: 0,
+      tile_size: [896, 480],
+      z: -110,
+      position: [0, 360],
+      scale: 2.0,
+    },
+    {
+      image: "../resources/background_03.png",
+      speed: 0.74,
+      tile_size: [896, 480],
+      z: -109,
+      position: [0, 360],
+      scale: 2.0,
+    },
+    {
+      image: "../resources/background_02.png",
+      speed: 0.82,
+      tile_size: [896, 480],
+      z: -108,
+      position: [0, 360],
+      scale: 2.0,
+    },
+    {
+      image: "../resources/background_01.png",
+      speed: 100,
+      tile_size: [896, 480],
+      z: -107,
+      position: [0, 360],
+      scale: 2.0,
+    },
+  ];
+
+  const tileset = map.tilesets[0];
+
+  for (const layer of map.layers) {
+    const newLayer = {} as any;
+
+    newLayer.id = layer.id;
+
+    if (layer.tiles && layer.tiles.length > 0) {
+      assert(layer.tiles.length == map.grid_size.x * map.grid_size.y);
+
+      newLayer.kind = { tile: {} };
+      newLayer.kind.tile.has_collision = layer.has_collision;
+      newLayer.kind.tile.tiles = [];
+      newLayer.kind.tile.tilemap = "../resources/default_tileset.png";
+
+      for (let i = 0; i < layer.tiles!.length; i++) {
+        const tile = layer.tiles![i];
+        if (tile == 0) continue;
+        const posX = i % map.grid_size.x;
+        const posY = map.grid_size.y - 1 - Math.floor(i / map.grid_size.x);
+
+        assert(posX < map.grid_size.x);
+        assert(
+          posY < map.grid_size.y,
+          `posY ( ${posY} ) isn't less than map.grid_size.y ( ${map.grid_size.y} ) for tile index ${i}`
+        );
+
+        const idx = tile - 1;
+        newLayer.kind.tile.tiles.push({
+          pos: [posX, posY],
+          idx,
+          jump_through:
+            (tileset.tile_attributes &&
+              tileset.tile_attributes[idx.toString()]?.includes(
+                "jumpthrough"
+              )) ||
+            undefined,
+        });
+      }
+    } else if (layer.objects && layer.objects.length > 0) {
+      newLayer.kind = { element: { elements: [] } };
+      for (const object of layer.objects) {
+        const element = {} as any;
+        // We have some weird offsets here because in the new format items are positioned at their
+        // center, intead of the bottom left.
+        //
+        // Optimizing for the anemone and seaweed positions is hacky, but works well enough for now
+        // and we can tweak the maps in the editor afterward.
+        let item_specific_offset = [0, 0];
+        switch (object.id) {
+          case "crab":
+            item_specific_offset = [0, 20];
+          case "sword":
+            item_specific_offset = [0, 20];
+          case "sproinger":
+            item_specific_offset = [-10, 15];
+        }
+        element.pos = [
+          object.position.x + 48 / 2 + item_specific_offset[0],
+          (map.grid_size.y - 1) * map.tile_size.y -
+            object.position.y +
+            8 +
+            item_specific_offset[1],
+        ];
+
+        // Do some weird rounding to try and snap the elements to an 8x8 pixel grid and then
+        // compensate for weirdness.
+        let remainder = element.pos[0] % 8;
+        element.pos[0] = element.pos[0] + (remainder >= 4 ? remainder : - remainder);
+        element.pos[1] = Math.round(element.pos[1]);
+        remainder = element.pos[1] % 8;
+        element.pos[1] = element.pos[1] + (remainder >= 4 ? remainder : - remainder);
+        element.pos[1] += 1.5;
+
+        element.element = `../elements/${object.kind}/${object.id}/${object.id}.element.yaml`;
+        newLayer.kind.element.elements.push(element);
+      }
+    } else {
+      continue;
+    }
+
+    newMap.layers.push(newLayer);
+  }
+
+  // Add spawn points
+  const spawnersLayer = {
+    id: "spawners",
+    kind: { element: { elements: [] } },
+  } as any;
+  for (const spawn_point of map.spawn_points) {
+    spawnersLayer.kind.element.elements.push({
+      pos: [
+        spawn_point.x,
+        (map.grid_size.y - 1) * map.tile_size.y - spawn_point.y,
+      ],
+      element: `../elements/environment/player_spawner/player_spawner.element.yaml`,
+    });
+  }
+
+  newMap.layers.push(spawnersLayer);
+
+  newMaps.push(newMap);
+}
+
+for (const map of newMaps) {
+  const name = map.name;
+  const filename = `../../assets/map/levels/${name}.map.json`;
+
+  await Deno.writeTextFile(filename, JSON.stringify(map, undefined, "  "));
+}
diff --git a/assets/maps/no_preview.png b/old_assets/maps/no_preview.png
similarity index 100%
rename from assets/maps/no_preview.png
rename to old_assets/maps/no_preview.png
diff --git a/assets/maps/test_level.json b/old_assets/maps/test_level.json
similarity index 100%
rename from assets/maps/test_level.json
rename to old_assets/maps/test_level.json
diff --git a/assets/maps/test_level.png b/old_assets/maps/test_level.png
similarity index 100%
rename from assets/maps/test_level.png
rename to old_assets/maps/test_level.png
diff --git a/assets/maps/zyrafa01.json b/old_assets/maps/zyrafa01.json
similarity index 100%
rename from assets/maps/zyrafa01.json
rename to old_assets/maps/zyrafa01.json
diff --git a/assets/maps/zyrafa01.png b/old_assets/maps/zyrafa01.png
similarity index 100%
rename from assets/maps/zyrafa01.png
rename to old_assets/maps/zyrafa01.png
diff --git a/assets/maps/zyrafa02.json b/old_assets/maps/zyrafa02.json
similarity index 100%
rename from assets/maps/zyrafa02.json
rename to old_assets/maps/zyrafa02.json
diff --git a/assets/maps/zyrafa02.png b/old_assets/maps/zyrafa02.png
similarity index 100%
rename from assets/maps/zyrafa02.png
rename to old_assets/maps/zyrafa02.png
diff --git a/assets/maps/zyrafa03.json b/old_assets/maps/zyrafa03.json
similarity index 100%
rename from assets/maps/zyrafa03.json
rename to old_assets/maps/zyrafa03.json
diff --git a/assets/maps/zyrafa03.png b/old_assets/maps/zyrafa03.png
similarity index 100%
rename from assets/maps/zyrafa03.png
rename to old_assets/maps/zyrafa03.png
diff --git a/assets/maps/zyrafa04.json b/old_assets/maps/zyrafa04.json
similarity index 100%
rename from assets/maps/zyrafa04.json
rename to old_assets/maps/zyrafa04.json
diff --git a/assets/maps/zyrafa04.png b/old_assets/maps/zyrafa04.png
similarity index 100%
rename from assets/maps/zyrafa04.png
rename to old_assets/maps/zyrafa04.png
diff --git a/assets/maps/zyrafa05.json b/old_assets/maps/zyrafa05.json
similarity index 100%
rename from assets/maps/zyrafa05.json
rename to old_assets/maps/zyrafa05.json
diff --git a/assets/maps/zyrafa05.png b/old_assets/maps/zyrafa05.png
similarity index 100%
rename from assets/maps/zyrafa05.png
rename to old_assets/maps/zyrafa05.png
diff --git a/assets/maps/zyrafa06.json b/old_assets/maps/zyrafa06.json
similarity index 100%
rename from assets/maps/zyrafa06.json
rename to old_assets/maps/zyrafa06.json
diff --git a/assets/maps/zyrafa06.png b/old_assets/maps/zyrafa06.png
similarity index 100%
rename from assets/maps/zyrafa06.png
rename to old_assets/maps/zyrafa06.png
diff --git a/assets/music.json b/old_assets/music.json
similarity index 100%
rename from assets/music.json
rename to old_assets/music.json
diff --git a/assets/music/across_the_pond.ogg b/old_assets/music/across_the_pond.ogg
similarity index 100%
rename from assets/music/across_the_pond.ogg
rename to old_assets/music/across_the_pond.ogg
diff --git a/assets/music/ahoy!.ogg b/old_assets/music/ahoy!.ogg
similarity index 100%
rename from assets/music/ahoy!.ogg
rename to old_assets/music/ahoy!.ogg
diff --git a/assets/music/bait_the_hook.ogg b/old_assets/music/bait_the_hook.ogg
similarity index 100%
rename from assets/music/bait_the_hook.ogg
rename to old_assets/music/bait_the_hook.ogg
diff --git a/assets/music/fish_and_ships.ogg b/old_assets/music/fish_and_ships.ogg
similarity index 100%
rename from assets/music/fish_and_ships.ogg
rename to old_assets/music/fish_and_ships.ogg
diff --git a/assets/music/fish_bowl.ogg b/old_assets/music/fish_bowl.ogg
similarity index 100%
rename from assets/music/fish_bowl.ogg
rename to old_assets/music/fish_bowl.ogg
diff --git a/assets/music/fish_tide.ogg b/old_assets/music/fish_tide.ogg
similarity index 100%
rename from assets/music/fish_tide.ogg
rename to old_assets/music/fish_tide.ogg
diff --git a/assets/music/fishsticks.ogg b/old_assets/music/fishsticks.ogg
similarity index 100%
rename from assets/music/fishsticks.ogg
rename to old_assets/music/fishsticks.ogg
diff --git a/assets/music/krill_or_be_krilled.ogg b/old_assets/music/krill_or_be_krilled.ogg
similarity index 100%
rename from assets/music/krill_or_be_krilled.ogg
rename to old_assets/music/krill_or_be_krilled.ogg
diff --git a/assets/music/thanks_for_all_the_fished.ogg b/old_assets/music/thanks_for_all_the_fished.ogg
similarity index 100%
rename from assets/music/thanks_for_all_the_fished.ogg
rename to old_assets/music/thanks_for_all_the_fished.ogg
diff --git a/assets/music/whale_theme.ogg b/old_assets/music/whale_theme.ogg
similarity index 100%
rename from assets/music/whale_theme.ogg
rename to old_assets/music/whale_theme.ogg
diff --git a/assets/particle_effects.json b/old_assets/particle_effects.json
similarity index 100%
rename from assets/particle_effects.json
rename to old_assets/particle_effects.json
diff --git a/assets/particle_effects/blunderbuss_bullet_smoke.json b/old_assets/particle_effects/blunderbuss_bullet_smoke.json
similarity index 100%
rename from assets/particle_effects/blunderbuss_bullet_smoke.json
rename to old_assets/particle_effects/blunderbuss_bullet_smoke.json
diff --git a/assets/particle_effects/blunderbuss_muzzle_smoke.json b/old_assets/particle_effects/blunderbuss_muzzle_smoke.json
similarity index 100%
rename from assets/particle_effects/blunderbuss_muzzle_smoke.json
rename to old_assets/particle_effects/blunderbuss_muzzle_smoke.json
diff --git a/assets/particle_effects/cannon_cannonball_smoke.json b/old_assets/particle_effects/cannon_cannonball_smoke.json
similarity index 100%
rename from assets/particle_effects/cannon_cannonball_smoke.json
rename to old_assets/particle_effects/cannon_cannonball_smoke.json
diff --git a/assets/particle_effects/empty.json b/old_assets/particle_effects/empty.json
similarity index 100%
rename from assets/particle_effects/empty.json
rename to old_assets/particle_effects/empty.json
diff --git a/assets/particle_effects/explosion.json b/old_assets/particle_effects/explosion.json
similarity index 100%
rename from assets/particle_effects/explosion.json
rename to old_assets/particle_effects/explosion.json
diff --git a/assets/particle_effects/explosion_fire.json b/old_assets/particle_effects/explosion_fire.json
similarity index 100%
rename from assets/particle_effects/explosion_fire.json
rename to old_assets/particle_effects/explosion_fire.json
diff --git a/assets/particle_effects/explosion_particles.json b/old_assets/particle_effects/explosion_particles.json
similarity index 100%
rename from assets/particle_effects/explosion_particles.json
rename to old_assets/particle_effects/explosion_particles.json
diff --git a/assets/particle_effects/grenades_smoke.json b/old_assets/particle_effects/grenades_smoke.json
similarity index 100%
rename from assets/particle_effects/grenades_smoke.json
rename to old_assets/particle_effects/grenades_smoke.json
diff --git a/assets/particle_effects/hit.json b/old_assets/particle_effects/hit.json
similarity index 100%
rename from assets/particle_effects/hit.json
rename to old_assets/particle_effects/hit.json
diff --git a/assets/particle_effects/kick_bomb_smoke.json b/old_assets/particle_effects/kick_bomb_smoke.json
similarity index 100%
rename from assets/particle_effects/kick_bomb_smoke.json
rename to old_assets/particle_effects/kick_bomb_smoke.json
diff --git a/assets/particle_effects/life_ui_explosion.json b/old_assets/particle_effects/life_ui_explosion.json
similarity index 100%
rename from assets/particle_effects/life_ui_explosion.json
rename to old_assets/particle_effects/life_ui_explosion.json
diff --git a/assets/particle_effects/machine_gun_firing_smoke.json b/old_assets/particle_effects/machine_gun_firing_smoke.json
similarity index 100%
rename from assets/particle_effects/machine_gun_firing_smoke.json
rename to old_assets/particle_effects/machine_gun_firing_smoke.json
diff --git a/assets/particle_effects/machine_gun_muzzle_smoke.json b/old_assets/particle_effects/machine_gun_muzzle_smoke.json
similarity index 100%
rename from assets/particle_effects/machine_gun_muzzle_smoke.json
rename to old_assets/particle_effects/machine_gun_muzzle_smoke.json
diff --git a/assets/particle_effects/musket_bullet_smoke.json b/old_assets/particle_effects/musket_bullet_smoke.json
similarity index 100%
rename from assets/particle_effects/musket_bullet_smoke.json
rename to old_assets/particle_effects/musket_bullet_smoke.json
diff --git a/assets/particle_effects/musket_muzzle_smoke.json b/old_assets/particle_effects/musket_muzzle_smoke.json
similarity index 100%
rename from assets/particle_effects/musket_muzzle_smoke.json
rename to old_assets/particle_effects/musket_muzzle_smoke.json
diff --git a/assets/particle_effects/smoke.json b/old_assets/particle_effects/smoke.json
similarity index 100%
rename from assets/particle_effects/smoke.json
rename to old_assets/particle_effects/smoke.json
diff --git a/assets/particle_effects/sniper_rifle_bullet_smoke.json b/old_assets/particle_effects/sniper_rifle_bullet_smoke.json
similarity index 100%
rename from assets/particle_effects/sniper_rifle_bullet_smoke.json
rename to old_assets/particle_effects/sniper_rifle_bullet_smoke.json
diff --git a/assets/particle_effects/sniper_rifle_muzzle_smoke.json b/old_assets/particle_effects/sniper_rifle_muzzle_smoke.json
similarity index 100%
rename from assets/particle_effects/sniper_rifle_muzzle_smoke.json
rename to old_assets/particle_effects/sniper_rifle_muzzle_smoke.json
diff --git a/assets/player_characters.json b/old_assets/player_characters.json
similarity index 100%
rename from assets/player_characters.json
rename to old_assets/player_characters.json
diff --git a/assets/player_characters.schema.json b/old_assets/player_characters.schema.json
similarity index 100%
rename from assets/player_characters.schema.json
rename to old_assets/player_characters.schema.json
diff --git a/assets/sounds.json b/old_assets/sounds.json
similarity index 100%
rename from assets/sounds.json
rename to old_assets/sounds.json
diff --git a/assets/sounds/blaster.wav b/old_assets/sounds/blaster.wav
similarity index 100%
rename from assets/sounds/blaster.wav
rename to old_assets/sounds/blaster.wav
diff --git a/assets/sounds/bullet_hit_dull.wav b/old_assets/sounds/bullet_hit_dull.wav
similarity index 100%
rename from assets/sounds/bullet_hit_dull.wav
rename to old_assets/sounds/bullet_hit_dull.wav
diff --git a/assets/sounds/bullet_hit_metal.wav b/old_assets/sounds/bullet_hit_metal.wav
similarity index 100%
rename from assets/sounds/bullet_hit_metal.wav
rename to old_assets/sounds/bullet_hit_metal.wav
diff --git a/assets/sounds/explode_m.wav b/old_assets/sounds/explode_m.wav
similarity index 100%
rename from assets/sounds/explode_m.wav
rename to old_assets/sounds/explode_m.wav
diff --git a/assets/sounds/fish_fillet.wav b/old_assets/sounds/fish_fillet.wav
similarity index 100%
rename from assets/sounds/fish_fillet.wav
rename to old_assets/sounds/fish_fillet.wav
diff --git a/assets/sounds/gun_empty.wav b/old_assets/sounds/gun_empty.wav
similarity index 100%
rename from assets/sounds/gun_empty.wav
rename to old_assets/sounds/gun_empty.wav
diff --git a/assets/sounds/gun_empty_b.wav b/old_assets/sounds/gun_empty_b.wav
similarity index 100%
rename from assets/sounds/gun_empty_b.wav
rename to old_assets/sounds/gun_empty_b.wav
diff --git a/assets/sounds/jump.wav b/old_assets/sounds/jump.wav
similarity index 100%
rename from assets/sounds/jump.wav
rename to old_assets/sounds/jump.wav
diff --git a/assets/sounds/land.wav b/old_assets/sounds/land.wav
similarity index 100%
rename from assets/sounds/land.wav
rename to old_assets/sounds/land.wav
diff --git a/assets/sounds/land_heavy.wav b/old_assets/sounds/land_heavy.wav
similarity index 100%
rename from assets/sounds/land_heavy.wav
rename to old_assets/sounds/land_heavy.wav
diff --git a/assets/sounds/land_light.wav b/old_assets/sounds/land_light.wav
similarity index 100%
rename from assets/sounds/land_light.wav
rename to old_assets/sounds/land_light.wav
diff --git a/assets/sounds/mine_set.wav b/old_assets/sounds/mine_set.wav
similarity index 100%
rename from assets/sounds/mine_set.wav
rename to old_assets/sounds/mine_set.wav
diff --git a/assets/sounds/pickup.wav b/old_assets/sounds/pickup.wav
similarity index 100%
rename from assets/sounds/pickup.wav
rename to old_assets/sounds/pickup.wav
diff --git a/assets/sounds/shoot.ogg b/old_assets/sounds/shoot.ogg
similarity index 100%
rename from assets/sounds/shoot.ogg
rename to old_assets/sounds/shoot.ogg
diff --git a/assets/sounds/slip.wav b/old_assets/sounds/slip.wav
similarity index 100%
rename from assets/sounds/slip.wav
rename to old_assets/sounds/slip.wav
diff --git a/assets/sounds/swing.wav b/old_assets/sounds/swing.wav
similarity index 100%
rename from assets/sounds/swing.wav
rename to old_assets/sounds/swing.wav
diff --git a/assets/sounds/sword.wav b/old_assets/sounds/sword.wav
similarity index 100%
rename from assets/sounds/sword.wav
rename to old_assets/sounds/sword.wav
diff --git a/assets/sounds/throw.wav b/old_assets/sounds/throw.wav
similarity index 100%
rename from assets/sounds/throw.wav
rename to old_assets/sounds/throw.wav
diff --git a/assets/textures.json b/old_assets/textures.json
similarity index 100%
rename from assets/textures.json
rename to old_assets/textures.json
diff --git a/assets/textures.schema.json b/old_assets/textures.schema.json
similarity index 100%
rename from assets/textures.schema.json
rename to old_assets/textures.schema.json
diff --git a/assets/textures/explosions/Big(176x144).png b/old_assets/textures/explosions/Big(176x144).png
similarity index 100%
rename from assets/textures/explosions/Big(176x144).png
rename to old_assets/textures/explosions/Big(176x144).png
diff --git a/old_assets/textures/explosions/Medium(144x112).png b/old_assets/textures/explosions/Medium(144x112).png
new file mode 100644
index 0000000000..787407869e
Binary files /dev/null and b/old_assets/textures/explosions/Medium(144x112).png differ
diff --git a/assets/textures/explosions/Small(112x80).png b/old_assets/textures/explosions/Small(112x80).png
similarity index 100%
rename from assets/textures/explosions/Small(112x80).png
rename to old_assets/textures/explosions/Small(112x80).png
diff --git a/assets/textures/items/ArabianAngelfish(19x12).png b/old_assets/textures/items/ArabianAngelfish(19x12).png
similarity index 100%
rename from assets/textures/items/ArabianAngelfish(19x12).png
rename to old_assets/textures/items/ArabianAngelfish(19x12).png
diff --git a/assets/textures/items/BandedButterflyFish(19x11).png b/old_assets/textures/items/BandedButterflyFish(19x11).png
similarity index 100%
rename from assets/textures/items/BandedButterflyFish(19x11).png
rename to old_assets/textures/items/BandedButterflyFish(19x11).png
diff --git a/assets/textures/items/BlueGreenChromis(22x11).png b/old_assets/textures/items/BlueGreenChromis(22x11).png
similarity index 100%
rename from assets/textures/items/BlueGreenChromis(22x11).png
rename to old_assets/textures/items/BlueGreenChromis(22x11).png
diff --git a/assets/textures/items/BlueTang(19x9).png b/old_assets/textures/items/BlueTang(19x9).png
similarity index 100%
rename from assets/textures/items/BlueTang(19x9).png
rename to old_assets/textures/items/BlueTang(19x9).png
diff --git a/assets/textures/items/Blunderbass(68x24).png b/old_assets/textures/items/Blunderbass(68x24).png
similarity index 100%
rename from assets/textures/items/Blunderbass(68x24).png
rename to old_assets/textures/items/Blunderbass(68x24).png
diff --git a/assets/textures/items/Blunderbuss(65x25).png b/old_assets/textures/items/Blunderbuss(65x25).png
similarity index 100%
rename from assets/textures/items/Blunderbuss(65x25).png
rename to old_assets/textures/items/Blunderbuss(65x25).png
diff --git a/assets/textures/items/BlunderbussBullet.png b/old_assets/textures/items/BlunderbussBullet.png
similarity index 100%
rename from assets/textures/items/BlunderbussBullet.png
rename to old_assets/textures/items/BlunderbussBullet.png
diff --git a/assets/textures/items/Boots(32x32).png b/old_assets/textures/items/Boots(32x32).png
similarity index 100%
rename from assets/textures/items/Boots(32x32).png
rename to old_assets/textures/items/Boots(32x32).png
diff --git a/assets/textures/items/Cannon(64x48).png b/old_assets/textures/items/Cannon(64x48).png
similarity index 100%
rename from assets/textures/items/Cannon(64x48).png
rename to old_assets/textures/items/Cannon(64x48).png
diff --git a/assets/textures/items/CannonBall(17x17).png b/old_assets/textures/items/CannonBall(17x17).png
similarity index 100%
rename from assets/textures/items/CannonBall(17x17).png
rename to old_assets/textures/items/CannonBall(17x17).png
diff --git a/old_assets/textures/items/Crab(17x12).png b/old_assets/textures/items/Crab(17x12).png
new file mode 100644
index 0000000000..718e067b09
Binary files /dev/null and b/old_assets/textures/items/Crab(17x12).png differ
diff --git a/assets/textures/items/Crate(36x31).png b/old_assets/textures/items/Crate(36x31).png
similarity index 100%
rename from assets/textures/items/Crate(36x31).png
rename to old_assets/textures/items/Crate(36x31).png
diff --git a/assets/textures/items/Curse(30x44).png b/old_assets/textures/items/Curse(30x44).png
similarity index 100%
rename from assets/textures/items/Curse(30x44).png
rename to old_assets/textures/items/Curse(30x44).png
diff --git a/assets/textures/items/FishSchoolIcon(64x64).png b/old_assets/textures/items/FishSchoolIcon(64x64).png
similarity index 100%
rename from assets/textures/items/FishSchoolIcon(64x64).png
rename to old_assets/textures/items/FishSchoolIcon(64x64).png
diff --git a/assets/textures/items/Flippers(45x36).png b/old_assets/textures/items/Flippers(45x36).png
similarity index 100%
rename from assets/textures/items/Flippers(45x36).png
rename to old_assets/textures/items/Flippers(45x36).png
diff --git a/assets/textures/items/Flippers(65x45).png b/old_assets/textures/items/Flippers(65x45).png
similarity index 100%
rename from assets/textures/items/Flippers(65x45).png
rename to old_assets/textures/items/Flippers(65x45).png
diff --git a/assets/textures/items/Grenades(25x52).png b/old_assets/textures/items/Grenades(25x52).png
similarity index 100%
rename from assets/textures/items/Grenades(25x52).png
rename to old_assets/textures/items/Grenades(25x52).png
diff --git a/assets/textures/items/Jellyfish(64x112).png b/old_assets/textures/items/Jellyfish(64x112).png
similarity index 100%
rename from assets/textures/items/Jellyfish(64x112).png
rename to old_assets/textures/items/Jellyfish(64x112).png
diff --git a/old_assets/textures/items/KickBomb(32x64).png b/old_assets/textures/items/KickBomb(32x64).png
new file mode 100644
index 0000000000..a37971fa0a
Binary files /dev/null and b/old_assets/textures/items/KickBomb(32x64).png differ
diff --git a/assets/textures/items/MachineGun(80x24).png b/old_assets/textures/items/MachineGun(80x24).png
similarity index 100%
rename from assets/textures/items/MachineGun(80x24).png
rename to old_assets/textures/items/MachineGun(80x24).png
diff --git a/assets/textures/items/MachineGunBullet(7x4).png b/old_assets/textures/items/MachineGunBullet(7x4).png
similarity index 100%
rename from assets/textures/items/MachineGunBullet(7x4).png
rename to old_assets/textures/items/MachineGunBullet(7x4).png
diff --git a/assets/textures/items/Mines(33x35).png b/old_assets/textures/items/Mines(33x35).png
similarity index 100%
rename from assets/textures/items/Mines(33x35).png
rename to old_assets/textures/items/Mines(33x35).png
diff --git a/assets/textures/items/Musket(92x32).png b/old_assets/textures/items/Musket(92x32).png
similarity index 100%
rename from assets/textures/items/Musket(92x32).png
rename to old_assets/textures/items/Musket(92x32).png
diff --git a/assets/textures/items/MusketBullet(15x15).png b/old_assets/textures/items/MusketBullet(15x15).png
similarity index 100%
rename from assets/textures/items/MusketBullet(15x15).png
rename to old_assets/textures/items/MusketBullet(15x15).png
diff --git a/assets/textures/items/RoyalGramma(25x11).png b/old_assets/textures/items/RoyalGramma(25x11).png
similarity index 100%
rename from assets/textures/items/RoyalGramma(25x11).png
rename to old_assets/textures/items/RoyalGramma(25x11).png
diff --git a/assets/textures/items/Seaweed(48x51).png b/old_assets/textures/items/Seaweed(48x51).png
similarity index 100%
rename from assets/textures/items/Seaweed(48x51).png
rename to old_assets/textures/items/Seaweed(48x51).png
diff --git a/assets/textures/items/SmallFish1(13x9).png b/old_assets/textures/items/SmallFish1(13x9).png
similarity index 100%
rename from assets/textures/items/SmallFish1(13x9).png
rename to old_assets/textures/items/SmallFish1(13x9).png
diff --git a/assets/textures/items/SmallFish2(13x9).png b/old_assets/textures/items/SmallFish2(13x9).png
similarity index 100%
rename from assets/textures/items/SmallFish2(13x9).png
rename to old_assets/textures/items/SmallFish2(13x9).png
diff --git a/assets/textures/items/SmallFish3(13x9).png b/old_assets/textures/items/SmallFish3(13x9).png
similarity index 100%
rename from assets/textures/items/SmallFish3(13x9).png
rename to old_assets/textures/items/SmallFish3(13x9).png
diff --git a/assets/textures/items/SmallProjectile(8x4).png b/old_assets/textures/items/SmallProjectile(8x4).png
similarity index 100%
rename from assets/textures/items/SmallProjectile(8x4).png
rename to old_assets/textures/items/SmallProjectile(8x4).png
diff --git a/assets/textures/items/SniperRifle(112x32).png b/old_assets/textures/items/SniperRifle(112x32).png
similarity index 100%
rename from assets/textures/items/SniperRifle(112x32).png
rename to old_assets/textures/items/SniperRifle(112x32).png
diff --git a/assets/textures/items/SniperRifle(92x32).png b/old_assets/textures/items/SniperRifle(92x32).png
similarity index 100%
rename from assets/textures/items/SniperRifle(92x32).png
rename to old_assets/textures/items/SniperRifle(92x32).png
diff --git a/assets/textures/items/SniperRifleBullet(7x7).png b/old_assets/textures/items/SniperRifleBullet(7x7).png
similarity index 100%
rename from assets/textures/items/SniperRifleBullet(7x7).png
rename to old_assets/textures/items/SniperRifleBullet(7x7).png
diff --git a/assets/textures/items/SniperRifleBullet.png b/old_assets/textures/items/SniperRifleBullet.png
similarity index 100%
rename from assets/textures/items/SniperRifleBullet.png
rename to old_assets/textures/items/SniperRifleBullet.png
diff --git a/old_assets/textures/items/Sproinger(31x20).png b/old_assets/textures/items/Sproinger(31x20).png
new file mode 100644
index 0000000000..a3a8c18bf3
Binary files /dev/null and b/old_assets/textures/items/Sproinger(31x20).png differ
diff --git a/assets/textures/items/StarFish(19x18).png b/old_assets/textures/items/StarFish(19x18).png
similarity index 100%
rename from assets/textures/items/StarFish(19x18).png
rename to old_assets/textures/items/StarFish(19x18).png
diff --git a/assets/textures/items/StarfishLauncher(37x20).png b/old_assets/textures/items/StarfishLauncher(37x20).png
similarity index 100%
rename from assets/textures/items/StarfishLauncher(37x20).png
rename to old_assets/textures/items/StarfishLauncher(37x20).png
diff --git a/old_assets/textures/items/Sword(65x93).png b/old_assets/textures/items/Sword(65x93).png
new file mode 100644
index 0000000000..b1352b7f69
Binary files /dev/null and b/old_assets/textures/items/Sword(65x93).png differ
diff --git a/assets/textures/items/Trident(288x96).png b/old_assets/textures/items/Trident(288x96).png
similarity index 100%
rename from assets/textures/items/Trident(288x96).png
rename to old_assets/textures/items/Trident(288x96).png
diff --git a/assets/textures/items/TurtleShell(32x32).png b/old_assets/textures/items/TurtleShell(32x32).png
similarity index 100%
rename from assets/textures/items/TurtleShell(32x32).png
rename to old_assets/textures/items/TurtleShell(32x32).png
diff --git a/assets/textures/items/hats/bonnet hat.png b/old_assets/textures/items/hats/bonnet hat.png
similarity index 100%
rename from assets/textures/items/hats/bonnet hat.png
rename to old_assets/textures/items/hats/bonnet hat.png
diff --git a/assets/textures/items/hats/bow hat.png b/old_assets/textures/items/hats/bow hat.png
similarity index 100%
rename from assets/textures/items/hats/bow hat.png
rename to old_assets/textures/items/hats/bow hat.png
diff --git a/assets/textures/items/hats/bucket hat.png b/old_assets/textures/items/hats/bucket hat.png
similarity index 100%
rename from assets/textures/items/hats/bucket hat.png
rename to old_assets/textures/items/hats/bucket hat.png
diff --git a/assets/textures/items/hats/chef's hat.png b/old_assets/textures/items/hats/chef's hat.png
similarity index 100%
rename from assets/textures/items/hats/chef's hat.png
rename to old_assets/textures/items/hats/chef's hat.png
diff --git a/assets/textures/items/hats/chest hat.png b/old_assets/textures/items/hats/chest hat.png
similarity index 100%
rename from assets/textures/items/hats/chest hat.png
rename to old_assets/textures/items/hats/chest hat.png
diff --git a/assets/textures/items/hats/cowboy hat.png b/old_assets/textures/items/hats/cowboy hat.png
similarity index 100%
rename from assets/textures/items/hats/cowboy hat.png
rename to old_assets/textures/items/hats/cowboy hat.png
diff --git a/assets/textures/items/hats/crown hat.png b/old_assets/textures/items/hats/crown hat.png
similarity index 100%
rename from assets/textures/items/hats/crown hat.png
rename to old_assets/textures/items/hats/crown hat.png
diff --git a/assets/textures/items/hats/diving goggles hat.png b/old_assets/textures/items/hats/diving goggles hat.png
similarity index 100%
rename from assets/textures/items/hats/diving goggles hat.png
rename to old_assets/textures/items/hats/diving goggles hat.png
diff --git a/assets/textures/items/hats/fisherman hat.png b/old_assets/textures/items/hats/fisherman hat.png
similarity index 100%
rename from assets/textures/items/hats/fisherman hat.png
rename to old_assets/textures/items/hats/fisherman hat.png
diff --git a/assets/textures/items/hats/octopus hat.png b/old_assets/textures/items/hats/octopus hat.png
similarity index 100%
rename from assets/textures/items/hats/octopus hat.png
rename to old_assets/textures/items/hats/octopus hat.png
diff --git a/assets/textures/items/hats/pineapple hat.png b/old_assets/textures/items/hats/pineapple hat.png
similarity index 100%
rename from assets/textures/items/hats/pineapple hat.png
rename to old_assets/textures/items/hats/pineapple hat.png
diff --git a/assets/textures/items/hats/pirate hat.png b/old_assets/textures/items/hats/pirate hat.png
similarity index 100%
rename from assets/textures/items/hats/pirate hat.png
rename to old_assets/textures/items/hats/pirate hat.png
diff --git a/assets/textures/items/hats/pot hat.png b/old_assets/textures/items/hats/pot hat.png
similarity index 100%
rename from assets/textures/items/hats/pot hat.png
rename to old_assets/textures/items/hats/pot hat.png
diff --git a/assets/textures/items/hats/pufferfish hat.png b/old_assets/textures/items/hats/pufferfish hat.png
similarity index 100%
rename from assets/textures/items/hats/pufferfish hat.png
rename to old_assets/textures/items/hats/pufferfish hat.png
diff --git a/assets/textures/items/hats/spicy lobster hat.png b/old_assets/textures/items/hats/spicy lobster hat.png
similarity index 100%
rename from assets/textures/items/hats/spicy lobster hat.png
rename to old_assets/textures/items/hats/spicy lobster hat.png
diff --git a/assets/textures/items/hats/straw hat.png b/old_assets/textures/items/hats/straw hat.png
similarity index 100%
rename from assets/textures/items/hats/straw hat.png
rename to old_assets/textures/items/hats/straw hat.png
diff --git a/assets/textures/items/hats/topper hat.png b/old_assets/textures/items/hats/topper hat.png
similarity index 100%
rename from assets/textures/items/hats/topper hat.png
rename to old_assets/textures/items/hats/topper hat.png
diff --git a/assets/textures/items/hats/unicorn hat.png b/old_assets/textures/items/hats/unicorn hat.png
similarity index 100%
rename from assets/textures/items/hats/unicorn hat.png
rename to old_assets/textures/items/hats/unicorn hat.png
diff --git a/assets/textures/items/hats/viking hat.png b/old_assets/textures/items/hats/viking hat.png
similarity index 100%
rename from assets/textures/items/hats/viking hat.png
rename to old_assets/textures/items/hats/viking hat.png
diff --git a/assets/textures/items/hats/water lily hat.png b/old_assets/textures/items/hats/water lily hat.png
similarity index 100%
rename from assets/textures/items/hats/water lily hat.png
rename to old_assets/textures/items/hats/water lily hat.png
diff --git a/old_assets/textures/map/background_01.png b/old_assets/textures/map/background_01.png
new file mode 100644
index 0000000000..1383b0b658
Binary files /dev/null and b/old_assets/textures/map/background_01.png differ
diff --git a/old_assets/textures/map/background_02.png b/old_assets/textures/map/background_02.png
new file mode 100644
index 0000000000..62ba191f73
Binary files /dev/null and b/old_assets/textures/map/background_02.png differ
diff --git a/old_assets/textures/map/background_03.png b/old_assets/textures/map/background_03.png
new file mode 100644
index 0000000000..f882f173ae
Binary files /dev/null and b/old_assets/textures/map/background_03.png differ
diff --git a/old_assets/textures/map/background_04.png b/old_assets/textures/map/background_04.png
new file mode 100644
index 0000000000..2ad1191892
Binary files /dev/null and b/old_assets/textures/map/background_04.png differ
diff --git a/old_assets/textures/map/default_tileset.png b/old_assets/textures/map/default_tileset.png
new file mode 100644
index 0000000000..42be6234e1
Binary files /dev/null and b/old_assets/textures/map/default_tileset.png differ
diff --git a/old_assets/textures/map/menu_background.png b/old_assets/textures/map/menu_background.png
new file mode 100644
index 0000000000..d3da3cb0be
Binary files /dev/null and b/old_assets/textures/map/menu_background.png differ
diff --git a/assets/textures/particles/CrateBreaking(128x128).png b/old_assets/textures/particles/CrateBreaking(128x128).png
similarity index 100%
rename from assets/textures/particles/CrateBreaking(128x128).png
rename to old_assets/textures/particles/CrateBreaking(128x128).png
diff --git a/old_assets/textures/player/PlayerCatty(96x80).png b/old_assets/textures/player/PlayerCatty(96x80).png
new file mode 100644
index 0000000000..9e018a741d
Binary files /dev/null and b/old_assets/textures/player/PlayerCatty(96x80).png differ
diff --git a/old_assets/textures/player/PlayerFishy(96x80).png b/old_assets/textures/player/PlayerFishy(96x80).png
new file mode 100644
index 0000000000..89df9855c0
Binary files /dev/null and b/old_assets/textures/player/PlayerFishy(96x80).png differ
diff --git a/old_assets/textures/player/PlayerLionfishy(96x80).png b/old_assets/textures/player/PlayerLionfishy(96x80).png
new file mode 100644
index 0000000000..95663ee6c0
Binary files /dev/null and b/old_assets/textures/player/PlayerLionfishy(96x80).png differ
diff --git a/old_assets/textures/player/PlayerOrcy(96x80).png b/old_assets/textures/player/PlayerOrcy(96x80).png
new file mode 100644
index 0000000000..1861ca29ec
Binary files /dev/null and b/old_assets/textures/player/PlayerOrcy(96x80).png differ
diff --git a/old_assets/textures/player/PlayerPescy(96x80).png b/old_assets/textures/player/PlayerPescy(96x80).png
new file mode 100644
index 0000000000..7617151829
Binary files /dev/null and b/old_assets/textures/player/PlayerPescy(96x80).png differ
diff --git a/old_assets/textures/player/PlayerSharky(96x80).png b/old_assets/textures/player/PlayerSharky(96x80).png
new file mode 100644
index 0000000000..1b24733ddb
Binary files /dev/null and b/old_assets/textures/player/PlayerSharky(96x80).png differ
diff --git a/assets/textures/temp/Cannonball(32x36).png b/old_assets/textures/temp/Cannonball(32x36).png
similarity index 100%
rename from assets/textures/temp/Cannonball(32x36).png
rename to old_assets/textures/temp/Cannonball(32x36).png
diff --git a/assets/textures/temp/Galleon(326x300).png b/old_assets/textures/temp/Galleon(326x300).png
similarity index 100%
rename from assets/textures/temp/Galleon(326x300).png
rename to old_assets/textures/temp/Galleon(326x300).png
diff --git a/assets/textures/temp/GalleonIcon(32x29).png b/old_assets/textures/temp/GalleonIcon(32x29).png
similarity index 100%
rename from assets/textures/temp/GalleonIcon(32x29).png
rename to old_assets/textures/temp/GalleonIcon(32x29).png
diff --git a/assets/textures/temp/LifeRing.png b/old_assets/textures/temp/LifeRing.png
similarity index 100%
rename from assets/textures/temp/LifeRing.png
rename to old_assets/textures/temp/LifeRing.png
diff --git a/assets/textures/temp/README.md b/old_assets/textures/temp/README.md
similarity index 100%
rename from assets/textures/temp/README.md
rename to old_assets/textures/temp/README.md
diff --git a/assets/textures/temp/Shark(60x220).png b/old_assets/textures/temp/Shark(60x220).png
similarity index 100%
rename from assets/textures/temp/Shark(60x220).png
rename to old_assets/textures/temp/Shark(60x220).png
diff --git a/assets/textures/temp/SharkIcon(32x34).png b/old_assets/textures/temp/SharkIcon(32x34).png
similarity index 100%
rename from assets/textures/temp/SharkIcon(32x34).png
rename to old_assets/textures/temp/SharkIcon(32x34).png
diff --git a/assets/textures/temp/Volcano(395x100).png b/old_assets/textures/temp/Volcano(395x100).png
similarity index 100%
rename from assets/textures/temp/Volcano(395x100).png
rename to old_assets/textures/temp/Volcano(395x100).png
diff --git a/assets/textures/temp/VolcanoIcon(36x22).png b/old_assets/textures/temp/VolcanoIcon(36x22).png
similarity index 100%
rename from assets/textures/temp/VolcanoIcon(36x22).png
rename to old_assets/textures/temp/VolcanoIcon(36x22).png
diff --git a/old_assets/textures/ui/editor_icons/Cursor.png b/old_assets/textures/ui/editor_icons/Cursor.png
new file mode 100644
index 0000000000..07d6ca8bcd
Binary files /dev/null and b/old_assets/textures/ui/editor_icons/Cursor.png differ
diff --git a/old_assets/textures/ui/editor_icons/Eraser.png b/old_assets/textures/ui/editor_icons/Eraser.png
new file mode 100644
index 0000000000..9c9cc94aed
Binary files /dev/null and b/old_assets/textures/ui/editor_icons/Eraser.png differ
diff --git a/old_assets/textures/ui/editor_icons/Object.png b/old_assets/textures/ui/editor_icons/Object.png
new file mode 100644
index 0000000000..127320aeb3
Binary files /dev/null and b/old_assets/textures/ui/editor_icons/Object.png differ
diff --git a/old_assets/textures/ui/editor_icons/Pointer and Map.png b/old_assets/textures/ui/editor_icons/Pointer and Map.png
new file mode 100644
index 0000000000..66a9aa8a44
Binary files /dev/null and b/old_assets/textures/ui/editor_icons/Pointer and Map.png differ
diff --git a/old_assets/textures/ui/editor_icons/Pointer.png b/old_assets/textures/ui/editor_icons/Pointer.png
new file mode 100644
index 0000000000..bbb14ba8a4
Binary files /dev/null and b/old_assets/textures/ui/editor_icons/Pointer.png differ
diff --git a/old_assets/textures/ui/editor_icons/Tile.png b/old_assets/textures/ui/editor_icons/Tile.png
new file mode 100644
index 0000000000..a74e86b0ba
Binary files /dev/null and b/old_assets/textures/ui/editor_icons/Tile.png differ
diff --git a/assets/textures/ui/editor_icons/no_icon.png b/old_assets/textures/ui/editor_icons/no_icon.png
similarity index 100%
rename from assets/textures/ui/editor_icons/no_icon.png
rename to old_assets/textures/ui/editor_icons/no_icon.png
diff --git a/assets/textures/ui/editor_icons/visibility.png b/old_assets/textures/ui/editor_icons/visibility.png
similarity index 100%
rename from assets/textures/ui/editor_icons/visibility.png
rename to old_assets/textures/ui/editor_icons/visibility.png
diff --git a/assets/textures/ui/editor_icons/visibility_off.png b/old_assets/textures/ui/editor_icons/visibility_off.png
similarity index 100%
rename from assets/textures/ui/editor_icons/visibility_off.png
rename to old_assets/textures/ui/editor_icons/visibility_off.png
diff --git a/assets/tiled_maps/.gitignore b/old_assets/tiled_maps/.gitignore
similarity index 100%
rename from assets/tiled_maps/.gitignore
rename to old_assets/tiled_maps/.gitignore
diff --git a/assets/tiled_maps/README.md b/old_assets/tiled_maps/README.md
similarity index 100%
rename from assets/tiled_maps/README.md
rename to old_assets/tiled_maps/README.md
diff --git a/assets/tiled_maps/lev01.json b/old_assets/tiled_maps/lev01.json
similarity index 100%
rename from assets/tiled_maps/lev01.json
rename to old_assets/tiled_maps/lev01.json
diff --git a/assets/tiled_maps/lev01.png b/old_assets/tiled_maps/lev01.png
similarity index 100%
rename from assets/tiled_maps/lev01.png
rename to old_assets/tiled_maps/lev01.png
diff --git a/assets/tiled_maps/lev02.json b/old_assets/tiled_maps/lev02.json
similarity index 100%
rename from assets/tiled_maps/lev02.json
rename to old_assets/tiled_maps/lev02.json
diff --git a/assets/tiled_maps/lev02.png b/old_assets/tiled_maps/lev02.png
similarity index 100%
rename from assets/tiled_maps/lev02.png
rename to old_assets/tiled_maps/lev02.png
diff --git a/assets/tiled_maps/lev03.json b/old_assets/tiled_maps/lev03.json
similarity index 100%
rename from assets/tiled_maps/lev03.json
rename to old_assets/tiled_maps/lev03.json
diff --git a/assets/tiled_maps/lev03.png b/old_assets/tiled_maps/lev03.png
similarity index 100%
rename from assets/tiled_maps/lev03.png
rename to old_assets/tiled_maps/lev03.png
diff --git a/assets/tiled_maps/lev04.json b/old_assets/tiled_maps/lev04.json
similarity index 100%
rename from assets/tiled_maps/lev04.json
rename to old_assets/tiled_maps/lev04.json
diff --git a/assets/tiled_maps/lev04.png b/old_assets/tiled_maps/lev04.png
similarity index 100%
rename from assets/tiled_maps/lev04.png
rename to old_assets/tiled_maps/lev04.png
diff --git a/assets/tiled_maps/lev05.json b/old_assets/tiled_maps/lev05.json
similarity index 100%
rename from assets/tiled_maps/lev05.json
rename to old_assets/tiled_maps/lev05.json
diff --git a/assets/tiled_maps/lev05.png b/old_assets/tiled_maps/lev05.png
similarity index 100%
rename from assets/tiled_maps/lev05.png
rename to old_assets/tiled_maps/lev05.png
diff --git a/assets/tiled_maps/lev06.json b/old_assets/tiled_maps/lev06.json
similarity index 100%
rename from assets/tiled_maps/lev06.json
rename to old_assets/tiled_maps/lev06.json
diff --git a/assets/tiled_maps/lev06.png b/old_assets/tiled_maps/lev06.png
similarity index 100%
rename from assets/tiled_maps/lev06.png
rename to old_assets/tiled_maps/lev06.png
diff --git a/assets/tiled_maps/levels.tiled-project b/old_assets/tiled_maps/levels.tiled-project
similarity index 100%
rename from assets/tiled_maps/levels.tiled-project
rename to old_assets/tiled_maps/levels.tiled-project
diff --git a/assets/tiled_maps/no_preview.png b/old_assets/tiled_maps/no_preview.png
similarity index 100%
rename from assets/tiled_maps/no_preview.png
rename to old_assets/tiled_maps/no_preview.png
diff --git a/assets/tiled_maps/test_level.json b/old_assets/tiled_maps/test_level.json
similarity index 100%
rename from assets/tiled_maps/test_level.json
rename to old_assets/tiled_maps/test_level.json
diff --git a/assets/tiled_maps/test_level.png b/old_assets/tiled_maps/test_level.png
similarity index 100%
rename from assets/tiled_maps/test_level.png
rename to old_assets/tiled_maps/test_level.png
diff --git a/assets/tiled_maps/zyrafa01.json b/old_assets/tiled_maps/zyrafa01.json
similarity index 100%
rename from assets/tiled_maps/zyrafa01.json
rename to old_assets/tiled_maps/zyrafa01.json
diff --git a/assets/tiled_maps/zyrafa01.png b/old_assets/tiled_maps/zyrafa01.png
similarity index 100%
rename from assets/tiled_maps/zyrafa01.png
rename to old_assets/tiled_maps/zyrafa01.png
diff --git a/assets/tiled_maps/zyrafa02.json b/old_assets/tiled_maps/zyrafa02.json
similarity index 100%
rename from assets/tiled_maps/zyrafa02.json
rename to old_assets/tiled_maps/zyrafa02.json
diff --git a/assets/tiled_maps/zyrafa02.png b/old_assets/tiled_maps/zyrafa02.png
similarity index 100%
rename from assets/tiled_maps/zyrafa02.png
rename to old_assets/tiled_maps/zyrafa02.png
diff --git a/assets/tiled_maps/zyrafa03.json b/old_assets/tiled_maps/zyrafa03.json
similarity index 100%
rename from assets/tiled_maps/zyrafa03.json
rename to old_assets/tiled_maps/zyrafa03.json
diff --git a/assets/tiled_maps/zyrafa03.png b/old_assets/tiled_maps/zyrafa03.png
similarity index 100%
rename from assets/tiled_maps/zyrafa03.png
rename to old_assets/tiled_maps/zyrafa03.png
diff --git a/assets/tiled_maps/zyrafa04.json b/old_assets/tiled_maps/zyrafa04.json
similarity index 100%
rename from assets/tiled_maps/zyrafa04.json
rename to old_assets/tiled_maps/zyrafa04.json
diff --git a/assets/tiled_maps/zyrafa04.png b/old_assets/tiled_maps/zyrafa04.png
similarity index 100%
rename from assets/tiled_maps/zyrafa04.png
rename to old_assets/tiled_maps/zyrafa04.png
diff --git a/assets/tiled_maps/zyrafa05.json b/old_assets/tiled_maps/zyrafa05.json
similarity index 100%
rename from assets/tiled_maps/zyrafa05.json
rename to old_assets/tiled_maps/zyrafa05.json
diff --git a/assets/tiled_maps/zyrafa05.png b/old_assets/tiled_maps/zyrafa05.png
similarity index 100%
rename from assets/tiled_maps/zyrafa05.png
rename to old_assets/tiled_maps/zyrafa05.png
diff --git a/assets/tiled_maps/zyrafa06.json b/old_assets/tiled_maps/zyrafa06.json
similarity index 100%
rename from assets/tiled_maps/zyrafa06.json
rename to old_assets/tiled_maps/zyrafa06.json
diff --git a/assets/tiled_maps/zyrafa06.png b/old_assets/tiled_maps/zyrafa06.png
similarity index 100%
rename from assets/tiled_maps/zyrafa06.png
rename to old_assets/tiled_maps/zyrafa06.png
diff --git a/assets/ui/AnonymousPro-Regular.ttf b/old_assets/ui/AnonymousPro-Regular.ttf
similarity index 100%
rename from assets/ui/AnonymousPro-Regular.ttf
rename to old_assets/ui/AnonymousPro-Regular.ttf
diff --git a/assets/ui/MinimalPixel v2.ttf b/old_assets/ui/MinimalPixel v2.ttf
similarity index 100%
rename from assets/ui/MinimalPixel v2.ttf
rename to old_assets/ui/MinimalPixel v2.ttf
diff --git a/assets/ui/Wood and Paper UI/Big Banner/1.png b/old_assets/ui/Wood and Paper UI/Big Banner/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/1.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/1.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/10.png b/old_assets/ui/Wood and Paper UI/Big Banner/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/10.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/10.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/11.png b/old_assets/ui/Wood and Paper UI/Big Banner/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/11.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/11.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/12.png b/old_assets/ui/Wood and Paper UI/Big Banner/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/12.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/12.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/13.png b/old_assets/ui/Wood and Paper UI/Big Banner/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/13.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/13.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/14.png b/old_assets/ui/Wood and Paper UI/Big Banner/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/14.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/14.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/15.png b/old_assets/ui/Wood and Paper UI/Big Banner/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/15.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/15.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/16.png b/old_assets/ui/Wood and Paper UI/Big Banner/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/16.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/16.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/17.png b/old_assets/ui/Wood and Paper UI/Big Banner/17.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/17.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/17.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/18.png b/old_assets/ui/Wood and Paper UI/Big Banner/18.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/18.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/18.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/19.png b/old_assets/ui/Wood and Paper UI/Big Banner/19.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/19.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/19.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/2.png b/old_assets/ui/Wood and Paper UI/Big Banner/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/2.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/2.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/20.png b/old_assets/ui/Wood and Paper UI/Big Banner/20.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/20.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/20.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/21.png b/old_assets/ui/Wood and Paper UI/Big Banner/21.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/21.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/21.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/22.png b/old_assets/ui/Wood and Paper UI/Big Banner/22.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/22.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/22.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/23.png b/old_assets/ui/Wood and Paper UI/Big Banner/23.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/23.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/23.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/24.png b/old_assets/ui/Wood and Paper UI/Big Banner/24.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/24.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/24.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/25.png b/old_assets/ui/Wood and Paper UI/Big Banner/25.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/25.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/25.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/26.png b/old_assets/ui/Wood and Paper UI/Big Banner/26.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/26.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/26.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/27.png b/old_assets/ui/Wood and Paper UI/Big Banner/27.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/27.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/27.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/28.png b/old_assets/ui/Wood and Paper UI/Big Banner/28.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/28.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/28.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/29.png b/old_assets/ui/Wood and Paper UI/Big Banner/29.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/29.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/29.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/3.png b/old_assets/ui/Wood and Paper UI/Big Banner/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/3.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/3.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/30.png b/old_assets/ui/Wood and Paper UI/Big Banner/30.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/30.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/30.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/31.png b/old_assets/ui/Wood and Paper UI/Big Banner/31.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/31.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/31.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/32.png b/old_assets/ui/Wood and Paper UI/Big Banner/32.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/32.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/32.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/33.png b/old_assets/ui/Wood and Paper UI/Big Banner/33.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/33.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/33.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/4.png b/old_assets/ui/Wood and Paper UI/Big Banner/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/4.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/4.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/5.png b/old_assets/ui/Wood and Paper UI/Big Banner/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/5.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/5.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/6.png b/old_assets/ui/Wood and Paper UI/Big Banner/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/6.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/6.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/7.png b/old_assets/ui/Wood and Paper UI/Big Banner/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/7.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/7.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/8.png b/old_assets/ui/Wood and Paper UI/Big Banner/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/8.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/8.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/9.png b/old_assets/ui/Wood and Paper UI/Big Banner/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/9.png
rename to old_assets/ui/Wood and Paper UI/Big Banner/9.png
diff --git a/assets/ui/Wood and Paper UI/Big Banner/Big Banner (guide).png b/old_assets/ui/Wood and Paper UI/Big Banner/Big Banner (guide).png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Banner/Big Banner (guide).png
rename to old_assets/ui/Wood and Paper UI/Big Banner/Big Banner (guide).png
diff --git a/assets/ui/Wood and Paper UI/Big Text/1.png b/old_assets/ui/Wood and Paper UI/Big Text/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/1.png
rename to old_assets/ui/Wood and Paper UI/Big Text/1.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/10.png b/old_assets/ui/Wood and Paper UI/Big Text/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/10.png
rename to old_assets/ui/Wood and Paper UI/Big Text/10.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/11.png b/old_assets/ui/Wood and Paper UI/Big Text/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/11.png
rename to old_assets/ui/Wood and Paper UI/Big Text/11.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/12.png b/old_assets/ui/Wood and Paper UI/Big Text/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/12.png
rename to old_assets/ui/Wood and Paper UI/Big Text/12.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/13.png b/old_assets/ui/Wood and Paper UI/Big Text/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/13.png
rename to old_assets/ui/Wood and Paper UI/Big Text/13.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/14.png b/old_assets/ui/Wood and Paper UI/Big Text/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/14.png
rename to old_assets/ui/Wood and Paper UI/Big Text/14.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/15.png b/old_assets/ui/Wood and Paper UI/Big Text/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/15.png
rename to old_assets/ui/Wood and Paper UI/Big Text/15.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/16.png b/old_assets/ui/Wood and Paper UI/Big Text/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/16.png
rename to old_assets/ui/Wood and Paper UI/Big Text/16.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/17.png b/old_assets/ui/Wood and Paper UI/Big Text/17.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/17.png
rename to old_assets/ui/Wood and Paper UI/Big Text/17.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/18.png b/old_assets/ui/Wood and Paper UI/Big Text/18.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/18.png
rename to old_assets/ui/Wood and Paper UI/Big Text/18.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/19.png b/old_assets/ui/Wood and Paper UI/Big Text/19.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/19.png
rename to old_assets/ui/Wood and Paper UI/Big Text/19.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/2.png b/old_assets/ui/Wood and Paper UI/Big Text/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/2.png
rename to old_assets/ui/Wood and Paper UI/Big Text/2.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/20.png b/old_assets/ui/Wood and Paper UI/Big Text/20.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/20.png
rename to old_assets/ui/Wood and Paper UI/Big Text/20.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/21.png b/old_assets/ui/Wood and Paper UI/Big Text/21.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/21.png
rename to old_assets/ui/Wood and Paper UI/Big Text/21.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/22.png b/old_assets/ui/Wood and Paper UI/Big Text/22.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/22.png
rename to old_assets/ui/Wood and Paper UI/Big Text/22.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/23.png b/old_assets/ui/Wood and Paper UI/Big Text/23.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/23.png
rename to old_assets/ui/Wood and Paper UI/Big Text/23.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/24.png b/old_assets/ui/Wood and Paper UI/Big Text/24.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/24.png
rename to old_assets/ui/Wood and Paper UI/Big Text/24.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/25.png b/old_assets/ui/Wood and Paper UI/Big Text/25.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/25.png
rename to old_assets/ui/Wood and Paper UI/Big Text/25.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/26.png b/old_assets/ui/Wood and Paper UI/Big Text/26.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/26.png
rename to old_assets/ui/Wood and Paper UI/Big Text/26.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/27.png b/old_assets/ui/Wood and Paper UI/Big Text/27.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/27.png
rename to old_assets/ui/Wood and Paper UI/Big Text/27.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/28.png b/old_assets/ui/Wood and Paper UI/Big Text/28.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/28.png
rename to old_assets/ui/Wood and Paper UI/Big Text/28.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/29.png b/old_assets/ui/Wood and Paper UI/Big Text/29.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/29.png
rename to old_assets/ui/Wood and Paper UI/Big Text/29.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/3.png b/old_assets/ui/Wood and Paper UI/Big Text/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/3.png
rename to old_assets/ui/Wood and Paper UI/Big Text/3.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/30.png b/old_assets/ui/Wood and Paper UI/Big Text/30.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/30.png
rename to old_assets/ui/Wood and Paper UI/Big Text/30.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/31.png b/old_assets/ui/Wood and Paper UI/Big Text/31.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/31.png
rename to old_assets/ui/Wood and Paper UI/Big Text/31.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/32.png b/old_assets/ui/Wood and Paper UI/Big Text/32.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/32.png
rename to old_assets/ui/Wood and Paper UI/Big Text/32.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/33.png b/old_assets/ui/Wood and Paper UI/Big Text/33.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/33.png
rename to old_assets/ui/Wood and Paper UI/Big Text/33.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/34.png b/old_assets/ui/Wood and Paper UI/Big Text/34.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/34.png
rename to old_assets/ui/Wood and Paper UI/Big Text/34.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/35.png b/old_assets/ui/Wood and Paper UI/Big Text/35.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/35.png
rename to old_assets/ui/Wood and Paper UI/Big Text/35.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/36.png b/old_assets/ui/Wood and Paper UI/Big Text/36.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/36.png
rename to old_assets/ui/Wood and Paper UI/Big Text/36.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/4.png b/old_assets/ui/Wood and Paper UI/Big Text/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/4.png
rename to old_assets/ui/Wood and Paper UI/Big Text/4.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/5.png b/old_assets/ui/Wood and Paper UI/Big Text/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/5.png
rename to old_assets/ui/Wood and Paper UI/Big Text/5.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/6.png b/old_assets/ui/Wood and Paper UI/Big Text/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/6.png
rename to old_assets/ui/Wood and Paper UI/Big Text/6.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/7.png b/old_assets/ui/Wood and Paper UI/Big Text/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/7.png
rename to old_assets/ui/Wood and Paper UI/Big Text/7.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/8.png b/old_assets/ui/Wood and Paper UI/Big Text/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/8.png
rename to old_assets/ui/Wood and Paper UI/Big Text/8.png
diff --git a/assets/ui/Wood and Paper UI/Big Text/9.png b/old_assets/ui/Wood and Paper UI/Big Text/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Big Text/9.png
rename to old_assets/ui/Wood and Paper UI/Big Text/9.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/1.png b/old_assets/ui/Wood and Paper UI/Green Board/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/1.png
rename to old_assets/ui/Wood and Paper UI/Green Board/1.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/10.png b/old_assets/ui/Wood and Paper UI/Green Board/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/10.png
rename to old_assets/ui/Wood and Paper UI/Green Board/10.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/11.png b/old_assets/ui/Wood and Paper UI/Green Board/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/11.png
rename to old_assets/ui/Wood and Paper UI/Green Board/11.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/12.png b/old_assets/ui/Wood and Paper UI/Green Board/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/12.png
rename to old_assets/ui/Wood and Paper UI/Green Board/12.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/13.png b/old_assets/ui/Wood and Paper UI/Green Board/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/13.png
rename to old_assets/ui/Wood and Paper UI/Green Board/13.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/14.png b/old_assets/ui/Wood and Paper UI/Green Board/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/14.png
rename to old_assets/ui/Wood and Paper UI/Green Board/14.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/15.png b/old_assets/ui/Wood and Paper UI/Green Board/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/15.png
rename to old_assets/ui/Wood and Paper UI/Green Board/15.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/16.png b/old_assets/ui/Wood and Paper UI/Green Board/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/16.png
rename to old_assets/ui/Wood and Paper UI/Green Board/16.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/2.png b/old_assets/ui/Wood and Paper UI/Green Board/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/2.png
rename to old_assets/ui/Wood and Paper UI/Green Board/2.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/3.png b/old_assets/ui/Wood and Paper UI/Green Board/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/3.png
rename to old_assets/ui/Wood and Paper UI/Green Board/3.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/4.png b/old_assets/ui/Wood and Paper UI/Green Board/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/4.png
rename to old_assets/ui/Wood and Paper UI/Green Board/4.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/5.png b/old_assets/ui/Wood and Paper UI/Green Board/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/5.png
rename to old_assets/ui/Wood and Paper UI/Green Board/5.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/6.png b/old_assets/ui/Wood and Paper UI/Green Board/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/6.png
rename to old_assets/ui/Wood and Paper UI/Green Board/6.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/7.png b/old_assets/ui/Wood and Paper UI/Green Board/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/7.png
rename to old_assets/ui/Wood and Paper UI/Green Board/7.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/8.png b/old_assets/ui/Wood and Paper UI/Green Board/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/8.png
rename to old_assets/ui/Wood and Paper UI/Green Board/8.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/9.png b/old_assets/ui/Wood and Paper UI/Green Board/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/9.png
rename to old_assets/ui/Wood and Paper UI/Green Board/9.png
diff --git a/assets/ui/Wood and Paper UI/Green Board/Green Board (guide).png b/old_assets/ui/Wood and Paper UI/Green Board/Green Board (guide).png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Board/Green Board (guide).png
rename to old_assets/ui/Wood and Paper UI/Green Board/Green Board (guide).png
diff --git a/assets/ui/Wood and Paper UI/Green Button/1.png b/old_assets/ui/Wood and Paper UI/Green Button/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/1.png
rename to old_assets/ui/Wood and Paper UI/Green Button/1.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/10.png b/old_assets/ui/Wood and Paper UI/Green Button/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/10.png
rename to old_assets/ui/Wood and Paper UI/Green Button/10.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/11.png b/old_assets/ui/Wood and Paper UI/Green Button/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/11.png
rename to old_assets/ui/Wood and Paper UI/Green Button/11.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/12.png b/old_assets/ui/Wood and Paper UI/Green Button/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/12.png
rename to old_assets/ui/Wood and Paper UI/Green Button/12.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/13.png b/old_assets/ui/Wood and Paper UI/Green Button/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/13.png
rename to old_assets/ui/Wood and Paper UI/Green Button/13.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/14.png b/old_assets/ui/Wood and Paper UI/Green Button/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/14.png
rename to old_assets/ui/Wood and Paper UI/Green Button/14.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/15.png b/old_assets/ui/Wood and Paper UI/Green Button/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/15.png
rename to old_assets/ui/Wood and Paper UI/Green Button/15.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/16.png b/old_assets/ui/Wood and Paper UI/Green Button/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/16.png
rename to old_assets/ui/Wood and Paper UI/Green Button/16.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/2.png b/old_assets/ui/Wood and Paper UI/Green Button/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/2.png
rename to old_assets/ui/Wood and Paper UI/Green Button/2.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/3.png b/old_assets/ui/Wood and Paper UI/Green Button/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/3.png
rename to old_assets/ui/Wood and Paper UI/Green Button/3.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/4.png b/old_assets/ui/Wood and Paper UI/Green Button/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/4.png
rename to old_assets/ui/Wood and Paper UI/Green Button/4.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/5.png b/old_assets/ui/Wood and Paper UI/Green Button/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/5.png
rename to old_assets/ui/Wood and Paper UI/Green Button/5.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/6.png b/old_assets/ui/Wood and Paper UI/Green Button/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/6.png
rename to old_assets/ui/Wood and Paper UI/Green Button/6.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/7.png b/old_assets/ui/Wood and Paper UI/Green Button/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/7.png
rename to old_assets/ui/Wood and Paper UI/Green Button/7.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/8.png b/old_assets/ui/Wood and Paper UI/Green Button/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/8.png
rename to old_assets/ui/Wood and Paper UI/Green Button/8.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/9.png b/old_assets/ui/Wood and Paper UI/Green Button/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/9.png
rename to old_assets/ui/Wood and Paper UI/Green Button/9.png
diff --git a/assets/ui/Wood and Paper UI/Green Button/Green Button (guide).png b/old_assets/ui/Wood and Paper UI/Green Button/Green Button (guide).png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Green Button/Green Button (guide).png
rename to old_assets/ui/Wood and Paper UI/Green Button/Green Button (guide).png
diff --git a/assets/ui/Wood and Paper UI/Inventory/1.png b/old_assets/ui/Wood and Paper UI/Inventory/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/1.png
rename to old_assets/ui/Wood and Paper UI/Inventory/1.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/10.png b/old_assets/ui/Wood and Paper UI/Inventory/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/10.png
rename to old_assets/ui/Wood and Paper UI/Inventory/10.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/11.png b/old_assets/ui/Wood and Paper UI/Inventory/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/11.png
rename to old_assets/ui/Wood and Paper UI/Inventory/11.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/12.png b/old_assets/ui/Wood and Paper UI/Inventory/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/12.png
rename to old_assets/ui/Wood and Paper UI/Inventory/12.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/13.png b/old_assets/ui/Wood and Paper UI/Inventory/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/13.png
rename to old_assets/ui/Wood and Paper UI/Inventory/13.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/14.png b/old_assets/ui/Wood and Paper UI/Inventory/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/14.png
rename to old_assets/ui/Wood and Paper UI/Inventory/14.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/15.png b/old_assets/ui/Wood and Paper UI/Inventory/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/15.png
rename to old_assets/ui/Wood and Paper UI/Inventory/15.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/16.png b/old_assets/ui/Wood and Paper UI/Inventory/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/16.png
rename to old_assets/ui/Wood and Paper UI/Inventory/16.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/2.png b/old_assets/ui/Wood and Paper UI/Inventory/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/2.png
rename to old_assets/ui/Wood and Paper UI/Inventory/2.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/3.png b/old_assets/ui/Wood and Paper UI/Inventory/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/3.png
rename to old_assets/ui/Wood and Paper UI/Inventory/3.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/4.png b/old_assets/ui/Wood and Paper UI/Inventory/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/4.png
rename to old_assets/ui/Wood and Paper UI/Inventory/4.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/5.png b/old_assets/ui/Wood and Paper UI/Inventory/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/5.png
rename to old_assets/ui/Wood and Paper UI/Inventory/5.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/6.png b/old_assets/ui/Wood and Paper UI/Inventory/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/6.png
rename to old_assets/ui/Wood and Paper UI/Inventory/6.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/7.png b/old_assets/ui/Wood and Paper UI/Inventory/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/7.png
rename to old_assets/ui/Wood and Paper UI/Inventory/7.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/8.png b/old_assets/ui/Wood and Paper UI/Inventory/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/8.png
rename to old_assets/ui/Wood and Paper UI/Inventory/8.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/9.png b/old_assets/ui/Wood and Paper UI/Inventory/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/9.png
rename to old_assets/ui/Wood and Paper UI/Inventory/9.png
diff --git a/assets/ui/Wood and Paper UI/Inventory/Inventory (guide).png b/old_assets/ui/Wood and Paper UI/Inventory/Inventory (guide).png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Inventory/Inventory (guide).png
rename to old_assets/ui/Wood and Paper UI/Inventory/Inventory (guide).png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Big Bars/1.png b/old_assets/ui/Wood and Paper UI/Life Bars/Big Bars/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Big Bars/1.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Big Bars/1.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Big Bars/2.png b/old_assets/ui/Wood and Paper UI/Life Bars/Big Bars/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Big Bars/2.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Big Bars/2.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Big Bars/3.png b/old_assets/ui/Wood and Paper UI/Life Bars/Big Bars/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Big Bars/3.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Big Bars/3.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Big Bars/4.png b/old_assets/ui/Wood and Paper UI/Life Bars/Big Bars/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Big Bars/4.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Big Bars/4.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Colors/1.png b/old_assets/ui/Wood and Paper UI/Life Bars/Colors/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Colors/1.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Colors/1.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Colors/2.png b/old_assets/ui/Wood and Paper UI/Life Bars/Colors/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Colors/2.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Colors/2.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Colors/3.png b/old_assets/ui/Wood and Paper UI/Life Bars/Colors/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Colors/3.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Colors/3.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Colors/4.png b/old_assets/ui/Wood and Paper UI/Life Bars/Colors/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Colors/4.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Colors/4.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Medium Bars/1.png b/old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Medium Bars/1.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/1.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Medium Bars/2.png b/old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Medium Bars/2.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/2.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Medium Bars/3.png b/old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Medium Bars/3.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/3.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Medium Bars/4.png b/old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Medium Bars/4.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/4.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Medium Bars/5.png b/old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Medium Bars/5.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Medium Bars/5.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Small Bars/1.png b/old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Small Bars/1.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/1.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Small Bars/2.png b/old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Small Bars/2.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/2.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Small Bars/3.png b/old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Small Bars/3.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/3.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Small Bars/4.png b/old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Small Bars/4.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/4.png
diff --git a/assets/ui/Wood and Paper UI/Life Bars/Small Bars/5.png b/old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Life Bars/Small Bars/5.png
rename to old_assets/ui/Wood and Paper UI/Life Bars/Small Bars/5.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/1.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/1.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/1.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/10.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/10.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/10.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/11.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/11.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/11.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/12.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/12.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/12.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/2.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/2.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/2.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/3.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/3.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/3.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/4.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/4.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/4.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/5.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/5.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/5.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/6.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/6.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/6.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/7.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/7.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/7.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/8.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/8.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/8.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/9.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/9.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons Cooldown/9.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/1.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/1.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/1.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/2.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/2.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/2.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/3.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/3.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/3.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/4.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/4.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/4.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/5.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/5.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/5.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/6.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/6.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/6.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/7.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/7.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/7.png
diff --git a/assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/8.png b/old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/8.png
rename to old_assets/ui/Wood and Paper UI/Mobile Buttons/Mobile Buttons/8.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/1.png b/old_assets/ui/Wood and Paper UI/Orange Paper/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/1.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/1.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/10.png b/old_assets/ui/Wood and Paper UI/Orange Paper/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/10.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/10.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/11.png b/old_assets/ui/Wood and Paper UI/Orange Paper/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/11.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/11.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/12.png b/old_assets/ui/Wood and Paper UI/Orange Paper/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/12.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/12.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/13.png b/old_assets/ui/Wood and Paper UI/Orange Paper/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/13.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/13.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/14.png b/old_assets/ui/Wood and Paper UI/Orange Paper/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/14.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/14.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/15.png b/old_assets/ui/Wood and Paper UI/Orange Paper/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/15.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/15.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/16.png b/old_assets/ui/Wood and Paper UI/Orange Paper/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/16.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/16.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/2.png b/old_assets/ui/Wood and Paper UI/Orange Paper/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/2.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/2.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/3.png b/old_assets/ui/Wood and Paper UI/Orange Paper/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/3.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/3.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/4.png b/old_assets/ui/Wood and Paper UI/Orange Paper/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/4.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/4.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/5.png b/old_assets/ui/Wood and Paper UI/Orange Paper/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/5.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/5.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/6.png b/old_assets/ui/Wood and Paper UI/Orange Paper/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/6.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/6.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/7.png b/old_assets/ui/Wood and Paper UI/Orange Paper/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/7.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/7.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/8.png b/old_assets/ui/Wood and Paper UI/Orange Paper/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/8.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/8.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/9.png b/old_assets/ui/Wood and Paper UI/Orange Paper/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/9.png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/9.png
diff --git a/assets/ui/Wood and Paper UI/Orange Paper/Orange Paper (guide).png b/old_assets/ui/Wood and Paper UI/Orange Paper/Orange Paper (guide).png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Orange Paper/Orange Paper (guide).png
rename to old_assets/ui/Wood and Paper UI/Orange Paper/Orange Paper (guide).png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/1.png b/old_assets/ui/Wood and Paper UI/Prefabs/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/1.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/1.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/10.png b/old_assets/ui/Wood and Paper UI/Prefabs/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/10.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/10.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/11.png b/old_assets/ui/Wood and Paper UI/Prefabs/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/11.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/11.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/12.png b/old_assets/ui/Wood and Paper UI/Prefabs/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/12.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/12.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/2.png b/old_assets/ui/Wood and Paper UI/Prefabs/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/2.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/2.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/3.png b/old_assets/ui/Wood and Paper UI/Prefabs/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/3.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/3.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/4.png b/old_assets/ui/Wood and Paper UI/Prefabs/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/4.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/4.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/5.png b/old_assets/ui/Wood and Paper UI/Prefabs/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/5.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/5.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/6.png b/old_assets/ui/Wood and Paper UI/Prefabs/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/6.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/6.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/7.png b/old_assets/ui/Wood and Paper UI/Prefabs/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/7.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/7.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/8.png b/old_assets/ui/Wood and Paper UI/Prefabs/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/8.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/8.png
diff --git a/assets/ui/Wood and Paper UI/Prefabs/9.png b/old_assets/ui/Wood and Paper UI/Prefabs/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Prefabs/9.png
rename to old_assets/ui/Wood and Paper UI/Prefabs/9.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/1.png b/old_assets/ui/Wood and Paper UI/Sliders/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/1.png
rename to old_assets/ui/Wood and Paper UI/Sliders/1.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/10.png b/old_assets/ui/Wood and Paper UI/Sliders/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/10.png
rename to old_assets/ui/Wood and Paper UI/Sliders/10.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/2.png b/old_assets/ui/Wood and Paper UI/Sliders/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/2.png
rename to old_assets/ui/Wood and Paper UI/Sliders/2.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/3.png b/old_assets/ui/Wood and Paper UI/Sliders/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/3.png
rename to old_assets/ui/Wood and Paper UI/Sliders/3.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/4.png b/old_assets/ui/Wood and Paper UI/Sliders/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/4.png
rename to old_assets/ui/Wood and Paper UI/Sliders/4.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/5.png b/old_assets/ui/Wood and Paper UI/Sliders/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/5.png
rename to old_assets/ui/Wood and Paper UI/Sliders/5.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/6.png b/old_assets/ui/Wood and Paper UI/Sliders/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/6.png
rename to old_assets/ui/Wood and Paper UI/Sliders/6.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/7.png b/old_assets/ui/Wood and Paper UI/Sliders/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/7.png
rename to old_assets/ui/Wood and Paper UI/Sliders/7.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/8.png b/old_assets/ui/Wood and Paper UI/Sliders/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/8.png
rename to old_assets/ui/Wood and Paper UI/Sliders/8.png
diff --git a/assets/ui/Wood and Paper UI/Sliders/9.png b/old_assets/ui/Wood and Paper UI/Sliders/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Sliders/9.png
rename to old_assets/ui/Wood and Paper UI/Sliders/9.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/1.png b/old_assets/ui/Wood and Paper UI/Small Banner/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/1.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/1.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/10.png b/old_assets/ui/Wood and Paper UI/Small Banner/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/10.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/10.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/11.png b/old_assets/ui/Wood and Paper UI/Small Banner/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/11.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/11.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/12.png b/old_assets/ui/Wood and Paper UI/Small Banner/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/12.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/12.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/13.png b/old_assets/ui/Wood and Paper UI/Small Banner/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/13.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/13.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/2.png b/old_assets/ui/Wood and Paper UI/Small Banner/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/2.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/2.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/3.png b/old_assets/ui/Wood and Paper UI/Small Banner/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/3.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/3.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/4.png b/old_assets/ui/Wood and Paper UI/Small Banner/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/4.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/4.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/5.png b/old_assets/ui/Wood and Paper UI/Small Banner/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/5.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/5.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/6.png b/old_assets/ui/Wood and Paper UI/Small Banner/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/6.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/6.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/7.png b/old_assets/ui/Wood and Paper UI/Small Banner/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/7.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/7.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/8.png b/old_assets/ui/Wood and Paper UI/Small Banner/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/8.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/8.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/9.png b/old_assets/ui/Wood and Paper UI/Small Banner/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/9.png
rename to old_assets/ui/Wood and Paper UI/Small Banner/9.png
diff --git a/assets/ui/Wood and Paper UI/Small Banner/Small Banner (guide).png b/old_assets/ui/Wood and Paper UI/Small Banner/Small Banner (guide).png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Banner/Small Banner (guide).png
rename to old_assets/ui/Wood and Paper UI/Small Banner/Small Banner (guide).png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/1.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/1.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/1.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/10.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/10.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/10.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/11.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/11.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/11.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/12.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/12.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/12.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/13.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/13.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/13.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/14.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/14.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/14.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/15.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/15.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/15.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/16.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/16.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/16.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/17.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/17.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/17.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/17.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/18.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/18.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/18.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/18.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/19.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/19.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/19.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/19.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/2.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/2.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/2.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/20.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/20.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/20.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/20.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/21.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/21.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/21.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/21.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/22.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/22.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/22.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/22.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/23.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/23.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/23.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/23.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/24.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/24.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/24.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/24.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/25.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/25.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/25.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/25.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/3.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/3.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/3.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/4.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/4.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/4.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/5.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/5.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/5.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/6.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/6.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/6.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/7.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/7.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/7.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/8.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/8.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/8.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Icons/9.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Icons/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Icons/9.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Icons/9.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/1.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/1.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/1.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/10.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/10.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/10.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/11.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/11.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/11.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/12.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/12.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/12.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/13.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/13.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/13.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/14.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/14.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/14.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/15.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/15.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/15.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/16.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/16.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/16.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/17.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/17.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/17.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/17.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/18.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/18.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/18.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/18.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/19.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/19.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/19.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/19.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/2.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/2.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/2.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/20.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/20.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/20.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/20.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/21.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/21.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/21.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/21.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/22.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/22.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/22.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/22.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/23.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/23.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/23.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/23.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/24.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/24.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/24.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/24.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/25.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/25.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/25.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/25.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/26.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/26.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/26.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/26.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/27.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/27.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/27.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/27.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/28.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/28.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/28.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/28.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/29.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/29.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/29.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/29.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/3.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/3.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/3.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/30.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/30.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/30.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/30.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/31.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/31.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/31.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/31.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/32.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/32.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/32.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/32.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/33.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/33.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/33.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/33.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/34.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/34.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/34.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/34.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/35.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/35.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/35.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/35.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/36.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/36.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/36.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/36.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/37.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/37.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/37.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/37.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/38.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/38.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/38.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/38.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/39.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/39.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/39.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/39.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/4.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/4.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/4.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/40.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/40.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/40.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/40.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/41.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/41.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/41.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/41.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/42.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/42.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/42.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/42.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/43.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/43.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/43.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/43.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/44.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/44.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/44.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/44.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/45.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/45.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/45.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/45.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/46.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/46.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/46.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/46.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/47.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/47.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/47.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/47.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/48.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/48.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/48.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/48.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/49.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/49.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/49.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/49.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/5.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/5.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/5.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/50.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/50.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/50.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/50.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/51.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/51.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/51.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/51.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/52.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/52.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/52.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/52.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/6.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/6.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/6.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/7.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/7.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/7.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/8.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/8.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/8.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/Small Text/9.png b/old_assets/ui/Wood and Paper UI/Small Text/Small Text/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/Small Text/9.png
rename to old_assets/ui/Wood and Paper UI/Small Text/Small Text/9.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/White Bar/1.png b/old_assets/ui/Wood and Paper UI/Small Text/White Bar/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/White Bar/1.png
rename to old_assets/ui/Wood and Paper UI/Small Text/White Bar/1.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/White Bar/2.png b/old_assets/ui/Wood and Paper UI/Small Text/White Bar/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/White Bar/2.png
rename to old_assets/ui/Wood and Paper UI/Small Text/White Bar/2.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/White Bar/3.png b/old_assets/ui/Wood and Paper UI/Small Text/White Bar/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/White Bar/3.png
rename to old_assets/ui/Wood and Paper UI/Small Text/White Bar/3.png
diff --git a/assets/ui/Wood and Paper UI/Small Text/White Bar/4.png b/old_assets/ui/Wood and Paper UI/Small Text/White Bar/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Small Text/White Bar/4.png
rename to old_assets/ui/Wood and Paper UI/Small Text/White Bar/4.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/1.png b/old_assets/ui/Wood and Paper UI/Yellow Board/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/1.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/1.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/10.png b/old_assets/ui/Wood and Paper UI/Yellow Board/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/10.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/10.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/11.png b/old_assets/ui/Wood and Paper UI/Yellow Board/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/11.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/11.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/12.png b/old_assets/ui/Wood and Paper UI/Yellow Board/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/12.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/12.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/13.png b/old_assets/ui/Wood and Paper UI/Yellow Board/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/13.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/13.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/14.png b/old_assets/ui/Wood and Paper UI/Yellow Board/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/14.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/14.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/15.png b/old_assets/ui/Wood and Paper UI/Yellow Board/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/15.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/15.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/16.png b/old_assets/ui/Wood and Paper UI/Yellow Board/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/16.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/16.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/2.png b/old_assets/ui/Wood and Paper UI/Yellow Board/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/2.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/2.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/3.png b/old_assets/ui/Wood and Paper UI/Yellow Board/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/3.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/3.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/4.png b/old_assets/ui/Wood and Paper UI/Yellow Board/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/4.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/4.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/5.png b/old_assets/ui/Wood and Paper UI/Yellow Board/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/5.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/5.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/6.png b/old_assets/ui/Wood and Paper UI/Yellow Board/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/6.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/6.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/7.png b/old_assets/ui/Wood and Paper UI/Yellow Board/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/7.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/7.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/8.png b/old_assets/ui/Wood and Paper UI/Yellow Board/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/8.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/8.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/9.png b/old_assets/ui/Wood and Paper UI/Yellow Board/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/9.png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/9.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Board/Yellow Board (guide).png b/old_assets/ui/Wood and Paper UI/Yellow Board/Yellow Board (guide).png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Board/Yellow Board (guide).png
rename to old_assets/ui/Wood and Paper UI/Yellow Board/Yellow Board (guide).png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/1.png b/old_assets/ui/Wood and Paper UI/Yellow Button/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/1.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/1.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/10.png b/old_assets/ui/Wood and Paper UI/Yellow Button/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/10.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/10.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/11.png b/old_assets/ui/Wood and Paper UI/Yellow Button/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/11.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/11.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/12.png b/old_assets/ui/Wood and Paper UI/Yellow Button/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/12.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/12.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/13.png b/old_assets/ui/Wood and Paper UI/Yellow Button/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/13.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/13.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/14.png b/old_assets/ui/Wood and Paper UI/Yellow Button/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/14.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/14.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/15.png b/old_assets/ui/Wood and Paper UI/Yellow Button/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/15.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/15.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/16.png b/old_assets/ui/Wood and Paper UI/Yellow Button/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/16.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/16.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/2.png b/old_assets/ui/Wood and Paper UI/Yellow Button/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/2.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/2.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/3.png b/old_assets/ui/Wood and Paper UI/Yellow Button/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/3.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/3.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/4.png b/old_assets/ui/Wood and Paper UI/Yellow Button/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/4.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/4.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/5.png b/old_assets/ui/Wood and Paper UI/Yellow Button/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/5.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/5.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/6.png b/old_assets/ui/Wood and Paper UI/Yellow Button/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/6.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/6.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/7.png b/old_assets/ui/Wood and Paper UI/Yellow Button/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/7.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/7.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/8.png b/old_assets/ui/Wood and Paper UI/Yellow Button/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/8.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/8.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/9.png b/old_assets/ui/Wood and Paper UI/Yellow Button/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/9.png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/9.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Button/Yellow Button (guide).png b/old_assets/ui/Wood and Paper UI/Yellow Button/Yellow Button (guide).png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Button/Yellow Button (guide).png
rename to old_assets/ui/Wood and Paper UI/Yellow Button/Yellow Button (guide).png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/1.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/1.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/1.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/1.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/10.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/10.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/10.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/10.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/11.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/11.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/11.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/11.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/12.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/12.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/12.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/12.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/13.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/13.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/13.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/13.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/14.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/14.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/14.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/14.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/15.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/15.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/15.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/15.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/16.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/16.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/16.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/16.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/2.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/2.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/2.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/2.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/3.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/3.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/3.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/3.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/4.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/4.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/4.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/4.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/5.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/5.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/5.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/5.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/6.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/6.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/6.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/6.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/7.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/7.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/7.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/7.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/8.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/8.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/8.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/8.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/9.png b/old_assets/ui/Wood and Paper UI/Yellow Paper/9.png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/9.png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/9.png
diff --git a/assets/ui/Wood and Paper UI/Yellow Paper/Yellow Paper (guide).png b/old_assets/ui/Wood and Paper UI/Yellow Paper/Yellow Paper (guide).png
similarity index 100%
rename from assets/ui/Wood and Paper UI/Yellow Paper/Yellow Paper (guide).png
rename to old_assets/ui/Wood and Paper UI/Yellow Paper/Yellow Paper (guide).png
diff --git a/assets/ui/blank_image.png b/old_assets/ui/blank_image.png
similarity index 100%
rename from assets/ui/blank_image.png
rename to old_assets/ui/blank_image.png
diff --git a/old_assets/ui/button_background.png b/old_assets/ui/button_background.png
new file mode 100644
index 0000000000..4a68a89dab
Binary files /dev/null and b/old_assets/ui/button_background.png differ
diff --git a/old_assets/ui/button_background_clicked.png b/old_assets/ui/button_background_clicked.png
new file mode 100644
index 0000000000..dfe103070c
Binary files /dev/null and b/old_assets/ui/button_background_clicked.png differ
diff --git a/assets/ui/button_background_disabled.png b/old_assets/ui/button_background_disabled.png
similarity index 100%
rename from assets/ui/button_background_disabled.png
rename to old_assets/ui/button_background_disabled.png
diff --git a/assets/ui/button_background_hovered.png b/old_assets/ui/button_background_hovered.png
similarity index 100%
rename from assets/ui/button_background_hovered.png
rename to old_assets/ui/button_background_hovered.png
diff --git a/assets/ui/checkbox_background.png b/old_assets/ui/checkbox_background.png
similarity index 100%
rename from assets/ui/checkbox_background.png
rename to old_assets/ui/checkbox_background.png
diff --git a/assets/ui/checkbox_background_checked.png b/old_assets/ui/checkbox_background_checked.png
similarity index 100%
rename from assets/ui/checkbox_background_checked.png
rename to old_assets/ui/checkbox_background_checked.png
diff --git a/assets/ui/checkbox_background_checked_hovered.png b/old_assets/ui/checkbox_background_checked_hovered.png
similarity index 100%
rename from assets/ui/checkbox_background_checked_hovered.png
rename to old_assets/ui/checkbox_background_checked_hovered.png
diff --git a/assets/ui/checkbox_background_clicked.png b/old_assets/ui/checkbox_background_clicked.png
similarity index 100%
rename from assets/ui/checkbox_background_clicked.png
rename to old_assets/ui/checkbox_background_clicked.png
diff --git a/assets/ui/checkbox_background_hovered.png b/old_assets/ui/checkbox_background_hovered.png
similarity index 100%
rename from assets/ui/checkbox_background_hovered.png
rename to old_assets/ui/checkbox_background_hovered.png
diff --git a/assets/ui/combobox_background.png b/old_assets/ui/combobox_background.png
similarity index 100%
rename from assets/ui/combobox_background.png
rename to old_assets/ui/combobox_background.png
diff --git a/assets/ui/editbox_background.png b/old_assets/ui/editbox_background.png
similarity index 100%
rename from assets/ui/editbox_background.png
rename to old_assets/ui/editbox_background.png
diff --git a/assets/ui/editbox_background_clicked.png b/old_assets/ui/editbox_background_clicked.png
similarity index 100%
rename from assets/ui/editbox_background_clicked.png
rename to old_assets/ui/editbox_background_clicked.png
diff --git a/assets/ui/main_menu_header.png b/old_assets/ui/main_menu_header.png
similarity index 100%
rename from assets/ui/main_menu_header.png
rename to old_assets/ui/main_menu_header.png
diff --git a/assets/ui/window_background.png b/old_assets/ui/window_background.png
similarity index 100%
rename from assets/ui/window_background.png
rename to old_assets/ui/window_background.png
diff --git a/assets/ui/window_border.png b/old_assets/ui/window_border.png
similarity index 100%
rename from assets/ui/window_border.png
rename to old_assets/ui/window_border.png
diff --git a/rust-toolchain b/rust-toolchain
new file mode 100644
index 0000000000..7573329311
--- /dev/null
+++ b/rust-toolchain
@@ -0,0 +1 @@
+1.64.0
\ No newline at end of file
diff --git a/scripts/build-web.sh b/scripts/build-web.sh
new file mode 100755
index 0000000000..d16396405d
--- /dev/null
+++ b/scripts/build-web.sh
@@ -0,0 +1,30 @@
+#!/bin/env bash
+
+#
+# This script is usually run by the justfile
+#
+
+is_release="$1"
+target=wasm32-unknown-unknown
+target_dir="web-target"
+
+release_arg=""
+build_kind="debug"
+dist_dir="$target_dir/wasm-debug"
+
+if [ "$is_release" == "release" ]; then
+    release_arg="--release"
+    build_kind="release"
+    dist_dir="$target_dir/wasm-release"
+fi
+
+export CARGO_TARGET_DIR=$target_dir
+
+set -ex
+
+cargo build --target $target $release_arg
+rm -rf $dist_dir
+mkdir -p $dist_dir
+wasm-bindgen --out-dir $dist_dir --target web --no-typescript $target_dir/$target/$build_kind/jumpy.wasm
+cp wasm_resources/index.html $dist_dir/index.html
+cp -r assets $dist_dir
diff --git a/scripts/build_wasm.sh b/scripts/build_wasm.sh
deleted file mode 100755
index 5870a170ac..0000000000
--- a/scripts/build_wasm.sh
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-HELP_STRING=$(cat <<- END
-	usage: build_wasm.sh PROJECT_NAME [--release] [--ultimate]
-
-	Build script for combining a Macroquad project with wasm-bindgen,
-	allowing integration with the greater wasm-ecosystem.
-
-	example: build_wasm.sh flappy-bird
-
-	This'll go through the following steps:
-
-	    1. Build as target 'wasm32-unknown-unknown'
-	    2. Create the directory 'wbindgen' if it doesn't already exist
-	    3. Run wasm-bindgen with output into the wbindgen directory
-	    4. Apply patches to the output js file (detailed here: https://github.com/not-fl3/macroquad/issues/212#issuecomment-835276147)
-
-	Required arguments:
-
-	    PROJECT_NAME            The name of the artifact/target/project
-
-	Arguments:
-
-	    --release               Build in release mode
-	    --ultimate              Build with ultimate integration
-
-
-	Author: Tom Solberg <me@sbg.dev>
-	Version: 0.1
-END
-)
-
-
-die () {
-    echo >&2 "usage: build_wasm.sh PROJECT_NAME [--release]"
-    echo >&2 "Error: $@"
-    echo >&2
-    exit 1
-}
-
-
-# Storage
-RELEASE=no
-ULTIMATE=no
-POSITIONAL=()
-
-# Parse primary commands
-while [[ $# -gt 0 ]]
-do
-    key="$1"
-    case $key in
-        --release)
-            RELEASE=yes
-            shift
-            ;;
-
-        --ultimate)
-            ULTIMATE=yes
-            shift
-            ;;
-
-        -h|--help)
-            echo "$HELP_STRING"
-            exit 0
-            ;;
-
-        *)
-            POSITIONAL+=("$1")
-            shift
-            ;;
-    esac
-done
-
-# Restore positionals
-set -- "${POSITIONAL[@]}"
-[ $# -ne 1 ] && die "too many arguments provided"
-
-PROJECT_NAME=$1
-
-TARGET_DIR="target/wasm32-unknown-unknown"
-
-EXTRA_ARGS=""
-if [ "$RELEASE" == "yes" ]; then
-    EXTRA_ARGS=" --release"
-
-    TARGET_DIR="$TARGET_DIR/release"
-else
-    TARGET_DIR="$TARGET_DIR/debug"
-fi
-
-if [ "$ULTIMATE" == "yes" ]; then
-    EXTRA_ARGS="$EXTRA_ARGS --features ultimate"
-fi
-
-HTML=$(cat <<- END
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>${PROJECT_NAME}</title>
-    <style>
-        html,
-        body,
-        canvas {
-            margin: 0px;
-            padding: 0px;
-            width: 100%;
-            height: 100%;
-            overflow: hidden;
-            position: absolute;
-            z-index: 0;
-        }
-    </style>
-</head>
-<body>
-    <canvas id="glcanvas" tabindex='1'></canvas>
-    <!-- Minified and statically hosted version of https://github.com/not-fl3/macroquad/blob/master/js/mq_js_bundle.js -->
-    <script src="https://not-fl3.github.io/miniquad-samples/mq_js_bundle.js"></script>
-    <script type="module">
-        import init, { set_wasm } from "./${PROJECT_NAME}.js";
-        async function run() {
-            let wbg = await init();
-            miniquad_add_plugin({
-                register_plugin: (a) => (a.wbg = wbg),
-                on_init: () => set_wasm(wasm_exports),
-                version: "0.0.1",
-                name: "wbg",
-            });
-            load("./${PROJECT_NAME}_bg.wasm");
-        }
-        run();
-    </script>
-</body>
-</html>
-END
-)
-
-# Build
-cargo build --target wasm32-unknown-unknown $EXTRA_ARGS
-
-# Generate bindgen outputs
-mkdir -p web
-wasm-bindgen --target web --out-dir web/ $TARGET_DIR/$PROJECT_NAME.wasm
-
-# Shim to tie the thing together
-sed -i "s/import \* as __wbg_star0 from 'env';//" web/$PROJECT_NAME.js
-sed -i "s/let wasm;/let wasm; export const set_wasm = (w) => wasm = w;/" web/$PROJECT_NAME.js
-sed -i "s/imports\['env'\] = __wbg_star0;/return imports.wbg\;/" web/$PROJECT_NAME.js
-
-echo "$HTML" > web/index.html
\ No newline at end of file
diff --git a/scripts/validate_json.sh b/scripts/validate_json.sh
deleted file mode 100755
index 576fed19a7..0000000000
--- a/scripts/validate_json.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-# Validates the JSON files using JSON schemas (Draft-07).
-# https://json-schema.org/draft-07/json-schema-release-notes.html
-#
-# - "file.json" is being validated if "file.schema.json" is found.
-# - All of the JSON files in the same directory are being validated if "schema.json" is found.
-#
-# Required tool for validation: https://github.com/ajv-validator/ajv-cli/
-# Example JSON schema generator: https://extendsclass.com/json-schema-validator.html
-
-set -e
-
-find . -name "*schema.json" -print0 | while read -rd $'\0' schema
-do
-    echo "[~] Schema found: $schema"
-    if [[ $(basename "$schema") != "schema.json" ]]; then
-        ajv validate --spec=draft7 -s "$schema" -d "${schema//.schema/}"
-    else
-        find "$(dirname "$schema")" -maxdepth 1 \
-            -name "*.json" -not -name "*schema.json" -print0 |
-                xargs -0 -I {} ajv validate --spec=draft7 -s "$schema" -d {}
-    fi
-done
diff --git a/src.bkup/README.md b/src.bkup/README.md
new file mode 100644
index 0000000000..ecef0ff3de
--- /dev/null
+++ b/src.bkup/README.md
@@ -0,0 +1 @@
+These are modules with code we might want later, but that aren't used in the game right now.
\ No newline at end of file
diff --git a/src.bkup/networking/client/player_input.rs b/src.bkup/networking/client/player_input.rs
new file mode 100644
index 0000000000..5896d6e110
--- /dev/null
+++ b/src.bkup/networking/client/player_input.rs
@@ -0,0 +1,50 @@
+use crate::{
+    networking::proto::{
+        player_input::{PlayerInputFromClient, PlayerInputFromServer},
+        ClientMatchInfo,
+    },
+    player::input::PlayerInputs,
+    prelude::*,
+};
+
+use super::NetClient;
+
+pub struct ClientPlayerInputPlugin;
+
+impl Plugin for ClientPlayerInputPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_system_to_stage(
+            CoreStage::First,
+            recv_player_input_from_server.run_if_resource_exists::<NetClient>(),
+        );
+        app.add_system_to_stage(
+            CoreStage::Last,
+            send_player_input_to_server
+                .run_if_resource_exists::<NetClient>()
+                .run_if_resource_exists::<ClientMatchInfo>(),
+        );
+    }
+}
+
+fn recv_player_input_from_server(
+    mut client: ResMut<NetClient>,
+    mut player_inputs: ResMut<PlayerInputs>,
+) {
+    // FIXME: Unordered packets not handled correctly. We need a network tick.
+    while let Some(message) = client.recv_unreliable::<PlayerInputFromServer>() {
+        let player_input = &mut player_inputs.players[message.player_idx as usize];
+
+        player_input.control = message.control;
+    }
+}
+
+fn send_player_input_to_server(
+    client: Res<NetClient>,
+    player_inputs: Res<PlayerInputs>,
+    match_info: Res<ClientMatchInfo>,
+) {
+    let control = &player_inputs.players[match_info.player_idx].control;
+    client.send_unreliable(&PlayerInputFromClient {
+        control: control.clone(),
+    });
+}
diff --git a/src.bkup/networking/commands.rs b/src.bkup/networking/commands.rs
new file mode 100644
index 0000000000..16468c8fb5
--- /dev/null
+++ b/src.bkup/networking/commands.rs
@@ -0,0 +1,411 @@
+#![allow(dead_code)] // TODO: Remove this when we use more stuff
+
+use std::marker::PhantomData;
+
+use bevy::{
+    ecs::{
+        entity::Entities,
+        system::{Command, EntityCommands, Resource, SystemParam},
+    },
+    reflect::TypeRegistryArc,
+};
+use serde::{de::DeserializeSeed, Deserialize, Serialize};
+
+use crate::{config::ENGINE_CONFIG, prelude::*, utils::ResetController};
+
+use super::{
+    client::NetClient,
+    serialization::{
+        de::CompactReflectDeserializer, deserializer_from_bytes, get_type_name_cache,
+        ser::CompactReflectSerializer, serialize_to_bytes, TypeNameCache,
+    },
+    server::NetServer,
+    NetId, NetIdMap,
+};
+
+pub struct NetCommandsPlugin;
+
+impl Plugin for NetCommandsPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<NetIdMap>().add_system(
+            client_handle_net_commands
+                .run_if_resource_exists::<NetClient>()
+                .run_if_resource_exists::<TypeNameCache>(),
+        );
+
+        if ENGINE_CONFIG.server_mode {
+            app.world.resource_scope(|world, server: Mut<NetServer>| {
+                let type_registry = world.resource::<TypeRegistryArc>();
+                let type_name_cache = get_type_name_cache(type_registry);
+
+                server.broadcast_reliable(&type_name_cache);
+
+                world.insert_resource(type_name_cache);
+            });
+        } else {
+            app.add_system(
+                update_type_name_cache_from_server.run_if_resource_exists::<NetClient>(),
+            );
+        }
+    }
+}
+
+fn update_type_name_cache_from_server(mut client: ResMut<NetClient>, mut commands: Commands) {
+    while let Some(type_name_cache) = client.recv_reliable::<TypeNameCache>() {
+        commands.insert_resource(type_name_cache);
+    }
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+pub enum CommandMessage {
+    Spawn {
+        net_id: NetId,
+    },
+    Insert {
+        net_id: NetId,
+        component_bytes: Vec<u8>,
+        type_name: String,
+    },
+    InsertResource {
+        resource_bytes: Vec<u8>,
+        type_name: String,
+    },
+    Despawn {
+        recursive: bool,
+        net_id: NetId,
+    },
+    NextState(State),
+    /// This corresponds to the action implemented by the [`jumpy::utils::ResetController`].
+    ///
+    /// Technically it's not a "Command", but it's similar enough that we put it in here.
+    ResetWorld,
+}
+
+impl std::fmt::Debug for CommandMessage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Spawn { net_id } => f.debug_struct("Spawn").field("net_id", net_id).finish(),
+            Self::Insert {
+                net_id,
+                component_bytes: _,
+                type_name,
+            } => f
+                .debug_struct("Insert")
+                .field("net_id", net_id)
+                .field("component_bytes", &"...")
+                .field("type_name", type_name)
+                .finish(),
+            Self::InsertResource {
+                resource_bytes: _,
+                type_name,
+            } => f
+                .debug_struct("InsertResource")
+                .field("resource_bytes", &"...")
+                .field("type_name", type_name)
+                .finish(),
+            Self::Despawn { recursive, net_id } => f
+                .debug_struct("Despawn")
+                .field("recursive", recursive)
+                .field("net_id", net_id)
+                .finish(),
+            Self::NextState(arg0) => f.debug_tuple("NextState").field(arg0).finish(),
+            Self::ResetWorld => write!(f, "ResetWorld"),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, Deserialize, Serialize)]
+pub enum State {
+    GameState(GameState),
+    InGameState(InGameState),
+}
+
+impl From<GameState> for State {
+    fn from(s: GameState) -> Self {
+        Self::GameState(s)
+    }
+}
+impl From<InGameState> for State {
+    fn from(s: InGameState) -> Self {
+        Self::InGameState(s)
+    }
+}
+
+pub fn client_handle_net_commands(
+    entities: &Entities,
+    mut commands: Commands,
+    type_registry: Res<TypeRegistryArc>,
+    mut client: ResMut<NetClient>,
+    mut net_ids: ResMut<NetIdMap>,
+    type_names: Res<TypeNameCache>,
+    mut reset_controller: ResetController,
+) {
+    while let Some(message) = client.recv_reliable::<CommandMessage>() {
+        trace!(command=?message, "Received CommandMessage from server");
+
+        match message {
+            CommandMessage::Spawn { net_id } => {
+                let entity = commands.spawn().insert(net_id).id();
+                info!("Spawning entity");
+                net_ids.insert(entity, net_id);
+            }
+            CommandMessage::Insert {
+                net_id,
+                component_bytes,
+                type_name,
+            } => {
+                let entity = net_ids.get_entity(net_id).expect("Entity not spawned");
+                let type_registry = type_registry.read();
+                let type_registration = type_registry
+                    .get_with_name(&type_name)
+                    .expect("Not registered in TypeRegistry");
+
+                let reflect_component = type_registration
+                    .data::<ReflectComponent>()
+                    .expect("Doesn't have ReflectComponent")
+                    .clone();
+                let reflect_deserializer =
+                    CompactReflectDeserializer::new(&type_registry, &type_names.0);
+                let component_data = reflect_deserializer
+                    .deserialize(&mut deserializer_from_bytes(&component_bytes))
+                    .expect("Deserialize net component");
+
+                commands.add(InsertReflectComponent {
+                    entity,
+                    component_data,
+                    reflect_component,
+                });
+            }
+            CommandMessage::InsertResource {
+                resource_bytes,
+                type_name,
+            } => {
+                let type_registry = type_registry.read();
+                let type_registration = type_registry
+                    .get_with_name(&type_name)
+                    .expect("Not registered in TypeRegistry");
+                let reflect_resource = type_registration
+                    .data::<ReflectResource>()
+                    .expect("Doesn't have ReflectResource")
+                    .clone();
+                let reflect_deserializer =
+                    CompactReflectDeserializer::new(&type_registry, &type_names.0);
+                let resource_data = reflect_deserializer
+                    .deserialize(&mut deserializer_from_bytes(&resource_bytes))
+                    .expect("Deserialize component");
+
+                commands.add(InsertReflectResource {
+                    reflect_resource,
+                    resource_data,
+                });
+            }
+            CommandMessage::NextState(s) => match s {
+                State::GameState(s) => commands.insert_resource(NextState(s)),
+                State::InGameState(s) => commands.insert_resource(NextState(s)),
+            },
+            CommandMessage::Despawn { recursive, net_id } => {
+                if let Some(entity) = net_ids.remove_net_id(net_id) {
+                    if entities.contains(entity) {
+                        let mut cmds = commands.entity(entity);
+                        if recursive {
+                            cmds.despawn_recursive()
+                        } else {
+                            cmds.despawn()
+                        }
+                    }
+                }
+            }
+            CommandMessage::ResetWorld => {
+                reset_controller.reset_world();
+            }
+        }
+    }
+}
+
+struct InsertReflectComponent {
+    entity: Entity,
+    reflect_component: ReflectComponent,
+    component_data: Box<dyn Reflect>,
+}
+impl Command for InsertReflectComponent {
+    fn write(self, world: &mut World) {
+        self.reflect_component.apply_or_insert(
+            world,
+            self.entity,
+            self.component_data.as_reflect(),
+        );
+    }
+}
+
+struct InsertReflectResource {
+    reflect_resource: ReflectResource,
+    resource_data: Box<dyn Reflect>,
+}
+impl Command for InsertReflectResource {
+    fn write(self, world: &mut World) {
+        self.reflect_resource
+            .apply_or_insert(world, self.resource_data.as_reflect());
+    }
+}
+
+/// Similar to [`Commands`], but with network synchronization of the executed commands.
+#[derive(SystemParam)]
+pub struct NetCommands<'w, 's> {
+    commands: Commands<'w, 's>,
+    res: NetResources<'w, 's>,
+}
+
+#[derive(SystemParam)]
+pub struct NetResources<'w, 's> {
+    type_registry: Res<'w, TypeRegistryArc>,
+    net_ids: ResMut<'w, NetIdMap>,
+    server: Option<ResMut<'w, NetServer>>,
+    type_names: Option<Res<'w, TypeNameCache>>,
+    #[system_param(ignore)]
+    _phantom: PhantomData<&'s ()>,
+}
+
+impl<'w, 's> NetCommands<'w, 's> {
+    pub fn spawn<'a>(&'a mut self) -> NetEntityCommands<'w, 's, 'a> {
+        let mut entity_cmds = self.commands.spawn();
+
+        if let Some(server) = &mut self.res.server {
+            // Allocate a network identifier for the new entity
+            let net_id = NetId::new();
+            // Add it to the queued network IDs
+            self.res.net_ids.insert(entity_cmds.id(), net_id);
+
+            // Inser the network ID as a component on the entity
+            entity_cmds.insert(net_id);
+
+            // Notify clients/server that an entity has been spawned
+            server.broadcast_reliable(&CommandMessage::Spawn { net_id });
+        }
+
+        NetEntityCommands {
+            entity_cmds,
+            res: &mut self.res,
+        }
+    }
+
+    pub fn entity<'a>(&'a mut self, entity: Entity) -> NetEntityCommands<'w, 's, 'a> {
+        let entity_cmds = self.commands.entity(entity);
+        NetEntityCommands {
+            entity_cmds,
+            res: &mut self.res,
+        }
+    }
+
+    pub fn next_state(&mut self, state: impl Into<State>) -> &mut Self {
+        let state = state.into();
+
+        if let Some(server) = &mut self.res.server {
+            server.broadcast_reliable(&CommandMessage::NextState(state));
+        }
+
+        match state {
+            State::GameState(s) => self.commands.insert_resource(NextState(s)),
+            State::InGameState(s) => self.commands.insert_resource(NextState(s)),
+        }
+
+        self
+    }
+
+    pub fn insert_resource(&mut self, resource: impl Resource + Reflect) -> &mut Self {
+        if let Some(server) = &mut self.res.server {
+            // Serialize the component
+            let (resource_bytes, type_name) = {
+                let type_registry = self.res.type_registry.read();
+                let type_registration = type_registry
+                    .get(resource.type_id())
+                    .expect("Not registered in TypeRegistry");
+                let serializer = CompactReflectSerializer::new(
+                    resource.as_reflect(),
+                    &type_registry,
+                    &self.res.type_names.as_ref().unwrap().0,
+                );
+
+                let message = serialize_to_bytes(&serializer).expect("Serialize net message");
+
+                (message, type_registration.type_name())
+            };
+
+            // Send the clients/server the inserted component
+            server.broadcast_reliable(&CommandMessage::InsertResource {
+                resource_bytes,
+                type_name: type_name.into(),
+            });
+        }
+
+        self.commands.insert_resource(resource);
+
+        self
+    }
+}
+
+pub struct NetEntityCommands<'w, 's, 'a> {
+    entity_cmds: EntityCommands<'w, 's, 'a>,
+    res: &'a mut NetResources<'w, 's>,
+}
+
+impl<'w, 's, 'a> NetEntityCommands<'w, 's, 'a> {
+    pub fn id(&self) -> Entity {
+        self.entity_cmds.id()
+    }
+    pub fn insert<C: Reflect + Component>(&mut self, c: C) -> &mut Self {
+        if let Some(server) = &mut self.res.server {
+            let entity = self.entity_cmds.id();
+
+            // Get the network ID
+            let net_id = self
+                .res
+                .net_ids
+                .get_net_id(entity)
+                .expect("Entity has no NetId");
+
+            // Serialize the component
+            let (component_bytes, type_name) = {
+                let type_registry = self.res.type_registry.read();
+                let type_registration = type_registry.get(c.type_id()).unwrap_or_else(|| {
+                    panic!(
+                        "{} not registered in TypeRegistry",
+                        std::any::type_name::<C>()
+                    )
+                });
+                let serializable = CompactReflectSerializer::new(
+                    c.as_reflect(),
+                    &type_registry,
+                    &self.res.type_names.as_ref().unwrap().0,
+                );
+
+                let message = serialize_to_bytes(&serializable).expect("Serialize net message");
+
+                (message, type_registration.type_name())
+            };
+
+            // Send the clients/server the inserted component
+            server.broadcast_reliable(&CommandMessage::Insert {
+                net_id,
+                component_bytes,
+                type_name: type_name.into(),
+            });
+        }
+
+        self.entity_cmds.insert(c);
+
+        self
+    }
+
+    pub fn despawn_recursive(self) {
+        if let Some(server) = &mut self.res.server {
+            if let Some(net_id) = self.res.net_ids.remove_entity(self.entity_cmds.id()) {
+                server.broadcast_reliable(&CommandMessage::Despawn {
+                    recursive: true,
+                    net_id,
+                });
+            }
+        }
+
+        self.entity_cmds.despawn_recursive();
+    }
+}
diff --git a/src.bkup/networking/frame_sync.rs b/src.bkup/networking/frame_sync.rs
new file mode 100644
index 0000000000..1995f28ae2
--- /dev/null
+++ b/src.bkup/networking/frame_sync.rs
@@ -0,0 +1,334 @@
+use bevy::{
+    ecs::component::ComponentId,
+    reflect::{ReflectFromPtr, TypeRegistryArc, TypeRegistryInternal},
+};
+use bevy_ecs_dynamic::dynamic_query::{DynamicQuery, FetchKind, FetchResult};
+use serde::de::DeserializeSeed;
+
+use crate::prelude::*;
+
+use super::{
+    client::NetClient,
+    serialization::{
+        de::CompactReflectDeserializer, deserializer_from_bytes, ser::CompactReflectSerializer,
+        serialize_to_bytes, TypeNameCache,
+    },
+    server::NetServer,
+    NetId, NetIdMap,
+};
+
+mod dynamic_query_info;
+use self::dynamic_query_info::{DynamicQueryInfo, DynamicQueryInfoResources};
+
+pub struct NetFrameSyncPlugin;
+
+impl Plugin for NetFrameSyncPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<NetworkSyncConfig>()
+            .add_system_to_stage(
+                FixedUpdateStage::First,
+                client_get_sync_data.exclusive_system().at_start(),
+            )
+            .add_system_to_stage(
+                FixedUpdateStage::First,
+                server_send_sync_data.exclusive_system().at_end(),
+            );
+    }
+}
+
+#[derive(Default)]
+pub struct NetworkSyncConfig {
+    pub queries: Vec<NetworkSyncQuery>,
+}
+
+pub struct NetworkSyncQuery {
+    pub query: DynamicQuery,
+    pub prune: bool,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct FrameSyncMessage {
+    pub queries: Vec<FrameSyncQuery>,
+}
+
+type Bytes = Vec<u8>;
+type ComponentsBytes = Vec<Bytes>;
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct FrameSyncQuery {
+    query_info: DynamicQueryInfo,
+    items: Vec<FrameSyncQueryItem>,
+    prune: bool,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+struct FrameSyncQueryItem {
+    net_id: NetId,
+    components: ComponentsBytes,
+}
+
+fn client_get_sync_data(world: &mut World) {
+    if !world.contains_resource::<NetClient>() {
+        return;
+    }
+    if !world.contains_resource::<TypeNameCache>() {
+        return;
+    }
+
+    world.resource_scope(|world, mut client: Mut<NetClient>| {
+        world.resource_scope(|world, net_ids: Mut<NetIdMap>| {
+            world.resource_scope(|world, type_registry: Mut<TypeRegistryArc>| {
+                world.resource_scope(|world, type_names: Mut<TypeNameCache>| {
+                    let type_registry = type_registry.read();
+                    impl_client_get_sync_data(
+                        world,
+                        &mut client,
+                        &net_ids,
+                        &*type_registry,
+                        &type_names,
+                    )
+                });
+            });
+        });
+    });
+}
+
+fn impl_client_get_sync_data(
+    world: &mut World,
+    client: &mut NetClient,
+    net_ids: &NetIdMap,
+    type_registry: &TypeRegistryInternal,
+    type_names: &TypeNameCache,
+) {
+    let mut message = None;
+    // We only care about the last message, so loop until we stop getting messages and store the
+    // latest one.
+    //
+    // FIXME: We currently send unordered packets, but assume that the latest one received is indeed the
+    // latest, when it could be older than a previously received packet. We need to keep a network tick
+    // so that we can tell which packet is the newest one we've seen.
+    while let Some(m) = client.recv_unreliable::<FrameSyncMessage>() {
+        message = Some(m);
+    }
+
+    // If we have a frame update
+    if let Some(message) = message {
+        for net_query in message.queries {
+            let mut query = net_query
+                .query_info
+                .with_all_fetches_mutable()
+                .get_query(DynamicQueryInfoResources {
+                    world,
+                    type_names,
+                    type_registry,
+                })
+                .expect("Invalid query");
+            let reflect_tools = get_reflect_from_ptr(world, type_registry, &query);
+
+            // Collect entities matching the query
+            let entities = query.iter_mut(world).map(|x| x.entity).collect::<Vec<_>>();
+
+            // Collect entities that have a net ID
+            let mut net_entities = Vec::with_capacity(entities.len());
+            for entity in entities {
+                if let Some(net_id) = net_ids.get_net_id(entity) {
+                    net_entities.push((entity, net_id));
+
+                // Delete non-networked entities matching the query
+                } else if net_query.prune {
+                    despawn_with_children_recursive(world, entity);
+                }
+            }
+
+            // Sort entities by net ID
+            net_entities.sort_unstable_by_key(|x| x.1);
+
+            let mut net_items_iter = net_query.items.into_iter();
+            'entities: for (entity, net_id) in net_entities {
+                // Get the components bytes for the matching networked entity
+                let components_bytes = loop {
+                    if let Some(item) = net_items_iter.next() {
+                        if item.net_id == net_id {
+                            break item.components;
+                        }
+                    } else {
+                        break 'entities;
+                    }
+                };
+
+                // Collect the pointers for the components of the entity
+                let components_target_pointers = query
+                    .get_mut(world, entity)
+                    .expect("Query entity")
+                    .into_iter()
+                    .map(|x| {
+                        if let FetchResult::RefMut { value, .. } = x {
+                            value
+                        } else {
+                            unreachable!("All fetches should have been mutable")
+                        }
+                    });
+
+                // Loop through the components and update them from the data from the network
+                for ((target_pointer, component_bytes), reflect_from_ptr) in
+                    components_target_pointers
+                        .zip(components_bytes)
+                        .zip(&reflect_tools)
+                {
+                    let target_reflect =
+                        unsafe { reflect_from_ptr.as_reflect_ptr_mut(target_pointer) };
+
+                    let deserializer =
+                        CompactReflectDeserializer::new(type_registry, &type_names.0);
+
+                    let component_data = deserializer
+                        .deserialize(&mut deserializer_from_bytes(&component_bytes))
+                        .expect("Deserialize net component");
+
+                    target_reflect.apply(component_data.as_ref());
+                }
+            }
+        }
+    }
+}
+
+fn server_send_sync_data(world: &mut World) {
+    if !world.contains_resource::<NetServer>() {
+        return;
+    }
+    if !world.contains_resource::<TypeNameCache>() {
+        return;
+    }
+
+    world.resource_scope(|world, mut server: Mut<NetServer>| {
+        world.resource_scope(|world, mut queries: Mut<NetworkSyncConfig>| {
+            world.resource_scope(|world, net_ids: Mut<NetIdMap>| {
+                world.resource_scope(|world, type_registry: Mut<TypeRegistryArc>| {
+                    world.resource_scope(|world, type_names: Mut<TypeNameCache>| {
+                        let type_registry = type_registry.read();
+                        impl_server_send_sync_data(
+                            world,
+                            &mut server,
+                            &mut queries,
+                            &net_ids,
+                            &*type_registry,
+                            &type_names,
+                        );
+                    });
+                });
+            });
+        });
+    });
+}
+
+fn impl_server_send_sync_data(
+    world: &mut World,
+    server: &mut NetServer,
+    network_sync: &mut NetworkSyncConfig,
+    net_ids: &NetIdMap,
+    type_registry: &TypeRegistryInternal,
+    type_names: &TypeNameCache,
+) {
+    let mut frame_sync_queries = Vec::with_capacity(network_sync.queries.len());
+
+    // Iterate over queries that need to be synced
+    for net_query in network_sync.queries.iter_mut() {
+        let query = &mut net_query.query;
+        let query_info = DynamicQueryInfo::from_query(
+            query,
+            DynamicQueryInfoResources {
+                world,
+                type_names,
+                type_registry,
+            },
+        );
+
+        // Get the ReflectFromPtr and ReflectSerialize for each component type in the query
+        let reflect_tools = get_reflect_from_ptr(world, type_registry, query);
+
+        // Loop over all entities matching the query
+        let mut serialized_items = Vec::new();
+        for item in query.iter_mut(world) {
+            let net_id = if let Some(id) = net_ids.get_net_id(item.entity) {
+                id
+            } else {
+                warn!("Skipping sync of entity without known NetId");
+                continue;
+            };
+
+            let mut components_bytes = Vec::with_capacity(item.items.len());
+            for (fetch_result, reflect_from_ptr) in item.items.into_iter().zip(reflect_tools.iter())
+            {
+                let ptr = if let FetchResult::Ref(ptr) = fetch_result {
+                    ptr
+                } else {
+                    panic!("Only read-only query supported for network sync");
+                };
+
+                let reflect = unsafe { reflect_from_ptr.as_reflect_ptr(ptr) };
+                let serializable =
+                    CompactReflectSerializer::new(reflect, type_registry, &type_names.0);
+                let bytes = serialize_to_bytes(&serializable).expect("Serialize component");
+                components_bytes.push(bytes);
+            }
+            serialized_items.push(FrameSyncQueryItem {
+                net_id,
+                components: components_bytes,
+            });
+        }
+
+        // Sort items by net_id
+        serialized_items.sort_unstable_by_key(|x| x.net_id);
+
+        frame_sync_queries.push(FrameSyncQuery {
+            query_info,
+            items: serialized_items,
+            prune: net_query.prune,
+        });
+    }
+
+    let message = FrameSyncMessage {
+        queries: frame_sync_queries,
+    };
+
+    server.broadcast_unreliable(&message);
+}
+
+fn get_reflect_from_ptr<'a, 'b>(
+    world: &'b World,
+    type_registry: &'a TypeRegistryInternal,
+    query: &'b DynamicQuery,
+) -> Vec<&'a ReflectFromPtr> {
+    query
+        .fetches()
+        .iter()
+        .map(|fetch_kind| fetch_kind.component_id())
+        .map(|component_id| {
+            world
+                .components()
+                .get_info(component_id)
+                .unwrap()
+                .type_id()
+                .unwrap()
+        })
+        .map(|type_id| {
+            let type_registration = type_registry.get(type_id).expect("Type not registered");
+            let reflect_from_ptr = type_registration
+                .data::<ReflectFromPtr>()
+                .expect("Missing ReflectFromPtr");
+            reflect_from_ptr
+        })
+        .collect::<Vec<_>>()
+}
+
+trait FetchKindExt {
+    fn component_id(&self) -> ComponentId;
+}
+
+impl FetchKindExt for FetchKind {
+    fn component_id(&self) -> ComponentId {
+        match self {
+            FetchKind::Ref(id) | FetchKind::RefMut(id) => *id,
+        }
+    }
+}
diff --git a/src.bkup/networking/frame_sync/dynamic_query_info.rs b/src.bkup/networking/frame_sync/dynamic_query_info.rs
new file mode 100644
index 0000000000..adbfae3d9f
--- /dev/null
+++ b/src.bkup/networking/frame_sync/dynamic_query_info.rs
@@ -0,0 +1,170 @@
+use bevy::{ecs::component::ComponentId, prelude::World, reflect::TypeRegistryInternal};
+use bevy_ecs_dynamic::dynamic_query::{DynamicQuery, FetchKind, FilterKind, QueryError};
+
+use crate::{networking::serialization::TypeNameCache, prelude::*};
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct DynamicQueryInfo {
+    fetches: Vec<FetchKindInfo>,
+    filters: Vec<FilterKindInfo>,
+}
+
+/// References to the types needed to convert and construct [`DynamicQueryInfo`].
+#[derive(Copy, Clone)]
+pub struct DynamicQueryInfoResources<'a> {
+    pub world: &'a World,
+    pub type_names: &'a TypeNameCache,
+    pub type_registry: &'a TypeRegistryInternal,
+}
+
+impl DynamicQueryInfo {
+    pub fn from_query(query: &DynamicQuery, info: DynamicQueryInfoResources) -> Self {
+        let fetches = query
+            .fetches()
+            .iter()
+            .cloned()
+            .map(|x| FetchKindInfo::from_fetch_kind(x, info))
+            .collect();
+        let filters = query
+            .filters()
+            .iter()
+            .cloned()
+            .map(|x| FilterKindInfo::from_filter_kind(x, info))
+            .collect();
+        Self { fetches, filters }
+    }
+
+    pub fn with_all_fetches_mutable(mut self) -> Self {
+        for fetch in &mut self.fetches {
+            *fetch = FetchKindInfo::RefMut(match fetch {
+                FetchKindInfo::Ref(id) | FetchKindInfo::RefMut(id) => *id,
+            });
+        }
+        self
+    }
+
+    pub fn get_query(
+        self: DynamicQueryInfo,
+        info: DynamicQueryInfoResources,
+    ) -> Result<DynamicQuery, QueryError> {
+        let fetches = self
+            .fetches
+            .into_iter()
+            .map(|x| x.get_fetch_kind(info))
+            .collect();
+        let filters = self
+            .filters
+            .into_iter()
+            .map(|x| x.get_filter_kind(info))
+            .collect();
+        DynamicQuery::new(info.world, fetches, filters)
+    }
+}
+
+/// The index into the type name cache for this component
+#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+struct ComponentTypeNameIdx(pub u32);
+
+impl ComponentTypeNameIdx {
+    fn get_component_id(&self, info: DynamicQueryInfoResources) -> ComponentId {
+        let type_registry = info.type_registry;
+
+        let type_name = info
+            .type_names
+            .0
+            .get_str(self.0)
+            .expect("Missing type name in cache");
+        let type_id = type_registry
+            .get_with_name(type_name)
+            .expect("Type not registered")
+            .type_id();
+
+        // FIXME(scripting): This can't support custom components created by scripts, because we
+        // assume the component ID can be directly tied to the type ID that we are syncing.
+        // We need to fix that and find a way to map component Ids on the server to component ids on the client
+        info.world
+            .components()
+            .get_id(type_id)
+            .expect("Component not found")
+    }
+
+    fn from_component_id(id: ComponentId, info: DynamicQueryInfoResources) -> Self {
+        let world = info.world;
+        let type_names = info.type_names;
+        let type_registry = info.type_registry;
+
+        let type_id = world
+            .components()
+            .get_info(id)
+            .expect("Component ID not found")
+            .type_id()
+            .expect("Component without Type ID");
+        let type_name = type_registry
+            .get(type_id)
+            .expect("Type not registered")
+            .type_name();
+
+        Self(
+            type_names
+                .0
+                .get_idx(type_name)
+                .expect("Missing type name in cache"),
+        )
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+enum FetchKindInfo {
+    Ref(ComponentTypeNameIdx),
+    RefMut(ComponentTypeNameIdx),
+}
+
+impl FetchKindInfo {
+    fn get_fetch_kind(&self, info: DynamicQueryInfoResources) -> FetchKind {
+        match self {
+            FetchKindInfo::Ref(id) => FetchKind::Ref(id.get_component_id(info)),
+            FetchKindInfo::RefMut(id) => FetchKind::RefMut(id.get_component_id(info)),
+        }
+    }
+
+    fn from_fetch_kind(f: FetchKind, info: DynamicQueryInfoResources) -> Self {
+        match f {
+            FetchKind::Ref(id) => Self::Ref(ComponentTypeNameIdx::from_component_id(id, info)),
+            FetchKind::RefMut(id) => {
+                Self::RefMut(ComponentTypeNameIdx::from_component_id(id, info))
+            }
+        }
+    }
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+enum FilterKindInfo {
+    With(ComponentTypeNameIdx),
+    Without(ComponentTypeNameIdx),
+    Changed(ComponentTypeNameIdx),
+    Added(ComponentTypeNameIdx),
+}
+
+impl FilterKindInfo {
+    fn get_filter_kind(&self, info: DynamicQueryInfoResources) -> FilterKind {
+        match self {
+            FilterKindInfo::With(id) => FilterKind::With(id.get_component_id(info)),
+            FilterKindInfo::Without(id) => FilterKind::Without(id.get_component_id(info)),
+            FilterKindInfo::Changed(id) => FilterKind::Changed(id.get_component_id(info)),
+            FilterKindInfo::Added(id) => FilterKind::Added(id.get_component_id(info)),
+        }
+    }
+
+    fn from_filter_kind(f: FilterKind, info: DynamicQueryInfoResources) -> Self {
+        match f {
+            FilterKind::With(id) => Self::With(ComponentTypeNameIdx::from_component_id(id, info)),
+            FilterKind::Without(id) => {
+                Self::Without(ComponentTypeNameIdx::from_component_id(id, info))
+            }
+            FilterKind::Changed(id) => {
+                Self::Changed(ComponentTypeNameIdx::from_component_id(id, info))
+            }
+            FilterKind::Added(id) => Self::Added(ComponentTypeNameIdx::from_component_id(id, info)),
+        }
+    }
+}
diff --git a/src.bkup/networking/proto/player_input.rs b/src.bkup/networking/proto/player_input.rs
new file mode 100644
index 0000000000..fbfd2ee778
--- /dev/null
+++ b/src.bkup/networking/proto/player_input.rs
@@ -0,0 +1,12 @@
+use crate::{player::input::PlayerControl, prelude::*};
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct PlayerInputFromClient {
+    pub control: PlayerControl,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct PlayerInputFromServer {
+    pub player_idx: u32,
+    pub control: PlayerControl,
+}
diff --git a/src.bkup/networking/serialization.rs b/src.bkup/networking/serialization.rs
new file mode 100644
index 0000000000..06783bd7ec
--- /dev/null
+++ b/src.bkup/networking/serialization.rs
@@ -0,0 +1,74 @@
+use crate::prelude::*;
+
+use bevy::{reflect::TypeRegistry, utils::HashMap};
+
+pub mod de;
+pub mod ser;
+
+pub struct SerializationPlugin;
+
+impl Plugin for SerializationPlugin {
+    fn build(&self, app: &mut App) {
+        // This type isn't registered
+        app.register_type::<bevy::math::Affine3A>();
+    }
+}
+
+pub fn serialize_to_bytes<T>(value: &T) -> anyhow::Result<Vec<u8>>
+where
+    T: Serialize + ?Sized,
+{
+    Ok(postcard::to_allocvec(value)?)
+}
+
+pub fn deserialize_from_bytes<'a, T>(bytes: &'a [u8]) -> anyhow::Result<T>
+where
+    T: Deserialize<'a>,
+{
+    Ok(postcard::from_bytes(bytes)?)
+}
+
+pub fn deserializer_from_bytes(
+    bytes: &[u8],
+) -> postcard::Deserializer<postcard::de_flavors::Slice> {
+    postcard::Deserializer::from_bytes(bytes)
+}
+
+#[derive(Default, Serialize, Deserialize)]
+pub struct TypeNameCache(pub StringCache);
+
+/// String cache that can be used to map strings to indices in order to save space.
+#[derive(Debug, Clone, Reflect, Default, Serialize, Deserialize)]
+#[reflect(Default)]
+pub struct StringCache {
+    strings: Vec<String>,
+    indexes: HashMap<String, u32>,
+}
+
+impl StringCache {
+    pub fn insert(&mut self, s: &str) {
+        let idx = self.strings.len();
+        self.strings.push(s.into());
+        self.indexes
+            .insert(s.into(), idx.try_into().expect("Too many strings in cache"));
+    }
+
+    pub fn get_idx(&self, str: &str) -> Option<u32> {
+        self.indexes.get(str).copied()
+    }
+
+    pub fn get_str(&self, idx: u32) -> Option<&str> {
+        self.strings.get(idx as usize).map(|x| x.as_str())
+    }
+}
+
+pub fn get_type_name_cache(type_registry: &TypeRegistry) -> TypeNameCache {
+    let mut cache = StringCache::default();
+
+    let type_registry = type_registry.read();
+    for registration in type_registry.iter() {
+        cache.insert(registration.type_name());
+    }
+
+    TypeNameCache(cache)
+}
diff --git a/src.bkup/networking/serialization/de.rs b/src.bkup/networking/serialization/de.rs
new file mode 100644
index 0000000000..caac9b0b72
--- /dev/null
+++ b/src.bkup/networking/serialization/de.rs
@@ -0,0 +1,441 @@
+use std::any::TypeId;
+
+use bevy::reflect::{
+    ArrayInfo, DynamicList, DynamicMap, DynamicStruct, DynamicTuple, DynamicTupleStruct, ListInfo,
+    Map, MapInfo, StructInfo, TupleInfo, TupleStructInfo, TypeInfo, TypeRegistration,
+    TypeRegistryInternal,
+};
+use serde::de::{DeserializeSeed, Error, Visitor};
+
+use super::StringCache;
+use crate::prelude::*;
+
+macro_rules! custom_err {
+    ($($arg:expr),* $(,)?) => {
+        Error::custom(format_args!($($arg),*))
+    };
+}
+
+pub struct CompactReflectDeserializer<'a>(DeserializerInner<'a>);
+
+impl<'a> CompactReflectDeserializer<'a> {
+    pub fn new(registry: &'a TypeRegistryInternal, type_names: &'a StringCache) -> Self {
+        Self(DeserializerInner {
+            registry,
+            type_names,
+        })
+    }
+}
+
+#[derive(Clone, Copy)]
+struct DeserializerInner<'a> {
+    registry: &'a TypeRegistryInternal,
+    type_names: &'a StringCache,
+}
+
+impl<'a> DeserializerInner<'a> {
+    fn get_registration_from_idx<E: Error>(&self, type_idx: u32) -> Result<&TypeRegistration, E> {
+        let type_name = self
+            .type_names
+            .get_str(type_idx)
+            .ok_or_else(|| custom_err!("Type name not in name cache"))?;
+
+        self.registry
+            .get_with_name(type_name)
+            .ok_or_else(|| custom_err!("Type not in type registry"))
+    }
+
+    fn get_registration_from_type_id<E: Error>(
+        &self,
+        type_id: TypeId,
+        type_name: &str,
+    ) -> Result<&TypeRegistration, E> {
+        self.registry
+            .get(type_id)
+            .ok_or_else(|| custom_err!("Type not in type registry: {}", type_name))
+    }
+}
+
+impl<'a, 'de> DeserializeSeed<'de> for CompactReflectDeserializer<'a> {
+    type Value = Box<dyn Reflect>;
+
+    fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        deserializer.deserialize_tuple(2, OuterTypeVisitor(self.0))
+    }
+}
+
+struct OuterTypeVisitor<'a>(DeserializerInner<'a>);
+
+impl<'a, 'de> Visitor<'de> for OuterTypeVisitor<'a> {
+    type Value = Box<dyn Reflect>;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("Tuple like (type_idx_in_str_cache, type_data)")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'de>,
+    {
+        let type_idx = seq
+            .next_element::<u32>()?
+            .ok_or_else(|| custom_err!("Missing type idx in top-level type"))?;
+        let registration = self.0.get_registration_from_idx(type_idx)?;
+
+        let reflect = seq
+            .next_element_seed(ReflectValueDeserializer {
+                inner: self.0,
+                registration,
+            })?
+            .ok_or_else(|| custom_err!("Missing type idx in top-level type"))?;
+
+        Ok(reflect)
+    }
+}
+
+#[derive(Copy, Clone)]
+struct ReflectValueDeserializer<'a> {
+    inner: DeserializerInner<'a>,
+    registration: &'a TypeRegistration,
+}
+
+impl<'a, 'de> DeserializeSeed<'de> for ReflectValueDeserializer<'a> {
+    type Value = Box<dyn Reflect>;
+
+    fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        // Handle both Value case and types that have a custom `ReflectDeserialize`
+        if let Some(deserialize_reflect) = self.registration.data::<ReflectDeserialize>() {
+            let value = deserialize_reflect.deserialize(deserializer)?;
+            return Ok(value);
+        }
+
+        match self.registration.type_info() {
+            TypeInfo::Struct(info) => {
+                let len = info.field_len();
+                let mut dynamic_struct = deserializer.deserialize_tuple(
+                    len,
+                    StructVisitor {
+                        inner: self.inner,
+                        info,
+                    },
+                )?;
+                dynamic_struct.set_name(info.type_name().into());
+
+                Ok(Box::new(dynamic_struct))
+            }
+            TypeInfo::TupleStruct(info) => {
+                let len = info.field_len();
+                let mut dynamic_tuple_struct = deserializer.deserialize_tuple(
+                    len,
+                    TupleStructVisitor {
+                        inner: self.inner,
+                        info,
+                    },
+                )?;
+                dynamic_tuple_struct.set_name(info.type_name().into());
+
+                Ok(Box::new(dynamic_tuple_struct))
+            }
+            TypeInfo::Tuple(info) => {
+                let len = info.field_len();
+                let mut dynamic_tuple = deserializer.deserialize_tuple(
+                    len,
+                    TupleVisitor {
+                        inner: self.inner,
+                        info,
+                    },
+                )?;
+                dynamic_tuple.set_name(info.type_name().into());
+
+                Ok(Box::new(dynamic_tuple))
+            }
+            TypeInfo::List(info) => {
+                let mut dynamic_list = deserializer.deserialize_seq(ListVisitor {
+                    inner: self.inner,
+                    info,
+                })?;
+                dynamic_list.set_name(info.type_name().into());
+
+                Ok(Box::new(dynamic_list))
+            }
+            TypeInfo::Array(info) => {
+                let mut dynamic_list = deserializer.deserialize_seq(ArrayVisitor {
+                    inner: self.inner,
+                    info,
+                })?;
+                dynamic_list.set_name(info.type_name().into());
+
+                Ok(Box::new(dynamic_list))
+            }
+            TypeInfo::Map(info) => {
+                let mut dynamic_map = deserializer.deserialize_map(MapVisitor {
+                    inner: self.inner,
+                    info,
+                })?;
+                dynamic_map.set_name(info.type_name().into());
+
+                Ok(Box::new(dynamic_map))
+            }
+            TypeInfo::Value(_) => {
+                // This case should already be handled
+                Err(custom_err!(
+                    "the TypeRegistration for {} doesn't have ReflectDeserialize",
+                    self.registration.type_name()
+                ))
+            }
+            TypeInfo::Dynamic(_) => {
+                // We could potentially allow this but we'd have no idea what the actual types of the
+                // fields are and would rely on the deserializer to determine them (e.g. `i32` vs `i64`)
+                Err(custom_err!(
+                    "cannot deserialize arbitrary dynamic type yet: {}",
+                    self.registration.type_name()
+                ))
+            }
+        }
+    }
+}
+
+struct StructVisitor<'a> {
+    inner: DeserializerInner<'a>,
+    info: &'a StructInfo,
+}
+
+impl<'a, 'de> Visitor<'de> for StructVisitor<'a> {
+    type Value = DynamicStruct;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("Tuple with struct fields")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'de>,
+    {
+        trace!("Visiting struct {}", self.info.type_name());
+        let mut index = 0usize;
+        let mut output = DynamicStruct::default();
+
+        while let Some(value) = seq.next_element_seed({
+            let field = self.info.field_at(index).unwrap();
+            let type_id = field.type_id();
+            ReflectValueDeserializer {
+                inner: self.inner,
+                registration: self
+                    .inner
+                    .get_registration_from_type_id(type_id, field.type_name())?,
+            }
+        })? {
+            let name = self.info.field_at(index).unwrap().name();
+            trace!("Visiting field {}", name);
+            output.insert_boxed(name, value);
+            index += 1;
+            if index >= self.info.field_len() {
+                break;
+            }
+        }
+
+        Ok(output)
+    }
+}
+
+struct TupleStructVisitor<'a> {
+    inner: DeserializerInner<'a>,
+    info: &'a TupleStructInfo,
+}
+
+impl<'a, 'de> Visitor<'de> for TupleStructVisitor<'a> {
+    type Value = DynamicTupleStruct;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("Tuple with tuple struct fields")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'de>,
+    {
+        trace!("Visiting tuple struct {}", self.info.type_name());
+        let mut index = 0usize;
+        let mut output = DynamicTupleStruct::default();
+
+        while let Some(value) = seq.next_element_seed({
+            let field = self.info.field_at(index).unwrap();
+            let type_id = field.type_id();
+            ReflectValueDeserializer {
+                inner: self.inner,
+                registration: self
+                    .inner
+                    .get_registration_from_type_id(type_id, field.type_name())?,
+            }
+        })? {
+            output.insert_boxed(value);
+            index += 1;
+            if index >= self.info.field_len() {
+                break;
+            }
+        }
+
+        Ok(output)
+    }
+}
+
+struct TupleVisitor<'a> {
+    inner: DeserializerInner<'a>,
+    info: &'a TupleInfo,
+}
+
+impl<'a, 'de> Visitor<'de> for TupleVisitor<'a> {
+    type Value = DynamicTuple;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("Tuple with tuple fields")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'de>,
+    {
+        trace!("Visiting tuple {}", self.info.type_name());
+        let mut index = 0usize;
+        let mut output = DynamicTuple::default();
+
+        while let Some(value) = seq.next_element_seed({
+            let field = self.info.field_at(index).unwrap();
+            let type_id = field.type_id();
+            ReflectValueDeserializer {
+                inner: self.inner,
+                registration: self
+                    .inner
+                    .get_registration_from_type_id(type_id, field.type_name())?,
+            }
+        })? {
+            output.insert_boxed(value);
+            index += 1;
+            if index >= self.info.field_len() {
+                break;
+            }
+        }
+
+        Ok(output)
+    }
+}
+
+struct ListVisitor<'a> {
+    inner: DeserializerInner<'a>,
+    info: &'a ListInfo,
+}
+
+impl<'a, 'de> Visitor<'de> for ListVisitor<'a> {
+    type Value = DynamicList;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("Tuple with tuple list fields")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'de>,
+    {
+        trace!("Visiting list {}", self.info.type_name());
+        let mut output = DynamicList::default();
+
+        let type_id = self.info.item_type_id();
+
+        while let Some(value) = seq.next_element_seed({
+            ReflectValueDeserializer {
+                inner: self.inner,
+                registration: self
+                    .inner
+                    .get_registration_from_type_id(type_id, self.info.item_type_name())?,
+            }
+        })? {
+            output.push_box(value);
+        }
+
+        Ok(output)
+    }
+}
+
+struct ArrayVisitor<'a> {
+    inner: DeserializerInner<'a>,
+    info: &'a ArrayInfo,
+}
+
+impl<'a, 'de> Visitor<'de> for ArrayVisitor<'a> {
+    type Value = DynamicList;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("Tuple with tuple list fields")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::SeqAccess<'de>,
+    {
+        trace!("Visiting array {}", self.info.type_name());
+        let mut output = DynamicList::default();
+
+        let type_id = self.info.item_type_id();
+
+        while let Some(value) = seq.next_element_seed({
+            ReflectValueDeserializer {
+                inner: self.inner,
+                registration: self
+                    .inner
+                    .get_registration_from_type_id(type_id, self.info.item_type_name())?,
+            }
+        })? {
+            output.push_box(value);
+        }
+
+        Ok(output)
+    }
+}
+
+struct MapVisitor<'a> {
+    inner: DeserializerInner<'a>,
+    info: &'a MapInfo,
+}
+
+impl<'a, 'de> Visitor<'de> for MapVisitor<'a> {
+    type Value = DynamicMap;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("map")
+    }
+
+    fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
+    where
+        A: serde::de::MapAccess<'de>,
+    {
+        trace!("Visiting map {}", self.info.type_name());
+        let mut output = DynamicMap::default();
+
+        let key_registration = self
+            .inner
+            .get_registration_from_type_id(self.info.key_type_id(), self.info.key_type_name())?;
+        let value_registration = self.inner.get_registration_from_type_id(
+            self.info.value_type_id(),
+            self.info.value_type_name(),
+        )?;
+
+        while let Some(key) = map.next_key_seed(ReflectValueDeserializer {
+            inner: self.inner,
+            registration: key_registration,
+        })? {
+            let value = map.next_value_seed(ReflectValueDeserializer {
+                registration: value_registration,
+                inner: self.inner,
+            })?;
+            output.insert_boxed(key, value);
+        }
+
+        Ok(output)
+    }
+}
diff --git a/src.bkup/networking/serialization/ser.rs b/src.bkup/networking/serialization/ser.rs
new file mode 100644
index 0000000000..0dbab2f0c9
--- /dev/null
+++ b/src.bkup/networking/serialization/ser.rs
@@ -0,0 +1,169 @@
+use bevy::reflect::{serde::Serializable, ReflectRef, TypeRegistryInternal};
+use serde::ser::{Error, SerializeMap, SerializeSeq, SerializeTuple};
+
+use super::StringCache;
+use crate::prelude::*;
+
+pub struct CompactReflectSerializer<'a>(SerializerInner<'a>);
+
+#[derive(Clone, Copy)]
+struct SerializerInner<'a> {
+    value: &'a dyn Reflect,
+    registry: &'a TypeRegistryInternal,
+    type_names: &'a StringCache,
+}
+
+impl<'a> SerializerInner<'a> {
+    fn serializable<E: serde::ser::Error>(&self) -> Result<Serializable, E> {
+        let reflect_serialize = self
+            .registry
+            .get_type_data::<ReflectSerialize>(self.value.type_id())
+            .ok_or_else(|| {
+                serde::ser::Error::custom(format_args!(
+                    "Type '{}' did not register ReflectSerialize",
+                    self.value.type_name()
+                ))
+            })?;
+        Ok(reflect_serialize.get_serializable(self.value))
+    }
+
+    fn for_value<'b>(&self, value: &'a dyn Reflect) -> SerializerInner<'b>
+    where
+        'a: 'b,
+    {
+        let mut s = *self;
+        s.value = value;
+        s
+    }
+}
+
+impl<'a> CompactReflectSerializer<'a> {
+    pub fn new(
+        value: &'a dyn Reflect,
+        registry: &'a TypeRegistryInternal,
+        type_name_cache: &'a StringCache,
+    ) -> Self {
+        CompactReflectSerializer(SerializerInner {
+            value,
+            registry,
+            type_names: type_name_cache,
+        })
+    }
+
+    fn value_serializer(&self) -> ValueSerializer {
+        ValueSerializer(self.0)
+    }
+}
+
+impl<'a> Serialize for CompactReflectSerializer<'a> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let mut tup = serializer.serialize_tuple(2)?;
+
+        let type_name = self.0.value.type_name();
+        let type_idx = self.0.type_names.get_idx(type_name).ok_or_else(|| {
+            Error::custom(format_args!("Type name not in string cache: {}", type_name))
+        })?;
+        tup.serialize_element(&type_idx)?;
+        tup.serialize_element(&self.value_serializer())?;
+
+        tup.end()
+    }
+}
+
+struct ValueSerializer<'a>(SerializerInner<'a>);
+
+impl<'a> Serialize for ValueSerializer<'a> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let serializable = self.0.serializable::<S::Error>();
+        if let Ok(serializable) = serializable {
+            return serializable.borrow().serialize(serializer);
+        }
+
+        trace!("Serializing {}", self.0.value.type_name());
+
+        match self.0.value.reflect_ref() {
+            ReflectRef::Struct(s) => {
+                let len = s.field_len();
+                let mut tup = serializer.serialize_tuple(len)?;
+                for (i, field) in s.iter_fields().enumerate() {
+                    trace!("Serializing field named `{:?}`", s.name_at(i).unwrap());
+                    let field_serializer = ValueSerializer(SerializerInner {
+                        value: field,
+                        ..self.0
+                    });
+
+                    tup.serialize_element(&field_serializer)?;
+                }
+                tup.end()
+            }
+            ReflectRef::TupleStruct(s) => {
+                let len = s.field_len();
+                let mut tup = serializer.serialize_tuple(len)?;
+                for field in s.iter_fields() {
+                    let field_serializer = ValueSerializer(SerializerInner {
+                        value: field,
+                        ..self.0
+                    });
+
+                    tup.serialize_element(&field_serializer)?;
+                }
+                tup.end()
+            }
+            ReflectRef::Tuple(t) => {
+                let len = t.field_len();
+                let mut tup = serializer.serialize_tuple(len)?;
+                for field in t.iter_fields() {
+                    let field_serializer = ValueSerializer(SerializerInner {
+                        value: field,
+                        ..self.0
+                    });
+
+                    tup.serialize_element(&field_serializer)?;
+                }
+                tup.end()
+            }
+            ReflectRef::List(l) => {
+                let len = l.len();
+                let mut seq = serializer.serialize_seq(Some(len))?;
+                for field in l.iter() {
+                    let field_serializer = ValueSerializer(SerializerInner {
+                        value: field,
+                        ..self.0
+                    });
+
+                    seq.serialize_element(&field_serializer)?;
+                }
+                seq.end()
+            }
+            ReflectRef::Array(a) => {
+                let len = a.len();
+                let mut seq = serializer.serialize_seq(Some(len))?;
+                for field in a.iter() {
+                    let field_serializer = ValueSerializer(self.0.for_value(field));
+
+                    seq.serialize_element(&field_serializer)?;
+                }
+                seq.end()
+            }
+            ReflectRef::Map(m) => {
+                let len = m.len();
+                let mut map = serializer.serialize_map(Some(len))?;
+                for (key, value) in m.iter() {
+                    map.serialize_entry(
+                        &ValueSerializer(self.0.for_value(key)),
+                        &ValueSerializer(self.0.for_value(value)),
+                    )?;
+                }
+
+                map.end()
+            }
+            ReflectRef::Value(_) => Err(serializable.err().unwrap()),
+        }
+    }
+}
diff --git a/src.bkup/networking/server/player_input.rs b/src.bkup/networking/server/player_input.rs
new file mode 100644
index 0000000000..86042c7353
--- /dev/null
+++ b/src.bkup/networking/server/player_input.rs
@@ -0,0 +1,35 @@
+use crate::{
+    networking::proto::player_input::{PlayerInputFromClient, PlayerInputFromServer},
+    player::input::PlayerInputs,
+    prelude::*,
+};
+
+use super::NetServer;
+
+pub struct ServerPlayerInputPlugin;
+
+impl Plugin for ServerPlayerInputPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_system_to_stage(CoreStage::First, recv_player_input);
+    }
+}
+
+fn recv_player_input(mut server: ResMut<NetServer>, mut player_inputs: ResMut<PlayerInputs>) {
+    // FIXME: We are not ordering packets, so we may apply a stale user input, which is not good. We
+    // need to track a network tick to know what the latest input really is.
+    while let Some(incomming) = server.recv_unreliable::<PlayerInputFromClient>() {
+        let input = &mut player_inputs.players[incomming.client_idx];
+
+        input.control = incomming.message.control.clone();
+
+        // FIXME: We may receive multiple updates for each user, so we may send multiple updates to
+        // the client, but we don't want to do that, we should just send one update per changed client.
+        server.send_unreliable_to(
+            &PlayerInputFromServer {
+                player_idx: incomming.client_idx.try_into().unwrap(),
+                control: incomming.message.control,
+            },
+            super::MessageTarget::AllExcept(incomming.client_idx),
+        )
+    }
+}
diff --git a/src.bkup/scripting/ops/net_commands.rs b/src.bkup/scripting/ops/net_commands.rs
new file mode 100644
index 0000000000..c4c2a76f2c
--- /dev/null
+++ b/src.bkup/scripting/ops/net_commands.rs
@@ -0,0 +1,161 @@
+use anyhow::{format_err, Context};
+use bevy::ecs::system::SystemState;
+use bevy::prelude::{default, ReflectComponent};
+use bevy::reflect::TypeRegistryArc;
+
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, JsValueRef, JsValueRefs, OpContext};
+
+use crate::networking::serialization::TypeNameCache;
+use crate::networking::server::NetServer;
+use crate::{
+    networking::{
+        commands::CommandMessage,
+        serialization::{ser::CompactReflectSerializer, serialize_to_bytes},
+        NetIdMap,
+    },
+    prelude::*,
+};
+
+pub struct NetCommandsSpawn;
+impl JsRuntimeOp for NetCommandsSpawn {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.NetCommands) {
+                globalThis.NetCommands = {}
+            }
+            
+            globalThis.NetCommands.spawn = () => {
+                return Value.wrapValueRef(
+                    bevyModJsScriptingOpSync("jumpy_net_commands_spawn")
+                );
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        context: OpContext<'_>,
+        world: &mut bevy::prelude::World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        // Expect empty arguments
+        let _: [(); 0] = serde_json::from_value(args).context("parse args")?;
+
+        let value_refs = context
+            .op_state
+            .entry::<JsValueRefs>()
+            .or_insert_with(default);
+
+        let mut net_commands_state = SystemState::<NetCommands>::new(world);
+        let entity = {
+            let mut net_commands = net_commands_state.get_mut(world);
+            net_commands.spawn().id()
+        };
+
+        net_commands_state.apply(world);
+
+        let value_ref = JsValueRef::new_free(Box::new(entity), value_refs);
+
+        Ok(serde_json::to_value(value_ref)?)
+    }
+}
+
+pub struct NetCommandsInsert;
+impl JsRuntimeOp for NetCommandsInsert {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.NetCommands) {
+                globalThis.NetCommands = {}
+            }
+            
+            globalThis.NetCommands.insert = (entity, component) => {
+                bevyModJsScriptingOpSync(
+                    "jumpy_net_commands_insert",
+                    Value.unwrapValueRef(entity),
+                    Value.unwrapValueRef(component)
+                );
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        context: OpContext<'_>,
+        world: &mut bevy::prelude::World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        // Parse args
+        let (entity_value_ref, component_value_ref): (JsValueRef, JsValueRef) =
+            serde_json::from_value(args).context("parse args")?;
+
+        let mut server = world.remove_resource::<NetServer>();
+
+        let value_refs = context
+            .op_state
+            .entry::<JsValueRefs>()
+            .or_insert_with(default);
+
+        // Get entity and make sure the entity exists
+        let entity = entity_value_ref.get_entity(world, value_refs)?;
+        world
+            .get_entity(entity)
+            .ok_or_else(|| format_err!("Entity does not exist"))?;
+
+        let component_value_ref = value_refs
+            .get(component_value_ref.key)
+            .ok_or_else(|| format_err!("Value ref doesn't exist"))?
+            .clone();
+
+        // Load the type registry
+        let type_registry = world.resource::<TypeRegistryArc>();
+        let type_names = world.resource::<TypeNameCache>();
+        let net_ids = world.resource::<NetIdMap>();
+        let type_registry = type_registry.read();
+
+        // Clone the reflect value of the component
+        let reflect_value_ref = component_value_ref.get(world)?;
+        let type_id = reflect_value_ref.type_id();
+        let reflect_value = reflect_value_ref.clone_value();
+
+        // Get the ReflectComponent
+        let type_registration = type_registry.get(type_id).expect("Type not registered");
+        let reflect_component = type_registration
+            .data::<ReflectComponent>()
+            .ok_or_else(|| format_err!("ReflectComponent not found for component value ref"))?
+            .clone();
+
+        if let Some(server) = &mut server {
+            let net_id = net_ids.get_net_id(entity).expect("Entity has no NetId");
+            let serializable = CompactReflectSerializer::new(
+                reflect_value_ref.as_reflect(),
+                &type_registry,
+                &type_names.0,
+            );
+            let component_bytes = serialize_to_bytes(&serializable).expect("Serialize component");
+
+            // Send component insertion message over the network
+            let type_name = type_registration.type_name();
+            server.broadcast_reliable(&CommandMessage::Insert {
+                net_id,
+                component_bytes,
+                type_name: type_name.into(),
+            });
+        }
+
+        // Drop our immutable borrow of the world
+        drop(type_registry);
+        drop(reflect_value_ref);
+
+        reflect_component.apply_or_insert(world, entity, reflect_value.as_reflect());
+
+        if let Some(server) = server {
+            world.insert_resource(server);
+        }
+
+        Ok(serde_json::Value::Null)
+    }
+}
diff --git a/src/animation.rs b/src/animation.rs
new file mode 100644
index 0000000000..d24c8e36b9
--- /dev/null
+++ b/src/animation.rs
@@ -0,0 +1,230 @@
+use std::time::Duration;
+
+use bevy::{ecs::system::AsSystemLabel, reflect::FromReflect, time::FixedTimestep, utils::HashMap};
+
+use crate::prelude::*;
+
+pub struct AnimationPlugin;
+
+#[derive(StageLabel)]
+pub enum AnimationStage {
+    Hydrate,
+    Animate,
+}
+
+// TODO: I don't know that I like the way this module is designed. Maybe we can simplify it.
+
+impl Plugin for AnimationPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<AnimatedSprite>()
+            .register_type::<AnimationBankSprite>()
+            .add_stage_after(
+                CoreStage::PostUpdate,
+                AnimationStage::Hydrate,
+                SystemStage::single_threaded()
+                    .with_system(hydrate_animation_bank_sprites)
+                    .with_system(hydrate_animated_sprites.after(hydrate_animation_bank_sprites)),
+            )
+            .add_stage_after(
+                AnimationStage::Hydrate,
+                AnimationStage::Animate,
+                SystemStage::single_threaded()
+                    .with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP))
+                    .with_system(update_animation_bank_sprites)
+                    .with_system(
+                        update_animated_sprite_components.after(update_animation_bank_sprites),
+                    )
+                    .with_system(
+                        animate_sprites
+                            .run_in_state(GameState::InGame)
+                            .run_not_in_state(InGameState::Paused)
+                            .after(update_animated_sprite_components.as_system_label()),
+                    ),
+            );
+    }
+}
+
+#[derive(Component, Debug, Default, Reflect, FromReflect)]
+#[reflect(Component, Default)]
+pub struct AnimatedSprite {
+    /// This is the current index in the animation, with an `idx` of `0` meaning that the index in
+    /// the sprite sheet will be `start`.
+    ///
+    /// If the idx is greater than `end - start`, then the animation will loop around.
+    pub index: usize,
+    pub start: usize,
+    pub end: usize,
+    pub atlas: Handle<TextureAtlas>,
+    pub flip_x: bool,
+    pub flip_y: bool,
+    pub repeat: bool,
+    pub fps: f32,
+    #[reflect(ignore)]
+    pub timer: Timer,
+}
+
+#[derive(Reflect, Component, Debug, Default, Deref, DerefMut)]
+pub struct LastAnimatedSprite(pub Option<AnimatedSprite>);
+
+impl Clone for AnimatedSprite {
+    fn clone(&self) -> Self {
+        Self {
+            index: self.index,
+            start: self.start,
+            end: self.end,
+            flip_x: self.flip_x,
+            flip_y: self.flip_y,
+            repeat: self.repeat,
+            fps: self.fps,
+            atlas: self.atlas.clone_weak(),
+            timer: self.timer.clone(),
+        }
+    }
+}
+
+/// Like an [`AnimatedSprite`] where you can chooose from multiple different animations.
+#[derive(Component, Debug, Default, Reflect, FromReflect, Serialize, Deserialize, Clone)]
+#[reflect(Component, Default)]
+pub struct AnimationBankSprite {
+    pub current_animation: String,
+    pub flip_x: bool,
+    pub flip_y: bool,
+}
+
+#[derive(Component, Debug, Default, Reflect, FromReflect, Clone)]
+#[reflect(Component, Default)]
+pub struct AnimationBank {
+    pub animations: HashMap<String, AnimatedSprite>,
+    pub last_animation: String,
+}
+
+fn animate_sprites(mut animated_sprites: Query<(&mut AnimatedSprite, &mut TextureAtlasSprite)>) {
+    for (mut animated_sprite, mut atlas_sprite) in &mut animated_sprites {
+        animated_sprite
+            .timer
+            .tick(Duration::from_secs_f64(crate::FIXED_TIMESTEP));
+
+        if animated_sprite.timer.just_finished() {
+            if animated_sprite.index
+                >= animated_sprite
+                    .end
+                    .saturating_sub(animated_sprite.start)
+                    .saturating_sub(1)
+                && !animated_sprite.repeat
+            {
+                continue;
+            }
+            animated_sprite.index += 1;
+            animated_sprite.index %= (animated_sprite.end - animated_sprite.start).max(1);
+        }
+
+        atlas_sprite.index = animated_sprite.start + animated_sprite.index;
+    }
+}
+
+fn hydrate_animated_sprites(
+    mut commands: Commands,
+    animated_sprites: Query<Entity, Added<AnimatedSprite>>,
+) {
+    for entity in &animated_sprites {
+        commands
+            .entity(entity)
+            .insert(LastAnimatedSprite(None))
+            .insert(Handle::<TextureAtlas>::default())
+            .insert(TextureAtlasSprite::default());
+    }
+}
+
+fn hydrate_animation_bank_sprites(
+    mut commands: Commands,
+    sprites: Query<Entity, (Added<AnimationBankSprite>, Without<AnimatedSprite>)>,
+) {
+    for entity in &sprites {
+        commands.entity(entity).insert(AnimatedSprite::default());
+    }
+}
+
+fn update_animated_sprite_components(
+    mut animated_sprites: Query<(
+        &mut AnimatedSprite,
+        &mut LastAnimatedSprite,
+        &mut Handle<TextureAtlas>,
+        &mut TextureAtlasSprite,
+    )>,
+) {
+    for (mut animated_sprite, mut last_animated_sprite, mut atlas_handle, mut atlas_sprite) in
+        &mut animated_sprites
+    {
+        if *atlas_handle != animated_sprite.atlas {
+            *atlas_handle = animated_sprite.atlas.clone_weak();
+        }
+
+        atlas_sprite.flip_x = animated_sprite.flip_x;
+        atlas_sprite.flip_y = animated_sprite.flip_y;
+
+        let fps = animated_sprite.fps;
+        let repeat = animated_sprite.repeat;
+
+        // If the FPS or repeat mode changed
+        if last_animated_sprite
+            .as_ref()
+            .as_ref()
+            .map(|last| fps != last.fps || repeat != last.repeat)
+            .unwrap_or(true)
+        {
+            // Restart the animation
+            animated_sprite.index = 0;
+            atlas_sprite.index = animated_sprite.start;
+
+            // Reset the timer
+            animated_sprite
+                .timer
+                .set_duration(Duration::from_secs_f32(1.0 / fps.max(0.0001)));
+            animated_sprite.timer.set_repeating(true);
+            animated_sprite.timer.reset();
+        }
+
+        // If the animation changed
+        if last_animated_sprite
+            .as_ref()
+            .as_ref()
+            .map(|last| animated_sprite.start != last.start || animated_sprite.end != last.end)
+            .unwrap_or(true)
+        {
+            // Restart the animation
+            animated_sprite.index = 0;
+            atlas_sprite.index = animated_sprite.start;
+        }
+
+        **last_animated_sprite = Some(animated_sprite.clone());
+    }
+}
+
+fn update_animation_bank_sprites(
+    mut banks: Query<
+        (
+            &AnimationBankSprite,
+            &mut AnimationBank,
+            &mut AnimatedSprite,
+        ),
+        Or<(Changed<AnimationBankSprite>, Added<AnimatedSprite>)>,
+    >,
+) {
+    for (bank_sprite, mut bank, mut animated_sprite) in &mut banks {
+        if let Some(animation) = bank.animations.get(&bank_sprite.current_animation) {
+            if bank_sprite.current_animation != bank.last_animation {
+                *animated_sprite = animation.clone();
+            }
+
+            animated_sprite.flip_x = bank_sprite.flip_x && !animation.flip_x;
+            animated_sprite.flip_y = bank_sprite.flip_y && !animation.flip_y;
+        } else {
+            warn!(
+                "Trying to play non-existent animation: {}",
+                bank_sprite.current_animation
+            );
+        }
+
+        bank.last_animation = bank_sprite.current_animation.clone();
+    }
+}
diff --git a/src/assets.rs b/src/assets.rs
new file mode 100644
index 0000000000..2daa83d908
--- /dev/null
+++ b/src/assets.rs
@@ -0,0 +1,463 @@
+use std::{
+    ffi::OsStr,
+    path::{Path, PathBuf},
+};
+
+use bevy::{
+    asset::{Asset, AssetLoader, AssetPath, LoadedAsset},
+    reflect::TypeUuid,
+    render::texture::ImageTextureLoader,
+};
+use bevy_egui::egui;
+use bevy_mod_js_scripting::{serde_json, JsScript};
+use normalize_path::NormalizePath;
+
+use crate::{
+    config::ENGINE_CONFIG,
+    metadata::{
+        BorderImageMeta, GameMeta, MapElementMeta, MapLayerKind, MapMeta, PlayerMeta,
+        TextureAtlasMeta,
+    },
+    prelude::*,
+};
+
+mod asset_handle;
+pub use asset_handle::AssetHandle;
+
+pub struct AssetPlugin;
+
+impl Plugin for AssetPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<AssetHandle<JsScript>>()
+            .register_type::<AssetHandle<Image>>()
+            .add_jumpy_asset::<GameMeta>()
+            .add_asset_loader(GameMetaLoader)
+            .add_jumpy_asset::<PlayerMeta>()
+            .add_asset_loader(PlayerMetaLoader)
+            .add_jumpy_asset::<MapMeta>()
+            .add_asset_loader(MapMetaLoader)
+            .add_jumpy_asset::<MapElementMeta>()
+            .add_asset_loader(MapElementMetaLoader)
+            .add_asset_loader(TextureAtlasLoader)
+            .add_jumpy_asset::<EguiFont>()
+            .add_asset_loader(EguiFontLoader);
+
+        if ENGINE_CONFIG.server_mode {
+            let image_loader = ImageTextureLoader::from_world(&mut app.world);
+            app.add_asset::<Image>().add_asset_loader(image_loader);
+        }
+    }
+}
+
+trait AppExt {
+    fn add_jumpy_asset<T: Asset>(&mut self) -> &mut Self;
+}
+impl AppExt for App {
+    fn add_jumpy_asset<T: Asset>(&mut self) -> &mut Self {
+        self.add_asset::<T>().register_type::<AssetHandle<T>>()
+    }
+}
+
+/// Calculate an asset's full path relative to another asset
+fn relative_asset_path(asset_path: &Path, relative_path: &str) -> PathBuf {
+    let is_relative = !relative_path.starts_with('/');
+
+    let path = if is_relative {
+        let base = asset_path.parent().unwrap_or_else(|| Path::new(""));
+        base.join(relative_path)
+    } else {
+        Path::new(relative_path)
+            .strip_prefix("/")
+            .unwrap()
+            .to_owned()
+    };
+    path.normalize()
+}
+
+/// Helper to get relative asset paths and handles
+fn get_relative_asset(
+    load_context: &bevy::asset::LoadContext,
+    self_path: &Path,
+    relative_path: &str,
+) -> (AssetPath<'static>, HandleUntyped) {
+    let asset_path = relative_asset_path(self_path, relative_path);
+    let asset_path = AssetPath::new(asset_path, None);
+    // Note: Because the load context doesn't have a get_handle_untyped, we have to feed it a dummy
+    // asset type, in this case GameMeta, and then subsequently clone it as untyped.
+    let handle = load_context
+        .get_handle::<_, GameMeta>(asset_path.clone())
+        .clone_untyped();
+
+    (asset_path, handle)
+}
+
+#[derive(Default)]
+pub struct GameMetaLoader;
+
+impl AssetLoader for GameMetaLoader {
+    fn load<'a>(
+        &'a self,
+        bytes: &'a [u8],
+        load_context: &'a mut bevy::asset::LoadContext,
+    ) -> bevy::utils::BoxedFuture<'a, Result<(), anyhow::Error>> {
+        Box::pin(async move {
+            let self_path = load_context.path();
+            let mut meta: GameMeta = if self_path.extension() == Some(OsStr::new("json")) {
+                serde_json::from_slice(bytes)?
+            } else {
+                serde_yaml::from_slice(bytes)?
+            };
+            trace!(path=?self_path, ?meta, "Loaded game asset");
+
+            // Detect the system locale
+            let locale = sys_locale::get_locale().unwrap_or_else(|| "en-US".to_string());
+            let locale = locale.parse().unwrap_or_else(|e| {
+                warn!(
+                    "Could not parse system locale string ( \"{}\" ), defaulting to \"en-US\": {}",
+                    locale, e
+                );
+                "en-US".parse().unwrap()
+            });
+            debug!("Detected system locale: {}", locale);
+            meta.translations.detected_locale = locale;
+
+            let mut dependencies = Vec::new();
+
+            // Get locale handles
+            for locale in &meta.translations.locales {
+                let (path, handle) = get_relative_asset(load_context, self_path, locale);
+                dependencies.push(path.clone());
+                meta.translations
+                    .locale_handles
+                    .push(AssetHandle::new(path, handle.typed()));
+            }
+
+            // Load the main menu background
+            let (main_menu_background_path, main_menu_background) = get_relative_asset(
+                load_context,
+                self_path,
+                &meta.main_menu.background_image.image,
+            );
+            meta.main_menu.background_image.image_handle = AssetHandle::new(
+                main_menu_background_path.clone(),
+                main_menu_background.typed(),
+            );
+            dependencies.push(main_menu_background_path);
+
+            // Load UI border images
+            let mut load_border_image = |border: &mut BorderImageMeta| {
+                let (path, handle) = get_relative_asset(load_context, self_path, &border.image);
+                dependencies.push(path.clone());
+                border.handle = AssetHandle::new(path, handle.typed());
+            };
+            load_border_image(&mut meta.ui_theme.hud.portrait_frame);
+            load_border_image(&mut meta.ui_theme.panel.border);
+            load_border_image(&mut meta.ui_theme.hud.lifebar.background_image);
+            load_border_image(&mut meta.ui_theme.hud.lifebar.progress_image);
+            for button in meta.ui_theme.button_styles.as_list() {
+                load_border_image(&mut button.borders.default);
+                if let Some(border) = &mut button.borders.clicked {
+                    load_border_image(border);
+                }
+                if let Some(border) = &mut button.borders.focused {
+                    load_border_image(border);
+                }
+            }
+
+            // Load editor icons
+            for icon in meta.ui_theme.editor.icons.as_mut_list() {
+                let (path, handle) = get_relative_asset(load_context, self_path, &icon.image);
+                icon.image_handle = AssetHandle::new(path.clone(), handle.typed());
+                dependencies.push(path);
+            }
+
+            // Load player handles
+            for player_relative_path in &meta.players {
+                let (path, handle) =
+                    get_relative_asset(load_context, self_path, player_relative_path);
+
+                meta.player_handles
+                    .push(AssetHandle::new(path.clone(), handle.typed()));
+                dependencies.push(path);
+            }
+
+            // Load map handles
+            for map_relative_path in &meta.maps {
+                let (path, handle) = get_relative_asset(load_context, self_path, map_relative_path);
+
+                meta.map_handles
+                    .push(AssetHandle::new(path.clone(), handle.typed()));
+                dependencies.push(path);
+            }
+
+            // Load UI fonts
+            for (font_name, font_relative_path) in &meta.ui_theme.font_families {
+                let (font_path, font_handle) =
+                    get_relative_asset(load_context, self_path, font_relative_path);
+
+                dependencies.push(font_path.clone());
+
+                meta.ui_theme.font_handles.insert(
+                    font_name.clone(),
+                    AssetHandle::new(font_path, font_handle.typed()),
+                );
+            }
+
+            // Load the script handles
+            for script_relative_path in &meta.scripts {
+                let (script_path, script_handle) =
+                    get_relative_asset(load_context, self_path, script_relative_path);
+                dependencies.push(script_path.clone());
+                meta.script_handles
+                    .push(AssetHandle::new(script_path, script_handle.typed()));
+            }
+
+            // Load the client_script handles
+            for script_relative_path in &meta.client_scripts {
+                let (script_path, script_handle) =
+                    get_relative_asset(load_context, self_path, script_relative_path);
+                dependencies.push(script_path.clone());
+                meta.client_script_handles
+                    .push(AssetHandle::new(script_path, script_handle.typed()));
+            }
+
+            // Load the serer_script handles
+            for script_relative_path in &meta.server_scripts {
+                let (script_path, script_handle) =
+                    get_relative_asset(load_context, self_path, script_relative_path);
+                dependencies.push(script_path.clone());
+                meta.server_script_handles
+                    .push(AssetHandle::new(script_path, script_handle.typed()));
+            }
+
+            load_context.set_default_asset(LoadedAsset::new(meta).with_dependencies(dependencies));
+
+            Ok(())
+        })
+    }
+
+    fn extensions(&self) -> &[&str] {
+        &["game.yml", "game.yaml", "game.json"]
+    }
+}
+
+pub struct PlayerMetaLoader;
+
+impl AssetLoader for PlayerMetaLoader {
+    fn load<'a>(
+        &'a self,
+        bytes: &'a [u8],
+        load_context: &'a mut bevy::asset::LoadContext,
+    ) -> bevy::utils::BoxedFuture<'a, Result<(), anyhow::Error>> {
+        Box::pin(async move {
+            let self_path = load_context.path();
+            let mut meta: PlayerMeta = if self_path.extension() == Some(OsStr::new("json")) {
+                serde_json::from_slice(bytes)?
+            } else {
+                serde_yaml::from_slice(bytes)?
+            };
+            trace!(?self_path, ?meta, "Loaded player asset");
+
+            let (atlas_path, atlas_handle) =
+                get_relative_asset(load_context, load_context.path(), &meta.spritesheet.image);
+
+            let atlas_handle = load_context.set_labeled_asset(
+                "atlas",
+                LoadedAsset::new(TextureAtlas::from_grid(
+                    atlas_handle.typed(),
+                    meta.spritesheet.tile_size.as_vec2(),
+                    meta.spritesheet.columns,
+                    meta.spritesheet.rows,
+                ))
+                .with_dependency(atlas_path.clone()),
+            );
+            meta.spritesheet.atlas_handle = AssetHandle::new(atlas_path, atlas_handle);
+
+            load_context.set_default_asset(LoadedAsset::new(meta));
+
+            Ok(())
+        })
+    }
+
+    fn extensions(&self) -> &[&str] {
+        &["player.yml", "player.yaml", "player.json"]
+    }
+}
+
+pub struct MapMetaLoader;
+
+impl AssetLoader for MapMetaLoader {
+    fn load<'a>(
+        &'a self,
+        bytes: &'a [u8],
+        load_context: &'a mut bevy::asset::LoadContext,
+    ) -> bevy::utils::BoxedFuture<'a, Result<(), anyhow::Error>> {
+        Box::pin(async move {
+            let self_path = load_context.path();
+            let mut meta: MapMeta = if self_path.extension() == Some(OsStr::new("json")) {
+                serde_json::from_slice(bytes)?
+            } else {
+                serde_yaml::from_slice(bytes)?
+            };
+            trace!(?self_path, ?meta, "Loaded map asset");
+
+            let mut dependencies = Vec::new();
+
+            // Load layer elements and tilemaps
+            for layer in &mut meta.layers {
+                match &mut layer.kind {
+                    MapLayerKind::Tile(tile_layer) => {
+                        let (path, handle) =
+                            get_relative_asset(load_context, self_path, &tile_layer.tilemap);
+                        tile_layer.tilemap_handle = AssetHandle::new(path.clone(), handle.typed());
+                        dependencies.push(path);
+                    }
+                    MapLayerKind::Element(element_layer) => {
+                        for element in &mut element_layer.elements {
+                            let (path, handle) =
+                                get_relative_asset(load_context, self_path, &element.element);
+                            element.element_handle = AssetHandle::new(path.clone(), handle.typed());
+                            dependencies.push(path);
+                        }
+                    }
+                }
+            }
+
+            // Load parallax background layers
+            for layer in &mut meta.background_layers {
+                let (path, handle) = get_relative_asset(load_context, self_path, &layer.image);
+                dependencies.push(path.clone());
+                layer.image_handle = AssetHandle::new(path, handle.typed());
+
+                // Rewrite relative paths from the parallax background layer as an absolute path to
+                // make it compatible with the parallax plugin.
+                layer.image = relative_asset_path(self_path, &layer.image)
+                    .to_str()
+                    .unwrap()
+                    .into();
+            }
+
+            load_context.set_default_asset(LoadedAsset::new(meta).with_dependencies(dependencies));
+
+            Ok(())
+        })
+    }
+
+    fn extensions(&self) -> &[&str] {
+        &["map.yml", "map.yaml", "map.json"]
+    }
+}
+
+pub struct MapElementMetaLoader;
+
+impl AssetLoader for MapElementMetaLoader {
+    fn load<'a>(
+        &'a self,
+        bytes: &'a [u8],
+        load_context: &'a mut bevy::asset::LoadContext,
+    ) -> bevy::utils::BoxedFuture<'a, Result<(), anyhow::Error>> {
+        Box::pin(async move {
+            let self_path = load_context.path();
+            let mut meta: MapElementMeta = if self_path.extension() == Some(OsStr::new("json")) {
+                serde_json::from_slice(bytes)?
+            } else {
+                serde_yaml::from_slice(bytes)?
+            };
+            trace!(?self_path, ?meta, "Loaded map element asset");
+
+            let mut dependencies = Vec::new();
+
+            // Load the element script
+            for script in &meta.scripts {
+                let (script_path, script_handle) =
+                    get_relative_asset(load_context, self_path, script);
+                meta.script_handles
+                    .push(AssetHandle::new(script_path.clone(), script_handle.typed()));
+                dependencies.push(script_path);
+            }
+
+            // Load preloaded assets
+            for asset in &meta.preload_assets {
+                let (path, handle) = get_relative_asset(load_context, self_path, asset);
+                dependencies.push(path);
+                meta.preload_asset_handles.push(handle);
+            }
+
+            load_context.set_default_asset(LoadedAsset::new(meta).with_dependencies(dependencies));
+
+            Ok(())
+        })
+    }
+
+    fn extensions(&self) -> &[&str] {
+        &["element.yml", "element.yaml", "element.json"]
+    }
+}
+
+pub struct TextureAtlasLoader;
+
+impl AssetLoader for TextureAtlasLoader {
+    fn load<'a>(
+        &'a self,
+        bytes: &'a [u8],
+        load_context: &'a mut bevy::asset::LoadContext,
+    ) -> bevy::asset::BoxedFuture<'a, anyhow::Result<(), anyhow::Error>> {
+        Box::pin(async move {
+            let self_path = load_context.path();
+            let meta: TextureAtlasMeta = if self_path.extension() == Some(OsStr::new("json")) {
+                serde_json::from_slice(bytes)?
+            } else {
+                serde_yaml::from_slice(bytes)?
+            };
+            trace!(?self_path, ?meta, "Loaded texture atlas asset");
+
+            let (image_path, image_handle) =
+                get_relative_asset(load_context, self_path, &meta.image);
+
+            let atlas = TextureAtlas::from_grid_with_padding(
+                image_handle.typed(),
+                meta.tile_size,
+                meta.columns,
+                meta.rows,
+                meta.padding,
+                meta.offset,
+            );
+
+            load_context.set_default_asset(LoadedAsset::new(atlas).with_dependency(image_path));
+
+            Ok(())
+        })
+    }
+
+    fn extensions(&self) -> &[&str] {
+        &["atlas.yml", "atlas.yaml", "atlas.json"]
+    }
+}
+
+#[derive(Debug, Clone, TypeUuid)]
+#[uuid = "421c9e38-89be-43ff-a293-6fea65abf946"]
+pub struct EguiFont(pub egui::FontData);
+
+pub struct EguiFontLoader;
+
+impl AssetLoader for EguiFontLoader {
+    fn load<'a>(
+        &'a self,
+        bytes: &'a [u8],
+        load_context: &'a mut bevy::asset::LoadContext,
+    ) -> bevy::utils::BoxedFuture<'a, Result<(), anyhow::Error>> {
+        Box::pin(async move {
+            let path = load_context.path();
+            let data = egui::FontData::from_owned(bytes.to_vec());
+            trace!(?path, "Loaded font asset");
+
+            load_context.set_default_asset(LoadedAsset::new(EguiFont(data)));
+
+            Ok(())
+        })
+    }
+
+    fn extensions(&self) -> &[&str] {
+        &["ttf"]
+    }
+}
diff --git a/src/assets/asset_handle.rs b/src/assets/asset_handle.rs
new file mode 100644
index 0000000000..9226dfd708
--- /dev/null
+++ b/src/assets/asset_handle.rs
@@ -0,0 +1,110 @@
+use std::sync::Arc;
+
+use bevy::{
+    asset::{Asset, AssetPath, LoadState},
+    reflect::FromReflect,
+};
+use bevy_has_load_progress::{HasLoadProgress, LoadProgress, LoadingResources};
+
+use crate::prelude::*;
+
+/// A wrapper around [`Handle<T>`] that also contains the [`AssetPath`] used to load the asset.
+///
+/// Unlike [`Handle<T>`], this type is serializable and deserializable and can be sent over the
+/// network.
+///
+/// > **ℹ️ Note:** When deserializing an [`AssetHandle`] you will always get a **weak** handle.
+#[derive(Component, Reflect, FromReflect)]
+#[reflect_value(Component, Serialize, Deserialize)]
+pub struct AssetHandle<T: Asset> {
+    pub inner: Handle<T>,
+    pub asset_path: Arc<AssetPath<'static>>,
+}
+
+impl<T: Asset> Default for AssetHandle<T> {
+    fn default() -> Self {
+        Self {
+            inner: Default::default(),
+            asset_path: Arc::new("<dummy_path>".into()),
+        }
+    }
+}
+
+impl<T: Asset> Clone for AssetHandle<T> {
+    fn clone(&self) -> Self {
+        Self {
+            inner: self.inner.clone(),
+            asset_path: self.asset_path.clone(),
+        }
+    }
+}
+
+impl<T: Asset> std::fmt::Debug for AssetHandle<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("AssetHandle")
+            .field("handle", &self.inner)
+            .field("asset_path", &self.asset_path)
+            .finish()
+    }
+}
+
+impl<T: Asset> std::ops::Deref for AssetHandle<T> {
+    type Target = Handle<T>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl<T: Asset> AssetHandle<T> {
+    pub fn new(asset_path: AssetPath<'static>, handle: Handle<T>) -> Self {
+        Self {
+            asset_path: Arc::new(asset_path),
+            inner: handle,
+        }
+    }
+
+    pub fn clone_weak(&self) -> Self {
+        Self {
+            inner: self.inner.clone_weak(),
+            asset_path: self.asset_path.clone(),
+        }
+    }
+}
+
+impl<T: Asset> Serialize for AssetHandle<T> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.asset_path.serialize(serializer)
+    }
+}
+
+impl<'de, T: Asset> Deserialize<'de> for AssetHandle<T> {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let asset_path = AssetPath::deserialize(deserializer)?;
+        let handle = Handle::<T>::weak(asset_path.get_id().into());
+
+        Ok(Self {
+            inner: handle,
+            asset_path: Arc::new(asset_path),
+        })
+    }
+}
+
+// Implement `HasLoadProgress` for asset handles
+impl<T: Asset> HasLoadProgress for AssetHandle<T> {
+    fn load_progress(&self, loading_resources: &LoadingResources) -> LoadProgress {
+        let loaded =
+            loading_resources.asset_server.get_load_state(&self.inner) == LoadState::Loaded;
+
+        LoadProgress {
+            loaded: if loaded { 1 } else { 0 },
+            total: 1,
+        }
+    }
+}
diff --git a/src/camera.rs b/src/camera.rs
new file mode 100644
index 0000000000..127d9d6e91
--- /dev/null
+++ b/src/camera.rs
@@ -0,0 +1,89 @@
+use bevy::render::view::RenderLayers;
+use bevy_parallax::{ParallaxCameraComponent, ParallaxResource};
+
+use crate::{config::ENGINE_CONFIG, prelude::*};
+
+pub struct CameraPlugin;
+
+impl Plugin for CameraPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<GameCamera>()
+            .register_type::<EditorCamera>();
+
+        if !ENGINE_CONFIG.server_mode {
+            app.add_plugin(bevy_parallax::ParallaxPlugin);
+        } else {
+            app.init_resource::<ParallaxResource>();
+        }
+    }
+}
+
+/// Named [`RenderLayers`][bevy::render::view::visibility::RenderLayers] bitmasks used throughout
+/// the game.
+pub struct GameRenderLayers;
+
+impl GameRenderLayers {
+    pub const DEFAULT: u8 = 0;
+    pub const GAME: u8 = 1;
+    pub const EDITOR: u8 = 2;
+}
+
+#[derive(Reflect, Component, Default)]
+#[reflect(Component, Default)]
+pub struct GameCamera;
+
+#[derive(Reflect, Component, Default)]
+#[reflect(Component, Default)]
+pub struct EditorCamera;
+
+#[derive(Bundle)]
+pub struct CameraBundle {
+    #[bundle]
+    camera_bundle: Camera2dBundle,
+    render_layers: RenderLayers,
+    parallax_camera_component: ParallaxCameraComponent,
+}
+
+pub fn spawn_game_camera(commands: &mut Commands) -> Entity {
+    commands
+        .spawn()
+        .insert(Name::new("Game Camera"))
+        .insert(GameCamera)
+        .insert_bundle(CameraBundle {
+            camera_bundle: Camera2dBundle {
+                // This is different than just omitting this transform field because
+                // Camera2DBundle's default transform is not the same as Transform::default().
+                transform: default(),
+                ..default()
+            },
+            render_layers: RenderLayers::layer(GameRenderLayers::DEFAULT)
+                .with(GameRenderLayers::GAME),
+            parallax_camera_component: ParallaxCameraComponent,
+        })
+        .id()
+}
+
+pub fn spawn_editor_camera(commands: &mut Commands) -> Entity {
+    commands
+        .spawn()
+        .insert(Name::new("Editor Camera"))
+        .insert(EditorCamera)
+        .insert_bundle(CameraBundle {
+            camera_bundle: Camera2dBundle {
+                // This is different than just omitting this transform field because
+                // Camera2DBundle's default transform is not the same as Transform::default().
+                transform: default(),
+                camera: Camera {
+                    // Disable editor camera by default
+                    is_active: false,
+                    ..default()
+                },
+                ..default()
+            },
+
+            render_layers: RenderLayers::layer(GameRenderLayers::DEFAULT)
+                .with(GameRenderLayers::EDITOR),
+            parallax_camera_component: ParallaxCameraComponent,
+        })
+        .id()
+}
diff --git a/src/config.rs b/src/config.rs
new file mode 100644
index 0000000000..9e95611d02
--- /dev/null
+++ b/src/config.rs
@@ -0,0 +1,158 @@
+use clap::Parser;
+use once_cell::sync::Lazy;
+
+pub const SERVER_MODE_ENV_VAR: &str = "JUMPY_SERVER_MODE";
+pub const ASSET_DIR_ENV_VAR: &str = "JUMPY_ASSET_DIR";
+
+const DEFAULT_LOG_LEVEL: &str = "info,wgpu=error,bevy_fluent=warn,symphonia_core=warn,symphonia_format_ogg=warn,symphonia_bundle_mp3=warn";
+
+pub static ENGINE_CONFIG: Lazy<EngineConfig> = Lazy::new(|| {
+    #[cfg(not(target_arch = "wasm32"))]
+    return EngineConfig::parse();
+
+    #[cfg(target_arch = "wasm32")]
+    return EngineConfig::from_web_params();
+});
+
+#[derive(Clone, Debug, clap::Parser)]
+#[command(author, version, about)]
+pub struct EngineConfig {
+    /// Whether or not to run the game headless server mode.
+    ///
+    /// Useful only for development.
+    #[arg(hide = true, long, env = SERVER_MODE_ENV_VAR)]
+    pub server_mode: bool,
+
+    /// Hot reload assets
+    #[arg(short = 'R', long)]
+    pub hot_reload: bool,
+
+    /// The directory to load assets from
+    #[arg(short, long, env = ASSET_DIR_ENV_VAR)]
+    pub asset_dir: Option<String>,
+
+    /// The .game.yaml asset to load at startup
+    #[arg(default_value = "default.game.yaml")]
+    pub game_asset: String,
+
+    /// Skip the menu and automatically start the game
+    #[arg(short = 's', long)]
+    pub auto_start: bool,
+
+    /// Enable the debug tools which can be accessed by pressing F12
+    #[arg(short = 'd', long)]
+    pub debug_tools: bool,
+
+    /// Set the log level
+    ///
+    /// May additionally specify log levels for specific modules as a comma-separated list of
+    /// `module=level` items.
+    #[arg(short = 'l', long, default_value = DEFAULT_LOG_LEVEL)]
+    pub log_level: String,
+}
+
+impl EngineConfig {
+    #[cfg(target_arch = "wasm32")]
+    pub fn from_web_params() -> Self {
+        if let Some(query) = web_sys::window().and_then(|w| w.location().search().ok()) {
+            let mut config = Self::web_default();
+
+            if let Some(asset_dir) = parse_url_query_string(&query, "asset_url") {
+                config.asset_dir = Some(asset_dir.into());
+            }
+
+            if let Some(game_asset) = parse_url_query_string(&query, "game_asset") {
+                config.game_asset = game_asset.into();
+            }
+
+            if let Some(auto_start) =
+                parse_url_query_string(&query, "auto_start").and_then(|s| s.parse().ok())
+            {
+                config.auto_start = auto_start;
+            }
+
+            if let Some(debug_tools) =
+                parse_url_query_string(&query, "debug_tools").and_then(|s| s.parse().ok())
+            {
+                config.debug_tools = debug_tools;
+            }
+
+            if let Some(log_level) = parse_url_query_string(&query, "log_level") {
+                config.log_level = log_level.into();
+            }
+
+            config
+        } else {
+            Self::web_default()
+        }
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    fn web_default() -> Self {
+        // Note: It's unfortunate that we have to manually synchronize this with the defaults set
+        // with structopt. If we find a way around that we should use it.
+        Self {
+            matchmaking_server: "127.0.0.1:8943".parse().unwrap(),
+            server_mode: false,
+            hot_reload: false,
+            asset_dir: None,
+            game_asset: "default.game.yaml".into(),
+            auto_start: false,
+            debug_tools: false,
+            log_level: DEFAULT_LOG_LEVEL.into(),
+        }
+    }
+}
+
+#[cfg(any(target_arch = "wasm32", test))]
+/// Parse the query string as returned by `web_sys::window()?.location().search()?` and get a
+/// specific key out of it.
+pub fn parse_url_query_string<'a>(query: &'a str, search_key: &str) -> Option<&'a str> {
+    let query_string = query.strip_prefix('?')?;
+
+    for pair in query_string.split('&') {
+        let (key, value) = if let Some(idx) = pair.find('=') {
+            let key = &pair[0..idx];
+            let value = &pair[(idx + 1)..];
+
+            (key, value)
+        } else {
+            (pair, "")
+        };
+
+        if key == search_key {
+            return Some(value);
+        }
+    }
+
+    None
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_parse_url_query_string() {
+        assert_eq!(
+            Some("info"),
+            parse_url_query_string("?RUST_LOG=info", "RUST_LOG")
+        );
+        assert_eq!(
+            Some("debug"),
+            parse_url_query_string("?RUST_LOG=debug&hello=world&foo=bar", "RUST_LOG")
+        );
+        assert_eq!(
+            Some("debug,wgpu=warn"),
+            parse_url_query_string("?RUST_LOG=debug,wgpu=warn&hello=world&foo=bar", "RUST_LOG")
+        );
+        assert_eq!(
+            Some("trace"),
+            parse_url_query_string("?hello=world&RUST_LOG=trace&foo=bar", "RUST_LOG")
+        );
+        assert_eq!(
+            None,
+            parse_url_query_string("?hello=world&foo=bar", "RUST_LOG")
+        );
+    }
+}
diff --git a/src/damage.rs b/src/damage.rs
new file mode 100644
index 0000000000..a07edd9424
--- /dev/null
+++ b/src/damage.rs
@@ -0,0 +1,95 @@
+//! Systems and components related to damage/kill zones
+
+use crate::{
+    networking::proto::ClientMatchInfo,
+    physics::{collisions::Rect, KinematicBody},
+    player::{PlayerIdx, PlayerKillCommand},
+    prelude::*,
+};
+
+pub struct DamagePlugin;
+
+impl Plugin for DamagePlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<DamageRegion>()
+            .register_type::<DamageRegionOwner>()
+            .add_system_to_stage(
+                FixedUpdateStage::PostUpdate,
+                eliminate_players_in_damage_region,
+            );
+    }
+}
+
+/// A rectangular damage region.
+///
+/// While this _might_ change in the future, damage regions will kill players immediately, so there
+/// is no "damage" field.
+#[derive(Reflect, Debug, Clone, Component, Default)]
+#[reflect(Component, Default)]
+pub struct DamageRegion {
+    /// The size of the damage region in pixels
+    pub size: Vec2,
+}
+
+impl DamageRegion {
+    /// Get the collision rectangle of this damage region, given it's transform.
+    pub fn collider_rect(&self, position: Vec3) -> Rect {
+        Rect::new(position.x, position.y, self.size.x, self.size.y)
+    }
+}
+
+/// A component that may be added to a damage region entity to indicate the triggering entity.
+///
+/// If this entity is a player, it will not be harmed by the damage region.
+///
+/// Ideally this would probalby be a [`Option<Entity>`] field on [`DamageRegion`], but since scripts
+/// can't interaction with Rust [`Option`]s yet, this is a solution that works now.
+#[derive(Reflect, Debug, Clone, Component)]
+#[reflect(Component, Default)]
+pub struct DamageRegionOwner(pub Entity);
+
+/// FIXME: Right now a [`Default`] implementation is required for scripts to be able to create
+/// components of a certain type, but there isn't a great default value for [`Entity`] so we create
+/// an entity with an index of [`u32::MAX`] as a workaround.
+///
+/// This workaround should be removed once scripts have a way to construct types without a
+/// [`Default`] implementation.
+impl Default for DamageRegionOwner {
+    fn default() -> Self {
+        Self(Entity::from_raw(u32::MAX))
+    }
+}
+
+/// System that will eliminate players that are intersecting with a damage region.
+fn eliminate_players_in_damage_region(
+    mut commands: Commands,
+    players: Query<(Entity, &PlayerIdx, &GlobalTransform, &KinematicBody)>,
+    damage_regions: Query<(&DamageRegion, &GlobalTransform, Option<&DamageRegionOwner>)>,
+    client_match_info: Option<Res<ClientMatchInfo>>,
+) {
+    for (player_ent, player_idx, player_global_transform, kinematic_body) in &players {
+        // For network games, only consider the local player. We're not allowed to kill the other
+        // players.
+        if let Some(info) = &client_match_info {
+            if player_idx.0 != info.player_idx {
+                continue;
+            }
+        }
+
+        let player_rect = kinematic_body.collider_rect(player_global_transform.translation());
+        for (damage_region, global_transform, damage_region_owner) in &damage_regions {
+            // Don't damage the player that owns this damage region
+            if let Some(owner) = damage_region_owner {
+                if owner.0 == player_ent {
+                    continue;
+                }
+            }
+
+            let damage_rect = damage_region.collider_rect(global_transform.translation());
+
+            if player_rect.overlaps(&damage_rect) {
+                commands.add(PlayerKillCommand::new(player_ent));
+            }
+        }
+    }
+}
diff --git a/src/debug.rs b/src/debug.rs
index f366fce20a..4f337ca0b0 100644
--- a/src/debug.rs
+++ b/src/debug.rs
@@ -1,17 +1,18 @@
-static mut IS_DEBUG_DRAW_ENABLED: bool = true;
+use bevy_inspector_egui::{WorldInspectorParams, WorldInspectorPlugin};
 
-pub fn is_debug_draw_enabled() -> bool {
-    unsafe { IS_DEBUG_DRAW_ENABLED }
-}
-
-pub fn enable_debug_draw() {
-    unsafe { IS_DEBUG_DRAW_ENABLED = true };
-}
+use crate::{config::ENGINE_CONFIG, prelude::*};
 
-pub fn disable_debug_draw() {
-    unsafe { IS_DEBUG_DRAW_ENABLED = false };
-}
+pub struct DebugPlugin;
 
-pub fn toggle_debug_draw() {
-    unsafe { IS_DEBUG_DRAW_ENABLED = !IS_DEBUG_DRAW_ENABLED }
+impl Plugin for DebugPlugin {
+    fn build(&self, app: &mut App) {
+        // Add debug plugins if enabled
+        if ENGINE_CONFIG.debug_tools {
+            app.insert_resource(WorldInspectorParams {
+                enabled: false,
+                ..default()
+            })
+            .add_plugin(WorldInspectorPlugin::new());
+        }
+    }
 }
diff --git a/src/drawables/animated_sprite.rs b/src/drawables/animated_sprite.rs
deleted file mode 100644
index c016ddcbb0..0000000000
--- a/src/drawables/animated_sprite.rs
+++ /dev/null
@@ -1,615 +0,0 @@
-use std::borrow::BorrowMut;
-use std::collections::HashMap;
-use std::iter::FromIterator;
-use std::ops::Mul;
-
-use macroquad::color;
-use macroquad::experimental::animation::Animation as MQAnimation;
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-
-use hecs::World;
-
-use serde::{Deserialize, Serialize};
-
-use core::Transform;
-
-use crate::{Drawable, DrawableKind, Resources};
-
-#[derive(Debug, Clone)]
-pub struct Animation {
-    pub id: String,
-    pub row: u32,
-    pub frames: u32,
-    pub fps: u32,
-    pub tweens: HashMap<String, Tween>,
-    pub is_looping: bool,
-}
-
-impl From<AnimationMetadata> for Animation {
-    fn from(meta: AnimationMetadata) -> Self {
-        let tweens = HashMap::from_iter(
-            meta.tweens
-                .into_iter()
-                .map(|meta| (meta.id.clone(), meta.into())),
-        );
-
-        Animation {
-            id: meta.id,
-            row: meta.row,
-            frames: meta.frames,
-            fps: meta.fps,
-            tweens,
-            is_looping: meta.is_looping,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Tween {
-    pub keyframes: Vec<Keyframe>,
-    pub current_translation: Vec2,
-}
-
-impl From<TweenMetadata> for Tween {
-    fn from(meta: TweenMetadata) -> Self {
-        let mut keyframes = meta.keyframes;
-
-        keyframes.sort_by(|a, b| a.frame.cmp(&b.frame));
-
-        let current_translation = keyframes
-            .first()
-            .map(|keyframe| keyframe.translation)
-            .unwrap_or_else(|| Vec2::ZERO);
-
-        Tween {
-            keyframes,
-            current_translation,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct Keyframe {
-    pub frame: u32,
-    #[serde(with = "core::json::vec2_def")]
-    pub translation: Vec2,
-}
-
-pub struct AnimatedSpriteParams {
-    pub frame_size: Option<Vec2>,
-    pub scale: f32,
-    pub offset: Vec2,
-    pub pivot: Option<Vec2>,
-    pub tint: Color,
-    pub is_flipped_x: bool,
-    pub is_flipped_y: bool,
-    pub autoplay_id: Option<String>,
-}
-
-impl Default for AnimatedSpriteParams {
-    fn default() -> Self {
-        AnimatedSpriteParams {
-            frame_size: None,
-            scale: 1.0,
-            offset: Vec2::ZERO,
-            pivot: None,
-            tint: color::WHITE,
-            is_flipped_x: false,
-            is_flipped_y: false,
-            autoplay_id: None,
-        }
-    }
-}
-
-impl From<AnimatedSpriteMetadata> for AnimatedSpriteParams {
-    fn from(meta: AnimatedSpriteMetadata) -> Self {
-        AnimatedSpriteParams {
-            scale: meta.scale.unwrap_or(1.0),
-            offset: meta.offset,
-            pivot: meta.pivot,
-            tint: meta.tint.unwrap_or(color::WHITE),
-            autoplay_id: meta.autoplay_id,
-            ..Default::default()
-        }
-    }
-}
-
-#[derive(Clone)]
-pub enum QueuedAnimationAction {
-    Play(String),
-    PlayIndex(usize),
-    WaitThen(f32, Box<QueuedAnimationAction>),
-    Deactivate,
-}
-
-impl QueuedAnimationAction {
-    pub fn wait_then(delay: f32, action: QueuedAnimationAction) -> Self {
-        QueuedAnimationAction::WaitThen(delay, Box::new(action))
-    }
-}
-
-#[derive(Clone)]
-pub struct AnimatedSprite {
-    pub texture: Texture2D,
-    pub frame_size: Vec2,
-    pub scale: f32,
-    pub offset: Vec2,
-    pub pivot: Option<Vec2>,
-    pub tint: Color,
-    pub animations: Vec<Animation>,
-    pub current_index: usize,
-    pub queued_action: Option<QueuedAnimationAction>,
-    pub current_frame: u32,
-    pub frame_timer: f32,
-    pub is_playing: bool,
-    pub is_flipped_x: bool,
-    pub is_flipped_y: bool,
-    pub is_deactivated: bool,
-    pub wait_timer: f32,
-}
-
-impl From<AnimatedSpriteMetadata> for AnimatedSprite {
-    fn from(meta: AnimatedSpriteMetadata) -> Self {
-        let animations = meta
-            .animations
-            .into_iter()
-            .map(Into::into)
-            .collect::<Vec<_>>();
-
-        let params = AnimatedSpriteParams {
-            scale: meta.scale.unwrap_or(1.0),
-            offset: meta.offset,
-            pivot: meta.pivot,
-            tint: meta.tint.unwrap_or(color::WHITE),
-            autoplay_id: meta.autoplay_id,
-            ..Default::default()
-        };
-
-        AnimatedSprite::new(&meta.texture_id, animations.as_slice(), params)
-    }
-}
-
-impl AnimatedSprite {
-    pub fn new(texture_id: &str, animations: &[Animation], params: AnimatedSpriteParams) -> Self {
-        let animations = animations.to_vec();
-
-        let texture_res = {
-            let resources = storage::get::<Resources>();
-            resources
-                .textures
-                .get(texture_id)
-                .cloned()
-                .unwrap_or_else(|| panic!("AnimatedSprite: Invalid texture ID '{}'", texture_id))
-        };
-
-        let mut is_playing = false;
-        let mut current_index = 0;
-
-        if let Some(autoplay_id) = &params.autoplay_id {
-            is_playing = true;
-
-            for (i, animation) in animations.iter().enumerate() {
-                if animation.id == *autoplay_id {
-                    current_index = i;
-                    break;
-                }
-            }
-        }
-
-        let frame_size = params
-            .frame_size
-            .unwrap_or_else(|| texture_res.frame_size());
-
-        AnimatedSprite {
-            texture: texture_res.texture,
-            frame_size,
-            animations,
-            scale: params.scale,
-            offset: params.offset,
-            pivot: params.pivot,
-            tint: params.tint,
-            frame_timer: 0.0,
-            current_index,
-            queued_action: None,
-            current_frame: 0,
-            is_playing,
-            is_flipped_x: params.is_flipped_x,
-            is_flipped_y: params.is_flipped_y,
-            is_deactivated: false,
-            wait_timer: 0.0,
-        }
-    }
-
-    pub fn get_animation(&self, id: &str) -> Option<&Animation> {
-        self.animations.iter().find(|&a| a.id == *id)
-    }
-
-    pub fn current_animation(&self) -> &Animation {
-        self.animations.get(self.current_index).unwrap()
-    }
-
-    pub fn size(&self) -> Vec2 {
-        self.frame_size * self.scale
-    }
-
-    pub fn source_rect(&self) -> Rect {
-        let animation = self.animations.get(self.current_index).unwrap();
-
-        Rect::new(
-            self.current_frame as f32 * self.frame_size.x,
-            animation.row as f32 * self.frame_size.y,
-            self.frame_size.x,
-            self.frame_size.y,
-        )
-    }
-
-    pub fn as_index(&self, id: &str) -> Option<usize> {
-        self.animations
-            .iter()
-            .enumerate()
-            .find(|&(_, a)| a.id == *id)
-            .map(|(i, _)| i)
-    }
-
-    pub fn set_animation_index(&mut self, index: usize, should_restart: bool) {
-        if should_restart || self.current_index != index {
-            self.wait_timer = 0.0;
-            self.current_index = index;
-            self.current_frame = 0;
-            self.frame_timer = 0.0;
-            self.is_playing = true;
-        }
-    }
-
-    pub fn set_animation(&mut self, id: &str, should_restart: bool) {
-        if let Some(index) = self.as_index(id) {
-            self.set_animation_index(index, should_restart);
-        }
-    }
-
-    pub fn queue_action(&mut self, action: QueuedAnimationAction) {
-        self.queued_action = Some(action);
-    }
-
-    pub fn restart(&mut self) {
-        self.current_frame = 0;
-        self.frame_timer = 0.0;
-        self.is_playing = true;
-    }
-}
-
-pub fn update_animated_sprites(world: &mut World) {
-    for (_, drawable) in world.query_mut::<&mut Drawable>() {
-        match drawable.kind.borrow_mut() {
-            DrawableKind::AnimatedSprite(sprite) => {
-                update_one_animated_sprite(sprite);
-            }
-            DrawableKind::AnimatedSpriteSet(sprite_set) => {
-                for key in &sprite_set.draw_order {
-                    let sprite = sprite_set.map.get_mut(key).unwrap();
-                    update_one_animated_sprite(sprite);
-                }
-            }
-            _ => {}
-        }
-    }
-}
-
-pub fn update_one_animated_sprite(sprite: &mut AnimatedSprite) {
-    let dt = get_frame_time();
-
-    if !sprite.is_deactivated && sprite.is_playing {
-        let (is_last_frame, is_looping) = {
-            let animation = sprite.animations.get(sprite.current_index).unwrap();
-            (
-                sprite.current_frame == animation.frames - 1,
-                animation.is_looping,
-            )
-        };
-
-        if is_last_frame {
-            let queued_action = sprite.queued_action.clone();
-
-            if let Some(action) = queued_action {
-                match action {
-                    QueuedAnimationAction::Play(id) => {
-                        sprite.set_animation(&id, false);
-                        sprite.queued_action = None;
-                    }
-                    QueuedAnimationAction::PlayIndex(index) => {
-                        sprite.set_animation_index(index, false);
-                        sprite.queued_action = None;
-                    }
-                    QueuedAnimationAction::WaitThen(delay, action) => {
-                        sprite.wait_timer += dt;
-                        if sprite.wait_timer >= delay {
-                            sprite.queued_action = Some(*action);
-                            sprite.wait_timer = 0.0;
-                        }
-                    }
-                    QueuedAnimationAction::Deactivate => {
-                        sprite.is_deactivated = true;
-                        sprite.queued_action = None;
-                    }
-                }
-            } else {
-                sprite.is_playing = is_looping;
-            }
-        }
-
-        let (fps, frame_cnt, tweens) = {
-            let animation = sprite.animations.get_mut(sprite.current_index).unwrap();
-            (animation.fps, animation.frames, &mut animation.tweens)
-        };
-
-        if sprite.is_playing {
-            sprite.frame_timer += dt;
-
-            if sprite.frame_timer > 1.0 / fps as f32 {
-                sprite.current_frame += 1;
-                sprite.frame_timer = 0.0;
-            }
-        }
-
-        sprite.current_frame %= frame_cnt;
-
-        for tween in tweens.values_mut() {
-            let mut current = tween.keyframes.first();
-            let mut next = current;
-
-            let len = tween.keyframes.len();
-
-            if len > 0 {
-                'tweens: for i in 1..len {
-                    let keyframe = tween.keyframes.get(i).unwrap();
-
-                    if sprite.current_frame < keyframe.frame {
-                        next = Some(keyframe);
-
-                        break 'tweens;
-                    } else {
-                        current = Some(keyframe);
-                    }
-                }
-            }
-
-            if let Some(current) = current {
-                if let Some(next) = next {
-                    let (frames, progress) = if current.frame <= next.frame {
-                        let frames = next.frame - current.frame + 1;
-                        let progress = sprite.current_frame - current.frame + 1;
-
-                        (frames, progress)
-                    } else {
-                        let frames = frame_cnt + next.frame - current.frame;
-                        let progress = if sprite.current_frame < current.frame {
-                            frame_cnt + sprite.current_frame - current.frame
-                        } else {
-                            sprite.current_frame - current.frame + 1
-                        };
-
-                        (frames, progress)
-                    };
-
-                    let factor = progress as f32 / frames as f32;
-
-                    tween.current_translation =
-                        current.translation + (next.translation - current.translation).mul(factor);
-                }
-            }
-        }
-    }
-}
-
-pub fn draw_one_animated_sprite(transform: &Transform, sprite: &AnimatedSprite) {
-    if !sprite.is_deactivated {
-        let position = transform.position + sprite.offset;
-
-        draw_texture_ex(
-            sprite.texture,
-            position.x,
-            position.y,
-            sprite.tint,
-            DrawTextureParams {
-                flip_x: sprite.is_flipped_x,
-                flip_y: sprite.is_flipped_y,
-                rotation: transform.rotation,
-                source: Some(sprite.source_rect()),
-                dest_size: Some(sprite.size()),
-                pivot: sprite.pivot,
-            },
-        )
-    }
-}
-
-pub fn debug_draw_one_animated_sprite(position: Vec2, sprite: &AnimatedSprite) {
-    if !sprite.is_deactivated {
-        let position = position + sprite.offset;
-        let size = sprite.size();
-
-        draw_rectangle_lines(position.x, position.y, size.x, size.y, 2.0, color::BLUE)
-    }
-}
-
-#[derive(Default)]
-pub struct AnimatedSpriteSet {
-    pub draw_order: Vec<String>,
-    pub map: HashMap<String, AnimatedSprite>,
-}
-
-impl AnimatedSpriteSet {
-    pub fn is_empty(&self) -> bool {
-        self.draw_order.is_empty()
-    }
-
-    pub fn size(&self) -> Vec2 {
-        let mut size = Vec2::ZERO;
-
-        for sprite in self.map.values() {
-            let sprite_size = sprite.size();
-
-            if sprite_size.x > size.x {
-                size.x = sprite_size.x;
-            }
-
-            if sprite_size.y > size.y {
-                size.y = sprite_size.y;
-            }
-        }
-
-        size
-    }
-
-    pub fn set_animation(&mut self, sprite_id: &str, id: &str, should_restart: bool) {
-        if let Some(sprite) = self.map.get_mut(sprite_id) {
-            sprite.set_animation(id, should_restart);
-        }
-    }
-
-    pub fn set_animation_index(&mut self, sprite_id: &str, index: usize, should_restart: bool) {
-        if let Some(sprite) = self.map.get_mut(sprite_id) {
-            sprite.set_animation_index(index, should_restart);
-        }
-    }
-
-    pub fn set_queued_action(&mut self, sprite_id: &str, action: QueuedAnimationAction) {
-        if let Some(sprite) = self.map.get_mut(sprite_id) {
-            sprite.queue_action(action);
-        }
-    }
-
-    pub fn set_all(&mut self, id: &str, should_restart: bool) {
-        for sprite in self.map.values_mut() {
-            sprite.set_animation(id, should_restart);
-        }
-    }
-
-    pub fn set_all_to_index(&mut self, index: usize, should_restart: bool) {
-        for sprite in self.map.values_mut() {
-            sprite.set_animation_index(index, should_restart);
-        }
-    }
-
-    pub fn queue_action_on_all(&mut self, action: QueuedAnimationAction) {
-        for sprite in self.map.values_mut() {
-            sprite.queue_action(action.clone());
-        }
-    }
-
-    pub fn restart_all(&mut self) {
-        for sprite in self.map.values_mut() {
-            sprite.restart();
-        }
-    }
-
-    pub fn flip_all_x(&mut self, state: bool) {
-        for sprite in self.map.values_mut() {
-            sprite.is_flipped_x = state;
-        }
-    }
-
-    pub fn flip_all_y(&mut self, state: bool) {
-        for sprite in self.map.values_mut() {
-            sprite.is_flipped_y = state;
-        }
-    }
-
-    pub fn activate_all(&mut self) {
-        for sprite in self.map.values_mut() {
-            sprite.is_deactivated = false;
-        }
-    }
-
-    pub fn deactivate_all(&mut self) {
-        for sprite in self.map.values_mut() {
-            sprite.is_deactivated = true;
-        }
-    }
-
-    pub fn play_all(&mut self) {
-        for sprite in self.map.values_mut() {
-            sprite.is_playing = true;
-        }
-    }
-
-    pub fn stop_all(&mut self) {
-        for sprite in self.map.values_mut() {
-            sprite.is_playing = false;
-        }
-    }
-}
-
-impl From<&[(&str, AnimatedSprite)]> for AnimatedSpriteSet {
-    fn from(sprites: &[(&str, AnimatedSprite)]) -> Self {
-        let draw_order = sprites.iter().map(|&(k, _)| k.to_string()).collect();
-
-        let map = HashMap::from_iter(
-            sprites
-                .iter()
-                .map(|(id, sprite)| (id.to_string(), sprite.clone())),
-        );
-
-        AnimatedSpriteSet { draw_order, map }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct AnimationMetadata {
-    pub id: String,
-    pub row: u32,
-    pub frames: u32,
-    pub fps: u32,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub tweens: Vec<TweenMetadata>,
-    #[serde(default)]
-    pub is_looping: bool,
-}
-
-impl From<AnimationMetadata> for MQAnimation {
-    fn from(a: AnimationMetadata) -> Self {
-        MQAnimation {
-            name: a.id,
-            row: a.row,
-            frames: a.frames,
-            fps: a.fps,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TweenMetadata {
-    pub id: String,
-    pub keyframes: Vec<Keyframe>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct AnimatedSpriteMetadata {
-    #[serde(rename = "texture")]
-    pub texture_id: String,
-    #[serde(default)]
-    pub scale: Option<f32>,
-    #[serde(default, with = "core::json::vec2_def")]
-    pub offset: Vec2,
-    #[serde(
-        default,
-        with = "core::json::vec2_opt",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub pivot: Option<Vec2>,
-    #[serde(
-        default,
-        with = "core::json::color_opt",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub tint: Option<Color>,
-    pub animations: Vec<AnimationMetadata>,
-    #[serde(default)]
-    pub autoplay_id: Option<String>,
-    #[serde(default)]
-    pub is_deactivated: bool,
-}
diff --git a/src/drawables/mod.rs b/src/drawables/mod.rs
deleted file mode 100644
index 4c3388253a..0000000000
--- a/src/drawables/mod.rs
+++ /dev/null
@@ -1,203 +0,0 @@
-mod animated_sprite;
-mod sprite;
-
-pub use animated_sprite::*;
-pub use sprite::*;
-use std::borrow::{Borrow, BorrowMut};
-
-use macroquad::prelude::*;
-
-use hecs::World;
-
-use core::Transform;
-
-/// This is a wrapper type for all the different types of drawable sprites, used so that we can
-/// access them all in one query and draw them, ordered, in one pass, according to `draw_order`.
-pub struct Drawable {
-    /// This is used to specify draw order on a sprite
-    /// This will be used, primarily, by `Player` to draw equipped items in the right order, relative
-    /// to its own sprite. This is done by multiplying the player id by ten and adding whatever offset
-    /// is required to this number, to order it relative to other sprites controlled by this specific
-    /// `Player` component.
-    pub draw_order: u32,
-    pub kind: DrawableKind,
-}
-
-impl Drawable {
-    pub fn new_sprite(draw_order: u32, texture_id: &str, params: SpriteParams) -> Self {
-        let sprite = Sprite::new(texture_id, params);
-
-        Drawable {
-            draw_order,
-            kind: DrawableKind::Sprite(sprite),
-        }
-    }
-
-    pub fn new_sprite_set(draw_order: u32, sprites: &[(&str, Sprite)]) -> Self {
-        let sprite_set = SpriteSet::from(sprites);
-
-        Drawable {
-            draw_order,
-            kind: DrawableKind::SpriteSet(sprite_set),
-        }
-    }
-
-    pub fn new_animated_sprite(
-        draw_order: u32,
-        texture_id: &str,
-        animations: &[Animation],
-        params: AnimatedSpriteParams,
-    ) -> Self {
-        let sprite = AnimatedSprite::new(texture_id, animations, params);
-
-        Drawable {
-            draw_order,
-            kind: DrawableKind::AnimatedSprite(sprite),
-        }
-    }
-
-    pub fn new_animated_sprite_set(draw_order: u32, sprites: &[(&str, AnimatedSprite)]) -> Self {
-        let sprite_set = AnimatedSpriteSet::from(sprites);
-
-        Drawable {
-            draw_order,
-            kind: DrawableKind::AnimatedSpriteSet(sprite_set),
-        }
-    }
-
-    pub fn get_sprite(&self) -> Option<&Sprite> {
-        match self.kind.borrow() {
-            DrawableKind::Sprite(sprite) => Some(sprite),
-            _ => None,
-        }
-    }
-
-    pub fn get_sprite_mut(&mut self) -> Option<&mut Sprite> {
-        match self.kind.borrow_mut() {
-            DrawableKind::Sprite(sprite) => Some(sprite),
-            _ => None,
-        }
-    }
-
-    pub fn get_sprite_set(&self) -> Option<&SpriteSet> {
-        match self.kind.borrow() {
-            DrawableKind::SpriteSet(sprite_set) => Some(sprite_set),
-            _ => None,
-        }
-    }
-
-    pub fn get_sprite_set_mut(&mut self) -> Option<&mut SpriteSet> {
-        match self.kind.borrow_mut() {
-            DrawableKind::SpriteSet(sprite_set) => Some(sprite_set),
-            _ => None,
-        }
-    }
-
-    pub fn get_animated_sprite(&self) -> Option<&AnimatedSprite> {
-        match self.kind.borrow() {
-            DrawableKind::AnimatedSprite(sprite) => Some(sprite),
-            _ => None,
-        }
-    }
-
-    pub fn get_animated_sprite_mut(&mut self) -> Option<&mut AnimatedSprite> {
-        match self.kind.borrow_mut() {
-            DrawableKind::AnimatedSprite(sprite) => Some(sprite),
-            _ => None,
-        }
-    }
-
-    pub fn get_animated_sprite_set(&self) -> Option<&AnimatedSpriteSet> {
-        match self.kind.borrow() {
-            DrawableKind::AnimatedSpriteSet(sprite_set) => Some(sprite_set),
-            _ => None,
-        }
-    }
-
-    pub fn get_animated_sprite_set_mut(&mut self) -> Option<&mut AnimatedSpriteSet> {
-        match self.kind.borrow_mut() {
-            DrawableKind::AnimatedSpriteSet(sprite_set) => Some(sprite_set),
-            _ => None,
-        }
-    }
-}
-
-pub enum DrawableKind {
-    Sprite(Sprite),
-    SpriteSet(SpriteSet),
-    AnimatedSprite(AnimatedSprite),
-    AnimatedSpriteSet(AnimatedSpriteSet),
-}
-
-pub fn draw_drawables(world: &mut World) {
-    let mut ordered = world
-        .query_mut::<&Drawable>()
-        .into_iter()
-        .map(|(e, drawable)| (e, drawable.draw_order))
-        .collect::<Vec<_>>();
-
-    ordered.sort_by(|&(_, a), &(_, b)| a.cmp(&b));
-
-    for e in ordered.into_iter().map(|(e, _)| e) {
-        let transform = world.get_mut::<Transform>(e).unwrap();
-        let mut drawable = world.get_mut::<Drawable>(e).unwrap();
-
-        match drawable.kind.borrow_mut() {
-            DrawableKind::Sprite(sprite) => {
-                draw_one_sprite(&transform, sprite);
-            }
-            DrawableKind::SpriteSet(sprite_set) => {
-                for id in sprite_set.draw_order.iter() {
-                    let sprite = sprite_set.map.get(id).unwrap();
-                    draw_one_sprite(&transform, sprite);
-                }
-            }
-            DrawableKind::AnimatedSprite(sprite) => {
-                draw_one_animated_sprite(&transform, sprite);
-            }
-            DrawableKind::AnimatedSpriteSet(sprite_set) => {
-                for id in sprite_set.draw_order.iter() {
-                    let sprite = sprite_set.map.get(id).unwrap();
-                    draw_one_animated_sprite(&transform, sprite);
-                }
-            }
-        }
-    }
-}
-
-pub fn debug_draw_drawables(world: &mut World) {
-    let mut ordered = world
-        .query_mut::<&Drawable>()
-        .into_iter()
-        .map(|(e, drawable)| (e, drawable.draw_order))
-        .collect::<Vec<_>>();
-
-    ordered.sort_by(|&(_, a), &(_, b)| a.cmp(&b));
-
-    for e in ordered.into_iter().map(|(e, _)| e) {
-        let position = world.get_mut::<Transform>(e).map(|t| t.position).unwrap();
-
-        let drawable = world.get_mut::<Drawable>(e).unwrap();
-
-        match drawable.kind.borrow() {
-            DrawableKind::Sprite(sprite) => {
-                debug_draw_one_sprite(position, sprite);
-            }
-            DrawableKind::SpriteSet(sprite_set) => {
-                for id in sprite_set.draw_order.iter() {
-                    let sprite = sprite_set.map.get(id).unwrap();
-                    debug_draw_one_sprite(position, sprite);
-                }
-            }
-            DrawableKind::AnimatedSprite(sprite) => {
-                debug_draw_one_animated_sprite(position, sprite);
-            }
-            DrawableKind::AnimatedSpriteSet(sprite_set) => {
-                for id in sprite_set.draw_order.iter() {
-                    let sprite = sprite_set.map.get(id).unwrap();
-                    debug_draw_one_animated_sprite(position, sprite);
-                }
-            }
-        }
-    }
-}
diff --git a/src/drawables/sprite.rs b/src/drawables/sprite.rs
deleted file mode 100644
index 7d7b5490cb..0000000000
--- a/src/drawables/sprite.rs
+++ /dev/null
@@ -1,280 +0,0 @@
-use std::collections::HashMap;
-use std::iter::FromIterator;
-use std::ops::Div;
-
-use macroquad::color;
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-use core::Transform;
-
-use crate::Resources;
-
-/// Parameters for `Sprite` component.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SpriteMetadata {
-    /// The id of the texture that will be used
-    #[serde(rename = "texture")]
-    pub texture_id: String,
-    /// The sprites index in the sprite sheet
-    #[serde(default)]
-    pub index: usize,
-    /// This is a scale factor that the sprite size will be multiplied by before draw
-    #[serde(default)]
-    pub scale: Option<f32>,
-    /// The offset of the drawn sprite, relative to the position provided as an argument to the
-    /// `Sprite` draw method.
-    /// Note that this offset will not be inverted if the sprite is flipped.
-    #[serde(default, with = "core::json::vec2_def")]
-    pub offset: Vec2,
-    /// The pivot of the sprite, relative to the position provided as an argument to the `Sprite`
-    /// draw method, plus any offset.
-    /// Note that this offset will not be inverted if the sprite is flipped.
-    #[serde(
-        default,
-        with = "core::json::vec2_opt",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub pivot: Option<Vec2>,
-    /// The size of the drawn sprite. If no size is specified, the texture entry's `sprite_size`
-    /// will be used, if specified, or the raw texture size, if not.
-    #[serde(
-        default,
-        with = "core::json::vec2_opt",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub size: Option<Vec2>,
-    /// An optional color to blend with the texture color
-    #[serde(
-        default,
-        with = "core::json::color_opt",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub tint: Option<Color>,
-    /// If this is true, the sprite will not be drawn.
-    #[serde(default)]
-    pub is_deactivated: bool,
-}
-
-impl Default for SpriteMetadata {
-    fn default() -> Self {
-        SpriteMetadata {
-            texture_id: "".to_string(),
-            index: 0,
-            scale: None,
-            offset: Vec2::ZERO,
-            pivot: None,
-            size: None,
-            tint: None,
-            is_deactivated: false,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Sprite {
-    pub texture: Texture2D,
-    pub source_rect: Rect,
-    pub tint: Color,
-    pub scale: f32,
-    pub offset: Vec2,
-    pub pivot: Option<Vec2>,
-    pub is_flipped_x: bool,
-    pub is_flipped_y: bool,
-    pub is_deactivated: bool,
-}
-
-impl Sprite {
-    pub fn new(texture_id: &str, params: SpriteParams) -> Self {
-        let texture_res = {
-            let resources = storage::get::<Resources>();
-            resources
-                .textures
-                .get(texture_id)
-                .cloned()
-                .unwrap_or_else(|| panic!("Sprite: Invalid texture ID '{}'", texture_id))
-        };
-
-        let sprite_size = params
-            .sprite_size
-            .unwrap_or_else(|| texture_res.frame_size());
-
-        let source_rect = {
-            let grid_size = texture_res.meta.size.div(sprite_size).as_u32();
-
-            {
-                let frame_cnt = (grid_size.x * grid_size.y) as usize;
-                assert!(
-                    params.index < frame_cnt,
-                    "Sprite: index '{}' exceeds total frame count '{}'",
-                    params.index,
-                    frame_cnt
-                );
-            }
-
-            let position = vec2(
-                (params.index as u32 % grid_size.x) as f32 * sprite_size.x,
-                (params.index as u32 / grid_size.x) as f32 * sprite_size.y,
-            );
-
-            Rect::new(position.x, position.y, sprite_size.x, sprite_size.y)
-        };
-
-        let tint = params.tint.unwrap_or(color::WHITE);
-
-        Sprite {
-            texture: texture_res.texture,
-            source_rect,
-            tint,
-            scale: params.scale,
-            offset: params.offset,
-            pivot: params.pivot,
-            is_flipped_x: params.is_flipped_x,
-            is_flipped_y: params.is_flipped_y,
-            is_deactivated: params.is_deactivated,
-        }
-    }
-
-    pub fn size(&self) -> Vec2 {
-        self.source_rect.size() * self.scale
-    }
-
-    pub fn set_scale(&mut self, scale: f32) {
-        self.scale = scale;
-    }
-}
-
-#[derive(Clone)]
-pub struct SpriteParams {
-    pub sprite_size: Option<Vec2>,
-    pub index: usize,
-    pub scale: f32,
-    pub offset: Vec2,
-    pub pivot: Option<Vec2>,
-    pub size: Option<Vec2>,
-    pub tint: Option<Color>,
-    pub is_flipped_x: bool,
-    pub is_flipped_y: bool,
-    pub is_deactivated: bool,
-}
-
-impl Default for SpriteParams {
-    fn default() -> Self {
-        SpriteParams {
-            sprite_size: None,
-            index: 0,
-            scale: 1.0,
-            offset: Vec2::ZERO,
-            pivot: None,
-            size: None,
-            tint: None,
-            is_flipped_x: false,
-            is_flipped_y: false,
-            is_deactivated: false,
-        }
-    }
-}
-
-impl From<SpriteMetadata> for SpriteParams {
-    fn from(meta: SpriteMetadata) -> Self {
-        SpriteParams {
-            index: meta.index,
-            scale: meta.scale.unwrap_or(1.0),
-            offset: meta.offset,
-            pivot: meta.pivot,
-            size: meta.size,
-            tint: meta.tint,
-            is_deactivated: meta.is_deactivated,
-            ..Default::default()
-        }
-    }
-}
-
-pub fn draw_one_sprite(transform: &Transform, sprite: &Sprite) {
-    if !sprite.is_deactivated {
-        let size = sprite.size();
-
-        draw_texture_ex(
-            sprite.texture,
-            transform.position.x + sprite.offset.x,
-            transform.position.y + sprite.offset.y,
-            sprite.tint,
-            DrawTextureParams {
-                flip_x: sprite.is_flipped_x,
-                flip_y: sprite.is_flipped_y,
-                rotation: transform.rotation,
-                source: Some(sprite.source_rect),
-                dest_size: Some(size),
-                pivot: sprite.pivot,
-            },
-        );
-    }
-}
-
-pub fn debug_draw_one_sprite(position: Vec2, sprite: &Sprite) {
-    if !sprite.is_deactivated {
-        let size = sprite.size();
-
-        draw_rectangle_lines(
-            position.x + sprite.offset.x,
-            position.y + sprite.offset.y,
-            size.x,
-            size.y,
-            2.0,
-            color::BLUE,
-        )
-    }
-}
-
-#[derive(Debug)]
-pub struct SpriteSet {
-    pub draw_order: Vec<String>,
-    pub map: HashMap<String, Sprite>,
-}
-
-impl From<&[(&str, Sprite)]> for SpriteSet {
-    fn from(sprites: &[(&str, Sprite)]) -> Self {
-        let draw_order = sprites.iter().map(|(id, _)| id.to_string()).collect();
-
-        let map = HashMap::from_iter(
-            sprites
-                .iter()
-                .map(|(id, sprite)| (id.to_string(), sprite.clone())),
-        );
-
-        SpriteSet { draw_order, map }
-    }
-}
-
-impl SpriteSet {
-    pub fn is_empty(&self) -> bool {
-        self.draw_order.is_empty()
-    }
-
-    pub fn flip_all_x(&mut self, state: bool) {
-        for sprite in self.map.values_mut() {
-            sprite.is_flipped_x = state;
-        }
-    }
-
-    pub fn flip_all_y(&mut self, state: bool) {
-        for sprite in self.map.values_mut() {
-            sprite.is_flipped_y = state;
-        }
-    }
-
-    pub fn activate_all(&mut self) {
-        for sprite in self.map.values_mut() {
-            sprite.is_deactivated = false;
-        }
-    }
-
-    pub fn deactivate_all(&mut self) {
-        for sprite in self.map.values_mut() {
-            sprite.is_deactivated = true;
-        }
-    }
-}
diff --git a/src/ecs.rs b/src/ecs.rs
deleted file mode 100644
index 1be6ae683a..0000000000
--- a/src/ecs.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use hecs::{Entity, World};
-
-pub type SystemFn = fn(&mut World);
-
-/// This is used as a component to signify ownership
-pub struct Owner(pub Entity);
-
-/// Placeholder until we implement threading
-#[derive(Default)]
-pub struct SchedulerBuilder {
-    steps: Vec<SystemFn>,
-}
-
-impl SchedulerBuilder {
-    #[must_use]
-    pub fn with_system(self, system: SystemFn) -> Self {
-        let mut steps = self.steps;
-        steps.push(system);
-
-        SchedulerBuilder { steps }
-    }
-
-    pub fn add_system(&mut self, system: SystemFn) -> &mut Self {
-        self.steps.push(system);
-        self
-    }
-
-    #[must_use]
-    pub fn with_thread_local(self, system: SystemFn) -> Self {
-        let mut steps = self.steps;
-        steps.push(system);
-
-        SchedulerBuilder { steps }
-    }
-
-    pub fn add_thread_local(&mut self, system: SystemFn) -> &mut Self {
-        self.steps.push(system);
-        self
-    }
-
-    pub fn build(self) -> Scheduler {
-        Scheduler { steps: self.steps }
-    }
-}
-
-/// Placeholder until we implement threading
-pub struct Scheduler {
-    steps: Vec<SystemFn>,
-}
-
-impl Scheduler {
-    pub fn builder() -> SchedulerBuilder {
-        SchedulerBuilder::default()
-    }
-
-    pub fn execute(&mut self, world: &mut World) {
-        for f in &mut self.steps {
-            f(world);
-        }
-    }
-}
diff --git a/src/editor/actions.rs b/src/editor/actions.rs
deleted file mode 100644
index 2fedf59f93..0000000000
--- a/src/editor/actions.rs
+++ /dev/null
@@ -1,1299 +0,0 @@
-use std::any::TypeId;
-use std::cmp::Ordering;
-
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-
-use core::error::{Error, ErrorKind, Result};
-
-use crate::editor::gui::windows::Window;
-use crate::map::{MapBackgroundLayer, MapObject, MapObjectKind};
-use crate::{
-    map::{Map, MapLayer, MapLayerKind, MapTile, MapTileset},
-    Resources,
-};
-
-/// These are all the actions available for the GUI and other sub-systems of the editor.
-/// If you need to perform multiple actions in one call, use the `Batch` variant.
-#[derive(Debug, Clone)]
-pub enum EditorAction {
-    Batch(Vec<EditorAction>),
-    Undo,
-    Redo,
-    SelectTool(Option<TypeId>),
-    OpenBackgroundPropertiesWindow,
-    UpdateBackground {
-        color: Color,
-        layers: Vec<MapBackgroundLayer>,
-    },
-    OpenCreateLayerWindow,
-    OpenCreateTilesetWindow,
-    OpenTilesetPropertiesWindow(String),
-    OpenCreateObjectWindow {
-        position: Vec2,
-        layer_id: String,
-    },
-    OpenObjectPropertiesWindow {
-        layer_id: String,
-        index: usize,
-    },
-    OpenTilePropertiesWindow {
-        layer_id: String,
-        index: usize,
-    },
-    CloseWindow(TypeId),
-    SelectTile {
-        id: u32,
-        tileset_id: String,
-    },
-    UpdateTileAttributes {
-        index: usize,
-        layer_id: String,
-        attributes: Vec<String>,
-    },
-    SelectLayer(String),
-    SetLayerDrawOrderIndex {
-        id: String,
-        index: usize,
-    },
-    CreateLayer {
-        id: String,
-        kind: MapLayerKind,
-        has_collision: bool,
-        index: Option<usize>,
-    },
-    DeleteLayer(String),
-    UpdateLayer {
-        id: String,
-        is_visible: bool,
-    },
-    SelectTileset(String),
-    OpenImportWindow(usize),
-    Import {
-        tilesets: Vec<MapTileset>,
-        background_color: Option<Color>,
-        background_layers: Vec<MapBackgroundLayer>,
-    },
-    CreateTileset {
-        id: String,
-        texture_id: String,
-    },
-    DeleteTileset(String),
-    UpdateTileset {
-        id: String,
-        texture_id: String,
-        autotile_mask: Vec<bool>,
-    },
-    SelectObject {
-        index: usize,
-        layer_id: String,
-    },
-    CreateObject {
-        id: String,
-        kind: MapObjectKind,
-        position: Vec2,
-        layer_id: String,
-    },
-    DeleteObject {
-        index: usize,
-        layer_id: String,
-    },
-    UpdateObject {
-        layer_id: String,
-        index: usize,
-        id: String,
-        kind: MapObjectKind,
-        position: Vec2,
-    },
-    CreateSpawnPoint(Vec2),
-    DeleteSpawnPoint(usize),
-    MoveSpawnPoint {
-        index: usize,
-        position: Vec2,
-    },
-    PlaceTile {
-        id: u32,
-        layer_id: String,
-        tileset_id: String,
-        coords: UVec2,
-    },
-    RemoveTile {
-        layer_id: String,
-        coords: UVec2,
-    },
-    CreateMap {
-        name: String,
-        description: Option<String>,
-        tile_size: Vec2,
-        grid_size: UVec2,
-    },
-    OpenCreateMapWindow,
-    OpenMap(usize),
-    OpenLoadMapWindow,
-    SaveMap {
-        name: Option<String>,
-        is_user_map: Option<bool>,
-    },
-    OpenSaveMapWindow,
-    DeleteMap(usize),
-    ExitToMainMenu,
-    QuitToDesktop,
-}
-
-impl EditorAction {
-    pub fn batch(actions: &[EditorAction]) -> Self {
-        Self::Batch(actions.to_vec())
-    }
-
-    pub fn close_window<T: Window + ?Sized + 'static>() -> Self {
-        let id = TypeId::of::<T>();
-        EditorAction::CloseWindow(id)
-    }
-
-    pub fn then(self, action: EditorAction) -> Self {
-        Self::batch(&[self, action])
-    }
-}
-
-/// All actions that modify map data should implement this trait
-pub trait UndoableAction {
-    fn apply(&mut self, _map: &mut Map) -> Result<()>;
-
-    fn undo(&mut self, _map: &mut Map) -> Result<()>;
-
-    fn redo(&mut self, map: &mut Map) -> Result<()> {
-        self.apply(map)
-    }
-
-    /// Implement this for actions that can be redundant (ie. no change will take place if it is applied).
-    /// This is to avoid history being filled up with repeat actions if user is holding input down
-    /// for a long time, for example.
-    /// This should not be used to circumvent bugs and errors, however. It is meant to stop the same
-    /// action from firing several times in a row, for example from holding mouse down on the map
-    /// (placing multiple tiles, with the same id, to the same coords).
-    /// Edge cases, like an action wanting to delete a layer that does not exist, should be handled
-    /// with errors, in stead (basically, things like that shouldn't happen, as it should be prevented
-    /// at a higher level)
-    fn is_redundant(&self, _map: &Map) -> bool {
-        false
-    }
-}
-
-#[derive(Debug)]
-pub struct UpdateBackgroundAction {
-    color: Color,
-    old_color: Option<Color>,
-    layers: Vec<MapBackgroundLayer>,
-    old_layers: Option<Vec<MapBackgroundLayer>>,
-}
-
-impl UpdateBackgroundAction {
-    pub fn new(color: Color, layers: Vec<MapBackgroundLayer>) -> Self {
-        UpdateBackgroundAction {
-            color,
-            old_color: None,
-            layers,
-            old_layers: None,
-        }
-    }
-}
-
-impl UndoableAction for UpdateBackgroundAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        self.old_color = Some(map.background_color);
-
-        map.background_color = self.color;
-
-        self.old_layers = Some(map.background_layers.clone());
-
-        map.background_layers = self.layers.clone();
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(color) = self.old_color.take() {
-            map.background_color = color;
-        } else {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"UpdateBackgroundPropertiesAction (Undo): No old background color was found. Undo was probably called on an action that was never applied"));
-        }
-
-        if let Some(layers) = self.old_layers.take() {
-            map.background_layers = layers;
-        } else {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"UpdateBackgroundPropertiesAction (Undo): No old background layers was found. Undo was probably called on an action that was never applied"));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct SetLayerDrawOrderIndexAction {
-    id: String,
-    draw_order_index: usize,
-    old_draw_order_index: Option<usize>,
-}
-
-impl SetLayerDrawOrderIndexAction {
-    pub fn new(id: String, draw_order_index: usize) -> Self {
-        SetLayerDrawOrderIndexAction {
-            id,
-            draw_order_index,
-            old_draw_order_index: None,
-        }
-    }
-}
-
-impl UndoableAction for SetLayerDrawOrderIndexAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        for i in 0..map.draw_order.len() {
-            let id = map.draw_order.get(i).unwrap();
-            if id == &self.id {
-                self.old_draw_order_index = Some(i);
-                map.draw_order.remove(i);
-                break;
-            }
-        }
-
-        if self.old_draw_order_index.is_none() {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"SetLayerDrawOrderIndexAction: Could not find the specified layer in the map draw order array"));
-        }
-
-        if self.draw_order_index > map.draw_order.len() {
-            map.draw_order.push(self.id.clone());
-        } else {
-            map.draw_order
-                .insert(self.draw_order_index, self.id.clone());
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if map.draw_order.remove(self.draw_order_index) != self.id {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"SetLayerDrawOrderIndexAction (Undo): There was a mismatch between the layer id found in at the specified draw order index and the id stored in the action"));
-        }
-
-        if let Some(i) = self.old_draw_order_index {
-            if i > map.draw_order.len() {
-                map.draw_order.push(self.id.clone());
-            } else {
-                map.draw_order.insert(i, self.id.clone());
-            }
-        } else {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"SetLayerDrawOrderIndexAction (Undo): No old draw order index was found. Undo was probably called on an action that was never applied"));
-        }
-
-        Ok(())
-    }
-
-    fn is_redundant(&self, map: &Map) -> bool {
-        for i in 0..map.draw_order.len() {
-            let id = map.draw_order.get(i).unwrap();
-            if id == &self.id && i == self.draw_order_index {
-                return true;
-            }
-        }
-
-        false
-    }
-}
-
-#[derive(Debug)]
-pub struct UpdateTileAttributesAction {
-    index: usize,
-    layer_id: String,
-    attributes: Vec<String>,
-    old_attributes: Option<Vec<String>>,
-}
-
-impl UpdateTileAttributesAction {
-    pub fn new(index: usize, layer_id: String, attributes: Vec<String>) -> Self {
-        UpdateTileAttributesAction {
-            index,
-            layer_id,
-            attributes,
-            old_attributes: None,
-        }
-    }
-}
-
-impl UndoableAction for UpdateTileAttributesAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            if let Some(Some(tile)) = layer.tiles.get_mut(self.index) {
-                self.old_attributes = Some(tile.attributes.clone());
-                tile.attributes = self.attributes.clone();
-            } else {
-                return Err(Error::new_const(
-                    ErrorKind::EditorAction,
-                    &"UpdateTileAttributesAction: The specified tile does not exist",
-                ));
-            }
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"UpdateTileAttributesAction: The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            if let Some(Some(tile)) = layer.tiles.get_mut(self.index) {
-                if let Some(old_attributes) = self.old_attributes.take() {
-                    tile.attributes = old_attributes;
-                } else {
-                    return Err(Error::new_const(ErrorKind::EditorAction, &"UpdateTileAttributesAction (Undo): No old attributes stored in action. Undo was probably called on an action that was never applied"));
-                }
-            } else {
-                return Err(Error::new_const(
-                    ErrorKind::EditorAction,
-                    &"UpdateTileAttributesAction (Undo): The specified tile does not exist",
-                ));
-            }
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"UpdateTileAttributesAction (Undo): The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn is_redundant(&self, map: &Map) -> bool {
-        if let Some(layer) = map.layers.get(&self.layer_id) {
-            if let Some(Some(tile)) = layer.tiles.get(self.index) {
-                let matching = tile
-                    .attributes
-                    .iter()
-                    .zip(&self.attributes)
-                    .filter(|&(a, b)| a == b)
-                    .count();
-                return matching == self.attributes.len();
-            }
-        }
-
-        false
-    }
-}
-
-#[derive(Debug)]
-pub struct CreateLayerAction {
-    id: String,
-    kind: MapLayerKind,
-    has_collision: bool,
-    index: Option<usize>,
-}
-
-impl CreateLayerAction {
-    pub fn new(id: String, kind: MapLayerKind, has_collision: bool, index: Option<usize>) -> Self {
-        CreateLayerAction {
-            id,
-            kind,
-            has_collision,
-            index,
-        }
-    }
-}
-
-impl UndoableAction for CreateLayerAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if map.layers.contains_key(&self.id) {
-            let len = map.draw_order.len();
-            for i in 0..len {
-                let id = map.draw_order.get(i).unwrap();
-                if id == &self.id {
-                    map.draw_order.remove(i);
-                    break;
-                }
-            }
-        }
-
-        let layer = MapLayer::new(&self.id, self.kind, self.has_collision, map.grid_size);
-        map.layers.insert(self.id.clone(), layer);
-
-        if let Some(i) = self.index {
-            if i <= map.draw_order.len() {
-                map.draw_order.insert(i, self.id.clone());
-
-                return Ok(());
-            }
-        }
-
-        map.draw_order.push(self.id.clone());
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if map.layers.remove(&self.id).is_none() {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"CreateLayerAction (Undo): The specified layer does not exist",
-            ));
-        }
-
-        if let Some(i) = self.index {
-            let id = map.draw_order.remove(i);
-            if id != self.id {
-                return Err(Error::new_const(ErrorKind::EditorAction, &"CreateLayerAction (Undo): There is a mismatch between the actions layer id and the one found at the actions draw order index"));
-            }
-        } else {
-            map.draw_order.retain(|id| id != &self.id);
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct DeleteLayerAction {
-    id: String,
-    layer: Option<MapLayer>,
-    draw_order_index: Option<usize>,
-}
-
-impl DeleteLayerAction {
-    pub fn new(id: String) -> Self {
-        DeleteLayerAction {
-            id,
-            layer: None,
-            draw_order_index: None,
-        }
-    }
-}
-
-impl UndoableAction for DeleteLayerAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.remove(&self.id) {
-            self.layer = Some(layer);
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"DeleteLayerAction: The specified layer does not exist",
-            ));
-        }
-
-        let len = map.draw_order.len();
-        for i in 0..len {
-            let layer_id = map.draw_order.get(i).unwrap();
-            if layer_id == &self.id {
-                map.draw_order.remove(i);
-                self.draw_order_index = Some(i);
-                break;
-            }
-        }
-
-        if self.draw_order_index.is_none() {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"DeleteLayerAction: The specified layer was not found in the draw order array",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = self.layer.take() {
-            map.layers.insert(self.id.clone(), layer);
-            if let Some(i) = self.draw_order_index {
-                if i >= map.draw_order.len() {
-                    map.draw_order.push(self.id.clone());
-                } else {
-                    map.draw_order.insert(i, self.id.clone());
-                }
-            } else {
-                return Err(Error::new_const(ErrorKind::EditorAction, &"DeleteLayerAction (Undo): No draw order index stored in action. Undo was probably called on an action that was never applied"));
-            }
-        } else {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"DeleteLayerAction (Undo): No layer stored in action. Undo was probably called on an action that was never applied"));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct UpdateLayerAction {
-    id: String,
-    is_visible: bool,
-    old_is_visible: Option<bool>,
-}
-
-impl UpdateLayerAction {
-    pub fn new(id: String, is_visible: bool) -> Self {
-        UpdateLayerAction {
-            id,
-            is_visible,
-            old_is_visible: None,
-        }
-    }
-}
-
-impl UndoableAction for UpdateLayerAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.get_mut(&self.id) {
-            self.old_is_visible = Some(layer.is_visible);
-            layer.is_visible = self.is_visible;
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"UpdateLayerAction: The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.get_mut(&self.id) {
-            if let Some(old_is_visible) = self.old_is_visible.take() {
-                layer.is_visible = old_is_visible;
-            } else {
-                return Err(Error::new_const(ErrorKind::EditorAction, &"UpdateLayerAction (Undo): No `old_is_visible` on action. Undo was probably called on an action that was never applied"));
-            }
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"UpdateLayerAction (Undo): The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct ImportAction {
-    tilesets: Vec<MapTileset>,
-    background_color: Option<Color>,
-    old_background_color: Option<Color>,
-    background_layers: Vec<MapBackgroundLayer>,
-    old_background_layers: Vec<MapBackgroundLayer>,
-}
-
-impl ImportAction {
-    pub fn new(
-        tilesets: Vec<MapTileset>,
-        background_color: Option<Color>,
-        background_layers: Vec<MapBackgroundLayer>,
-    ) -> Self {
-        ImportAction {
-            tilesets,
-            background_color,
-            old_background_color: None,
-            background_layers,
-            old_background_layers: Vec::new(),
-        }
-    }
-}
-
-impl UndoableAction for ImportAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        for tileset in &self.tilesets {
-            let mut first_tile_id = 1;
-            for tileset in map.tilesets.values() {
-                let next_tile_id = tileset.first_tile_id + tileset.tile_cnt;
-                if next_tile_id > first_tile_id {
-                    first_tile_id = next_tile_id;
-                }
-            }
-
-            let tileset = MapTileset {
-                id: tileset.id.clone(),
-                texture_id: tileset.texture_id.clone(),
-                texture_size: tileset.texture_size,
-                tile_size: tileset.tile_size,
-                grid_size: tileset.grid_size,
-                first_tile_id,
-                tile_cnt: tileset.tile_cnt,
-                tile_subdivisions: tileset.tile_subdivisions,
-                autotile_mask: tileset.autotile_mask.clone(),
-                tile_attributes: tileset.tile_attributes.clone(),
-                properties: tileset.properties.clone(),
-                bitmasks: None,
-            };
-
-            map.tilesets.insert(tileset.id.clone(), tileset);
-        }
-
-        if let Some(background_color) = self.background_color {
-            self.old_background_color = Some(map.background_color);
-            map.background_color = background_color;
-        }
-
-        self.old_background_layers = map.background_layers.clone();
-
-        map.background_layers
-            .append(&mut self.background_layers.clone());
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        for tileset in &self.tilesets {
-            if map.tilesets.remove(&tileset.id).is_none() {
-                return Err(Error::new_const(ErrorKind::EditorAction, &"ImportTilesetsAction (Undo): One of the imported tilesets could not be found in the map"));
-            }
-        }
-
-        if let Some(background_color) = self.old_background_color.take() {
-            map.background_color = background_color;
-        }
-
-        map.background_layers = self.old_background_layers.drain(..).collect();
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct CreateTilesetAction {
-    id: String,
-    texture_id: String,
-}
-
-impl CreateTilesetAction {
-    pub fn new(id: String, texture_id: String) -> Self {
-        CreateTilesetAction { id, texture_id }
-    }
-}
-
-impl UndoableAction for CreateTilesetAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        let resources = storage::get::<Resources>();
-        if let Some(texture_entry) = resources.textures.get(&self.texture_id).cloned() {
-            let texture_size = uvec2(
-                texture_entry.texture.width() as u32,
-                texture_entry.texture.height() as u32,
-            );
-
-            let mut first_tile_id = 1;
-            for tileset in map.tilesets.values() {
-                let next_tile_id = tileset.first_tile_id + tileset.tile_cnt;
-                if next_tile_id > first_tile_id {
-                    first_tile_id = next_tile_id;
-                }
-            }
-
-            let tileset = MapTileset::new(
-                &self.id,
-                &self.texture_id,
-                texture_size,
-                map.tile_size,
-                first_tile_id,
-            );
-
-            map.tilesets.insert(self.id.clone(), tileset);
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"CreateTilesetAction: The specified texture does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if map.tilesets.remove(&self.id).is_none() {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"CreateTilesetAction (Undo): The specified tileset does not exist. Undo was probably called on an action that was never applied"));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct DeleteTilesetAction {
-    id: String,
-    tileset: Option<MapTileset>,
-}
-
-impl DeleteTilesetAction {
-    pub fn new(id: String) -> Self {
-        DeleteTilesetAction { id, tileset: None }
-    }
-}
-
-impl UndoableAction for DeleteTilesetAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(tileset) = map.tilesets.remove(&self.id) {
-            self.tileset = Some(tileset);
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"DeleteTilesetAction: The specified tileset does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(tileset) = self.tileset.take() {
-            map.tilesets.insert(self.id.clone(), tileset);
-        } else {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"DeleteTilesetAction (Undo): No tileset stored in action. Undo was probably called on an action that was never applied"));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct UpdateTilesetAction {
-    id: String,
-    texture_id: String,
-    old_texture_id: Option<String>,
-    autotile_mask: Vec<bool>,
-    old_autotile_mask: Option<Vec<bool>>,
-}
-
-impl UpdateTilesetAction {
-    pub fn new(id: String, texture_id: String, autotile_mask: Vec<bool>) -> Self {
-        UpdateTilesetAction {
-            id,
-            texture_id,
-            old_texture_id: None,
-            autotile_mask,
-            old_autotile_mask: None,
-        }
-    }
-}
-
-impl UndoableAction for UpdateTilesetAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(tileset) = map.tilesets.get_mut(&self.id) {
-            self.old_texture_id = Some(tileset.texture_id.clone());
-            tileset.texture_id = self.texture_id.clone();
-
-            if self.autotile_mask.len() != tileset.autotile_mask.len() {
-                return Err(Error::new_const(ErrorKind::EditorAction, &"UpdateTilesetAction: There is a size mismatch between the actions autotile mask vector and the one on the tileset"));
-            }
-
-            self.old_autotile_mask = Some(tileset.autotile_mask.clone());
-            tileset.autotile_mask = self.autotile_mask.clone();
-
-            tileset.bitmasks = tileset.get_bitmasks();
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"UpdateTilesetAction: The specified tileset does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(tileset) = map.tilesets.get_mut(&self.id) {
-            if let Some(old_texture_id) = &self.old_texture_id {
-                tileset.texture_id = old_texture_id.clone();
-            } else {
-                return Err(Error::new_const(ErrorKind::EditorAction, &"UpdateTilesetAction (Undo): No old texture id stored in action. Undo was probably called on an action that was never applied"));
-            }
-
-            if let Some(old_autotile_mask) = &self.old_autotile_mask {
-                if old_autotile_mask.len() != tileset.autotile_mask.len() {
-                    return Err(Error::new_const(ErrorKind::EditorAction, &"UpdateTilesetAction (Undo): There is a size mismatch between the actions autotile mask vector and the one on the tileset"));
-                }
-
-                tileset.autotile_mask = old_autotile_mask.clone();
-                self.old_autotile_mask = None;
-            } else {
-                return Err(Error::new_const(ErrorKind::EditorAction, &"UpdateTilesetAction (Undo): No old autotile mask stored in action. Undo was probably called on an action that was never applied"));
-            }
-
-            tileset.bitmasks = tileset.get_bitmasks();
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"UpdateTilesetAction (Undo): The specified tileset does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct CreateObjectAction {
-    id: String,
-    kind: MapObjectKind,
-    position: Vec2,
-    layer_id: String,
-}
-
-impl CreateObjectAction {
-    pub fn new(id: String, kind: MapObjectKind, position: Vec2, layer_id: String) -> Self {
-        CreateObjectAction {
-            id,
-            kind,
-            position,
-            layer_id,
-        }
-    }
-}
-
-impl UndoableAction for CreateObjectAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            let object = MapObject::new(&self.id, self.kind, self.position);
-
-            layer.objects.insert(0, object);
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"CreateObjectAction: The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            layer.objects.remove(0);
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"CreateObjectAction (Undo): The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct DeleteObjectAction {
-    index: usize,
-    layer_id: String,
-    object: Option<MapObject>,
-}
-
-impl DeleteObjectAction {
-    pub fn new(index: usize, layer_id: String) -> Self {
-        DeleteObjectAction {
-            index,
-            layer_id,
-            object: None,
-        }
-    }
-}
-
-impl UndoableAction for DeleteObjectAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            let object = layer.objects.remove(self.index);
-            self.object = Some(object);
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"DeleteObjectAction: The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(object) = self.object.take() {
-            if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-                layer.objects.insert(self.index, object);
-            } else {
-                return Err(Error::new_const(
-                    ErrorKind::EditorAction,
-                    &"DeleteObjectAction (Undo): The specified layer does not exist",
-                ));
-            }
-        } else {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"DeleteObjectAction (Undo): No object stored in action. Undo was probably called on an action that was never applied"));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct UpdateObjectAction {
-    layer_id: String,
-    index: usize,
-    id: String,
-    kind: MapObjectKind,
-    position: Vec2,
-    object: Option<MapObject>,
-}
-
-impl UpdateObjectAction {
-    pub fn new(
-        layer_id: String,
-        index: usize,
-        id: String,
-        kind: MapObjectKind,
-        position: Vec2,
-    ) -> Self {
-        UpdateObjectAction {
-            layer_id,
-            index,
-            id,
-            kind,
-            position,
-            object: None,
-        }
-    }
-}
-
-impl UndoableAction for UpdateObjectAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            if let Some(object) = layer.objects.get_mut(self.index) {
-                self.object = Some(object.clone());
-
-                object.id = self.id.clone();
-                object.kind = self.kind;
-                object.position = self.position;
-            } else {
-                return Err(Error::new_const(
-                    ErrorKind::EditorAction,
-                    &"UpdateObjectAction: The specified object index does not exist",
-                ));
-            }
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"UpdateObjectAction: The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            if let Some(object) = self.object.take() {
-                layer.objects[self.index] = object;
-            } else {
-                return Err(Error::new_const(ErrorKind::EditorAction, &"UpdateObjectAction: No object found on action. Undo was probably called on an action that was never applied"));
-            }
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"UpdateObjectAction (Undo): The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct CreateSpawnPointAction {
-    position: Vec2,
-}
-
-impl CreateSpawnPointAction {
-    pub fn new(position: Vec2) -> Self {
-        CreateSpawnPointAction { position }
-    }
-}
-
-impl UndoableAction for CreateSpawnPointAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        map.spawn_points.push(self.position);
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        map.spawn_points.pop();
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct DeleteSpawnPointAction {
-    index: usize,
-    spawn_point: Option<Vec2>,
-}
-
-impl DeleteSpawnPointAction {
-    pub fn new(index: usize) -> Self {
-        DeleteSpawnPointAction {
-            index,
-            spawn_point: None,
-        }
-    }
-}
-
-impl UndoableAction for DeleteSpawnPointAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        let spawn_point = map.spawn_points.remove(self.index);
-        self.spawn_point = Some(spawn_point);
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(spawn_point) = self.spawn_point.take() {
-            if self.index >= map.spawn_points.len() {
-                map.spawn_points.push(spawn_point);
-            } else {
-                map.spawn_points.insert(self.index, spawn_point);
-            }
-        } else {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"DeleteSpawnPointAction (Undo): No spawn point saved in action. Undo was probably called on an action that was never applied"));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct MoveSpawnPointAction {
-    index: usize,
-    position: Vec2,
-    old_position: Option<Vec2>,
-}
-
-impl MoveSpawnPointAction {
-    pub fn new(index: usize, position: Vec2) -> Self {
-        MoveSpawnPointAction {
-            index,
-            position,
-            old_position: None,
-        }
-    }
-}
-
-impl UndoableAction for MoveSpawnPointAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        let old_position = map.spawn_points.remove(self.index);
-        self.old_position = Some(old_position);
-
-        match map.spawn_points.len().cmp(&self.index) {
-            Ordering::Equal => map.spawn_points.push(self.position),
-            Ordering::Greater => map.spawn_points.insert(self.index, self.position),
-            _ => {
-                return Err(Error::new_const(
-                    ErrorKind::EditorAction,
-                    &"MoveSpawnPointAction: Index out of bounds",
-                ))
-            }
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(old_position) = self.old_position {
-            map.spawn_points[self.index] = old_position;
-        } else {
-            return Err(Error::new_const(ErrorKind::EditorAction, &"MoveSpawnPointAction (Undo): No old position saved in action. Undo was probably called on an action that was never applied"));
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-pub struct PlaceTileAction {
-    id: u32,
-    layer_id: String,
-    tileset_id: String,
-    coords: UVec2,
-    replaced_tile: Option<MapTile>,
-}
-
-impl PlaceTileAction {
-    pub fn new(id: u32, layer_id: String, tileset_id: String, coords: UVec2) -> Self {
-        PlaceTileAction {
-            id,
-            layer_id,
-            tileset_id,
-            coords,
-            replaced_tile: None,
-        }
-    }
-}
-
-impl UndoableAction for PlaceTileAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(tileset) = map.tilesets.get(&self.tileset_id) {
-            let texture_id = tileset.texture_id.clone();
-            let texture_coords = tileset.get_texture_coords(self.id);
-
-            let i = map.to_index(self.coords);
-
-            if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-                if let MapLayerKind::TileLayer = layer.kind {
-                    self.replaced_tile = layer.tiles.remove(i);
-
-                    let tile = MapTile {
-                        tile_id: self.id,
-                        tileset_id: self.tileset_id.clone(),
-                        texture_id,
-                        texture_coords,
-                        attributes: vec![],
-                    };
-
-                    layer.tiles.insert(i, Some(tile));
-                } else {
-                    return Err(Error::new_const(
-                        ErrorKind::EditorAction,
-                        &"PlaceTileAction: The specified layer is not a tile layer",
-                    ));
-                }
-            } else {
-                return Err(Error::new_const(
-                    ErrorKind::EditorAction,
-                    &"PlaceTileAction: The specified layer does not exist",
-                ));
-            }
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"PlaceTileAction: The specified tileset does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        let i = map.to_index(self.coords);
-
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            if let MapLayerKind::TileLayer = layer.kind {
-                if layer.tiles.get(i).is_none() {
-                    return Err(Error::new_const(ErrorKind::EditorAction, &"PlaceTileAction (Undo): No tile at the specified coords, in the specified layer. Undo was probably called on an action that was never applied"));
-                }
-
-                if let Some(tile) = self.replaced_tile.take() {
-                    layer.tiles[i] = Some(tile);
-                } else {
-                    layer.tiles[i] = None;
-                }
-            } else {
-                return Err(Error::new_const(
-                    ErrorKind::EditorAction,
-                    &"PlaceTileAction (Undo): The specified layer is not a tile layer",
-                ));
-            }
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"PlaceTileAction (Undo): The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn is_redundant(&self, map: &Map) -> bool {
-        if let Some(layer) = map.layers.get(&self.layer_id) {
-            let i = map.to_index(self.coords);
-            if let Some(Some(tile)) = layer.tiles.get(i) {
-                return tile.tileset_id == self.tileset_id && tile.tile_id == self.id;
-            }
-        }
-
-        false
-    }
-}
-
-#[derive(Debug)]
-pub struct RemoveTileAction {
-    layer_id: String,
-    coords: UVec2,
-    tile: Option<MapTile>,
-}
-
-impl RemoveTileAction {
-    pub fn new(layer_id: String, coords: UVec2) -> Self {
-        RemoveTileAction {
-            layer_id,
-            coords,
-            tile: None,
-        }
-    }
-}
-
-impl UndoableAction for RemoveTileAction {
-    fn apply(&mut self, map: &mut Map) -> Result<()> {
-        let i = map.to_index(self.coords);
-
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            if let MapLayerKind::TileLayer = layer.kind {
-                if let Some(tile) = layer.tiles.remove(i) {
-                    self.tile = Some(tile);
-
-                    layer.tiles.insert(i, None);
-                } else {
-                    return Err(Error::new_const(ErrorKind::EditorAction, &"RemoveTileAction: No tile at the specified coords, in the specified layer. Undo was probably called on an action that was never applied"));
-                }
-            } else {
-                return Err(Error::new_const(
-                    ErrorKind::EditorAction,
-                    &"RemoveTileAction: The specified layer is not a tile layer",
-                ));
-            }
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"RemoveTileAction: The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn undo(&mut self, map: &mut Map) -> Result<()> {
-        let i = map.to_index(self.coords);
-
-        if let Some(layer) = map.layers.get_mut(&self.layer_id) {
-            if let MapLayerKind::TileLayer = layer.kind {
-                if let Some(old_tile) = self.tile.take() {
-                    if let Some(tile) = layer.tiles.get_mut(i) {
-                        *tile = Some(old_tile);
-                    } else {
-                        return Err(Error::new_const(ErrorKind::EditorAction, &"RemoveTileAction (Undo): No tile found vec entry in map at the index stored in action (this should not be possible, as the entry should be a `None` if the tile was empty)"));
-                    }
-                } else {
-                    return Err(Error::new_const(ErrorKind::EditorAction, &"RemoveTileAction (Undo): No tile stored in action. Undo was probably called on an action that was never applied"));
-                }
-            } else {
-                return Err(Error::new_const(
-                    ErrorKind::EditorAction,
-                    &"RemoveTileAction (Undo): The specified layer is not a tile layer",
-                ));
-            }
-        } else {
-            return Err(Error::new_const(
-                ErrorKind::EditorAction,
-                &"RemoveTileAction (Undo): The specified layer does not exist",
-            ));
-        }
-
-        Ok(())
-    }
-
-    fn is_redundant(&self, map: &Map) -> bool {
-        let i = map.to_index(self.coords);
-        if let Some(layer) = map.layers.get(&self.layer_id) {
-            if let Some(tile) = layer.tiles.get(i) {
-                return tile.is_none();
-            }
-        }
-
-        false
-    }
-}
diff --git a/src/editor/camera.rs b/src/editor/camera.rs
deleted file mode 100644
index 6cc95bd998..0000000000
--- a/src/editor/camera.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use macroquad::{experimental::scene::RefMut, prelude::*};
-
-pub struct EditorCamera {
-    pub position: Vec2,
-    pub scale: f32,
-}
-
-impl EditorCamera {
-    const FRUSTUM_PADDING: f32 = 64.0;
-    const DEFAULT_SCALE: f32 = 1.0;
-
-    pub fn new(position: Vec2) -> Self {
-        EditorCamera {
-            position,
-            scale: Self::DEFAULT_SCALE,
-        }
-    }
-
-    pub fn get_view_rect(&self) -> Rect {
-        let size = vec2(screen_width() / self.scale, screen_height() / self.scale);
-        let position = self.position - size / 2.0;
-
-        Rect::new(position.x, position.y, size.x, size.y)
-    }
-
-    // This can be used for culling when drawing the map. Not strictly necessary with the small maps in FF
-    pub fn get_padded_frustum(&self) -> Rect {
-        let mut res = self.get_view_rect();
-        res.move_to(res.point() - vec2(Self::FRUSTUM_PADDING, Self::FRUSTUM_PADDING));
-        res.w += Self::FRUSTUM_PADDING * 2.0;
-        res.h += Self::FRUSTUM_PADDING * 2.0;
-        res
-    }
-
-    pub fn to_world_space(&self, position: Vec2) -> Vec2 {
-        let rect = self.get_view_rect();
-        position / self.scale + rect.point()
-    }
-
-    pub fn to_screen_space(&self, position: Vec2) -> Vec2 {
-        let rect = self.get_view_rect();
-        (position - rect.point()) * self.scale
-    }
-}
-
-impl scene::Node for EditorCamera {
-    fn fixed_update(node: RefMut<Self>) {
-        let camera = Some(Camera2D {
-            offset: vec2(0.0, 0.0),
-            target: vec2(node.position.x.round(), node.position.y.round()),
-            zoom: vec2(node.scale / screen_width(), -node.scale / screen_height()) * 2.0,
-            ..Camera2D::default()
-        });
-
-        scene::set_camera(0, camera);
-    }
-}
diff --git a/src/editor/gui/combobox.rs b/src/editor/gui/combobox.rs
deleted file mode 100644
index cba5cd005a..0000000000
--- a/src/editor/gui/combobox.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use macroquad::{
-    prelude::*,
-    ui::{widgets, Id, Ui},
-};
-
-pub trait ComboBoxValue {
-    fn get_index(&self) -> usize;
-
-    fn get_options(&self) -> Vec<String>;
-
-    fn set_index(&mut self, index: usize);
-
-    fn get_value(&self) -> String {
-        self.get_options()
-            .get(self.get_index())
-            .unwrap()
-            .to_string()
-    }
-}
-
-pub struct ComboBoxVec {
-    index: usize,
-    options: Vec<String>,
-}
-
-impl ComboBoxVec {
-    pub fn new(index: usize, options: &[&str]) -> Self {
-        let options = options.iter().map(|s| s.to_string()).collect();
-
-        ComboBoxVec { index, options }
-    }
-
-    pub fn set_value(&mut self, value: &str) {
-        for (i, v) in self.options.iter().enumerate() {
-            if *v == *value {
-                self.index = i;
-            }
-        }
-    }
-}
-
-impl ComboBoxValue for ComboBoxVec {
-    fn set_index(&mut self, index: usize) {
-        self.index = index;
-    }
-
-    fn get_index(&self) -> usize {
-        self.index
-    }
-
-    fn get_options(&self) -> Vec<String> {
-        self.options.clone()
-    }
-}
-
-impl From<&[&str]> for ComboBoxVec {
-    fn from(slice: &[&str]) -> Self {
-        ComboBoxVec::new(0, slice)
-    }
-}
-
-impl From<&[String]> for ComboBoxVec {
-    fn from(slice: &[String]) -> Self {
-        let slice = slice.iter().map(|s| s.as_str()).collect::<Vec<_>>();
-
-        ComboBoxVec::new(0, &slice)
-    }
-}
-
-impl From<&ComboBoxVec> for usize {
-    fn from(v: &ComboBoxVec) -> Self {
-        v.get_index()
-    }
-}
-
-pub struct ComboBoxBuilder {
-    id: Id,
-    label: Option<String>,
-    ratio: Option<f32>,
-}
-
-impl ComboBoxBuilder {
-    pub fn new(id: Id) -> Self {
-        ComboBoxBuilder {
-            id,
-            label: None,
-            ratio: None,
-        }
-    }
-
-    #[must_use]
-    pub fn with_label(self, label: &str) -> Self {
-        ComboBoxBuilder {
-            label: Some(label.to_string()),
-            ..self
-        }
-    }
-
-    #[must_use]
-    pub fn with_ratio(self, ratio: f32) -> Self {
-        ComboBoxBuilder {
-            ratio: Some(ratio),
-            ..self
-        }
-    }
-
-    pub fn build<V: ComboBoxValue>(&self, ui: &mut Ui, value: &mut V) {
-        let mut index = value.get_index();
-
-        let owned = value.get_options();
-        let options = owned.iter().map(String::as_str).collect::<Vec<_>>();
-
-        let mut combobox = widgets::ComboBox::new(self.id, &options);
-
-        if let Some(ratio) = self.ratio {
-            combobox = combobox.ratio(ratio);
-        }
-
-        if let Some(label) = &self.label {
-            combobox = combobox.label(label);
-        }
-
-        combobox.ui(ui, &mut index);
-
-        value.set_index(index);
-    }
-}
diff --git a/src/editor/gui/context_menu.rs b/src/editor/gui/context_menu.rs
deleted file mode 100644
index 3e12041709..0000000000
--- a/src/editor/gui/context_menu.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use super::EditorAction;
-
-use crate::gui::{GuiResources, ELEMENT_MARGIN};
-
-#[derive(Debug, Clone)]
-pub enum ContextMenuEntry {
-    Separator,
-    Action {
-        label: String,
-        action: EditorAction,
-    },
-    SubMenu {
-        label: String,
-        entries: Vec<ContextMenuEntry>,
-        is_open: bool,
-    },
-}
-
-impl ContextMenuEntry {
-    const WIDTH: f32 = 150.0;
-    const ENTRY_HEIGHT: f32 = 25.0;
-
-    pub fn separator() -> Self {
-        ContextMenuEntry::Separator
-    }
-
-    pub fn action(label: &str, action: EditorAction) -> Self {
-        ContextMenuEntry::Action {
-            label: label.to_string(),
-            action,
-        }
-    }
-
-    pub fn sub_menu(label: &str, entries: &[ContextMenuEntry]) -> Self {
-        ContextMenuEntry::SubMenu {
-            label: label.to_string(),
-            entries: entries.to_vec(),
-            is_open: false,
-        }
-    }
-
-    fn get_height(&self) -> f32 {
-        if let Self::Separator = self {
-            return ELEMENT_MARGIN;
-        }
-
-        Self::ENTRY_HEIGHT
-    }
-
-    fn contains(&self, position: Vec2, point: Vec2) -> bool {
-        let rect = Rect::new(position.x, position.y, Self::WIDTH, self.get_height());
-        if rect.contains(point) {
-            return true;
-        }
-
-        if let Self::SubMenu {
-            entries, is_open, ..
-        } = self
-        {
-            if *is_open {
-                let mut position = vec2(position.x + Self::WIDTH, position.y);
-                position = get_corrected_position(position, entries, false);
-
-                for entry in entries {
-                    if entry.contains(position, point) {
-                        return true;
-                    }
-
-                    position.y += entry.get_height();
-                }
-            }
-        }
-
-        false
-    }
-}
-
-pub struct ContextMenu {
-    entries: Vec<ContextMenuEntry>,
-    position: Vec2,
-}
-
-impl ContextMenu {
-    pub fn new(position: Vec2, entries: &[ContextMenuEntry]) -> Self {
-        let entries = entries.to_vec();
-        let position = get_corrected_position(position, &entries, true);
-
-        ContextMenu { entries, position }
-    }
-
-    pub fn get_size(&self) -> Vec2 {
-        let mut height = 0.0;
-        for entry in &self.entries {
-            height += entry.get_height();
-        }
-
-        vec2(ContextMenuEntry::WIDTH, height)
-    }
-
-    pub fn contains(&self, point: Vec2) -> bool {
-        let mut position = self.position;
-        for entry in &self.entries {
-            if entry.contains(position, point) {
-                return true;
-            }
-
-            position.y += entry.get_height();
-        }
-
-        false
-    }
-
-    pub fn draw(&mut self, ui: &mut Ui) -> Option<EditorAction> {
-        let gui_resources = storage::get::<GuiResources>();
-        ui.push_skin(&gui_resources.skins.context_menu);
-
-        let res = draw_entries(ui, self.position, &mut self.entries);
-
-        ui.pop_skin();
-
-        res
-    }
-}
-
-fn get_corrected_position(position: Vec2, entries: &[ContextMenuEntry], is_root: bool) -> Vec2 {
-    let mut height = 0.0;
-
-    for entry in entries {
-        height += entry.get_height();
-    }
-
-    let screen_width = screen_width();
-    let screen_height = screen_height();
-
-    let x = if is_root {
-        position
-            .x
-            .clamp(0.0, screen_width - ContextMenuEntry::WIDTH)
-    } else if position.x + ContextMenuEntry::WIDTH > screen_width {
-        position.x - ContextMenuEntry::WIDTH * 2.0
-    } else {
-        position.x
-    };
-
-    let y = position.y.clamp(0.0, screen_height - height);
-
-    vec2(x, y)
-}
-
-fn draw_entries(
-    ui: &mut Ui,
-    position: Vec2,
-    entries: &mut [ContextMenuEntry],
-) -> Option<EditorAction> {
-    let mut res = None;
-
-    let mut size = vec2(ContextMenuEntry::WIDTH, 0.0);
-    for entry in &mut *entries {
-        size.y += entry.get_height();
-    }
-
-    let mut sub_menus = Vec::new();
-
-    widgets::Group::new(hash!(), size)
-        .position(position)
-        .ui(ui, |ui| {
-            let mut y_offset = 0.0;
-
-            for entry in entries {
-                let size = vec2(ContextMenuEntry::WIDTH, entry.get_height());
-                let entry_position = vec2(0.0, y_offset);
-
-                match entry {
-                    ContextMenuEntry::Separator => {
-                        widgets::Group::new(hash!(), size)
-                            .position(entry_position)
-                            .ui(ui, |_ui| {
-                                // TODO: Draw texture
-                            });
-                    }
-                    ContextMenuEntry::Action { label, action } => {
-                        let button = widgets::Button::new("")
-                            .position(entry_position)
-                            .size(size)
-                            .ui(ui);
-
-                        ui.label(entry_position, label);
-
-                        if button {
-                            res = Some(action.clone());
-                        }
-                    }
-                    ContextMenuEntry::SubMenu {
-                        label,
-                        entries,
-                        is_open,
-                    } => {
-                        let button = widgets::Button::new("")
-                            .position(entry_position)
-                            .size(size)
-                            .ui(ui);
-
-                        ui.label(entry_position, label);
-
-                        {
-                            let suffix = if *is_open { "<" } else { ">" };
-                            let suffix_width = ui.calc_size(suffix).x;
-                            let position =
-                                vec2(entry_position.x + size.x - suffix_width, entry_position.y);
-                            ui.label(position, suffix);
-                        }
-
-                        if button {
-                            *is_open = !*is_open;
-                        }
-
-                        if *is_open {
-                            let position = position
-                                + vec2(
-                                    entry_position.x + ContextMenuEntry::WIDTH,
-                                    entry_position.y,
-                                );
-                            sub_menus.push((position, entries));
-                        }
-                    }
-                }
-
-                y_offset += size.y;
-            }
-        });
-
-    for (position, entries) in sub_menus {
-        let position = get_corrected_position(position, entries, false);
-        res = draw_entries(ui, position, entries);
-    }
-
-    res
-}
diff --git a/src/editor/gui/editor_menu.rs b/src/editor/gui/editor_menu.rs
deleted file mode 100644
index d7f951c312..0000000000
--- a/src/editor/gui/editor_menu.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use crate::editor::EditorContext;
-use macroquad::{
-    prelude::*,
-    ui::{hash, Ui},
-};
-
-use crate::gui::{Menu, MenuEntry, MenuResult};
-
-const MENU_WIDTH: f32 = 300.0;
-
-pub const EDITOR_MENU_RESULT_NEW: usize = 0;
-pub const EDITOR_MENU_RESULT_OPEN_IMPORT: usize = 1;
-pub const EDITOR_MENU_RESULT_SAVE: usize = 2;
-pub const EDITOR_MENU_RESULT_SAVE_AS: usize = 3;
-pub const EDITOR_MENU_RESULT_MAIN_MENU: usize = 4;
-pub const EDITOR_MENU_RESULT_QUIT: usize = 5;
-
-static mut EDITOR_MENU_INSTANCE: Option<Menu> = None;
-
-pub fn open_editor_menu(ctx: &EditorContext) {
-    unsafe {
-        if EDITOR_MENU_INSTANCE.is_none() {
-            let menu = Menu::new(
-                hash!(),
-                MENU_WIDTH,
-                &[
-                    MenuEntry {
-                        index: EDITOR_MENU_RESULT_NEW,
-                        title: "New".to_string(),
-                        ..Default::default()
-                    },
-                    MenuEntry {
-                        index: EDITOR_MENU_RESULT_OPEN_IMPORT,
-                        title: "Open/Import".to_string(),
-                        ..Default::default()
-                    },
-                    MenuEntry {
-                        index: EDITOR_MENU_RESULT_SAVE,
-                        title: "Save".to_string(),
-                        is_disabled: !ctx.is_user_map && !cfg!(debug_assertions),
-                        ..Default::default()
-                    },
-                    MenuEntry {
-                        index: EDITOR_MENU_RESULT_SAVE_AS,
-                        title: "Save As".to_string(),
-                        ..Default::default()
-                    },
-                    MenuEntry {
-                        index: EDITOR_MENU_RESULT_MAIN_MENU,
-                        title: "Main Menu".to_string(),
-                        ..Default::default()
-                    },
-                    MenuEntry {
-                        index: EDITOR_MENU_RESULT_QUIT,
-                        title: "Quit".to_string(),
-                        ..Default::default()
-                    },
-                ],
-            );
-
-            EDITOR_MENU_INSTANCE = Some(menu);
-        }
-    }
-}
-
-pub fn close_editor_menu() {
-    unsafe { EDITOR_MENU_INSTANCE = None };
-}
-
-pub fn draw_editor_menu(ui: &mut Ui, ctx: &EditorContext) -> Option<MenuResult> {
-    let menu = unsafe {
-        if EDITOR_MENU_INSTANCE.is_none() {
-            open_editor_menu(ctx);
-        }
-
-        EDITOR_MENU_INSTANCE.as_mut().unwrap()
-    };
-
-    let res = menu.ui(ui);
-
-    if res.is_some() {
-        close_editor_menu();
-    }
-
-    res
-}
-
-pub fn is_editor_menu_open() -> bool {
-    unsafe { EDITOR_MENU_INSTANCE.is_some() }
-}
-
-/// Toggle editor menu and return state after toggle
-pub fn toggle_editor_menu(ctx: &EditorContext) -> bool {
-    if is_editor_menu_open() {
-        close_editor_menu();
-        false
-    } else {
-        open_editor_menu(ctx);
-        true
-    }
-}
diff --git a/src/editor/gui/mod.rs b/src/editor/gui/mod.rs
deleted file mode 100644
index 45fc38630c..0000000000
--- a/src/editor/gui/mod.rs
+++ /dev/null
@@ -1,353 +0,0 @@
-use std::{any::TypeId, collections::HashMap};
-
-pub mod context_menu;
-pub mod toolbars;
-pub mod windows;
-
-pub mod combobox;
-
-mod editor_menu;
-
-pub use combobox::{ComboBoxBuilder, ComboBoxValue};
-
-pub use editor_menu::{
-    close_editor_menu, draw_editor_menu, is_editor_menu_open, open_editor_menu, toggle_editor_menu,
-    EDITOR_MENU_RESULT_MAIN_MENU, EDITOR_MENU_RESULT_NEW, EDITOR_MENU_RESULT_OPEN_IMPORT,
-    EDITOR_MENU_RESULT_QUIT, EDITOR_MENU_RESULT_SAVE, EDITOR_MENU_RESULT_SAVE_AS,
-};
-
-use macroquad::{
-    experimental::collections::storage,
-    hash,
-    prelude::*,
-    ui::{root_ui, widgets},
-};
-
-use super::{EditorAction, EditorCamera, EditorContext};
-
-use crate::{
-    gui::{GuiResources, ELEMENT_MARGIN},
-    map::Map,
-};
-
-pub use toolbars::{
-    LayerListElement, ObjectListElement, TilesetDetailsElement, TilesetListElement,
-    ToolSelectorElement, Toolbar, ToolbarElement, ToolbarElementParams, ToolbarPosition,
-};
-
-pub use windows::{
-    ConfirmDialog, CreateLayerWindow, CreateObjectWindow, CreateTilesetWindow,
-    TilesetPropertiesWindow, Window, WINDOW_BUTTON_MAX_WIDTH, WINDOW_BUTTON_MIN_WIDTH,
-};
-
-use crate::gui::{BUTTON_FONT_SIZE, BUTTON_MARGIN_V, WINDOW_MARGIN_H, WINDOW_MARGIN_V};
-use crate::map::MapLayerKind;
-use context_menu::{ContextMenu, ContextMenuEntry};
-
-#[derive(Debug, Default, Clone)]
-pub struct ButtonParams {
-    pub label: &'static str,
-    // This should be an absolute width for window and a width factor for toolbar elements.
-    // Permitted width factors for toolbar element buttons are 0.25 and 0.5.
-    pub width_override: Option<f32>,
-    // This holds the action that will be applied on click.
-    // Setting this to `None` will disable the button.
-    pub action: Option<EditorAction>,
-}
-
-pub struct EditorGui {
-    left_toolbar: Option<Toolbar>,
-    right_toolbar: Option<Toolbar>,
-    open_windows: HashMap<TypeId, Box<dyn Window>>,
-    context_menu: Option<ContextMenu>,
-}
-
-impl EditorGui {
-    pub const LEFT_TOOLBAR_WIDTH: f32 = 82.0;
-    pub const RIGHT_TOOLBAR_WIDTH: f32 = 250.0;
-
-    pub const TOOL_SELECTOR_HEIGHT_FACTOR: f32 = 0.5;
-    pub const LAYER_LIST_HEIGHT_FACTOR: f32 = 0.3;
-    pub const TILESET_LIST_HEIGHT_FACTOR: f32 = 0.2;
-    pub const TILESET_DETAILS_HEIGHT_FACTOR: f32 = 0.5;
-    pub const OBJECT_LIST_HEIGHT_FACTOR: f32 = 0.7;
-
-    pub fn new() -> Self {
-        EditorGui {
-            left_toolbar: None,
-            right_toolbar: None,
-            open_windows: HashMap::new(),
-            context_menu: None,
-        }
-    }
-
-    pub fn add_toolbar(&mut self, toolbar: Toolbar) {
-        match toolbar.position {
-            ToolbarPosition::Left => {
-                self.left_toolbar = Some(toolbar);
-            }
-            ToolbarPosition::Right => {
-                self.right_toolbar = Some(toolbar);
-            }
-        }
-    }
-
-    #[must_use]
-    pub fn with_toolbar(self, toolbar: Toolbar) -> Self {
-        let mut gui = self;
-        gui.add_toolbar(toolbar);
-        gui
-    }
-
-    pub fn context_menu_contains(&self, position: Vec2) -> bool {
-        if let Some(context_menu) = &self.context_menu {
-            if context_menu.contains(position) {
-                return true;
-            }
-        }
-
-        false
-    }
-
-    pub fn contains(&self, position: Vec2) -> bool {
-        if self.context_menu_contains(position) {
-            return true;
-        }
-
-        if let Some(left_toolbar) = &self.left_toolbar {
-            if left_toolbar.contains(position) {
-                return true;
-            }
-        }
-
-        if let Some(right_toolbar) = &self.right_toolbar {
-            if right_toolbar.contains(position) {
-                return true;
-            }
-        }
-
-        for window in self.open_windows.values() {
-            if window.contains(position) {
-                return true;
-            }
-        }
-
-        false
-    }
-
-    pub fn open_context_menu(&mut self, position: Vec2, map: &Map, ctx: EditorContext) {
-        let mut entries = vec![
-            ContextMenuEntry::action("Undo", EditorAction::Undo),
-            ContextMenuEntry::action("Redo", EditorAction::Redo),
-        ];
-
-        let object_world_position = scene::find_node_by_type::<EditorCamera>()
-            .unwrap()
-            .to_world_space(position);
-
-        if let Some(layer_id) = &ctx.selected_layer {
-            let layer = &map.layers.get(layer_id).unwrap();
-            if layer.kind == MapLayerKind::ObjectLayer {
-                entries.push(ContextMenuEntry::action(
-                    "Create Object",
-                    EditorAction::OpenCreateObjectWindow {
-                        position: object_world_position,
-                        layer_id: layer_id.clone(),
-                    },
-                ));
-            }
-        }
-
-        entries.append(&mut vec![
-            ContextMenuEntry::action("Add Layer", EditorAction::OpenCreateLayerWindow),
-            ContextMenuEntry::action("Background", EditorAction::OpenBackgroundPropertiesWindow),
-        ]);
-
-        self.context_menu = Some(ContextMenu::new(position, &entries));
-    }
-
-    pub fn close_context_menu(&mut self) {
-        self.context_menu = None;
-    }
-
-    pub fn add_window<W: Window + 'static>(&mut self, window: W) {
-        let key = TypeId::of::<W>();
-        self.open_windows
-            .entry(key)
-            .or_insert_with(|| Box::new(window));
-    }
-
-    pub fn remove_window<W: Window + 'static>(&mut self) {
-        let key = TypeId::of::<W>();
-        self.open_windows.remove(&key).unwrap();
-    }
-
-    pub fn remove_window_id(&mut self, id: TypeId) {
-        self.open_windows.remove(&id).unwrap();
-    }
-
-    pub fn draw(&mut self, map: &Map, ctx: EditorContext) -> Option<EditorAction> {
-        let mut res = None;
-
-        let ui = &mut root_ui();
-
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.default);
-        }
-
-        if let Some(left_toolbar) = &mut self.left_toolbar {
-            if let Some(action) = left_toolbar.draw(ui, map, &ctx) {
-                res = Some(action);
-            }
-        }
-
-        if let Some(right_toolbar) = &mut self.right_toolbar {
-            if let Some(action) = right_toolbar.draw(ui, map, &ctx) {
-                res = Some(action);
-            }
-        }
-
-        for (id, window) in &mut self.open_windows {
-            let params = window.get_params().clone();
-
-            let position = params.get_absolute_position();
-            let size = params.size;
-
-            widgets::Window::new(hash!(id), position, size)
-                .titlebar(false)
-                .movable(!params.is_static)
-                .ui(ui, |ui| {
-                    let mut content_size =
-                        size - vec2(WINDOW_MARGIN_H * 2.0, WINDOW_MARGIN_V * 2.0);
-
-                    let mut content_position = Vec2::ZERO;
-
-                    if let Some(title) = &params.title {
-                        let gui_resources = storage::get::<GuiResources>();
-                        ui.push_skin(&gui_resources.skins.window_header);
-
-                        ui.label(content_position, title);
-
-                        let label_size = ui.calc_size(title);
-
-                        content_size.y -= label_size.y;
-                        content_position.y += label_size.y;
-
-                        ui.pop_skin();
-                    }
-
-                    let button_height = BUTTON_FONT_SIZE + (BUTTON_MARGIN_V * 2.0);
-
-                    if params.has_buttons {
-                        content_size.y -= button_height + ELEMENT_MARGIN;
-                    }
-
-                    widgets::Group::new(hash!(id, "content"), content_size)
-                        .position(content_position)
-                        .ui(ui, |ui| {
-                            if let Some(action) = window.draw(ui, content_size, map, &ctx) {
-                                res = Some(action);
-                            }
-                        });
-
-                    if params.has_buttons {
-                        let button_area_size = vec2(content_size.x, button_height);
-                        let button_area_position =
-                            vec2(content_position.x, content_position.y + content_size.y);
-
-                        widgets::Group::new(hash!(id, "buttons"), button_area_size)
-                            .position(button_area_position)
-                            .ui(ui, |ui| {
-                                let mut button_position = vec2(ELEMENT_MARGIN, 0.0);
-
-                                let buttons = window.get_buttons(map, &ctx);
-
-                                let button_cnt = buttons.len();
-                                let margins = button_cnt as f32 * ELEMENT_MARGIN;
-                                let width = ((size.x - margins) / button_cnt as f32)
-                                    .clamp(WINDOW_BUTTON_MIN_WIDTH, WINDOW_BUTTON_MAX_WIDTH);
-
-                                let button_size = vec2(width, button_height);
-
-                                for button in buttons {
-                                    if button.action.is_none() {
-                                        let gui_resources = storage::get::<GuiResources>();
-                                        ui.push_skin(&gui_resources.skins.button_disabled);
-                                    }
-
-                                    let was_clicked = widgets::Button::new(button.label)
-                                        .position(button_position)
-                                        .size(button_size)
-                                        .ui(ui);
-
-                                    if button.action.is_some() {
-                                        if was_clicked {
-                                            res = button.action;
-                                        }
-                                    } else {
-                                        ui.pop_skin();
-                                    }
-
-                                    button_position.x += button_size.x + ELEMENT_MARGIN;
-                                }
-                            });
-                    }
-                });
-        }
-
-        if let Some(context_menu) = &mut self.context_menu {
-            if let Some(action) = context_menu.draw(ui) {
-                self.context_menu = None;
-                res = Some(action);
-            }
-        }
-
-        if is_editor_menu_open() {
-            if let Some(menu_res) = draw_editor_menu(ui, &ctx) {
-                close_editor_menu();
-
-                match menu_res.into_usize() {
-                    EDITOR_MENU_RESULT_NEW => {
-                        let action = EditorAction::OpenCreateMapWindow;
-                        res = Some(action);
-                    }
-                    EDITOR_MENU_RESULT_OPEN_IMPORT => {
-                        let action = EditorAction::OpenLoadMapWindow;
-                        res = Some(action);
-                    }
-                    EDITOR_MENU_RESULT_SAVE => {
-                        let action = EditorAction::SaveMap {
-                            name: None,
-                            is_user_map: None,
-                        };
-                        res = Some(action);
-                    }
-                    EDITOR_MENU_RESULT_SAVE_AS => {
-                        let action = EditorAction::OpenSaveMapWindow;
-                        res = Some(action);
-                    }
-                    EDITOR_MENU_RESULT_MAIN_MENU => {
-                        let action = EditorAction::ExitToMainMenu;
-                        res = Some(action);
-                    }
-                    EDITOR_MENU_RESULT_QUIT => {
-                        let action = EditorAction::QuitToDesktop;
-                        res = Some(action);
-                    }
-                    _ => {}
-                }
-            }
-        }
-
-        ui.pop_skin();
-
-        res
-    }
-}
-
-impl Default for EditorGui {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/toolbars/layer_list.rs b/src/editor/gui/toolbars/layer_list.rs
deleted file mode 100644
index f7b68b0815..0000000000
--- a/src/editor/gui/toolbars/layer_list.rs
+++ /dev/null
@@ -1,220 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{widgets, Ui},
-};
-
-use crate::{
-    gui::GuiResources,
-    map::{Map, MapLayerKind},
-    Resources,
-};
-
-use super::{
-    ButtonParams, EditorAction, EditorContext, Toolbar, ToolbarElement, ToolbarElementParams,
-};
-use crate::gui::ELEMENT_MARGIN;
-
-pub struct LayerListElement {
-    params: ToolbarElementParams,
-}
-
-impl LayerListElement {
-    pub fn new() -> Self {
-        let params = ToolbarElementParams {
-            header: Some("Layers".to_string()),
-            has_buttons: true,
-            has_margins: false,
-        };
-
-        LayerListElement { params }
-    }
-}
-
-impl ToolbarElement for LayerListElement {
-    fn get_params(&self) -> &ToolbarElementParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        map: &Map,
-        ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let mut res = None;
-
-        let entry_size = vec2(size.x, Toolbar::LIST_ENTRY_HEIGHT);
-        let mut position = Vec2::ZERO;
-
-        let gui_resources = storage::get::<GuiResources>();
-        ui.push_skin(&gui_resources.skins.list_box);
-
-        for layer_id in &map.draw_order {
-            let layer = map.layers.get(layer_id).unwrap();
-
-            let is_selected = if let Some(selected_id) = &ctx.selected_layer {
-                layer_id == selected_id
-            } else {
-                false
-            };
-
-            if is_selected {
-                ui.push_skin(&gui_resources.skins.list_box_selected);
-            }
-
-            let layer_btn = widgets::Button::new("")
-                .size(entry_size)
-                .position(position)
-                .ui(ui);
-
-            let label = if layer.kind == MapLayerKind::ObjectLayer {
-                format!("(O) {}", layer_id)
-            } else {
-                format!("(T) {}", layer_id)
-            };
-
-            ui.label(position, &label);
-
-            if layer_btn {
-                res = Some(EditorAction::SelectLayer(layer_id.clone()));
-            }
-
-            if is_selected {
-                ui.pop_skin();
-            }
-
-            ui.push_skin(&gui_resources.skins.list_box_no_bg);
-
-            {
-                let texture = {
-                    let resources = storage::get::<Resources>();
-                    if layer.is_visible {
-                        resources.textures.get("visibility_icon").unwrap().texture
-                    } else {
-                        resources
-                            .textures
-                            .get("visibility_off_icon")
-                            .unwrap()
-                            .texture
-                    }
-                };
-
-                let btn_size = vec2(entry_size.y, entry_size.y);
-
-                let btn_position = vec2(position.x + entry_size.x - btn_size.x, position.y);
-
-                let visibility_btn = widgets::Button::new("")
-                    .size(btn_size)
-                    .position(btn_position)
-                    .ui(ui);
-
-                {
-                    let texture_size = {
-                        let height = entry_size.y - ELEMENT_MARGIN;
-                        vec2(height, height)
-                    };
-
-                    let half_margin = ELEMENT_MARGIN / 2.0;
-
-                    let texture_position =
-                        vec2(btn_position.x + half_margin, btn_position.y + half_margin);
-
-                    widgets::Texture::new(texture)
-                        .size(texture_size.x, texture_size.y)
-                        .position(texture_position)
-                        .ui(ui);
-                }
-
-                if visibility_btn {
-                    let action = EditorAction::UpdateLayer {
-                        id: layer_id.clone(),
-                        is_visible: !layer.is_visible,
-                    };
-
-                    res = Some(action);
-                }
-            }
-
-            ui.pop_skin();
-
-            position.y += entry_size.y;
-        }
-
-        ui.pop_skin();
-
-        res
-    }
-
-    fn get_buttons(&self, map: &Map, ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let mut delete_action = None;
-        let mut move_up_action = None;
-        let mut move_down_action = None;
-
-        if let Some(layer_id) = &ctx.selected_layer {
-            let mut index = None;
-
-            {
-                for (i, id) in map.draw_order.iter().enumerate() {
-                    if id == layer_id {
-                        index = Some(i);
-                        break;
-                    }
-                }
-            }
-
-            delete_action = Some(EditorAction::DeleteLayer(layer_id.clone()));
-
-            if let Some(index) = index {
-                if index > 0 {
-                    move_up_action = Some(EditorAction::SetLayerDrawOrderIndex {
-                        id: layer_id.clone(),
-                        index: index - 1,
-                    });
-                }
-
-                if index + 1 < map.draw_order.len() {
-                    move_down_action = Some(EditorAction::SetLayerDrawOrderIndex {
-                        id: layer_id.clone(),
-                        index: index + 1,
-                    });
-                }
-            }
-        }
-
-        res.push(ButtonParams {
-            label: "+",
-            action: Some(EditorAction::OpenCreateLayerWindow),
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "-",
-            action: delete_action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Up",
-            action: move_up_action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Down",
-            action: move_down_action,
-            ..Default::default()
-        });
-
-        res
-    }
-}
-
-impl Default for LayerListElement {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/toolbars/mod.rs b/src/editor/gui/toolbars/mod.rs
deleted file mode 100644
index b0714e9bc4..0000000000
--- a/src/editor/gui/toolbars/mod.rs
+++ /dev/null
@@ -1,333 +0,0 @@
-use std::{any::TypeId, collections::HashMap};
-
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use crate::{
-    gui::{GuiResources, ELEMENT_MARGIN},
-    map::Map,
-};
-
-use super::{ButtonParams, EditorAction, EditorContext};
-
-mod tool_selector;
-
-pub use tool_selector::ToolSelectorElement;
-
-mod layer_list;
-
-pub use layer_list::LayerListElement;
-
-mod tileset_list;
-
-pub use tileset_list::TilesetListElement;
-
-mod tileset_details;
-
-pub use tileset_details::TilesetDetailsElement;
-
-mod object_list;
-
-pub use object_list::ObjectListElement;
-
-#[derive(Debug, Default, Clone)]
-pub struct ToolbarElementParams {
-    header: Option<String>,
-    has_margins: bool,
-    has_buttons: bool,
-}
-
-pub trait ToolbarElement {
-    fn get_params(&self) -> &ToolbarElementParams;
-
-    // The `size` parameter will be the size of the group containing the element
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        map: &Map,
-        ctx: &EditorContext,
-    ) -> Option<EditorAction>;
-
-    // Implement this and set `has_buttons` to true in the `ToolbarElementParams` returned by
-    // `get_params` to add a button bar to the bottom of the element.
-    // There can be no more than four buttons, each represented by a `ButtonParam` struct, in
-    // the `Vec` returned by this method.
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        Vec::new()
-    }
-
-    // This controls whether the element is drawn or not
-    fn is_drawn(&self, _map: &Map, _ctx: &EditorContext) -> bool {
-        true
-    }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub enum ToolbarPosition {
-    Left,
-    Right,
-}
-
-pub struct Toolbar {
-    pub width: f32,
-    pub position: ToolbarPosition,
-    draw_order: Vec<TypeId>,
-    elements: HashMap<TypeId, (f32, Box<dyn ToolbarElement>)>,
-}
-
-impl Toolbar {
-    pub const LIST_ENTRY_HEIGHT: f32 = 25.0;
-
-    pub const BUTTON_HEIGHT: f32 = 25.0;
-
-    pub fn new(position: ToolbarPosition, width: f32) -> Self {
-        Toolbar {
-            position,
-            width,
-            draw_order: Vec::new(),
-            elements: HashMap::new(),
-        }
-    }
-
-    #[must_use]
-    pub fn with_element<E: ToolbarElement + 'static>(self, height_factor: f32, element: E) -> Self {
-        let mut res = self;
-        res.add_element(height_factor, element);
-        res
-    }
-
-    pub fn add_element<E: ToolbarElement + 'static>(&mut self, height_factor: f32, element: E) {
-        let id = TypeId::of::<E>();
-        self.elements.insert(id, (height_factor, Box::new(element)));
-        self.draw_order.push(id);
-    }
-
-    pub fn remove_element<E: ToolbarElement + 'static>(
-        &mut self,
-    ) -> Option<Box<dyn ToolbarElement>> {
-        let id = TypeId::of::<E>();
-        self.draw_order.retain(|other_id| *other_id != id);
-        self.elements.remove(&id).map(|(_, id)| id)
-    }
-
-    pub fn get_rect(&self) -> Rect {
-        let mut offset = 0.0;
-        if self.position == ToolbarPosition::Right {
-            offset += screen_width() - self.width;
-        }
-
-        Rect::new(offset, 0.0, self.width, screen_height())
-    }
-
-    pub fn contains(&self, point: Vec2) -> bool {
-        let rect = self.get_rect();
-        rect.contains(point)
-    }
-
-    pub fn draw(&mut self, ui: &mut Ui, map: &Map, ctx: &EditorContext) -> Option<EditorAction> {
-        let mut res = None;
-
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.toolbar);
-        }
-
-        let mut position = Vec2::ZERO;
-        if self.position == ToolbarPosition::Right {
-            position.x += screen_width() - self.width;
-        }
-
-        let toolbar_id = hash!(self.position);
-        let toolbar_size = vec2(self.width, screen_height());
-
-        widgets::Group::new(toolbar_id, toolbar_size)
-            .position(position)
-            .ui(ui, |ui| {
-                let mut position = Vec2::ZERO;
-
-                {
-                    let gui_resources = storage::get::<GuiResources>();
-                    ui.push_skin(&gui_resources.skins.toolbar_bg);
-                    widgets::Button::new("")
-                        .position(position)
-                        .size(toolbar_size)
-                        .ui(ui);
-                    ui.pop_skin();
-                }
-
-                for element_id in &self.draw_order {
-                    let (height_factor, element) = self
-                        .elements
-                        .get_mut(element_id)
-                        .map(|(height_factor, element)| (*height_factor, element))
-                        .unwrap();
-
-                    if element.is_drawn(map, ctx) {
-                        let params = element.get_params().clone();
-
-                        let element_id = hash!(toolbar_id, element_id);
-
-                        let element_size = {
-                            let height = screen_height() * height_factor;
-                            vec2(self.width, height)
-                        };
-
-                        let element_position = position;
-                        let mut content_position = element_position;
-                        let mut content_size = element_size;
-
-                        if let Some(header) = &params.header {
-                            let gui_resources = storage::get::<GuiResources>();
-                            ui.push_skin(&gui_resources.skins.toolbar_header_bg);
-
-                            let header_height = ui.calc_size(header).y;
-
-                            {
-                                let size = vec2(toolbar_size.x, header_height);
-
-                                widgets::Button::new("")
-                                    .position(element_position)
-                                    .size(size)
-                                    .ui(ui);
-                                ui.label(element_position, header);
-                            }
-
-                            content_size.y -= header_height;
-                            content_position.y += header_height;
-
-                            ui.pop_skin();
-                        }
-
-                        if params.has_buttons {
-                            content_size.y -= Toolbar::BUTTON_HEIGHT + (ELEMENT_MARGIN * 2.0);
-                        }
-
-                        let margins = vec2(ELEMENT_MARGIN, ELEMENT_MARGIN);
-                        if params.has_margins {
-                            content_size -= vec2(margins.x, margins.y * 2.0);
-                            content_position += margins;
-                        }
-
-                        widgets::Group::new(hash!(element_id, "content"), content_size)
-                            .position(content_position)
-                            .ui(ui, |ui| {
-                                content_size.x -= margins.x;
-                                if let Some(action) = element.draw(ui, content_size, map, ctx) {
-                                    res = Some(action);
-                                }
-                            });
-
-                        if params.has_buttons {
-                            let mut menubar_position =
-                                vec2(element_position.x, content_position.y) + margins;
-                            menubar_position.y += content_size.y;
-
-                            let mut menubar_size = vec2(element_size.x, Toolbar::BUTTON_HEIGHT);
-                            menubar_size.x -= margins.x * 2.0;
-
-                            widgets::Group::new(hash!(element_id, "menubar"), menubar_size)
-                                .position(menubar_position)
-                                .ui(ui, |ui| {
-                                    {
-                                        let gui_resources = storage::get::<GuiResources>();
-                                        ui.push_skin(&gui_resources.skins.toolbar_button);
-                                    }
-
-                                    let buttons = element.get_buttons(map, ctx);
-
-                                    let button_cnt = buttons.len().clamp(0, 4);
-
-                                    if button_cnt > 0 {
-                                        let mut button_position = Vec2::ZERO;
-
-                                        let total_width =
-                                            menubar_size.x - (margins.x * (button_cnt - 1) as f32);
-
-                                        let mut overrides = 0;
-                                        let mut total_override_factor = 0.0;
-                                        for i in 0..button_cnt {
-                                            let button = buttons.get(i).unwrap();
-                                            if let Some(width_factor) = button.width_override {
-                                                total_override_factor +=
-                                                    to_corrected_button_width_factor(width_factor);
-                                                overrides += 1;
-                                            }
-                                        }
-
-                                        let auto_width = {
-                                            let remaining_buttons = button_cnt - overrides;
-                                            let remaining_width_factor =
-                                                1.0 - total_override_factor;
-                                            let width_factor =
-                                                remaining_width_factor / remaining_buttons as f32;
-                                            total_width
-                                                * to_corrected_button_width_factor(width_factor)
-                                        };
-
-                                        let mut i = 0;
-                                        for button in buttons {
-                                            let mut button_size =
-                                                vec2(auto_width, Self::BUTTON_HEIGHT);
-                                            if let Some(width_factor) = button.width_override {
-                                                button_size.x = total_width
-                                                    * to_corrected_button_width_factor(
-                                                        width_factor,
-                                                    );
-                                            }
-
-                                            if button.action.is_none() {
-                                                let gui_resources = storage::get::<GuiResources>();
-                                                ui.push_skin(
-                                                    &gui_resources.skins.toolbar_button_disabled,
-                                                );
-                                            }
-
-                                            let was_clicked = widgets::Button::new(button.label)
-                                                .size(button_size)
-                                                .position(button_position)
-                                                .ui(ui);
-
-                                            if button.action.is_some() {
-                                                if was_clicked {
-                                                    res = button.action;
-                                                }
-                                            } else {
-                                                ui.pop_skin();
-                                            }
-
-                                            button_position.x += button_size.x + margins.x;
-
-                                            i += 1;
-
-                                            if i >= button_cnt {
-                                                break;
-                                            }
-                                        }
-                                    }
-
-                                    ui.pop_skin();
-                                });
-                        }
-
-                        position.y += element_size.y;
-                    }
-                }
-            });
-
-        ui.pop_skin();
-
-        res
-    }
-}
-
-fn to_corrected_button_width_factor(width_factor: f32) -> f32 {
-    if width_factor <= 0.25 {
-        0.25
-    } else {
-        0.5
-    }
-}
diff --git a/src/editor/gui/toolbars/object_list.rs b/src/editor/gui/toolbars/object_list.rs
deleted file mode 100644
index b5ea971906..0000000000
--- a/src/editor/gui/toolbars/object_list.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{widgets, Ui},
-};
-
-use super::{
-    EditorAction, EditorContext, GuiResources, Map, Toolbar, ToolbarElement, ToolbarElementParams,
-};
-
-use crate::{
-    editor::{gui::ButtonParams, EditorCamera},
-    map::MapLayerKind,
-};
-
-pub struct ObjectListElement {
-    params: ToolbarElementParams,
-}
-
-impl ObjectListElement {
-    pub fn new() -> Self {
-        let params = ToolbarElementParams {
-            header: Some("Objects".to_string()),
-            has_buttons: true,
-            has_margins: false,
-        };
-
-        ObjectListElement { params }
-    }
-}
-
-impl ToolbarElement for ObjectListElement {
-    fn get_params(&self) -> &ToolbarElementParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        map: &Map,
-        ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let mut res = None;
-
-        let entry_size = vec2(size.x, Toolbar::LIST_ENTRY_HEIGHT);
-        let mut position = Vec2::ZERO;
-
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.list_box);
-        }
-
-        let layer_id = ctx.selected_layer.as_ref().unwrap();
-        let layer = map.layers.get(layer_id).unwrap();
-
-        for (i, object) in layer.objects.iter().enumerate() {
-            let is_selected = if let Some(selected_index) = ctx.selected_object {
-                selected_index == i
-            } else {
-                false
-            };
-
-            if is_selected {
-                let gui_resources = storage::get::<GuiResources>();
-                ui.push_skin(&gui_resources.skins.list_box_selected);
-            }
-
-            let was_clicked = widgets::Button::new("")
-                .size(entry_size)
-                .position(position)
-                .ui(ui);
-
-            ui.label(position, &object.id);
-
-            if was_clicked {
-                res = Some(EditorAction::SelectObject {
-                    index: i,
-                    layer_id: layer_id.clone(),
-                });
-            }
-
-            if is_selected {
-                ui.pop_skin();
-            }
-
-            position.y += entry_size.y;
-        }
-
-        ui.pop_skin();
-
-        res
-    }
-
-    fn get_buttons(&self, map: &Map, ctx: &EditorContext) -> Vec<ButtonParams> {
-        let layer_id = ctx.selected_layer.clone().unwrap();
-
-        let position = {
-            let camera = scene::find_node_by_type::<EditorCamera>().unwrap();
-            let view_rect = camera.get_view_rect();
-            let offset = vec2(view_rect.w, view_rect.h) / 2.0;
-            (view_rect.point() + offset) - map.world_offset
-        };
-
-        let create_action = Some(EditorAction::OpenCreateObjectWindow {
-            layer_id: layer_id.clone(),
-            position,
-        });
-
-        let mut delete_action = None;
-        let mut properties_action = None;
-
-        if let Some(index) = ctx.selected_object {
-            delete_action = Some(EditorAction::DeleteObject {
-                index,
-                layer_id: layer_id.clone(),
-            });
-
-            properties_action = Some(EditorAction::OpenObjectPropertiesWindow { layer_id, index });
-        }
-
-        vec![
-            ButtonParams {
-                label: "+",
-                width_override: Some(0.25),
-                action: create_action,
-            },
-            ButtonParams {
-                label: "-",
-                width_override: Some(0.25),
-                action: delete_action,
-            },
-            ButtonParams {
-                label: "Edit",
-                width_override: Some(0.5),
-                action: properties_action,
-            },
-        ]
-    }
-
-    fn is_drawn(&self, map: &Map, ctx: &EditorContext) -> bool {
-        if let Some(layer_id) = &ctx.selected_layer {
-            if let Some(layer) = map.layers.get(layer_id) {
-                return layer.kind == MapLayerKind::ObjectLayer;
-            }
-        }
-
-        false
-    }
-}
-
-impl Default for ObjectListElement {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/toolbars/tileset_details.rs b/src/editor/gui/toolbars/tileset_details.rs
deleted file mode 100644
index 99a72c947e..0000000000
--- a/src/editor/gui/toolbars/tileset_details.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{widgets, Ui},
-};
-
-use super::{EditorAction, EditorContext, GuiResources, Map, ToolbarElement, ToolbarElementParams};
-
-use crate::{gui::ELEMENT_MARGIN, Resources};
-
-pub struct TilesetDetailsElement {
-    params: ToolbarElementParams,
-}
-
-impl TilesetDetailsElement {
-    pub fn new() -> Self {
-        let params = ToolbarElementParams {
-            header: None,
-            has_margins: true,
-            ..Default::default()
-        };
-
-        TilesetDetailsElement { params }
-    }
-}
-
-impl ToolbarElement for TilesetDetailsElement {
-    fn get_params(&self) -> &ToolbarElementParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        map: &Map,
-        ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let mut res = None;
-
-        let mut position = Vec2::ZERO;
-
-        if let Some(tileset_id) = &ctx.selected_tileset {
-            let tileset = map.tilesets.get(tileset_id).unwrap();
-
-            let texture_entry = {
-                let resources = storage::get::<Resources>();
-                resources
-                    .textures
-                    .get(&tileset.texture_id)
-                    .cloned()
-                    .unwrap()
-            };
-
-            let grid_size = vec2(tileset.grid_size.x as f32, tileset.grid_size.y as f32);
-
-            let scaled_width = size.x;
-            let scaled_height =
-                (scaled_width / texture_entry.texture.width()) * texture_entry.texture.height();
-
-            let scaled_tile_size = vec2(scaled_width / grid_size.x, scaled_height / grid_size.y);
-
-            widgets::Texture::new(texture_entry.texture)
-                .position(position)
-                .size(scaled_width, scaled_height)
-                .ui(ui);
-
-            {
-                let gui_resources = storage::get::<GuiResources>();
-                ui.push_skin(&gui_resources.skins.tileset_grid);
-            }
-
-            for y in 0..tileset.grid_size.y {
-                for x in 0..tileset.grid_size.x {
-                    let tile_id = y * tileset.grid_size.x + x;
-
-                    let is_selected = if let Some(selected) = ctx.selected_tile {
-                        selected == tile_id
-                    } else {
-                        false
-                    };
-
-                    if is_selected {
-                        let gui_resources = storage::get::<GuiResources>();
-                        ui.push_skin(&gui_resources.skins.tileset_grid_selected);
-                    }
-
-                    let position = vec2(x as f32, y as f32) * scaled_tile_size;
-
-                    let button = widgets::Button::new("")
-                        .size(scaled_tile_size)
-                        .position(position)
-                        .ui(ui);
-
-                    if button {
-                        res = Some(EditorAction::SelectTile {
-                            id: tile_id,
-                            tileset_id: tileset.id.clone(),
-                        });
-                    }
-
-                    if is_selected {
-                        ui.pop_skin();
-                    }
-                }
-            }
-
-            ui.pop_skin();
-
-            position.y += scaled_height + ELEMENT_MARGIN;
-        }
-
-        res
-    }
-
-    fn is_drawn(&self, _map: &Map, ctx: &EditorContext) -> bool {
-        ctx.selected_tileset.is_some()
-    }
-}
-
-impl Default for TilesetDetailsElement {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/toolbars/tileset_list.rs b/src/editor/gui/toolbars/tileset_list.rs
deleted file mode 100644
index 3d4e840565..0000000000
--- a/src/editor/gui/toolbars/tileset_list.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{widgets, Ui},
-};
-
-use super::{
-    EditorAction, EditorContext, GuiResources, Map, Toolbar, ToolbarElement, ToolbarElementParams,
-};
-
-use crate::{editor::gui::ButtonParams, map::MapLayerKind};
-
-pub struct TilesetListElement {
-    params: ToolbarElementParams,
-}
-
-impl TilesetListElement {
-    pub fn new() -> Self {
-        let params = ToolbarElementParams {
-            header: Some("Tilesets".to_string()),
-            has_buttons: true,
-            has_margins: false,
-        };
-
-        TilesetListElement { params }
-    }
-}
-
-impl ToolbarElement for TilesetListElement {
-    fn get_params(&self) -> &ToolbarElementParams {
-        &self.params
-    }
-
-    fn get_buttons(&self, _map: &Map, ctx: &EditorContext) -> Vec<ButtonParams> {
-        // Properties are disabled until autotile is up and running
-
-        let mut delete_action = None;
-        //let mut properties_action = None;
-
-        if let Some(tileset_id) = &ctx.selected_tileset {
-            delete_action = Some(EditorAction::DeleteTileset(tileset_id.clone()));
-            /*
-            properties_action = Some(EditorAction::OpenTilesetPropertiesWindow(
-                tileset_id.clone(),
-            ));
-            */
-        }
-
-        vec![
-            ButtonParams {
-                label: "+",
-                width_override: Some(0.25),
-                action: Some(EditorAction::OpenCreateTilesetWindow),
-            },
-            ButtonParams {
-                label: "-",
-                width_override: Some(0.25),
-                action: delete_action,
-            },
-            ButtonParams {
-                label: "Edit",
-                width_override: Some(0.5),
-                //action: properties_action,
-                action: None,
-            },
-        ]
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        map: &Map,
-        ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let mut res = None;
-
-        let entry_size = vec2(size.x, Toolbar::LIST_ENTRY_HEIGHT);
-        let mut position = Vec2::ZERO;
-
-        let gui_resources = storage::get::<GuiResources>();
-        ui.push_skin(&gui_resources.skins.list_box);
-
-        for tileset_id in map.tilesets.keys() {
-            let is_selected = if let Some(selected_id) = &ctx.selected_tileset {
-                tileset_id == selected_id
-            } else {
-                false
-            };
-
-            if is_selected {
-                ui.push_skin(&gui_resources.skins.list_box_selected);
-            }
-
-            let was_clicked = widgets::Button::new("")
-                .size(entry_size)
-                .position(position)
-                .ui(ui);
-
-            ui.label(position, tileset_id);
-
-            if was_clicked {
-                res = Some(EditorAction::SelectTileset(tileset_id.clone()));
-            }
-
-            if is_selected {
-                ui.pop_skin();
-            }
-
-            position.y += entry_size.y;
-        }
-
-        ui.pop_skin();
-
-        res
-    }
-
-    fn is_drawn(&self, map: &Map, ctx: &EditorContext) -> bool {
-        if let Some(layer_id) = &ctx.selected_layer {
-            if let Some(layer) = map.layers.get(layer_id) {
-                return layer.kind == MapLayerKind::TileLayer;
-            }
-        }
-
-        false
-    }
-}
-
-impl Default for TilesetListElement {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/toolbars/tool_selector.rs b/src/editor/gui/toolbars/tool_selector.rs
deleted file mode 100644
index 25291c1b4c..0000000000
--- a/src/editor/gui/toolbars/tool_selector.rs
+++ /dev/null
@@ -1,178 +0,0 @@
-use std::any::TypeId;
-
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{widgets, Ui},
-};
-
-use super::{
-    EditorAction, EditorContext, Map, ToolbarElement, ToolbarElementParams, ELEMENT_MARGIN,
-};
-
-use crate::editor::tools::EditorTool;
-use crate::{
-    editor::tools::{get_tool_instance_of_id, EditorToolParams},
-    gui::GuiResources,
-    Resources,
-};
-
-pub struct ToolSelectorElement {
-    params: ToolbarElementParams,
-    tools: Vec<TypeId>,
-}
-
-impl ToolSelectorElement {
-    pub fn new() -> Self {
-        let params = ToolbarElementParams {
-            header: None,
-            has_margins: true,
-            has_buttons: false,
-        };
-
-        ToolSelectorElement {
-            params,
-            tools: Vec::new(),
-        }
-    }
-
-    #[must_use]
-    pub fn with_tool<T: EditorTool + 'static>(self) -> Self {
-        let id = TypeId::of::<T>();
-        let mut tools = self.tools;
-        tools.push(id);
-
-        ToolSelectorElement { tools, ..self }
-    }
-
-    pub fn add_tool<T: EditorTool + 'static>(&mut self) {
-        let id = TypeId::of::<T>();
-        self.tools.push(id);
-    }
-}
-
-impl ToolbarElement for ToolSelectorElement {
-    fn get_params(&self) -> &ToolbarElementParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        map: &Map,
-        ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let mut res = None;
-
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.tool_selector);
-        }
-
-        let size = vec2(size.x, size.x);
-        let mut position = Vec2::ZERO;
-
-        // TODO: Grey out inactive tools, in stead of removing them altogether
-        let mut available_tools = self
-            .tools
-            .iter()
-            .filter_map(|id| {
-                let tool = get_tool_instance_of_id(id);
-                if tool.is_available(map, ctx) {
-                    return Some((Some(*id), tool.get_params().clone()));
-                }
-
-                None
-            })
-            .collect::<Vec<(Option<TypeId>, EditorToolParams)>>();
-
-        available_tools.insert(
-            0,
-            (
-                None,
-                EditorToolParams {
-                    name: "Cursor".to_string(),
-                    icon_texture_id: "cursor_tool_icon".to_string(),
-                    ..Default::default()
-                },
-            ),
-        );
-
-        let resources = storage::get::<Resources>();
-        for (id, params) in available_tools {
-            let mut is_selected = false;
-            if let Some(id) = id {
-                if let Some(selected_id) = ctx.selected_tool {
-                    is_selected = id == selected_id;
-                }
-            } else {
-                is_selected = ctx.selected_tool.is_none();
-            }
-
-            if is_selected {
-                let gui_resources = storage::get::<GuiResources>();
-                ui.push_skin(&gui_resources.skins.tool_selector_selected);
-            }
-
-            let was_clicked = widgets::Button::new("")
-                .position(position)
-                .size(size)
-                .ui(ui);
-
-            let texture_entry = resources
-                .textures
-                .get(&params.icon_texture_id)
-                .cloned()
-                .unwrap();
-
-            widgets::Texture::new(texture_entry.texture)
-                .position(position)
-                .size(size.x, size.y)
-                .ui(ui);
-
-            /*{
-                let label_size = ui.calc_size(&params.name);
-                if label_size.x + (ELEMENT_MARGIN * 2.0) > size.x {
-                    let words: Vec<_> = params.name.split(' ').collect();
-
-                    let x_center = position.x + size.x / 2.0;
-                    let mut y_offset = ELEMENT_MARGIN;
-
-                    for word in words {
-                        let label_size = ui.calc_size(word);
-
-                        if y_offset + label_size.y > size.y {
-                            break;
-                        }
-
-                        let position = vec2(x_center - label_size.x / 2.0, position.y + y_offset);
-                        widgets::Label::new(word).position(position).ui(ui);
-
-                        y_offset += label_size.y;
-                    }
-                }
-            }*/
-
-            if was_clicked {
-                res = Some(EditorAction::SelectTool(id));
-            }
-
-            position.y += size.y + ELEMENT_MARGIN;
-
-            if is_selected {
-                ui.pop_skin();
-            }
-        }
-
-        ui.pop_skin();
-
-        res
-    }
-}
-
-impl Default for ToolSelectorElement {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/windows/background_properties.rs b/src/editor/gui/windows/background_properties.rs
deleted file mode 100644
index 624332fac2..0000000000
--- a/src/editor/gui/windows/background_properties.rs
+++ /dev/null
@@ -1,306 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use crate::map::MapBackgroundLayer;
-use crate::{map::Map, Resources};
-
-use crate::gui::{GuiResources, ELEMENT_MARGIN, LIST_BOX_ENTRY_HEIGHT};
-use crate::resources::TextureKind;
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-
-pub struct BackgroundPropertiesWindow {
-    params: WindowParams,
-    color: Color,
-    layers: Vec<MapBackgroundLayer>,
-    layer_texture_id: Option<String>,
-    layer_depth: f32,
-    selected_layer: Option<usize>,
-}
-
-impl BackgroundPropertiesWindow {
-    pub fn new(color: Color, layers: Vec<MapBackgroundLayer>) -> Self {
-        let params = WindowParams {
-            title: Some("Background Properties".to_string()),
-            size: vec2(360.0, 500.0),
-            ..Default::default()
-        };
-
-        BackgroundPropertiesWindow {
-            params,
-            color,
-            layers,
-            layer_texture_id: None,
-            layer_depth: 0.0,
-            selected_layer: None,
-        }
-    }
-}
-
-impl Window for BackgroundPropertiesWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let action = self
-            .get_close_action()
-            .then(EditorAction::UpdateBackground {
-                color: self.color,
-                layers: self.layers.clone(),
-            });
-
-        res.push(ButtonParams {
-            label: "Save",
-            action: Some(action),
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        _map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("background_properties_window");
-
-        widgets::Group::new(hash!(id, "color_group"), vec2(size.x * 0.4, size.y * 0.5))
-            .position(vec2(0.0, 0.0))
-            .ui(ui, |ui| {
-                let mut r_str = format!("{:.1}", self.color.r);
-                let mut g_str = format!("{:.1}", self.color.g);
-                let mut b_str = format!("{:.1}", self.color.b);
-                let mut a_str = format!("{:.1}", self.color.a);
-
-                widgets::InputText::new(hash!(id, "color_r_input"))
-                    .ratio(1.0)
-                    .label("r")
-                    .ui(ui, &mut r_str);
-
-                widgets::InputText::new(hash!(id, "color_g_input"))
-                    .ratio(1.0)
-                    .label("g")
-                    .ui(ui, &mut g_str);
-
-                widgets::InputText::new(hash!(id, "color_b_input"))
-                    .ratio(1.0)
-                    .label("b")
-                    .ui(ui, &mut b_str);
-
-                widgets::InputText::new(hash!(id, "color_a_input"))
-                    .ratio(1.0)
-                    .label("a")
-                    .ui(ui, &mut a_str);
-
-                if let Ok(r) = r_str.parse::<f32>() {
-                    self.color.r = r;
-                }
-
-                if let Ok(g) = g_str.parse::<f32>() {
-                    self.color.g = g;
-                }
-
-                if let Ok(b) = b_str.parse::<f32>() {
-                    self.color.b = b;
-                }
-
-                if let Ok(a) = a_str.parse::<f32>() {
-                    self.color.a = a;
-                }
-            });
-
-        let layer_list_size = vec2((size.x * 0.6) - ELEMENT_MARGIN, size.y * 0.5);
-        let layer_list_entry_size = vec2(layer_list_size.x, LIST_BOX_ENTRY_HEIGHT);
-
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.list_box_no_bg);
-        }
-
-        widgets::Group::new(hash!(id, "layer_list"), layer_list_size)
-            .position(vec2((size.x * 0.4) + ELEMENT_MARGIN, 0.0))
-            .ui(ui, |ui| {
-                let layers = self.layers.clone();
-                for (i, layer) in layers.iter().enumerate() {
-                    widgets::Group::new(hash!(id, "layer_list_entry", i), layer_list_entry_size)
-                        .position(vec2(0.0, i as f32 * LIST_BOX_ENTRY_HEIGHT))
-                        .ui(ui, |ui| {
-                            let mut is_selected = false;
-                            if let Some(index) = self.selected_layer {
-                                is_selected = index == i;
-                            }
-
-                            if is_selected {
-                                let gui_resources = storage::get::<GuiResources>();
-                                ui.push_skin(&gui_resources.skins.list_box_selected);
-                            }
-
-                            let entry_btn = widgets::Button::new("")
-                                .size(layer_list_entry_size)
-                                .position(vec2(0.0, 0.0));
-
-                            if entry_btn.ui(ui) {
-                                if is_selected {
-                                    self.selected_layer = None;
-                                    self.layer_texture_id = None;
-                                    self.layer_depth = 0.0;
-                                } else {
-                                    self.selected_layer = Some(i);
-                                    self.layer_texture_id = Some(layer.texture_id.clone());
-                                    self.layer_depth = layer.depth;
-                                }
-                            }
-
-                            ui.label(vec2(0.0, 0.0), &layer.texture_id);
-
-                            if is_selected {
-                                ui.pop_skin();
-                            }
-                        });
-                }
-            });
-
-        ui.pop_skin();
-
-        widgets::Group::new(
-            hash!(id, "layer_attributes"),
-            vec2(size.x, (size.y * 0.5) - ELEMENT_MARGIN),
-        )
-        .position(vec2(0.0, (size.y * 0.5) + ELEMENT_MARGIN))
-        .ui(ui, |ui| {
-            let resources = storage::get::<Resources>();
-            let mut texture_ids = resources
-                .textures
-                .values()
-                .filter_map(|texture_res| {
-                    let mut res = None;
-
-                    if let Some(kind) = texture_res.meta.kind {
-                        if kind == TextureKind::Background {
-                            res = Some(texture_res.meta.id.as_str());
-                        }
-                    }
-
-                    res
-                })
-                .collect::<Vec<&str>>();
-
-            texture_ids.sort_unstable();
-
-            let mut texture_index = texture_ids
-                .iter()
-                .enumerate()
-                .find_map(|(i, id)| {
-                    if let Some(texture_id) = &self.layer_texture_id {
-                        if *id == texture_id {
-                            return Some(i);
-                        }
-                    }
-
-                    None
-                })
-                .unwrap_or(0);
-
-            widgets::ComboBox::new(hash!(id, "layer_texture_input"), &texture_ids)
-                .ratio(0.8)
-                .label("Texture")
-                .ui(ui, &mut texture_index);
-
-            self.layer_texture_id = texture_ids.get(texture_index).map(|str| str.to_string());
-
-            let mut depth_str = format!("{:.1}", self.layer_depth);
-
-            widgets::InputText::new(hash!(id, "layer_depth_input"))
-                .ratio(0.4)
-                .label("Depth")
-                .ui(ui, &mut depth_str);
-
-            if let Ok(depth) = depth_str.parse::<f32>() {
-                self.layer_depth = depth;
-            }
-
-            ui.same_line(0.0);
-
-            if let Some(mut index) = self.selected_layer {
-                {
-                    let layer = self.layers.get_mut(index).unwrap();
-                    layer.texture_id = self.layer_texture_id.clone().unwrap();
-                    layer.depth = self.layer_depth;
-                }
-
-                let delete_btn = widgets::Button::new("Delete");
-
-                if delete_btn.ui(ui) {
-                    self.layers.remove(index);
-
-                    self.selected_layer = None;
-                    self.layer_texture_id = None;
-                    self.layer_depth = 0.0;
-                }
-
-                ui.same_line(0.0);
-
-                let up_btn = widgets::Button::new("Up");
-
-                if up_btn.ui(ui) && index > 0 {
-                    let layer = self.layers.remove(index);
-
-                    index -= 1;
-                    self.layers.insert(index, layer);
-
-                    self.selected_layer = Some(index);
-                }
-
-                ui.same_line(0.0);
-
-                let down_btn = widgets::Button::new("Down");
-
-                if down_btn.ui(ui) && index < self.layers.len() {
-                    let layer = self.layers.remove(index);
-
-                    if index < self.layers.len() {
-                        index += 1;
-                        self.layers.insert(index, layer);
-                    } else {
-                        index = self.layers.len();
-                        self.layers.push(layer);
-                    }
-
-                    self.selected_layer = Some(index);
-                }
-            } else {
-                let add_btn = widgets::Button::new("Add");
-
-                if add_btn.ui(ui) && self.layer_texture_id.is_some() {
-                    let texture_id = self.layer_texture_id.take().unwrap();
-                    let depth = self.layer_depth;
-
-                    self.layer_depth = 0.0;
-
-                    self.layers.push(MapBackgroundLayer {
-                        texture_id,
-                        depth,
-                        offset: Vec2::ZERO,
-                    });
-                }
-            }
-        });
-
-        None
-    }
-}
diff --git a/src/editor/gui/windows/confirm_dialog.rs b/src/editor/gui/windows/confirm_dialog.rs
deleted file mode 100644
index 13d6f26eff..0000000000
--- a/src/editor/gui/windows/confirm_dialog.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use macroquad::{prelude::*, ui::Ui};
-
-use super::{EditorAction, EditorContext, Map, Window, WindowParams};
-use crate::editor::gui::windows::ButtonParams;
-
-pub struct ConfirmDialog {
-    params: WindowParams,
-    body: Vec<String>,
-    confirm_action: EditorAction,
-}
-
-impl ConfirmDialog {
-    const WINDOW_TITLE: &'static str = "Please Confirm";
-    const CONFIRM_LABEL: &'static str = "Ok";
-    const CANCEL_LABEL: &'static str = "Cancel";
-
-    pub fn new(size: Vec2, body: &[&str], confirm_action: EditorAction) -> Self {
-        let params = WindowParams {
-            title: Some(Self::WINDOW_TITLE.to_string()),
-            size,
-            is_static: true,
-            ..Default::default()
-        };
-
-        let body = body.iter().map(|line| line.to_string()).collect();
-
-        ConfirmDialog {
-            params,
-            body,
-            confirm_action,
-        }
-    }
-}
-
-impl Window for ConfirmDialog {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let action = self.get_close_action().then(self.confirm_action.clone());
-
-        res.push(ButtonParams {
-            label: Self::CONFIRM_LABEL,
-            action: Some(action),
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: Self::CANCEL_LABEL,
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        _size: Vec2,
-        _map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        for line in &self.body {
-            ui.label(None, line);
-        }
-
-        ui.separator();
-        ui.separator();
-        ui.separator();
-        ui.separator();
-
-        None
-    }
-}
diff --git a/src/editor/gui/windows/create_layer.rs b/src/editor/gui/windows/create_layer.rs
deleted file mode 100644
index b0c9f3f933..0000000000
--- a/src/editor/gui/windows/create_layer.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use macroquad::{
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use crate::map::{Map, MapLayerKind};
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-use crate::editor::gui::ComboBoxBuilder;
-use crate::gui::Checkbox;
-
-pub struct CreateLayerWindow {
-    params: WindowParams,
-    id: String,
-    kind: MapLayerKind,
-    has_collision: bool,
-}
-
-impl CreateLayerWindow {
-    pub fn new() -> Self {
-        let params = WindowParams {
-            title: Some("Create Layer".to_string()),
-            size: vec2(275.0, 275.0),
-            ..Default::default()
-        };
-
-        CreateLayerWindow {
-            params,
-            id: "Unnamed Layer".to_string(),
-            kind: MapLayerKind::TileLayer,
-            has_collision: false,
-        }
-    }
-}
-
-impl Window for CreateLayerWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        _size: Vec2,
-        _map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("create_layer_window");
-
-        {
-            let size = vec2(173.0, 25.0);
-
-            widgets::InputText::new(hash!(id, "name_input"))
-                .size(size)
-                .ratio(1.0)
-                .label("Name")
-                .ui(ui, &mut self.id);
-        }
-
-        ui.separator();
-
-        ComboBoxBuilder::new(hash!(id, "type_input"))
-            .with_label("Type")
-            .with_ratio(1.0)
-            .build(ui, &mut self.kind);
-
-        if self.kind == MapLayerKind::TileLayer {
-            ui.separator();
-
-            Checkbox::new(hash!(id, "collision_input"), None, "Collision")
-                .ui(ui, &mut self.has_collision);
-        }
-
-        None
-    }
-
-    fn get_buttons(&self, map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let is_existing_id = map.draw_order.iter().any(|id| id == &self.id);
-
-        let mut action = None;
-        if !is_existing_id {
-            let batch = self.get_close_action().then(EditorAction::CreateLayer {
-                id: self.id.clone(),
-                kind: self.kind,
-                has_collision: self.has_collision,
-                index: None,
-            });
-
-            action = Some(batch);
-        }
-
-        res.push(ButtonParams {
-            label: "Create",
-            action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-}
-
-impl Default for CreateLayerWindow {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/windows/create_map.rs b/src/editor/gui/windows/create_map.rs
deleted file mode 100644
index b898258330..0000000000
--- a/src/editor/gui/windows/create_map.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-use std::path::Path;
-
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use core::text::ToStringHelper;
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-
-use crate::map::Map;
-use crate::resources::{map_name_to_filename, MAP_EXPORTS_DEFAULT_DIR, MAP_EXPORTS_EXTENSION};
-use crate::Resources;
-
-pub struct CreateMapWindow {
-    params: WindowParams,
-    name: String,
-    description: String,
-    grid_size: UVec2,
-    tile_size: Vec2,
-    map_export_path: String,
-}
-
-impl CreateMapWindow {
-    pub fn new() -> Self {
-        let params = WindowParams {
-            title: Some("Create Map".to_string()),
-            size: vec2(350.0, 425.0),
-            ..Default::default()
-        };
-
-        let map_export_path = {
-            let resources = storage::get::<Resources>();
-            Path::new(&resources.assets_dir).join(MAP_EXPORTS_DEFAULT_DIR)
-        };
-
-        CreateMapWindow {
-            params,
-            name: "unnamed_map".to_string(),
-            description: "".to_string(),
-            grid_size: uvec2(100, 75),
-            tile_size: vec2(16.0, 16.0),
-            map_export_path: map_export_path.to_string_helper(),
-        }
-    }
-}
-
-impl Window for CreateMapWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        _size: Vec2,
-        _map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("create_map_window");
-
-        ui.separator();
-
-        {
-            let size = vec2(275.0, 25.0);
-
-            widgets::InputText::new(hash!(id, "name_input"))
-                .size(size)
-                .ratio(1.0)
-                .ui(ui, &mut self.name);
-        }
-
-        ui.separator();
-
-        {
-            let path_label = Path::new(&self.map_export_path)
-                .join(map_name_to_filename(&self.name))
-                .with_extension(MAP_EXPORTS_EXTENSION);
-
-            widgets::Label::new(path_label.to_string_lossy().as_ref()).ui(ui);
-        }
-
-        ui.separator();
-
-        {
-            let size = vec2(275.0, 75.0);
-
-            widgets::InputText::new(hash!(id, "description_input"))
-                .size(size)
-                .ratio(1.0)
-                .ui(ui, &mut self.description);
-        }
-
-        ui.separator();
-
-        {
-            let mut grid_width = self.grid_size.x.to_string();
-            let mut grid_height = self.grid_size.y.to_string();
-
-            let mut tile_width = self.tile_size.x.to_string();
-            let mut tile_height = self.tile_size.y.to_string();
-
-            let size = vec2(75.0, 25.0);
-
-            widgets::InputText::new(hash!(id, "tile_width_input"))
-                .size(size)
-                .ratio(1.0)
-                .label("x")
-                .ui(ui, &mut tile_width);
-
-            ui.same_line(size.x + 25.0);
-
-            widgets::InputText::new(hash!(id, "tile_height_input"))
-                .size(size)
-                .ratio(1.0)
-                .label("Tile size")
-                .ui(ui, &mut tile_height);
-
-            widgets::InputText::new(hash!(id, "grid_width_input"))
-                .size(size)
-                .ratio(1.0)
-                .label("x")
-                .ui(ui, &mut grid_width);
-
-            ui.same_line(size.x + 25.0);
-
-            widgets::InputText::new(hash!(id, "grid_height_input"))
-                .size(size)
-                .ratio(1.0)
-                .label("Grid size")
-                .ui(ui, &mut grid_height);
-
-            self.grid_size = uvec2(
-                grid_width.parse::<u32>().unwrap(),
-                grid_height.parse::<u32>().unwrap(),
-            );
-
-            self.tile_size = vec2(
-                tile_width.parse::<f32>().unwrap(),
-                tile_height.parse::<f32>().unwrap(),
-            );
-        }
-
-        ui.separator();
-
-        None
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let mut action = None;
-
-        if self.grid_size > UVec2::ZERO && self.tile_size > Vec2::ZERO {
-            let mut description = None;
-            if !self.description.is_empty() {
-                description = Some(self.description.clone());
-            }
-
-            let batch = self.get_close_action().then(EditorAction::CreateMap {
-                name: self.name.clone(),
-                description,
-                tile_size: self.tile_size,
-                grid_size: self.grid_size,
-            });
-
-            action = Some(batch);
-        }
-
-        res.push(ButtonParams {
-            label: "Create",
-            action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-}
-
-impl Default for CreateMapWindow {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/windows/create_object.rs b/src/editor/gui/windows/create_object.rs
deleted file mode 100644
index 92320eb02d..0000000000
--- a/src/editor/gui/windows/create_object.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use crate::editor::gui::combobox::ComboBoxVec;
-use crate::{
-    editor::gui::{ComboBoxBuilder, ComboBoxValue},
-    map::{Map, MapObjectKind},
-    Resources,
-};
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-
-pub struct CreateObjectWindow {
-    params: WindowParams,
-    id: Option<String>,
-    kind: MapObjectKind,
-    position: Vec2,
-    layer_id: String,
-}
-
-impl CreateObjectWindow {
-    pub fn new(position: Vec2, layer_id: String) -> Self {
-        let params = WindowParams {
-            title: Some("Create Object".to_string()),
-            size: vec2(300.0, 300.0),
-            ..Default::default()
-        };
-
-        CreateObjectWindow {
-            params,
-            id: None,
-            kind: MapObjectKind::Item,
-            position,
-            layer_id,
-        }
-    }
-}
-
-impl Window for CreateObjectWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        if let Some(id) = self.id.clone() {
-            let action = self.get_close_action().then(EditorAction::CreateObject {
-                id,
-                kind: self.kind,
-                position: self.position,
-                layer_id: self.layer_id.clone(),
-            });
-
-            res.push(ButtonParams {
-                label: "Create",
-                action: Some(action),
-                ..Default::default()
-            });
-        }
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        _size: Vec2,
-        _map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("create_object_window");
-
-        {
-            let size = vec2(72.0, 28.0);
-
-            let mut x_str = format!("{:.1}", self.position.x);
-            let mut y_str = format!("{:.1}", self.position.y);
-
-            widgets::InputText::new(hash!(id, "position_x_input"))
-                .size(size)
-                .ui(ui, &mut x_str);
-
-            ui.same_line(0.0);
-
-            ui.label(None, "x");
-
-            ui.same_line(0.0);
-
-            widgets::InputText::new(hash!(id, "position_y_input"))
-                .size(size)
-                .ui(ui, &mut y_str);
-
-            ui.separator();
-            ui.separator();
-            ui.separator();
-            ui.separator();
-
-            let x = if let Ok(x) = x_str.parse::<f32>() {
-                (x * 100.0).round() / 100.0
-            } else {
-                0.0
-            };
-
-            let y = if let Ok(y) = y_str.parse::<f32>() {
-                (y * 100.0).round() / 100.0
-            } else {
-                0.0
-            };
-
-            self.position = vec2(x, y);
-        }
-
-        ComboBoxBuilder::new(hash!(id, "type_input"))
-            .with_ratio(0.8)
-            .with_label("Type")
-            .build(ui, &mut self.kind);
-
-        let resources = storage::get::<Resources>();
-        let item_ids = match self.kind {
-            MapObjectKind::Item => resources
-                .items
-                .keys()
-                .map(|k| k.as_str())
-                .collect::<Vec<&str>>(),
-            MapObjectKind::Environment => vec!["sproinger", "crab", "fish_school"],
-            MapObjectKind::Decoration => resources
-                .decoration
-                .keys()
-                .map(|k| k.as_str())
-                .collect::<Vec<&str>>(),
-        };
-
-        let mut item_id_value = if let Some(current_id) = &self.id {
-            let index = item_ids
-                .iter()
-                .enumerate()
-                .find_map(|(i, id)| if id == current_id { Some(i) } else { None })
-                .unwrap_or_default();
-
-            ComboBoxVec::new(index, &item_ids)
-        } else {
-            ComboBoxVec::new(0, &item_ids)
-        };
-
-        ComboBoxBuilder::new(hash!("id_input"))
-            .with_ratio(0.8)
-            .with_label("Variant")
-            .build(ui, &mut item_id_value);
-
-        self.id = Some(item_id_value.get_value());
-
-        None
-    }
-}
diff --git a/src/editor/gui/windows/create_tileset.rs b/src/editor/gui/windows/create_tileset.rs
deleted file mode 100644
index 39c8870287..0000000000
--- a/src/editor/gui/windows/create_tileset.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use crate::editor::gui::combobox::ComboBoxVec;
-use crate::editor::gui::{ComboBoxBuilder, ComboBoxValue};
-use crate::{map::Map, Resources};
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-use crate::resources::TextureKind;
-
-pub struct CreateTilesetWindow {
-    params: WindowParams,
-    tileset_id: String,
-    texture: ComboBoxVec,
-}
-
-impl CreateTilesetWindow {
-    pub fn new() -> Self {
-        let params = WindowParams {
-            title: Some("Create Tileset".to_string()),
-            size: vec2(320.0, 250.0),
-            ..Default::default()
-        };
-
-        let resources = storage::get::<Resources>();
-        let mut textures = resources
-            .textures
-            .iter()
-            .filter_map(|(k, v)| {
-                if let Some(kind) = v.meta.kind {
-                    if kind == TextureKind::Tileset {
-                        return Some(k.clone());
-                    }
-                }
-
-                None
-            })
-            .collect::<Vec<String>>();
-
-        textures.sort_unstable();
-
-        CreateTilesetWindow {
-            params,
-            tileset_id: "Unnamed Tileset".to_string(),
-            texture: textures.as_slice().into(),
-        }
-    }
-}
-
-impl Window for CreateTilesetWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn get_buttons(&self, map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let is_existing_id = map.tilesets.iter().any(|(id, _)| id == &self.tileset_id);
-
-        let mut action = None;
-        if !is_existing_id {
-            let batch = self.get_close_action().then(EditorAction::CreateTileset {
-                id: self.tileset_id.clone(),
-                texture_id: self.texture.get_value(),
-            });
-
-            action = Some(batch);
-        }
-
-        res.push(ButtonParams {
-            label: "Create",
-            action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        _size: Vec2,
-        _map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("create_tileset_window");
-
-        widgets::InputText::new(hash!(id, "name_input"))
-            .ratio(0.8)
-            .label("Name")
-            .ui(ui, &mut self.tileset_id);
-
-        ui.separator();
-
-        ComboBoxBuilder::new(hash!(id, "texture_input"))
-            .with_ratio(0.8)
-            .with_label("Texture")
-            .build(ui, &mut self.texture);
-
-        None
-    }
-}
-
-impl Default for CreateTilesetWindow {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/windows/import.rs b/src/editor/gui/windows/import.rs
deleted file mode 100644
index f509a86f35..0000000000
--- a/src/editor/gui/windows/import.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use crate::gui::{Checkbox, GuiResources, ELEMENT_MARGIN, LIST_BOX_ENTRY_HEIGHT};
-
-use crate::map::{Map, MapBackgroundLayer, MapTileset};
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-use crate::Resources;
-
-pub struct ImportWindow {
-    params: WindowParams,
-    map_index: usize,
-    tilesets: Vec<MapTileset>,
-    selected_tilesets: Vec<usize>,
-    should_import_background: bool,
-    background_color: Option<Color>,
-    background_layers: Vec<MapBackgroundLayer>,
-    is_loaded: bool,
-}
-
-impl ImportWindow {
-    pub fn new(map_index: usize) -> Self {
-        let params = WindowParams {
-            title: Some("Import".to_string()),
-            size: vec2(350.0, 350.0),
-            ..Default::default()
-        };
-
-        ImportWindow {
-            params,
-            map_index,
-            tilesets: Vec::new(),
-            selected_tilesets: Vec::new(),
-            should_import_background: false,
-            background_color: None,
-            background_layers: Vec::new(),
-            is_loaded: false,
-        }
-    }
-}
-
-impl Window for ImportWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        _map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("import_window");
-
-        if !self.is_loaded {
-            let resources = storage::get::<Resources>();
-            let map_resource = resources.maps.get(self.map_index).unwrap();
-            self.tilesets = map_resource.map.tilesets.values().cloned().collect();
-
-            self.background_color = Some(map_resource.map.background_color);
-            self.background_layers = map_resource.map.background_layers.clone();
-
-            self.is_loaded = true;
-        }
-
-        widgets::Group::new(hash!(id, "list_box"), vec2(size.x, size.y * 0.8))
-            .position(vec2(0.0, 0.0))
-            .ui(ui, |ui| {
-                {
-                    let gui_resources = storage::get::<GuiResources>();
-                    ui.push_skin(&gui_resources.skins.list_box_no_bg);
-                }
-
-                let entry_size = vec2(size.x, LIST_BOX_ENTRY_HEIGHT);
-
-                for (i, tileset) in self.tilesets.iter().enumerate() {
-                    let is_selected = self.selected_tilesets.contains(&i);
-
-                    if is_selected {
-                        let gui_resources = storage::get::<GuiResources>();
-                        ui.push_skin(&gui_resources.skins.list_box_selected);
-                    }
-
-                    let entry_position = vec2(0.0, i as f32 * entry_size.y);
-
-                    let entry_btn = widgets::Button::new("")
-                        .size(entry_size)
-                        .position(entry_position);
-
-                    if entry_btn.ui(ui) {
-                        if is_selected {
-                            self.selected_tilesets.retain(|selected| *selected != i);
-                        } else {
-                            self.selected_tilesets.push(i);
-                        }
-                    }
-
-                    ui.label(entry_position, &tileset.id);
-
-                    if is_selected {
-                        ui.pop_skin();
-                    }
-                }
-
-                ui.pop_skin();
-            });
-
-        {
-            let position = vec2(0.0, (size.y * 0.8) + ELEMENT_MARGIN);
-
-            let checkbox = Checkbox::new(
-                hash!(id, "background_checkbox"),
-                position,
-                "Import Background",
-            );
-
-            checkbox
-                .with_margin(ELEMENT_MARGIN)
-                .ui(ui, &mut self.should_import_background);
-        }
-
-        None
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let tilesets = self
-            .tilesets
-            .iter()
-            .enumerate()
-            .filter_map(|(i, tileset)| {
-                if self.selected_tilesets.contains(&i) {
-                    Some(tileset.clone())
-                } else {
-                    None
-                }
-            })
-            .collect();
-
-        let mut background_color = None;
-        let mut background_layers = Vec::new();
-
-        if self.should_import_background {
-            background_color = self.background_color;
-            background_layers = self.background_layers.clone();
-        }
-
-        let batch = self.get_close_action().then(EditorAction::Import {
-            tilesets,
-            background_color,
-            background_layers,
-        });
-
-        res.push(ButtonParams {
-            label: "Import",
-            action: Some(batch),
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-}
diff --git a/src/editor/gui/windows/load_map.rs b/src/editor/gui/windows/load_map.rs
deleted file mode 100644
index 85685d0a34..0000000000
--- a/src/editor/gui/windows/load_map.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use crate::gui::{GuiResources, ELEMENT_MARGIN, LIST_BOX_ENTRY_HEIGHT};
-
-use crate::map::Map;
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-use crate::Resources;
-
-pub struct LoadMapWindow {
-    params: WindowParams,
-    index: Option<usize>,
-}
-
-impl LoadMapWindow {
-    pub fn new() -> Self {
-        let params = WindowParams {
-            title: Some("Open Map".to_string()),
-            size: vec2(350.0, 350.0),
-            ..Default::default()
-        };
-
-        LoadMapWindow {
-            params,
-            index: None,
-        }
-    }
-}
-
-impl Window for LoadMapWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        _map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("load_map_window");
-
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.list_box_no_bg);
-        }
-
-        if let Some(index) = self.index {
-            let btn_size = vec2(size.x, LIST_BOX_ENTRY_HEIGHT);
-            let btn_position = vec2(0.0, 0.0);
-
-            let back_btn = widgets::Button::new("")
-                .size(btn_size)
-                .position(btn_position);
-
-            if back_btn.ui(ui) {
-                self.index = None;
-            }
-
-            ui.label(btn_position, "< Back");
-
-            ui.pop_skin();
-
-            {
-                let resources = storage::get::<Resources>();
-                let map_resource = resources.maps.get(index).unwrap();
-
-                let mut width = size.x;
-                let mut height =
-                    (width / map_resource.preview.width()) * map_resource.preview.height();
-
-                let max_height = size.y - LIST_BOX_ENTRY_HEIGHT - (ELEMENT_MARGIN * 2.0);
-
-                if height > max_height {
-                    height = max_height;
-                    width = (height / map_resource.preview.height()) * map_resource.preview.width();
-                }
-
-                let preview_position = vec2((size.x - width) / 2.0, btn_size.y + ELEMENT_MARGIN);
-
-                widgets::Texture::new(map_resource.preview)
-                    .size(width, height)
-                    .position(preview_position)
-                    .ui(ui);
-            }
-        } else {
-            let size = vec2(size.x, size.y - ELEMENT_MARGIN);
-            widgets::Group::new(hash!(id, "list_box"), size)
-                .position(Vec2::ZERO)
-                .ui(ui, |ui| {
-                    let resources = storage::get::<Resources>();
-
-                    let entry_size = vec2(size.x, LIST_BOX_ENTRY_HEIGHT);
-
-                    for (i, map_resource) in resources.maps.iter().enumerate() {
-                        let mut is_selected = false;
-                        if let Some(index) = self.index {
-                            is_selected = index == i;
-                        }
-
-                        if is_selected {
-                            let gui_resources = storage::get::<GuiResources>();
-                            ui.push_skin(&gui_resources.skins.list_box_selected);
-                        }
-
-                        let entry_position = vec2(0.0, i as f32 * entry_size.y);
-
-                        let entry_btn = widgets::Button::new("")
-                            .size(entry_size)
-                            .position(entry_position);
-
-                        if entry_btn.ui(ui) {
-                            self.index = Some(i);
-                        }
-
-                        ui.label(entry_position, &map_resource.meta.path);
-
-                        if is_selected {
-                            ui.pop_skin();
-                        }
-                    }
-                });
-
-            ui.pop_skin();
-        }
-
-        None
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let mut open_action = None;
-        let mut import_action = None;
-
-        if let Some(index) = self.index {
-            let open_batch = self.get_close_action().then(EditorAction::OpenMap(index));
-            open_action = Some(open_batch);
-
-            let import_batch = self
-                .get_close_action()
-                .then(EditorAction::OpenImportWindow(index));
-            import_action = Some(import_batch);
-        }
-
-        res.push(ButtonParams {
-            label: "Open",
-            action: open_action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Import",
-            action: import_action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-}
-
-impl Default for LoadMapWindow {
-    fn default() -> Self {
-        Self::new()
-    }
-}
diff --git a/src/editor/gui/windows/mod.rs b/src/editor/gui/windows/mod.rs
deleted file mode 100644
index 1e930dd839..0000000000
--- a/src/editor/gui/windows/mod.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use std::any::TypeId;
-
-use macroquad::{prelude::*, ui::Ui};
-
-mod confirm_dialog;
-mod create_tileset;
-
-mod background_properties;
-mod create_layer;
-mod create_map;
-mod create_object;
-mod import;
-mod load_map;
-mod object_properties;
-mod save_map;
-mod tile_properties;
-mod tileset_properties;
-
-pub use background_properties::BackgroundPropertiesWindow;
-pub use confirm_dialog::ConfirmDialog;
-pub use create_layer::CreateLayerWindow;
-pub use create_map::CreateMapWindow;
-pub use create_object::CreateObjectWindow;
-pub use create_tileset::CreateTilesetWindow;
-pub use import::ImportWindow;
-pub use load_map::LoadMapWindow;
-pub use object_properties::ObjectPropertiesWindow;
-pub use save_map::SaveMapWindow;
-pub use tile_properties::TilePropertiesWindow;
-pub use tileset_properties::TilesetPropertiesWindow;
-
-use super::{ButtonParams, EditorAction, EditorContext, Map};
-
-pub const WINDOW_BUTTON_MIN_WIDTH: f32 = 64.0;
-pub const WINDOW_BUTTON_MAX_WIDTH: f32 = 96.0;
-
-#[derive(Debug, Copy, Clone)]
-pub enum WindowPosition {
-    Centered,
-    Absolute(Vec2),
-}
-
-impl WindowPosition {
-    pub fn to_absolute(&self, size: Vec2) -> Vec2 {
-        match self {
-            WindowPosition::Centered => {
-                let screen_size = vec2(screen_width(), screen_height());
-                (screen_size - size) / 2.0
-            }
-            WindowPosition::Absolute(position) => *position,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct WindowParams {
-    pub title: Option<String>,
-    pub size: Vec2,
-    pub position: WindowPosition,
-    pub has_buttons: bool,
-    pub is_static: bool,
-}
-
-impl WindowParams {
-    pub fn get_absolute_position(&self) -> Vec2 {
-        self.position.to_absolute(self.size)
-    }
-}
-
-impl Default for WindowParams {
-    fn default() -> Self {
-        WindowParams {
-            title: None,
-            size: vec2(250.0, 350.0),
-            position: WindowPosition::Centered,
-            has_buttons: true,
-            is_static: false,
-        }
-    }
-}
-
-// This should be implemented for any windows opened by the gui.
-// It provides a uniform standardization of window, boot visually and in regards to how control
-// flow is handled, by returning actions, in stead of performing the logic in the window draw.
-pub trait Window {
-    fn get_params(&self) -> &WindowParams;
-
-    // Implement this and set `has_buttons` to true in the `WindowParams` returned by
-    // `get_params` to add buttons to the bottom of the window.
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams>
-    where
-        Self: 'static,
-    {
-        vec![ButtonParams {
-            label: "Close",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        }]
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        size: Vec2,
-        map: &Map,
-        ctx: &EditorContext,
-    ) -> Option<EditorAction>;
-
-    fn get_absolute_position(&self) -> Vec2 {
-        let params = self.get_params();
-        params.position.to_absolute(params.size)
-    }
-
-    fn get_rect(&self) -> Rect {
-        let params = self.get_params();
-        let position = params.position.to_absolute(params.size);
-        Rect::new(position.x, position.y, params.size.x, params.size.y)
-    }
-
-    fn contains(&self, point: Vec2) -> bool {
-        let rect = self.get_rect();
-        rect.contains(point)
-    }
-
-    fn get_close_action(&self) -> EditorAction
-    where
-        Self: 'static,
-    {
-        let id = TypeId::of::<Self>();
-        EditorAction::CloseWindow(id)
-    }
-}
diff --git a/src/editor/gui/windows/object_properties.rs b/src/editor/gui/windows/object_properties.rs
deleted file mode 100644
index 15a3d08ef3..0000000000
--- a/src/editor/gui/windows/object_properties.rs
+++ /dev/null
@@ -1,178 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use crate::editor::gui::combobox::ComboBoxVec;
-use crate::map::MapObject;
-use crate::{
-    editor::gui::{ComboBoxBuilder, ComboBoxValue},
-    map::{Map, MapObjectKind},
-    Resources,
-};
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-
-pub struct ObjectPropertiesWindow {
-    params: WindowParams,
-    layer_id: String,
-    index: usize,
-    object: Option<MapObject>,
-}
-
-impl ObjectPropertiesWindow {
-    pub fn new(layer_id: String, index: usize) -> Self {
-        let params = WindowParams {
-            title: Some("Object Properties".to_string()),
-            size: vec2(300.0, 300.0),
-            ..Default::default()
-        };
-
-        ObjectPropertiesWindow {
-            params,
-            layer_id,
-            index,
-            object: None,
-        }
-    }
-}
-
-impl Window for ObjectPropertiesWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let mut action = None;
-
-        if let Some(object) = &self.object {
-            let batch = self.get_close_action().then(EditorAction::UpdateObject {
-                layer_id: self.layer_id.clone(),
-                index: self.index,
-                id: object.id.clone(),
-                kind: object.kind,
-                position: object.position,
-            });
-
-            action = Some(batch);
-        }
-
-        res.push(ButtonParams {
-            label: "Save",
-            action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        _size: Vec2,
-        map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("update_object_window");
-
-        let mut object = self.object.clone().unwrap_or({
-            let mut res = None;
-
-            if let Some(layer) = map.layers.get(&self.layer_id) {
-                res = layer.objects.get(self.index);
-            }
-
-            res.cloned().unwrap()
-        });
-
-        {
-            let size = vec2(72.0, 28.0);
-
-            let mut x_str = format!("{:.1}", object.position.x);
-            let mut y_str = format!("{:.1}", object.position.y);
-
-            widgets::InputText::new(hash!(id, "position_x_input"))
-                .size(size)
-                .ui(ui, &mut x_str);
-
-            ui.same_line(0.0);
-
-            ui.label(None, "x");
-
-            ui.same_line(0.0);
-
-            widgets::InputText::new(hash!(id, "position_y_input"))
-                .size(size)
-                .ui(ui, &mut y_str);
-
-            ui.separator();
-            ui.separator();
-            ui.separator();
-            ui.separator();
-
-            let x = if let Ok(x) = x_str.parse::<f32>() {
-                (x * 100.0).round() / 100.0
-            } else {
-                0.0
-            };
-
-            let y = if let Ok(y) = y_str.parse::<f32>() {
-                (y * 100.0).round() / 100.0
-            } else {
-                0.0
-            };
-
-            object.position = vec2(x, y);
-        }
-
-        ComboBoxBuilder::new(hash!(id, "type_input"))
-            .with_ratio(0.8)
-            .with_label("Type")
-            .build(ui, &mut object.kind);
-
-        let resources = storage::get::<Resources>();
-        let item_ids = match object.kind {
-            MapObjectKind::Item => resources
-                .items
-                .keys()
-                .map(|k| k.as_str())
-                .collect::<Vec<&str>>(),
-            MapObjectKind::Environment => vec!["sproinger"],
-            MapObjectKind::Decoration => resources
-                .decoration
-                .keys()
-                .map(|k| k.as_str())
-                .collect::<Vec<&str>>(),
-        };
-
-        let mut item_id_value = {
-            let index = item_ids
-                .iter()
-                .enumerate()
-                .find_map(|(i, id)| if *id == object.id { Some(i) } else { None })
-                .unwrap_or_default();
-
-            ComboBoxVec::new(index, &item_ids)
-        };
-
-        ComboBoxBuilder::new(hash!("id_input"))
-            .with_ratio(0.8)
-            .with_label("Variant")
-            .build(ui, &mut item_id_value);
-
-        object.id = item_id_value.get_value();
-
-        self.object = Some(object);
-
-        None
-    }
-}
diff --git a/src/editor/gui/windows/save_map.rs b/src/editor/gui/windows/save_map.rs
deleted file mode 100644
index 2cc9ca6301..0000000000
--- a/src/editor/gui/windows/save_map.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-use std::path::Path;
-
-use crate::map::Map;
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-use crate::resources::{
-    is_valid_map_export_path, map_name_to_filename, MAP_EXPORTS_DEFAULT_DIR, MAP_EXPORTS_EXTENSION,
-};
-use crate::Resources;
-
-pub struct SaveMapWindow {
-    params: WindowParams,
-    name: String,
-    should_overwrite: bool,
-}
-
-impl SaveMapWindow {
-    pub fn new(current_name: &str) -> Self {
-        let params = WindowParams {
-            title: Some("Save Map".to_string()),
-            size: vec2(350.0, 350.0),
-            ..Default::default()
-        };
-
-        SaveMapWindow {
-            params,
-            name: current_name.to_string(),
-            should_overwrite: false,
-        }
-    }
-}
-
-impl Window for SaveMapWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        _size: Vec2,
-        _map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("save_map_window");
-
-        {
-            let size = vec2(173.0, 25.0);
-
-            widgets::InputText::new(hash!(id, "name_input"))
-                .size(size)
-                .ratio(1.0)
-                .label("Name")
-                .ui(ui, &mut self.name);
-
-            {
-                let resources = storage::get::<Resources>();
-                let path = Path::new(&resources.assets_dir)
-                    .join(MAP_EXPORTS_DEFAULT_DIR)
-                    .join(map_name_to_filename(&self.name))
-                    .with_extension(MAP_EXPORTS_EXTENSION);
-
-                widgets::Label::new(path.to_string_lossy().as_ref()).ui(ui);
-            }
-        }
-
-        ui.separator();
-        ui.separator();
-        ui.separator();
-        ui.separator();
-
-        widgets::Checkbox::new(hash!(id, "overwrite_input"))
-            .label("Overwrite Existing")
-            .ui(ui, &mut self.should_overwrite);
-
-        None
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let path = Path::new(MAP_EXPORTS_DEFAULT_DIR)
-            .join(map_name_to_filename(&self.name))
-            .with_extension(MAP_EXPORTS_EXTENSION);
-
-        let mut action = None;
-        if is_valid_map_export_path(&path, self.should_overwrite) {
-            let save_action = EditorAction::SaveMap {
-                name: Some(self.name.clone()),
-                is_user_map: Some(true),
-            };
-            let batch = self.get_close_action().then(save_action);
-
-            action = Some(batch);
-        }
-
-        res.push(ButtonParams {
-            label: "Save",
-            action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-}
diff --git a/src/editor/gui/windows/tile_properties.rs b/src/editor/gui/windows/tile_properties.rs
deleted file mode 100644
index 08ef603a0a..0000000000
--- a/src/editor/gui/windows/tile_properties.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use macroquad::{
-    prelude::*,
-    ui::{hash, Ui},
-};
-
-use crate::map::Map;
-
-use crate::gui::Checkbox;
-
-use super::{ButtonParams, EditorAction, EditorContext, Window, WindowParams};
-
-const JUMPTHROUGH_ATTRIBUTE: &str = "jumpthrough";
-
-pub struct TilePropertiesWindow {
-    params: WindowParams,
-    layer_id: String,
-    index: usize,
-    attributes: Option<Vec<String>>,
-}
-
-impl TilePropertiesWindow {
-    pub fn new(layer_id: String, index: usize) -> Self {
-        let params = WindowParams {
-            title: Some("Tile Properties".to_string()),
-            size: vec2(300.0, 200.0),
-            ..Default::default()
-        };
-
-        TilePropertiesWindow {
-            params,
-            layer_id,
-            index,
-            attributes: None,
-        }
-    }
-}
-
-impl Window for TilePropertiesWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let mut action = None;
-
-        if let Some(attributes) = self.attributes.clone() {
-            let batch = self
-                .get_close_action()
-                .then(EditorAction::UpdateTileAttributes {
-                    layer_id: self.layer_id.clone(),
-                    index: self.index,
-                    attributes,
-                });
-
-            action = Some(batch);
-        }
-
-        res.push(ButtonParams {
-            label: "Save",
-            action,
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        _size: Vec2,
-        map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        let id = hash!("update_tile_window");
-
-        if self.attributes.is_none() {
-            if let Some(layer) = map.layers.get(&self.layer_id) {
-                if let Some(Some(tile)) = layer.tiles.get(self.index) {
-                    self.attributes = Some(tile.attributes.clone());
-                }
-            }
-        }
-
-        let mut is_jumpthrough;
-
-        if let Some(attributes) = &mut self.attributes {
-            let was_jumpthrough = attributes.contains(&(JUMPTHROUGH_ATTRIBUTE.to_string()));
-            is_jumpthrough = was_jumpthrough;
-
-            Checkbox::new(hash!(id, "jumpthrough_input"), None, "Platform")
-                .ui(ui, &mut is_jumpthrough);
-
-            if is_jumpthrough && !was_jumpthrough {
-                attributes.push(JUMPTHROUGH_ATTRIBUTE.to_string());
-            } else if !is_jumpthrough && was_jumpthrough {
-                attributes.retain(|s| s != JUMPTHROUGH_ATTRIBUTE);
-            }
-        }
-
-        None
-    }
-}
diff --git a/src/editor/gui/windows/tileset_properties.rs b/src/editor/gui/windows/tileset_properties.rs
deleted file mode 100644
index 88d3f3fda1..0000000000
--- a/src/editor/gui/windows/tileset_properties.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, widgets, Ui},
-};
-
-use crate::editor::gui::combobox::ComboBoxVec;
-use crate::editor::gui::{ComboBoxBuilder, ComboBoxValue};
-use crate::{gui::GuiResources, Resources};
-
-use super::{ButtonParams, EditorAction, EditorContext, Map, Window, WindowParams};
-use crate::map::MapTileset;
-use crate::resources::TextureKind;
-
-pub struct TilesetPropertiesWindow {
-    params: WindowParams,
-    tileset_id: String,
-    autotile_mask: Vec<bool>,
-    texture: ComboBoxVec,
-    has_data: bool,
-}
-
-impl TilesetPropertiesWindow {
-    pub fn new(tileset_id: &str) -> Self {
-        let params = WindowParams {
-            size: vec2(600.0, 500.0),
-            is_static: true,
-            ..Default::default()
-        };
-
-        let resources = storage::get::<Resources>();
-        let texture_ids = resources
-            .textures
-            .iter()
-            .filter_map(|(k, v)| {
-                if let Some(kind) = v.meta.kind {
-                    if kind == TextureKind::Tileset {
-                        return Some(k.as_str());
-                    }
-                }
-
-                None
-            })
-            .collect::<Vec<_>>();
-
-        let texture = ComboBoxVec::new(0, &texture_ids);
-
-        TilesetPropertiesWindow {
-            params,
-            tileset_id: tileset_id.to_string(),
-            autotile_mask: Vec::new(),
-            texture,
-            has_data: false,
-        }
-    }
-
-    pub fn read_from_tileset(&mut self, map: &Map) {
-        if let Some(tileset) = map.tilesets.get(&self.tileset_id) {
-            let subgrid_size = tileset.grid_size * tileset.tile_subdivisions;
-            let subtile_cnt = (subgrid_size.x * subgrid_size.y) as usize;
-
-            self.texture.set_value(&tileset.texture_id);
-
-            self.autotile_mask = Vec::with_capacity(subtile_cnt);
-            for i in 0..subtile_cnt {
-                if let Some(subtile) = tileset.autotile_mask.get(i) {
-                    self.autotile_mask.push(*subtile);
-                } else {
-                    self.autotile_mask.push(false);
-                }
-            }
-
-            self.has_data = true;
-        }
-    }
-
-    #[allow(dead_code)]
-    fn draw_autotile_settings(
-        &mut self,
-        ui: &mut Ui,
-        position: Vec2,
-        size: Vec2,
-        tileset: &MapTileset,
-    ) -> Option<EditorAction> {
-        let texture_entry = {
-            let resources = storage::get::<Resources>();
-            resources
-                .textures
-                .get(&tileset.texture_id)
-                .cloned()
-                .unwrap()
-        };
-
-        let tileset_texture_size = vec2(
-            texture_entry.texture.width(),
-            texture_entry.texture.height(),
-        );
-
-        let mut scaled_width = size.x;
-        let mut scaled_height = (scaled_width / tileset_texture_size.x) * tileset_texture_size.y;
-
-        if scaled_height > size.y {
-            scaled_height = size.y;
-            scaled_width = (scaled_height / tileset_texture_size.y) * tileset_texture_size.x;
-        }
-
-        let subgrid_size = tileset.grid_size * tileset.tile_subdivisions;
-
-        let scaled_subtile_size = vec2(
-            scaled_width / subgrid_size.x as f32,
-            scaled_height / subgrid_size.y as f32,
-        );
-
-        widgets::Texture::new(texture_entry.texture)
-            .size(scaled_width, scaled_height)
-            .position(position)
-            .ui(ui);
-
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.tileset_subtile_grid);
-        }
-
-        for y in 0..subgrid_size.y {
-            for x in 0..subgrid_size.x {
-                let i = (y * subgrid_size.x + x) as usize;
-
-                let is_selected = self.autotile_mask[i];
-
-                if is_selected {
-                    let gui_resources = storage::get::<GuiResources>();
-                    ui.push_skin(&gui_resources.skins.tileset_subtile_grid_selected);
-                }
-
-                let subtile_position = position + vec2(x as f32, y as f32) * scaled_subtile_size;
-
-                let was_clicked = widgets::Button::new("")
-                    .size(scaled_subtile_size)
-                    .position(subtile_position)
-                    .ui(ui);
-
-                if is_selected {
-                    ui.pop_skin();
-                }
-
-                if was_clicked {
-                    self.autotile_mask[i] = !is_selected;
-                }
-            }
-        }
-
-        ui.pop_skin();
-
-        None
-    }
-}
-
-impl Window for TilesetPropertiesWindow {
-    fn get_params(&self) -> &WindowParams {
-        &self.params
-    }
-
-    fn draw(
-        &mut self,
-        ui: &mut Ui,
-        _size: Vec2,
-        map: &Map,
-        _ctx: &EditorContext,
-    ) -> Option<EditorAction> {
-        if let Some(_tileset) = map.tilesets.get(&self.tileset_id) {
-            let id = hash!("tileset_properties_window");
-
-            if !self.has_data {
-                self.read_from_tileset(map);
-            }
-
-            if self.has_data {
-                /*
-                {
-                    let size = size;
-                    let position = Vec2::ZERO;
-
-                    if let Some(action) = self.draw_autotile_settings(ui, position, size, tileset) {
-                        return Some(action);
-                    }
-                }
-                */
-
-                widgets::Label::new(&self.tileset_id).ui(ui);
-
-                ui.separator();
-
-                ComboBoxBuilder::new(hash!(id, "texture_input"))
-                    .with_ratio(0.8)
-                    .with_label("Texture")
-                    .build(ui, &mut self.texture);
-            }
-        }
-
-        None
-    }
-
-    fn get_buttons(&self, _map: &Map, _ctx: &EditorContext) -> Vec<ButtonParams> {
-        let mut res = Vec::new();
-
-        let autotile_mask = self.autotile_mask.clone();
-
-        let action = self.get_close_action().then(EditorAction::UpdateTileset {
-            id: self.tileset_id.clone(),
-            texture_id: self.texture.get_value(),
-            autotile_mask,
-        });
-
-        res.push(ButtonParams {
-            label: "Save",
-            action: Some(action),
-            ..Default::default()
-        });
-
-        res.push(ButtonParams {
-            label: "Cancel",
-            action: Some(self.get_close_action()),
-            ..Default::default()
-        });
-
-        res
-    }
-}
diff --git a/src/editor/history.rs b/src/editor/history.rs
deleted file mode 100644
index 5bd33f33cd..0000000000
--- a/src/editor/history.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use core::Result;
-
-use crate::Map;
-
-use super::UndoableAction;
-
-pub struct EditorHistory {
-    undo_stack: Vec<Box<dyn UndoableAction>>,
-    redo_stack: Vec<Box<dyn UndoableAction>>,
-}
-
-impl EditorHistory {
-    pub fn new() -> Self {
-        EditorHistory {
-            undo_stack: Vec::new(),
-            redo_stack: Vec::new(),
-        }
-    }
-
-    pub fn apply(&mut self, mut action: Box<dyn UndoableAction>, map: &mut Map) -> Result<()> {
-        if !action.is_redundant(map) {
-            action.apply(map)?;
-            self.undo_stack.push(action);
-            self.redo_stack.clear();
-        }
-
-        Ok(())
-    }
-
-    pub fn undo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(mut action) = self.undo_stack.pop() {
-            action.undo(map)?;
-            self.redo_stack.push(action);
-        }
-
-        Ok(())
-    }
-
-    pub fn redo(&mut self, map: &mut Map) -> Result<()> {
-        if let Some(mut action) = self.redo_stack.pop() {
-            action.redo(map)?;
-            self.undo_stack.push(action);
-        }
-
-        Ok(())
-    }
-
-    pub fn clear(&mut self) {
-        self.undo_stack.clear();
-        self.redo_stack.clear();
-    }
-}
diff --git a/src/editor/input.rs b/src/editor/input.rs
deleted file mode 100644
index 1b8f312485..0000000000
--- a/src/editor/input.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-use macroquad::{experimental::collections::storage, prelude::*};
-
-use fishsticks::{Axis, Button};
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum EditorInputScheme {
-    Mouse,
-    Gamepad(fishsticks::GamepadId),
-}
-
-#[derive(Debug, Default, Clone, Copy)]
-pub struct EditorInput {
-    pub action: bool,
-    pub back: bool,
-    pub context_menu: bool,
-    pub camera_move_direction: Vec2,
-    pub camera_mouse_move: bool,
-    pub camera_zoom: f32,
-    pub cursor_move_direction: Vec2,
-    pub undo: bool,
-    pub redo: bool,
-    pub toggle_menu: bool,
-    pub toggle_draw_grid: bool,
-    pub toggle_snap_to_grid: bool,
-    pub toggle_disable_parallax: bool,
-    pub save: bool,
-    pub save_as: bool,
-    pub load: bool,
-    pub delete: bool,
-}
-
-pub fn collect_editor_input(scheme: EditorInputScheme) -> EditorInput {
-    let mut input = EditorInput::default();
-
-    match scheme {
-        EditorInputScheme::Mouse => {
-            input.action = is_mouse_button_down(MouseButton::Left);
-            input.camera_mouse_move = is_mouse_button_down(MouseButton::Middle);
-            input.context_menu = is_mouse_button_pressed(MouseButton::Right);
-
-            let (_, zoom) = mouse_wheel();
-            if zoom < 0.0 {
-                input.camera_zoom = -1.0;
-            } else if zoom > 0.0 {
-                input.camera_zoom = 1.0;
-            }
-
-            if is_key_down(KeyCode::LeftControl) {
-                if is_key_pressed(KeyCode::Z) {
-                    if is_key_down(KeyCode::LeftShift) {
-                        input.redo = true;
-                    } else {
-                        input.undo = true;
-                    }
-                }
-
-                input.toggle_snap_to_grid = is_key_pressed(KeyCode::G);
-
-                if is_key_pressed(KeyCode::S) {
-                    if is_key_down(KeyCode::LeftShift) {
-                        input.save_as = true;
-                    } else {
-                        input.save = true;
-                    }
-                }
-
-                if is_key_pressed(KeyCode::L) {
-                    input.load = true;
-                }
-            } else {
-                if is_key_pressed(KeyCode::Escape) {
-                    input.toggle_menu = true;
-                    input.back = true;
-                }
-
-                if is_key_down(KeyCode::Left) || is_key_down(KeyCode::A) {
-                    input.camera_move_direction.x = -1.0;
-                } else if is_key_down(KeyCode::Right) || is_key_down(KeyCode::D) {
-                    input.camera_move_direction.x = 1.0;
-                }
-
-                if is_key_down(KeyCode::Up) || is_key_down(KeyCode::W) {
-                    input.camera_move_direction.y = -1.0;
-                } else if is_key_down(KeyCode::Down) || is_key_down(KeyCode::S) {
-                    input.camera_move_direction.y = 1.0;
-                }
-
-                input.toggle_draw_grid = is_key_pressed(KeyCode::G);
-
-                input.toggle_disable_parallax = is_key_pressed(KeyCode::P);
-
-                input.delete = is_key_pressed(KeyCode::Delete);
-            }
-        }
-        EditorInputScheme::Gamepad(ix) => {
-            let gamepad_system = storage::get_mut::<fishsticks::GamepadContext>();
-            let gamepad = gamepad_system.gamepad(ix);
-
-            if let Some(gamepad) = gamepad {
-                input.action = gamepad.digital_inputs.activated(Button::East);
-                input.back = gamepad.digital_inputs.activated(Button::South);
-                input.context_menu = gamepad.digital_inputs.activated(Button::West);
-
-                input.camera_move_direction = {
-                    let direction_x = gamepad.analog_inputs.value(Axis::LeftStickX);
-                    let direction_y = gamepad.analog_inputs.value(Axis::LeftStickY);
-
-                    let direction = vec2(direction_x, direction_y);
-
-                    direction.normalize_or_zero()
-                };
-
-                input.cursor_move_direction = {
-                    let direction_x = gamepad.analog_inputs.value(Axis::RightStickX);
-                    let direction_y = gamepad.analog_inputs.value(Axis::RightStickY);
-
-                    let direction = vec2(direction_x, direction_y);
-
-                    direction.normalize_or_zero()
-                };
-            }
-        }
-    }
-
-    input
-}
diff --git a/src/editor/mod.rs b/src/editor/mod.rs
deleted file mode 100644
index 70978a91cc..0000000000
--- a/src/editor/mod.rs
+++ /dev/null
@@ -1,1657 +0,0 @@
-use std::any::TypeId;
-use std::path::Path;
-
-use crate::{
-    exit_to_main_menu,
-    map::{CRAB_TEXTURE_ID, FISH_SCHOOL_ICON_TEXTURE_ID},
-    quit_to_desktop, Resources,
-};
-
-mod camera;
-
-pub use camera::EditorCamera;
-
-pub mod gui;
-
-use gui::{
-    toggle_editor_menu,
-    toolbars::{
-        LayerListElement, ObjectListElement, TilesetDetailsElement, TilesetListElement,
-        ToolSelectorElement, Toolbar, ToolbarPosition,
-    },
-    CreateLayerWindow, CreateObjectWindow, CreateTilesetWindow, EditorGui, TilesetPropertiesWindow,
-};
-
-mod actions;
-
-use actions::{
-    CreateLayerAction, CreateObjectAction, CreateTilesetAction, DeleteLayerAction,
-    DeleteObjectAction, DeleteTilesetAction, EditorAction, PlaceTileAction, RemoveTileAction,
-    SetLayerDrawOrderIndexAction, UndoableAction, UpdateTilesetAction,
-};
-
-mod input;
-
-mod history;
-mod tools;
-
-pub use tools::{
-    add_tool_instance, get_tool_instance, get_tool_instance_of_id, EraserTool, ObjectPlacementTool,
-    TilePlacementTool, DEFAULT_TOOL_ICON_TEXTURE_ID,
-};
-
-use history::EditorHistory;
-pub use input::EditorInputScheme;
-
-use crate::editor::actions::{
-    CreateSpawnPointAction, DeleteSpawnPointAction, ImportAction, MoveSpawnPointAction,
-    UpdateBackgroundAction, UpdateLayerAction, UpdateObjectAction, UpdateTileAttributesAction,
-};
-use crate::editor::gui::windows::{
-    BackgroundPropertiesWindow, CreateMapWindow, ImportWindow, LoadMapWindow,
-    ObjectPropertiesWindow, SaveMapWindow, TilePropertiesWindow,
-};
-use crate::editor::input::{collect_editor_input, EditorInput};
-use crate::editor::tools::SpawnPointPlacementTool;
-use crate::gui::SELECTION_HIGHLIGHT_COLOR;
-use crate::map::{MapObject, MapObjectKind};
-use crate::player::IDLE_ANIMATION_ID;
-use macroquad::{
-    color,
-    experimental::{
-        collections::storage,
-        scene::{Node, RefMut},
-    },
-    prelude::*,
-};
-
-use core::text::{draw_aligned_text, HorizontalAlignment, VerticalAlignment};
-
-use super::map::{Map, MapLayerKind};
-use crate::resources::{
-    map_name_to_filename, MapResource, MAP_EXPORTS_DEFAULT_DIR, MAP_EXPORTS_EXTENSION,
-};
-
-#[derive(Debug, Clone)]
-pub struct EditorContext {
-    pub selected_tool: Option<TypeId>,
-    pub selected_layer: Option<String>,
-    pub selected_tileset: Option<String>,
-    pub selected_tile: Option<u32>,
-    pub selected_object: Option<usize>,
-    pub input_scheme: EditorInputScheme,
-    pub cursor_position: Vec2,
-    pub is_user_map: bool,
-    pub is_tiled_map: bool,
-    pub should_snap_to_grid: bool,
-}
-
-impl Default for EditorContext {
-    fn default() -> Self {
-        EditorContext {
-            selected_tool: None,
-            selected_layer: None,
-            selected_tileset: None,
-            selected_tile: None,
-            selected_object: None,
-            input_scheme: EditorInputScheme::Mouse,
-            cursor_position: Vec2::ZERO,
-            is_user_map: false,
-            is_tiled_map: false,
-            should_snap_to_grid: false,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-enum DraggedObject {
-    MapObject {
-        id: String,
-        kind: MapObjectKind,
-        index: usize,
-        layer_id: String,
-        click_offset: Vec2,
-    },
-    SpawnPoint {
-        index: usize,
-        click_offset: Vec2,
-    },
-}
-
-const SPAWN_POINT_COLLIDER_WIDTH: f32 = 38.0;
-const SPAWN_POINT_COLLIDER_HEIGHT: f32 = 49.0;
-
-pub struct Editor {
-    map_resource: MapResource,
-
-    selected_tool: Option<TypeId>,
-    selected_layer: Option<String>,
-    selected_tileset: Option<String>,
-    // Selected tile in tileset
-    selected_tile: Option<u32>,
-    selected_object: Option<usize>,
-    selected_spawn_point: Option<usize>,
-
-    // Selected tile in map
-    selected_map_tile_index: Option<usize>,
-
-    input_scheme: EditorInputScheme,
-    previous_cursor_position: Vec2,
-    cursor_position: Vec2,
-    history: EditorHistory,
-
-    previous_input: EditorInput,
-    input: EditorInput,
-    mouse_movement: Vec2,
-
-    info_message: Option<String>,
-
-    dragged_object: Option<DraggedObject>,
-
-    info_message_timer: f32,
-    double_click_timer: f32,
-
-    should_draw_grid: bool,
-    should_snap_to_grid: bool,
-    is_parallax_disabled: bool,
-}
-
-impl Editor {
-    const CAMERA_PAN_THRESHOLD: f32 = 0.005;
-
-    const CAMERA_PAN_SPEED: f32 = 5.0;
-    const CAMERA_ZOOM_STEP: f32 = 0.1;
-    const CAMERA_ZOOM_MIN: f32 = 0.1;
-    const CAMERA_ZOOM_MAX: f32 = 2.5;
-
-    const CURSOR_MOVE_SPEED: f32 = 5.0;
-
-    const OBJECT_SELECTION_RECT_SIZE: f32 = 75.0;
-    const OBJECT_SELECTION_RECT_PADDING: f32 = 8.0;
-
-    const GRID_LINE_WIDTH: f32 = 1.0;
-    const GRID_COLOR: Color = Color {
-        r: 1.0,
-        g: 1.0,
-        b: 1.0,
-        a: 0.25,
-    };
-
-    const DOUBLE_CLICK_THRESHOLD: f32 = 0.25;
-
-    const MESSAGE_TIMEOUT: f32 = 2.5;
-
-    pub fn new(input_scheme: EditorInputScheme, map_resource: MapResource) -> Self {
-        add_tool_instance(TilePlacementTool::new());
-        add_tool_instance(ObjectPlacementTool::new());
-        add_tool_instance(SpawnPointPlacementTool::new());
-        add_tool_instance(EraserTool::new());
-
-        let selected_tool = None;
-
-        let selected_layer = map_resource.map.draw_order.first().cloned();
-
-        let cursor_position = match input_scheme {
-            EditorInputScheme::Mouse => mouse_position().into(),
-            EditorInputScheme::Gamepad(..) => vec2(screen_width() / 2.0, screen_height() / 2.0),
-        };
-
-        let tool_selector_element = ToolSelectorElement::new()
-            .with_tool::<TilePlacementTool>()
-            .with_tool::<ObjectPlacementTool>()
-            .with_tool::<SpawnPointPlacementTool>()
-            .with_tool::<EraserTool>();
-
-        let left_toolbar = Toolbar::new(ToolbarPosition::Left, EditorGui::LEFT_TOOLBAR_WIDTH)
-            .with_element(
-                EditorGui::TOOL_SELECTOR_HEIGHT_FACTOR,
-                tool_selector_element,
-            );
-
-        let right_toolbar = Toolbar::new(ToolbarPosition::Right, EditorGui::RIGHT_TOOLBAR_WIDTH)
-            .with_element(EditorGui::LAYER_LIST_HEIGHT_FACTOR, LayerListElement::new())
-            .with_element(
-                EditorGui::TILESET_LIST_HEIGHT_FACTOR,
-                TilesetListElement::new(),
-            )
-            .with_element(
-                EditorGui::TILESET_DETAILS_HEIGHT_FACTOR,
-                TilesetDetailsElement::new(),
-            )
-            .with_element(
-                EditorGui::OBJECT_LIST_HEIGHT_FACTOR,
-                ObjectListElement::new(),
-            );
-
-        let gui = EditorGui::new()
-            .with_toolbar(left_toolbar)
-            .with_toolbar(right_toolbar);
-
-        storage::store(gui);
-
-        Editor {
-            map_resource,
-            selected_tool,
-            selected_layer,
-            selected_tileset: None,
-            selected_tile: None,
-            selected_object: None,
-            selected_spawn_point: None,
-
-            selected_map_tile_index: None,
-
-            input_scheme,
-            previous_cursor_position: cursor_position,
-            cursor_position,
-            history: EditorHistory::new(),
-
-            previous_input: EditorInput::default(),
-            input: EditorInput::default(),
-            mouse_movement: Vec2::ZERO,
-
-            info_message: None,
-
-            dragged_object: None,
-
-            info_message_timer: 0.0,
-            double_click_timer: Self::DOUBLE_CLICK_THRESHOLD,
-
-            should_draw_grid: true,
-            should_snap_to_grid: false,
-            is_parallax_disabled: false,
-        }
-    }
-
-    #[allow(dead_code)]
-    fn get_selected_tile(&self) -> Option<(String, u32)> {
-        if let Some(tileset_id) = self.selected_tileset.clone() {
-            if let Some(tile_id) = self.selected_tile {
-                let selected = (tileset_id, tile_id);
-                return Some(selected);
-            }
-        }
-
-        None
-    }
-
-    fn get_map(&self) -> &Map {
-        &self.map_resource.map
-    }
-
-    #[allow(dead_code)]
-    fn get_map_mut(&mut self) -> &mut Map {
-        &mut self.map_resource.map
-    }
-
-    fn get_context(&self) -> EditorContext {
-        EditorContext {
-            selected_tool: self.selected_tool,
-            selected_layer: self.selected_layer.clone(),
-            selected_tileset: self.selected_tileset.clone(),
-            selected_tile: self.selected_tile,
-            selected_object: self.selected_object,
-            input_scheme: self.input_scheme,
-            cursor_position: self.cursor_position,
-            is_user_map: self.map_resource.meta.is_user_map,
-            is_tiled_map: self.map_resource.meta.is_tiled_map,
-            should_snap_to_grid: self.should_snap_to_grid,
-        }
-    }
-
-    fn update_context(&mut self) {
-        if let Some(layer_id) = &self.selected_layer {
-            if !self.get_map().draw_order.contains(layer_id) {
-                self.selected_layer = None;
-            }
-        } else if let Some(layer_id) = self.get_map().draw_order.first() {
-            self.selected_layer = Some(layer_id.clone());
-        }
-
-        if let Some(layer_id) = &self.selected_layer {
-            let layer = self.get_map().layers.get(layer_id).unwrap();
-
-            match layer.kind {
-                MapLayerKind::TileLayer => {
-                    self.selected_object = None;
-                }
-                MapLayerKind::ObjectLayer => {
-                    self.selected_tileset = None;
-                    self.selected_tile = None;
-                }
-            }
-        }
-
-        if let Some(tileset_id) = &self.selected_tileset {
-            if let Some(tileset) = self.get_map().tilesets.get(tileset_id) {
-                if let Some(tile_id) = self.selected_tile {
-                    if tile_id >= tileset.tile_cnt {
-                        self.selected_tile = None;
-                    }
-                }
-            } else {
-                self.selected_tileset = None;
-                self.selected_tile = None;
-            }
-        }
-
-        if let Some(tool_id) = &self.selected_tool {
-            let tool = get_tool_instance_of_id(tool_id);
-            let ctx = self.get_context();
-            if !tool.is_available(self.get_map(), &ctx) {
-                self.selected_tool = None;
-            }
-        }
-    }
-
-    fn clear_context(&mut self) {
-        self.selected_tool = None;
-        self.selected_layer = None;
-        self.selected_tileset = None;
-        self.selected_tile = None;
-        self.selected_object = None;
-    }
-
-    fn select_tileset(&mut self, tileset_id: &str, tile_id: Option<u32>) {
-        if let Some(tileset) = self.map_resource.map.tilesets.get(tileset_id) {
-            self.selected_tileset = Some(tileset_id.to_string());
-
-            if let Some(tile_id) = tile_id {
-                if tile_id < tileset.first_tile_id + tileset.tile_cnt {
-                    self.selected_tile = Some(tile_id);
-                    return;
-                }
-            }
-
-            self.selected_tile = Some(tileset.first_tile_id);
-        }
-    }
-
-    // This applies an `EditorAction`. This is to be used, exclusively, in stead of, for example,
-    // applying `UndoableActions` directly on the `History` of `Editor`.
-    fn apply_action(&mut self, action: EditorAction) {
-        //println!("Action: {:?}", action);
-
-        let mut res = Ok(());
-
-        match action {
-            EditorAction::Batch(actions) => {
-                for action in actions {
-                    self.apply_action(action)
-                }
-            }
-            EditorAction::Undo => {
-                res = self.history.undo(&mut self.map_resource.map);
-            }
-            EditorAction::Redo => {
-                res = self.history.redo(&mut self.map_resource.map);
-            }
-            EditorAction::SelectTool(id) => {
-                self.selected_tool = id;
-            }
-            EditorAction::UpdateBackground { color, layers } => {
-                let action = UpdateBackgroundAction::new(color, layers);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::OpenBackgroundPropertiesWindow => {
-                let map = &self.map_resource.map;
-
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(BackgroundPropertiesWindow::new(
-                    map.background_color,
-                    map.background_layers.clone(),
-                ));
-            }
-            EditorAction::OpenCreateLayerWindow => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(CreateLayerWindow::new());
-            }
-            EditorAction::OpenCreateTilesetWindow => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(CreateTilesetWindow::new());
-            }
-            EditorAction::OpenTilesetPropertiesWindow(tileset_id) => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(TilesetPropertiesWindow::new(&tileset_id));
-            }
-            EditorAction::OpenCreateObjectWindow { position, layer_id } => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(CreateObjectWindow::new(position, layer_id))
-            }
-            EditorAction::OpenObjectPropertiesWindow { layer_id, index } => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(ObjectPropertiesWindow::new(layer_id, index))
-            }
-            EditorAction::OpenTilePropertiesWindow { layer_id, index } => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(TilePropertiesWindow::new(layer_id, index))
-            }
-            EditorAction::CloseWindow(id) => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.remove_window_id(id);
-            }
-            EditorAction::SelectTile { id, tileset_id } => {
-                self.select_tileset(&tileset_id, Some(id));
-            }
-            EditorAction::UpdateTileAttributes {
-                index,
-                layer_id,
-                attributes,
-            } => {
-                let action = UpdateTileAttributesAction::new(index, layer_id, attributes);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::SelectLayer(id) => {
-                if self.get_map().layers.contains_key(&id) {
-                    self.selected_layer = Some(id);
-                }
-            }
-            EditorAction::SetLayerDrawOrderIndex { id, index } => {
-                let action = SetLayerDrawOrderIndexAction::new(id, index);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::CreateLayer {
-                id,
-                kind,
-                has_collision,
-                index,
-            } => {
-                let action = CreateLayerAction::new(id, kind, has_collision, index);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::DeleteLayer(id) => {
-                let action = DeleteLayerAction::new(id);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::UpdateLayer { id, is_visible } => {
-                let action = UpdateLayerAction::new(id, is_visible);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::SelectTileset(id) => {
-                self.select_tileset(&id, None);
-            }
-            EditorAction::CreateTileset { id, texture_id } => {
-                let action = CreateTilesetAction::new(id, texture_id);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::DeleteTileset(id) => {
-                let action = DeleteTilesetAction::new(id);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::UpdateTileset {
-                id,
-                texture_id,
-                autotile_mask,
-            } => {
-                let action = UpdateTilesetAction::new(id, texture_id, autotile_mask);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::SelectObject { index, layer_id } => {
-                self.selected_layer = Some(layer_id);
-                self.selected_object = Some(index);
-            }
-            EditorAction::CreateObject {
-                id,
-                kind,
-                position,
-                layer_id,
-            } => {
-                let action = CreateObjectAction::new(id, kind, position, layer_id);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::DeleteObject { index, layer_id } => {
-                let action = DeleteObjectAction::new(index, layer_id);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::UpdateObject {
-                layer_id,
-                index,
-                id,
-                kind,
-                position,
-            } => {
-                let action = UpdateObjectAction::new(layer_id, index, id, kind, position);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::CreateSpawnPoint(position) => {
-                let action = CreateSpawnPointAction::new(position);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::DeleteSpawnPoint(index) => {
-                let action = DeleteSpawnPointAction::new(index);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::MoveSpawnPoint { index, position } => {
-                let action = MoveSpawnPointAction::new(index, position);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::PlaceTile {
-                id,
-                layer_id,
-                tileset_id,
-                coords,
-            } => {
-                let action = PlaceTileAction::new(id, layer_id, tileset_id, coords);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::RemoveTile { layer_id, coords } => {
-                let action = RemoveTileAction::new(layer_id, coords);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::OpenImportWindow(map_index) => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(ImportWindow::new(map_index));
-            }
-            EditorAction::Import {
-                tilesets,
-                background_color,
-                background_layers,
-            } => {
-                let action = ImportAction::new(tilesets, background_color, background_layers);
-                res = self
-                    .history
-                    .apply(Box::new(action), &mut self.map_resource.map);
-            }
-            EditorAction::CreateMap {
-                name,
-                description,
-                grid_size,
-                tile_size,
-            } => {
-                let resources = storage::get::<Resources>();
-                let res = resources.create_map(&name, description.as_deref(), tile_size, grid_size);
-                match res {
-                    Err(err) => println!("Create Map: {}", err),
-                    Ok(map_resource) => {
-                        self.map_resource = map_resource;
-                        self.history.clear();
-                        self.clear_context();
-                    }
-                }
-            }
-            EditorAction::OpenCreateMapWindow => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(CreateMapWindow::new());
-            }
-            EditorAction::OpenMap(index) => {
-                let resources = storage::get::<Resources>();
-                let map_resource = resources.maps.get(index).cloned().unwrap();
-
-                self.map_resource = map_resource;
-                self.history.clear();
-                self.clear_context();
-            }
-            EditorAction::OpenLoadMapWindow => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(LoadMapWindow::new());
-            }
-            EditorAction::SaveMap { name, is_user_map } => {
-                let mut map_resource = self.map_resource.clone();
-
-                if let Some(name) = name {
-                    let path = Path::new(MAP_EXPORTS_DEFAULT_DIR)
-                        .join(map_name_to_filename(&name))
-                        .with_extension(MAP_EXPORTS_EXTENSION);
-
-                    map_resource.meta.name = name;
-                    map_resource.meta.path = path.to_string_lossy().to_string();
-                }
-
-                if let Some(is_user_map) = is_user_map {
-                    map_resource.meta.is_user_map = is_user_map;
-                }
-                map_resource.meta.is_tiled_map = false;
-
-                let mut resources = storage::get_mut::<Resources>();
-                if resources.save_map(&map_resource).is_ok() {
-                    self.map_resource = map_resource;
-                }
-            }
-            EditorAction::OpenSaveMapWindow => {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.add_window(SaveMapWindow::new(&self.map_resource.meta.name));
-            }
-            EditorAction::DeleteMap(index) => {
-                let mut resources = storage::get_mut::<Resources>();
-                resources.delete_map(index).unwrap();
-            }
-            EditorAction::ExitToMainMenu => {
-                exit_to_main_menu();
-            }
-            EditorAction::QuitToDesktop => {
-                quit_to_desktop();
-            }
-        }
-
-        if let Err(err) = res {
-            panic!("Error: {}", err);
-        }
-
-        self.update_context();
-    }
-}
-
-impl Node for Editor {
-    fn update(mut node: RefMut<Self>) {
-        node.update_context();
-
-        if node.input_scheme == EditorInputScheme::Mouse {
-            node.previous_cursor_position = node.cursor_position;
-            node.cursor_position = mouse_position().into();
-        }
-
-        let dt = get_frame_time();
-
-        node.previous_input = node.input;
-        node.input = collect_editor_input(node.input_scheme);
-
-        {
-            let movement = node.cursor_position - node.previous_cursor_position;
-            node.mouse_movement += movement;
-        }
-
-        if node.info_message.is_some() {
-            node.info_message_timer += dt;
-
-            if node.info_message_timer >= Self::MESSAGE_TIMEOUT {
-                node.info_message = None;
-                node.info_message_timer = 0.0;
-            }
-        }
-
-        if node.input.save {
-            let action = if node.map_resource.meta.is_user_map {
-                EditorAction::SaveMap {
-                    name: None,
-                    is_user_map: None,
-                }
-            } else {
-                EditorAction::OpenSaveMapWindow
-            };
-
-            node.apply_action(action);
-        }
-
-        if node.input.save_as {
-            let action = EditorAction::OpenSaveMapWindow;
-            node.apply_action(action);
-        }
-
-        if node.input.load {
-            let action = EditorAction::OpenLoadMapWindow;
-            node.apply_action(action);
-        }
-
-        if !node.input.action && node.double_click_timer < Self::DOUBLE_CLICK_THRESHOLD {
-            node.double_click_timer =
-                (node.double_click_timer + dt).clamp(0.0, Self::DOUBLE_CLICK_THRESHOLD);
-        }
-
-        if node.input.toggle_menu {
-            toggle_editor_menu(&node.get_context());
-        }
-
-        if node.input.toggle_draw_grid {
-            node.should_draw_grid = !node.should_draw_grid;
-
-            node.info_message = {
-                let state = if node.should_draw_grid { "ON" } else { "OFF" };
-
-                Some(format!("Draw grid: {}", state))
-            }
-        }
-
-        if node.input.toggle_snap_to_grid {
-            node.should_snap_to_grid = !node.should_snap_to_grid;
-
-            node.info_message = {
-                let state = if node.should_snap_to_grid {
-                    "ON"
-                } else {
-                    "OFF"
-                };
-
-                Some(format!("Snap to grid: {}", state))
-            }
-        }
-
-        if node.input.toggle_disable_parallax {
-            node.is_parallax_disabled = !node.is_parallax_disabled;
-
-            node.info_message = {
-                let state = if node.is_parallax_disabled {
-                    "OFF"
-                } else {
-                    "ON"
-                };
-
-                Some(format!("Parallax: {}", state))
-            }
-        }
-
-        if node.input.undo {
-            node.apply_action(EditorAction::Undo);
-        } else if node.input.redo {
-            node.apply_action(EditorAction::Redo);
-        }
-
-        let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-            .unwrap()
-            .to_world_space(node.cursor_position);
-
-        let (is_cursor_over_gui, is_cursor_over_context_menu) = {
-            let gui = storage::get::<EditorGui>();
-            let is_over_gui = gui.contains(node.cursor_position);
-            let mut is_over_context_menu = false;
-            if is_over_gui && gui.context_menu_contains(node.cursor_position) {
-                is_over_context_menu = true;
-            }
-
-            (is_over_gui, is_over_context_menu)
-        };
-
-        if let Some(id) = &node.selected_tool {
-            let res = {
-                let tool = get_tool_instance_of_id(id);
-                let map = node.get_map();
-                let ctx = node.get_context();
-
-                tool.update(map, &ctx)
-            };
-
-            if let Some(action) = res {
-                node.apply_action(action);
-            }
-        }
-
-        if node.input.action {
-            if !is_cursor_over_context_menu {
-                let mut gui = storage::get_mut::<EditorGui>();
-                gui.close_context_menu();
-            }
-
-            if !is_cursor_over_gui {
-                if let Some(id) = &node.selected_tool {
-                    let ctx = node.get_context();
-                    let tool = get_tool_instance_of_id(id);
-                    let params = tool.get_params();
-                    if !node.previous_input.action || params.is_continuous {
-                        if let Some(action) = tool.get_action(node.get_map(), &ctx) {
-                            node.apply_action(action);
-                        }
-                    }
-                } else if node.previous_input.action {
-                    if node.cursor_position == node.previous_cursor_position
-                        && node.dragged_object.is_none()
-                    {
-                        if let Some(index) = node.selected_object {
-                            let layer_id = node.selected_layer.clone().unwrap();
-                            let layer = node.get_map().layers.get(&layer_id).unwrap();
-
-                            let object = layer.objects.get(index).unwrap();
-                            let position = scene::find_node_by_type::<EditorCamera>()
-                                .unwrap()
-                                .to_screen_space(object.position);
-
-                            let size = get_object_size(object);
-                            let rect = Rect::new(position.x, position.y, size.x, size.y);
-
-                            if rect.contains(node.cursor_position) {
-                                let click_offset = node.cursor_position - position;
-
-                                node.dragged_object = Some(DraggedObject::MapObject {
-                                    id: object.id.clone(),
-                                    kind: object.kind,
-                                    index,
-                                    layer_id,
-                                    click_offset,
-                                })
-                            }
-                        } else if let Some(index) = node.selected_spawn_point {
-                            let spawn_point = node.get_map().spawn_points[index];
-
-                            let position = scene::find_node_by_type::<EditorCamera>()
-                                .unwrap()
-                                .to_screen_space(spawn_point);
-
-                            let rect = Rect::new(
-                                position.x,
-                                position.y,
-                                SPAWN_POINT_COLLIDER_WIDTH,
-                                SPAWN_POINT_COLLIDER_HEIGHT,
-                            );
-
-                            if rect.contains(node.cursor_position) {
-                                let click_offset = node.cursor_position - position;
-
-                                node.dragged_object = Some(DraggedObject::SpawnPoint {
-                                    index,
-                                    click_offset,
-                                })
-                            }
-                        }
-                    }
-                } else {
-                    let mut is_double_click = false;
-                    let mut is_selecting_object = false;
-                    let mut is_selecting_spawn_point = false;
-                    let mut is_selecting_tile = false;
-
-                    if node.double_click_timer < Self::DOUBLE_CLICK_THRESHOLD {
-                        node.double_click_timer = Self::DOUBLE_CLICK_THRESHOLD;
-                        is_double_click = true;
-                    } else {
-                        node.double_click_timer = 0.0;
-                    }
-
-                    let mut layer_ids = node
-                        .map_resource
-                        .map
-                        .layers
-                        .keys()
-                        .cloned()
-                        .collect::<Vec<String>>();
-
-                    if let Some(selected_layer_id) = &node.selected_layer {
-                        let res = layer_ids.iter().enumerate().find_map(|(i, layer_id)| {
-                            if layer_id == selected_layer_id {
-                                Some(i)
-                            } else {
-                                None
-                            }
-                        });
-
-                        if let Some(i) = res {
-                            layer_ids.remove(i);
-                            layer_ids.insert(0, selected_layer_id.clone());
-                        }
-                    }
-
-                    let mut object_index = None;
-                    let mut layer_id = None;
-
-                    'layers: for id in &layer_ids {
-                        let layer = node.map_resource.map.layers.get(id).unwrap();
-                        if layer.kind == MapLayerKind::ObjectLayer {
-                            for (i, object) in layer.objects.iter().enumerate() {
-                                let size = get_object_size(object);
-                                let position = object.position + node.map_resource.map.world_offset;
-
-                                let rect = Rect::new(position.x, position.y, size.x, size.y);
-
-                                if rect.contains(cursor_world_position) {
-                                    object_index = Some(i);
-                                    layer_id = Some(id.clone());
-
-                                    break 'layers;
-                                }
-                            }
-                        }
-                    }
-
-                    if let Some(i) = object_index {
-                        let mut should_select = true;
-
-                        if let Some(current_index) = node.selected_object {
-                            if current_index == i {
-                                should_select = false;
-
-                                if is_double_click {
-                                    let layer_id = layer_id.clone().unwrap();
-
-                                    let action = EditorAction::OpenObjectPropertiesWindow {
-                                        layer_id,
-                                        index: i,
-                                    };
-
-                                    node.apply_action(action);
-                                } else {
-                                    node.selected_object = None;
-                                }
-                            }
-                        }
-
-                        if should_select {
-                            is_selecting_object = true;
-
-                            let layer_id = layer_id.unwrap();
-
-                            let action = EditorAction::SelectObject { index: i, layer_id };
-
-                            node.apply_action(action);
-                        }
-                    } else {
-                        for (i, spawn_point) in node.get_map().spawn_points.iter().enumerate() {
-                            let position = scene::find_node_by_type::<EditorCamera>()
-                                .unwrap()
-                                .to_screen_space(*spawn_point);
-
-                            let rect = Rect::new(
-                                position.x,
-                                position.y,
-                                SPAWN_POINT_COLLIDER_WIDTH,
-                                SPAWN_POINT_COLLIDER_HEIGHT,
-                            );
-
-                            if rect.contains(node.cursor_position) {
-                                is_selecting_spawn_point = true;
-
-                                let mut should_select = true;
-
-                                if let Some(index) = node.selected_spawn_point {
-                                    if index == i {
-                                        node.selected_spawn_point = None;
-                                        should_select = false;
-                                    }
-                                }
-
-                                if should_select {
-                                    node.selected_spawn_point = Some(i);
-                                }
-
-                                break;
-                            }
-                        }
-
-                        if !is_selecting_spawn_point {
-                            let mut tile_index = None;
-
-                            'tile_layers: for id in &layer_ids {
-                                let layer = node.get_map().layers.get(id).unwrap();
-                                if layer.kind == MapLayerKind::TileLayer {
-                                    let world_offset = node.get_map().world_offset;
-                                    let tile_size = node.get_map().tile_size;
-
-                                    for (x, y, tile) in node.map_resource.map.get_tiles(id, None) {
-                                        if tile.is_some() {
-                                            let rect = Rect::new(
-                                                world_offset.x + (x as f32 * tile_size.x),
-                                                world_offset.y + (y as f32 * tile_size.y),
-                                                tile_size.x,
-                                                tile_size.y,
-                                            );
-                                            if rect.contains(cursor_world_position) {
-                                                let i = node.get_map().to_index(uvec2(x, y));
-                                                tile_index = Some(i);
-                                                layer_id = Some(id.clone());
-
-                                                break 'tile_layers;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-
-                            if let Some(tile_index) = tile_index {
-                                let mut should_select = true;
-
-                                if let Some(selected_tile_index) = node.selected_map_tile_index {
-                                    if selected_tile_index == tile_index
-                                        && layer_id.as_ref().unwrap()
-                                            == node.selected_layer.as_ref().unwrap()
-                                    {
-                                        should_select = false;
-
-                                        if is_double_click {
-                                            let layer_id = layer_id.clone().unwrap();
-
-                                            let action = EditorAction::OpenTilePropertiesWindow {
-                                                layer_id,
-                                                index: tile_index,
-                                            };
-
-                                            node.apply_action(action);
-                                        } else {
-                                            node.selected_map_tile_index = None;
-                                        }
-                                    }
-                                }
-
-                                if should_select {
-                                    is_selecting_tile = true;
-                                    node.selected_map_tile_index = Some(tile_index);
-                                    node.selected_layer = layer_id;
-                                }
-                            }
-                        }
-                    }
-
-                    if !is_selecting_tile && !is_selecting_object && !is_selecting_spawn_point {
-                        node.selected_map_tile_index = None;
-                        node.selected_object = None;
-                        node.selected_spawn_point = None;
-                    }
-                }
-            }
-        } else if let Some(dragged_object) = node.dragged_object.take() {
-            let map = node.get_map();
-
-            let click_offset = match dragged_object {
-                DraggedObject::MapObject { click_offset, .. }
-                | DraggedObject::SpawnPoint { click_offset, .. } => click_offset,
-            };
-
-            let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-                .unwrap()
-                .to_world_space(node.cursor_position - click_offset);
-
-            let mut position = (cursor_world_position).clamp(
-                map.world_offset,
-                map.world_offset + (map.grid_size.as_f32() * map.tile_size),
-            );
-
-            if node.should_snap_to_grid {
-                let coords = map.to_coords(position);
-                position = map.to_position(coords);
-            }
-
-            match dragged_object {
-                DraggedObject::MapObject {
-                    id,
-                    kind,
-                    index,
-                    layer_id,
-                    ..
-                } => {
-                    let action = EditorAction::UpdateObject {
-                        id,
-                        kind,
-                        index,
-                        layer_id,
-                        position,
-                    };
-
-                    node.apply_action(action);
-                }
-                DraggedObject::SpawnPoint { index, .. } => {
-                    let action = EditorAction::MoveSpawnPoint { index, position };
-
-                    node.apply_action(action);
-                }
-            }
-        }
-
-        if node.input.delete {
-            if let Some(index) = node.selected_object.take() {
-                let layer_id = node.selected_layer.clone().unwrap();
-
-                let action = EditorAction::DeleteObject { index, layer_id };
-
-                node.apply_action(action);
-            } else if let Some(index) = node.selected_map_tile_index.take() {
-                let layer_id = node.selected_layer.clone().unwrap();
-                let coords = {
-                    let grid_size = node.get_map().grid_size;
-                    uvec2(index as u32 % grid_size.x, index as u32 / grid_size.x)
-                };
-
-                let action = EditorAction::RemoveTile { coords, layer_id };
-
-                node.apply_action(action);
-            } else if let Some(index) = node.selected_spawn_point.take() {
-                let action = EditorAction::DeleteSpawnPoint(index);
-                node.apply_action(action);
-            }
-        }
-
-        if node.input.context_menu {
-            let mut gui = storage::get_mut::<EditorGui>();
-            gui.open_context_menu(
-                node.cursor_position,
-                &node.map_resource.map,
-                node.get_context(),
-            );
-        }
-    }
-
-    fn fixed_update(mut node: RefMut<Self>) {
-        if let EditorInputScheme::Gamepad { .. } = node.input_scheme {
-            node.previous_cursor_position = node.cursor_position;
-            let movement = node.input.cursor_move_direction * Self::CURSOR_MOVE_SPEED;
-            node.cursor_position += movement;
-        }
-
-        let is_cursor_over_map = {
-            let gui = storage::get::<EditorGui>();
-            !gui.contains(node.cursor_position)
-        };
-
-        let screen_size = vec2(screen_width(), screen_height());
-
-        let threshold = screen_size * Self::CAMERA_PAN_THRESHOLD;
-
-        let mut pan_direction = node.input.camera_move_direction;
-
-        if node.cursor_position.x <= threshold.x {
-            pan_direction.x = -1.0;
-        } else if node.cursor_position.x >= screen_size.x - threshold.x {
-            pan_direction.x = 1.0;
-        }
-
-        if node.cursor_position.y <= threshold.y {
-            pan_direction.y = -1.0;
-        } else if node.cursor_position.y >= screen_size.y - threshold.y {
-            pan_direction.y = 1.0;
-        }
-
-        let mut movement = pan_direction * Self::CAMERA_PAN_SPEED;
-
-        let mut camera = scene::find_node_by_type::<EditorCamera>().unwrap();
-
-        if movement == Vec2::ZERO && node.input.camera_mouse_move {
-            movement = -node.mouse_movement / camera.scale;
-        }
-
-        node.mouse_movement = Vec2::ZERO;
-
-        camera.position = (camera.position + movement).clamp(Vec2::ZERO, node.get_map().get_size());
-
-        if is_cursor_over_map {
-            camera.scale = (camera.scale + node.input.camera_zoom * Self::CAMERA_ZOOM_STEP)
-                .clamp(Self::CAMERA_ZOOM_MIN, Self::CAMERA_ZOOM_MAX);
-        }
-    }
-
-    fn draw(mut node: RefMut<Self>) {
-        {
-            let map = node.get_map();
-            map.draw_background(None, node.is_parallax_disabled);
-            map.draw(None, false);
-        }
-
-        if node.should_draw_grid {
-            let map = node.get_map();
-            let map_size = map.grid_size.as_f32() * map.tile_size;
-
-            draw_rectangle_lines(
-                map.world_offset.x,
-                map.world_offset.y,
-                map_size.x,
-                map_size.y,
-                Self::GRID_LINE_WIDTH,
-                Self::GRID_COLOR,
-            );
-
-            for x in 0..map.grid_size.x {
-                let begin = vec2(
-                    map.world_offset.x + (x as f32 * map.tile_size.x),
-                    map.world_offset.y,
-                );
-
-                let end = vec2(
-                    begin.x,
-                    begin.y + (map.grid_size.y as f32 * map.tile_size.y),
-                );
-
-                draw_line(
-                    begin.x,
-                    begin.y,
-                    end.x,
-                    end.y,
-                    Self::GRID_LINE_WIDTH,
-                    Self::GRID_COLOR,
-                )
-            }
-
-            for y in 0..map.grid_size.y {
-                let begin = vec2(
-                    map.world_offset.x,
-                    map.world_offset.y + (y as f32 * map.tile_size.y),
-                );
-
-                let end = vec2(
-                    begin.x + (map.grid_size.x as f32 * map.tile_size.x),
-                    begin.y,
-                );
-
-                draw_line(
-                    begin.x,
-                    begin.y,
-                    end.x,
-                    end.y,
-                    Self::GRID_LINE_WIDTH,
-                    Self::GRID_COLOR,
-                )
-            }
-        }
-
-        {
-            let resources = storage::get::<Resources>();
-
-            for (i, spawn_point) in node.get_map().spawn_points.iter().enumerate() {
-                let mut is_selected = false;
-
-                let mut position = *spawn_point;
-
-                if let Some(DraggedObject::SpawnPoint {
-                    index,
-                    click_offset,
-                }) = node.dragged_object.clone()
-                {
-                    if index == i {
-                        let map = node.get_map();
-
-                        let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-                            .unwrap()
-                            .to_world_space(node.cursor_position - click_offset);
-
-                        position = (cursor_world_position).clamp(
-                            map.world_offset,
-                            map.world_offset + (map.grid_size.as_f32() * map.tile_size),
-                        );
-
-                        if node.should_snap_to_grid {
-                            let coords = map.to_coords(position);
-                            position = map.to_position(coords);
-                        }
-                    }
-                }
-
-                if let Some(index) = node.selected_spawn_point {
-                    is_selected = index == i;
-                }
-
-                let texture_res = resources.textures.get("spawn_point_icon").unwrap();
-
-                let frame_size = texture_res.meta.frame_size.unwrap_or_else(|| {
-                    vec2(texture_res.texture.width(), texture_res.texture.height())
-                });
-
-                let source_rect = Rect::new(0.0, 0.0, frame_size.x, frame_size.y);
-
-                draw_texture_ex(
-                    texture_res.texture,
-                    position.x,
-                    position.y,
-                    color::WHITE,
-                    DrawTextureParams {
-                        dest_size: Some(frame_size),
-                        source: Some(source_rect),
-                        ..Default::default()
-                    },
-                );
-
-                if is_selected {
-                    draw_rectangle_lines(
-                        position.x,
-                        position.y,
-                        SPAWN_POINT_COLLIDER_WIDTH,
-                        SPAWN_POINT_COLLIDER_HEIGHT,
-                        4.0,
-                        SELECTION_HIGHLIGHT_COLOR,
-                    )
-                }
-            }
-
-            let len = node.get_map().draw_order.len();
-            for i in 0..len {
-                let i = len as i32 - i as i32 - 1;
-                if i >= 0 {
-                    let layer_id = node.get_map().draw_order.get(i as usize).unwrap();
-                    let layer = node.get_map().layers.get(layer_id).unwrap();
-
-                    if layer.is_visible && layer.kind == MapLayerKind::ObjectLayer {
-                        for (i, object) in layer.objects.iter().enumerate() {
-                            let mut label = None;
-
-                            let mut is_selected = false;
-                            if let Some(layer_id) = &node.selected_layer {
-                                if let Some(index) = node.selected_object {
-                                    is_selected = *layer_id == layer.id && index == i;
-                                }
-                            }
-
-                            let mut object_position =
-                                node.map_resource.map.world_offset + object.position;
-
-                            if let Some(DraggedObject::MapObject {
-                                layer_id,
-                                index,
-                                click_offset,
-                                ..
-                            }) = node.dragged_object.clone()
-                            {
-                                if layer.id == layer_id && index == i {
-                                    let map = node.get_map();
-
-                                    let cursor_world_position =
-                                        scene::find_node_by_type::<EditorCamera>()
-                                            .unwrap()
-                                            .to_world_space(node.cursor_position - click_offset);
-
-                                    object_position = (cursor_world_position).clamp(
-                                        map.world_offset,
-                                        map.world_offset + (map.grid_size.as_f32() * map.tile_size),
-                                    );
-
-                                    if node.should_snap_to_grid {
-                                        let coords = map.to_coords(object_position);
-                                        object_position = map.to_position(coords);
-                                    }
-                                }
-                            }
-
-                            match object.kind {
-                                MapObjectKind::Item => {
-                                    if let Some(meta) = resources.items.get(&object.id) {
-                                        if let Some(texture_res) =
-                                            resources.textures.get(&meta.sprite.texture_id)
-                                        {
-                                            let (texture, frame_size) =
-                                                (texture_res.texture, texture_res.frame_size());
-
-                                            let row = meta
-                                                .sprite
-                                                .animations
-                                                .iter()
-                                                .find(|&a| a.id == *IDLE_ANIMATION_ID)
-                                                .map(|a| a.row)
-                                                .unwrap_or_default();
-
-                                            let position = object_position + meta.sprite.offset;
-
-                                            let tint = meta.sprite.tint.unwrap_or(color::WHITE);
-
-                                            let dest_size =
-                                                meta.sprite.scale.map(|s| s * frame_size);
-
-                                            let source = Some(Rect::new(
-                                                0.0,
-                                                row as f32 * frame_size.y,
-                                                frame_size.x,
-                                                frame_size.y,
-                                            ));
-
-                                            draw_texture_ex(
-                                                texture,
-                                                position.x,
-                                                position.y,
-                                                tint,
-                                                DrawTextureParams {
-                                                    dest_size,
-                                                    source,
-                                                    ..Default::default()
-                                                },
-                                            );
-                                        } else {
-                                            label = Some("INVALID TEXTURE ID".to_string());
-                                        }
-                                    } else {
-                                        label = Some("INVALID OBJECT ID".to_string());
-                                    }
-                                }
-                                MapObjectKind::Decoration => {
-                                    if let Some(params) = resources.decoration.get(&object.id) {
-                                        if let Some(texture_res) =
-                                            resources.textures.get(&params.sprite.texture_id)
-                                        {
-                                            let position = object_position + params.sprite.offset;
-
-                                            let tint = params.sprite.tint.unwrap_or(color::WHITE);
-
-                                            let (texture, frame_size) =
-                                                (texture_res.texture, texture_res.frame_size());
-
-                                            let dest_size =
-                                                params.sprite.scale.map(|s| s * frame_size);
-
-                                            let source =
-                                                params.sprite.animations.first().map(|a| {
-                                                    Rect::new(
-                                                        0.0,
-                                                        a.row as f32 * frame_size.y,
-                                                        frame_size.x,
-                                                        frame_size.y,
-                                                    )
-                                                });
-
-                                            draw_texture_ex(
-                                                texture,
-                                                position.x,
-                                                position.y,
-                                                tint,
-                                                DrawTextureParams {
-                                                    dest_size,
-                                                    source,
-                                                    ..Default::default()
-                                                },
-                                            );
-                                        } else {
-                                            label = Some("INVALID TEXTURE ID".to_string());
-                                        }
-                                    } else {
-                                        label = Some("INVALID OBJECT ID".to_string());
-                                    }
-                                }
-                                MapObjectKind::Environment => match object.id.as_str() {
-                                    "sproinger" | "crab" | "fish_school" => {
-                                        let texture_id = match object.id.as_str() {
-                                            "sproinger" => "sproinger",
-                                            "crab" => CRAB_TEXTURE_ID,
-                                            "fish_school" => FISH_SCHOOL_ICON_TEXTURE_ID,
-                                            _ => unreachable!(),
-                                        };
-                                        let texture_res =
-                                            resources.textures.get(texture_id).unwrap();
-
-                                        let frame_size =
-                                            texture_res.meta.frame_size.unwrap_or_else(|| {
-                                                vec2(
-                                                    texture_res.texture.width(),
-                                                    texture_res.texture.height(),
-                                                )
-                                            });
-
-                                        let source_rect =
-                                            Rect::new(0.0, 0.0, frame_size.x, frame_size.y);
-
-                                        draw_texture_ex(
-                                            texture_res.texture,
-                                            object_position.x,
-                                            object_position.y,
-                                            color::WHITE,
-                                            DrawTextureParams {
-                                                dest_size: Some(frame_size),
-                                                source: Some(source_rect),
-                                                ..Default::default()
-                                            },
-                                        );
-                                    }
-                                    _ => {
-                                        label = Some("INVALID OBJECT ID".to_string());
-                                    }
-                                },
-                            }
-
-                            let size = get_object_size(object);
-
-                            if let Some(label) = &label {
-                                let params = TextParams::default();
-
-                                draw_text_ex(
-                                    label,
-                                    object_position.x,
-                                    object_position.y + (size.y / 2.0)
-                                        - Self::OBJECT_SELECTION_RECT_PADDING,
-                                    params,
-                                );
-                            }
-
-                            if is_selected {
-                                draw_rectangle_lines(
-                                    object_position.x - Self::OBJECT_SELECTION_RECT_PADDING,
-                                    object_position.y - Self::OBJECT_SELECTION_RECT_PADDING,
-                                    size.x,
-                                    size.y,
-                                    4.0,
-                                    SELECTION_HIGHLIGHT_COLOR,
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if let Some(tile_index) = node.selected_map_tile_index {
-            let grid_size = node.get_map().grid_size;
-            let tile_size = node.get_map().tile_size;
-
-            let coords = uvec2(
-                tile_index as u32 % grid_size.x,
-                tile_index as u32 / grid_size.x,
-            );
-            let position = node.get_map().to_position(coords);
-
-            draw_rectangle_lines(
-                position.x,
-                position.y,
-                tile_size.x,
-                tile_size.y,
-                5.0,
-                SELECTION_HIGHLIGHT_COLOR,
-            )
-        }
-
-        if let Some(label) = &node.info_message {
-            push_camera_state();
-            set_default_camera();
-
-            let label_position = vec2(screen_width() / 2.0, 16.0);
-
-            draw_aligned_text(
-                label,
-                label_position,
-                HorizontalAlignment::Center,
-                VerticalAlignment::Bottom,
-                TextParams {
-                    ..Default::default()
-                },
-            );
-
-            pop_camera_state();
-        }
-
-        let mut res = None;
-
-        if let Some(tool_id) = &node.selected_tool {
-            let tool = get_tool_instance_of_id(tool_id);
-            let ctx = node.get_context();
-            res = tool.draw_cursor(node.get_map(), &ctx);
-        }
-
-        {
-            let ctx = node.get_context();
-            let mut gui = storage::get_mut::<EditorGui>();
-            if let Some(action) = gui.draw(node.get_map(), ctx) {
-                res = Some(action);
-            }
-        }
-
-        if let Some(action) = res {
-            node.apply_action(action);
-        }
-    }
-}
-
-fn get_object_size(object: &MapObject) -> Vec2 {
-    let mut res = None;
-
-    let mut label = None;
-
-    let resources = storage::get::<Resources>();
-
-    match object.kind {
-        MapObjectKind::Item => {
-            if let Some(meta) = resources.items.get(&object.id) {
-                if resources.textures.get(&meta.sprite.texture_id).is_some() {
-                    res = Some(meta.collider_size);
-                } else {
-                    label = Some("INVALID TEXTURE ID".to_string());
-                }
-            } else {
-                label = Some("INVALID OBJECT ID".to_string())
-            }
-        }
-        MapObjectKind::Decoration => {
-            if let Some(meta) = resources.decoration.get(&object.id) {
-                if let Some(texture_res) = resources.textures.get(&meta.sprite.texture_id) {
-                    res = Some(texture_res.frame_size());
-                } else {
-                    label = Some("INVALID TEXTURE ID".to_string());
-                }
-            } else {
-                label = Some("INVALID OBJECT ID".to_string())
-            }
-        }
-        MapObjectKind::Environment => match object.id.as_str() {
-            "sproinger" => {
-                let texture_res = resources.textures.get("sproinger").unwrap();
-                res = texture_res.meta.frame_size;
-            }
-            "crab" => {
-                let texture_res = resources.textures.get(CRAB_TEXTURE_ID).unwrap();
-                res = texture_res.meta.frame_size;
-            }
-            "fish_school" => {
-                let texture_res = resources.textures.get(FISH_SCHOOL_ICON_TEXTURE_ID).unwrap();
-                res = texture_res.meta.frame_size;
-            }
-            _ => label = Some("INVALID OBJECT ID".to_string()),
-        },
-    }
-
-    if let Some(label) = &label {
-        let params = TextParams::default();
-        let measure = measure_text(
-            label,
-            Some(params.font),
-            params.font_size,
-            params.font_scale,
-        );
-        res = Some(vec2(measure.width, measure.height));
-    }
-
-    res.unwrap_or_else(|| {
-        vec2(
-            Editor::OBJECT_SELECTION_RECT_SIZE,
-            Editor::OBJECT_SELECTION_RECT_SIZE,
-        )
-    }) + (vec2(
-        Editor::OBJECT_SELECTION_RECT_PADDING,
-        Editor::OBJECT_SELECTION_RECT_PADDING,
-    ) * 2.0)
-}
diff --git a/src/editor/tools/eraser.rs b/src/editor/tools/eraser.rs
deleted file mode 100644
index e8e5faab7a..0000000000
--- a/src/editor/tools/eraser.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use macroquad::{color, prelude::*};
-
-use super::{EditorAction, EditorContext, EditorTool, EditorToolParams};
-
-use crate::{
-    editor::EditorCamera,
-    map::{Map, MapLayerKind},
-};
-
-#[derive(Default)]
-pub struct EraserTool {
-    params: EditorToolParams,
-}
-
-impl EraserTool {
-    pub fn new() -> Self {
-        let params = EditorToolParams {
-            name: "Erase Tiles".to_string(),
-            icon_texture_id: "eraser_tool_icon".to_string(),
-            is_continuous: true,
-        };
-
-        EraserTool { params }
-    }
-}
-
-impl EditorTool for EraserTool {
-    fn get_params(&self) -> &EditorToolParams {
-        &self.params
-    }
-
-    fn get_action(&mut self, map: &Map, ctx: &EditorContext) -> Option<EditorAction> {
-        let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-            .unwrap()
-            .to_world_space(ctx.cursor_position);
-
-        if map.contains(cursor_world_position) {
-            if let Some(layer_id) = &ctx.selected_layer {
-                let layer = map.layers.get(layer_id).unwrap();
-                let camera = scene::find_node_by_type::<EditorCamera>().unwrap();
-                let world_position = camera.to_world_space(ctx.cursor_position);
-
-                match layer.kind {
-                    MapLayerKind::TileLayer => {
-                        let coords = map.to_coords(world_position);
-
-                        return Some(EditorAction::RemoveTile {
-                            layer_id: layer_id.clone(),
-                            coords,
-                        });
-                    }
-                    MapLayerKind::ObjectLayer => {
-                        // TODO: Implement object layers
-                    }
-                }
-            }
-        }
-
-        None
-    }
-
-    fn is_available(&self, map: &Map, ctx: &EditorContext) -> bool {
-        if let Some(layer_id) = &ctx.selected_layer {
-            let layer = map.layers.get(layer_id).unwrap();
-            return layer.kind == MapLayerKind::TileLayer;
-        }
-
-        false
-    }
-
-    fn draw_cursor(&mut self, map: &Map, ctx: &EditorContext) -> Option<EditorAction> {
-        let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-            .unwrap()
-            .to_world_space(ctx.cursor_position);
-
-        if map.contains(cursor_world_position) {
-            if let Some(layer_id) = &ctx.selected_layer {
-                let layer = map.layers.get(layer_id).unwrap();
-
-                if layer.kind == MapLayerKind::TileLayer {
-                    let coords = map.to_coords(cursor_world_position);
-                    let position = map.to_position(coords);
-
-                    let outline_color = if layer.tiles[map.to_index(coords)].is_some() {
-                        color::YELLOW
-                    } else {
-                        color::RED
-                    };
-
-                    draw_rectangle_lines(
-                        position.x,
-                        position.y,
-                        map.tile_size.x,
-                        map.tile_size.y,
-                        2.0,
-                        outline_color,
-                    );
-                }
-            }
-        }
-
-        None
-    }
-}
diff --git a/src/editor/tools/mod.rs b/src/editor/tools/mod.rs
deleted file mode 100644
index fb93cfb74a..0000000000
--- a/src/editor/tools/mod.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use std::{any::TypeId, collections::HashMap};
-
-mod eraser;
-mod placement;
-
-pub use eraser::EraserTool;
-pub use placement::{ObjectPlacementTool, SpawnPointPlacementTool, TilePlacementTool};
-
-use macroquad::prelude::*;
-
-use super::{EditorAction, EditorContext, Map};
-
-static mut TOOL_INSTANCES: Option<HashMap<TypeId, Box<dyn EditorTool>>> = None;
-
-unsafe fn get_tool_instance_directory() -> &'static mut HashMap<TypeId, Box<dyn EditorTool>> {
-    if TOOL_INSTANCES.is_none() {
-        TOOL_INSTANCES = Some(HashMap::new());
-    }
-
-    TOOL_INSTANCES.as_mut().unwrap()
-}
-
-pub fn add_tool_instance<T: EditorTool + 'static>(tool: T) -> TypeId {
-    let id = TypeId::of::<T>();
-    unsafe { get_tool_instance_directory() }.insert(id, Box::new(tool));
-    id
-}
-
-pub fn get_tool_instance_of_id(id: &TypeId) -> &'static mut dyn EditorTool {
-    unsafe { get_tool_instance_directory() }
-        .get_mut(id)
-        .unwrap()
-        .as_mut()
-}
-
-// TODO: Cast to T
-pub fn get_tool_instance<T: EditorTool + 'static>() -> &'static mut dyn EditorTool {
-    let id = TypeId::of::<T>();
-    get_tool_instance_of_id(&id)
-}
-
-#[allow(dead_code)]
-pub fn get_tool_params_of_id(id: &TypeId) -> &'static EditorToolParams {
-    get_tool_instance_of_id(id).get_params()
-}
-
-#[allow(dead_code)]
-pub fn get_tool_params<T: EditorTool + 'static>() -> &'static EditorToolParams {
-    let id = TypeId::of::<T>();
-    get_tool_params_of_id(&id)
-}
-
-pub const DEFAULT_TOOL_ICON_TEXTURE_ID: &str = "default_tool_icon";
-
-#[derive(Debug, Clone)]
-pub struct EditorToolParams {
-    pub name: String,
-    pub icon_texture_id: String,
-    /// Set this to `true` if the tool should be activated every update when action button is held
-    /// or `false` if it should only activate once per click
-    pub is_continuous: bool,
-}
-
-impl Default for EditorToolParams {
-    fn default() -> Self {
-        EditorToolParams {
-            name: "Unnamed Tool".to_string(),
-            icon_texture_id: DEFAULT_TOOL_ICON_TEXTURE_ID.to_string(),
-            is_continuous: false,
-        }
-    }
-}
-
-pub trait EditorTool {
-    fn get_params(&self) -> &EditorToolParams;
-
-    fn get_action(&mut self, map: &Map, ctx: &EditorContext) -> Option<EditorAction>;
-
-    fn update(&mut self, _map: &Map, _ctx: &EditorContext) -> Option<EditorAction> {
-        None
-    }
-
-    fn is_available(&self, _map: &Map, _ctx: &EditorContext) -> bool {
-        true
-    }
-
-    fn draw_cursor(&mut self, _map: &Map, _ctx: &EditorContext) -> Option<EditorAction> {
-        None
-    }
-}
diff --git a/src/editor/tools/placement.rs b/src/editor/tools/placement.rs
deleted file mode 100644
index c397527dd8..0000000000
--- a/src/editor/tools/placement.rs
+++ /dev/null
@@ -1,308 +0,0 @@
-use macroquad::{color, experimental::collections::storage, prelude::*};
-
-use super::{EditorAction, EditorContext, EditorTool, EditorToolParams};
-
-use crate::{
-    editor::EditorCamera,
-    map::{Map, MapLayerKind},
-    rand::ChooseRandom,
-    Resources,
-};
-
-#[derive(Default)]
-pub struct TilePlacementTool {
-    params: EditorToolParams,
-    coords: Option<UVec2>,
-}
-
-impl TilePlacementTool {
-    pub fn new() -> Self {
-        let params = EditorToolParams {
-            name: "Place Tiles".to_string(),
-            icon_texture_id: "tile_placement_tool_icon".to_string(),
-            is_continuous: true,
-        };
-
-        TilePlacementTool {
-            params,
-            coords: None,
-        }
-    }
-}
-
-impl EditorTool for TilePlacementTool {
-    fn get_params(&self) -> &EditorToolParams {
-        &self.params
-    }
-
-    fn get_action(&mut self, map: &Map, ctx: &EditorContext) -> Option<EditorAction> {
-        let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-            .unwrap()
-            .to_world_space(ctx.cursor_position);
-
-        if map.contains(cursor_world_position) {
-            if let Some(layer_id) = &ctx.selected_layer {
-                let camera = scene::find_node_by_type::<EditorCamera>().unwrap();
-                let world_position = camera.to_world_space(ctx.cursor_position);
-
-                if let Some(tileset_id) = &ctx.selected_tileset {
-                    if let Some(tile_id) = ctx.selected_tile {
-                        let coords = map.to_coords(world_position);
-
-                        return Some(EditorAction::PlaceTile {
-                            id: tile_id,
-                            layer_id: layer_id.clone(),
-                            tileset_id: tileset_id.clone(),
-                            coords,
-                        });
-                    }
-                }
-            }
-        }
-
-        None
-    }
-
-    fn update(&mut self, map: &Map, ctx: &EditorContext) -> Option<EditorAction> {
-        #[allow(unused_mut)]
-        let mut res = None;
-
-        if self.is_available(map, ctx) {
-            if let Some(tileset_id) = &ctx.selected_tileset {
-                let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-                    .unwrap()
-                    .to_world_space(ctx.cursor_position);
-                let coords = map.to_coords(cursor_world_position);
-
-                if self.coords != Some(coords) {
-                    let tileset = map.tilesets.get(tileset_id).unwrap();
-
-                    // Do autotile resolution here and set `res` to an `EditorAction::SelectTile` if
-                    // selected tile should be changed according to context.
-
-                    //Get self surrounding tiles
-                    let mut surrounding_tiles: Vec<bool> = vec![];
-                    for y in 0..3 {
-                        for x in 0..3 {
-                            if let Some(layer) = &ctx.selected_layer {
-                                let is_some = map
-                                    .get_tile(
-                                        layer,
-                                        (coords.x + x).saturating_sub(1),
-                                        (coords.y + y).saturating_sub(1),
-                                    )
-                                    .is_some();
-                                surrounding_tiles.push(is_some);
-                            }
-                        }
-                    }
-
-                    //Get bitmask value from self surrounding tiles
-                    let mut bitmask = 0;
-                    for (i, b) in surrounding_tiles.iter().enumerate() {
-                        if *b && i < 4 {
-                            bitmask += 2_u32.pow(i as u32);
-                        } else if *b && i > 4 {
-                            bitmask += 2_u32.pow(i as u32 - 1);
-                        }
-                    }
-
-                    let mut tile_ids = Vec::new();
-                    if let Some(bitmasks) = &tileset.bitmasks {
-                        for (i, tileset_bitmask) in bitmasks.iter().enumerate() {
-                            if *tileset_bitmask == bitmask && bitmask != 0 {
-                                tile_ids.push(i as u32);
-                            }
-                        }
-                    }
-
-                    if let Some(id) = tile_ids.choose() {
-                        res = Some(EditorAction::SelectTile {
-                            tileset_id: tileset_id.to_owned(),
-                            id: *id,
-                        });
-                    }
-                }
-
-                self.coords = Some(coords);
-            }
-        }
-
-        res
-    }
-
-    fn is_available(&self, map: &Map, ctx: &EditorContext) -> bool {
-        if let Some(layer_id) = &ctx.selected_layer {
-            let layer = map.layers.get(layer_id).unwrap();
-            return layer.kind == MapLayerKind::TileLayer;
-        }
-
-        false
-    }
-
-    fn draw_cursor(&mut self, map: &Map, ctx: &EditorContext) -> Option<EditorAction> {
-        let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-            .unwrap()
-            .to_world_space(ctx.cursor_position);
-
-        if map.contains(cursor_world_position) {
-            if let Some(layer_id) = &ctx.selected_layer {
-                let layer = map.layers.get(layer_id).unwrap();
-
-                if layer.kind == MapLayerKind::TileLayer {
-                    if let Some(tileset_id) = &ctx.selected_tileset {
-                        if let Some(tile_id) = ctx.selected_tile {
-                            let tileset = map.tilesets.get(tileset_id).unwrap();
-
-                            let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-                                .unwrap()
-                                .to_world_space(ctx.cursor_position);
-
-                            let coords = map.to_coords(cursor_world_position);
-                            let position = map.to_position(coords);
-
-                            let texture_coords = tileset.get_texture_coords(tile_id);
-                            let texture = {
-                                let resources = storage::get::<Resources>();
-                                let res = resources.textures.get(&tileset.texture_id).unwrap();
-                                res.texture
-                            };
-
-                            let source_rect = Rect::new(
-                                texture_coords.x,
-                                texture_coords.y,
-                                map.tile_size.x,
-                                map.tile_size.y,
-                            );
-
-                            draw_texture_ex(
-                                texture,
-                                position.x,
-                                position.y,
-                                color::WHITE,
-                                DrawTextureParams {
-                                    dest_size: Some(map.tile_size),
-                                    source: Some(source_rect),
-                                    ..Default::default()
-                                },
-                            )
-                        }
-                    }
-                }
-            }
-        }
-
-        None
-    }
-}
-
-#[derive(Default)]
-pub struct ObjectPlacementTool {
-    params: EditorToolParams,
-}
-
-impl ObjectPlacementTool {
-    pub fn new() -> Self {
-        let params = EditorToolParams {
-            name: "Place Objects".to_string(),
-            icon_texture_id: "object_placement_tool_icon".to_string(),
-            ..Default::default()
-        };
-
-        ObjectPlacementTool { params }
-    }
-}
-
-impl EditorTool for ObjectPlacementTool {
-    fn get_params(&self) -> &EditorToolParams {
-        &self.params
-    }
-
-    fn get_action(&mut self, map: &Map, ctx: &EditorContext) -> Option<EditorAction> {
-        let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-            .unwrap()
-            .to_world_space(ctx.cursor_position);
-
-        if map.contains(cursor_world_position) {
-            if let Some(layer_id) = ctx.selected_layer.clone() {
-                let layer = map.layers.get(&layer_id).unwrap();
-
-                if layer.kind == MapLayerKind::ObjectLayer {
-                    let mut position = scene::find_node_by_type::<EditorCamera>()
-                        .unwrap()
-                        .to_world_space(ctx.cursor_position);
-
-                    let rect = Rect::new(
-                        map.world_offset.x,
-                        map.world_offset.y,
-                        map.grid_size.x as f32 * map.tile_size.x,
-                        map.grid_size.y as f32 * map.tile_size.y,
-                    );
-
-                    if ctx.should_snap_to_grid {
-                        let coords = map.to_coords(position);
-                        position = map.to_position(coords);
-                    }
-
-                    if rect.contains(position) {
-                        let action = EditorAction::OpenCreateObjectWindow { position, layer_id };
-
-                        return Some(action);
-                    }
-                }
-            }
-        }
-
-        None
-    }
-
-    fn is_available(&self, map: &Map, ctx: &EditorContext) -> bool {
-        if let Some(layer_id) = &ctx.selected_layer {
-            let layer = map.layers.get(layer_id).unwrap();
-            return layer.kind == MapLayerKind::ObjectLayer;
-        }
-
-        false
-    }
-}
-
-pub struct SpawnPointPlacementTool {
-    params: EditorToolParams,
-}
-
-impl SpawnPointPlacementTool {
-    pub fn new() -> Self {
-        let params = EditorToolParams {
-            name: "Place Spawn Point".to_string(),
-            icon_texture_id: "spawn_point_placement_tool_icon".to_string(),
-            ..Default::default()
-        };
-
-        SpawnPointPlacementTool { params }
-    }
-}
-
-impl EditorTool for SpawnPointPlacementTool {
-    fn get_params(&self) -> &EditorToolParams {
-        &self.params
-    }
-
-    fn get_action(&mut self, _map: &Map, ctx: &EditorContext) -> Option<EditorAction> {
-        // TODO: Snap to grid
-
-        let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
-            .unwrap()
-            .to_world_space(ctx.cursor_position);
-
-        let resources = storage::get::<Resources>();
-        let texture_res = resources.textures.get("spawn_point_icon").unwrap();
-        let offset = vec2(
-            texture_res.texture.width() / 2.0,
-            texture_res.texture.height(),
-        );
-
-        let action = EditorAction::CreateSpawnPoint(cursor_world_position - offset);
-
-        Some(action)
-    }
-}
diff --git a/src/effects/active/mod.rs b/src/effects/active/mod.rs
deleted file mode 100644
index 7e6b6f5e13..0000000000
--- a/src/effects/active/mod.rs
+++ /dev/null
@@ -1,374 +0,0 @@
-use hecs::{Entity, World};
-use macroquad::color;
-
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-use core::math::{deg_to_rad, rotate_vector, IsZero};
-use core::Result;
-
-use crate::game::play_sound_effect;
-use crate::items::spawn_item;
-use crate::Resources;
-use crate::{PassiveEffectInstance, PassiveEffectMetadata};
-
-pub mod projectiles;
-pub mod triggered;
-
-pub use triggered::{TriggeredEffectMetadata, TriggeredEffectTrigger};
-
-use crate::effects::active::projectiles::{spawn_projectile, ProjectileParams};
-use crate::effects::active::triggered::{spawn_triggered_effect, TriggeredEffect};
-use crate::particles::ParticleEmitterMetadata;
-use crate::player::{on_player_damage, Player};
-use crate::PhysicsBody;
-use core::Transform;
-pub use projectiles::ProjectileKind;
-
-const COLLIDER_DEBUG_DRAW_TTL: f32 = 0.5;
-
-struct CircleCollider {
-    r: f32,
-    ttl_timer: f32,
-}
-
-struct RectCollider {
-    w: f32,
-    h: f32,
-    ttl_timer: f32,
-}
-
-pub fn spawn_active_effect(
-    world: &mut World,
-    owner: Entity,
-    spawner: Entity,
-    origin: Vec2,
-    params: ActiveEffectMetadata,
-) -> Result<()> {
-    let is_facing_left = {
-        let player = world.get::<Player>(owner).unwrap();
-        player.is_facing_left
-    };
-
-    if let Some(id) = &params.sound_effect_id {
-        play_sound_effect(id, 1.0);
-    }
-
-    let mut damage = Vec::new();
-
-    match *params.kind {
-        ActiveEffectKind::CircleCollider {
-            radius,
-            passive_effects,
-            is_lethal,
-            is_explosion,
-        } => {
-            let circle = Circle::new(origin.x, origin.y, radius);
-
-            #[cfg(debug_assertions)]
-            {
-                world.spawn((
-                    Transform::new(origin, 0.0),
-                    CircleCollider {
-                        r: radius,
-                        ttl_timer: 0.0,
-                    },
-                ));
-            }
-
-            for (e, (transform, body)) in world.query::<(&Transform, &PhysicsBody)>().iter() {
-                let other_rect = body.as_rect(transform.position);
-                if circle.overlaps_rect(&other_rect) {
-                    if let Ok(mut player) = world.get_mut::<Player>(e) {
-                        if is_explosion || e != owner {
-                            if is_lethal {
-                                damage.push((owner, e));
-                            }
-
-                            for meta in passive_effects.clone().into_iter() {
-                                let effect_instance = PassiveEffectInstance::new(None, meta);
-                                player.passive_effects.push(effect_instance);
-                            }
-                        }
-                    } else if is_explosion {
-                        if let Ok(mut effect) = world.get_mut::<TriggeredEffect>(e) {
-                            if effect.trigger.contains(&TriggeredEffectTrigger::Explosion) {
-                                effect.is_triggered = true;
-                                effect.triggered_by = Some(owner);
-                                effect.should_override_delay = true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        ActiveEffectKind::RectCollider {
-            width,
-            height,
-            is_lethal,
-            passive_effects,
-        } => {
-            let mut rect = Rect::new(origin.x, origin.y, width, height);
-            if is_facing_left {
-                rect.x -= rect.w;
-            }
-
-            #[cfg(debug_assertions)]
-            {
-                world.spawn((
-                    Transform::new(origin, 0.0),
-                    RectCollider {
-                        w: rect.w,
-                        h: rect.h,
-                        ttl_timer: 0.0,
-                    },
-                ));
-            }
-
-            for (e, (transform, player, body)) in
-                world.query_mut::<(&Transform, &mut Player, &PhysicsBody)>()
-            {
-                if owner != e {
-                    let other_rect = body.as_rect(transform.position);
-                    if rect.overlaps(&other_rect) {
-                        if is_lethal {
-                            damage.push((owner, e));
-                        }
-
-                        for meta in passive_effects.clone().into_iter() {
-                            let effect_instance = PassiveEffectInstance::new(None, meta);
-                            player.passive_effects.push(effect_instance);
-                        }
-                    }
-                }
-            }
-        }
-        ActiveEffectKind::TriggeredEffect { meta } => {
-            spawn_triggered_effect(world, owner, origin, is_facing_left, *meta)?;
-        }
-        ActiveEffectKind::Projectile {
-            kind,
-            speed,
-            range,
-            spread,
-            is_lethal,
-            passive_effects,
-            particles,
-        } => {
-            let mut velocity = Vec2::ZERO;
-            if is_facing_left {
-                velocity.x = -speed
-            } else {
-                velocity.x = speed
-            }
-
-            if spread != 0.0 {
-                let rad = deg_to_rad(spread);
-                let spread = rand::gen_range(-rad, rad);
-
-                velocity = rotate_vector(velocity, spread);
-            }
-
-            spawn_projectile(
-                world,
-                owner,
-                kind,
-                origin,
-                velocity,
-                range,
-                ProjectileParams {
-                    is_lethal,
-                    passive_effects,
-                    particle_effects: particles,
-                },
-            );
-        }
-        ActiveEffectKind::SpawnItem {
-            item,
-            offset,
-            inherit_spawner_velocity,
-        } => {
-            let resources = storage::get::<Resources>();
-            let item_meta = resources.items.get(&item).expect("Item doesn't exist");
-
-            match spawn_item(world, origin + offset, item_meta.clone()) {
-                Ok(entity) => {
-                    if inherit_spawner_velocity {
-                        let spawner_velocity = {
-                            let mut spawner_body_query =
-                                world.query_one::<&PhysicsBody>(spawner).unwrap();
-                            let spawner_body = spawner_body_query.get().unwrap();
-                            spawner_body.velocity
-                        };
-
-                        let mut entity_body =
-                            world.query_one_mut::<&mut PhysicsBody>(entity).unwrap();
-                        entity_body.velocity = spawner_velocity;
-                    }
-                }
-                Err(e) => {
-                    println!("WARNING: {:?}", e);
-                }
-            }
-        }
-    }
-
-    for (damage_from_entity, damage_to_entity) in damage.drain(0..) {
-        on_player_damage(world, damage_from_entity, damage_to_entity);
-    }
-
-    Ok(())
-}
-
-/// This holds all the common parameters, available to all implementations, as well as specialized
-/// parameters, in the `ActiveEffectKind`.
-// NOTE: We would prefer to `serde(deny_unknown_fields)` here, but we are blocked by this issue:
-// https://github.com/serde-rs/serde/issues/1358
-#[derive(Clone, Serialize, Deserialize)]
-pub struct ActiveEffectMetadata {
-    /// This holds all the specialized parameters for the effect, dependent on the implementation,
-    /// specified by its variant. It is flattened into this struct in JSON.
-    #[serde(flatten)]
-    pub kind: Box<ActiveEffectKind>,
-    /// This specifies the id of a sound effect to play when the effect is instantiated.
-    #[serde(
-        default,
-        rename = "sound_effect",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub sound_effect_id: Option<String>,
-    /// The delay between instantiation of the effect is requested and the actual instantiation.
-    /// This will delay the entire effect, including sound effects, particle effects and anything
-    /// drawn as a result of the effect, so in most cases it is probably better to use a
-    /// `TriggeredEffect`, with a `timed_trigger` value, in stead of using this.
-    #[serde(default)]
-    pub delay: f32,
-}
-
-/// This should hold implementations of the commonly used weapon effects, that see usage spanning
-/// many different weapon implementations.
-///
-/// The effects that have the `Collider` suffix denote effects that do an immediate collider check,
-/// upon attack, using the weapons `effect_offset` as origin.
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ActiveEffectKind {
-    /// Check for hits with a `Circle` collider.
-    CircleCollider {
-        radius: f32,
-        /// This contains any passive effects that will be spawned on collision
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        passive_effects: Vec<PassiveEffectMetadata>,
-        /// If `true` the effect will do damage to any player it hits
-        #[serde(
-            default = "core::json::default_true",
-            skip_serializing_if = "core::json::is_true"
-        )]
-        is_lethal: bool,
-        #[serde(default, skip_serializing_if = "core::json::is_false")]
-        is_explosion: bool,
-    },
-    /// Check for hits with a `Rect` collider
-    RectCollider {
-        width: f32,
-        height: f32,
-        /// If `true` the effect will do damage to any player it hits
-        #[serde(
-            default = "core::json::default_true",
-            skip_serializing_if = "core::json::is_true"
-        )]
-        is_lethal: bool,
-        /// This contains any passive effects that will be spawned on collision
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        passive_effects: Vec<PassiveEffectMetadata>,
-    },
-    /// Spawn a trigger that will set of another effect if its trigger conditions are met.
-    TriggeredEffect {
-        #[serde(flatten)]
-        meta: Box<TriggeredEffectMetadata>,
-    },
-    /// Spawn a projectile.
-    /// This would typically be used for things like a gun.
-    Projectile {
-        #[serde(rename = "projectile")]
-        kind: ProjectileKind,
-        speed: f32,
-        range: f32,
-        #[serde(default, skip_serializing_if = "f32::is_zero")]
-        spread: f32,
-        /// If `true` the effect will do damage to any player it hits
-        #[serde(
-            default = "core::json::default_true",
-            skip_serializing_if = "core::json::is_true"
-        )]
-        is_lethal: bool,
-        /// This contains any passive effects that will be spawned on collision
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        passive_effects: Vec<PassiveEffectMetadata>,
-        /// Particle effects that will be attached to the projectile
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        particles: Vec<ParticleEmitterMetadata>,
-    },
-    SpawnItem {
-        item: String,
-        #[serde(default, with = "core::json::vec2_def")]
-        offset: Vec2,
-        #[serde(default)]
-        inherit_spawner_velocity: bool,
-    },
-}
-
-pub fn debug_draw_active_effects(world: &mut World) {
-    let mut to_remove = Vec::new();
-
-    let dt = get_frame_time();
-
-    for (e, (transform, collider)) in world.query_mut::<(&Transform, &mut CircleCollider)>() {
-        collider.ttl_timer += dt;
-
-        draw_circle_lines(
-            transform.position.x,
-            transform.position.y,
-            collider.r,
-            2.0,
-            color::RED,
-        );
-
-        if collider.ttl_timer >= COLLIDER_DEBUG_DRAW_TTL {
-            to_remove.push(e);
-        }
-    }
-
-    for (e, (transform, collider)) in world.query_mut::<(&Transform, &mut RectCollider)>() {
-        collider.ttl_timer += dt;
-
-        draw_rectangle_lines(
-            transform.position.x,
-            transform.position.y,
-            collider.w,
-            collider.h,
-            2.0,
-            color::RED,
-        );
-
-        if collider.ttl_timer >= COLLIDER_DEBUG_DRAW_TTL {
-            to_remove.push(e);
-        }
-    }
-
-    for (_, (transform, body, effect)) in
-        world.query_mut::<(&Transform, &PhysicsBody, &TriggeredEffect)>()
-    {
-        if let Some(opts) = &effect.grab_options {
-            let rect = opts.get_collider_rect(transform.position, body.velocity);
-            draw_rectangle_lines(rect.x, rect.y, rect.w, rect.h, 2.0, color::ORANGE);
-        }
-    }
-
-    for e in to_remove.drain(0..) {
-        world.despawn(e).unwrap();
-    }
-}
diff --git a/src/effects/active/projectiles.rs b/src/effects/active/projectiles.rs
deleted file mode 100644
index ac7a50bc38..0000000000
--- a/src/effects/active/projectiles.rs
+++ /dev/null
@@ -1,316 +0,0 @@
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-use std::f32::consts::PI;
-
-use hecs::{Entity, World};
-use macroquad_platformer::Tile;
-
-use serde::{Deserialize, Serialize};
-
-use crate::effects::active::triggered::TriggeredEffect;
-use crate::effects::TriggeredEffectTrigger;
-use crate::particles::{ParticleEmitter, ParticleEmitterMetadata};
-use crate::player::{on_player_damage, Player, PlayerState};
-use crate::{CollisionWorld, PhysicsBody, Resources, RigidBody, RigidBodyParams, SpriteMetadata};
-use crate::{Drawable, PassiveEffectInstance, PassiveEffectMetadata, SpriteParams};
-use core::Transform;
-
-const PROJECTILE_DRAW_ORDER: u32 = 1;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum ProjectileKind {
-    Circle {
-        radius: f32,
-        #[serde(with = "core::json::ColorDef")]
-        color: Color,
-    },
-    Rect {
-        width: f32,
-        height: f32,
-        #[serde(with = "core::json::ColorDef")]
-        color: Color,
-    },
-    Sprite {
-        #[serde(rename = "sprite")]
-        params: SpriteMetadata,
-        /// If yes, the sprite would be rotated by angle between Vec2(1, 0) (most likely will be changed in the future) and velocity vector.
-        /// This, for example, used for machine gun bullets rotation.
-        #[serde(default)]
-        can_rotate: bool,
-    },
-}
-
-pub struct Projectile {
-    pub kind: ProjectileKind,
-    pub owner: Entity,
-    pub origin: Vec2,
-    pub range: f32,
-    pub is_lethal: bool,
-    pub passive_effects: Vec<PassiveEffectMetadata>,
-}
-
-impl Projectile {
-    pub fn new(
-        owner: Entity,
-        kind: ProjectileKind,
-        origin: Vec2,
-        range: f32,
-        is_lethal: bool,
-        passive_effects: &[PassiveEffectMetadata],
-    ) -> Self {
-        Projectile {
-            owner,
-            kind,
-            origin,
-            range,
-            is_lethal,
-            passive_effects: passive_effects.to_vec(),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct ProjectileParams {
-    pub is_lethal: bool,
-    pub passive_effects: Vec<PassiveEffectMetadata>,
-    pub particle_effects: Vec<ParticleEmitterMetadata>,
-}
-
-impl Default for ProjectileParams {
-    fn default() -> Self {
-        ProjectileParams {
-            is_lethal: true,
-            passive_effects: Vec::new(),
-            particle_effects: Vec::new(),
-        }
-    }
-}
-
-pub fn spawn_projectile(
-    world: &mut World,
-    owner: Entity,
-    kind: ProjectileKind,
-    origin: Vec2,
-    velocity: Vec2,
-    range: f32,
-    params: ProjectileParams,
-) -> Entity {
-    let entity = world.spawn(());
-    world
-        .insert_one(
-            entity,
-            Projectile::new(
-                owner,
-                kind.clone(),
-                origin,
-                range,
-                params.is_lethal,
-                &params.passive_effects,
-            ),
-        )
-        .unwrap();
-
-    let mut transform = Transform::from(origin);
-
-    let body_params = match kind {
-        ProjectileKind::Rect { width, height, .. } => RigidBodyParams {
-            offset: vec2(-width, -height) / 2.0,
-            size: vec2(width, height),
-            can_rotate: false,
-        },
-        ProjectileKind::Circle { radius, .. } => RigidBodyParams {
-            size: vec2(radius * 2.0, radius * 2.0),
-            can_rotate: false,
-            ..Default::default()
-        },
-        ProjectileKind::Sprite {
-            params: meta,
-            can_rotate,
-        } => {
-            let resources = storage::get::<Resources>();
-            let texture_res = resources.textures.get(&meta.texture_id).unwrap();
-
-            let size = meta
-                .size
-                .unwrap_or_else(|| texture_res.meta.frame_size.unwrap_or(texture_res.meta.size));
-
-            let offset = meta.offset - (vec2(size.x, size.y) / 2.0);
-
-            let is_flipped_x = velocity.x < 0.0;
-
-            if can_rotate {
-                let mut direction = Vec2::ZERO;
-
-                if is_flipped_x {
-                    direction.x = 1.0;
-                } else {
-                    direction.x = -1.0;
-                }
-
-                transform.rotation = (velocity.y - direction.y).atan2(velocity.x - direction.x);
-
-                if is_flipped_x {
-                    transform.rotation += PI;
-                }
-            }
-
-            world
-                .insert_one(
-                    entity,
-                    Drawable::new_sprite(
-                        PROJECTILE_DRAW_ORDER,
-                        &meta.texture_id,
-                        SpriteParams {
-                            is_flipped_x,
-                            offset,
-                            ..meta.clone().into()
-                        },
-                    ),
-                )
-                .unwrap();
-
-            RigidBodyParams {
-                offset,
-                size,
-                ..Default::default()
-            }
-        }
-    };
-
-    world
-        .insert(entity, (transform, RigidBody::new(velocity, body_params)))
-        .unwrap();
-
-    let mut particle_emitters = Vec::new();
-    for params in params.particle_effects {
-        let mut emitter = ParticleEmitter::from(params);
-        emitter.is_active = true;
-
-        particle_emitters.push(emitter);
-    }
-
-    if !particle_emitters.is_empty() {
-        world.insert_one(entity, particle_emitters).unwrap();
-    }
-
-    entity
-}
-
-enum ProjectileCollision {
-    Player(Entity),
-    Trigger(Entity),
-    Map,
-}
-
-pub fn fixed_update_projectiles(world: &mut World) {
-    let bodies = world
-        .query::<(&Transform, &PhysicsBody)>()
-        .iter()
-        .map(|(e, (transform, body))| (e, body.as_rect(transform.position)))
-        .collect::<Vec<_>>();
-
-    let collision_world = storage::get::<CollisionWorld>();
-
-    let mut events = Vec::new();
-
-    'projectiles: for (e, (projectile, transform, body)) in world
-        .query::<(&Projectile, &Transform, &RigidBody)>()
-        .iter()
-    {
-        if projectile.origin.distance(transform.position) >= projectile.range {
-            events.push((projectile.owner, e, None));
-            continue 'projectiles;
-        }
-
-        let size = body.size.as_i32();
-        let map_collision = collision_world.collide_solids(transform.position, size.x, size.y);
-        if map_collision == Tile::Solid {
-            let res = (projectile.owner, e, Some(ProjectileCollision::Map));
-            events.push(res);
-            continue 'projectiles;
-        }
-
-        let rect = body.as_rect(transform.position);
-        for (other, other_rect) in &bodies {
-            if rect.overlaps(other_rect) {
-                if let Ok(mut player) = world.get_mut::<Player>(*other) {
-                    if player.state != PlayerState::Dead {
-                        for meta in projectile.passive_effects.clone().into_iter() {
-                            let effect_instance = PassiveEffectInstance::new(None, meta);
-
-                            player.passive_effects.push(effect_instance);
-                        }
-
-                        if projectile.is_lethal {
-                            let res = (
-                                projectile.owner,
-                                e,
-                                Some(ProjectileCollision::Player(*other)),
-                            );
-
-                            events.push(res);
-                        }
-
-                        continue 'projectiles;
-                    }
-                } else if let Ok(effect) = world.get::<TriggeredEffect>(*other) {
-                    if effect.trigger.contains(&TriggeredEffectTrigger::Projectile) {
-                        let res = (
-                            projectile.owner,
-                            e,
-                            Some(ProjectileCollision::Trigger(*other)),
-                        );
-                        events.push(res);
-                    }
-                }
-            }
-        }
-    }
-
-    for (damage_from_entity, projectile_entity, collision) in events {
-        if let Some(collision_kind) = collision {
-            match collision_kind {
-                ProjectileCollision::Player(damage_to_entity) => {
-                    on_player_damage(world, damage_from_entity, damage_to_entity);
-                }
-                ProjectileCollision::Trigger(trigger_entity) => {
-                    let mut effect = world.get_mut::<TriggeredEffect>(trigger_entity).unwrap();
-                    if !effect.should_override_delay {
-                        effect.is_triggered = true;
-                        effect.should_override_delay = true;
-                        effect.triggered_by = Some(damage_from_entity);
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        let _ = world.despawn(projectile_entity);
-    }
-}
-
-pub fn draw_projectiles(world: &mut World) {
-    for (_, (projectile, transform)) in world.query::<(&Projectile, &Transform)>().iter() {
-        match projectile.kind {
-            ProjectileKind::Rect {
-                width,
-                height,
-                color,
-            } => {
-                draw_rectangle(
-                    transform.position.x,
-                    transform.position.y,
-                    width,
-                    height,
-                    color,
-                );
-            }
-            ProjectileKind::Circle { radius, color } => {
-                draw_circle(transform.position.x, transform.position.y, radius, color);
-            }
-            _ => {}
-        }
-    }
-}
diff --git a/src/effects/active/triggered.rs b/src/effects/active/triggered.rs
deleted file mode 100644
index b058a95434..0000000000
--- a/src/effects/active/triggered.rs
+++ /dev/null
@@ -1,529 +0,0 @@
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-
-use hecs::{Entity, World};
-
-use serde::{Deserialize, Serialize};
-
-use core::math::{deg_to_rad, rotate_vector};
-use core::{Result, Transform};
-
-use crate::effects::active::spawn_active_effect;
-use crate::items::spawn_item;
-use crate::particles::{ParticleEmitter, ParticleEmitterMetadata};
-use crate::player::{Player, PlayerController, PlayerInventory, PlayerState};
-use crate::{physics, Resources};
-use crate::{ActiveEffectMetadata, AnimatedSpriteMetadata, CollisionWorld, PhysicsBody};
-use crate::{Drawable, DrawableKind, PhysicsBodyParams};
-
-const TRIGGERED_EFFECT_DRAW_ORDER: u32 = 5;
-
-/// The various collision types that can trigger a `TriggeredEffect`.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum TriggeredEffectTrigger {
-    /// The player that deployed the effect
-    Player,
-    /// Enemy players
-    Enemy,
-    /// Ground tiles (all tiles with collision, except platforms)
-    Ground,
-    /// Explosion effects
-    Explosion,
-    /// Projectile hit
-    Projectile,
-}
-
-pub struct TriggeredEffect {
-    pub owner: Entity,
-    pub trigger: Vec<TriggeredEffectTrigger>,
-    pub effects: Vec<ActiveEffectMetadata>,
-    pub activation_delay: f32,
-    pub expire_time: Option<f32>,
-    pub expire_effects: Vec<ActiveEffectMetadata>,
-    pub trigger_delay: f32,
-    pub timed_trigger: Option<f32>,
-    pub is_kickable: bool,
-    /// This can be used to trigger the effect immediately, ignoring delay timers.
-    /// Also requires `is_triggered` to be set to `true`, for this to work.
-    pub should_override_delay: bool,
-    pub should_collide_with_platforms: bool,
-    pub is_triggered: bool,
-    /// This holds a handle to the player that triggered the effect, if applicable.
-    pub triggered_by: Option<Entity>,
-    pub grab_options: Option<TriggeredEffectGrabOptions>,
-    pub kick_delay_timer: f32,
-    pub activation_timer: f32,
-    pub trigger_delay_timer: f32,
-    pub timed_trigger_timer: f32,
-}
-
-impl TriggeredEffect {
-    pub fn new(owner: Entity, meta: TriggeredEffectMetadata) -> Self {
-        TriggeredEffect {
-            owner,
-            trigger: meta.trigger,
-            effects: meta.effects,
-            activation_delay: meta.activation_delay,
-            expire_time: meta.expire_time,
-            expire_effects: meta.expire_effects,
-            trigger_delay: meta.trigger_delay,
-            timed_trigger: meta.timed_trigger,
-            is_kickable: meta.is_kickable,
-            should_override_delay: false,
-            should_collide_with_platforms: meta.should_collide_with_platforms,
-            is_triggered: false,
-            triggered_by: None,
-            grab_options: meta.grab_options,
-            kick_delay_timer: 0.0,
-            activation_timer: 0.0,
-            trigger_delay_timer: 0.0,
-            timed_trigger_timer: 0.0,
-        }
-    }
-}
-
-pub fn spawn_triggered_effect(
-    world: &mut World,
-    owner: Entity,
-    origin: Vec2,
-    is_facing_left: bool,
-    meta: TriggeredEffectMetadata,
-) -> Result<Entity> {
-    let mut velocity = meta.velocity;
-    if is_facing_left {
-        velocity.x = -velocity.x;
-    }
-
-    if meta.spread != 0.0 {
-        let rad = deg_to_rad(meta.spread);
-        let spread = rand::gen_range(-rad, rad);
-
-        velocity = rotate_vector(velocity, spread);
-    }
-
-    let offset = -meta.size / 2.0;
-
-    let actor = {
-        let mut collision_world = storage::get_mut::<CollisionWorld>();
-        collision_world.add_actor(origin, meta.size.x as i32, meta.size.y as i32)
-    };
-
-    let rotation = deg_to_rad(meta.rotation);
-
-    let entity = world.spawn((
-        TriggeredEffect::new(owner, meta.clone()),
-        Transform::new(origin, rotation),
-        PhysicsBody::new(
-            actor,
-            velocity,
-            PhysicsBodyParams {
-                offset,
-                size: meta.size,
-                can_rotate: meta.can_rotate,
-                gravity: meta.gravity,
-                angular_velocity: meta.angular_velocity,
-                bouncyness: meta.bouncyness,
-                ..Default::default()
-            },
-        ),
-    ));
-
-    if let Some(meta) = meta.sprite.clone() {
-        let animated_sprite = meta.into();
-
-        let mut drawable = Drawable {
-            draw_order: TRIGGERED_EFFECT_DRAW_ORDER,
-            kind: DrawableKind::AnimatedSprite(animated_sprite),
-        };
-
-        {
-            let sprite = drawable.get_animated_sprite_mut().unwrap();
-            sprite.offset -= sprite.frame_size / 2.0;
-        }
-
-        world.insert_one(entity, drawable)?;
-    }
-
-    if !meta.effects.is_empty() {
-        let mut particle_emitters = meta
-            .particles
-            .into_iter()
-            .map(ParticleEmitter::new)
-            .collect::<Vec<_>>();
-
-        for emitter in &mut particle_emitters {
-            emitter.activate();
-        }
-
-        world.insert_one(entity, particle_emitters)?
-    }
-
-    Ok(entity)
-}
-
-const KICK_FORCE: f32 = 15.0;
-const KICK_DELAY: f32 = 0.22;
-
-pub fn fixed_update_triggered_effects(world: &mut World) {
-    let dt = get_frame_time();
-
-    let mut to_trigger = Vec::new();
-
-    let players = world
-        .query::<(&Player, &Transform, &PhysicsBody)>()
-        .iter()
-        .filter_map(|(e, (player, transform, body))| {
-            if player.state == PlayerState::Dead {
-                None
-            } else {
-                Some((e, player.is_facing_left, transform.position, body.size))
-            }
-        })
-        .collect::<Vec<_>>();
-
-    for (entity, (effect, transform, body)) in world
-        .query::<(&mut TriggeredEffect, &Transform, &mut PhysicsBody)>()
-        .iter()
-    {
-        if !effect.should_collide_with_platforms {
-            let mut collision_world = storage::get_mut::<CollisionWorld>();
-            collision_world.descent(body.actor);
-        }
-
-        effect.timed_trigger_timer += dt;
-        effect.kick_delay_timer += dt;
-        effect.activation_timer += dt;
-
-        if let Some(timed_trigger) = effect.timed_trigger {
-            if effect.timed_trigger_timer >= timed_trigger {
-                effect.is_triggered = true;
-            }
-        }
-
-        if effect.is_triggered {
-            effect.trigger_delay_timer += dt;
-        }
-
-        if !effect.is_triggered && effect.activation_timer >= effect.activation_delay {
-            let collider = Rect::new(
-                transform.position.x,
-                transform.position.y,
-                body.size.x,
-                body.size.y,
-            );
-
-            let can_be_triggered_by_player =
-                effect.trigger.contains(&TriggeredEffectTrigger::Player);
-            let can_be_triggered_by_enemy = effect.trigger.contains(&TriggeredEffectTrigger::Enemy);
-            let can_be_triggered_by_ground =
-                effect.trigger.contains(&TriggeredEffectTrigger::Ground);
-
-            if can_be_triggered_by_player || can_be_triggered_by_enemy {
-                let should_exclude_owner = (effect.is_kickable
-                    && effect.kick_delay_timer < KICK_DELAY)
-                    || (!can_be_triggered_by_player && !effect.is_kickable);
-
-                'players: for (pe, is_facing_left, position, size) in players.clone() {
-                    if !should_exclude_owner || pe != effect.owner {
-                        let player_collider = Rect::new(position.x, position.y, size.x, size.y);
-
-                        if collider.overlaps(&player_collider) {
-                            let mut should_trigger = false;
-
-                            if effect.is_kickable && effect.kick_delay_timer >= KICK_DELAY {
-                                if is_facing_left && transform.position.x < position.x + size.x {
-                                    body.velocity.x = -KICK_FORCE;
-                                } else if !is_facing_left && transform.position.x > position.x {
-                                    body.velocity.x = KICK_FORCE;
-                                } else {
-                                    should_trigger = true;
-                                }
-                            } else {
-                                should_trigger = true;
-                            }
-
-                            if should_trigger {
-                                effect.is_triggered = true;
-                                effect.triggered_by = Some(pe);
-                            }
-
-                            break 'players;
-                        }
-                    }
-                }
-            }
-
-            if can_be_triggered_by_ground && body.is_on_ground {
-                effect.is_triggered = true;
-            }
-        }
-
-        if effect.is_triggered
-            && (effect.should_override_delay || effect.trigger_delay_timer >= effect.trigger_delay)
-        {
-            let params = (
-                entity,
-                effect.triggered_by,
-                effect.owner,
-                transform.position,
-                effect.effects.clone(),
-            );
-            to_trigger.push(params);
-        } else if let Some(lifetime) = effect.expire_time {
-            if effect.activation_timer >= lifetime {
-                let params = (
-                    entity,
-                    effect.triggered_by,
-                    effect.owner,
-                    transform.position,
-                    effect.expire_effects.clone(),
-                );
-                to_trigger.push(params);
-            }
-        }
-    }
-
-    for (e, _, owner, origin, effects) in to_trigger.drain(0..) {
-        for params in effects {
-            if let Err(err) = spawn_active_effect(world, owner, e, origin, params) {
-                #[cfg(debug_assertions)]
-                println!("WARNING: {}", err);
-            }
-        }
-
-        if let Err(err) = world.despawn(e) {
-            #[cfg(debug_assertions)]
-            println!("WARNING: {}", err);
-        }
-    }
-}
-
-pub fn update_triggered_effects(world: &mut World) {
-    let mut to_grab = Vec::new();
-
-    let players = world
-        .query::<(
-            &Player,
-            &Transform,
-            &PhysicsBody,
-            &PlayerController,
-            &PlayerInventory,
-        )>()
-        .iter()
-        .filter_map(|(e, (player, transform, body, controller, inventory))| {
-            if player.state == PlayerState::Dead {
-                None
-            } else {
-                Some((
-                    e,
-                    player.is_facing_left,
-                    transform.position,
-                    body.size,
-                    controller.clone(),
-                    inventory.weapon.is_some(),
-                ))
-            }
-        })
-        .collect::<Vec<_>>();
-
-    'effects: for (entity, (effect, body, transform)) in world
-        .query::<(&mut TriggeredEffect, &PhysicsBody, &Transform)>()
-        .iter()
-    {
-        if let Some(opts) = &effect.grab_options {
-            let collider = opts.get_collider_rect(transform.position, body.velocity);
-
-            for (pe, player_is_facing_left, player_pos, size, controller, has_weapon) in &players {
-                let is_on_left = transform.position.x < player_pos.x;
-                // Players with weapons cannot grab items
-                if *has_weapon || (is_on_left != *player_is_facing_left && opts.must_be_facing) {
-                    continue;
-                }
-                let player_collider = Rect::new(player_pos.x, player_pos.y, size.x, size.y);
-
-                if collider.overlaps(&player_collider) && controller.should_pickup {
-                    if let Some(item_id) = &opts.equips_item {
-                        to_grab.push((entity, pe, item_id.clone()));
-                    }
-                    continue 'effects;
-                }
-            }
-        }
-    }
-
-    for (effect_entity, player_entity, item_id) in to_grab {
-        let resources = storage::get::<Resources>();
-        let item = spawn_item(
-            world,
-            Vec2::default(),
-            resources
-                .items
-                .get(&item_id)
-                .expect("Item not found")
-                .clone(),
-        )
-        .unwrap();
-
-        let player_inventory = world
-            .query_one_mut::<&mut PlayerInventory>(*player_entity)
-            .unwrap();
-
-        player_inventory.pending_weapon_replacement = Some(item);
-
-        if let Err(err) = world.despawn(effect_entity) {
-            #[cfg(debug_assertions)]
-            println!("WARNING: {}", err);
-        }
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TriggeredEffectMetadata {
-    /// The effects to instantiate when the triggers condition is met
-    #[serde(default, alias = "effect")]
-    pub effects: Vec<ActiveEffectMetadata>,
-    /// Particle effects that will be attached to the trigger
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub particles: Vec<ParticleEmitterMetadata>,
-    /// This specifies the size of the trigger.
-    #[serde(with = "core::json::vec2_def")]
-    pub size: Vec2,
-    #[serde(default)]
-    pub grab_options: Option<TriggeredEffectGrabOptions>,
-    /// This specifies the valid trigger conditions for the trigger.
-    #[serde(default)]
-    pub trigger: Vec<TriggeredEffectTrigger>,
-    /// This specifies the velocity of the triggers body when it is instantiated.
-    #[serde(default, with = "core::json::vec2_def")]
-    pub velocity: Vec2,
-    /// The number of degrees to randomly vary the velocity angle either up or down when deploying
-    /// the effect
-    #[serde(default)]
-    pub spread: f32,
-    /// This specifies the initial rotation of the sprite.
-    #[serde(default)]
-    pub rotation: f32,
-    /// This specifies the speed at which the object should rotate in mid-air, specified in degrees per second
-    #[serde(default)]
-    pub angular_velocity: f32,
-    /// This can be used to add an animated sprite to the trigger. If only a sprite is desired, an
-    /// animation with only one frame can be used.
-    #[serde(default, alias = "animation", skip_serializing_if = "Option::is_none")]
-    pub sprite: Option<AnimatedSpriteMetadata>,
-    /// This specifies the delay between the the trigger is instantiated and when it will be
-    /// possible to trigger it.
-    /// Explosions and projectiles, if in the list of valid trigger conditions, will ignore this
-    /// and trigger the effect immediately.
-    #[serde(default)]
-    pub activation_delay: f32,
-    /// This specifies the delay between the triggers conditions are met and the effect is triggered.
-    /// Explosions and projectiles, if in the list of valid trigger conditions, will ignore this
-    /// and trigger the effect immediately.
-    #[serde(default)]
-    pub trigger_delay: f32,
-    /// If a value is specified the effect will trigger automatically after `value` time has passed.
-    /// Explosions and projectiles, if in the list of valid trigger conditions, will ignore this
-    /// and trigger the effect immediately.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub timed_trigger: Option<f32>,
-    /// An optional lifetime after which the effect with despawn, _without_ triggering
-    #[serde(default)]
-    pub expire_time: Option<f32>,
-    /// A list of effects that will activate when the item expires, if `expire_time` is not null
-    #[serde(default)]
-    pub expire_effects: Vec<ActiveEffectMetadata>,
-    /// If this is `true` the trigger is kicked by a player, if it hits him while he is facing it
-    #[serde(default)]
-    pub is_kickable: bool,
-    /// If this is `true` the effect will collide with platforms. This will also trigger it on
-    /// collisions with platforms, if `ground` is selected as one of the trigger criteria
-    #[serde(default, rename = "collide_with_platforms")]
-    pub should_collide_with_platforms: bool,
-    /// If this is `true` the triggered physics body will rotate while in the air.
-    #[serde(default)]
-    pub can_rotate: bool,
-    #[serde(default = "default_physics_gravity")]
-    pub gravity: f32,
-    #[serde(default)]
-    pub bouncyness: f32,
-}
-
-impl Default for TriggeredEffectMetadata {
-    fn default() -> Self {
-        TriggeredEffectMetadata {
-            effects: Vec::new(),
-            particles: Vec::new(),
-            size: vec2(6.0, 6.0),
-            grab_options: None,
-            trigger: Vec::new(),
-            velocity: Vec2::ZERO,
-            spread: 0.0,
-            rotation: 0.0,
-            angular_velocity: 0.0,
-            sprite: None,
-            activation_delay: 0.0,
-            trigger_delay: 0.0,
-            timed_trigger: None,
-            expire_time: None,
-            expire_effects: Vec::new(),
-            is_kickable: false,
-            should_collide_with_platforms: false,
-            can_rotate: false,
-            gravity: default_physics_gravity(),
-            bouncyness: 0.0,
-        }
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TriggeredEffectGrabOptions {
-    /// The size of the grab-zone
-    #[serde(with = "core::json::vec2_def")]
-    pub zone_size: Vec2,
-    /// The offset of the grab-zone
-    #[serde(default, with = "core::json::vec2_def")]
-    pub zone_offset: Vec2,
-    /// Whether or not the player must be facing the item to grab it
-    #[serde(default = "default_true")]
-    pub must_be_facing: bool,
-    /// The item that is equipped to the player when this effect is grabbed
-    #[serde(default)]
-    pub equips_item: Option<String>,
-}
-
-impl TriggeredEffectGrabOptions {
-    pub fn get_collider_rect(&self, pos: Vec2, velocity: Vec2) -> Rect {
-        let offset = self.zone_offset;
-        let width = self.zone_size.x;
-        let height = self.zone_size.y;
-        let flip_x = velocity.x < 0.0;
-        let flip_y = velocity.y < 0.0;
-        Rect {
-            // The velocity is used to flip the collision box in the direction the item is moving
-            x: if flip_x {
-                pos.x - width - offset.x
-            } else {
-                pos.x + offset.x
-            },
-            y: if flip_y {
-                pos.y - height - offset.y
-            } else {
-                pos.y + offset.y
-            },
-            w: width,
-            h: height,
-        }
-    }
-}
-
-fn default_true() -> bool {
-    true
-}
-
-fn default_physics_gravity() -> f32 {
-    physics::GRAVITY
-}
diff --git a/src/effects/mod.rs b/src/effects/mod.rs
deleted file mode 100644
index 00f42b64cd..0000000000
--- a/src/effects/mod.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-pub mod active;
-pub mod passive;
-
-pub use passive::{PassiveEffectInstance, PassiveEffectMetadata};
-
-pub use active::{ActiveEffectKind, ActiveEffectMetadata, TriggeredEffectTrigger};
-
-/// This is used to allow both active and passive effects to be used as values in JSON
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(untagged)]
-pub enum AnyEffectParams {
-    Active(ActiveEffectMetadata),
-    Passive(Box<PassiveEffectMetadata>),
-}
diff --git a/src/effects/passive/coroutines.rs b/src/effects/passive/coroutines.rs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/effects/passive/mod.rs b/src/effects/passive/mod.rs
deleted file mode 100644
index 05dffd93ac..0000000000
--- a/src/effects/passive/mod.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use std::collections::HashMap;
-
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-use hecs::{Entity, World};
-
-mod turtle_shell;
-
-use crate::player::PlayerEventKind;
-use crate::{AnimatedSprite, AnimatedSpriteMetadata, PlayerEvent};
-
-static mut PASSIVE_EFFECT_FUNCS: Option<HashMap<String, PassiveEffectFn>> = None;
-
-unsafe fn get_passive_effects_map() -> &'static mut HashMap<String, PassiveEffectFn> {
-    PASSIVE_EFFECT_FUNCS.get_or_insert(HashMap::new())
-}
-
-#[allow(dead_code)]
-pub fn add_passive_effect(id: &str, f: PassiveEffectFn) {
-    unsafe { get_passive_effects_map() }.insert(id.to_string(), f);
-}
-
-pub fn try_get_passive_effect(id: &str) -> Option<&PassiveEffectFn> {
-    unsafe { get_passive_effects_map() }.get(id)
-}
-
-pub fn get_passive_effect(id: &str) -> &PassiveEffectFn {
-    try_get_passive_effect(id).unwrap()
-}
-
-pub type PassiveEffectFn =
-    fn(world: &mut World, player_entity: Entity, item_entity: Option<Entity>, event: PlayerEvent);
-
-pub fn init_passive_effects() {
-    let effects = unsafe { get_passive_effects_map() };
-
-    effects.insert(
-        turtle_shell::EFFECT_FUNCTION_ID.to_string(),
-        turtle_shell::effect_function,
-    );
-}
-
-pub struct PassiveEffectInstance {
-    pub name: String,
-    pub function: Option<PassiveEffectFn>,
-    pub activated_on: Vec<PlayerEventKind>,
-    pub sprite: Option<AnimatedSprite>,
-    pub sprite_entity: Option<Entity>,
-    pub particle_effect_id: Option<String>,
-    pub event_particle_effect_id: Option<String>,
-    pub blocks_damage: bool,
-    pub uses: Option<u32>,
-    pub item: Option<Entity>,
-    pub use_cnt: u32,
-    pub duration: Option<f32>,
-    pub duration_timer: f32,
-}
-
-impl PassiveEffectInstance {
-    pub fn new(item: Option<Entity>, meta: PassiveEffectMetadata) -> Self {
-        let function = meta.function_id.map(|id| *get_passive_effect(&id));
-
-        PassiveEffectInstance {
-            name: meta.name,
-            function,
-            activated_on: meta.activated_on,
-            sprite: meta.sprite.map(Into::into),
-            sprite_entity: None,
-            particle_effect_id: meta.particle_effect_id,
-            event_particle_effect_id: meta.event_particle_effect_id,
-            blocks_damage: meta.blocks_damage,
-            uses: meta.uses,
-            item,
-            use_cnt: 0,
-            duration: meta.duration,
-            duration_timer: 0.0,
-        }
-    }
-
-    pub fn update(&mut self, dt: f32) {
-        self.duration_timer += dt;
-    }
-
-    pub fn is_depleted(&self) -> bool {
-        if let Some(duration) = self.duration {
-            if self.duration_timer >= duration {
-                return true;
-            }
-        }
-
-        if let Some(uses) = self.uses {
-            if self.use_cnt >= uses {
-                return true;
-            }
-        }
-
-        false
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct PassiveEffectMetadata {
-    pub name: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub function_id: Option<String>,
-    /// This specifies the player events that will trigger an activation of the event
-    pub activated_on: Vec<PlayerEventKind>,
-    /// This is the particle effect that will be spawned when the effect become active.
-    #[serde(
-        default,
-        rename = "particle_effect",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub particle_effect_id: Option<String>,
-    /// This is the particle effect that will be spawned, each time a player event leads to the
-    /// effect coroutine being called.
-    #[serde(
-        default,
-        rename = "event_particle_effect",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub event_particle_effect_id: Option<String>,
-    /// If this is true damage will be blocked on a player that has the item equipped
-    #[serde(default)]
-    pub blocks_damage: bool,
-    /// This is the amount of times the coroutine can be called, before the effect is depleted
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub uses: Option<u32>,
-    /// This is the duration of the effect.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub duration: Option<f32>,
-
-    /// An optional sprite to add to the player along with the effect
-    #[serde(alias = "animation")]
-    pub sprite: Option<AnimatedSpriteMetadata>,
-}
diff --git a/src/effects/passive/turtle_shell.rs b/src/effects/passive/turtle_shell.rs
deleted file mode 100644
index 03c0c77038..0000000000
--- a/src/effects/passive/turtle_shell.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use hecs::{Entity, World};
-
-use crate::player::{Player, PlayerEventQueue};
-use crate::PlayerEvent;
-
-pub const EFFECT_FUNCTION_ID: &str = "turtle_shell";
-
-pub fn effect_function(
-    world: &mut World,
-    player_entity: Entity,
-    _item_entity: Option<Entity>,
-    event: PlayerEvent,
-) {
-    if let PlayerEvent::ReceiveDamage { is_from_left, .. } = event {
-        let player = world.get::<Player>(player_entity).unwrap();
-        let mut events = world.get_mut::<PlayerEventQueue>(player_entity).unwrap();
-
-        if player.is_facing_left != is_from_left {
-            events
-                .queue
-                .push(PlayerEvent::DamageBlocked { is_from_left });
-        }
-    }
-}
diff --git a/src/events.rs b/src/events.rs
deleted file mode 100644
index 56816c88e3..0000000000
--- a/src/events.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-//! These events are meant to trigger actions in the main loop.
-//! This might seem excessive, for now, but in the future we want to be able to do things like
-//! jumping between game modes, for example, like starting a test game with a map we are editing
-//! in the editor, without having to exit to main menu, select game mode, select map, etc.
-
-static mut APPLICATION_EVENTS: Option<Vec<ApplicationEvent>> = None;
-
-unsafe fn get_event_queue() -> &'static mut Vec<ApplicationEvent> {
-    APPLICATION_EVENTS.get_or_insert(Vec::new())
-}
-
-pub fn dispatch_application_event(event: ApplicationEvent) {
-    unsafe { get_event_queue() }.push(event);
-}
-
-pub fn iter_events() -> ApplicationEventIterator {
-    ApplicationEventIterator::new()
-}
-
-/// This holds all the event types
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum ApplicationEvent {
-    /// Reload resources
-    ReloadResources,
-    /// Exit to main menu
-    MainMenu,
-    /// Quit to desktop
-    Quit,
-}
-
-impl ApplicationEvent {
-    pub fn dispatch(self) {
-        dispatch_application_event(self);
-    }
-}
-
-/// This iterates over all the events in the event queue
-#[derive(Default)]
-pub struct ApplicationEventIterator {}
-
-impl ApplicationEventIterator {
-    pub fn new() -> Self {
-        ApplicationEventIterator {}
-    }
-}
-
-impl Iterator for ApplicationEventIterator {
-    type Item = ApplicationEvent;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        unsafe { get_event_queue() }.pop()
-    }
-}
diff --git a/src/game/camera.rs b/src/game/camera.rs
deleted file mode 100644
index b6848d111c..0000000000
--- a/src/game/camera.rs
+++ /dev/null
@@ -1,263 +0,0 @@
-use macroquad::prelude::collections::storage;
-use macroquad::prelude::*;
-use macroquad::rand::gen_range;
-
-use core::noise::NoiseGenerator;
-
-use crate::map::Map;
-
-struct Shake {
-    direction: (f32, f32),
-    kind: ShakeType,
-    magnitude: f32,
-    length: f32, //in frames, but stored in float to avoid casting
-    age: f32,
-    random_offset: f32,
-    frequency: f32, // 1 is pretty standard, .2 is a punch (with 10 frames of shake it oscillates about max twice). With .5 it's more of a rumble
-}
-
-#[allow(dead_code)]
-enum ShakeType {
-    Noise,
-    Sinusoidal,
-    Rotational,
-}
-
-pub struct GameCamera {
-    bounds: Rect,
-    follow_buffer: Vec<(Vec2, f32)>,
-    shake: Vec<Shake>,
-    noisegen: NoiseGenerator,
-    noisegen_position: f32,
-
-    pub manual: Option<(Vec2, f32)>,
-    player_rects: Vec<Rect>,
-}
-
-impl GameCamera {
-    const BUFFER_CAPACITY: usize = 20;
-
-    pub fn new(map_size: Vec2) -> GameCamera {
-        let bounds = Rect::new(0.0, 0.0, map_size.x, map_size.y);
-
-        GameCamera {
-            bounds,
-            follow_buffer: vec![],
-            shake: vec![],
-            manual: None,
-            noisegen: NoiseGenerator::new(5),
-            noisegen_position: 5.0,
-            player_rects: Vec::new(),
-        }
-    }
-
-    pub fn add_player_rect(&mut self, rect: Rect) {
-        let map = storage::get::<Map>();
-        let playable = map.get_playable_area();
-        if playable.overlaps(&rect) {
-            self.player_rects.push(rect);
-
-        // We don't want to try to follow the player out of the playable area, so set the
-        // effective player rect to the closest spot to the player that is still touching the
-        // playable area.
-        } else {
-            let min = Vec2::new(playable.x, playable.y);
-            let max = min + Vec2::new(playable.w, playable.h);
-
-            self.player_rects.push(Rect::new(
-                rect.x.clamp(min.x, max.x),
-                rect.y.clamp(min.y, max.y),
-                rect.w,
-                rect.h,
-            ));
-        }
-    }
-}
-
-#[allow(dead_code)]
-impl GameCamera {
-    pub fn shake_noise(&mut self, magnitude: f32, length: i32, frequency: f32) {
-        self.shake.push(Shake {
-            direction: (1.0, 1.0),
-            kind: ShakeType::Noise,
-            magnitude,
-            length: length as f32,
-            age: 0.0,
-            random_offset: rand::gen_range(1.0, 100.0),
-            frequency,
-        });
-    }
-
-    pub fn shake_noise_dir(
-        &mut self,
-        magnitude: f32,
-        length: i32,
-        frequency: f32,
-        direction: (f32, f32),
-    ) {
-        self.shake.push(Shake {
-            direction,
-            kind: ShakeType::Noise,
-            magnitude,
-            length: length as f32,
-            age: 0.0,
-            random_offset: rand::gen_range(1.0, 100.0),
-            frequency,
-        });
-    }
-
-    pub fn shake_sinusoidal(&mut self, magnitude: f32, length: i32, frequency: f32, angle: f32) {
-        self.shake.push(Shake {
-            direction: (angle.cos(), angle.sin()),
-            kind: ShakeType::Sinusoidal,
-            magnitude,
-            length: length as f32,
-            age: 0.0,
-            random_offset: 0.0,
-            frequency,
-        });
-    }
-
-    pub fn shake_rotational(&mut self, magnitude: f32, length: i32) {
-        self.shake.push(Shake {
-            direction: (1.0, 1.0),
-            kind: ShakeType::Rotational,
-            magnitude: magnitude * (gen_range(0, 2) as f32 - 0.5) * 2.0,
-            length: length as f32,
-            age: 0.0,
-            random_offset: 0.0,
-            frequency: 0.0,
-        });
-    }
-
-    pub fn get_shake(&mut self) -> (Vec2, f32) {
-        //(x translate, y translate, rotation)
-        self.noisegen_position += 0.5;
-        let mut shake_offset = vec2(0.0, 0.0);
-        let mut shake_rotation = 0.0;
-        for i in 0..self.shake.len() {
-            let strength = 1.0 - self.shake[i].age / self.shake[i].length;
-            match self.shake[i].kind {
-                ShakeType::Noise => {
-                    shake_offset.x += self.noisegen.perlin_2d(
-                        self.noisegen_position * self.shake[i].frequency
-                            + self.shake[i].random_offset,
-                        5.0,
-                    ) * self.shake[i].magnitude
-                        * self.shake[i].direction.0
-                        * strength
-                        * 100.0;
-                    shake_offset.y += self.noisegen.perlin_2d(
-                        self.noisegen_position * self.shake[i].frequency
-                            + self.shake[i].random_offset,
-                        7.0,
-                    ) * self.shake[i].magnitude
-                        * self.shake[i].direction.1
-                        * strength
-                        * 100.0;
-                }
-                ShakeType::Sinusoidal => {
-                    shake_offset.x += (self.noisegen_position * self.shake[i].frequency * 1.0)
-                        .sin()
-                        * self.shake[i].magnitude
-                        * self.shake[i].direction.0
-                        * strength
-                        * 50.0; // Noise values are +/- 0.5, trig is twice as large
-                    shake_offset.y += (self.noisegen_position * self.shake[i].frequency * 1.0)
-                        .sin()
-                        * self.shake[i].magnitude
-                        * self.shake[i].direction.1
-                        * strength
-                        * 50.0;
-                }
-                ShakeType::Rotational => {
-                    //shake_rotation += self.noisegen.perlin_2d(self.noisegen_position * self.shake[i].frequency + self.shake[i].random_offset, 5.0) * self.shake[i].magnitude * strength.powi(3);
-                    shake_rotation += self.shake[i].magnitude * strength.powi(3) * 3.0;
-                }
-            };
-
-            self.shake[i].age += 1.0;
-        }
-
-        self.shake.retain(|s| s.age < s.length);
-
-        shake_offset.x = (shake_offset.x.abs() + 1.0).log2() * shake_offset.x.signum(); // log2(x+1) is almost linear from 0-1, but then flattens out. Limits the screenshake so if there is lots at the same time, the scene won't fly away
-        shake_offset.y = (shake_offset.y.abs() + 1.0).log2() * shake_offset.y.signum();
-
-        (shake_offset, shake_rotation)
-    }
-
-    pub fn update(&mut self) {
-        {
-            let aspect = screen_width() / screen_height();
-
-            let mut middle_point = vec2(0.0, 0.0);
-            let mut min = vec2(10000.0, 10000.0);
-            let mut max = vec2(-10000.0, -10000.0);
-
-            let player_cnt = self.player_rects.len();
-            for rect in self.player_rects.drain(0..player_cnt) {
-                let camera_pox_middle = rect.point() + rect.size() / 2.0;
-                //let k = if player.controller_id == 1 { 0.8 } else { 0.2 };
-                middle_point += camera_pox_middle; // * k;
-
-                min = min.min(camera_pox_middle);
-                max = max.max(camera_pox_middle);
-            }
-
-            middle_point /= player_cnt as f32;
-
-            let border_x = 150.0;
-            let border_y = 200.0;
-            let mut scale = (max - min).abs() + vec2(border_x * 2.0, border_y * 2.0);
-
-            if scale.x > scale.y * aspect {
-                scale.y = scale.x / aspect;
-            }
-
-            let mut zoom = scale.y;
-
-            // bottom camera bound
-            if scale.y / 2. + middle_point.y > self.bounds.h {
-                middle_point.y = self.bounds.h - scale.y / 2.0;
-            }
-
-            if let Some((override_target, override_zoom)) = self.manual {
-                middle_point = override_target;
-                zoom = override_zoom;
-            }
-
-            self.follow_buffer.insert(0, (middle_point, zoom));
-            self.follow_buffer.truncate(Self::BUFFER_CAPACITY);
-        }
-        let mut sum_pos = (0.0f64, 0.0f64);
-        let mut sum_zoom = 0.0;
-        for (pos, zoom) in &self.follow_buffer {
-            sum_pos.0 += pos.x as f64;
-            sum_pos.1 += pos.y as f64;
-            sum_zoom += *zoom as f64;
-        }
-        let mut middle_point = vec2(
-            (sum_pos.0 / self.follow_buffer.len() as f64) as f32,
-            (sum_pos.1 / self.follow_buffer.len() as f64) as f32,
-        );
-        let zoom = (sum_zoom / self.follow_buffer.len() as f64) as f32;
-
-        let shake = self.get_shake();
-        middle_point += shake.0;
-        let rotation = shake.1;
-
-        let aspect = screen_width() / screen_height();
-
-        // let middle_point = vec2(400.0, 600.0);
-        // let zoom = 400.0;
-        let macroquad_camera = Camera2D {
-            target: middle_point,
-            zoom: vec2(1. / aspect, -1.0) / zoom * 2.0,
-            rotation,
-            ..Camera2D::default()
-        };
-
-        scene::set_camera(0, Some(macroquad_camera));
-    }
-}
diff --git a/src/game/mod.rs b/src/game/mod.rs
deleted file mode 100644
index 093de572b3..0000000000
--- a/src/game/mod.rs
+++ /dev/null
@@ -1,296 +0,0 @@
-mod camera;
-mod music;
-pub mod sound;
-
-pub use camera::GameCamera;
-
-use fishsticks::{Button, GamepadContext};
-
-use macroquad::experimental::collections::storage;
-use macroquad::experimental::scene::{Node, RefMut};
-use macroquad::prelude::*;
-use macroquad::ui::root_ui;
-
-use hecs::{Entity, World};
-
-use core::input::is_gamepad_btn_pressed;
-use core::Result;
-
-use crate::debug;
-use crate::ecs::Scheduler;
-use crate::gui::{self, GAME_MENU_RESULT_MAIN_MENU, GAME_MENU_RESULT_QUIT};
-use crate::physics::{debug_draw_physics_bodies, fixed_update_physics_bodies};
-use crate::player::{
-    draw_weapons_hud, spawn_player, update_player_animations, update_player_camera_box,
-    update_player_controllers, update_player_events, update_player_inventory,
-    update_player_passive_effects, update_player_states, PlayerParams,
-};
-use crate::{
-    create_collision_world, debug_draw_drawables, debug_draw_rigid_bodies, draw_drawables,
-    exit_to_main_menu, fixed_update_rigid_bodies, quit_to_desktop, update_animated_sprites, Map,
-    MapLayerKind, MapObjectKind, Resources,
-};
-
-use crate::effects::active::debug_draw_active_effects;
-use crate::effects::active::projectiles::fixed_update_projectiles;
-use crate::effects::active::triggered::{fixed_update_triggered_effects, update_triggered_effects};
-use crate::items::{spawn_item, update_respawning_items};
-use crate::map::{
-    debug_draw_fish_schools, fixed_update_sproingers, spawn_crab, spawn_decoration,
-    spawn_fish_school, spawn_sproinger, update_crabs, update_fish_schools, update_map_kill_zone,
-};
-use crate::network::{
-    fixed_update_network_client, fixed_update_network_host, update_network_client,
-    update_network_host,
-};
-use crate::particles::{draw_particles, update_particle_emitters};
-pub use music::{start_music, stop_music};
-pub use sound::play_sound_effect;
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub enum GameMode {
-    Local,
-    NetworkHost,
-    NetworkClient,
-}
-
-pub struct Game {
-    world: World,
-    #[allow(dead_code)]
-    players: Vec<Entity>,
-    updates: Scheduler,
-    fixed_updates: Scheduler,
-    draws: Scheduler,
-    #[cfg(debug_assertions)]
-    debug_draws: Scheduler,
-}
-
-impl Game {
-    pub fn new(mode: GameMode, map: Map, player_params: &[PlayerParams]) -> Result<Game> {
-        let mut world = World::default();
-
-        {
-            let camera = GameCamera::new(map.get_size());
-            storage::store(camera);
-
-            let collision_world = create_collision_world(&map);
-            storage::store(collision_world);
-        }
-
-        spawn_map_objects(&mut world, &map).unwrap();
-
-        let players = player_params
-            .iter()
-            .cloned()
-            .map(|params| {
-                let position = map.get_random_spawn_point();
-                spawn_player(
-                    &mut world,
-                    params.index,
-                    position,
-                    params.controller,
-                    params.character,
-                )
-            })
-            .collect();
-
-        storage::store(map);
-
-        let mut updates_builder = Scheduler::builder();
-
-        let mut fixed_updates_builder = Scheduler::builder();
-
-        match mode {
-            GameMode::NetworkClient => {
-                updates_builder.add_system(update_network_client);
-
-                fixed_updates_builder.add_system(fixed_update_network_client);
-            }
-            GameMode::NetworkHost => {
-                updates_builder.add_system(update_network_host);
-
-                fixed_updates_builder.add_system(fixed_update_network_host);
-            }
-            _ => {}
-        }
-
-        updates_builder
-            .add_system(update_player_controllers)
-            .add_system(update_player_camera_box);
-
-        if matches!(mode, GameMode::Local | GameMode::NetworkHost) {
-            updates_builder
-                .add_system(update_respawning_items)
-                .add_system(update_map_kill_zone)
-                .add_system(update_player_states)
-                .add_system(update_player_inventory)
-                .add_system(update_player_passive_effects)
-                .add_system(update_player_events)
-                .add_system(update_triggered_effects)
-                .add_system(update_fish_schools)
-                .add_system(update_crabs);
-
-            fixed_updates_builder
-                .add_system(fixed_update_physics_bodies)
-                .add_system(fixed_update_rigid_bodies)
-                .add_system(fixed_update_projectiles)
-                .add_system(fixed_update_triggered_effects)
-                .add_system(fixed_update_sproingers);
-        }
-
-        let updates = updates_builder
-            .with_system(update_player_animations)
-            .with_system(update_animated_sprites)
-            .with_system(update_particle_emitters)
-            .build();
-
-        let fixed_updates = fixed_updates_builder.build();
-
-        let draws = Scheduler::builder()
-            .with_thread_local(draw_drawables)
-            .with_thread_local(draw_weapons_hud)
-            .with_thread_local(draw_particles)
-            .build();
-
-        #[cfg(debug_assertions)]
-        let debug_draws = Scheduler::builder()
-            .with_thread_local(debug_draw_drawables)
-            .with_thread_local(debug_draw_physics_bodies)
-            .with_thread_local(debug_draw_rigid_bodies)
-            .with_thread_local(debug_draw_active_effects)
-            .with_thread_local(debug_draw_fish_schools)
-            .build();
-
-        let res = Game {
-            world,
-            players,
-            updates,
-            fixed_updates,
-            draws,
-            #[cfg(debug_assertions)]
-            debug_draws,
-        };
-
-        Ok(res)
-    }
-
-    fn on_update(&mut self) {
-        self.updates.execute(&mut self.world);
-
-        #[cfg(debug_assertions)]
-        if is_key_pressed(macroquad::prelude::KeyCode::U) {
-            crate::debug::toggle_debug_draw();
-        }
-
-        {
-            let gamepad_context = storage::get::<GamepadContext>();
-            if is_key_pressed(macroquad::prelude::KeyCode::Escape)
-                || is_gamepad_btn_pressed(Some(&gamepad_context), Button::Start)
-            {
-                gui::toggle_game_menu();
-            }
-        }
-    }
-
-    fn on_fixed_update(&mut self) {
-        self.fixed_updates.execute(&mut self.world);
-    }
-
-    fn on_draw(&mut self) {
-        let mut camera = storage::get_mut::<GameCamera>();
-        camera.update();
-
-        {
-            let map = storage::get::<Map>();
-            map.draw(None, true);
-        }
-
-        self.draws.execute(&mut self.world);
-
-        #[cfg(debug_assertions)]
-        if debug::is_debug_draw_enabled() {
-            self.debug_draws.execute(&mut self.world);
-        }
-
-        if gui::is_game_menu_open() {
-            if let Some(res) = gui::draw_game_menu(&mut *root_ui()) {
-                match res.into_usize() {
-                    GAME_MENU_RESULT_MAIN_MENU => exit_to_main_menu(),
-                    GAME_MENU_RESULT_QUIT => quit_to_desktop(),
-                    _ => {}
-                }
-            }
-        }
-    }
-}
-
-impl Node for Game {
-    fn update(mut node: RefMut<Self>) {
-        node.on_update();
-    }
-
-    fn fixed_update(mut node: RefMut<Self>) {
-        node.on_fixed_update();
-    }
-
-    fn draw(mut node: RefMut<Self>) {
-        node.on_draw();
-    }
-}
-
-pub fn spawn_map_objects(world: &mut World, map: &Map) -> Result<Vec<Entity>> {
-    let mut objects = Vec::new();
-
-    for layer in map.layers.values() {
-        if layer.is_visible && layer.kind == MapLayerKind::ObjectLayer {
-            for map_object in &layer.objects {
-                match map_object.kind {
-                    MapObjectKind::Decoration => {
-                        let resources = storage::get::<Resources>();
-                        let res = resources.decoration.get(&map_object.id).cloned();
-
-                        if let Some(params) = res {
-                            let decoration = spawn_decoration(world, map_object.position, params);
-                            objects.push(decoration);
-                        } else {
-                            #[cfg(debug_assertions)]
-                            println!("WARNING: Invalid decoration id '{}'", &map_object.id)
-                        }
-                    }
-                    MapObjectKind::Item => {
-                        let resources = storage::get::<Resources>();
-                        let res = resources.items.get(&map_object.id).cloned();
-
-                        if let Some(params) = res {
-                            let item = spawn_item(world, map_object.position, params)?;
-                            objects.push(item);
-                        } else {
-                            #[cfg(debug_assertions)]
-                            println!("WARNING: Invalid item id '{}'", &map_object.id)
-                        }
-                    }
-                    MapObjectKind::Environment => match map_object.id.as_str() {
-                        "sproinger" => {
-                            let sproinger = spawn_sproinger(world, map_object.position)?;
-                            objects.push(sproinger);
-                        }
-                        "crab" => {
-                            let crab = spawn_crab(world, map_object.position)?;
-                            objects.push(crab);
-                        }
-                        "fish_school" => {
-                            let fish_school = spawn_fish_school(world, map_object.position)?;
-                            objects.push(fish_school);
-                        }
-                        _ => {
-                            #[cfg(debug_assertions)]
-                            println!("WARNING: Invalid environment item id '{}'", &map_object.id)
-                        }
-                    },
-                }
-            }
-        }
-    }
-
-    Ok(objects)
-}
diff --git a/src/game/music.rs b/src/game/music.rs
deleted file mode 100644
index 0a014c11cd..0000000000
--- a/src/game/music.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use macroquad::{
-    audio::{play_sound, stop_sound, PlaySoundParams, Sound},
-    experimental::collections::storage,
-};
-
-use crate::Resources;
-
-static mut CURRENTLY_PLAYING: Option<Sound> = None;
-
-pub fn start_music(id: &str) {
-    stop_music();
-
-    let resources = storage::get::<Resources>();
-    let sound = resources.music[id];
-
-    play_sound(
-        sound,
-        PlaySoundParams {
-            looped: true,
-            volume: 0.6,
-        },
-    );
-
-    unsafe { CURRENTLY_PLAYING = Some(sound) };
-}
-
-pub fn stop_music() {
-    if let Some(sound) = unsafe { CURRENTLY_PLAYING } {
-        stop_sound(sound);
-    }
-}
diff --git a/src/game/sound.rs b/src/game/sound.rs
deleted file mode 100644
index 3909bbc4ed..0000000000
--- a/src/game/sound.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use macroquad::{audio::play_sound, prelude::collections::storage};
-
-use crate::Resources;
-
-/// This is a stand-in until we have volume settings
-pub const SOUND_EFFECT_VOLUME: f32 = 0.4;
-
-pub fn play_sound_effect(sound_id: &str, volume_multiplier: f32) {
-    let resources = storage::get::<Resources>();
-    let sound = resources.sounds[sound_id];
-    play_sound(
-        sound,
-        macroquad::audio::PlaySoundParams {
-            looped: false,
-            volume: SOUND_EFFECT_VOLUME * volume_multiplier,
-        },
-    );
-}
diff --git a/src/gui/background.rs b/src/gui/background.rs
deleted file mode 100644
index 74d0271542..0000000000
--- a/src/gui/background.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use macroquad::{
-    color,
-    experimental::collections::storage,
-    prelude::*,
-    ui::{root_ui, widgets, Ui},
-};
-
-use crate::resources::{Resources, TextureResource};
-
-pub struct Background {
-    textures: Vec<TextureResource>,
-    size: Vec2,
-    position: Vec2,
-}
-
-impl Background {
-    pub fn new(size: Vec2, position: Vec2, textures: &[TextureResource]) -> Self {
-        let textures = textures.to_vec();
-
-        Background {
-            textures,
-            size,
-            position,
-        }
-    }
-
-    pub fn ui(&self, ui: &mut Ui) {
-        for res in &self.textures {
-            widgets::Texture::new(res.texture)
-                .size(self.size.x, self.size.y)
-                .position(self.position)
-                .ui(ui);
-        }
-    }
-
-    pub fn draw(&self) {
-        for res in &self.textures {
-            draw_texture_ex(
-                res.texture,
-                self.position.x,
-                self.position.y,
-                color::WHITE,
-                DrawTextureParams {
-                    dest_size: Some(self.size),
-                    ..Default::default()
-                },
-            )
-        }
-    }
-}
-
-pub fn draw_main_menu_background(is_ui: bool) {
-    let resources = storage::get::<Resources>();
-
-    let background_01 = resources.textures.get("background_01").cloned().unwrap();
-    let background_02 = resources.textures.get("background_02").cloned().unwrap();
-    let background_03 = resources.textures.get("background_03").cloned().unwrap();
-    let background_04 = resources.textures.get("background_04").cloned().unwrap();
-
-    let height = screen_height();
-    let width = (height / background_01.texture.height()) * background_01.texture.width();
-
-    let bg = Background::new(
-        vec2(width, height),
-        Vec2::ZERO,
-        &[background_04, background_03, background_02, background_01],
-    );
-
-    if is_ui {
-        bg.ui(&mut *root_ui());
-    } else {
-        bg.draw();
-    }
-}
diff --git a/src/gui/checkbox.rs b/src/gui/checkbox.rs
deleted file mode 100644
index b89cc2733a..0000000000
--- a/src/gui/checkbox.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use std::ops::Deref;
-
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{widgets, Id, Ui},
-};
-
-use crate::gui::{GuiResources, ELEMENT_MARGIN};
-
-pub struct Checkbox {
-    id: Id,
-    margin: f32,
-    position: Option<Vec2>,
-    label: String,
-    allow_click_on_label: bool,
-}
-
-impl Checkbox {
-    const ALLOW_CLICK_ON_LABEL: bool = true;
-
-    pub fn new<P: Into<Option<Vec2>>>(id: Id, position: P, label: &str) -> Self {
-        Checkbox {
-            id,
-            margin: 0.0,
-            position: position.into(),
-            label: label.to_string(),
-            allow_click_on_label: Self::ALLOW_CLICK_ON_LABEL,
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn with_inactive_label(self) -> Self {
-        Checkbox {
-            allow_click_on_label: false,
-            ..self
-        }
-    }
-
-    pub fn with_margin(self, margin: f32) -> Self {
-        Checkbox { margin, ..self }
-    }
-
-    pub fn ui(&self, ui: &mut Ui, value: &mut bool) {
-        let gui_resources = storage::get::<GuiResources>();
-
-        if *value {
-            ui.push_skin(&gui_resources.skins.checkbox_selected);
-        } else {
-            ui.push_skin(&gui_resources.skins.checkbox);
-        }
-
-        ui.separator();
-
-        let label_size = ui.calc_size(&self.label);
-        let element_height = label_size.y * 0.75;
-        let checkbox_size = vec2(element_height, element_height);
-        let mut total_size = vec2(checkbox_size.x + ELEMENT_MARGIN, 0.0) + label_size;
-
-        let mut position = None;
-        if let Some(mut pos) = self.position {
-            pos.x += self.margin;
-            position = Some(pos);
-        } else {
-            total_size.x += self.margin;
-        }
-
-        let mut group = widgets::Group::new(self.id, total_size);
-
-        if let Some(position) = position {
-            group = group.position(position);
-        }
-
-        group.ui(ui, |ui| {
-            let mut checkbox_position = vec2(0.0, (label_size.y - element_height) / 2.0);
-            let mut label_position = vec2(checkbox_size.x + ELEMENT_MARGIN, 0.0);
-
-            if position.is_none() {
-                checkbox_position.x += self.margin;
-                label_position.x += self.margin;
-            }
-
-            let checkbox = widgets::Button::new("")
-                .position(checkbox_position)
-                .size(checkbox_size)
-                .ui(ui);
-
-            if checkbox {
-                *value = !*value;
-            }
-
-            ui.push_skin(&gui_resources.skins.label_button);
-            let label_btn = widgets::Button::new(self.label.deref())
-                .position(label_position)
-                .ui(ui);
-            ui.pop_skin();
-
-            if label_btn && self.allow_click_on_label {
-                *value = !*value;
-            }
-        });
-
-        ui.pop_skin();
-    }
-}
diff --git a/src/gui/create_map.rs b/src/gui/create_map.rs
deleted file mode 100644
index 6308dc2c3e..0000000000
--- a/src/gui/create_map.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use std::path::Path;
-
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{hash, root_ui, widgets},
-};
-
-use core::Result;
-
-use super::{GuiResources, Panel};
-
-use crate::gui::draw_main_menu_background;
-use crate::resources::{
-    map_name_to_filename, MapResource, Resources, MAP_EXPORTS_DEFAULT_DIR, MAP_EXPORTS_EXTENSION,
-};
-use core::input::{is_gamepad_btn_pressed, GamepadContext};
-
-enum WindowState {
-    None,
-    Params(String, String, Vec2, UVec2),
-    Cancel,
-}
-
-pub async fn show_create_map_menu() -> Result<Option<MapResource>> {
-    let mut res = WindowState::None;
-
-    let size = vec2(350.0, 425.0);
-    let position = vec2(
-        (screen_width() - size.x) / 2.0,
-        (screen_height() - size.y) / 2.0,
-    );
-
-    next_frame().await;
-
-    let gui_resources = storage::get::<GuiResources>();
-    root_ui().push_skin(&gui_resources.skins.menu);
-
-    let mut name = "Unnamed Map".to_string();
-    let mut description = "".to_string();
-    let mut grid_width = "100".to_string();
-    let mut grid_height = "100".to_string();
-    let mut tile_width = "32".to_string();
-    let mut tile_height = "32".to_string();
-
-    let map_export_path = {
-        let resources = storage::get::<Resources>();
-        Path::new(&resources.assets_dir).join(MAP_EXPORTS_DEFAULT_DIR)
-    };
-
-    let mut gamepad_system = storage::get_mut::<GamepadContext>();
-
-    loop {
-        let _ = gamepad_system.update();
-
-        draw_main_menu_background(true);
-
-        Panel::new(hash!(), size, position)
-            .with_title("Create Map", false)
-            .ui(&mut *root_ui(), |ui, _| {
-                {
-                    let size = vec2(275.0, 25.0);
-
-                    widgets::InputText::new(hash!())
-                        .size(size)
-                        .ratio(1.0)
-                        .ui(ui, &mut name);
-                }
-
-                ui.separator();
-
-                {
-                    let path_label = map_export_path
-                        .join(map_name_to_filename(&name))
-                        .with_extension(MAP_EXPORTS_EXTENSION);
-
-                    widgets::Label::new(path_label.to_string_lossy().as_ref()).ui(ui);
-                }
-
-                ui.separator();
-
-                {
-                    let size = vec2(275.0, 75.0);
-
-                    widgets::InputText::new(hash!())
-                        .size(size)
-                        .ratio(1.0)
-                        .ui(ui, &mut description);
-                }
-
-                ui.separator();
-
-                {
-                    let size = vec2(75.0, 25.0);
-
-                    widgets::InputText::new(hash!())
-                        .size(size)
-                        .ratio(1.0)
-                        .label("x")
-                        .ui(ui, &mut tile_width);
-
-                    ui.same_line(size.x + 25.0);
-
-                    widgets::InputText::new(hash!())
-                        .size(size)
-                        .ratio(1.0)
-                        .label("Tile size")
-                        .ui(ui, &mut tile_height);
-
-                    widgets::InputText::new(hash!())
-                        .size(size)
-                        .ratio(1.0)
-                        .label("x")
-                        .ui(ui, &mut grid_width);
-
-                    ui.same_line(size.x + 25.0);
-
-                    widgets::InputText::new(hash!())
-                        .size(size)
-                        .ratio(1.0)
-                        .label("Grid size")
-                        .ui(ui, &mut grid_height);
-                }
-
-                ui.separator();
-                ui.separator();
-                ui.separator();
-
-                let btn_a =
-                    is_gamepad_btn_pressed(Some(&gamepad_system), fishsticks::Button::South);
-
-                let enter = is_key_pressed(KeyCode::Enter);
-
-                if ui.button(None, "Confirm") || btn_a || enter {
-                    // TODO: Validate input
-
-                    let tile_size = vec2(
-                        tile_width.parse::<f32>().unwrap(),
-                        tile_height.parse::<f32>().unwrap(),
-                    );
-
-                    let grid_size = uvec2(
-                        grid_width.parse::<u32>().unwrap(),
-                        grid_height.parse::<u32>().unwrap(),
-                    );
-
-                    res = WindowState::Params(
-                        name.clone(),
-                        description.clone(),
-                        tile_size,
-                        grid_size,
-                    );
-                }
-
-                ui.same_line(0.0);
-
-                let btn_b = is_gamepad_btn_pressed(Some(&gamepad_system), fishsticks::Button::East);
-
-                let escape = is_key_pressed(KeyCode::Escape);
-
-                if ui.button(None, "Cancel") || btn_b || escape {
-                    res = WindowState::Cancel;
-                }
-            });
-
-        match res {
-            WindowState::Params(name, description, tile_size, grid_size) => {
-                root_ui().pop_skin();
-
-                let description = if description.is_empty() {
-                    None
-                } else {
-                    Some(description.as_str())
-                };
-
-                let resources = storage::get::<Resources>();
-                return resources
-                    .create_map(&name, description, tile_size, grid_size)
-                    .map(Some);
-            }
-            WindowState::Cancel => {
-                return Ok(None);
-            }
-            _ => {}
-        }
-
-        next_frame().await;
-    }
-}
diff --git a/src/gui/credits.rs b/src/gui/credits.rs
deleted file mode 100644
index aa83579476..0000000000
--- a/src/gui/credits.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-use core::input::is_gamepad_btn_pressed;
-use fishsticks::{Button, GamepadContext};
-use macroquad::{experimental::collections::storage, prelude::*};
-use std::path::Path;
-
-const TEXT_X_OFFSET: f32 = 370.0;
-const MAIN_HEADER_Y_OFFSET: f32 = 300.0;
-const SECONDARY_HEADER_Y_OFFSET: f32 = 150.0;
-const TEXT_Y_OFFSET: f32 = 60.0;
-
-const CREDITS_LIST: [(&str, LabelType); 32] = [
-    ("Fish Folk: Jumpy", LabelType::MainHeader),
-    ("Founding Team", LabelType::SecondaryHeader),
-    ("Erlend Sogge Heggen - General Director", LabelType::Regular),
-    ("'Emerald Jak' - Sound Director", LabelType::Regular),
-    (
-        "Fedor Logachev - Technical Director (former)",
-        LabelType::Regular,
-    ),
-    (
-        "Ole A. Sjo Fasting - Technical Director (current)",
-        LabelType::Regular,
-    ),
-    ("Orlando Herrera - Art Director", LabelType::Regular),
-    ("Regulars", LabelType::SecondaryHeader),
-    ("Orhun Parmaksız - Infrastructure", LabelType::Regular),
-    ("Kultaev Aleksandr - Gameplay Code", LabelType::Regular),
-    ("Carlo Supina - Dev Advocacy", LabelType::Regular),
-    ("Micah Tigley - Dev Advocacy", LabelType::Regular),
-    ("Drake - Media Content", LabelType::Regular),
-    (
-        "Michał Grzegórzek-Kiaszewicz - Gameplay Design",
-        LabelType::Regular,
-    ),
-    ("Contributors", LabelType::SecondaryHeader),
-    ("Saverio Miroddi - Gameplay Code", LabelType::Regular),
-    ("@grufkork - Gameplay Code", LabelType::Regular),
-    ("@PotatoTech - Gameplay Code", LabelType::Regular),
-    ("Armando Gonzalez - Gameplay Code", LabelType::Regular),
-    ("Isaac - Gameplay Code", LabelType::Regular),
-    ("Kadir Yazıcı - Gameplay Code", LabelType::Regular),
-    ("Ignat Insarovi - Gameplay Code", LabelType::Regular),
-    ("garoslaw - Audio", LabelType::Regular),
-    ("Animesh Sahu - Infrastructure", LabelType::Regular),
-    ("Srayan Jana - Dev Advocacy", LabelType::Regular),
-    ("Alve Larsson - Website", LabelType::Regular),
-    ("William Batista - Gameplay Code", LabelType::Regular),
-    ("@zicklag - Gameplay Code", LabelType::Regular),
-    ("Tech Foundations", LabelType::SecondaryHeader),
-    ("macroquad.rs", LabelType::Regular),
-    ("rust-lang.org", LabelType::Regular),
-    ("Thank you!", LabelType::MainHeader),
-];
-
-#[derive(Clone)]
-struct CreditLabel {
-    text: String,
-    x: f32,
-    y: f32,
-    font_size: u16,
-}
-
-#[derive(Clone, Copy)]
-enum LabelType {
-    MainHeader,
-    SecondaryHeader,
-    Regular,
-}
-
-pub async fn show_game_credits(assets_dir: &str) {
-    let gamepad_context = storage::get::<GamepadContext>();
-
-    let mut delta = 200.0;
-    let credits = create_game_credits();
-
-    let font = load_ttf_font(
-        Path::new(assets_dir)
-            .join("ui/AnonymousPro-Regular.ttf")
-            .to_str()
-            .unwrap(),
-    )
-    .await
-    .unwrap();
-
-    loop {
-        if is_key_pressed(KeyCode::Escape)
-            || is_gamepad_btn_pressed(Some(&gamepad_context), Button::East)
-        {
-            break;
-        }
-
-        clear_background(BLACK);
-        delta -= 0.5;
-
-        for credit in &credits {
-            let x = screen_width() / 2.0 - credit.x;
-            let y = credit.y + delta;
-            draw_text_ex(
-                &credit.text,
-                x,
-                y,
-                TextParams {
-                    font,
-                    font_size: credit.font_size,
-                    color: WHITE,
-                    ..Default::default()
-                },
-            );
-        }
-
-        next_frame().await;
-    }
-}
-
-fn create_game_credits() -> Vec<CreditLabel> {
-    let mut game_credits: Vec<CreditLabel> = Vec::new();
-    let mut prev_position = 0.0;
-
-    for credit in CREDITS_LIST {
-        let credit_label = credit;
-        match credit_label.1 {
-            LabelType::MainHeader => {
-                if credit.0 == "Fish Folk: Jumpy" {
-                    prev_position -= MAIN_HEADER_Y_OFFSET;
-                } else {
-                    prev_position -= -MAIN_HEADER_Y_OFFSET;
-                }
-
-                game_credits.push(CreditLabel {
-                    text: credit_label.0.to_string(),
-                    x: TEXT_X_OFFSET,
-                    y: screen_height() + prev_position,
-                    font_size: 100,
-                });
-            }
-            LabelType::SecondaryHeader => {
-                prev_position -= -SECONDARY_HEADER_Y_OFFSET;
-
-                game_credits.push(CreditLabel {
-                    text: credit_label.0.to_string(),
-                    x: TEXT_X_OFFSET,
-                    y: screen_height() + prev_position,
-                    font_size: 40,
-                });
-            }
-            LabelType::Regular => {
-                prev_position -= -TEXT_Y_OFFSET;
-
-                game_credits.push(CreditLabel {
-                    text: credit_label.0.to_string(),
-                    x: TEXT_X_OFFSET,
-                    y: screen_height() + prev_position,
-                    font_size: 30,
-                });
-            }
-        }
-    }
-
-    game_credits
-}
diff --git a/src/gui/game_menu.rs b/src/gui/game_menu.rs
deleted file mode 100644
index 25199c9b3a..0000000000
--- a/src/gui/game_menu.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use macroquad::{
-    prelude::*,
-    ui::{hash, Ui},
-};
-
-use super::{Menu, MenuEntry, MenuResult};
-
-const MENU_WIDTH: f32 = 300.0;
-
-pub const GAME_MENU_RESULT_MAIN_MENU: usize = 0;
-pub const GAME_MENU_RESULT_QUIT: usize = 1;
-
-static mut GAME_MENU_INSTANCE: Option<Menu> = None;
-
-pub fn open_game_menu() {
-    unsafe {
-        if GAME_MENU_INSTANCE.is_none() {
-            let menu = Menu::new(
-                hash!(),
-                MENU_WIDTH,
-                &[
-                    #[cfg(not(feature = "ultimate"))]
-                    MenuEntry {
-                        index: GAME_MENU_RESULT_MAIN_MENU,
-                        title: "Main Menu".to_string(),
-                        ..Default::default()
-                    },
-                    MenuEntry {
-                        index: GAME_MENU_RESULT_QUIT,
-                        title: "Quit".to_string(),
-                        ..Default::default()
-                    },
-                ],
-            );
-
-            GAME_MENU_INSTANCE = Some(menu);
-        }
-    }
-}
-
-pub fn close_game_menu() {
-    unsafe { GAME_MENU_INSTANCE = None };
-}
-
-pub fn draw_game_menu(ui: &mut Ui) -> Option<MenuResult> {
-    let menu = unsafe {
-        if GAME_MENU_INSTANCE.is_none() {
-            open_game_menu();
-        }
-
-        GAME_MENU_INSTANCE.as_mut().unwrap()
-    };
-
-    let res = menu.ui(ui);
-
-    if res.is_some() {
-        close_game_menu();
-    }
-
-    res
-}
-
-pub fn is_game_menu_open() -> bool {
-    unsafe { GAME_MENU_INSTANCE.is_some() }
-}
-
-/// Toggle game menu and return state after toggle
-pub fn toggle_game_menu() -> bool {
-    if is_game_menu_open() {
-        close_game_menu();
-        false
-    } else {
-        open_game_menu();
-        true
-    }
-}
diff --git a/src/gui/main_menu.rs b/src/gui/main_menu.rs
deleted file mode 100644
index 9fd4297766..0000000000
--- a/src/gui/main_menu.rs
+++ /dev/null
@@ -1,317 +0,0 @@
-use std::borrow::BorrowMut;
-
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{self, hash, root_ui, widgets},
-};
-
-use fishsticks::{Button, GamepadContext};
-
-use super::{draw_main_menu_background, GuiResources, Menu, MenuEntry, MenuResult, Panel};
-
-use crate::player::{PlayerControllerKind, PlayerParams};
-use crate::{gui, EditorInputScheme, Map, Resources};
-use core::input::{is_gamepad_btn_pressed, update_gamepad_context, GameInputScheme};
-
-const MENU_WIDTH: f32 = 300.0;
-
-const HEADER_TEXTURE_ID: &str = "main_menu_header";
-
-const LOCAL_GAME_MENU_WIDTH: f32 = 400.0;
-const LOCAL_GAME_MENU_HEIGHT: f32 = 200.0;
-
-pub enum MainMenuResult {
-    LocalGame {
-        map: Box<Map>,
-        players: Vec<PlayerParams>,
-    },
-    Editor {
-        input_scheme: EditorInputScheme,
-        is_new_map: bool,
-    },
-    ReloadResources,
-    Credits,
-    Quit,
-}
-
-#[allow(dead_code)]
-enum MainMenuState {
-    Root(Menu),
-    LocalGame,
-    Settings,
-    Editor(Menu),
-    Credits,
-}
-
-const ROOT_OPTION_LOCAL_GAME: usize = 0;
-const ROOT_OPTION_EDITOR: usize = 1;
-// Settings haven't been implemented yet
-// const ROOT_OPTION_SETTINGS: usize = 2;
-const ROOT_OPTION_RELOAD_RESOURCES: usize = 3;
-const ROOT_OPTION_CREDITS: usize = 4;
-
-const LOCAL_GAME_OPTION_SUBMIT: usize = 0;
-
-const EDITOR_OPTION_CREATE: usize = 0;
-const EDITOR_OPTION_LOAD: usize = 1;
-
-fn build_main_menu() -> Menu {
-    Menu::new(
-        hash!("main_menu"),
-        MENU_WIDTH,
-        &[
-            MenuEntry {
-                index: ROOT_OPTION_LOCAL_GAME,
-                title: "Local Game".to_string(),
-                ..Default::default()
-            },
-            MenuEntry {
-                index: ROOT_OPTION_EDITOR,
-                title: "Editor".to_string(),
-                ..Default::default()
-            },
-            // Settings haven't been implemented yet
-            // MenuEntry {
-            //     index: ROOT_OPTION_SETTINGS,
-            //     title: "Settings".to_string(),
-            //     is_disabled: true,
-            //     ..Default::default()
-            // },
-            #[cfg(debug_assertions)]
-            MenuEntry {
-                index: ROOT_OPTION_RELOAD_RESOURCES,
-                title: "Reload Resources".to_string(),
-                ..Default::default()
-            },
-            MenuEntry {
-                index: ROOT_OPTION_CREDITS,
-                title: "Credits".to_string(),
-                ..Default::default()
-            },
-        ],
-    )
-    .with_cancel_button(Some("Quit"))
-}
-
-fn build_editor_menu() -> Menu {
-    Menu::new(
-        hash!("main_menu", "editor"),
-        MENU_WIDTH,
-        &[
-            MenuEntry {
-                index: EDITOR_OPTION_CREATE,
-                title: "Create Map".to_string(),
-                ..Default::default()
-            },
-            MenuEntry {
-                index: EDITOR_OPTION_LOAD,
-                title: "Load Map".to_string(),
-                ..Default::default()
-            },
-        ],
-    )
-    .with_cancel_button(Some("Cancel"))
-}
-
-pub async fn show_main_menu() -> MainMenuResult {
-    let mut menu_state = MainMenuState::Root(build_main_menu());
-
-    let mut player_input = Vec::new();
-
-    loop {
-        update_gamepad_context(None).unwrap();
-
-        draw_main_menu_background(true);
-
-        {
-            let resources = storage::get::<Resources>();
-            let texture_entry = resources.textures.get(HEADER_TEXTURE_ID).unwrap();
-
-            let size = vec2(
-                texture_entry.texture.width(),
-                texture_entry.texture.height(),
-            );
-
-            let position = vec2((screen_width() - size.x) / 2.0, 35.0);
-
-            widgets::Texture::new(texture_entry.texture)
-                .position(position)
-                .size(size.x, size.y)
-                .ui(&mut *root_ui());
-        }
-
-        match menu_state.borrow_mut() {
-            MainMenuState::Root(menu_instance) => {
-                if let Some(res) = menu_instance.ui(&mut *root_ui()) {
-                    match res.into_usize() {
-                        ROOT_OPTION_LOCAL_GAME => {
-                            menu_state = MainMenuState::LocalGame;
-                        }
-                        ROOT_OPTION_EDITOR => {
-                            menu_state = MainMenuState::Editor(build_editor_menu());
-                        }
-                        ROOT_OPTION_RELOAD_RESOURCES => {
-                            return MainMenuResult::ReloadResources;
-                        }
-                        ROOT_OPTION_CREDITS => {
-                            menu_state = MainMenuState::Credits;
-                        }
-                        Menu::CANCEL_INDEX => {
-                            return MainMenuResult::Quit;
-                        }
-                        _ => {}
-                    }
-                }
-            }
-            MainMenuState::LocalGame => {
-                let res = local_game_ui(&mut *root_ui(), &mut player_input);
-                if let Some(res) = res {
-                    match res.into_usize() {
-                        LOCAL_GAME_OPTION_SUBMIT => {
-                            let player_cnt = player_input.len();
-
-                            assert_eq!(
-                                player_cnt, 2,
-                                "Local Game: There should be two player input schemes for this game mode"
-                            );
-
-                            let player_characters =
-                                gui::show_select_characters_menu(&player_input).await;
-
-                            let map_resource = gui::show_select_map_menu().await;
-
-                            let mut players = Vec::new();
-
-                            for (i, &input_scheme) in player_input.iter().enumerate() {
-                                let character = player_characters.get(i).cloned().unwrap();
-
-                                let controller = PlayerControllerKind::LocalInput(input_scheme);
-
-                                let params = PlayerParams {
-                                    index: i as u8,
-                                    controller,
-                                    character,
-                                };
-
-                                players.push(params);
-                            }
-
-                            return MainMenuResult::LocalGame {
-                                map: Box::new(map_resource.map),
-                                players,
-                            };
-                        }
-                        Menu::CANCEL_INDEX => {
-                            menu_state = MainMenuState::Root(build_main_menu());
-                        }
-                        _ => {}
-                    }
-                }
-            }
-            MainMenuState::Editor(menu_instance) => {
-                if let Some(res) = menu_instance.ui(&mut *root_ui()) {
-                    match res.into_usize() {
-                        EDITOR_OPTION_CREATE => {
-                            return MainMenuResult::Editor {
-                                input_scheme: EditorInputScheme::Mouse,
-                                is_new_map: true,
-                            }
-                        }
-                        EDITOR_OPTION_LOAD => {
-                            return MainMenuResult::Editor {
-                                input_scheme: EditorInputScheme::Mouse,
-                                is_new_map: false,
-                            }
-                        }
-                        Menu::CANCEL_INDEX => {
-                            menu_state = MainMenuState::Root(build_main_menu());
-                        }
-                        _ => {}
-                    }
-                }
-            }
-            MainMenuState::Settings => {
-                unreachable!("Settings is not implemented yet");
-            }
-            MainMenuState::Credits => {
-                return MainMenuResult::Credits;
-            }
-        }
-
-        next_frame().await;
-    }
-}
-
-fn local_game_ui(ui: &mut ui::Ui, player_input: &mut Vec<GameInputScheme>) -> Option<MenuResult> {
-    if player_input.len() == 2 {
-        return Some(LOCAL_GAME_OPTION_SUBMIT.into());
-    } else {
-        let gamepad_context = storage::get::<GamepadContext>();
-
-        if is_key_pressed(KeyCode::Escape)
-            || is_gamepad_btn_pressed(Some(&gamepad_context), Button::East)
-        {
-            return Some(Menu::CANCEL_INDEX.into());
-        }
-    }
-
-    if player_input.len() < 2 {
-        if is_key_pressed(KeyCode::Enter) {
-            if !player_input.contains(&GameInputScheme::KeyboardLeft) {
-                player_input.push(GameInputScheme::KeyboardLeft);
-            } else {
-                player_input.push(GameInputScheme::KeyboardRight);
-            }
-        }
-
-        let gamepad_context = storage::get_mut::<GamepadContext>();
-        for (ix, gamepad) in gamepad_context.gamepads() {
-            if gamepad.digital_inputs.activated(fishsticks::Button::Start)
-                && !player_input.contains(&GameInputScheme::Gamepad(ix))
-            {
-                player_input.push(GameInputScheme::Gamepad(ix));
-            }
-        }
-    }
-
-    let size = vec2(LOCAL_GAME_MENU_WIDTH, LOCAL_GAME_MENU_HEIGHT);
-    let position = (vec2(screen_width(), screen_height()) - size) / 2.0;
-
-    Panel::new(hash!(), size, position).ui(ui, |ui, _| {
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.menu);
-        }
-
-        {
-            let position = vec2(12.0, 12.0);
-
-            if !player_input.is_empty() {
-                ui.label(position, "Player 1: READY");
-            } else {
-                ui.label(position, "Player 1: press START or ENTER");
-            }
-        }
-
-        {
-            let position = vec2(12.0, 44.0);
-
-            if player_input.len() > 1 {
-                ui.label(position, "Player 2: READY");
-            } else {
-                ui.label(position, "Player 2: press START or ENTER");
-            }
-        }
-
-        {
-            let position = vec2(12.0, 108.0);
-
-            ui.label(position, "Press B or ESC to cancel");
-        }
-
-        ui.pop_skin();
-    });
-
-    None
-}
diff --git a/src/gui/menu.rs b/src/gui/menu.rs
deleted file mode 100644
index 2d3bc541de..0000000000
--- a/src/gui/menu.rs
+++ /dev/null
@@ -1,471 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{widgets, Id, Ui},
-};
-
-use fishsticks::{Axis, Button};
-
-use super::{
-    GuiResources, Panel, BUTTON_FONT_SIZE, BUTTON_MARGIN_V, WINDOW_MARGIN_H, WINDOW_MARGIN_V,
-};
-
-use core::input::{is_gamepad_btn_pressed, GamepadContext};
-
-#[derive(Debug, Copy, Clone)]
-pub enum MenuPosition {
-    Center,
-    AbsoluteHorizontal(f32),
-    AbsoluteVertical(f32),
-    Absolute(Vec2),
-}
-
-impl Default for MenuPosition {
-    fn default() -> Self {
-        MenuPosition::Center
-    }
-}
-
-impl From<(Option<f32>, Option<f32>)> for MenuPosition {
-    fn from((x, y): (Option<f32>, Option<f32>)) -> Self {
-        let mut res = Self::Center;
-
-        if let Some(x) = x {
-            res = Self::AbsoluteHorizontal(x);
-        }
-
-        if let Some(y) = y {
-            if let Self::AbsoluteHorizontal(x) = res {
-                res = Self::Absolute(vec2(x, y));
-            } else {
-                res = Self::AbsoluteVertical(y);
-            }
-        }
-
-        res
-    }
-}
-
-impl From<Vec2> for MenuPosition {
-    fn from(position: Vec2) -> Self {
-        Self::Absolute(position)
-    }
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct MenuEntry {
-    pub index: usize,
-    pub title: String,
-    pub is_pulled_down: bool,
-    pub is_disabled: bool,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub struct MenuResult(usize);
-
-impl MenuResult {
-    pub fn is_cancel(self) -> bool {
-        self.0 == Menu::CANCEL_INDEX
-    }
-
-    pub fn into_usize(self) -> usize {
-        self.into()
-    }
-}
-
-impl From<usize> for MenuResult {
-    fn from(index: usize) -> Self {
-        MenuResult(index)
-    }
-}
-
-impl From<MenuResult> for usize {
-    fn from(res: MenuResult) -> Self {
-        res.0
-    }
-}
-
-pub struct Menu {
-    id: Id,
-    header: Option<String>,
-    width: f32,
-    height: Option<f32>,
-    position: MenuPosition,
-    entries: Vec<MenuEntry>,
-    has_cancel_button: bool,
-    cancel_entry_title_override: Option<String>,
-    current_selection: Option<usize>,
-    last_mouse_position: Vec2,
-    up_grace_timer: f32,
-    down_grace_timer: f32,
-    is_first_draw: bool,
-}
-
-impl Menu {
-    pub const CANCEL_INDEX: usize = 99999;
-
-    const HEADER_MARGIN: f32 = 16.0;
-    const CANCEL_TITLE: &'static str = "Cancel";
-
-    pub const ENTRY_HEIGHT: f32 = (BUTTON_MARGIN_V * 2.0) + BUTTON_FONT_SIZE;
-    pub const ENTRY_MARGIN: f32 = 4.0;
-
-    const NAVIGATION_GRACE_TIME: f32 = 0.25;
-
-    pub fn new(id: Id, width: f32, entries: &[MenuEntry]) -> Self {
-        Menu {
-            id,
-            header: None,
-            width,
-            height: None,
-            position: MenuPosition::default(),
-            entries: entries.to_vec(),
-            has_cancel_button: false,
-            cancel_entry_title_override: None,
-            current_selection: None,
-            last_mouse_position: Vec2::ZERO,
-            up_grace_timer: Self::NAVIGATION_GRACE_TIME,
-            down_grace_timer: Self::NAVIGATION_GRACE_TIME,
-            is_first_draw: true,
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn with_header(self, header: &str) -> Self {
-        let header = Some(header.to_string());
-
-        Menu { header, ..self }
-    }
-
-    #[allow(dead_code)]
-    pub fn with_height(self, height: f32) -> Self {
-        Menu {
-            height: Some(height),
-            ..self
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn with_position<P: Into<MenuPosition>>(self, position: P) -> Self {
-        Menu {
-            position: position.into(),
-            ..self
-        }
-    }
-
-    /// This adds a cancel entry to the menu. The title of this entry will be `Self::CANCEL_TITLE`
-    /// if no override is specified
-    pub fn with_cancel_button(self, title_override: Option<&str>) -> Self {
-        for entry in &self.entries {
-            assert_ne!(
-                entry.index,
-                Self::CANCEL_INDEX,
-                "Menu: MenuEntry has reserved index ({})",
-                Self::CANCEL_INDEX
-            );
-        }
-
-        let cancel_entry_title_override = title_override.map(|str| str.to_string());
-
-        Menu {
-            has_cancel_button: true,
-            cancel_entry_title_override,
-            ..self
-        }
-    }
-
-    pub fn ui(&mut self, ui: &mut Ui) -> Option<MenuResult> {
-        let mut res = None;
-
-        {
-            let dt = get_frame_time();
-            self.up_grace_timer += dt;
-            self.down_grace_timer += dt;
-        }
-
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.menu);
-        }
-
-        let mouse_position = {
-            let (x, y) = mouse_position();
-            vec2(x, y)
-        };
-
-        if mouse_position != self.last_mouse_position {
-            self.current_selection = None;
-        }
-
-        self.last_mouse_position = mouse_position;
-
-        let mut entries = self.entries.clone();
-
-        if self.has_cancel_button {
-            let title = self
-                .cancel_entry_title_override
-                .clone()
-                .unwrap_or_else(|| Self::CANCEL_TITLE.to_string());
-
-            entries.push(MenuEntry {
-                index: Self::CANCEL_INDEX,
-                title,
-                is_pulled_down: true,
-                is_disabled: false,
-            })
-        }
-
-        let (should_confirm, should_cancel) = self.update_input();
-
-        let header_height = if let Some(header) = &self.header {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.menu_header);
-
-            let header_size = ui.calc_size(header);
-
-            ui.pop_skin();
-
-            header_size.y + Self::HEADER_MARGIN
-        } else {
-            0.0
-        };
-
-        let size = {
-            let height = header_height
-                + if let Some(height) = self.height {
-                    height
-                } else {
-                    let len = entries.len();
-                    let entry_margins = if len > 0 {
-                        (len as f32 * Self::ENTRY_MARGIN) - Self::ENTRY_MARGIN
-                    } else {
-                        0.0
-                    };
-
-                    (len as f32 * Self::ENTRY_HEIGHT) + entry_margins + (WINDOW_MARGIN_V * 2.0)
-                };
-
-            vec2(self.width, height)
-        };
-
-        let position = match self.position {
-            MenuPosition::Center => vec2(screen_width() - size.x, screen_height() - size.y) / 2.0,
-            MenuPosition::AbsoluteHorizontal(x) => vec2(x, (screen_height() - size.y) / 2.0),
-            MenuPosition::AbsoluteVertical(y) => vec2((screen_width() - size.x) / 2.0, y),
-            MenuPosition::Absolute(position) => position,
-        };
-
-        Panel::new(self.id, size, position).ui(ui, |ui, inner_size| {
-            let entry_size = vec2(size.x - (WINDOW_MARGIN_H * 2.0), Self::ENTRY_HEIGHT);
-
-            if let Some(header) = &self.header {
-                let gui_resources = storage::get::<GuiResources>();
-
-                ui.push_skin(&gui_resources.skins.menu_header);
-
-                ui.label(vec2(0.0, 0.0), header);
-
-                ui.pop_skin();
-            }
-
-            let entries_position = vec2(0.0, header_height);
-
-            let mut top_entries = Vec::new();
-            let mut bottom_entries = Vec::new();
-
-            for entry in entries {
-                if entry.is_pulled_down {
-                    bottom_entries.push(entry);
-                } else {
-                    top_entries.push(entry);
-                }
-            }
-
-            if should_confirm && self.current_selection.is_none() {
-                let mut entry = top_entries.first();
-
-                if entry.is_none() {
-                    entry = bottom_entries.first();
-                }
-
-                if let Some(entry) = entry {
-                    res = Some(entry.index.into());
-                }
-            }
-
-            for (i, entry) in top_entries.iter().enumerate() {
-                let entry_position = entries_position
-                    + if i > 0 {
-                        vec2(0.0, i as f32 * (entry_size.y + Self::ENTRY_MARGIN))
-                    } else {
-                        vec2(0.0, 0.0)
-                    };
-
-                let is_selected = if let Some(current_selection) = self.current_selection {
-                    current_selection == i
-                } else {
-                    false
-                };
-
-                {
-                    let gui_resources = storage::get::<GuiResources>();
-                    if entry.is_disabled {
-                        ui.push_skin(&gui_resources.skins.menu_disabled);
-                    } else if is_selected {
-                        ui.push_skin(&gui_resources.skins.menu_selected);
-                    }
-                }
-
-                let btn = widgets::Button::new(entry.title.as_str())
-                    .size(entry_size)
-                    .position(entry_position);
-
-                if (btn.ui(ui) || (is_selected && should_confirm)) && !entry.is_disabled {
-                    res = Some(entry.index.into());
-                }
-
-                if entry.is_disabled || is_selected {
-                    ui.pop_skin();
-                }
-            }
-
-            let bottom_y = {
-                let top_end = entries_position.y
-                    + (top_entries.len() as f32 * (entry_size.y + Self::ENTRY_MARGIN));
-                let bottom_height = {
-                    let len = bottom_entries.len();
-
-                    let entry_margins = if len > 0 {
-                        (len as f32 * Self::ENTRY_MARGIN) - Self::ENTRY_MARGIN
-                    } else {
-                        0.0
-                    };
-
-                    (len as f32 * entry_size.y) + entry_margins
-                };
-
-                if top_end + bottom_height > inner_size.y {
-                    top_end
-                } else {
-                    inner_size.y - bottom_height
-                }
-            };
-
-            for (i, entry) in bottom_entries.iter().enumerate() {
-                let entry_position = vec2(
-                    0.0,
-                    bottom_y + (i as f32 * (entry_size.y + Self::ENTRY_MARGIN)),
-                );
-
-                let mut is_selected = false;
-                if let Some(current_selection) = self.current_selection {
-                    if current_selection >= top_entries.len() {
-                        is_selected = current_selection - top_entries.len() == i
-                    }
-                }
-
-                {
-                    let gui_resources = storage::get::<GuiResources>();
-                    if entry.is_disabled {
-                        ui.push_skin(&gui_resources.skins.menu_disabled);
-                    } else if is_selected {
-                        ui.push_skin(&gui_resources.skins.menu_selected);
-                    }
-                }
-
-                let btn = widgets::Button::new(entry.title.as_str())
-                    .size(entry_size)
-                    .position(entry_position);
-
-                if (btn.ui(ui) || (is_selected && should_confirm)) && !entry.is_disabled {
-                    res = Some(entry.index.into());
-                }
-
-                if entry.is_disabled || is_selected {
-                    ui.pop_skin();
-                }
-            }
-        });
-
-        ui.pop_skin();
-
-        if self.has_cancel_button && should_cancel {
-            res = Some(Self::CANCEL_INDEX.into());
-        }
-
-        self.is_first_draw = false;
-
-        res
-    }
-
-    fn update_input(&mut self) -> (bool, bool) {
-        if self.is_first_draw {
-            (false, false)
-        } else {
-            let gamepad_context = storage::get::<GamepadContext>();
-
-            let mut selection = self.current_selection.map(|s| s as i32);
-
-            let mut gamepad_up = false;
-            let mut gamepad_down = false;
-
-            for (_, gamepad) in gamepad_context.gamepads() {
-                gamepad_up = gamepad_up
-                    || gamepad.digital_inputs.activated(Button::DPadUp)
-                    || gamepad.analog_inputs.digital_value(Axis::LeftStickY) < 0.0;
-                gamepad_down = gamepad_down
-                    || gamepad.digital_inputs.activated(Button::DPadDown)
-                    || gamepad.analog_inputs.digital_value(Axis::LeftStickY) > 0.0;
-            }
-
-            if self.up_grace_timer >= Self::NAVIGATION_GRACE_TIME
-                && (gamepad_up || is_key_down(KeyCode::Up) || is_key_down(KeyCode::W))
-            {
-                self.up_grace_timer = 0.0;
-
-                selection = if let Some(selection) = selection {
-                    Some(selection - 1)
-                } else {
-                    Some(0)
-                };
-            } else if self.down_grace_timer >= Self::NAVIGATION_GRACE_TIME
-                && (gamepad_down || is_key_down(KeyCode::Down) || is_key_down(KeyCode::S))
-            {
-                self.down_grace_timer = 0.0;
-
-                selection = if let Some(selection) = selection {
-                    Some(selection + 1)
-                } else {
-                    Some(0)
-                };
-            }
-
-            if let Some(selection) = selection {
-                let mut entries_cnt = self.entries.len();
-                if self.has_cancel_button {
-                    entries_cnt += 1;
-                }
-
-                let selection = if selection < 0 {
-                    if entries_cnt > 0 {
-                        entries_cnt - 1
-                    } else {
-                        0
-                    }
-                } else {
-                    selection as usize % entries_cnt
-                };
-
-                self.current_selection = Some(selection);
-            }
-
-            let should_confirm = is_gamepad_btn_pressed(Some(&gamepad_context), Button::South)
-                || is_key_pressed(KeyCode::Enter);
-
-            let should_cancel = is_gamepad_btn_pressed(Some(&gamepad_context), Button::East)
-                || is_key_pressed(KeyCode::Escape);
-
-            (should_confirm, should_cancel)
-        }
-    }
-}
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
deleted file mode 100644
index c1b85890e0..0000000000
--- a/src/gui/mod.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-mod background;
-mod checkbox;
-mod create_map;
-mod credits;
-mod game_menu;
-mod main_menu;
-mod menu;
-mod panel;
-mod select_character;
-mod select_map;
-mod style;
-
-use macroquad::prelude::*;
-
-pub use style::{
-    SkinCollection, BUTTON_FONT_SIZE, BUTTON_MARGIN_H, BUTTON_MARGIN_V, LIST_BOX_ENTRY_HEIGHT,
-    SELECTION_HIGHLIGHT_COLOR, WINDOW_BG_COLOR, WINDOW_MARGIN_H, WINDOW_MARGIN_V,
-};
-
-pub use background::{draw_main_menu_background, Background};
-pub use checkbox::Checkbox;
-pub use create_map::show_create_map_menu;
-pub use credits::show_game_credits;
-pub use game_menu::{
-    close_game_menu, draw_game_menu, is_game_menu_open, open_game_menu, toggle_game_menu,
-    GAME_MENU_RESULT_MAIN_MENU, GAME_MENU_RESULT_QUIT,
-};
-pub use main_menu::{show_main_menu, MainMenuResult};
-pub use menu::{Menu, MenuEntry, MenuResult};
-pub use panel::{NewPanel, Panel};
-pub use select_character::show_select_characters_menu;
-pub use select_map::show_select_map_menu;
-
-pub const NO_COLOR: Color = Color::new(0.0, 0.0, 0.0, 0.0);
-
-pub const ELEMENT_MARGIN: f32 = 8.0;
-
-pub struct GuiResources {
-    pub skins: SkinCollection,
-}
-
-impl GuiResources {
-    pub fn new() -> GuiResources {
-        GuiResources {
-            skins: SkinCollection::new(),
-        }
-    }
-}
diff --git a/src/gui/panel.rs b/src/gui/panel.rs
deleted file mode 100644
index f243f5f148..0000000000
--- a/src/gui/panel.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-//! This is a builder for panels (windows with static positions)
-//! The stock MQ windows do not update their position when screen size changes, even when they
-//! are not movable, so we solve this by drawing a non-interactive button, to draw the background,
-//! and a group, on top of that, to hold the layout.
-
-use crate::Resources;
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{widgets, Id, Ui},
-};
-
-use super::{GuiResources, WINDOW_MARGIN_H, WINDOW_MARGIN_V};
-
-pub struct Panel {
-    id: Id,
-    title: Option<String>,
-    is_title_centered: bool,
-    size: Vec2,
-    position: Vec2,
-    background_color: Option<Color>,
-}
-
-impl Panel {
-    const BG_OFFSET: f32 = 12.0;
-
-    pub fn new(id: Id, size: Vec2, position: Vec2) -> Self {
-        Panel {
-            id,
-            title: None,
-            is_title_centered: false,
-            size,
-            position,
-            background_color: None,
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn with_title(self, title: &str, is_centered: bool) -> Self {
-        Panel {
-            title: Some(title.to_string()),
-            is_title_centered: is_centered,
-            ..self
-        }
-    }
-
-    pub fn with_background_color(self, color: Color) -> Self {
-        Panel {
-            background_color: Some(color),
-            ..self
-        }
-    }
-
-    /// This draws the panel. The callback provided as `f` will be called with the current `Ui` and
-    /// the inner size of the panel as arguments. The inner size will be the size of the window,
-    /// minus the window margins.
-    pub fn ui<F: FnOnce(&mut Ui, Vec2)>(&self, ui: &mut Ui, f: F) {
-        {
-            let gui_resources = storage::get::<GuiResources>();
-
-            if let Some(background_color) = self.background_color {
-                ui.push_skin(&gui_resources.skins.panel_no_bg);
-
-                draw_rectangle(
-                    self.position.x + Self::BG_OFFSET,
-                    self.position.y + Self::BG_OFFSET,
-                    self.size.x - (Self::BG_OFFSET * 2.0),
-                    self.size.y - (Self::BG_OFFSET * 2.0),
-                    background_color,
-                );
-            } else {
-                ui.push_skin(&gui_resources.skins.panel);
-            }
-        }
-
-        let _ = widgets::Button::new("")
-            .position(self.position)
-            .size(self.size)
-            .ui(ui);
-
-        let window_margins = vec2(WINDOW_MARGIN_H, WINDOW_MARGIN_V);
-
-        let mut content_position = self.position + window_margins;
-        let mut content_size = self.size - (window_margins * 2.0);
-
-        if let Some(title) = &self.title {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.window_header);
-
-            let label_size = ui.calc_size(title);
-            let mut label_position = content_position;
-
-            if self.is_title_centered {
-                label_position.x += ((self.size.x - label_size.x) / 2.0) - WINDOW_MARGIN_H;
-            }
-
-            ui.label(label_position, title);
-
-            content_size.y -= label_size.y;
-            content_position.y += label_size.y;
-
-            ui.pop_skin();
-        }
-
-        widgets::Group::new(self.id, content_size)
-            .position(content_position)
-            .ui(ui, |ui| {
-                ui.pop_skin();
-
-                f(ui, content_size)
-            });
-    }
-}
-
-pub struct NewPanel {
-    id: Id,
-    title: Option<String>,
-    is_title_centered: bool,
-    size: UVec2,
-    position: Vec2,
-}
-
-#[allow(dead_code)]
-impl NewPanel {
-    const TEXTURE_SIZE: f32 = 32.0;
-
-    /// Size is multiplied by 32.0 to get the real pixel size
-    pub fn new(id: Id, size: UVec2, position: Vec2) -> Self {
-        assert!(size.x >= 2, "Panels horizontal size must be 2 or more");
-        assert!(size.y >= 2, "Panels vertical size must be 2 or more");
-
-        NewPanel {
-            id,
-            title: None,
-            is_title_centered: false,
-            size,
-            position,
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn with_title(self, title: &str, is_centered: bool) -> Self {
-        NewPanel {
-            title: Some(title.to_string()),
-            is_title_centered: is_centered,
-            ..self
-        }
-    }
-
-    /// This draws the panel. The callback provided as `f` will be called with the current `Ui` and
-    /// the inner size of the panel as arguments. The inner size will be the size of the window,
-    /// minus the window margins.
-    pub fn ui<F: FnOnce(&mut Ui, Vec2)>(&self, ui: &mut Ui, f: F) {
-        let full_size = self.size.as_f32() * Self::TEXTURE_SIZE;
-
-        let window_margins = vec2(WINDOW_MARGIN_H, WINDOW_MARGIN_V);
-
-        {
-            let resources = storage::get::<Resources>();
-
-            let upper_lh_corner = resources
-                .textures
-                .get("yellow_board_upper_lh_corner")
-                .unwrap();
-
-            let top = resources.textures.get("yellow_board_top").unwrap();
-
-            let upper_rh_corner = resources
-                .textures
-                .get("yellow_board_upper_rh_corner")
-                .unwrap();
-
-            let bottom = resources.textures.get("yellow_board_bottom").unwrap();
-
-            let bg = resources.textures.get("yellow_board_bg").unwrap();
-
-            let lh_side = resources.textures.get("yellow_board_lh_side").unwrap();
-
-            let rh_side = resources.textures.get("yellow_board_rh_side").unwrap();
-
-            let lower_lh_corner = resources
-                .textures
-                .get("yellow_board_lower_lh_corner")
-                .unwrap();
-
-            let lower_rh_corner = resources
-                .textures
-                .get("yellow_board_lower_rh_corner")
-                .unwrap();
-
-            for x in 0..self.size.x {
-                for y in 0..self.size.y {
-                    let offset = vec2(x as f32 * Self::TEXTURE_SIZE, y as f32 * Self::TEXTURE_SIZE);
-
-                    if x == 0 && y == 0 {
-                        widgets::Texture::new(upper_lh_corner.texture)
-                            .position(self.position + offset)
-                            .size(Self::TEXTURE_SIZE, Self::TEXTURE_SIZE)
-                            .ui(ui);
-                    } else if x == 0 && y == self.size.y - 1 {
-                        widgets::Texture::new(lower_lh_corner.texture)
-                            .position(self.position + offset)
-                            .size(Self::TEXTURE_SIZE, Self::TEXTURE_SIZE)
-                            .ui(ui);
-                    } else if x == self.size.x - 1 && y == 0 {
-                        widgets::Texture::new(upper_rh_corner.texture)
-                            .position(self.position + offset)
-                            .size(Self::TEXTURE_SIZE, Self::TEXTURE_SIZE)
-                            .ui(ui);
-                    } else if x == self.size.x - 1 && y == self.size.y - 1 {
-                        widgets::Texture::new(lower_rh_corner.texture)
-                            .position(self.position + offset)
-                            .size(Self::TEXTURE_SIZE, Self::TEXTURE_SIZE)
-                            .ui(ui);
-                    } else if x == 0 {
-                        widgets::Texture::new(lh_side.texture)
-                            .position(self.position + offset)
-                            .size(Self::TEXTURE_SIZE, Self::TEXTURE_SIZE)
-                            .ui(ui);
-                    } else if x == self.size.x - 1 {
-                        widgets::Texture::new(rh_side.texture)
-                            .position(self.position + offset)
-                            .size(Self::TEXTURE_SIZE, Self::TEXTURE_SIZE)
-                            .ui(ui);
-                    } else if y == 0 {
-                        widgets::Texture::new(top.texture)
-                            .position(self.position + offset)
-                            .size(Self::TEXTURE_SIZE, Self::TEXTURE_SIZE)
-                            .ui(ui);
-                    } else if y == self.size.y - 1 {
-                        widgets::Texture::new(bottom.texture)
-                            .position(self.position + offset)
-                            .size(Self::TEXTURE_SIZE, Self::TEXTURE_SIZE)
-                            .ui(ui);
-                    } else {
-                        widgets::Texture::new(bg.texture)
-                            .position(self.position + offset)
-                            .size(Self::TEXTURE_SIZE, Self::TEXTURE_SIZE)
-                            .ui(ui);
-                    }
-                }
-            }
-        }
-
-        let mut content_position = self.position + window_margins;
-        let mut content_size = full_size - (window_margins * 2.0);
-
-        if let Some(title) = &self.title {
-            let gui_resources = storage::get::<GuiResources>();
-            ui.push_skin(&gui_resources.skins.window_header);
-
-            let label_size = ui.calc_size(title);
-            let mut label_position = content_position;
-
-            if self.is_title_centered {
-                label_position.x += ((full_size.x - label_size.x) / 2.0) - WINDOW_MARGIN_H;
-            }
-
-            ui.label(label_position, title);
-
-            content_size.y -= label_size.y;
-            content_position.y += label_size.y;
-
-            ui.pop_skin();
-        }
-
-        widgets::Group::new(self.id, content_size)
-            .position(content_position)
-            .ui(ui, |ui| {
-                ui.pop_skin();
-
-                f(ui, content_size)
-            });
-    }
-}
diff --git a/src/gui/select_character.rs b/src/gui/select_character.rs
deleted file mode 100644
index d6ed4c6d11..0000000000
--- a/src/gui/select_character.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-use macroquad::ui::{hash, root_ui, widgets};
-
-use fishsticks::{Axis, Button, GamepadContext};
-
-use crate::gui::{
-    draw_main_menu_background, GuiResources, Panel, BUTTON_FONT_SIZE, BUTTON_MARGIN_H,
-    WINDOW_BG_COLOR,
-};
-use crate::player::PlayerCharacterMetadata;
-use crate::{
-    draw_one_animated_sprite, update_one_animated_sprite, AnimatedSpriteMetadata, Resources,
-};
-use core::input::{update_gamepad_context, GameInputScheme};
-use core::Transform;
-
-const SECTION_WIDTH: f32 = 300.0;
-const SECTION_HEIGHT: f32 = 400.0;
-
-const SECTION_MARGIN: f32 = 16.0;
-
-const NAVIGATION_GRACE_TIME: f32 = 0.25;
-
-const NAVIGATION_BTN_WIDTH: f32 = 64.0;
-const NAVIGATION_BTN_HEIGHT: f32 = (BUTTON_MARGIN_H * 2.0) + BUTTON_FONT_SIZE;
-
-pub async fn show_select_characters_menu(
-    player_input: &[GameInputScheme],
-) -> Vec<PlayerCharacterMetadata> {
-    let mut selected_params = Vec::new();
-
-    let player_cnt = player_input.len();
-
-    let player_characters = {
-        let resources = storage::get::<Resources>();
-        resources
-            .player_characters
-            .values()
-            .cloned()
-            .collect::<Vec<_>>()
-    };
-
-    assert!(
-        player_characters.len() >= player_cnt,
-        "Character selection: There are more players than there are available player characters"
-    );
-
-    let mut current_selections = Vec::new();
-    let mut navigation_grace_timers = Vec::new();
-    let mut animated_sprites = Vec::new();
-
-    for (i, character) in player_characters.iter().enumerate().take(player_cnt) {
-        selected_params.push(None);
-
-        current_selections.push(i);
-        navigation_grace_timers.push(0.0);
-
-        let meta: AnimatedSpriteMetadata = character.sprite.clone().into();
-
-        animated_sprites.push(meta.into());
-    }
-
-    let mut is_ready = false;
-
-    while !is_ready {
-        update_gamepad_context(None).unwrap();
-
-        draw_main_menu_background(false);
-
-        let section_size = vec2(SECTION_WIDTH, SECTION_HEIGHT);
-        let total_size = vec2(
-            ((section_size.x + SECTION_MARGIN) * player_cnt as f32) - SECTION_MARGIN,
-            section_size.y,
-        );
-
-        let first_position = (vec2(screen_width(), screen_height()) - total_size) / 2.0;
-
-        {
-            let gui_resources = storage::get::<GuiResources>();
-            root_ui().push_skin(&gui_resources.skins.default);
-        }
-
-        for (i, input_scheme) in player_input.iter().enumerate() {
-            let section_position = vec2(
-                first_position.x + ((section_size.x + SECTION_MARGIN) * i as f32),
-                first_position.y,
-            );
-
-            let mut current_selection = current_selections[i] as i32;
-
-            let mut should_navigate_left = false;
-            let mut should_navigate_right = false;
-            let mut should_confirm = false;
-
-            {
-                navigation_grace_timers[i] += get_frame_time();
-
-                let can_navigate = navigation_grace_timers[i] >= NAVIGATION_GRACE_TIME;
-
-                match *input_scheme {
-                    GameInputScheme::KeyboardRight => {
-                        should_navigate_left = can_navigate && is_key_down(KeyCode::Left);
-                        should_navigate_right = can_navigate && is_key_down(KeyCode::Right);
-                        should_confirm =
-                            is_key_pressed(KeyCode::L) || is_key_pressed(KeyCode::Enter);
-                    }
-                    GameInputScheme::KeyboardLeft => {
-                        should_navigate_left = can_navigate && is_key_down(KeyCode::A);
-                        should_navigate_right = can_navigate && is_key_down(KeyCode::D);
-                        should_confirm =
-                            is_key_pressed(KeyCode::V) || is_key_pressed(KeyCode::LeftControl);
-                    }
-                    GameInputScheme::Gamepad(gamepad_id) => {
-                        let gamepad_context = storage::get::<GamepadContext>();
-                        let gamepad = gamepad_context.gamepad(gamepad_id);
-
-                        if let Some(gamepad) = gamepad {
-                            should_navigate_left = can_navigate
-                                && (gamepad.analog_inputs.digital_value(Axis::LeftStickX) < 0.0
-                                    || gamepad.digital_inputs.just_activated(Button::DPadLeft));
-
-                            should_navigate_right = can_navigate
-                                && (gamepad.analog_inputs.digital_value(Axis::LeftStickX) > 0.0
-                                    || gamepad.digital_inputs.just_activated(Button::DPadRight));
-
-                            should_confirm = gamepad.digital_inputs.just_activated(Button::South);
-                        }
-                    }
-                }
-
-                Panel::new(hash!("section", i), section_size, section_position)
-                    .with_title(&format!("Player {}", i + 1), true)
-                    .with_background_color(WINDOW_BG_COLOR)
-                    .ui(&mut *root_ui(), |ui, inner_size| {
-                        let animation_player = &mut animated_sprites[i];
-
-                        update_one_animated_sprite(animation_player);
-
-                        // TODO: Calculate scale from a fixed target size, based on ui layout
-                        animation_player.scale = 2.0;
-
-                        let animation_size = animation_player.size();
-                        let animation_transform = {
-                            let position = section_position
-                                + vec2((section_size.x - animation_size.x) / 2.0, 100.0);
-                            Transform::from(position)
-                        };
-
-                        draw_one_animated_sprite(&animation_transform, animation_player);
-
-                        {
-                            let gui_resources = storage::get::<GuiResources>();
-                            ui.push_skin(&gui_resources.skins.window_header);
-
-                            let name_label = &player_characters[current_selection as usize].name;
-
-                            let label_size = ui.calc_size(name_label);
-                            let label_position = vec2(
-                                (inner_size.x - label_size.x) / 2.0,
-                                inner_size.y
-                                    - NAVIGATION_BTN_HEIGHT
-                                    - SECTION_MARGIN
-                                    - label_size.y,
-                            );
-
-                            widgets::Label::new(name_label)
-                                .position(label_position)
-                                .ui(ui);
-
-                            ui.pop_skin();
-                        }
-
-                        let btn_size = vec2(NAVIGATION_BTN_WIDTH, NAVIGATION_BTN_HEIGHT);
-
-                        let btn_section = vec2(inner_size.x / 2.0, inner_size.y - btn_size.y);
-
-                        {
-                            let btn_position = vec2(
-                                btn_section.x - (SECTION_MARGIN / 2.0) - btn_size.x,
-                                btn_section.y,
-                            );
-
-                            should_navigate_left = widgets::Button::new("<")
-                                .size(btn_size)
-                                .position(btn_position)
-                                .ui(ui)
-                                || should_navigate_left;
-                        }
-
-                        {
-                            let btn_position =
-                                vec2(btn_section.x + (SECTION_MARGIN / 2.0), btn_section.y);
-
-                            should_navigate_right = widgets::Button::new(">")
-                                .size(btn_size)
-                                .position(btn_position)
-                                .ui(ui)
-                                || should_navigate_right;
-                        }
-                    });
-
-                if should_confirm {
-                    let params = player_characters[current_selection as usize].clone();
-                    selected_params[i] = Some(params);
-                }
-            }
-
-            if selected_params[i].is_none() && (should_navigate_left || should_navigate_right) {
-                let mut is_taken = true;
-                while is_taken {
-                    if should_navigate_left {
-                        current_selection -= 1;
-                    } else if should_navigate_right {
-                        current_selection += 1;
-                    }
-
-                    if current_selection < 0 {
-                        current_selection = player_characters.len() as i32 - 1;
-                    } else {
-                        current_selection %= player_characters.len() as i32;
-                    }
-
-                    is_taken = current_selections
-                        .iter()
-                        .enumerate()
-                        .any(|(ii, selection)| ii != i && *selection == current_selection as usize);
-                }
-
-                current_selections[i] = current_selection as usize;
-
-                navigation_grace_timers[i] = 0.0;
-
-                let character = player_characters.get(current_selection as usize).unwrap();
-
-                let meta: AnimatedSpriteMetadata = character.sprite.clone().into();
-
-                animated_sprites[i] = meta.into();
-            }
-
-            is_ready = !selected_params.iter().any(|params| params.is_none());
-        }
-
-        root_ui().pop_skin();
-
-        next_frame().await;
-    }
-
-    selected_params.into_iter().flatten().collect()
-}
diff --git a/src/gui/select_map.rs b/src/gui/select_map.rs
deleted file mode 100644
index 20105d13c0..0000000000
--- a/src/gui/select_map.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use macroquad::{
-    experimental::collections::storage,
-    prelude::*,
-    ui::{self, root_ui, widgets},
-};
-
-use super::GuiResources;
-
-use crate::{resources::MapResource, GamepadContext, Resources};
-
-use crate::gui::{draw_main_menu_background, WINDOW_MARGIN_H, WINDOW_MARGIN_V};
-
-const MAP_SELECT_SCREEN_MARGIN_FACTOR: f32 = 0.1;
-const MAP_SELECT_PREVIEW_TARGET_WIDTH: f32 = 250.0;
-const MAP_SELECT_PREVIEW_RATIO: f32 = 10.0 / 16.0;
-const MAP_SELECT_PREVIEW_SHRINK_FACTOR: f32 = 0.8;
-
-pub async fn show_select_map_menu() -> MapResource {
-    let mut current_page: i32;
-    let mut hovered: i32 = 0;
-
-    let mut old_mouse_position = mouse_position();
-
-    // skip a frame to let Enter be unpressed from the previous screen
-    next_frame().await;
-
-    loop {
-        draw_main_menu_background(false);
-
-        let gui_resources = storage::get::<GuiResources>();
-        let mut gamepad_system = storage::get_mut::<GamepadContext>();
-
-        let _ = gamepad_system.update();
-
-        let mut up = is_key_pressed(KeyCode::Up) || is_key_pressed(KeyCode::W);
-        let mut down = is_key_pressed(KeyCode::Down) || is_key_pressed(KeyCode::S);
-        let mut right = is_key_pressed(KeyCode::Right) || is_key_pressed(KeyCode::D);
-        let mut left = is_key_pressed(KeyCode::Left) || is_key_pressed(KeyCode::A);
-        let mut start = is_key_pressed(KeyCode::Enter);
-
-        let (page_up, page_down) = {
-            let mouse_wheel = mouse_wheel();
-            (mouse_wheel.1 > 0.0, mouse_wheel.1 < 0.0)
-        };
-
-        for (_, gamepad) in gamepad_system.gamepads() {
-            use fishsticks::{Axis, Button};
-
-            up |= gamepad.digital_inputs.just_activated(Button::DPadUp)
-                || matches!(
-                    gamepad.analog_inputs.just_activated_digital(Axis::LeftStickY),
-                    Some(value) if value < 0.0
-                );
-
-            down |= gamepad.digital_inputs.just_activated(Button::DPadDown)
-                || matches!(
-                    gamepad.analog_inputs.just_activated_digital(Axis::LeftStickY),
-                    Some(value) if value > 0.0
-                );
-
-            left |= gamepad.digital_inputs.just_activated(Button::DPadLeft)
-                || matches!(
-                    gamepad.analog_inputs.just_activated_digital(Axis::LeftStickX),
-                    Some(value) if value < 0.0
-                );
-
-            right |= gamepad.digital_inputs.just_activated(Button::DPadRight)
-                || matches!(
-                    gamepad.analog_inputs.just_activated_digital(Axis::LeftStickX),
-                    Some(value) if value > 0.0
-                );
-
-            start |= gamepad.digital_inputs.just_activated(Button::South)
-                || gamepad.digital_inputs.just_activated(Button::Start);
-        }
-
-        let resources = storage::get::<Resources>();
-        let map_cnt = resources.maps.len();
-
-        root_ui().push_skin(&gui_resources.skins.map_selection);
-
-        let screen_size = vec2(screen_width(), screen_height());
-        let screen_margins = vec2(
-            screen_size.x * MAP_SELECT_SCREEN_MARGIN_FACTOR,
-            screen_size.y * MAP_SELECT_SCREEN_MARGIN_FACTOR,
-        );
-        let content_size = vec2(
-            screen_size.x - (screen_margins.x * 2.0),
-            screen_size.y - (screen_margins.y * 2.0),
-        );
-
-        let entries_per_row = (content_size.x / MAP_SELECT_PREVIEW_TARGET_WIDTH).round() as usize;
-        let row_cnt = (map_cnt / entries_per_row) + 1;
-
-        let entry_size = {
-            let width = content_size.x / entries_per_row as f32;
-            vec2(width, width * MAP_SELECT_PREVIEW_RATIO)
-        };
-
-        let rows_per_page = (content_size.y / entry_size.y) as usize;
-        let entries_per_page = rows_per_page * entries_per_row;
-
-        let page_cnt = (row_cnt / rows_per_page) + 1;
-
-        {
-            if up {
-                hovered -= entries_per_row as i32;
-                if hovered < 0 {
-                    hovered += 1 + map_cnt as i32 + (map_cnt % entries_per_row) as i32;
-                    if hovered >= map_cnt as i32 {
-                        hovered = map_cnt as i32 - 1;
-                    }
-                }
-            }
-
-            if down {
-                let old = hovered;
-                hovered += entries_per_row as i32;
-                if hovered >= map_cnt as i32 {
-                    if old == map_cnt as i32 - 1 {
-                        hovered = 0;
-                    } else {
-                        hovered = map_cnt as i32 - 1;
-                    }
-                }
-            }
-
-            if left {
-                let row_begin = (hovered / entries_per_row as i32) * entries_per_row as i32;
-                hovered -= 1;
-                if hovered < row_begin {
-                    hovered = row_begin + entries_per_row as i32 - 1;
-                }
-            }
-
-            if right {
-                let row_begin = (hovered / entries_per_row as i32) * entries_per_row as i32;
-                hovered += 1;
-                if hovered >= row_begin + entries_per_row as i32 {
-                    hovered = row_begin;
-                }
-            }
-
-            current_page = hovered / entries_per_page as i32;
-
-            if page_up {
-                current_page -= 1;
-                if current_page < 0 {
-                    current_page = page_cnt as i32 - 1;
-                    hovered += (map_cnt + (entries_per_page - (map_cnt % entries_per_page))
-                        - entries_per_page) as i32;
-                    if hovered >= map_cnt as i32 {
-                        hovered = map_cnt as i32 - 1
-                    }
-                } else {
-                    hovered -= entries_per_page as i32;
-                }
-            }
-
-            if page_down {
-                current_page += 1;
-                if current_page >= page_cnt as i32 {
-                    current_page = 0;
-                    hovered %= entries_per_page as i32;
-                } else {
-                    hovered += entries_per_page as i32;
-                    if hovered >= map_cnt as i32 {
-                        hovered = map_cnt as i32 - 1;
-                    }
-                }
-            }
-
-            current_page %= page_cnt as i32;
-
-            {
-                if page_cnt > 1 {
-                    let pagination_label = format!("page {}/{}", current_page + 1, page_cnt);
-
-                    let label_size = root_ui().calc_size(&pagination_label);
-                    let label_position =
-                        screen_size - vec2(WINDOW_MARGIN_H, WINDOW_MARGIN_V) - label_size;
-
-                    widgets::Label::new(&pagination_label)
-                        .position(label_position)
-                        .ui(&mut *root_ui());
-                }
-
-                let begin = (current_page as usize * entries_per_page).clamp(0, map_cnt);
-                let end = (begin + entries_per_page).clamp(begin, map_cnt);
-
-                for (pi, i) in (begin..end).enumerate() {
-                    let map_entry = resources.maps.get(i).unwrap();
-                    let is_hovered = hovered == i as i32;
-
-                    let mut rect = Rect::new(
-                        screen_margins.x + ((pi % entries_per_row) as f32 * entry_size.x),
-                        screen_margins.y + ((pi / entries_per_row) as f32 * entry_size.y),
-                        entry_size.x,
-                        entry_size.y,
-                    );
-
-                    if !is_hovered {
-                        let w = rect.w * MAP_SELECT_PREVIEW_SHRINK_FACTOR;
-                        let h = rect.h * MAP_SELECT_PREVIEW_SHRINK_FACTOR;
-
-                        rect.x += (rect.w - w) / 2.0;
-                        rect.y += (rect.h - h) / 2.0;
-
-                        rect.w = w;
-                        rect.h = h;
-                    }
-
-                    if old_mouse_position != mouse_position()
-                        && rect.contains(mouse_position().into())
-                    {
-                        hovered = i as _;
-                    }
-
-                    if ui::widgets::Button::new(map_entry.preview)
-                        .size(rect.size())
-                        .position(rect.point())
-                        .ui(&mut *root_ui())
-                        || start
-                    {
-                        root_ui().pop_skin();
-                        let res = resources.maps.get(hovered as usize).cloned().unwrap();
-                        return res;
-                    }
-                }
-            }
-        }
-
-        root_ui().pop_skin();
-
-        old_mouse_position = mouse_position();
-
-        next_frame().await;
-    }
-}
diff --git a/src/gui/style.rs b/src/gui/style.rs
deleted file mode 100644
index b7f763364f..0000000000
--- a/src/gui/style.rs
+++ /dev/null
@@ -1,931 +0,0 @@
-use macroquad::{
-    color::Color,
-    experimental::collections::storage,
-    math::RectOffset,
-    ui::{root_ui, Skin},
-};
-
-use crate::Resources;
-
-use super::{ELEMENT_MARGIN, NO_COLOR};
-
-pub const FONT_SIZE: f32 = 18.0;
-
-pub const TEXT_COLOR: Color = Color {
-    r: 0.78,
-    g: 0.78,
-    b: 0.62,
-    a: 1.0,
-};
-
-pub const LABEL_MARGIN_V: f32 = 4.0;
-pub const LABEL_MARGIN_H: f32 = 8.0;
-
-pub const HEADER_FONT_SIZE: f32 = 28.0;
-
-const BUTTON_BG_MARGIN_V: f32 = 8.0;
-const BUTTON_BG_MARGIN_H: f32 = 8.0;
-
-pub const BUTTON_MARGIN_V: f32 = 8.0;
-pub const BUTTON_MARGIN_H: f32 = 16.0;
-
-pub const BUTTON_FONT_SIZE: f32 = 25.0;
-
-pub const SMALL_BUTTON_FONT_SIZE: f32 = 18.0;
-
-pub const SMALL_BUTTON_MARGIN_V: f32 = 8.0;
-pub const SMALL_BUTTON_MARGIN_H: f32 = 16.0;
-
-const EDITBOX_BG_MARGIN_V: f32 = 2.0;
-const EDITBOX_BG_MARGIN_H: f32 = 2.0;
-
-pub const EDITBOX_MARGIN_V: f32 = 4.0;
-pub const EDITBOX_MARGIN_H: f32 = 8.0;
-
-const GROUP_BG_MARGIN_H: f32 = 0.0;
-const GROUP_BG_MARGIN_V: f32 = 0.0;
-
-pub const GROUP_MARGIN_H: f32 = 0.0;
-pub const GROUP_MARGIN_V: f32 = 0.0;
-
-const COMBOBOX_BG_MARGIN_H: f32 = 18.0;
-const COMBOBOX_BG_MARGIN_V: f32 = 4.0;
-
-const COMBOBOX_MARGIN_H: f32 = 8.0;
-const COMBOBOX_MARGIN_V: f32 = 4.0;
-
-const WINDOW_BG_MARGIN_V: f32 = 52.0;
-const WINDOW_BG_MARGIN_H: f32 = 52.0;
-
-pub const WINDOW_MARGIN_V: f32 = 22.0;
-pub const WINDOW_MARGIN_H: f32 = 22.0;
-
-pub const WINDOW_BG_COLOR: Color = Color {
-    r: 0.15,
-    g: 0.17,
-    b: 0.27,
-    a: 1.0,
-};
-
-pub const SELECTION_HIGHLIGHT_COLOR: Color = Color {
-    r: 0.23,
-    g: 0.67,
-    b: 0.41,
-    a: 1.0,
-};
-
-pub const LIST_BOX_ENTRY_HEIGHT: f32 = 24.0;
-
-const BLANK_IMAGE_ID: &str = "blank_image";
-
-const BUTTON_BACKGROUND_IMAGE_ID: &str = "button_background";
-const BUTTON_BACKGROUND_CLICKED_IMAGE_ID: &str = "button_background_clicked";
-const BUTTON_BACKGROUND_DISABLED_IMAGE_ID: &str = "button_background_disabled";
-const BUTTON_BACKGROUND_HOVERED_IMAGE_ID: &str = "button_background_hovered";
-
-const CHECKBOX_BACKGROUND_IMAGE_ID: &str = "checkbox_background";
-const CHECKBOX_BACKGROUND_CHECKED_IMAGE_ID: &str = "checkbox_background_checked";
-const CHECKBOX_BACKGROUND_CHECKED_HOVERED_IMAGE_ID: &str = "checkbox_background_checked_hovered";
-const CHECKBOX_BACKGROUND_CLICKED_IMAGE_ID: &str = "checkbox_background_clicked";
-const CHECKBOX_BACKGROUND_HOVERED_IMAGE_ID: &str = "checkbox_background_hovered";
-
-const COMBOBOX_BACKGROUND_IMAGE_ID: &str = "combobox_background";
-
-const EDITBOX_BACKGROUND_IMAGE_ID: &str = "editbox_background";
-const EDITBOX_BACKGROUND_CLICKED_IMAGE_ID: &str = "editbox_background_clicked";
-
-const WINDOW_BACKGROUND_IMAGE_ID: &str = "window_background";
-const WINDOW_BORDER_IMAGE_ID: &str = "window_border";
-
-pub struct SkinCollection {
-    pub default: Skin,
-    pub button_disabled: Skin,
-    pub window_header: Skin,
-    pub checkbox: Skin,
-    pub checkbox_selected: Skin,
-    pub label_button: Skin,
-    pub list_box: Skin,
-    pub list_box_selected: Skin,
-    pub list_box_no_bg: Skin,
-    pub context_menu: Skin,
-    pub toolbar: Skin,
-    pub toolbar_bg: Skin,
-    pub toolbar_header_bg: Skin,
-    pub toolbar_button: Skin,
-    pub toolbar_button_disabled: Skin,
-    pub tool_selector: Skin,
-    pub tool_selector_selected: Skin,
-    pub tileset_grid: Skin,
-    pub tileset_grid_selected: Skin,
-    pub tileset_subtile_grid: Skin,
-    pub tileset_subtile_grid_selected: Skin,
-    pub menu: Skin,
-    pub menu_header: Skin,
-    pub menu_selected: Skin,
-    pub menu_disabled: Skin,
-    pub map_selection: Skin,
-    pub panel: Skin,
-    pub panel_no_bg: Skin,
-}
-
-impl SkinCollection {
-    pub fn new() -> SkinCollection {
-        let resources = storage::get::<Resources>();
-
-        let _blank_image = resources.images.get(BLANK_IMAGE_ID).unwrap();
-
-        let button_background = resources.images.get(BUTTON_BACKGROUND_IMAGE_ID).unwrap();
-        let button_background_clicked = resources
-            .images
-            .get(BUTTON_BACKGROUND_CLICKED_IMAGE_ID)
-            .unwrap();
-        let button_background_disabled = resources
-            .images
-            .get(BUTTON_BACKGROUND_DISABLED_IMAGE_ID)
-            .unwrap();
-        let button_background_hovered = resources
-            .images
-            .get(BUTTON_BACKGROUND_HOVERED_IMAGE_ID)
-            .unwrap();
-
-        let checkbox_background = resources.images.get(CHECKBOX_BACKGROUND_IMAGE_ID).unwrap();
-        let checkbox_background_checked = resources
-            .images
-            .get(CHECKBOX_BACKGROUND_CHECKED_IMAGE_ID)
-            .unwrap();
-        let checkbox_background_checked_hovered = resources
-            .images
-            .get(CHECKBOX_BACKGROUND_CHECKED_HOVERED_IMAGE_ID)
-            .unwrap();
-        let checkbox_background_clicked = resources
-            .images
-            .get(CHECKBOX_BACKGROUND_CLICKED_IMAGE_ID)
-            .unwrap();
-        let checkbox_background_hovered = resources
-            .images
-            .get(CHECKBOX_BACKGROUND_HOVERED_IMAGE_ID)
-            .unwrap();
-
-        let combobox_background = resources.images.get(COMBOBOX_BACKGROUND_IMAGE_ID).unwrap();
-
-        let editbox_background = resources.images.get(EDITBOX_BACKGROUND_IMAGE_ID).unwrap();
-        let editbox_background_clicked = resources
-            .images
-            .get(EDITBOX_BACKGROUND_CLICKED_IMAGE_ID)
-            .unwrap();
-
-        let window_background = resources.images.get(WINDOW_BACKGROUND_IMAGE_ID).unwrap();
-        let window_border = resources.images.get(WINDOW_BORDER_IMAGE_ID).unwrap();
-
-        let default = {
-            let window_style = root_ui()
-                .style_builder()
-                .background(window_background.image.clone())
-                .background_margin(RectOffset::new(
-                    WINDOW_BG_MARGIN_H,
-                    WINDOW_BG_MARGIN_H,
-                    WINDOW_BG_MARGIN_V,
-                    WINDOW_BG_MARGIN_V,
-                ))
-                .margin(RectOffset::new(
-                    WINDOW_MARGIN_H - WINDOW_BG_MARGIN_H,
-                    WINDOW_MARGIN_H - WINDOW_BG_MARGIN_H,
-                    WINDOW_MARGIN_V - WINDOW_BG_MARGIN_V,
-                    WINDOW_MARGIN_V - WINDOW_BG_MARGIN_V,
-                ))
-                .build();
-
-            let button_style = root_ui()
-                .style_builder()
-                .background(button_background.image.clone())
-                .background_hovered(button_background_hovered.image.clone())
-                .background_clicked(button_background_clicked.image.clone())
-                .background_margin(RectOffset::new(
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_V,
-                    BUTTON_BG_MARGIN_V,
-                ))
-                .margin(RectOffset::new(
-                    BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                    BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                ))
-                .text_color(TEXT_COLOR)
-                .font_size(BUTTON_FONT_SIZE as u16)
-                .build();
-
-            let group_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(
-                    GROUP_MARGIN_H - GROUP_BG_MARGIN_H,
-                    GROUP_MARGIN_H - GROUP_BG_MARGIN_H,
-                    GROUP_MARGIN_V - GROUP_BG_MARGIN_V,
-                    GROUP_MARGIN_V - GROUP_BG_MARGIN_V,
-                ))
-                .background_margin(RectOffset::new(
-                    GROUP_MARGIN_H,
-                    GROUP_MARGIN_H,
-                    GROUP_MARGIN_V,
-                    GROUP_MARGIN_V,
-                ))
-                .color(NO_COLOR)
-                .color_hovered(NO_COLOR)
-                .color_clicked(NO_COLOR)
-                .build();
-
-            let label_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(
-                    LABEL_MARGIN_H,
-                    LABEL_MARGIN_H,
-                    LABEL_MARGIN_V,
-                    LABEL_MARGIN_V,
-                ))
-                .text_color(TEXT_COLOR)
-                .font_size(FONT_SIZE as u16)
-                .build();
-
-            let editbox_style = root_ui()
-                .style_builder()
-                .background(editbox_background.image.clone())
-                .background_clicked(editbox_background_clicked.image.clone())
-                .background_margin(RectOffset::new(
-                    EDITBOX_BG_MARGIN_H,
-                    EDITBOX_BG_MARGIN_H,
-                    EDITBOX_BG_MARGIN_V,
-                    EDITBOX_BG_MARGIN_V,
-                ))
-                .margin(RectOffset::new(
-                    EDITBOX_MARGIN_H - EDITBOX_BG_MARGIN_H,
-                    EDITBOX_MARGIN_H - EDITBOX_BG_MARGIN_H,
-                    EDITBOX_MARGIN_V - EDITBOX_BG_MARGIN_V,
-                    EDITBOX_MARGIN_V - EDITBOX_BG_MARGIN_V,
-                ))
-                .text_color(TEXT_COLOR)
-                .font_size(FONT_SIZE as u16)
-                .build();
-
-            let checkbox_style = root_ui()
-                .style_builder()
-                .background(checkbox_background.image.clone())
-                .background_hovered(checkbox_background_hovered.image.clone())
-                .background_clicked(checkbox_background_clicked.image.clone())
-                .build();
-
-            let combobox_style = root_ui()
-                .style_builder()
-                .background(combobox_background.image.clone())
-                .background_margin(RectOffset::new(
-                    COMBOBOX_BG_MARGIN_H,
-                    COMBOBOX_BG_MARGIN_H,
-                    COMBOBOX_BG_MARGIN_V,
-                    COMBOBOX_BG_MARGIN_V,
-                ))
-                .margin(RectOffset::new(
-                    COMBOBOX_MARGIN_H - COMBOBOX_BG_MARGIN_H,
-                    COMBOBOX_MARGIN_H - COMBOBOX_BG_MARGIN_H,
-                    COMBOBOX_MARGIN_V - COMBOBOX_BG_MARGIN_V,
-                    COMBOBOX_MARGIN_V - COMBOBOX_BG_MARGIN_V,
-                ))
-                .text_color(Color::from_rgba(120, 120, 120, 255))
-                .color(Color::from_rgba(210, 210, 210, 255))
-                .font_size(FONT_SIZE as u16)
-                .build();
-
-            let scrollbar_style = root_ui()
-                .style_builder()
-                .color(Color::from_rgba(38, 43, 68, 255))
-                .build();
-
-            let scrollbar_handle_style = root_ui()
-                .style_builder()
-                .color(Color::from_rgba(38, 43, 68, 255))
-                .color_hovered(Color::from_rgba(58, 68, 102, 255))
-                .color_clicked(Color::from_rgba(38, 43, 68, 255))
-                .build();
-
-            let scroll_multiplier = 10.0;
-            let margin = ELEMENT_MARGIN;
-
-            Skin {
-                window_style,
-                group_style,
-                label_style,
-                button_style,
-                editbox_style,
-                checkbox_style,
-                combobox_style,
-                scrollbar_style,
-                scrollbar_handle_style,
-                scroll_multiplier,
-                margin,
-                ..root_ui().default_skin()
-            }
-        };
-
-        let button_disabled = {
-            let button_style = root_ui()
-                .style_builder()
-                .background(button_background_disabled.image.clone())
-                .background_margin(RectOffset::new(
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_V,
-                    BUTTON_BG_MARGIN_V,
-                ))
-                .margin(RectOffset::new(
-                    BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                    BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                ))
-                .background_hovered(button_background_disabled.image.clone())
-                .background_clicked(button_background_disabled.image.clone())
-                .text_color(Color::from_rgba(88, 88, 88, 255))
-                .font_size(BUTTON_FONT_SIZE as u16)
-                .build();
-
-            Skin {
-                button_style,
-                ..default.clone()
-            }
-        };
-
-        let window_header = {
-            let label_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(8.0, 8.0, 4.0, 16.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .text_color(TEXT_COLOR)
-                .font_size(HEADER_FONT_SIZE as u16)
-                .build();
-
-            Skin {
-                label_style,
-                ..default.clone()
-            }
-        };
-
-        let checkbox = {
-            let button_style = root_ui()
-                .style_builder()
-                .background(checkbox_background.image.clone())
-                .background_hovered(checkbox_background_hovered.image.clone())
-                .background_clicked(checkbox_background_clicked.image.clone())
-                .background_margin(RectOffset::new(0.0, 0.0, 4.0, 4.0))
-                .build();
-
-            let scrollbar_style = root_ui()
-                .style_builder()
-                .color(NO_COLOR)
-                .color_hovered(NO_COLOR)
-                .color_clicked(NO_COLOR)
-                .build();
-
-            let scrollbar_handle_style = root_ui()
-                .style_builder()
-                .color(NO_COLOR)
-                .color_hovered(NO_COLOR)
-                .color_clicked(NO_COLOR)
-                .build();
-
-            let group_style = root_ui()
-                .style_builder()
-                .color(NO_COLOR)
-                .color_hovered(NO_COLOR)
-                .color_clicked(NO_COLOR)
-                .build();
-
-            Skin {
-                button_style,
-                scrollbar_style,
-                scrollbar_handle_style,
-                group_style,
-                ..default.clone()
-            }
-        };
-
-        let checkbox_selected = {
-            let button_style = root_ui()
-                .style_builder()
-                .background(checkbox_background_checked.image.clone())
-                .background_hovered(checkbox_background_checked_hovered.image.clone())
-                .background_clicked(checkbox_background_clicked.image.clone())
-                .background_margin(RectOffset::new(0.0, 0.0, 4.0, 4.0))
-                .build();
-
-            Skin {
-                button_style,
-                ..checkbox.clone()
-            }
-        };
-
-        let label_button = {
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 4.0, 4.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .text_color(TEXT_COLOR)
-                .font_size(FONT_SIZE as u16)
-                .color(NO_COLOR)
-                .color_hovered(NO_COLOR)
-                .color_clicked(NO_COLOR)
-                .build();
-
-            Skin {
-                button_style,
-                ..default.clone()
-            }
-        };
-
-        let list_box = {
-            let label_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(8.0, 8.0, 4.0, 4.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .text_color(TEXT_COLOR)
-                .font_size(16)
-                .build();
-
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(58, 68, 68, 255))
-                .color_hovered(Color::from_rgba(58, 68, 102, 255))
-                .color_clicked(Color::from_rgba(58, 68, 68, 255))
-                .build();
-
-            let scrollbar_style = root_ui()
-                .style_builder()
-                .color(Color::from_rgba(38, 43, 68, 255))
-                .build();
-
-            let scrollbar_handle_style = root_ui()
-                .style_builder()
-                .color(Color::from_rgba(38, 43, 68, 255))
-                .color_hovered(Color::from_rgba(58, 68, 102, 255))
-                .color_clicked(Color::from_rgba(38, 43, 68, 255))
-                .build();
-
-            Skin {
-                label_style,
-                button_style,
-                scrollbar_style,
-                scrollbar_handle_style,
-                ..default.clone()
-            }
-        };
-
-        let list_box_selected = {
-            let label_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(8.0, 8.0, 4.0, 4.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .text_color(TEXT_COLOR)
-                .font_size(16)
-                .build();
-
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(58, 68, 102, 255))
-                .color_hovered(Color::from_rgba(58, 68, 102, 255))
-                .color_clicked(Color::from_rgba(58, 68, 102, 255))
-                .build();
-
-            Skin {
-                label_style,
-                button_style,
-                ..list_box.clone()
-            }
-        };
-
-        let list_box_no_bg = {
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(0, 0, 0, 0))
-                .color_hovered(Color::from_rgba(58, 68, 102, 255))
-                .color_clicked(Color::from_rgba(58, 68, 68, 255))
-                .build();
-
-            Skin {
-                button_style,
-                ..list_box.clone()
-            }
-        };
-
-        let context_menu = {
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(38, 43, 68, 255))
-                .color_hovered(Color::from_rgba(38, 43, 102, 255))
-                .color_clicked(Color::from_rgba(38, 43, 68, 255))
-                .build();
-
-            let scrollbar_style = root_ui()
-                .style_builder()
-                .color(Color::from_rgba(0, 0, 0, 0))
-                .build();
-
-            let scrollbar_handle_style = root_ui()
-                .style_builder()
-                .color(Color::from_rgba(0, 0, 0, 0))
-                .color_hovered(Color::from_rgba(0, 0, 0, 0))
-                .color_clicked(Color::from_rgba(0, 0, 0, 0))
-                .build();
-
-            Skin {
-                button_style,
-                scrollbar_style,
-                scrollbar_handle_style,
-                ..list_box.clone()
-            }
-        };
-
-        let toolbar = {
-            let scrollbar_style = root_ui()
-                .style_builder()
-                .color(Color::from_rgba(38, 43, 68, 255))
-                .build();
-
-            let scrollbar_handle_style = root_ui()
-                .style_builder()
-                .color(Color::from_rgba(58, 68, 68, 255))
-                .color_hovered(Color::from_rgba(58, 68, 102, 255))
-                .color_clicked(Color::from_rgba(58, 68, 68, 255))
-                .build();
-
-            Skin {
-                scrollbar_style,
-                scrollbar_handle_style,
-                ..default.clone()
-            }
-        };
-
-        let toolbar_bg = {
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(58, 68, 68, 255))
-                .color_hovered(Color::from_rgba(58, 68, 68, 255))
-                .color_clicked(Color::from_rgba(58, 68, 68, 255))
-                .build();
-
-            Skin {
-                button_style,
-                ..toolbar.clone()
-            }
-        };
-
-        let toolbar_header_bg = {
-            let label_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(8.0, 8.0, 4.0, 4.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .text_color(TEXT_COLOR)
-                .font_size(18)
-                .build();
-
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(38, 43, 68, 255))
-                .color_hovered(Color::from_rgba(38, 43, 68, 255))
-                .color_clicked(Color::from_rgba(38, 43, 68, 255))
-                .build();
-
-            Skin {
-                label_style,
-                button_style,
-                ..toolbar.clone()
-            }
-        };
-
-        let toolbar_button = {
-            let button_style = root_ui()
-                .style_builder()
-                .background(button_background.image.clone())
-                .background_hovered(button_background_hovered.image.clone())
-                .background_clicked(button_background_clicked.image.clone())
-                .background_margin(RectOffset::new(
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_V,
-                    BUTTON_BG_MARGIN_V,
-                ))
-                .margin(RectOffset::new(
-                    SMALL_BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    SMALL_BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    SMALL_BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                    SMALL_BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                ))
-                .text_color(TEXT_COLOR)
-                .font_size(SMALL_BUTTON_FONT_SIZE as u16)
-                .build();
-
-            Skin {
-                button_style,
-                ..toolbar.clone()
-            }
-        };
-
-        let toolbar_button_disabled = {
-            let button_style = root_ui()
-                .style_builder()
-                .background(button_background_disabled.image.clone())
-                .background_hovered(button_background_disabled.image.clone())
-                .background_clicked(button_background_disabled.image.clone())
-                .background_margin(RectOffset::new(
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_V,
-                    BUTTON_BG_MARGIN_V,
-                ))
-                .margin(RectOffset::new(
-                    SMALL_BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    SMALL_BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    SMALL_BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                    SMALL_BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                ))
-                .text_color(TEXT_COLOR)
-                .font_size(SMALL_BUTTON_FONT_SIZE as u16)
-                .build();
-
-            Skin {
-                button_style,
-                ..toolbar_button.clone()
-            }
-        };
-
-        let tool_selector = {
-            let button_style = root_ui()
-                .style_builder()
-                .color(Color::from_rgba(58, 68, 68, 255))
-                .color_hovered(Color::from_rgba(58, 68, 102, 255))
-                .color_clicked(Color::from_rgba(58, 68, 68, 255))
-                .build();
-
-            Skin {
-                button_style,
-                ..toolbar.clone()
-            }
-        };
-
-        let tool_selector_selected = {
-            let button_style = root_ui()
-                .style_builder()
-                .background_margin(RectOffset::new(2.0, 2.0, 2.0, 2.0))
-                .margin(RectOffset::new(6.0, 6.0, 6.0, 6.0))
-                .color(Color::from_rgba(58, 68, 102, 255))
-                .color_hovered(Color::from_rgba(58, 68, 102, 255))
-                .color_clicked(Color::from_rgba(58, 68, 102, 255))
-                .build();
-
-            Skin {
-                button_style,
-                ..tool_selector.clone()
-            }
-        };
-
-        let tileset_grid = {
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(0, 0, 0, 0))
-                .color_hovered(Color::from_rgba(38, 43, 102, 180))
-                .color_clicked(Color::from_rgba(0, 0, 0, 0))
-                .build();
-
-            Skin {
-                button_style,
-                ..toolbar.clone()
-            }
-        };
-
-        let tileset_grid_selected = {
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(38, 43, 68, 180))
-                .color_hovered(Color::from_rgba(38, 43, 68, 180))
-                .color_clicked(Color::from_rgba(38, 43, 68, 180))
-                .build();
-
-            Skin {
-                button_style,
-                ..toolbar.clone()
-            }
-        };
-
-        let tileset_subtile_grid = {
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(0, 0, 0, 0))
-                .color_hovered(Color::from_rgba(98, 43, 38, 200))
-                .color_clicked(Color::from_rgba(0, 0, 0, 0))
-                .build();
-
-            Skin {
-                button_style,
-                ..toolbar.clone()
-            }
-        };
-
-        let tileset_subtile_grid_selected = {
-            let button_style = root_ui()
-                .style_builder()
-                .margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .background_margin(RectOffset::new(0.0, 0.0, 0.0, 0.0))
-                .color(Color::from_rgba(98, 43, 38, 200))
-                .color_hovered(Color::from_rgba(98, 43, 38, 200))
-                .color_clicked(Color::from_rgba(98, 43, 38, 200))
-                .build();
-
-            Skin {
-                button_style,
-                ..toolbar.clone()
-            }
-        };
-
-        let menu = { Skin { ..default.clone() } };
-
-        let menu_header = {
-            let label_style = root_ui()
-                .style_builder()
-                .text_color(TEXT_COLOR)
-                .font_size(HEADER_FONT_SIZE as u16)
-                .build();
-
-            Skin {
-                label_style,
-                ..list_box.clone()
-            }
-        };
-
-        let menu_selected = {
-            let button_style = root_ui()
-                .style_builder()
-                .background_margin(RectOffset::new(
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_V,
-                    BUTTON_BG_MARGIN_V,
-                ))
-                .margin(RectOffset::new(
-                    BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                    BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                ))
-                .background(button_background_hovered.image.clone())
-                .background_hovered(button_background_hovered.image.clone())
-                .background_clicked(button_background_clicked.image.clone())
-                .text_color(TEXT_COLOR)
-                .font_size(BUTTON_FONT_SIZE as u16)
-                .build();
-
-            Skin {
-                button_style,
-                ..list_box.clone()
-            }
-        };
-
-        let menu_disabled = {
-            let button_style = root_ui()
-                .style_builder()
-                .background_margin(RectOffset::new(
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_H,
-                    BUTTON_BG_MARGIN_V,
-                    BUTTON_BG_MARGIN_V,
-                ))
-                .margin(RectOffset::new(
-                    BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    BUTTON_MARGIN_H - BUTTON_BG_MARGIN_H,
-                    BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                    BUTTON_MARGIN_V - BUTTON_BG_MARGIN_V,
-                ))
-                .background(button_background_disabled.image.clone())
-                .background_hovered(button_background_disabled.image.clone())
-                .background_clicked(button_background_disabled.image.clone())
-                .text_color(TEXT_COLOR)
-                .font_size(BUTTON_FONT_SIZE as u16)
-                .build();
-
-            Skin {
-                button_style,
-                ..list_box.clone()
-            }
-        };
-
-        let panel = {
-            let group_style = root_ui()
-                .style_builder()
-                .color(NO_COLOR)
-                .color_hovered(NO_COLOR)
-                .color_clicked(NO_COLOR)
-                .build();
-
-            let button_style = root_ui()
-                .style_builder()
-                .background(window_background.image.clone())
-                .background_hovered(window_background.image.clone())
-                .background_clicked(window_background.image.clone())
-                .background_margin(RectOffset::new(52.0, 52.0, 52.0, 52.0))
-                .build();
-
-            Skin {
-                group_style,
-                button_style,
-                ..default.clone()
-            }
-        };
-
-        let panel_no_bg = {
-            let group_style = root_ui()
-                .style_builder()
-                .color(NO_COLOR)
-                .color_hovered(NO_COLOR)
-                .color_clicked(NO_COLOR)
-                .build();
-
-            let button_style = root_ui()
-                .style_builder()
-                .background(window_border.image.clone())
-                .background_hovered(window_border.image.clone())
-                .background_clicked(window_border.image.clone())
-                .background_margin(RectOffset::new(52.0, 52.0, 52.0, 52.0))
-                .build();
-
-            Skin {
-                group_style,
-                button_style,
-                ..default.clone()
-            }
-        };
-
-        let map_selection = {
-            let button_style = root_ui()
-                .style_builder()
-                .background(window_border.image.clone())
-                .background_margin(RectOffset::new(52.0, 52.0, 52.0, 52.0))
-                .margin(RectOffset::new(-40.0, -40.0, -40.0, -40.0))
-                .background_hovered(window_border.image.clone())
-                .background_clicked(window_border.image.clone())
-                .text_color(TEXT_COLOR)
-                .reverse_background_z(true)
-                .font_size(45)
-                .build();
-
-            Skin {
-                button_style,
-                ..default.clone()
-            }
-        };
-
-        SkinCollection {
-            default,
-            button_disabled,
-            window_header,
-            checkbox,
-            checkbox_selected,
-            label_button,
-            list_box,
-            list_box_selected,
-            list_box_no_bg,
-            context_menu,
-            toolbar,
-            toolbar_bg,
-            toolbar_header_bg,
-            toolbar_button,
-            toolbar_button_disabled,
-            tool_selector,
-            tool_selector_selected,
-            tileset_grid,
-            tileset_grid_selected,
-            tileset_subtile_grid,
-            tileset_subtile_grid_selected,
-            menu,
-            menu_header,
-            menu_selected,
-            menu_disabled,
-            panel,
-            panel_no_bg,
-            map_selection,
-        }
-    }
-}
diff --git a/src/item.rs b/src/item.rs
new file mode 100644
index 0000000000..4db5a1dbb6
--- /dev/null
+++ b/src/item.rs
@@ -0,0 +1,71 @@
+use crate::{
+    networking::{proto::game::GameEventFromServer, server::NetServer, NetId, NetIdMap},
+    prelude::*,
+};
+
+pub struct ItemPlugin;
+
+impl Plugin for ItemPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<Item>()
+            .add_fixed_update_event::<ItemGrabEvent>()
+            .add_fixed_update_event::<ItemDropEvent>()
+            .add_fixed_update_event::<ItemUseEvent>()
+            .add_system_to_stage(
+                CoreStage::PreUpdate,
+                send_net_item_spawns_from_server.run_if_resource_exists::<NetServer>(),
+            );
+    }
+}
+
+/// Component indicating that the entity it is attached to is an item that can be picked up
+/// by a player.
+#[derive(Component, Reflect, Default, Serialize, Deserialize, Debug)]
+#[reflect(Default, Component)]
+pub struct Item {
+    /// The path to the item's script
+    pub script: String,
+}
+
+/// An event triggered when an item is grabbed
+#[derive(Reflect, Clone, Debug)]
+pub struct ItemGrabEvent {
+    pub player: Entity,
+    pub item: Entity,
+    pub position: Vec3,
+}
+
+/// An event triggered when an item is dropped
+#[derive(Reflect, Clone, Debug)]
+pub struct ItemDropEvent {
+    pub player: Entity,
+    pub item: Entity,
+    pub position: Vec3,
+    pub velocity: Vec2,
+}
+
+/// An event triggered when an item is used
+#[derive(Reflect, Clone, Debug)]
+pub struct ItemUseEvent {
+    pub player: Entity,
+    pub item: Entity,
+    pub position: Vec3,
+}
+
+/// System to send send net messages for item spawns when running as the server
+fn send_net_item_spawns_from_server(
+    server: Res<NetServer>,
+    new_items: Query<(Entity, &Transform, &Item), Added<Item>>,
+    mut net_ids: ResMut<NetIdMap>,
+) {
+    for (entity, transform, item) in &new_items {
+        let net_id = NetId::new();
+        net_ids.insert(entity, net_id);
+
+        server.broadcast_reliable(&GameEventFromServer::SpawnItem {
+            net_id,
+            script: item.script.clone(),
+            pos: transform.translation,
+        });
+    }
+}
diff --git a/src/items.rs b/src/items.rs
deleted file mode 100644
index 03b53737ed..0000000000
--- a/src/items.rs
+++ /dev/null
@@ -1,656 +0,0 @@
-//! Things available to spawn from the level editor
-//! Proto-mods, eventually some of the items will move to some sort of a wasm runtime
-
-use hecs::{Entity, World};
-use macroquad::audio::{play_sound, PlaySoundParams, Sound};
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-use crate::game::sound::SOUND_EFFECT_VOLUME;
-use crate::utils::timer::Timer;
-use crate::{
-    ActiveEffectMetadata, AnimatedSprite, AnimatedSpriteMetadata, CollisionWorld, Drawable, Owner,
-    PassiveEffectMetadata, PhysicsBody, QueuedAnimationAction, Resources,
-};
-
-use core::{Result, Transform};
-
-use crate::effects::active::spawn_active_effect;
-use crate::particles::{ParticleEmitter, ParticleEmitterMetadata};
-use crate::physics::PhysicsBodyParams;
-use crate::player::{Player, PlayerInventory, IDLE_ANIMATION_ID};
-
-pub const ITEMS_DRAW_ORDER: u32 = 1;
-
-pub const SPRITE_ANIMATED_SPRITE_ID: &str = "sprite";
-pub const EFFECT_ANIMATED_SPRITE_ID: &str = "effect";
-
-pub const GROUND_ANIMATION_ID: &str = "ground";
-pub const ATTACK_ANIMATION_ID: &str = "attack";
-
-/// This dictates what happens to an item when it is dropped, either manually or on death.
-#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ItemDropBehavior {
-    /// Clear all state and restore default parameters
-    ClearState,
-    /// Keep all state between pickups
-    PersistState,
-    /// Destroy the item on drop
-    Destroy,
-}
-
-impl Default for ItemDropBehavior {
-    fn default() -> Self {
-        ItemDropBehavior::ClearState
-    }
-}
-
-/// This dictates what happens to an item when it is depleted, either by exceeding its duration,
-/// in the case of `Equipment`, or by depleting `uses`, if specified, in the case of a `Weapon`
-#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ItemDepleteBehavior {
-    /// Keep the item on depletion (do nothing)
-    Keep,
-    /// Drop the item on depletion
-    Drop,
-    /// Destroy the item on depletion
-    Destroy,
-}
-
-impl Default for ItemDepleteBehavior {
-    fn default() -> Self {
-        ItemDepleteBehavior::Keep
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum MapItemKind {
-    Weapon {
-        #[serde(flatten)]
-        meta: WeaponMetadata,
-    },
-    Item {
-        #[serde(flatten)]
-        meta: ItemMetadata,
-    },
-}
-
-pub struct ItemParams {
-    pub name: String,
-    pub effects: Vec<PassiveEffectMetadata>,
-    pub uses: Option<u32>,
-    pub duration: Option<f32>,
-    pub mount_offset: Vec2,
-    pub drop_behavior: ItemDropBehavior,
-    pub deplete_behavior: ItemDepleteBehavior,
-    pub is_hat: bool,
-    pub respawn_info: Option<RespawnInfo>,
-}
-
-#[derive(Clone)]
-pub struct Item {
-    pub id: String,
-    pub name: String,
-    pub effects: Vec<PassiveEffectMetadata>,
-    pub uses: Option<u32>,
-    pub duration: Option<f32>,
-    pub mount_offset: Vec2,
-    pub drop_behavior: ItemDropBehavior,
-    pub deplete_behavior: ItemDepleteBehavior,
-    pub is_hat: bool,
-    pub duration_timer: f32,
-    pub use_cnt: u32,
-    pub respawn_info: Option<RespawnInfo>,
-}
-
-impl Item {
-    pub fn new(id: &str, params: ItemParams) -> Self {
-        Item {
-            id: id.to_string(),
-            name: params.name,
-            effects: params.effects,
-            uses: params.uses,
-            duration: params.duration,
-            mount_offset: params.mount_offset,
-            drop_behavior: params.drop_behavior,
-            deplete_behavior: params.deplete_behavior,
-            respawn_info: params.respawn_info,
-            is_hat: params.is_hat,
-            duration_timer: 0.0,
-            use_cnt: 0,
-        }
-    }
-}
-
-/// This holds the parameters used when constructing an `Equipment`
-#[derive(Clone, Serialize, Deserialize)]
-pub struct ItemMetadata {
-    /// The effects that will be instantiated when the item is equipped
-    #[serde(default)]
-    pub effects: Vec<PassiveEffectMetadata>,
-    /// The items duration, after being equipped. This will also be the default duration of
-    /// passive effects that are added to the player, when equipping the item
-    #[serde(default)]
-    pub duration: Option<f32>,
-    /// If this is `true` the item will be treated as a hat
-    #[serde(default, rename = "hat", skip_serializing_if = "core::json::is_false")]
-    pub is_hat: bool,
-}
-
-// NOTE: We would prefer to `serde(deny_unknown_fields)` here, but we are blocked by this issue:
-// https://github.com/serde-rs/serde/issues/1358
-#[derive(Clone, Serialize, Deserialize)]
-pub struct MapItemMetadata {
-    pub id: String,
-    pub name: String,
-    #[serde(flatten)]
-    pub kind: MapItemKind,
-    #[serde(default)]
-    pub can_rotate: bool,
-    #[serde(with = "core::json::vec2_def")]
-    pub collider_size: Vec2,
-    #[serde(default, with = "core::json::vec2_def")]
-    pub collider_offset: Vec2,
-    #[serde(default)]
-    pub uses: Option<u32>,
-    #[serde(default)]
-    pub drop_behavior: ItemDropBehavior,
-    #[serde(default)]
-    pub deplete_behavior: ItemDepleteBehavior,
-    /// If specified, the item will be respawned if it is depleted or falls off the map, after the
-    /// specified delay in seconds.
-    #[serde(default = "default_respawn_delay")]
-    pub respawn_delay: Option<f32>,
-    /// This specifies the offset from the player position to where the equipped item is drawn
-    #[serde(default, with = "core::json::vec2_def")]
-    pub mount_offset: Vec2,
-    /// The parameters for the `AnimationPlayer` that will be used to draw the item
-    #[serde(alias = "animation")]
-    pub sprite: AnimatedSpriteMetadata,
-}
-
-fn default_respawn_delay() -> Option<f32> {
-    Some(3.0)
-}
-
-pub fn spawn_item(world: &mut World, position: Vec2, meta: MapItemMetadata) -> Result<Entity> {
-    let mut sprites = Vec::new();
-
-    let MapItemMetadata {
-        collider_size,
-        collider_offset,
-        drop_behavior,
-        deplete_behavior,
-        mount_offset,
-        ..
-    } = meta;
-
-    let actor = storage::get_mut::<CollisionWorld>().add_actor(
-        position,
-        collider_size.x as i32,
-        collider_size.y as i32,
-    );
-
-    let sprite = meta.sprite.into();
-
-    sprites.push((SPRITE_ANIMATED_SPRITE_ID, sprite));
-
-    let id = meta.id.as_str();
-
-    let entity = world.spawn((
-        Transform::from(position),
-        PhysicsBody::new(
-            actor,
-            None,
-            PhysicsBodyParams {
-                size: collider_size,
-                offset: collider_offset,
-                has_mass: true,
-                has_friction: true,
-                can_rotate: meta.can_rotate,
-                ..Default::default()
-            },
-        ),
-    ));
-
-    let uses = meta.uses;
-    let respawn_info = meta.respawn_delay.map(|respawn_delay| RespawnInfo {
-        position,
-        respawn_delay,
-    });
-
-    let name = meta.name.clone();
-
-    match meta.kind {
-        MapItemKind::Item { meta } => {
-            let ItemMetadata {
-                effects,
-                duration,
-                is_hat,
-            } = meta;
-
-            world.insert_one(
-                entity,
-                Item::new(
-                    id,
-                    ItemParams {
-                        name,
-                        effects,
-                        uses,
-                        duration,
-                        mount_offset,
-                        drop_behavior,
-                        deplete_behavior,
-                        is_hat,
-                        respawn_info,
-                    },
-                ),
-            )?;
-
-            if !sprites.is_empty() {
-                world.insert_one(
-                    entity,
-                    Drawable::new_animated_sprite_set(ITEMS_DRAW_ORDER, sprites.as_slice()),
-                )?;
-            }
-        }
-        MapItemKind::Weapon { meta } => {
-            let effect_offset = meta.effect_offset;
-
-            let mut sound_effect = None;
-            if let Some(id) = meta.sound_effect_id.as_ref() {
-                sound_effect = storage::get::<Resources>().sounds.get(id).copied();
-            }
-
-            if let Some(effect_sprite) = meta.effect_sprite {
-                let mut sprite: AnimatedSprite = effect_sprite.into();
-                sprite.is_deactivated = true;
-
-                sprites.push((EFFECT_ANIMATED_SPRITE_ID, sprite));
-            }
-
-            let particle_emitters = meta
-                .particles
-                .clone()
-                .into_iter()
-                .map(ParticleEmitter::new)
-                .collect::<Vec<_>>();
-
-            if !particle_emitters.is_empty() {
-                world.insert_one(entity, particle_emitters).unwrap();
-            }
-
-            let params = WeaponParams {
-                name,
-                effects: meta.effects,
-                uses,
-                sound_effect,
-                mount_offset,
-                effect_offset,
-                drop_behavior,
-                deplete_behavior,
-                respawn_info,
-            };
-
-            world.insert_one(
-                entity,
-                Weapon::new(id, meta.recoil, meta.cooldown, meta.attack_duration, params),
-            )?;
-
-            if !sprites.is_empty() {
-                world.insert_one(
-                    entity,
-                    Drawable::new_animated_sprite_set(ITEMS_DRAW_ORDER, sprites.as_slice()),
-                )?;
-            }
-        }
-    }
-
-    Ok(entity)
-}
-
-pub struct WeaponParams {
-    pub name: String,
-    pub effects: Vec<ActiveEffectMetadata>,
-    pub uses: Option<u32>,
-    pub sound_effect: Option<Sound>,
-    pub mount_offset: Vec2,
-    pub effect_offset: Vec2,
-    pub drop_behavior: ItemDropBehavior,
-    pub deplete_behavior: ItemDepleteBehavior,
-    pub respawn_info: Option<RespawnInfo>,
-}
-
-impl Default for WeaponParams {
-    fn default() -> Self {
-        WeaponParams {
-            name: "".to_string(),
-            effects: Vec::new(),
-            uses: None,
-            sound_effect: None,
-            mount_offset: Vec2::ZERO,
-            effect_offset: Vec2::ZERO,
-            drop_behavior: Default::default(),
-            deplete_behavior: Default::default(),
-            respawn_info: None,
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct Weapon {
-    pub id: String,
-    pub name: String,
-    pub effects: Vec<ActiveEffectMetadata>,
-    pub sound_effect: Option<Sound>,
-    pub recoil: f32,
-    pub cooldown: f32,
-    pub attack_duration: f32,
-    pub uses: Option<u32>,
-    pub mount_offset: Vec2,
-    pub effect_offset: Vec2,
-    pub drop_behavior: ItemDropBehavior,
-    pub deplete_behavior: ItemDepleteBehavior,
-    pub cooldown_timer: f32,
-    pub use_cnt: u32,
-    pub respawn_info: Option<RespawnInfo>,
-}
-
-impl Weapon {
-    pub fn new(
-        id: &str,
-        recoil: f32,
-        cooldown: f32,
-        attack_duration: f32,
-        params: WeaponParams,
-    ) -> Self {
-        Weapon {
-            id: id.to_string(),
-            name: params.name,
-            effects: params.effects,
-            recoil,
-            cooldown,
-            uses: params.uses,
-            attack_duration,
-            sound_effect: params.sound_effect,
-            mount_offset: params.mount_offset,
-            effect_offset: params.effect_offset,
-            drop_behavior: params.drop_behavior,
-            deplete_behavior: params.deplete_behavior,
-            respawn_info: params.respawn_info,
-            cooldown_timer: cooldown,
-            use_cnt: 0,
-        }
-    }
-}
-
-pub fn fire_weapon(world: &mut World, entity: Entity, owner: Entity) -> Result<()> {
-    let mut effects = Vec::new();
-
-    let mut origin = Vec2::ZERO;
-
-    {
-        let mut weapon = world.get_mut::<Weapon>(entity).unwrap();
-
-        if weapon.cooldown_timer >= weapon.cooldown {
-            let mut player = world.get_mut::<Player>(owner).unwrap();
-
-            {
-                let mut owner_body = world.get_mut::<PhysicsBody>(owner).unwrap();
-
-                if player.is_facing_left {
-                    owner_body.velocity.x = weapon.recoil;
-                } else {
-                    owner_body.velocity.x = -weapon.recoil;
-                }
-
-                let owner_transform = world.get::<Transform>(owner).unwrap();
-                let owner_inventory = world.get::<PlayerInventory>(owner).unwrap();
-
-                origin = owner_transform.position
-                    + owner_inventory
-                        .get_weapon_mount(player.is_facing_left, player.is_upside_down);
-
-                let mut offset = weapon.mount_offset + weapon.effect_offset;
-                if player.is_facing_left {
-                    offset.x = -offset.x;
-                }
-
-                origin += offset;
-            }
-
-            player.attack_timer = weapon.attack_duration;
-
-            weapon.use_cnt += 1;
-
-            weapon.cooldown_timer = 0.0;
-
-            if let Some(sound) = weapon.sound_effect {
-                play_sound(
-                    sound,
-                    PlaySoundParams {
-                        looped: false,
-                        volume: SOUND_EFFECT_VOLUME,
-                    },
-                );
-            }
-
-            let mut drawable = world.get_mut::<Drawable>(entity).unwrap();
-            {
-                let sprite_set = drawable.get_animated_sprite_set_mut().unwrap();
-
-                {
-                    let sprite = sprite_set.map.get_mut(SPRITE_ANIMATED_SPRITE_ID).unwrap();
-                    let is_looping = sprite
-                        .get_animation(ATTACK_ANIMATION_ID)
-                        .map(|a| a.is_looping)
-                        .unwrap_or_default();
-
-                    sprite.set_animation(ATTACK_ANIMATION_ID, !is_looping);
-                    sprite.queue_action(QueuedAnimationAction::Play(IDLE_ANIMATION_ID.to_string()));
-                }
-
-                if let Some(sprite) = sprite_set.map.get_mut(EFFECT_ANIMATED_SPRITE_ID) {
-                    sprite.is_deactivated = false;
-
-                    let is_looping = sprite
-                        .get_animation(ATTACK_ANIMATION_ID)
-                        .map(|a| a.is_looping)
-                        .unwrap_or_default();
-
-                    sprite.set_animation(ATTACK_ANIMATION_ID, !is_looping);
-                    sprite.queue_action(QueuedAnimationAction::Deactivate);
-                }
-            }
-
-            if let Ok(mut particle_emitters) = world.get_mut::<Vec<ParticleEmitter>>(entity) {
-                for emitter in particle_emitters.iter_mut() {
-                    emitter.activate();
-                }
-            }
-
-            effects = weapon.effects.clone();
-        }
-    }
-
-    for params in effects {
-        spawn_active_effect(world, owner, entity, origin, params)?;
-    }
-
-    Ok(())
-}
-
-/// This holds the parameters for the `AnimationPlayer` components of an equipped `Weapon`.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct WeaponAnimationMetadata {
-    /// This holds the parameters of the main `AnimationPlayer` component, holding the main
-    /// animations, like `"idle"` and `"attack"`.
-    /// At a minimum, an animation with the id `"idle"` must be specified. If no animation is
-    /// required, an animation with one frame can be used to just display a sprite.
-    #[serde(rename = "animation")]
-    pub sprite: AnimatedSpriteMetadata,
-    /// This can hold the parameters of the effect `AnimationPlayer` component, holding the
-    /// animations used for effects like `"attack_effect"`.
-    /// At a minimum, if this is specified, an animation with the id `"attack_effect"` must be
-    /// specified. If no animation is required, an animation with one frame can be used to just
-    /// display a sprite.
-    #[serde(
-        default,
-        rename = "effect_animation",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub effect: Option<AnimatedSpriteMetadata>,
-}
-
-/// This holds parameters specific to the `Weapon` variant of `ItemKind`, used to instantiate a
-/// `Weapon` struct instance, when an `Item` of type `Weapon` is picked up.
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct WeaponMetadata {
-    /// This specifies the effects to instantiate when the weapon is used to attack
-    #[serde(default)]
-    pub effects: Vec<ActiveEffectMetadata>,
-    /// Particle effects that will be activated when using the weapon
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub particles: Vec<ParticleEmitterMetadata>,
-    /// This can specify an id of a sound effect that is played when the weapon is used to attack
-    #[serde(
-        default,
-        rename = "sound_effect",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub sound_effect_id: Option<String>,
-    /// This specifies the offset between the upper left corner of the weapon's sprite to the
-    /// position that will serve as the origin of the weapon's effects
-    #[serde(default, with = "core::json::vec2_def")]
-    pub effect_offset: Vec2,
-    /// This can specify a maximum amount of weapon uses. If no value is specified, the weapon
-    /// will have unlimited uses.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub uses: Option<u32>,
-    /// This specifies the minimum interval of attacks with the weapon
-    #[serde(default)]
-    pub cooldown: f32,
-    /// This specifies the amount of time the player will be locked in an attack state when using
-    /// the weapon
-    #[serde(default)]
-    pub attack_duration: f32,
-    /// This specifies the force applied to the `Player` velocity, in the opposite direction of the
-    /// attack, when the weapon is activated.
-    #[serde(default)]
-    pub recoil: f32,
-    /// This can hold the parameters of the effect `AnimationPlayer` component, holding the
-    /// animations used for effects.
-    /// At a minimum, if this is specified, an animation with the id `"attack"` must be
-    /// specified.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub effect_sprite: Option<AnimatedSpriteMetadata>,
-}
-
-impl Default for WeaponMetadata {
-    fn default() -> Self {
-        WeaponMetadata {
-            effects: Vec::new(),
-            particles: Vec::new(),
-            sound_effect_id: None,
-            uses: None,
-            effect_offset: Vec2::ZERO,
-            cooldown: 0.0,
-            attack_duration: 0.0,
-            recoil: 0.0,
-            effect_sprite: None,
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct RespawnInfo {
-    pub position: Vec2,
-    pub respawn_delay: f32,
-}
-
-/// An item that has been destroyed somehow that should respawn
-#[derive(Clone)]
-pub struct RespawningItem {
-    pub timer: Timer,
-    pub info: RespawnInfo,
-    pub kind: RespawningItemKind,
-}
-
-#[derive(Clone)]
-pub enum RespawningItemKind {
-    Weapon(Weapon),
-    Item(Item),
-}
-
-pub fn update_respawning_items(world: &mut World) {
-    let mut to_spawn = Vec::new();
-
-    for (respawning_item_entity, (respawning_item, transform, body, drawable)) in world
-        .query_mut::<(
-            &mut RespawningItem,
-            &mut Transform,
-            &mut PhysicsBody,
-            &mut Drawable,
-        )>()
-    {
-        let respawning_item: &mut RespawningItem = respawning_item;
-        let transform: &mut Transform = transform;
-        let body: &mut PhysicsBody = body;
-        let drawable: &mut Drawable = drawable;
-
-        respawning_item.timer.tick_frame_time();
-
-        if respawning_item.timer.has_finished() {
-            transform.position = respawning_item.info.position;
-            body.velocity = Vec2::ZERO;
-            body.is_deactivated = false;
-            match &mut drawable.kind {
-                crate::DrawableKind::Sprite(s) => s.is_deactivated = false,
-                crate::DrawableKind::SpriteSet(s) => {
-                    if let Some(sprite) = s.map.get_mut(SPRITE_ANIMATED_SPRITE_ID) {
-                        sprite.is_deactivated = false;
-                    }
-                }
-                crate::DrawableKind::AnimatedSprite(s) => s.is_deactivated = false,
-                crate::DrawableKind::AnimatedSpriteSet(s) => {
-                    if let Some(sprite) = s.map.get_mut(SPRITE_ANIMATED_SPRITE_ID) {
-                        sprite.is_deactivated = false;
-                    }
-                }
-            }
-            to_spawn.push(respawning_item_entity);
-        } else {
-            match &mut drawable.kind {
-                crate::DrawableKind::Sprite(s) => s.is_deactivated = true,
-                crate::DrawableKind::SpriteSet(s) => s.deactivate_all(),
-                crate::DrawableKind::AnimatedSprite(s) => s.is_deactivated = true,
-                crate::DrawableKind::AnimatedSpriteSet(s) => s.deactivate_all(),
-            }
-        }
-    }
-
-    for entity in to_spawn {
-        let respawning_item = world.remove_one::<RespawningItem>(entity).unwrap();
-        world.remove_one::<Owner>(entity).ok();
-
-        match respawning_item.kind {
-            RespawningItemKind::Weapon(mut weapon) => {
-                weapon.use_cnt = 0;
-                world.insert_one(entity, weapon)
-            }
-            RespawningItemKind::Item(mut item) => {
-                item.use_cnt = 0;
-                item.duration_timer = 0.0;
-                world.insert_one(entity, item)
-            }
-        }
-        .unwrap();
-    }
-}
diff --git a/src/json/map/mod.rs b/src/json/map/mod.rs
deleted file mode 100644
index 1c4452e51a..0000000000
--- a/src/json/map/mod.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-pub mod tiled;
-
-use std::{collections::HashMap, iter::FromIterator};
-
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-use crate::map::{
-    Map, MapBackgroundLayer, MapLayer, MapLayerKind, MapObject, MapProperty, MapTile, MapTileset,
-};
-
-pub use tiled::TiledMap;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub(crate) struct MapDef {
-    #[serde(
-        default = "Map::default_background_color",
-        with = "core::json::ColorDef"
-    )]
-    pub background_color: Color,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub background_layers: Vec<MapBackgroundLayer>,
-    #[serde(with = "core::json::vec2_def", default)]
-    pub world_offset: Vec2,
-    #[serde(with = "core::json::uvec2_def")]
-    pub grid_size: UVec2,
-    #[serde(with = "core::json::vec2_def")]
-    pub tile_size: Vec2,
-    pub layers: Vec<MapLayerDef>,
-    pub tilesets: Vec<MapTileset>,
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub properties: HashMap<String, MapProperty>,
-    #[serde(default, with = "core::json::vec2_vec")]
-    pub spawn_points: Vec<Vec2>,
-}
-
-impl From<Map> for MapDef {
-    fn from(other: Map) -> MapDef {
-        let layers = other
-            .draw_order
-            .iter()
-            .filter_map(|layer_id| {
-                if let Some(layer) = other.layers.get(layer_id) {
-                    let (tiles, objects) = match &layer.kind {
-                        MapLayerKind::TileLayer => {
-                            let tiles = layer
-                                .tiles
-                                .iter()
-                                .map(|opt| match opt {
-                                    Some(tile) => {
-                                        let tileset = other
-                                            .tilesets
-                                            .get(&tile.tileset_id)
-                                            .unwrap_or_else(|| {
-                                                panic!(
-                                                    "Unable to find tileset with id '{}'!",
-                                                    tile.tileset_id
-                                                )
-                                            });
-                                        tile.tile_id + tileset.first_tile_id
-                                    }
-                                    _ => 0,
-                                })
-                                .collect();
-
-                            (Some(tiles), None)
-                        }
-                        MapLayerKind::ObjectLayer => {
-                            let objects = layer.objects.clone();
-
-                            (None, Some(objects))
-                        }
-                    };
-
-                    let layer = MapLayerDef {
-                        id: layer.id.clone(),
-                        kind: layer.kind,
-                        has_collision: layer.has_collision,
-                        objects,
-                        tiles,
-                        is_visible: layer.is_visible,
-                        properties: layer.properties.clone(),
-                    };
-
-                    return Some(layer);
-                }
-
-                None
-            })
-            .collect();
-
-        let tilesets = other.tilesets.into_values().collect();
-
-        MapDef {
-            background_color: other.background_color,
-            background_layers: other.background_layers,
-            world_offset: other.world_offset,
-            grid_size: other.grid_size,
-            tile_size: other.tile_size,
-            layers,
-            tilesets,
-            properties: other.properties,
-            spawn_points: other.spawn_points,
-        }
-    }
-}
-
-impl From<MapDef> for Map {
-    fn from(def: MapDef) -> Self {
-        let tilesets = HashMap::from_iter(
-            def.tilesets
-                .clone()
-                .into_iter()
-                .map(|tileset| (tileset.id.clone(), tileset)),
-        );
-
-        let draw_order = def.layers.iter().map(|layer| layer.id.clone()).collect();
-
-        let layers = HashMap::from_iter(def.layers.iter().map(|layer| {
-            let tiles = layer
-                .tiles
-                .clone()
-                .unwrap_or_default()
-                .into_iter()
-                .map(|tile_id| {
-                    if tile_id == 0 {
-                        None
-                    } else {
-                        let tile = match tilesets.iter().find(|(_, tileset)| {
-                            tile_id >= tileset.first_tile_id
-                                && tile_id < tileset.first_tile_id + tileset.tile_cnt
-                        }) {
-                            Some((_, tileset)) => {
-                                let tile_id = tile_id - tileset.first_tile_id;
-                                let mut attributes = Vec::new();
-                                if let Some(tile_attributes) =
-                                    tileset.tile_attributes.get(&tile_id).cloned()
-                                {
-                                    for attribute in tile_attributes {
-                                        attributes.push(attribute);
-                                    }
-                                }
-
-                                let tile = MapTile {
-                                    tile_id,
-                                    tileset_id: tileset.id.clone(),
-                                    texture_id: tileset.texture_id.clone(),
-                                    texture_coords: tileset.get_texture_coords(tile_id),
-                                    attributes,
-                                };
-
-                                Some(tile)
-                            }
-                            _ => None,
-                        };
-                        assert!(
-                            tile.is_some(),
-                            "Unable to determine tileset from tile_id '{}'",
-                            tile_id
-                        );
-                        tile
-                    }
-                })
-                .collect();
-
-            let objects = layer.objects.clone().unwrap_or_default();
-
-            let layer = MapLayer {
-                id: layer.id.clone(),
-                kind: layer.kind,
-                has_collision: layer.has_collision,
-                grid_size: def.grid_size,
-                tiles,
-                objects,
-                is_visible: layer.is_visible,
-                properties: layer.properties.clone(),
-            };
-
-            (layer.id.clone(), layer)
-        }));
-
-        Map {
-            background_color: def.background_color,
-            background_layers: def.background_layers,
-            world_offset: def.world_offset,
-            grid_size: def.grid_size,
-            tile_size: def.tile_size,
-            layers,
-            tilesets,
-            draw_order,
-            properties: def.properties,
-            spawn_points: def.spawn_points,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct MapLayerDef {
-    pub id: String,
-    pub kind: MapLayerKind,
-    #[serde(default)]
-    pub has_collision: bool,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub tiles: Option<Vec<u32>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub objects: Option<Vec<MapObject>>,
-    #[serde(default)]
-    pub is_visible: bool,
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub properties: HashMap<String, MapProperty>,
-}
-
-impl Default for MapLayerDef {
-    fn default() -> Self {
-        MapLayerDef {
-            id: "".to_string(),
-            kind: MapLayerKind::TileLayer,
-            has_collision: false,
-            tiles: Some(Vec::new()),
-            objects: None,
-            is_visible: true,
-            properties: HashMap::new(),
-        }
-    }
-}
diff --git a/src/json/map/tiled.rs b/src/json/map/tiled.rs
deleted file mode 100644
index 6940fc110a..0000000000
--- a/src/json/map/tiled.rs
+++ /dev/null
@@ -1,356 +0,0 @@
-use std::collections::HashMap;
-
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-use core::math::color_from_hex_string;
-
-use crate::map::MapObjectKind;
-use crate::map::{Map, MapLayer, MapLayerKind, MapObject, MapProperty, MapTile, MapTileset};
-
-const SPAWN_POINT_MAP_OBJECT_TYPE: &str = "spawn_point";
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case", tag = "type")]
-pub enum TiledProperty {
-    Bool { name: String, value: bool },
-    Float { name: String, value: f32 },
-    Int { name: String, value: i32 },
-    String { name: String, value: String },
-    Color { name: String, value: String },
-    Object { name: String, value: i32 },
-    File { name: String, value: String },
-}
-
-#[derive(Debug, Clone, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TiledObject {
-    pub id: u32,
-    pub name: String,
-    #[serde(rename = "type")]
-    pub object_type: String,
-    pub x: f32,
-    pub y: f32,
-    pub height: f32,
-    pub width: f32,
-    pub visible: bool,
-    pub rotation: f32,
-    pub ellipse: Option<bool>,
-    pub polygon: Option<Vec<TiledPolyPoint>>,
-    pub properties: Option<Vec<TiledProperty>>,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TiledTileAttribute {
-    pub id: u32,
-    #[serde(rename = "type")]
-    pub attribute: String,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TiledPolyPoint {
-    pub x: f32,
-    pub y: f32,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TiledTileset {
-    pub columns: i32,
-    pub image: String,
-    pub imagewidth: i32,
-    pub imageheight: i32,
-    pub margin: i32,
-    pub name: String,
-    #[serde(default, rename = "tiles")]
-    pub tile_attributes: Option<Vec<TiledTileAttribute>>,
-    #[serde(default)]
-    pub properties: Option<Vec<TiledProperty>>,
-    pub spacing: i32,
-    pub tileheight: i32,
-    pub tilewidth: i32,
-    pub firstgid: u32,
-    pub tilecount: u32,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TiledLayer {
-    pub name: String,
-    pub visible: bool,
-    #[serde(rename = "type")]
-    pub layer_type: String,
-    #[serde(default)]
-    pub data: Vec<u32>,
-    #[serde(default)]
-    pub objects: Vec<TiledObject>,
-    #[serde(default)]
-    pub properties: Option<Vec<TiledProperty>>,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TiledMap {
-    // Optional background color
-    pub backgroundcolor: Option<String>,
-    // Number of columns in the map grid
-    pub width: u32,
-    // Number of rows in the map grid
-    pub height: u32,
-    // Width of the individual tiles
-    pub tilewidth: u32,
-    // Height of the individual tiles
-    pub tileheight: u32,
-    // The JSON format version
-    pub version: String,
-    // The Tiled version used to create the map
-    pub tiledversion: String,
-    pub layers: Vec<TiledLayer>,
-    pub tilesets: Vec<TiledTileset>,
-    #[serde(default)]
-    pub properties: Option<Vec<TiledProperty>>,
-}
-
-impl TiledMap {
-    pub const TILE_LAYER_TYPE: &'static str = "tilelayer";
-
-    pub const COLLISION_LAYER_PROP: &'static str = "collision";
-    pub const TEXTURE_ID_PROP: &'static str = "texture_id";
-
-    pub fn into_map(self) -> Map {
-        let background_color = if let Some(background_color) = self.backgroundcolor {
-            color_from_hex_string(&background_color)
-        } else {
-            Map::default_background_color()
-        };
-
-        let mut tilesets = HashMap::new();
-        for tiled_tileset in self.tilesets {
-            let texture_size = uvec2(
-                tiled_tileset.imagewidth as u32,
-                tiled_tileset.imageheight as u32,
-            );
-
-            let tile_size = vec2(
-                tiled_tileset.tilewidth as f32,
-                tiled_tileset.tileheight as f32,
-            );
-
-            let grid_size = uvec2(
-                tiled_tileset.columns as u32,
-                tiled_tileset.tilecount / tiled_tileset.columns as u32,
-            );
-
-            let mut tile_attributes: HashMap<u32, Vec<String>> = HashMap::new();
-            if let Some(tiled_tile_attributes) = tiled_tileset.tile_attributes.as_ref() {
-                for tiled_attr in tiled_tile_attributes {
-                    tile_attributes.entry(tiled_attr.id).or_default();
-                    tile_attributes
-                        .get_mut(&tiled_attr.id)
-                        .unwrap()
-                        .push(tiled_attr.attribute.clone());
-                }
-            }
-
-            let mut texture_id = None;
-            let mut properties = HashMap::new();
-
-            if let Some(tiled_props) = tiled_tileset.properties.as_ref() {
-                for tiled_prop in tiled_props {
-                    let (name, prop) = pair_from_tiled_prop(tiled_prop.clone());
-                    if name == Self::TEXTURE_ID_PROP {
-                        if let MapProperty::String(value) = &prop {
-                            texture_id = Some(value.clone());
-                            continue;
-                        }
-                    }
-
-                    properties.insert(name, prop);
-                }
-            }
-
-            let texture_id = texture_id.unwrap_or_else(|| {
-                panic!(
-                    "Tiled tileset '{}' needs a 'texture_id' property!",
-                    &tiled_tileset.name
-                )
-            });
-
-            let tile_subdivisions = MapTileset::default_tile_subdivisions();
-            let subdivision_grid_size = grid_size * tile_subdivisions;
-
-            let subtile_cnt = (subdivision_grid_size.x * subdivision_grid_size.y) as usize;
-            let mut autotile_mask = vec![];
-            autotile_mask.resize(subtile_cnt, false);
-
-            let tileset = MapTileset {
-                id: tiled_tileset.name.clone(),
-                texture_id: texture_id.to_string(),
-                texture_size,
-                tile_size,
-                grid_size,
-                first_tile_id: tiled_tileset.firstgid,
-                tile_cnt: tiled_tileset.tilecount,
-                tile_subdivisions,
-                autotile_mask,
-                tile_attributes,
-                properties,
-                bitmasks: None,
-            };
-
-            tilesets.insert(tiled_tileset.name, tileset);
-        }
-
-        let mut spawn_points = Vec::new();
-        let mut layers = HashMap::new();
-        let mut draw_order = Vec::new();
-        for tiled_layer in &self.layers {
-            let mut tiles = Vec::new();
-            for tile_id in tiled_layer.data.clone() {
-                let res = if tile_id != 0 {
-                    let tileset = tilesets
-                        .iter()
-                        .find_map(|(_, tileset)| {
-                            if tile_id >= tileset.first_tile_id
-                                && tile_id <= tileset.first_tile_id + tileset.tile_cnt
-                            {
-                                return Some(tileset);
-                            }
-                            None
-                        })
-                        .unwrap();
-
-                    let tile_id = tile_id - tileset.first_tile_id;
-
-                    let attributes = tileset
-                        .tile_attributes
-                        .get(&tile_id)
-                        .cloned()
-                        .unwrap_or_default();
-
-                    let tile = MapTile {
-                        tile_id,
-                        tileset_id: tileset.id.clone(),
-                        texture_id: tileset.texture_id.clone(),
-                        texture_coords: tileset.get_texture_coords(tile_id),
-                        attributes,
-                    };
-
-                    Some(tile)
-                } else {
-                    None
-                };
-
-                tiles.push(res);
-            }
-
-            let mut objects = Vec::new();
-            for tiled_object in &tiled_layer.objects {
-                let position = vec2(tiled_object.x, tiled_object.y);
-
-                if tiled_object.object_type == *SPAWN_POINT_MAP_OBJECT_TYPE {
-                    spawn_points.push(position);
-                } else {
-                    let mut properties = HashMap::new();
-                    if let Some(tiled_props) = tiled_object.properties.clone() {
-                        for tiled_prop in tiled_props {
-                            let (name, prop) = pair_from_tiled_prop(tiled_prop);
-                            properties.insert(name, prop);
-                        }
-                    }
-
-                    let kind = MapObjectKind::from(tiled_object.object_type.clone());
-
-                    let object = MapObject {
-                        id: tiled_object.name.clone(),
-                        kind,
-                        position,
-                        properties,
-                    };
-
-                    objects.push(object);
-                }
-            }
-
-            let grid_size = uvec2(self.width, self.height);
-
-            let mut has_collision = false;
-            let mut properties = HashMap::new();
-            if let Some(tiled_props) = &tiled_layer.properties {
-                for tiled_prop in tiled_props {
-                    let (name, prop) = pair_from_tiled_prop(tiled_prop.clone());
-                    if name == Self::COLLISION_LAYER_PROP {
-                        if let MapProperty::Bool(value) = &prop {
-                            has_collision = *value;
-                            continue;
-                        }
-                    }
-
-                    properties.insert(name, prop);
-                }
-            }
-
-            let kind = if tiled_layer.layer_type == *Self::TILE_LAYER_TYPE {
-                MapLayerKind::TileLayer
-            } else {
-                MapLayerKind::ObjectLayer
-            };
-
-            let layer = MapLayer {
-                id: tiled_layer.name.clone(),
-                kind,
-                has_collision,
-                grid_size,
-                tiles,
-                objects,
-                is_visible: tiled_layer.visible,
-                properties,
-            };
-
-            draw_order.push(layer.id.clone());
-            layers.insert(layer.id.clone(), layer);
-        }
-
-        let grid_size = uvec2(self.width, self.height);
-
-        let mut properties = HashMap::new();
-        if let Some(tiled_props) = self.properties {
-            for tiled_prop in tiled_props {
-                let (name, prop) = pair_from_tiled_prop(tiled_prop);
-                properties.insert(name, prop);
-            }
-        }
-
-        Map {
-            background_color,
-            background_layers: Vec::new(),
-            world_offset: Vec2::ZERO,
-            grid_size,
-            tile_size: vec2(self.tilewidth as f32, self.tileheight as f32),
-            layers,
-            tilesets,
-            draw_order,
-            properties,
-            spawn_points,
-        }
-    }
-}
-
-fn pair_from_tiled_prop(tiled_prop: TiledProperty) -> (String, MapProperty) {
-    match tiled_prop {
-        TiledProperty::Bool { name, value } => (name, MapProperty::Bool(value)),
-        TiledProperty::Float { name, value } => (name, MapProperty::Float(value)),
-        TiledProperty::Int { name, value } => (name, MapProperty::Int(value)),
-        TiledProperty::String { name, value } => (name, MapProperty::String(value)),
-        TiledProperty::Color { name, value } => {
-            let color = color_from_hex_string(&value);
-            (name, MapProperty::Color(color))
-        }
-        TiledProperty::Object { name, value } => (name, MapProperty::Int(value)),
-        TiledProperty::File { name, value } => (name, MapProperty::String(value)),
-    }
-}
diff --git a/src/json/mod.rs b/src/json/mod.rs
deleted file mode 100644
index 03761cd740..0000000000
--- a/src/json/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod map;
-
-pub use map::*;
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000000..39556e3fde
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,266 @@
+//! Jumpy is a pixel-style, tactical 2D shooter with a fishy theme.
+//!
+//! This is the project's internal developer API documentation. API documentation is usually meant
+//! for libraries with public APIs, but this is a game, so we use it to document the internal game
+//! architecture for contributors.
+//!
+//! TODO: Write essentially an Architecture.md type of document here, and fill out the other game
+//! module's documentation.
+
+#![allow(clippy::type_complexity)]
+#![allow(clippy::forget_non_drop)]
+#![allow(clippy::too_many_arguments)]
+
+use std::time::Duration;
+
+use bevy::{
+    app::{RunMode, ScheduleRunnerPlugin, ScheduleRunnerSettings},
+    asset::AssetServerSettings,
+    log::{LogPlugin, LogSettings},
+    pbr::PbrPlugin,
+    render::{texture::ImageSettings, RenderPlugin},
+    sprite::SpritePlugin,
+    text::TextPlugin,
+    time::FixedTimestep,
+    window::WindowPlugin,
+    winit::WinitPlugin,
+};
+use bevy_parallax::ParallaxResource;
+
+pub mod animation;
+pub mod assets;
+pub mod camera;
+pub mod config;
+pub mod damage;
+pub mod debug;
+pub mod item;
+pub mod lifetime;
+pub mod lines;
+pub mod loading;
+pub mod localization;
+pub mod map;
+pub mod metadata;
+pub mod name;
+pub mod networking;
+pub mod physics;
+pub mod platform;
+pub mod player;
+pub mod prelude;
+pub mod run_criteria;
+pub mod scripting;
+pub mod ui;
+pub mod utils;
+pub mod workarounds;
+
+use crate::{
+    animation::AnimationPlugin,
+    assets::AssetPlugin,
+    camera::CameraPlugin,
+    damage::DamagePlugin,
+    debug::DebugPlugin,
+    item::ItemPlugin,
+    lifetime::LifetimePlugin,
+    lines::LinesPlugin,
+    loading::LoadingPlugin,
+    localization::LocalizationPlugin,
+    map::MapPlugin,
+    metadata::{GameMeta, MetadataPlugin},
+    name::NamePlugin,
+    networking::{proto, server::NetServer, NetworkingPlugin},
+    physics::PhysicsPlugin,
+    platform::PlatformPlugin,
+    player::PlayerPlugin,
+    prelude::*,
+    scripting::ScriptingPlugin,
+    ui::UiPlugin,
+    workarounds::WorkaroundsPlugin,
+};
+
+/// The timestep used for fixed update systems
+pub const FIXED_TIMESTEP: f64 = 1.0 / 60.;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum GameState {
+    LoadingPlatformStorage,
+    LoadingGameData,
+    MainMenu,
+    InGame,
+    ServerPlayerSelect,
+    ServerInGame,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum InGameState {
+    Playing,
+    Editing,
+    Paused,
+}
+
+#[derive(StageLabel)]
+pub enum FixedUpdateStage {
+    First,
+    PreUpdate,
+    Update,
+    PostUpdate,
+    Last,
+}
+
+pub fn build_app(net_server: Option<NetServer>) -> App {
+    // Load engine config. This will parse CLI arguments or web query string so we want to do it
+    // before we create the app to make sure everything is in order.
+    let engine_config = &*config::ENGINE_CONFIG;
+
+    let mut app = App::new();
+
+    if !engine_config.server_mode {
+        app.insert_resource(WindowDescriptor {
+            title: "Fish Folk: Jumpy".to_string(),
+            fit_canvas_to_parent: true,
+            ..default()
+        })
+        .insert_resource(ImageSettings::default_nearest());
+    }
+
+    // Configure log level
+    app.insert_resource(LogSettings {
+        filter: engine_config.log_level.clone(),
+        ..default()
+    });
+
+    // Configure asset server
+    let mut asset_server_settings = AssetServerSettings {
+        watch_for_changes: engine_config.hot_reload,
+        ..default()
+    };
+    if let Some(asset_dir) = &engine_config.asset_dir {
+        asset_server_settings.asset_folder = asset_dir.clone();
+    }
+    app.insert_resource(asset_server_settings);
+
+    if !engine_config.server_mode {
+        // Initialize resources
+        app.insert_resource(ClearColor(Color::BLACK))
+            .init_resource::<ParallaxResource>();
+    }
+
+    // Set initial game state
+    app.add_loopless_state(GameState::LoadingPlatformStorage)
+        .add_loopless_state(InGameState::Playing);
+
+    // Add fixed update stages
+    app.add_stage_after(
+        CoreStage::First,
+        FixedUpdateStage::First,
+        SystemStage::parallel().with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+    )
+    .add_stage_after(
+        CoreStage::PreUpdate,
+        FixedUpdateStage::PreUpdate,
+        SystemStage::parallel().with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+    )
+    .add_stage_after(
+        CoreStage::Update,
+        FixedUpdateStage::Update,
+        SystemStage::parallel().with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+    )
+    .add_stage_after(
+        CoreStage::PostUpdate,
+        FixedUpdateStage::PostUpdate,
+        SystemStage::parallel().with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+    )
+    .add_stage_after(
+        CoreStage::Last,
+        FixedUpdateStage::Last,
+        SystemStage::parallel().with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+    );
+
+    // Install game plugins
+
+    // Server mode requires special configuration to disable rendering, etc.
+    if engine_config.server_mode {
+        if let Some(net_server) = net_server {
+            // Send each client their player index
+            let player_count = net_server.client_count();
+            for i in 0..player_count {
+                info!("Sending net idx for player {i}");
+                net_server.send_reliable(
+                    &proto::ClientMatchInfo {
+                        player_idx: i,
+                        player_count,
+                    },
+                    i,
+                );
+            }
+
+            app.insert_resource(net_server);
+        } else {
+            panic!("Net server required when in server mode");
+        }
+
+        app.add_plugins_with(DefaultPlugins, |group| {
+            group
+                .disable::<LogPlugin>()
+                .disable::<RenderPlugin>()
+                .disable::<WindowPlugin>()
+                .disable::<WinitPlugin>()
+                .disable::<SpritePlugin>()
+                .disable::<bevy::ui::UiPlugin>()
+                .disable::<TextPlugin>()
+                .disable::<PbrPlugin>()
+        })
+        .init_resource::<Windows>()
+        .add_asset::<TextureAtlas>()
+        .insert_resource(ScheduleRunnerSettings {
+            run_mode: RunMode::Loop {
+                wait: Some(Duration::from_secs_f64(FIXED_TIMESTEP)),
+            },
+        })
+        .add_plugin(ScheduleRunnerPlugin)
+        .register_type::<bevy::render::view::ComputedVisibility>()
+        .register_type::<bevy::render::view::Visibility>();
+
+    // If we're not in server mode
+    } else {
+        app.add_plugins_with(DefaultPlugins, |group| {
+            // TODO: We should figure out how to not include these dependencies, so we can remove
+            // this disable section, too.
+            group
+                .disable::<bevy::ui::UiPlugin>()
+                .disable::<TextPlugin>()
+        })
+        .add_plugin(LinesPlugin)
+        .add_plugin(UiPlugin);
+    }
+
+    app.add_plugin(bevy_tweening::TweeningPlugin)
+        .add_plugin(MetadataPlugin)
+        .add_plugin(PlatformPlugin)
+        .add_plugin(LoadingPlugin)
+        .add_plugin(AssetPlugin)
+        .add_plugin(LocalizationPlugin)
+        .add_plugin(NamePlugin)
+        .add_plugin(AnimationPlugin)
+        .add_plugin(PlayerPlugin)
+        .add_plugin(ItemPlugin)
+        .add_plugin(PhysicsPlugin)
+        .add_plugin(CameraPlugin)
+        .add_plugin(MapPlugin)
+        .add_plugin(DamagePlugin)
+        .add_plugin(LifetimePlugin)
+        .add_plugin(WorkaroundsPlugin)
+        .add_plugin(DebugPlugin)
+        .add_plugin(ScriptingPlugin)
+        .add_plugin(NetworkingPlugin);
+
+    debug!(?engine_config, "Starting game");
+
+    // Get the game handle
+    let asset_server = app.world.get_resource::<AssetServer>().unwrap();
+    let game_asset = &engine_config.game_asset;
+    let game_handle: Handle<GameMeta> = asset_server.load(game_asset);
+
+    // Insert game handle resource
+    app.world.insert_resource(game_handle);
+
+    app
+}
diff --git a/src/lifetime.rs b/src/lifetime.rs
new file mode 100644
index 0000000000..47ef435afc
--- /dev/null
+++ b/src/lifetime.rs
@@ -0,0 +1,46 @@
+//! Module providing entity lifetime components and systems
+
+use crate::{prelude::*, FIXED_TIMESTEP};
+
+pub struct LifetimePlugin;
+
+impl Plugin for LifetimePlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<Lifetime>()
+            .add_system_to_stage(FixedUpdateStage::PostUpdate, lifetime_system);
+    }
+}
+
+/// The lifetime state of an entity
+///
+/// > **Note:** The age represents how long the entity has had the [`Lifetime`] component on it, not
+/// > necessarily how long since the entity was spawned, if the [`Lifetime`] component was added
+/// > later, after it was spawned.
+/// >
+/// > Also, the age and lifetime are public, subject to other system's modification.
+#[derive(Reflect, Debug, Clone, Component, Default)]
+#[reflect(Component, Default)]
+pub struct Lifetime {
+    /// How long the entity should be allowed to live in seconds.
+    pub lifetime: f32,
+    /// How long the entity has lived in seconds.
+    pub age: f32,
+    /// Set this to `true` to despawn the entity non-recursively when the lifetime is expired.
+    ///
+    /// By default this is set to false and will despawn the entity recursively.
+    pub non_recursive_despawn: bool,
+}
+
+/// Despawns entities that have an expired lifetime
+fn lifetime_system(mut commands: Commands, mut entities: Query<(Entity, &mut Lifetime)>) {
+    for (entity, mut lifetime) in &mut entities {
+        lifetime.age += FIXED_TIMESTEP as f32;
+        if lifetime.age >= lifetime.lifetime {
+            if lifetime.non_recursive_despawn {
+                commands.entity(entity).despawn();
+            } else {
+                commands.entity(entity).despawn_recursive();
+            }
+        }
+    }
+}
diff --git a/src/lines.rs b/src/lines.rs
new file mode 100644
index 0000000000..5fcdd6761d
--- /dev/null
+++ b/src/lines.rs
@@ -0,0 +1,13 @@
+//! Plugin for easily drawing lines in the world for debugging or editor visualization.
+
+use crate::prelude::*;
+use bevy_prototype_lyon::prelude::*;
+
+pub struct LinesPlugin;
+
+impl Plugin for LinesPlugin {
+    fn build(&self, app: &mut App) {
+        // WIP
+        app.add_plugin(ShapePlugin);
+    }
+}
diff --git a/src/loading.rs b/src/loading.rs
new file mode 100644
index 0000000000..5718d9ac28
--- /dev/null
+++ b/src/loading.rs
@@ -0,0 +1,373 @@
+use bevy::{ecs::system::SystemParam, render::camera::ScalingMode};
+use bevy_egui::{egui, EguiContext};
+use bevy_fluent::Locale;
+use bevy_has_load_progress::{HasLoadProgress, LoadingResources};
+use bevy_mod_js_scripting::ActiveScripts;
+use leafwing_input_manager::{
+    axislike::{AxisType, SingleAxis},
+    prelude::InputMap,
+    InputManagerBundle,
+};
+
+use crate::{
+    camera::{spawn_editor_camera, spawn_game_camera},
+    config::ENGINE_CONFIG,
+    metadata::{BorderImageMeta, GameMeta, PlayerMeta, Settings},
+    platform::Storage,
+    player::{input::PlayerInputs, MAX_PLAYERS},
+    prelude::*,
+    ui::input::MenuAction,
+    GameState,
+};
+
+pub struct LoadingPlugin;
+
+impl Plugin for LoadingPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_startup_system(setup).add_system(
+            load_game
+                .run_in_state(GameState::LoadingGameData)
+                .run_if(game_assets_loaded),
+        );
+
+        // Configure hot reload
+        if ENGINE_CONFIG.hot_reload {
+            app.add_system_to_stage(CoreStage::Last, hot_reload_game)
+                .add_system_set_to_stage(
+                    CoreStage::Last,
+                    ConditionSet::new().run_in_state(GameState::InGame).into(),
+                );
+        }
+    }
+}
+
+#[derive(Component)]
+pub struct PlayerInputCollector(pub usize);
+
+fn setup(mut commands: Commands) {
+    commands
+        .spawn()
+        .insert(Name::new("Menu Input Collector"))
+        .insert_bundle(InputManagerBundle {
+            input_map: menu_input_map(),
+            ..default()
+        });
+
+    // Spawn the game camera
+    spawn_game_camera(&mut commands);
+
+    // Spawn the editor camera
+    spawn_editor_camera(&mut commands);
+}
+
+// Condition system used to make sure game assets have loaded
+fn game_assets_loaded(
+    game_handle: Res<Handle<GameMeta>>,
+    loading_resources: LoadingResources,
+    game_assets: Res<Assets<GameMeta>>,
+) -> bool {
+    if let Some(game) = game_assets.get(&game_handle) {
+        // Track load progress
+        let load_progress = game.load_progress(&loading_resources);
+        debug!(
+            %load_progress,
+            "Loading game assets: {:.2}% ",
+            load_progress.as_percent() * 100.0
+        );
+
+        // Wait until assets are loaded to start game
+        let done = load_progress.as_percent() >= 1.0;
+
+        if done {
+            info!("Game assets loaded");
+        }
+
+        done
+    } else {
+        false
+    }
+}
+
+/// System param used to load and hot reload the game
+#[derive(SystemParam)]
+pub struct GameLoader<'w, 's> {
+    skip_next_asset_update_event: Local<'s, bool>,
+    camera_projections: Query<'w, 's, &'static mut OrthographicProjection>,
+    commands: Commands<'w, 's>,
+    game_handle: Res<'w, Handle<GameMeta>>,
+    clear_color: ResMut<'w, ClearColor>,
+    game_assets: ResMut<'w, Assets<GameMeta>>,
+    egui_ctx: Option<ResMut<'w, EguiContext>>,
+    events: EventReader<'w, 's, AssetEvent<GameMeta>>,
+    active_scripts: ResMut<'w, ActiveScripts>,
+    storage: ResMut<'w, Storage>,
+    player_assets: ResMut<'w, Assets<PlayerMeta>>,
+    texture_atlas_assets: Res<'w, Assets<TextureAtlas>>,
+    player_inputs: ResMut<'w, PlayerInputs>,
+}
+
+impl<'w, 's> GameLoader<'w, 's> {
+    /// This function is called once when the game starts up and, when hot reload is enabled, on
+    /// update, to check for asset changed events and to update the [`GameMeta`] resource.
+    ///
+    /// The `is_hot_reload` argument is used to indicate whether the function should check for asset
+    /// updates and reload, or whether it should run the one-time initialization of the game.
+    fn load(mut self, is_hot_reload: bool) {
+        // Check to make sure we shouldn't skip this execution
+        // ( i.e. if this is a hot reload run without any changed assets )
+        if self.should_skip_run(is_hot_reload) {
+            return;
+        }
+
+        let Self {
+            mut skip_next_asset_update_event,
+            mut camera_projections,
+            mut commands,
+            game_handle,
+            mut game_assets,
+            mut egui_ctx,
+            mut active_scripts,
+            mut clear_color,
+            mut storage,
+            mut player_assets,
+            texture_atlas_assets,
+            mut player_inputs,
+            ..
+        } = self;
+
+        if let Some(game) = game_assets.get_mut(&game_handle) {
+            // Hot reload preparation
+            if is_hot_reload {
+                // Since we are modifying the game asset, which will trigger another asset changed
+                // event, we need to skip the next update event.
+                *skip_next_asset_update_event = true;
+
+                // Clear the active scripts
+                active_scripts.clear();
+
+            // One-time initialization
+            } else {
+                if let Some(ctx) = egui_ctx.as_mut() {
+                    // Initialize empty fonts for all game fonts.
+                    //
+                    // This makes sure Egui will not panic if we try to use a font that is still loading.
+                    let mut egui_fonts = egui::FontDefinitions::default();
+                    for font_name in game.ui_theme.font_families.keys() {
+                        let font_family = egui::FontFamily::Name(font_name.clone().into());
+                        egui_fonts.families.insert(font_family, vec![]);
+                    }
+                    ctx.ctx_mut().set_fonts(egui_fonts.clone());
+                    commands.insert_resource(egui_fonts);
+                }
+
+                // Spawn player input collectors.
+                let settings = storage.get(Settings::STORAGE_KEY);
+                let settings = settings.as_ref().unwrap_or(&game.default_settings);
+                for player in 0..MAX_PLAYERS {
+                    commands
+                        .spawn()
+                        .insert(Name::new(format!("Player Input Collector {player}")))
+                        .insert(PlayerInputCollector(player))
+                        .insert_bundle(InputManagerBundle {
+                            input_map: settings.player_controls.get_input_map(player),
+                            ..default()
+                        });
+                }
+
+                // Select default character for all players
+                for player in &mut player_inputs.players {
+                    player.selected_player = game.player_handles[0].clone_weak();
+                }
+
+                if ENGINE_CONFIG.server_mode {
+                    // Go to server player selection state
+                    commands.insert_resource(NextState(GameState::ServerPlayerSelect));
+                } else {
+                    // Transition to the main menu when we are done
+                    commands.insert_resource(NextState(GameState::MainMenu));
+                }
+            }
+
+            // Update camera scaling mode
+            for mut projection in &mut camera_projections {
+                projection.scaling_mode = ScalingMode::FixedVertical(game.camera_height as f32);
+            }
+
+            // set the clear color
+            clear_color.0 = game.clear_color.into();
+
+            // Set the locale resource
+            let translations = &game.translations;
+            commands.insert_resource(
+                Locale::new(translations.detected_locale.clone())
+                    .with_default(translations.default_locale.clone()),
+            );
+
+            if let Some(egui_ctx) = &mut egui_ctx {
+                let mut visuals = egui::Visuals::dark();
+                visuals.widgets = game.ui_theme.widgets.get_egui_widget_style();
+                egui_ctx.ctx_mut().set_visuals(visuals);
+
+                // Helper to load border images
+                let mut load_border_image = |border: &mut BorderImageMeta| {
+                    border.egui_texture = egui_ctx.add_image(border.handle.inner.clone_weak());
+                };
+
+                // Add Border images to egui context
+                load_border_image(&mut game.ui_theme.hud.portrait_frame);
+                load_border_image(&mut game.ui_theme.panel.border);
+                load_border_image(&mut game.ui_theme.hud.lifebar.background_image);
+                load_border_image(&mut game.ui_theme.hud.lifebar.progress_image);
+                for button in game.ui_theme.button_styles.as_list() {
+                    load_border_image(&mut button.borders.default);
+                    if let Some(border) = &mut button.borders.clicked {
+                        load_border_image(border);
+                    }
+                    if let Some(border) = &mut button.borders.focused {
+                        load_border_image(border);
+                    }
+                }
+                // Add player sprite sheets to egui context
+                for player_handle in &game.player_handles {
+                    let player_meta = player_assets.get_mut(player_handle).unwrap();
+                    let atlas = texture_atlas_assets
+                        .get(&player_meta.spritesheet.atlas_handle)
+                        .unwrap();
+                    player_meta.spritesheet.egui_texture_id =
+                        egui_ctx.add_image(atlas.texture.clone_weak());
+                }
+
+                // Add editor icons to egui context
+                for icon in game.ui_theme.editor.icons.as_mut_list() {
+                    icon.egui_texture_id = egui_ctx.add_image(icon.image_handle.inner.clone_weak());
+                }
+            }
+
+            // Set the active scripts
+            for script_handle in &game.script_handles {
+                active_scripts.insert(script_handle.inner.clone_weak());
+            }
+            if ENGINE_CONFIG.server_mode {
+                for script_handle in &game.server_script_handles {
+                    active_scripts.insert(script_handle.inner.clone_weak());
+                }
+            } else {
+                for script_handle in &game.client_script_handles {
+                    active_scripts.insert(script_handle.inner.clone_weak());
+                }
+            }
+
+            // Insert the game resource
+            commands.insert_resource(game.clone());
+
+            // If the game asset isn't loaded yet
+        } else {
+            trace!("Awaiting game load")
+        }
+    }
+
+    // Run checks to see if we should skip running the system
+    fn should_skip_run(&mut self, is_hot_reload: bool) -> bool {
+        // If this is a hot reload run, check for modified asset events
+        if is_hot_reload {
+            let mut has_update = false;
+            for (event, event_id) in self.events.iter_with_id() {
+                if let AssetEvent::Modified { .. } = event {
+                    // We may need to skip an asset update event
+                    if *self.skip_next_asset_update_event {
+                        *self.skip_next_asset_update_event = false;
+                    } else {
+                        debug!(%event_id, "Game updated");
+                        has_update = true;
+                    }
+                }
+            }
+
+            // If there was no update, skip execution
+            if !has_update {
+                return true;
+            }
+        }
+
+        false
+    }
+}
+
+fn menu_input_map() -> InputMap<MenuAction> {
+    InputMap::default()
+        .set_gamepad(Gamepad::new(0))
+        // Up
+        .insert(KeyCode::Up, MenuAction::Up)
+        .insert(GamepadButtonType::DPadUp, MenuAction::Up)
+        .insert(
+            SingleAxis {
+                axis_type: AxisType::Gamepad(GamepadAxisType::LeftStickY),
+                positive_low: 0.5,
+                negative_low: -1.0,
+                value: None,
+            },
+            MenuAction::Up,
+        )
+        // Left
+        .insert(KeyCode::Left, MenuAction::Left)
+        .insert(GamepadButtonType::DPadLeft, MenuAction::Left)
+        .insert(
+            SingleAxis {
+                axis_type: AxisType::Gamepad(GamepadAxisType::LeftStickX),
+                positive_low: 1.0,
+                negative_low: -0.5,
+                value: None,
+            },
+            MenuAction::Left,
+        )
+        // Down
+        .insert(KeyCode::Down, MenuAction::Down)
+        .insert(GamepadButtonType::DPadDown, MenuAction::Down)
+        .insert(
+            SingleAxis {
+                axis_type: AxisType::Gamepad(GamepadAxisType::LeftStickY),
+                positive_low: 1.0,
+                negative_low: -0.5,
+                value: None,
+            },
+            MenuAction::Down,
+        )
+        // Right
+        .insert(KeyCode::Right, MenuAction::Right)
+        .insert(GamepadButtonType::DPadRight, MenuAction::Right)
+        .insert(
+            SingleAxis {
+                axis_type: AxisType::Gamepad(GamepadAxisType::LeftStickX),
+                positive_low: 0.5,
+                negative_low: -1.0,
+                value: None,
+            },
+            MenuAction::Right,
+        )
+        // Start
+        .insert(GamepadButtonType::Start, MenuAction::Start)
+        // Confirm
+        .insert(KeyCode::Return, MenuAction::Confirm)
+        .insert(GamepadButtonType::South, MenuAction::Confirm)
+        .insert(GamepadButtonType::Start, MenuAction::Confirm)
+        // Back
+        .insert(KeyCode::Escape, MenuAction::Back)
+        .insert(GamepadButtonType::East, MenuAction::Back)
+        // Toggle Fullscreen
+        .insert(KeyCode::F11, MenuAction::ToggleFullscreen)
+        .insert(GamepadButtonType::Mode, MenuAction::ToggleFullscreen)
+        // Pause
+        .insert(KeyCode::Escape, MenuAction::Pause)
+        .insert(GamepadButtonType::Start, MenuAction::Pause)
+        .build()
+}
+
+/// System to run the initial game load
+fn load_game(loader: GameLoader) {
+    loader.load(false);
+}
+
+/// System to check for asset changes and hot reload the game
+fn hot_reload_game(loader: GameLoader) {
+    loader.load(true);
+}
diff --git a/src/localization.rs b/src/localization.rs
new file mode 100644
index 0000000000..f5ca4b2345
--- /dev/null
+++ b/src/localization.rs
@@ -0,0 +1,115 @@
+use std::borrow::Borrow;
+
+use bevy::{prelude::*, utils::HashMap};
+use bevy_fluent::{
+    exts::fluent::content::Request, BundleAsset, Content, FluentPlugin, Locale, Localization,
+};
+use fluent::FluentArgs;
+
+/// Plugin for initializing and loading the [`Localization`] resource.
+pub struct LocalizationPlugin;
+
+impl Plugin for LocalizationPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugin(FluentPlugin)
+            .init_resource::<Locale>()
+            .insert_resource(Localization::new());
+
+        app.add_system(load_locales);
+    }
+}
+
+/// Extension trait to reduce boilerplate when getting values from a [`Localization`].
+pub trait LocalizationExt<'a, T: Into<Request<'a, U>>, U: Borrow<FluentArgs<'a>>> {
+    /// Request message content and get an empty string if it doesn't exist.
+    fn get(&self, request: T) -> String;
+}
+
+impl<'a, T, U> LocalizationExt<'a, T, U> for Localization
+where
+    T: Copy + Into<Request<'a, U>> + std::fmt::Debug,
+    U: Borrow<FluentArgs<'a>>,
+{
+    /// Request message content and get an empty string if it doesn't exist.
+    fn get(&self, request: T) -> String {
+        let response = self.content(request);
+
+        if response.is_none() {
+            debug!(
+                "Missing response for {request:?}. \
+                ( Could be normal if localization is still loading )"
+            );
+        }
+
+        response.unwrap_or_default()
+    }
+}
+
+/// Watch for locale [`BundleAsset`] load events and add any new bundles to the [`Localization`]
+/// resource.
+fn load_locales(
+    locale: Res<Locale>,
+    mut loading_bundles: Local<Vec<Handle<BundleAsset>>>,
+    mut localization: ResMut<Localization>,
+    mut events: EventReader<AssetEvent<BundleAsset>>,
+    assets: Res<Assets<BundleAsset>>,
+) {
+    // Whether there was an update that means we need to rebuild the localization
+    let mut should_rebuild_localization = false;
+
+    // We need to reload the localization if our Locale changed
+    if locale.is_changed() {
+        should_rebuild_localization = true;
+    }
+
+    // Collect any previously loading locales that we should try to load again
+    let mut try_to_load = loading_bundles.drain(..).collect::<Vec<_>>();
+
+    // Add any updated or created assets to the list of bundles to try to load
+    for event in events.iter() {
+        match event {
+            AssetEvent::Created { handle } | AssetEvent::Modified { handle } => {
+                try_to_load.push(handle.clone_weak());
+            }
+            _ => (),
+        }
+    }
+
+    // Try to load all bundles that need to be loaded
+    for handle in try_to_load {
+        // If the asset is loaded now
+        if assets.get(&handle).is_some() {
+            // We need to rebuild the localization
+            should_rebuild_localization = true;
+
+        // If it isn't loaded yet
+        } else {
+            // Try to load it next frame
+            loading_bundles.push(handle);
+        }
+    }
+
+    // Rebuild localization if anything was updated
+    if should_rebuild_localization {
+        let mut new_localization = Localization::new();
+
+        // Create map containing the bundles and their handles, indexed by their locale
+        let mut bundles = assets
+            .iter()
+            .map(|(handle_id, asset)| (&asset.locales[0], (handle_id, asset)))
+            .collect::<HashMap<_, _>>();
+
+        // Extract sorted list of locales in a fallback chain
+        let locales = locale.fallback_chain(bundles.keys().cloned());
+
+        // Insert bundles into the localization in sorted order
+        for locale in locales {
+            if let Some((handle_id, bundle)) = bundles.remove(locale) {
+                new_localization.insert(&Handle::weak(handle_id), bundle);
+            }
+        }
+
+        // Update the localization resource
+        *localization = new_localization;
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index b4d31248d9..2ad17b529b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,258 +1,5 @@
-use fishsticks::GamepadContext;
+fn main() {
+    let mut app = jumpy::build_app(None);
 
-use std::env;
-use std::path::PathBuf;
-
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-
-pub mod debug;
-pub mod ecs;
-pub mod editor;
-pub mod effects;
-pub mod events;
-pub mod game;
-mod gui;
-mod items;
-pub mod json;
-pub mod map;
-pub mod network;
-pub mod particles;
-pub mod physics;
-pub mod player;
-pub mod resources;
-pub mod utils;
-
-pub mod drawables;
-
-pub use drawables::*;
-pub use physics::*;
-
-use editor::{Editor, EditorCamera, EditorInputScheme};
-
-use map::{Map, MapLayerKind, MapObjectKind};
-
-use core::network::Api;
-use core::Result;
-
-pub use core::Config;
-pub use items::Item;
-
-pub use events::{dispatch_application_event, ApplicationEvent};
-
-pub use game::{start_music, stop_music, Game, GameCamera};
-
-pub use resources::Resources;
-
-pub use player::PlayerEvent;
-
-pub use ecs::Owner;
-
-use crate::effects::passive::init_passive_effects;
-use crate::game::GameMode;
-use crate::particles::Particles;
-use crate::resources::load_resources;
-pub use effects::{
-    ActiveEffectKind, ActiveEffectMetadata, PassiveEffectInstance, PassiveEffectMetadata,
-};
-
-pub type CollisionWorld = macroquad_platformer::World;
-
-const CONFIG_FILE_ENV_VAR: &str = "JUMPY_CONFIG";
-const ASSETS_DIR_ENV_VAR: &str = "JUMPY_ASSETS";
-const MODS_DIR_ENV_VAR: &str = "JUMPY_MODS";
-
-const WINDOW_TITLE: &str = "Fish Folk: Jumpy";
-
-/// Exit to main menu
-pub fn exit_to_main_menu() {
-    ApplicationEvent::MainMenu.dispatch();
-}
-
-/// Quit to desktop
-pub fn quit_to_desktop() {
-    ApplicationEvent::Quit.dispatch()
-}
-
-/// Reload resources
-pub fn reload_resources() {
-    ApplicationEvent::ReloadResources.dispatch()
-}
-
-fn window_conf() -> Conf {
-    let path = env::var(CONFIG_FILE_ENV_VAR)
-        .map(PathBuf::from)
-        .unwrap_or_else(|_| {
-            #[cfg(debug_assertions)]
-            return PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("config.toml");
-            #[cfg(not(debug_assertions))]
-            return PathBuf::from("./config.toml");
-        });
-
-    let config = Config::load(&path).unwrap();
-
-    storage::store(config.clone());
-
-    Conf {
-        window_title: WINDOW_TITLE.to_owned(),
-        high_dpi: config.window.is_high_dpi,
-        fullscreen: config.window.is_fullscreen,
-        window_width: config.window.width as i32,
-        window_height: config.window.height as i32,
-        ..Default::default()
-    }
-}
-
-/// Returns `true` if the outer game loop should continue;
-#[cfg(not(feature = "ultimate"))]
-async fn init_game() -> Result<bool> {
-    use gui::MainMenuResult;
-
-    match gui::show_main_menu().await {
-        MainMenuResult::LocalGame { map, players } => {
-            let game = Game::new(GameMode::Local, *map, &players)?;
-            scene::add_node(game);
-
-            start_music("fish_tide");
-        }
-        MainMenuResult::Editor {
-            input_scheme,
-            is_new_map,
-        } => {
-            let map_resource = if is_new_map {
-                let res = gui::show_create_map_menu().await?;
-                if res.is_none() {
-                    return Ok(true);
-                }
-
-                res.unwrap()
-            } else {
-                gui::show_select_map_menu().await
-            };
-
-            let position = map_resource.map.get_size() * 0.5;
-
-            scene::add_node(EditorCamera::new(position));
-            scene::add_node(Editor::new(input_scheme, map_resource));
-        }
-        MainMenuResult::ReloadResources => {
-            reload_resources();
-        }
-        MainMenuResult::Credits => {
-            let resources = storage::get::<Resources>();
-            start_music("thanks_for_all_the_fished");
-            gui::show_game_credits(&resources.assets_dir).await;
-            stop_music();
-            return Ok(true);
-        }
-        MainMenuResult::Quit => {
-            quit_to_desktop();
-        }
-    };
-
-    Ok(false)
-}
-
-#[cfg(feature = "ultimate")]
-async fn init_game() -> Result<bool> {
-    use core::input::GameInputScheme;
-    use core::network::Api;
-
-    use crate::player::{PlayerControllerKind, PlayerParams};
-
-    let player_ids = vec!["1".to_string(), "2".to_string()];
-
-    Api::init::<ultimate::UltimateApiBackend>(&player_ids[0], true).await?;
-
-    let (map, mut characters) = {
-        let resources = storage::get::<Resources>();
-
-        let map = resources.maps.first().map(|res| res.map.clone()).unwrap();
-
-        let characters = vec![
-            resources.player_characters.get("pescy").cloned().unwrap(),
-            resources.player_characters.get("sharky").cloned().unwrap(),
-        ];
-
-        (map, characters)
-    };
-
-    let players = vec![
-        PlayerParams {
-            index: 0,
-            controller: PlayerControllerKind::LocalInput(GameInputScheme::KeyboardLeft).into(),
-            character: characters.pop().unwrap(),
-        },
-        PlayerParams {
-            index: 1,
-            controller: PlayerControllerKind::Network(player_ids[1].clone()).into(),
-            character: characters.pop().unwrap(),
-        },
-    ];
-
-    let game = Game::new(GameMode::NetworkHost, map, &players)?;
-    scene::add_node(game);
-
-    start_music("fish_tide");
-
-    Ok(false)
-}
-
-#[macroquad::main(window_conf)]
-async fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
-    use events::iter_events;
-
-    let assets_dir = env::var(ASSETS_DIR_ENV_VAR).unwrap_or_else(|_| "./assets".to_string());
-    let mods_dir = env::var(MODS_DIR_ENV_VAR).unwrap_or_else(|_| "./mods".to_string());
-
-    rand::srand(0);
-
-    load_resources(&assets_dir, &mods_dir).await?;
-
-    {
-        let gamepad_context = fishsticks::GamepadContext::init().unwrap();
-        storage::store(gamepad_context);
-    }
-
-    {
-        let particles = Particles::new();
-        storage::store(particles);
-    }
-
-    init_passive_effects();
-
-    'outer: loop {
-        if init_game().await? {
-            continue 'outer;
-        }
-
-        'inner: loop {
-            #[allow(clippy::never_loop)]
-            for event in iter_events() {
-                match event {
-                    ApplicationEvent::ReloadResources => {
-                        load_resources(&assets_dir, &mods_dir).await?;
-                        break 'inner;
-                    }
-                    ApplicationEvent::MainMenu => break 'inner,
-                    ApplicationEvent::Quit => break 'outer,
-                }
-            }
-
-            {
-                let mut gamepad_context = storage::get_mut::<GamepadContext>();
-                gamepad_context.update()?;
-            }
-
-            next_frame().await;
-        }
-
-        scene::clear();
-
-        stop_music();
-    }
-
-    Api::close().await?;
-
-    Ok(())
+    app.run();
 }
diff --git a/src/map.rs b/src/map.rs
new file mode 100644
index 0000000000..7f4107bf5c
--- /dev/null
+++ b/src/map.rs
@@ -0,0 +1,235 @@
+use bevy::{render::view::RenderLayers, utils::HashSet};
+use bevy_ecs_tilemap::prelude::*;
+use bevy_mod_js_scripting::{ActiveScripts, JsScript};
+use bevy_parallax::ParallaxResource;
+use bevy_prototype_lyon::{prelude::*, shapes::Rectangle};
+
+use crate::{
+    camera::GameRenderLayers,
+    config::ENGINE_CONFIG,
+    metadata::{MapElementMeta, MapLayerKind, MapLayerMeta, MapMeta},
+    name::EntityName,
+    physics::collisions::{CollisionLayerTag, TileCollision},
+    prelude::*,
+};
+
+pub mod grid;
+
+pub struct MapPlugin;
+
+impl Plugin for MapPlugin {
+    fn build(&self, app: &mut App) {
+        if !ENGINE_CONFIG.server_mode {
+            app.add_plugin(TilemapPlugin);
+        }
+
+        app.init_resource::<MapScripts>().add_system(hydrate_maps);
+    }
+}
+
+/// Contains the scripts that have been added for the currently loaded map
+#[derive(Deref, DerefMut, Default)]
+pub struct MapScripts(pub HashSet<Handle<JsScript>>);
+
+/// Marker component for the map grid
+#[derive(Component)]
+pub struct MapGridView;
+
+pub fn hydrate_maps(
+    mut commands: Commands,
+    mut parallax: ResMut<ParallaxResource>,
+    map_assets: Res<Assets<MapMeta>>,
+    windows: Res<Windows>,
+    asset_server: Res<AssetServer>,
+    mut texture_atlas_assets: ResMut<Assets<TextureAtlas>>,
+    element_assets: ResMut<Assets<MapElementMeta>>,
+    mut active_scripts: ResMut<ActiveScripts>,
+    mut map_scripts: ResMut<MapScripts>,
+    unspawned_maps: Query<(Entity, &AssetHandle<MapMeta>), Without<MapMeta>>,
+) {
+    for (map_entity, map_handle) in &unspawned_maps {
+        let map = map_assets.get(map_handle).expect("Map asset not loaded");
+        let grid = GeometryBuilder::build_as(
+            &grid::Grid {
+                grid_size: map.grid_size,
+                tile_size: map.tile_size,
+            },
+            DrawMode::Stroke(StrokeMode::new(Color::rgba(0.8, 0.8, 0.8, 0.25), 0.5)),
+            default(),
+        );
+
+        if !ENGINE_CONFIG.server_mode {
+            let window = windows.primary();
+            *parallax = map.get_parallax_resource();
+            parallax.window_size = Vec2::new(window.width(), window.height());
+            parallax.create_layers(&mut commands, &asset_server, &mut texture_atlas_assets);
+
+            commands.insert_resource(ClearColor(map.background_color.into()));
+        }
+
+        let tilemap_size = TilemapSize {
+            x: map.grid_size.x,
+            y: map.grid_size.y,
+        };
+
+        commands
+            .entity(map_entity)
+            .insert(map.clone())
+            .insert(Name::new("Map"))
+            .insert(map.clone())
+            .insert_bundle(VisibilityBundle::default())
+            .insert_bundle(TransformBundle::default());
+        let mut map_children = Vec::new();
+
+        // Spawn the grid
+        let grid_entity = commands
+            .spawn()
+            .insert(Name::new("Grid"))
+            .insert(MapGridView)
+            .insert_bundle(grid)
+            .insert(RenderLayers::layer(GameRenderLayers::EDITOR))
+            .id();
+        map_children.push(grid_entity);
+
+        // Clear any previously loaded map scripts
+        for script in map_scripts.drain() {
+            active_scripts.remove(&script);
+        }
+
+        // Spawn map layers
+        for (i, layer) in map.layers.iter().enumerate() {
+            let layer: &MapLayerMeta = layer;
+            let layer_id = &layer.id;
+
+            match &layer.kind {
+                MapLayerKind::Tile(tile_layer) => {
+                    let layer_entity = commands
+                        .spawn()
+                        .insert(Name::new(format!("Map Layer: {layer_id}")))
+                        .id();
+                    let mut storage = TileStorage::empty(tilemap_size);
+
+                    let mut tile_entities = Vec::new();
+                    for tile in &tile_layer.tiles {
+                        let tile_pos = TilePos {
+                            x: tile.pos.x,
+                            y: tile.pos.y,
+                        };
+
+                        let half_tile_x = map.tile_size.x as f32 / 2.0;
+                        let half_tile_y = map.tile_size.y as f32 / 2.0;
+                        let mut tile_entity_commands = commands.spawn();
+
+                        tile_entity_commands
+                            .insert(Name::new(format!(
+                                "Map Tile: {}: ( {} x {} )",
+                                layer.id, tile.pos.x, tile.pos.y,
+                            )))
+                            .insert_bundle(TileBundle {
+                                position: tile_pos,
+                                tilemap_id: TilemapId(layer_entity),
+                                texture: TileTexture(tile.idx),
+                                ..default()
+                            })
+                            .insert_bundle(TransformBundle {
+                                local: Transform::from_xyz(
+                                    half_tile_x + map.tile_size.x as f32 * tile_pos.x as f32,
+                                    half_tile_y + map.tile_size.y as f32 * tile_pos.y as f32,
+                                    0.0,
+                                ),
+                                ..default()
+                            });
+
+                        if tile.jump_through {
+                            tile_entity_commands.insert(TileCollision::JumpThrough);
+                        } else {
+                            tile_entity_commands.insert(TileCollision::Solid);
+                        }
+                        let tile_entity = tile_entity_commands.id();
+
+                        storage.set(&tile_pos, Some(tile_entity));
+
+                        tile_entities.push(tile_entity);
+                    }
+
+                    let mut layer_commands = commands.entity(layer_entity);
+
+                    layer_commands
+                        .insert_bundle(TilemapBundle {
+                            grid_size: TilemapGridSize {
+                                x: map.grid_size.x as f32,
+                                y: map.grid_size.y as f32,
+                            },
+                            tile_size: TilemapTileSize {
+                                x: map.tile_size.x as f32,
+                                y: map.tile_size.y as f32,
+                            },
+                            texture: TilemapTexture(tile_layer.tilemap_handle.inner.clone_weak()),
+                            storage,
+                            transform: Transform::from_xyz(0.0, 0.0, -100.0 + i as f32),
+                            ..default()
+                        })
+                        .push_children(&tile_entities);
+
+                    if tile_layer.has_collision {
+                        layer_commands.insert(CollisionLayerTag::default());
+                    }
+
+                    let tile_layer = layer_commands.id();
+
+                    map_children.push(tile_layer);
+                }
+                MapLayerKind::Element(element_layer) => {
+                    for element in &element_layer.elements {
+                        let element_meta =
+                            element_assets.get(&element.element_handle).unwrap().clone();
+                        for script_handle in &element_meta.script_handles {
+                            active_scripts.insert(script_handle.inner.clone_weak());
+                            map_scripts.insert(script_handle.inner.clone_weak());
+                        }
+
+                        let element_name = &element_meta.name;
+
+                        // Note we use NetCommands to spawn the entity, because it needs to have
+                        let entity = commands
+                            .spawn()
+                            .insert(EntityName(format!(
+                                "Map Element ( {layer_id} ): {element_name}"
+                            )))
+                            .insert(Visibility::default())
+                            .insert(ComputedVisibility::default())
+                            .insert(Transform::from_xyz(
+                                element.pos.x,
+                                element.pos.y,
+                                -100.0 + i as f32,
+                            ))
+                            .insert(GlobalTransform::default())
+                            .with_children(|parent| {
+                                parent
+                                    .spawn()
+                                    .insert(Name::new("Map Element Debug Rect"))
+                                    .insert(RenderLayers::layer(GameRenderLayers::EDITOR))
+                                    .insert_bundle(GeometryBuilder::build_as(
+                                        &Rectangle {
+                                            extents: element_meta.editor_size,
+                                            ..default()
+                                        },
+                                        #[allow(const_item_mutation)]
+                                        DrawMode::Stroke(StrokeMode::new(
+                                            *Color::GREEN.set_a(0.5),
+                                            0.5,
+                                        )),
+                                        default(),
+                                    ));
+                            })
+                            .insert(element_meta)
+                            .id();
+                        map_children.push(entity)
+                    }
+                }
+            }
+        }
+
+        commands.entity(map_entity).push_children(&map_children);
+    }
+}
diff --git a/src/map/crab.rs b/src/map/crab.rs
deleted file mode 100644
index 4f9abf20f9..0000000000
--- a/src/map/crab.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-use core::Transform;
-
-use fishsticks::error::Result;
-use hecs::{Entity, With, World};
-use macroquad::{
-    prelude::{collections::storage, Vec2},
-    rand,
-};
-
-use crate::{
-    player::Player, utils::timer::Timer, Animation, CollisionWorld, Drawable, PhysicsBody,
-    PhysicsBodyParams, Resources,
-};
-
-pub const CRAB_TEXTURE_ID: &str = "crab";
-
-const DRAW_ORDER: u32 = 2;
-/// This horizontal distance away from it's spawn point that a crab is comfortable being
-const COMFORTABLE_SPAWN_DISTANCE: f32 = 25.0;
-/// The distance away from "scary stuff" that the crab wants to be
-const COMFORTABLE_SCARY_DISTANCE: f32 = 100.0;
-/// The y difference in position to still consider being as on the same level as the crab
-const SAME_LEVEL_THRESHOLD: f32 = 50.0;
-
-const WALK_SPEED: f32 = 0.5;
-const RUN_SPEED: f32 = 2.5;
-
-pub struct Crab {
-    pub spawn_position: Vec2,
-    pub state: CrabState,
-    pub state_timer: Timer,
-}
-
-#[derive(Debug)]
-pub enum CrabState {
-    /// Standing still for a time
-    Paused,
-    /// Walking in a direction for a time
-    Walking {
-        /// Are we walking left? If false, we are walking right.
-        left: bool,
-    },
-    /// We are running from something we're scared of
-    Running {
-        /// What scared the little crabbie? 🦀
-        scared_of: Entity,
-    },
-}
-
-impl CrabState {
-    fn is_moving(&self) -> bool {
-        matches!(self, CrabState::Walking { .. } | CrabState::Running { .. })
-    }
-}
-
-impl Default for CrabState {
-    fn default() -> Self {
-        CrabState::Paused
-    }
-}
-
-pub fn spawn_crab(world: &mut World, spawn_position: Vec2) -> Result<Entity> {
-    let resources = storage::get::<Resources>();
-    let texture_res = resources.textures.get(CRAB_TEXTURE_ID).unwrap();
-    let size = texture_res.meta.size;
-    let actor = storage::get_mut::<CollisionWorld>().add_actor(
-        spawn_position,
-        size.x as i32,
-        size.y as i32,
-    );
-
-    let crab_animations = &[Animation {
-        id: "idle".to_string(),
-        row: 0,
-        frames: 2,
-        fps: 2,
-        tweens: Default::default(),
-        is_looping: true,
-    }];
-
-    Ok(world.spawn((
-        Crab {
-            spawn_position,
-            state: CrabState::default(),
-            state_timer: Timer::new(1.0),
-        },
-        Transform::from(spawn_position),
-        Drawable::new_animated_sprite(
-            DRAW_ORDER,
-            CRAB_TEXTURE_ID,
-            crab_animations,
-            Default::default(),
-        ),
-        PhysicsBody::new(
-            actor,
-            None,
-            PhysicsBodyParams {
-                size,
-                can_rotate: false,
-                gravity: 0.5,
-                ..Default::default()
-            },
-        ),
-    )))
-}
-
-pub fn update_crabs(world: &mut World) {
-    for (_, (crab, drawable, transform, body)) in world
-        .query::<(&mut Crab, &mut Drawable, &Transform, &mut PhysicsBody)>()
-        .iter()
-    {
-        let transform: &Transform = transform;
-        let drawable: &mut Drawable = drawable;
-        let crab: &mut Crab = crab;
-        let body: &mut PhysicsBody = body;
-
-        let pos = transform.position;
-
-        let rand_bool = |true_bias: u8| rand::gen_range(0u8, 2 + true_bias) > 0;
-        let rand_delay = |min, max| Timer::new(rand::gen_range(min, max));
-
-        let next_scary_thing = || {
-            for (scary_entity, transform) in world.query::<With<Player, &Transform>>().iter() {
-                let scary_pos = transform.position;
-
-                if (pos - scary_pos).length() < COMFORTABLE_SCARY_DISTANCE // If scary thing is too close
-                    && (pos.y - scary_pos.y).abs() < SAME_LEVEL_THRESHOLD
-                // and we're on the same level
-                {
-                    return Some(scary_entity);
-                }
-            }
-
-            None
-        };
-
-        let pick_next_move = || {
-            let x_diff = pos.x - crab.spawn_position.x;
-
-            let pause_bias = if crab.state.is_moving() { 2 } else { 0 };
-            if rand_bool(pause_bias) {
-                (CrabState::Paused, rand_delay(0.2, 0.5))
-            } else {
-                let left = if (x_diff.abs() > COMFORTABLE_SPAWN_DISTANCE) && rand_bool(2) {
-                    x_diff > 0.0
-                } else {
-                    rand_bool(0)
-                };
-                (CrabState::Walking { left }, rand_delay(0.05, 0.75))
-            }
-        };
-
-        crab.state_timer.tick_frame_time();
-
-        // Perform any state transitions
-        if crab.state_timer.has_finished() {
-            if let Some(scared_of) = next_scary_thing() {
-                crab.state = CrabState::Running { scared_of };
-                crab.state_timer = rand_delay(0.3, 0.7);
-            } else {
-                match &crab.state {
-                    CrabState::Paused | CrabState::Walking { .. } => {
-                        let (state, timer) = pick_next_move();
-                        crab.state = state;
-                        crab.state_timer = timer;
-                    }
-                    CrabState::Running { scared_of } => {
-                        let scary_pos = world.get::<Transform>(*scared_of).unwrap().position;
-
-                        if (pos - scary_pos).length() > COMFORTABLE_SCARY_DISTANCE {
-                            if let Some(scared_of) = next_scary_thing() {
-                                crab.state = CrabState::Running { scared_of };
-                                crab.state_timer = rand_delay(0.3, 0.7);
-                            } else {
-                                let (state, timer) = pick_next_move();
-                                crab.state = state;
-                                crab.state_timer = timer;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // Apply any component modifications for the current state
-        let sprite = drawable.get_animated_sprite_mut().unwrap();
-        match &crab.state {
-            CrabState::Paused => {
-                sprite.is_playing = true;
-
-                body.velocity.x = 0.0;
-            }
-            CrabState::Walking { left } => {
-                sprite.is_flipped_x = *left;
-                sprite.is_playing = false;
-
-                let direction = if *left { -1.0 } else { 1.0 };
-                let speed = direction * WALK_SPEED;
-                body.velocity.x = speed;
-            }
-            CrabState::Running { scared_of } => {
-                sprite.is_playing = true;
-
-                let scary_pos = world.get::<Transform>(*scared_of).unwrap().position;
-
-                let direction = (pos.x - scary_pos.x).signum();
-                let speed = direction * RUN_SPEED;
-                body.velocity.x = speed;
-            }
-        }
-    }
-}
diff --git a/src/map/decoration.rs b/src/map/decoration.rs
deleted file mode 100644
index f8dd4adb07..0000000000
--- a/src/map/decoration.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use macroquad::prelude::*;
-
-use hecs::{Entity, World};
-
-use serde::{Deserialize, Serialize};
-
-use crate::{AnimatedSpriteMetadata, Drawable, DrawableKind};
-use core::Transform;
-
-const DECORATION_DRAW_ORDER: u32 = 0;
-
-#[derive(Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct DecorationMetadata {
-    pub id: String,
-    pub sprite: AnimatedSpriteMetadata,
-}
-
-pub struct Decoration {
-    pub id: String,
-}
-
-impl Decoration {
-    pub fn new(id: &str) -> Self {
-        Decoration { id: id.to_string() }
-    }
-}
-
-pub fn spawn_decoration(world: &mut World, position: Vec2, meta: DecorationMetadata) -> Entity {
-    let sprite = meta.sprite.into();
-
-    world.spawn((
-        Decoration::new(&meta.id),
-        Transform::from(position),
-        Drawable {
-            draw_order: DECORATION_DRAW_ORDER,
-            kind: DrawableKind::AnimatedSprite(sprite),
-        },
-    ))
-}
diff --git a/src/map/fish_school.rs b/src/map/fish_school.rs
deleted file mode 100644
index 17256f48c0..0000000000
--- a/src/map/fish_school.rs
+++ /dev/null
@@ -1,370 +0,0 @@
-use core::Transform;
-
-use fishsticks::error::Result;
-use hecs::{Entity, World};
-use macroquad::{
-    prelude::{collections::storage, vec2, Color, Rect, Vec2},
-    rand,
-};
-
-use crate::{
-    player::Player,
-    utils::{ease::Ease, timer::Timer},
-    AnimatedSpriteParams, Animation, Drawable, PhysicsBody, Resources, RigidBody,
-};
-
-/// The texture of the fish school icon ( used in the editor to represent a school of fish )
-pub const FISH_SCHOOL_ICON_TEXTURE_ID: &str = "fish_school_icon";
-
-/// List of fish textures
-const FISH_TEXTURE_IDS: &[&str] = &[
-    "blue_tang",
-    "royal_gramma",
-    "arabian_angelfish",
-    "blue_green_chromis",
-    "banded_butterfly_fish",
-    // "small_fish1",
-    // "small_fish2",
-    // "small_fish3",
-];
-/// The default and most-likely to ocurr number of fish in a school
-const FISH_COUNT_BASE: u32 = 3;
-/// The ammount greater or less than the base number of fish that may spawn
-const FISH_COUNT_RANGE: u32 = 2;
-/// The distance from the spawn point on each axis that the individual fish in the school will be
-/// initially spawned within
-const FISH_SPAWN_RANGE: f32 = 64.0;
-/// The distance that the fish wish to stay within the center of their school
-const TARGET_SCHOOL_SIZE: f32 = 100.0;
-
-/// Minimum draw order
-const DRAW_ORDER_MIN: u32 = 0;
-/// Maximum draw order
-const DRAW_ORDER_MAX: u32 = 100;
-
-/// The color to debug draw school bounds
-const GROUPED_SCHOOL_BOUNDS_DEBUG_DRAW_COLOR: Color = Color {
-    r: 0.0,
-    g: 1.0,
-    b: 0.0,
-    a: 1.0,
-};
-/// The color to debug draw school bounds when the school is not grouped
-const UNGROUPED_SCHOOL_BOUNDS_DEBUG_DRAW_COLOR: Color = Color {
-    r: 1.0,
-    g: 0.0,
-    b: 1.0,
-    a: 1.0,
-};
-
-pub struct FishSchool {
-    pub spawn_pos: Vec2,
-    pub fish_entities: Vec<Entity>,
-}
-
-pub struct Fish {
-    state: FishState,
-    state_timer: Timer,
-}
-
-#[derive(Debug)]
-pub enum FishState {
-    /// Moving to a location
-    Moving { from: Vec2, to: Vec2 },
-}
-
-pub fn spawn_fish_school(world: &mut World, spawn_position: Vec2) -> Result<Entity> {
-    let resources = storage::get::<Resources>();
-    let fish_school_icon_sprite = resources.textures.get(FISH_SCHOOL_ICON_TEXTURE_ID).unwrap();
-    let fish_school_icon_sprite_size = fish_school_icon_sprite.meta.frame_size.unwrap();
-
-    let rand_bool = || rand::gen_range(0u8, 2) == 0;
-
-    let mut fish_count = FISH_COUNT_BASE as i32;
-    if rand_bool() {
-        let sign = if rand_bool() { -1 } else { 1 };
-        for _ in 0..FISH_COUNT_RANGE {
-            if rand_bool() {
-                fish_count = fish_count.saturating_add(sign);
-            }
-        }
-    }
-
-    let mut fish_school = FishSchool {
-        spawn_pos: spawn_position + fish_school_icon_sprite_size / 2.0,
-        fish_entities: Vec::with_capacity(fish_count as usize),
-    };
-    let fish_school_entity = world.reserve_entity();
-
-    let fish_spawn_min = spawn_position;
-    let fish_spawn_max = spawn_position + Vec2::splat(FISH_SPAWN_RANGE);
-
-    for _ in 0..fish_count {
-        let spawn_point = vec2(
-            rand::gen_range(fish_spawn_min.x, fish_spawn_max.x),
-            rand::gen_range(fish_spawn_min.y, fish_spawn_max.y),
-        );
-
-        let texture_index = rand::gen_range(0, FISH_TEXTURE_IDS.len());
-        let texture_id = FISH_TEXTURE_IDS[texture_index];
-
-        let fish_entity = world.spawn((
-            Fish {
-                state: FishState::Moving {
-                    from: spawn_point,
-                    to: spawn_point,
-                },
-                state_timer: Timer::new(rand::gen_range(0.2, 1.0)),
-            },
-            Transform::from(spawn_point),
-            Drawable::new_animated_sprite(
-                rand::gen_range(DRAW_ORDER_MIN, DRAW_ORDER_MAX + 1),
-                texture_id,
-                &[Animation {
-                    id: "default".to_string(),
-                    row: 0,
-                    frames: 4,
-                    fps: 3,
-                    tweens: Default::default(),
-                    is_looping: true,
-                }],
-                AnimatedSpriteParams {
-                    is_flipped_x: rand_bool(),
-                    ..Default::default()
-                },
-            ),
-        ));
-
-        fish_school.fish_entities.push(fish_entity);
-    }
-
-    world.insert_one(fish_school_entity, fish_school).unwrap();
-
-    Ok(fish_school_entity)
-}
-
-pub fn update_fish_schools(world: &mut World) {
-    let mut schools = Vec::new();
-
-    for (_, school) in world.query::<&FishSchool>().iter() {
-        let school: &FishSchool = school;
-
-        let school_info = if let Some(info) = get_school_info(world, school) {
-            info
-        } else {
-            continue;
-        };
-
-        schools.push(school_info);
-    }
-
-    for school in &schools {
-        let school: &SchoolInfo = school;
-
-        let mut collider_rects = world
-            .query::<(&Transform, &PhysicsBody)>()
-            .with::<Player>()
-            .iter()
-            .map(|(_, (transform, body))| body.as_rect(transform.position))
-            .collect::<Vec<_>>();
-
-        collider_rects.extend(
-            world
-                .query::<(&Transform, &RigidBody)>()
-                .iter()
-                .map(|(_, (transform, body))| body.as_rect(transform.position)),
-        );
-
-        for fish_entity in &school.fish_entities {
-            let (mut fish, drawable, transform) = world
-                .query_one_mut::<(&mut Fish, &mut Drawable, &mut Transform)>(*fish_entity)
-                .unwrap();
-            let sprite = drawable.get_animated_sprite_mut().unwrap();
-            let pos: &mut Vec2 = &mut transform.position;
-            let padding = 20.0;
-            let rect = Rect::new(
-                pos.x - padding / 2.0,
-                pos.y - padding / 2.0,
-                sprite.texture.width() + padding,
-                sprite.texture.height() + padding,
-            );
-
-            let mut collides_with = None;
-            for body in &collider_rects {
-                if rect.overlaps(body) {
-                    collides_with = Some(body);
-                    break;
-                }
-            }
-
-            let rand_bool = || rand::gen_range(0u8, 2) > 0;
-            let rand_delay = |min, max| Timer::new(rand::gen_range(min, max));
-
-            let pick_next_move = || {
-                if !school.is_grouped {
-                    let target_point = pos.lerp(school.center, rand::gen_range(0.1, 0.4));
-
-                    (
-                        FishState::Moving {
-                            from: *pos,
-                            to: target_point,
-                        },
-                        rand_delay(0.2, 0.7),
-                    )
-                } else if rand_bool() {
-                    let target_point = vec2(
-                        pos.x + rand::gen_range(-20.0, 20.0),
-                        pos.y + rand::gen_range(-20.0, 20.0),
-                    );
-                    (
-                        FishState::Moving {
-                            from: *pos,
-                            to: target_point,
-                        },
-                        rand_delay(0.5, 1.5),
-                    )
-                } else {
-                    let target_point = pos.lerp(school.spawn_pos, rand::gen_range(0.10, 0.25));
-                    (
-                        FishState::Moving {
-                            from: *pos,
-                            to: target_point,
-                        },
-                        rand_delay(0.5, 1.5),
-                    )
-                }
-            };
-
-            fish.state_timer.tick_frame_time();
-
-            if let Some(collision_rect) = collides_with {
-                let collision_center = collision_rect.point() + collision_rect.size() / 2.0;
-                let diff = *pos - collision_center;
-                fish.state = FishState::Moving {
-                    from: *pos,
-                    to: *pos + diff.normalize() * rand::gen_range(30.0, 60.0),
-                };
-                fish.state_timer = rand_delay(0.2, 0.6);
-
-                // We tick the timer an extra time here to make sure that the fish gets moving
-                // immediately without waiting for an extra frame, because if we keep colliding we
-                // may just keep re-setting the timer and the fish get's stuck until it stops
-                // colliding.
-                fish.state_timer.tick_frame_time();
-            } else if fish.state_timer.has_finished() {
-                let (state, timer) = pick_next_move();
-                fish.state = state;
-                fish.state_timer = timer;
-            }
-
-            match &fish.state {
-                FishState::Moving { from, to } => {
-                    let lerp_progress = Ease {
-                        ease_in: false,
-                        ease_out: true,
-                        function: crate::utils::ease::EaseFunction::Sinusoidial,
-                        progress: fish.state_timer.progress(),
-                    }
-                    .output();
-
-                    sprite.is_flipped_x = from.x > to.x;
-                    sprite.current_frame =
-                        (sprite.animations[0].frames as f32 * lerp_progress).floor() as u32;
-
-                    *pos = from.lerp(*to, lerp_progress);
-                }
-            }
-        }
-    }
-}
-
-pub fn debug_draw_fish_schools(world: &mut World) {
-    for (_, school) in world.query::<&FishSchool>().iter() {
-        let school: &FishSchool = school;
-        let school = if let Some(info) = get_school_info(world, school) {
-            info
-        } else {
-            continue;
-        };
-
-        macroquad::shapes::draw_rectangle_lines(
-            school.bounds_rect.x,
-            school.bounds_rect.y,
-            school.bounds_rect.w,
-            school.bounds_rect.h,
-            1.0,
-            if school.is_grouped {
-                GROUPED_SCHOOL_BOUNDS_DEBUG_DRAW_COLOR
-            } else {
-                UNGROUPED_SCHOOL_BOUNDS_DEBUG_DRAW_COLOR
-            },
-        );
-
-        macroquad::shapes::draw_circle_lines(
-            school.center.x,
-            school.center.y,
-            2.0,
-            1.0,
-            if school.is_grouped {
-                GROUPED_SCHOOL_BOUNDS_DEBUG_DRAW_COLOR
-            } else {
-                UNGROUPED_SCHOOL_BOUNDS_DEBUG_DRAW_COLOR
-            },
-        );
-    }
-}
-
-#[derive(Clone)]
-struct SchoolInfo {
-    spawn_pos: Vec2,
-    center: Vec2,
-    bounds_rect: Rect,
-    is_grouped: bool,
-    fish_entities: Vec<Entity>,
-}
-
-fn get_school_info(world: &World, school: &FishSchool) -> Option<SchoolInfo> {
-    let resources = storage::get::<Resources>();
-    let fish_sprite = resources.textures.get(FISH_TEXTURE_IDS[0]).unwrap();
-    let fish_size = fish_sprite.meta.frame_size.unwrap();
-
-    let fish_transforms = school
-        .fish_entities
-        .iter()
-        .map(|&x| world.get::<Transform>(x).unwrap())
-        .collect::<Vec<_>>();
-
-    if fish_transforms.is_empty() {
-        return None;
-    }
-
-    let mut school_bounds_min = fish_transforms[0].position;
-    let mut school_bounds_max = fish_transforms[0].position;
-
-    for transform in &fish_transforms {
-        let pos: &Vec2 = &transform.position;
-
-        school_bounds_min.x = school_bounds_min.x.min(pos.x);
-        school_bounds_min.y = school_bounds_min.y.min(pos.y);
-        school_bounds_max.x = school_bounds_max.x.max(pos.x + fish_size.x);
-        school_bounds_max.y = school_bounds_max.y.max(pos.y + fish_size.y);
-    }
-    let bounds_rect = Rect::new(
-        school_bounds_min.x,
-        school_bounds_min.y,
-        school_bounds_max.x - school_bounds_min.x,
-        school_bounds_max.y - school_bounds_min.y,
-    );
-
-    let size = school_bounds_max - school_bounds_min;
-    let center = school_bounds_min + size / 2.0;
-    let is_grouped = size.x.max(size.y) < TARGET_SCHOOL_SIZE;
-
-    Some(SchoolInfo {
-        spawn_pos: school.spawn_pos,
-        center,
-        bounds_rect,
-        is_grouped,
-        fish_entities: school.fish_entities.clone(),
-    })
-}
diff --git a/src/map/grid.rs b/src/map/grid.rs
new file mode 100644
index 0000000000..bf5a05d7ab
--- /dev/null
+++ b/src/map/grid.rs
@@ -0,0 +1,33 @@
+use bevy_prototype_lyon::prelude::tess::{
+    geom::{
+        euclid::{Point2D, Size2D},
+        Rect,
+    },
+    path::traits::PathBuilder,
+};
+
+use super::*;
+
+pub struct Grid {
+    pub grid_size: UVec2,
+    pub tile_size: UVec2,
+}
+
+impl Geometry for Grid {
+    fn add_geometry(&self, b: &mut tess::path::path::Builder) {
+        for x in 0..self.grid_size.x {
+            for y in 0..self.grid_size.y {
+                b.add_rectangle(
+                    &Rect {
+                        origin: Point2D::new(
+                            x as f32 * self.tile_size.x as f32,
+                            y as f32 * self.tile_size.y as f32,
+                        ),
+                        size: Size2D::new(self.tile_size.x as f32, self.tile_size.y as f32),
+                    },
+                    tess::path::Winding::Positive,
+                );
+            }
+        }
+    }
+}
diff --git a/src/map/mod.rs b/src/map/mod.rs
deleted file mode 100644
index 5a9682d90c..0000000000
--- a/src/map/mod.rs
+++ /dev/null
@@ -1,772 +0,0 @@
-use std::{collections::HashMap, path::Path};
-
-use macroquad::{color, experimental::collections::storage, prelude::*};
-
-use serde::{Deserialize, Serialize};
-
-mod crab;
-mod decoration;
-mod fish_school;
-mod player_interaction;
-mod sproinger;
-
-pub use crab::*;
-pub use decoration::*;
-pub use fish_school::*;
-pub use player_interaction::*;
-pub use sproinger::*;
-
-use core::math::URect;
-use core::text::ToStringHelper;
-use core::Result;
-
-use crate::{
-    editor::gui::combobox::ComboBoxValue,
-    json::{self, TiledMap},
-    Resources,
-};
-
-/// The ammount of space above the map that the player can be without being killed
-const EXTRA_PLAYABLE_SKY: f32 = 200.0;
-const EXTRA_PLAYABLE_WIDTH: f32 = 400.0;
-
-pub type MapProperty = core::json::GenericParam;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct MapBackgroundLayer {
-    pub texture_id: String,
-    pub depth: f32,
-    #[serde(with = "core::json::vec2_def")]
-    pub offset: Vec2,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(into = "json::MapDef", from = "json::MapDef")]
-pub struct Map {
-    #[serde(
-        default = "Map::default_background_color",
-        with = "core::json::ColorDef"
-    )]
-    pub background_color: Color,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub background_layers: Vec<MapBackgroundLayer>,
-    #[serde(with = "core::json::def_vec2")]
-    pub world_offset: Vec2,
-    #[serde(with = "core::json::def_uvec2")]
-    pub grid_size: UVec2,
-    #[serde(with = "core::json::def_vec2")]
-    pub tile_size: Vec2,
-    pub layers: HashMap<String, MapLayer>,
-    pub tilesets: HashMap<String, MapTileset>,
-    #[serde(skip)]
-    pub draw_order: Vec<String>,
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub properties: HashMap<String, MapProperty>,
-    #[serde(default, with = "core::json::vec2_vec")]
-    pub spawn_points: Vec<Vec2>,
-}
-
-impl Map {
-    pub const PLATFORM_TILE_ATTRIBUTE: &'static str = "jumpthrough";
-
-    // Padding added to colliders for collision checks since the collision system stops movement
-    // before collision is registered, if not.
-    pub const COLLIDER_PADDING: f32 = 8.0;
-
-    const FLATTENED_BACKGROUND_PADDING_X: f32 = 100.0;
-    const FLATTENED_BACKGROUND_PADDING_Y: f32 = 100.0;
-
-    pub fn new(tile_size: Vec2, grid_size: UVec2) -> Self {
-        Map {
-            background_color: Self::default_background_color(),
-            background_layers: Vec::new(),
-            world_offset: Vec2::ZERO,
-            grid_size,
-            tile_size,
-            layers: HashMap::new(),
-            tilesets: HashMap::new(),
-            draw_order: Vec::new(),
-            properties: HashMap::new(),
-            spawn_points: Vec::new(),
-        }
-    }
-
-    pub async fn load<P: AsRef<Path>>(path: P) -> Result<Self> {
-        let path = path.as_ref();
-
-        let bytes = load_file(&path.to_string_helper()).await?;
-        let map = serde_json::from_slice(&bytes).unwrap();
-
-        Ok(map)
-    }
-
-    pub async fn load_tiled<P: AsRef<Path>>(path: P, export_path: Option<P>) -> Result<Self> {
-        let path = path.as_ref();
-
-        let bytes = load_file(&path.to_string_helper()).await?;
-        let tiled_map: TiledMap = serde_json::from_slice(&bytes).unwrap();
-
-        let map = tiled_map.into_map();
-
-        if let Some(export_path) = export_path {
-            map.save(export_path).unwrap();
-        }
-
-        Ok(map)
-    }
-
-    pub fn get_size(&self) -> Vec2 {
-        vec2(
-            self.grid_size.x as f32 * self.tile_size.x,
-            self.grid_size.y as f32 * self.tile_size.y,
-        )
-    }
-
-    /// Get the playable map area.
-    ///
-    /// Any player that doesn't overlap the play area will be killed.
-    pub fn get_playable_area(&self) -> Rect {
-        let size = self.get_size();
-        Rect::new(
-            self.world_offset.x - EXTRA_PLAYABLE_WIDTH / 2.0,
-            self.world_offset.y - EXTRA_PLAYABLE_SKY,
-            size.x + EXTRA_PLAYABLE_WIDTH,
-            size.y + EXTRA_PLAYABLE_SKY,
-        )
-    }
-
-    pub fn contains(&self, position: Vec2) -> bool {
-        let map_size = self.grid_size.as_f32() * self.tile_size;
-        let rect = Rect::new(
-            self.world_offset.x,
-            self.world_offset.y,
-            map_size.x,
-            map_size.y,
-        );
-        rect.contains(position)
-    }
-
-    pub fn to_grid(&self, rect: &Rect) -> URect {
-        let p = self.to_coords(rect.point());
-        let w = ((rect.w / self.tile_size.x) as u32).clamp(0, self.grid_size.x - p.x - 1);
-        let h = ((rect.h / self.tile_size.y) as u32).clamp(0, self.grid_size.y - p.y - 1);
-        URect::new(p.x, p.y, w, h)
-    }
-
-    pub fn to_coords(&self, position: Vec2) -> UVec2 {
-        let x = (((position.x - self.world_offset.x) / self.tile_size.x) as u32)
-            .clamp(0, self.grid_size.x - 1);
-        let y = (((position.y - self.world_offset.y) / self.tile_size.y) as u32)
-            .clamp(0, self.grid_size.y - 1);
-        uvec2(x, y)
-    }
-
-    pub fn to_index(&self, coords: UVec2) -> usize {
-        ((coords.y * self.grid_size.x) + coords.x) as usize
-    }
-
-    pub fn to_position(&self, point: UVec2) -> Vec2 {
-        vec2(
-            (point.x as f32 * self.tile_size.x) + self.world_offset.x,
-            (point.y as f32 * self.tile_size.y) + self.world_offset.y,
-        )
-    }
-
-    pub fn get_tile(&self, layer_id: &str, x: u32, y: u32) -> &Option<MapTile> {
-        let layer = self
-            .layers
-            .get(layer_id)
-            .unwrap_or_else(|| panic!("No layer with id '{}'!", layer_id));
-
-        if x >= self.grid_size.x || y >= self.grid_size.y {
-            return &None;
-        };
-
-        let i = (y * self.grid_size.x + x) as usize;
-        &layer.tiles[i]
-    }
-
-    pub fn get_tiles(&self, layer_id: &str, rect: Option<URect>) -> MapTileIterator {
-        let rect = rect.unwrap_or_else(|| URect::new(0, 0, self.grid_size.x, self.grid_size.y));
-        let layer = self
-            .layers
-            .get(layer_id)
-            .unwrap_or_else(|| panic!("No layer with id '{}'!", layer_id));
-
-        MapTileIterator::new(layer, rect)
-    }
-
-    pub fn get_collisions(&self, collider: &Rect, should_ignore_platforms: bool) -> Vec<Rect> {
-        let collider = Rect::new(
-            collider.x - Self::COLLIDER_PADDING,
-            collider.y - Self::COLLIDER_PADDING,
-            collider.w + Self::COLLIDER_PADDING * 2.0,
-            collider.h + Self::COLLIDER_PADDING * 2.0,
-        );
-
-        let grid = self.to_grid(&Rect::new(
-            collider.x - self.tile_size.x,
-            collider.y - self.tile_size.y,
-            collider.w + self.tile_size.x * 2.0,
-            collider.h + self.tile_size.y * 2.0,
-        ));
-
-        let mut collisions = Vec::new();
-
-        let platform_attr = Self::PLATFORM_TILE_ATTRIBUTE.to_string();
-
-        for layer in self.layers.values() {
-            if layer.is_visible && layer.has_collision {
-                for (x, y, tile) in self.get_tiles(&layer.id, Some(grid)) {
-                    if let Some(tile) = tile {
-                        if !(should_ignore_platforms && tile.attributes.contains(&platform_attr)) {
-                            let tile_position = self.to_position(uvec2(x, y));
-
-                            let tile_rect = Rect::new(
-                                tile_position.x,
-                                tile_position.y,
-                                self.tile_size.x,
-                                self.tile_size.y,
-                            );
-
-                            if tile_rect.overlaps(&collider) {
-                                collisions.push(tile_rect);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        collisions
-    }
-
-    pub fn is_collision_at(&self, position: Vec2, should_ignore_platforms: bool) -> bool {
-        let index = {
-            let coords = self.to_coords(position);
-            self.to_index(coords)
-        };
-
-        for layer in self.layers.values() {
-            if layer.is_visible && layer.has_collision {
-                if let Some(Some(tile)) = layer.tiles.get(index) {
-                    return !(should_ignore_platforms
-                        && tile
-                            .attributes
-                            .contains(&Self::PLATFORM_TILE_ATTRIBUTE.to_string()));
-                }
-            }
-        }
-
-        false
-    }
-
-    fn background_parallax(texture: Texture2D, depth: f32, camera_pos: Vec2) -> Rect {
-        let w = texture.width();
-        let h = texture.height();
-
-        let dest_rect = Rect::new(0., 0., w, h);
-        let parallax_w = w * 0.5;
-
-        let mut dest_rect2 = Rect::new(
-            -parallax_w,
-            -parallax_w,
-            w + parallax_w * 2.,
-            h + parallax_w * 2.,
-        );
-
-        let parallax_x = camera_pos.x / dest_rect.w - 0.3;
-        let parallax_y = camera_pos.y / dest_rect.h * 0.6 - 0.5;
-
-        dest_rect2.x += parallax_w * parallax_x * depth;
-        dest_rect2.y += parallax_w * parallax_y * depth;
-
-        dest_rect2
-    }
-
-    pub fn draw_background(&self, rect: Option<URect>, is_parallax_disabled: bool) {
-        let rect = rect.unwrap_or_else(|| URect::new(0, 0, self.grid_size.x, self.grid_size.y));
-
-        draw_rectangle(
-            self.world_offset.x,
-            self.world_offset.y,
-            rect.w as f32 * self.tile_size.x,
-            rect.h as f32 * self.tile_size.y,
-            self.background_color,
-        );
-
-        let resources = storage::get::<Resources>();
-
-        {
-            let position = scene::camera_pos();
-
-            for layer in &self.background_layers {
-                let texture_res = resources.textures.get(&layer.texture_id).unwrap();
-                let dest_rect = if is_parallax_disabled {
-                    let map_size = self.grid_size.as_f32() * self.tile_size;
-
-                    let width = map_size.x + (Self::FLATTENED_BACKGROUND_PADDING_X * 2.0);
-                    let height = (width / texture_res.meta.size.x) * texture_res.meta.size.y;
-
-                    Rect::new(
-                        self.world_offset.x - Self::FLATTENED_BACKGROUND_PADDING_X,
-                        self.world_offset.y - Self::FLATTENED_BACKGROUND_PADDING_Y,
-                        width,
-                        height,
-                    )
-                } else {
-                    let mut dest_rect =
-                        Self::background_parallax(texture_res.texture, layer.depth, position);
-                    dest_rect.x += layer.offset.x;
-                    dest_rect.y += layer.offset.y;
-                    dest_rect
-                };
-
-                draw_texture_ex(
-                    texture_res.texture,
-                    dest_rect.x,
-                    dest_rect.y,
-                    WHITE,
-                    DrawTextureParams {
-                        dest_size: Some(vec2(dest_rect.w, dest_rect.h)),
-                        ..Default::default()
-                    },
-                )
-            }
-        }
-    }
-
-    /// This will draw the map
-    pub fn draw(&self, rect: Option<URect>, should_draw_background: bool) {
-        if should_draw_background {
-            self.draw_background(rect, false);
-        }
-
-        let rect = rect.unwrap_or_else(|| URect::new(0, 0, self.grid_size.x, self.grid_size.y));
-
-        let mut draw_order = self.draw_order.clone();
-        draw_order.reverse();
-
-        let resources = storage::get::<Resources>();
-        for layer_id in draw_order {
-            if let Some(layer) = self.layers.get(&layer_id) {
-                if layer.is_visible && layer.kind == MapLayerKind::TileLayer {
-                    for (x, y, tile) in self.get_tiles(&layer_id, Some(rect)) {
-                        if let Some(tile) = tile {
-                            let world_position = self.world_offset
-                                + vec2(x as f32 * self.tile_size.x, y as f32 * self.tile_size.y);
-
-                            let texture_entry =
-                                resources.textures.get(&tile.texture_id).unwrap_or_else(|| {
-                                    panic!("No texture with id '{}'!", tile.texture_id)
-                                });
-
-                            draw_texture_ex(
-                                texture_entry.texture,
-                                world_position.x,
-                                world_position.y,
-                                color::WHITE,
-                                DrawTextureParams {
-                                    source: Some(Rect::new(
-                                        tile.texture_coords.x, // + 0.1,
-                                        tile.texture_coords.y, // + 0.1,
-                                        self.tile_size.x,      // - 0.2,
-                                        self.tile_size.y,      // - 0.2,
-                                    )),
-                                    dest_size: Some(vec2(self.tile_size.x, self.tile_size.y)),
-                                    ..Default::default()
-                                },
-                            );
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn get_layer_kind(&self, layer_id: &str) -> Option<MapLayerKind> {
-        if let Some(layer) = self.layers.get(layer_id) {
-            return Some(layer.kind);
-        }
-
-        None
-    }
-
-    pub fn default_background_color() -> Color {
-        Color::new(0.0, 0.0, 0.0, 1.0)
-    }
-
-    #[cfg(any(target_family = "unix", target_family = "windows"))]
-    pub fn save<P: AsRef<Path>>(&self, path: P) -> Result<()> {
-        let json = serde_json::to_string_pretty(self)?;
-        std::fs::write(path, json)?;
-        Ok(())
-    }
-
-    #[cfg(target_family = "wasm")]
-    pub fn save<P: AsRef<Path>>(&self, _: P) -> Result<()> {
-        Ok(())
-    }
-
-    pub fn get_random_spawn_point(&self) -> Vec2 {
-        let i = rand::gen_range(0, self.spawn_points.len());
-        self.spawn_points[i]
-    }
-}
-
-pub struct MapTileIterator<'a> {
-    rect: URect,
-    current: (u32, u32),
-    layer: &'a MapLayer,
-}
-
-impl<'a> MapTileIterator<'a> {
-    fn new(layer: &'a MapLayer, rect: URect) -> Self {
-        let current = (rect.x, rect.y);
-        MapTileIterator {
-            layer,
-            rect,
-            current,
-        }
-    }
-}
-
-impl<'a> Iterator for MapTileIterator<'a> {
-    type Item = (u32, u32, &'a Option<MapTile>);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let next = if self.current.0 + 1 >= self.rect.x + self.rect.w {
-            (self.rect.x, self.current.1 + 1)
-        } else {
-            (self.current.0 + 1, self.current.1)
-        };
-
-        let i = (self.current.1 * self.layer.grid_size.x + self.current.0) as usize;
-        if self.current.1 >= self.rect.y + self.rect.h || i >= self.layer.tiles.len() {
-            return None;
-        }
-
-        let res = Some((self.current.0, self.current.1, &self.layer.tiles[i]));
-
-        self.current = next;
-
-        res
-    }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum MapLayerKind {
-    TileLayer,
-    ObjectLayer,
-}
-
-impl MapLayerKind {
-    pub fn options() -> &'static [&'static str] {
-        &["Tiles", "Objects"]
-    }
-}
-
-impl ComboBoxValue for MapLayerKind {
-    fn get_index(&self) -> usize {
-        match self {
-            Self::TileLayer => 0,
-            Self::ObjectLayer => 1,
-        }
-    }
-
-    fn set_index(&mut self, index: usize) {
-        *self = match index {
-            0 => Self::TileLayer,
-            1 => Self::ObjectLayer,
-            _ => unreachable!(),
-        }
-    }
-
-    fn get_options(&self) -> Vec<String> {
-        Self::options().iter().map(|s| s.to_string()).collect()
-    }
-}
-
-impl Default for MapLayerKind {
-    fn default() -> Self {
-        MapLayerKind::TileLayer
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct MapLayer {
-    pub id: String,
-    pub kind: MapLayerKind,
-    #[serde(default)]
-    pub has_collision: bool,
-    #[serde(with = "core::json::uvec2_def")]
-    pub grid_size: UVec2,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub tiles: Vec<Option<MapTile>>,
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub objects: Vec<MapObject>,
-    #[serde(default)]
-    pub is_visible: bool,
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub properties: HashMap<String, MapProperty>,
-}
-
-impl MapLayer {
-    pub fn new(id: &str, kind: MapLayerKind, has_collision: bool, grid_size: UVec2) -> Self {
-        let has_collision = if kind == MapLayerKind::TileLayer {
-            has_collision
-        } else {
-            false
-        };
-
-        let mut tiles = Vec::new();
-        tiles.resize((grid_size.x * grid_size.y) as usize, None);
-
-        MapLayer {
-            id: id.to_string(),
-            kind,
-            has_collision,
-            tiles,
-            grid_size,
-            ..Default::default()
-        }
-    }
-}
-
-impl Default for MapLayer {
-    fn default() -> Self {
-        MapLayer {
-            id: "".to_string(),
-            has_collision: false,
-            kind: MapLayerKind::TileLayer,
-            grid_size: UVec2::ZERO,
-            tiles: Vec::new(),
-            objects: Vec::new(),
-            is_visible: true,
-            properties: HashMap::new(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct MapTile {
-    pub tile_id: u32,
-    pub tileset_id: String,
-    pub texture_id: String,
-    #[serde(with = "core::json::vec2_def")]
-    pub texture_coords: Vec2,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub attributes: Vec<String>,
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum MapObjectKind {
-    Item,
-    Environment,
-    Decoration,
-}
-
-impl MapObjectKind {
-    const ITEM: &'static str = "item";
-    const ENVIRONMENT: &'static str = "environment";
-    const DECORATION: &'static str = "decoration";
-
-    pub fn options() -> &'static [&'static str] {
-        &["Item", "Environment", "Decoration"]
-    }
-}
-
-impl From<String> for MapObjectKind {
-    fn from(str: String) -> Self {
-        if str == Self::ITEM {
-            Self::Item
-        } else if str == Self::ENVIRONMENT {
-            Self::Environment
-        } else if str == Self::DECORATION {
-            Self::Decoration
-        } else {
-            let str = if str.is_empty() {
-                "NO_OBJECT_TYPE"
-            } else {
-                &str
-            };
-
-            unreachable!("Invalid MapObjectKind '{}'", str)
-        }
-    }
-}
-
-impl From<MapObjectKind> for String {
-    fn from(kind: MapObjectKind) -> String {
-        match kind {
-            MapObjectKind::Item => MapObjectKind::ITEM.to_string(),
-            MapObjectKind::Environment => MapObjectKind::ENVIRONMENT.to_string(),
-            MapObjectKind::Decoration => MapObjectKind::DECORATION.to_string(),
-        }
-    }
-}
-
-impl ComboBoxValue for MapObjectKind {
-    fn get_index(&self) -> usize {
-        match self {
-            Self::Item => 0,
-            Self::Environment => 1,
-            Self::Decoration => 2,
-        }
-    }
-
-    fn set_index(&mut self, index: usize) {
-        *self = match index {
-            0 => Self::Item,
-            1 => Self::Environment,
-            2 => Self::Decoration,
-            _ => unreachable!(),
-        }
-    }
-
-    fn get_options(&self) -> Vec<String> {
-        Self::options().iter().map(|s| s.to_string()).collect()
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct MapObject {
-    pub id: String,
-    pub kind: MapObjectKind,
-    #[serde(with = "core::json::vec2_def")]
-    pub position: Vec2,
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub properties: HashMap<String, MapProperty>,
-}
-
-impl MapObject {
-    pub fn new(id: &str, kind: MapObjectKind, position: Vec2) -> Self {
-        MapObject {
-            id: id.to_string(),
-            kind,
-            position,
-            properties: HashMap::new(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct MapTileset {
-    pub id: String,
-    pub texture_id: String,
-    #[serde(with = "core::json::uvec2_def")]
-    pub texture_size: UVec2,
-    #[serde(with = "core::json::vec2_def")]
-    pub tile_size: Vec2,
-    #[serde(with = "core::json::uvec2_def")]
-    pub grid_size: UVec2,
-    pub first_tile_id: u32,
-    pub tile_cnt: u32,
-    #[serde(
-        default = "MapTileset::default_tile_subdivisions",
-        with = "core::json::uvec2_def"
-    )]
-    pub tile_subdivisions: UVec2,
-    pub autotile_mask: Vec<bool>,
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub tile_attributes: HashMap<u32, Vec<String>>,
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub properties: HashMap<String, MapProperty>,
-    #[serde(skip)]
-    pub bitmasks: Option<Vec<u32>>,
-}
-
-impl MapTileset {
-    pub fn new(
-        id: &str,
-        texture_id: &str,
-        texture_size: UVec2,
-        tile_size: Vec2,
-        first_tile_id: u32,
-    ) -> Self {
-        let grid_size = uvec2(
-            texture_size.x / tile_size.x as u32,
-            texture_size.y / tile_size.y as u32,
-        );
-
-        let tile_subdivisions = Self::default_tile_subdivisions();
-
-        let subtile_grid_size = grid_size * tile_subdivisions;
-
-        let subtile_cnt = (subtile_grid_size.x * subtile_grid_size.y) as usize;
-
-        let mut autotile_mask = vec![];
-        autotile_mask.resize(subtile_cnt, false);
-
-        MapTileset {
-            id: id.to_string(),
-            texture_id: texture_id.to_string(),
-            texture_size,
-            tile_size,
-            grid_size,
-            first_tile_id,
-            tile_cnt: grid_size.x * grid_size.y,
-            tile_subdivisions,
-            autotile_mask,
-            tile_attributes: HashMap::new(),
-            properties: HashMap::new(),
-            bitmasks: None,
-        }
-    }
-
-    pub fn get_texture_coords(&self, tile_id: u32) -> Vec2 {
-        let x = (tile_id % self.grid_size.x) as f32 * self.tile_size.x;
-        let y = (tile_id / self.grid_size.x) as f32 * self.tile_size.y;
-        vec2(x, y)
-    }
-
-    pub fn default_tile_subdivisions() -> UVec2 {
-        uvec2(3, 3)
-    }
-
-    pub fn get_bitmasks(&self) -> Option<Vec<u32>> {
-        //Get autotile mask bitmasks
-        let tsub_x = self.tile_subdivisions.x as usize;
-        let tsub_y = self.tile_subdivisions.y as usize;
-        let atmsk_width = self.grid_size.x as usize * tsub_x;
-
-        let mut bitmasks_vec: Vec<Vec<bool>> =
-            vec![vec![]; self.autotile_mask.len() / (tsub_x * tsub_y)];
-        let mut bitmasks: Vec<u32> = vec![0; self.autotile_mask.len() / (tsub_x * tsub_y)];
-
-        let mut trow_off = 0;
-        for i in 0..self.autotile_mask.len() / atmsk_width {
-            if i != 0 && i % tsub_y == 0 {
-                trow_off += atmsk_width / tsub_x;
-            }
-            let row = self.autotile_mask[i * atmsk_width..i * atmsk_width + atmsk_width].to_vec();
-
-            for x in 0..row.len() / tsub_x {
-                let tile_row = row[x * tsub_x..x * tsub_x + tsub_x].to_vec();
-
-                bitmasks_vec[x + trow_off].extend(tile_row);
-            }
-        }
-
-        for (n, surrounding_tiles) in bitmasks_vec.iter().enumerate() {
-            for (i, b) in surrounding_tiles.iter().enumerate() {
-                if *b && i < 4 {
-                    bitmasks[n] += 2_u32.pow(i as u32);
-                } else if *b && i > 4 {
-                    bitmasks[n] += 2_u32.pow(i as u32 - 1);
-                }
-            }
-        }
-        Some(bitmasks)
-    }
-}
diff --git a/src/map/player_interaction.rs b/src/map/player_interaction.rs
deleted file mode 100644
index 1c1ea7a075..0000000000
--- a/src/map/player_interaction.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use core::Transform;
-
-use hecs::{Entity, World};
-use macroquad::prelude::collections::storage;
-
-use crate::{
-    items::{RespawnInfo, RespawningItem, RespawningItemKind, Weapon},
-    player::{Player, PlayerState},
-    utils::timer::Timer,
-    Item, PhysicsBody,
-};
-
-use super::Map;
-
-pub fn update_map_kill_zone(world: &mut World) {
-    let map = storage::get::<Map>();
-
-    // Kill players out of bounds
-    for (_, (player, transform, body)) in world
-        .query::<(&mut Player, &Transform, &PhysicsBody)>()
-        .iter()
-    {
-        let player: &mut Player = player;
-        let transform: &Transform = transform;
-        let body: &PhysicsBody = body;
-
-        let player_rect = body.as_rect(transform.position);
-
-        if !map.get_playable_area().overlaps(&player_rect) {
-            player.state = PlayerState::Dead;
-        }
-    }
-
-    struct ToDestroy {
-        entity: Entity,
-        respawn_info: Option<RespawnInfo>,
-    }
-    let mut to_destroy = Vec::new();
-
-    // Despawn items out of bounds
-    for (entity, (item, transform, body)) in world
-        .query::<(&mut Item, &Transform, &PhysicsBody)>()
-        .iter()
-    {
-        let item: &mut Item = item;
-        let transform: &Transform = transform;
-        let body: &PhysicsBody = body;
-
-        let item_rect = body.as_rect(transform.position);
-
-        if !map.get_playable_area().overlaps(&item_rect) {
-            to_destroy.push(ToDestroy {
-                entity,
-                respawn_info: item.respawn_info,
-            })
-        }
-    }
-
-    // Despawn weapons out of bounds
-    for (entity, (weapon, transform, body)) in world
-        .query::<(&mut Weapon, &Transform, &PhysicsBody)>()
-        .iter()
-    {
-        let weapon: &mut Weapon = weapon;
-        let transform: &Transform = transform;
-        let body: &PhysicsBody = body;
-
-        let item_rect = body.as_rect(transform.position);
-
-        if !map.get_playable_area().overlaps(&item_rect) {
-            to_destroy.push(ToDestroy {
-                entity,
-                respawn_info: weapon.respawn_info,
-            })
-        }
-    }
-
-    for to_destroy in to_destroy {
-        let entity = to_destroy.entity;
-
-        if let Some(respawn_info) = to_destroy.respawn_info {
-            if let Ok(weapon) = world.remove_one::<Weapon>(entity) {
-                world
-                    .insert_one(
-                        entity,
-                        RespawningItem {
-                            timer: Timer::new(respawn_info.respawn_delay),
-                            info: respawn_info,
-                            kind: RespawningItemKind::Weapon(weapon),
-                        },
-                    )
-                    .unwrap();
-            } else if let Ok(item) = world.remove_one::<Item>(entity) {
-                world
-                    .insert_one(
-                        entity,
-                        RespawningItem {
-                            timer: Timer::new(respawn_info.respawn_delay),
-                            info: respawn_info,
-                            kind: RespawningItemKind::Item(item),
-                        },
-                    )
-                    .unwrap();
-            }
-        } else if let Err(err) = world.despawn(entity) {
-            #[cfg(debug_assertions)]
-            println!("WARNING: {}", err);
-        }
-    }
-}
diff --git a/src/map/sproinger.rs b/src/map/sproinger.rs
deleted file mode 100644
index fe0235e3b7..0000000000
--- a/src/map/sproinger.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use macroquad::prelude::*;
-use std::collections::HashMap;
-
-use hecs::{Entity, World};
-
-use core::Result;
-use core::Transform;
-
-use crate::game::play_sound_effect;
-use crate::{Animation, Drawable, PhysicsBody, QueuedAnimationAction};
-
-const SPROINGER_DRAW_ORDER: u32 = 2;
-
-const TEXTURE_ID: &str = "sproinger";
-
-const IDLE_ANIMATION_ID: &str = "idle";
-const EXPAND_ANIMATION_ID: &str = "expand";
-const CONTRACT_ANIMATION_ID: &str = "contract";
-
-const SOUND_EFFECT_ID: &str = "jump";
-
-const COOLDOWN: f32 = 0.75;
-
-const TRIGGER_WIDTH: f32 = 32.0;
-const TRIGGER_HEIGHT: f32 = 8.0;
-
-const FORCE: f32 = 25.0;
-
-#[derive(Default)]
-pub struct Sproinger {
-    pub cooldown_timer: f32,
-}
-
-impl Sproinger {
-    pub fn new() -> Self {
-        Sproinger {
-            cooldown_timer: COOLDOWN,
-        }
-    }
-}
-
-pub fn spawn_sproinger(world: &mut World, position: Vec2) -> Result<Entity> {
-    let animations = &[
-        Animation {
-            id: IDLE_ANIMATION_ID.to_string(),
-            row: 0,
-            frames: 1,
-            fps: 1,
-            tweens: HashMap::new(),
-            is_looping: false,
-        },
-        Animation {
-            id: EXPAND_ANIMATION_ID.to_string(),
-            row: 1,
-            frames: 2,
-            fps: 8,
-            tweens: HashMap::new(),
-            is_looping: false,
-        },
-        Animation {
-            id: CONTRACT_ANIMATION_ID.to_string(),
-            row: 2,
-            frames: 2,
-            fps: 4,
-            tweens: HashMap::new(),
-            is_looping: false,
-        },
-    ];
-
-    let entity = world.spawn((
-        Sproinger::new(),
-        Transform::from(position),
-        Drawable::new_animated_sprite(
-            SPROINGER_DRAW_ORDER,
-            TEXTURE_ID,
-            animations,
-            Default::default(),
-        ),
-    ));
-
-    Ok(entity)
-}
-
-pub fn fixed_update_sproingers(world: &mut World) {
-    let dt = get_frame_time();
-
-    let bodies = world
-        .query::<(&Transform, &PhysicsBody)>()
-        .iter()
-        .filter_map(|(e, (transform, body))| {
-            if !body.is_deactivated {
-                Some((e, body.as_rect(transform.position)))
-            } else {
-                None
-            }
-        })
-        .collect::<Vec<_>>();
-
-    let mut to_be_sproinged = Vec::new();
-
-    'sproingers: for (_, (sproinger, transform, drawable)) in
-        world.query_mut::<(&mut Sproinger, &Transform, &mut Drawable)>()
-    {
-        sproinger.cooldown_timer += dt;
-
-        if sproinger.cooldown_timer >= COOLDOWN {
-            let sprite = drawable.get_animated_sprite_mut().unwrap();
-            sprite.set_animation(IDLE_ANIMATION_ID, true);
-
-            let position = transform.position - (sprite.frame_size / 2.0);
-
-            let trigger_rect = Rect::new(position.x, position.y, TRIGGER_WIDTH, TRIGGER_HEIGHT);
-
-            for (e, rect) in &bodies {
-                if trigger_rect.overlaps(rect) {
-                    to_be_sproinged.push(*e);
-
-                    sproinger.cooldown_timer = 0.0;
-
-                    sprite.set_animation(EXPAND_ANIMATION_ID, true);
-                    sprite.queue_action(QueuedAnimationAction::Play(
-                        CONTRACT_ANIMATION_ID.to_string(),
-                    ));
-
-                    play_sound_effect(SOUND_EFFECT_ID, 1.0);
-
-                    continue 'sproingers;
-                }
-            }
-        }
-    }
-
-    for entity in to_be_sproinged {
-        if let Ok(mut body) = world.get_mut::<PhysicsBody>(entity) {
-            body.velocity.y = -FORCE;
-        }
-    }
-}
diff --git a/src/metadata.rs b/src/metadata.rs
new file mode 100644
index 0000000000..592eb20e63
--- /dev/null
+++ b/src/metadata.rs
@@ -0,0 +1,110 @@
+//! Data structures for things like assets and settings that can be serialized and deserialized.
+
+use crate::prelude::*;
+
+use bevy::{reflect::TypeUuid, utils::HashMap};
+use bevy_has_load_progress::HasLoadProgress;
+use bevy_mod_js_scripting::JsScript;
+
+mod localization;
+mod map;
+mod player;
+mod settings;
+mod ui;
+
+pub use localization::*;
+pub use map::*;
+pub use player::*;
+pub use settings::*;
+pub use ui::*;
+
+pub struct MetadataPlugin;
+
+impl Plugin for MetadataPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugin(MapMetadataPlugin)
+            .add_plugin(PlayerMetadataPlugin);
+    }
+}
+
+#[derive(HasLoadProgress, TypeUuid, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+#[uuid = "b14f1630-64d0-4bb7-ba3d-e7b83f8a7f62"]
+pub struct GameMeta {
+    pub players: Vec<String>,
+    #[serde(skip)]
+    pub player_handles: Vec<AssetHandle<player::PlayerMeta>>,
+    pub maps: Vec<String>,
+    #[serde(skip)]
+    pub map_handles: Vec<AssetHandle<map::MapMeta>>,
+    pub clear_color: ui::ColorMeta,
+    pub camera_height: u32,
+    pub translations: localization::TranslationsMeta,
+    pub ui_theme: ui::UIThemeMeta,
+    pub main_menu: MainMenuMeta,
+    pub default_settings: settings::Settings,
+    pub physics: PhysicsMeta,
+
+    /// Scripts that run on both the server and the client
+    #[serde(default)]
+    pub scripts: Vec<String>,
+    #[serde(skip)]
+    pub script_handles: Vec<AssetHandle<JsScript>>,
+
+    /// Scripts that run only on the client
+    #[serde(default)]
+    pub client_scripts: Vec<String>,
+    #[serde(skip)]
+    pub client_script_handles: Vec<AssetHandle<JsScript>>,
+
+    /// Scripts that run only on the server
+    #[serde(default)]
+    pub server_scripts: Vec<String>,
+    #[serde(skip)]
+    pub server_script_handles: Vec<AssetHandle<JsScript>>,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct PhysicsMeta {
+    pub terminal_velocity: f32,
+    pub friction_lerp: f32,
+    pub stop_threshold: f32,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct MainMenuMeta {
+    pub title_font: FontMeta,
+    pub subtitle_font: FontMeta,
+    pub background_image: ImageMeta,
+    pub menu_width: f32,
+    // pub music: String,
+    // #[serde(skip)]
+    // pub music_handle: Handle<AudioSource>,
+}
+
+#[derive(HasLoadProgress, Deserialize, Serialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct ImageMeta {
+    pub image: String,
+    pub image_size: Vec2,
+    #[serde(skip)]
+    pub image_handle: AssetHandle<Image>,
+    /// Egui texture ID may not be valid on all [`ImageMeta`] unless it is added to the egui context
+    /// during game load.
+    #[serde(skip)]
+    pub egui_texture_id: bevy_egui::egui::TextureId,
+}
+
+#[derive(Deserialize, Serialize, Clone, Debug)]
+pub struct TextureAtlasMeta {
+    pub image: String,
+    pub tile_size: Vec2,
+    pub columns: usize,
+    pub rows: usize,
+    #[serde(default)]
+    pub padding: Vec2,
+    #[serde(default)]
+    pub offset: Vec2,
+}
diff --git a/src/metadata/localization.rs b/src/metadata/localization.rs
new file mode 100644
index 0000000000..2d96c83a46
--- /dev/null
+++ b/src/metadata/localization.rs
@@ -0,0 +1,21 @@
+use bevy_fluent::BundleAsset;
+use unic_langid::LanguageIdentifier;
+
+use super::*;
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct TranslationsMeta {
+    /// The locale setting detected on the user's system
+    #[serde(skip)]
+    #[has_load_progress(none)]
+    pub detected_locale: LanguageIdentifier,
+    /// The default locale that will be used if a message is not found in the user's selected locale
+    #[has_load_progress(none)]
+    pub default_locale: LanguageIdentifier,
+    /// Paths to the locale resources to load
+    pub locales: Vec<String>,
+    /// The handles to the locale bundle assets
+    #[serde(skip)]
+    pub locale_handles: Vec<AssetHandle<BundleAsset>>,
+}
diff --git a/src/metadata/map.rs b/src/metadata/map.rs
new file mode 100644
index 0000000000..24406fda1e
--- /dev/null
+++ b/src/metadata/map.rs
@@ -0,0 +1,194 @@
+use crate::animation::AnimatedSprite;
+
+use super::*;
+
+use bevy::reflect::FromReflect;
+use bevy_parallax::{LayerData as ParallaxLayerData, ParallaxResource};
+
+pub struct MapMetadataPlugin;
+
+impl Plugin for MapMetadataPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<MapMeta>()
+            .register_type::<Vec<String>>()
+            .register_type::<HashMap<String, AnimatedSprite>>()
+            .register_type::<MapElementMeta>();
+    }
+}
+
+#[derive(
+    Reflect, Component, HasLoadProgress, TypeUuid, Deserialize, Serialize, Clone, Debug, Default,
+)]
+#[reflect(Component, Default)]
+#[serde(deny_unknown_fields)]
+#[uuid = "8ede98c2-4f17-46f2-bcc5-ae0dc63b2137"]
+pub struct MapMeta {
+    pub name: String,
+    /// The parallax background layers
+    #[serde(default)]
+    pub background_layers: Vec<ParallaxLayerMeta>,
+    /// The background color of the map, behind the parallax layers
+    pub background_color: ColorMeta,
+    /// Size of the map in tiles
+    pub grid_size: UVec2,
+    /// The size of the tiles in pixels
+    pub tile_size: UVec2,
+    /// The layers of the map
+    pub layers: Vec<MapLayerMeta>,
+}
+
+impl MapMeta {
+    #[allow(unused)] // Until we use it
+    pub fn get_parallax_resource(&self) -> ParallaxResource {
+        ParallaxResource::new(
+            self.background_layers
+                .iter()
+                .cloned()
+                .map(Into::into)
+                .collect(),
+        )
+    }
+}
+
+#[derive(Reflect, FromReflect, HasLoadProgress, Deserialize, Serialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct MapLayerMeta {
+    pub id: String,
+    pub kind: MapLayerKind,
+    #[serde(skip)]
+    pub entity: Option<Entity>,
+}
+
+#[derive(Reflect, FromReflect, Deserialize, Serialize, Clone, Debug)]
+#[reflect_value(Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+#[serde(rename_all = "snake_case")]
+pub enum MapLayerKind {
+    Tile(MapTileLayer),
+    Element(MapElementLayer),
+}
+
+impl HasLoadProgress for MapLayerKind {
+    fn load_progress(
+        &self,
+        loading_resources: &bevy_has_load_progress::LoadingResources,
+    ) -> bevy_has_load_progress::LoadProgress {
+        match self {
+            MapLayerKind::Tile(tile_layer) => tile_layer.load_progress(loading_resources),
+            MapLayerKind::Element(element_layer) => element_layer.load_progress(loading_resources),
+        }
+    }
+}
+
+#[derive(Reflect, HasLoadProgress, Deserialize, Serialize, Clone, Debug, Default)]
+#[serde(deny_unknown_fields)]
+pub struct MapTileLayer {
+    pub tilemap: String,
+    #[serde(skip)]
+    pub tilemap_handle: AssetHandle<Image>,
+    pub has_collision: bool,
+    pub tiles: Vec<MapTileMeta>,
+}
+
+#[derive(HasLoadProgress, Deserialize, Serialize, Clone, Debug, Default)]
+#[serde(deny_unknown_fields)]
+pub struct MapElementLayer {
+    pub elements: Vec<MapElementSpawn>,
+}
+
+#[derive(HasLoadProgress, Deserialize, Serialize, Clone, Debug, Default)]
+#[serde(deny_unknown_fields)]
+pub struct MapElementSpawn {
+    pub pos: Vec2,
+    pub element: String,
+    #[serde(skip)]
+    pub element_handle: AssetHandle<MapElementMeta>,
+}
+
+#[derive(Reflect, FromReflect, HasLoadProgress, Deserialize, Serialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct MapTileMeta {
+    pub pos: UVec2,
+    pub idx: u32,
+    #[serde(default)]
+    pub jump_through: bool,
+}
+
+#[derive(Reflect, FromReflect, HasLoadProgress, Deserialize, Serialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+#[serde(default)]
+pub struct ParallaxLayerMeta {
+    pub speed: f32,
+    pub image: String,
+    #[serde(skip)]
+    pub image_handle: AssetHandle<Image>,
+    pub tile_size: Vec2,
+    pub cols: usize,
+    pub rows: usize,
+    pub scale: f32,
+    pub z: f32,
+    pub transition_factor: f32,
+    pub position: Vec2,
+}
+
+impl Default for ParallaxLayerMeta {
+    fn default() -> Self {
+        Self {
+            speed: default(),
+            image: default(),
+            image_handle: default(),
+            tile_size: default(),
+            cols: 1,
+            rows: 1,
+            scale: 1.0,
+            z: default(),
+            transition_factor: 1.0,
+            position: default(),
+        }
+    }
+}
+
+impl From<ParallaxLayerMeta> for ParallaxLayerData {
+    fn from(meta: ParallaxLayerMeta) -> Self {
+        Self {
+            speed: meta.speed,
+            path: meta.image,
+            tile_size: meta.tile_size,
+            cols: meta.cols,
+            rows: meta.rows,
+            scale: meta.scale,
+            z: meta.z,
+            transition_factor: meta.transition_factor,
+            position: meta.position,
+        }
+    }
+}
+
+#[derive(
+    Reflect, Component, HasLoadProgress, TypeUuid, Deserialize, Serialize, Clone, Debug, Default,
+)]
+#[reflect(Default, Component)]
+#[serde(deny_unknown_fields)]
+#[uuid = "0a4a0cc6-ee52-4b0d-a88b-871c49a06622"]
+pub struct MapElementMeta {
+    pub name: String,
+    pub category: String,
+    pub scripts: Vec<String>,
+
+    /// The size of the bounding rect for the element in the editor
+    #[serde(default = "editor_size_default")]
+    pub editor_size: Vec2,
+
+    #[serde(skip)]
+    pub script_handles: Vec<AssetHandle<JsScript>>,
+    /// Assets that should be pre-loaded by the game before starting
+    #[serde(default)]
+    pub preload_assets: Vec<String>,
+    #[serde(skip)]
+    #[reflect(ignore)]
+    pub preload_asset_handles: Vec<HandleUntyped>,
+}
+
+fn editor_size_default() -> Vec2 {
+    Vec2::splat(16.0)
+}
diff --git a/src/metadata/player.rs b/src/metadata/player.rs
new file mode 100644
index 0000000000..047b0705d3
--- /dev/null
+++ b/src/metadata/player.rs
@@ -0,0 +1,128 @@
+use std::ops::Range;
+
+use bevy::reflect::FromReflect;
+use serde::{de::SeqAccess, Deserializer};
+
+use crate::animation::{AnimatedSprite, AnimationBank, AnimationBankSprite};
+
+use super::*;
+
+pub struct PlayerMetadataPlugin;
+
+impl Plugin for PlayerMetadataPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<PlayerMeta>();
+    }
+}
+
+#[derive(Reflect, TypeUuid, Deserialize, Clone, Debug, Component)]
+#[serde(deny_unknown_fields)]
+#[uuid = "a939278b-901a-47d4-8ee8-6ac97881cf4d"]
+pub struct PlayerMeta {
+    pub name: String,
+    pub spritesheet: PlayerSpritesheetMeta,
+}
+
+#[derive(Reflect, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct PlayerSpritesheetMeta {
+    pub image: String,
+    #[serde(skip)]
+    pub atlas_handle: AssetHandle<TextureAtlas>,
+    #[serde(skip)]
+    #[reflect(ignore)]
+    pub egui_texture_id: bevy_egui::egui::TextureId,
+    pub tile_size: UVec2,
+    pub columns: usize,
+    pub rows: usize,
+    pub animation_fps: f32,
+    pub animations: HashMap<String, AnimationClip>,
+}
+
+impl PlayerSpritesheetMeta {
+    pub fn get_animation_bank_and_sprite(&self) -> (AnimationBank, AnimationBankSprite) {
+        let animations = self
+            .animations
+            .clone()
+            .into_iter()
+            .map(|(name, clip)| {
+                (
+                    name,
+                    AnimatedSprite {
+                        start: clip.frames.start,
+                        end: clip.frames.end,
+                        atlas: self.atlas_handle.inner.clone_weak(),
+                        flip_x: false,
+                        flip_y: false,
+                        repeat: clip.repeat,
+                        fps: self.animation_fps,
+                        timer: Timer::from_seconds(1.0 / self.animation_fps, true),
+                        index: 0,
+                    },
+                )
+            })
+            .collect();
+
+        (
+            AnimationBank {
+                animations,
+                last_animation: default(),
+            },
+            AnimationBankSprite {
+                current_animation: self.animations.keys().next().cloned().unwrap_or_default(),
+                flip_x: false,
+                flip_y: false,
+            },
+        )
+    }
+}
+
+#[derive(Reflect, FromReflect, serde::Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct AnimationClip {
+    #[serde(deserialize_with = "deserialize_range_from_array")]
+    pub frames: Range<usize>,
+    #[serde(default)]
+    pub repeat: bool,
+}
+
+fn deserialize_range_from_array<'de, D>(de: D) -> Result<Range<usize>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    de.deserialize_tuple(2, RangeVisitor)
+}
+
+struct RangeVisitor;
+
+impl<'de> serde::de::Visitor<'de> for RangeVisitor {
+    type Value = Range<usize>;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("A sequence of 2 integers")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+    where
+        A: SeqAccess<'de>,
+    {
+        let start: usize = if let Some(start) = seq.next_element()? {
+            start
+        } else {
+            return Err(serde::de::Error::invalid_length(
+                0,
+                &"a sequence with a length of 2",
+            ));
+        };
+        let end: usize = if let Some(end) = seq.next_element()? {
+            end
+        } else {
+            return Err(serde::de::Error::invalid_length(
+                1,
+                &"a sequence with a length of 2",
+            ));
+        };
+
+        Ok(start..end)
+    }
+}
diff --git a/src/metadata/settings.rs b/src/metadata/settings.rs
new file mode 100644
index 0000000000..12bf384d6d
--- /dev/null
+++ b/src/metadata/settings.rs
@@ -0,0 +1,83 @@
+use std::borrow::Cow;
+
+use bevy::prelude::Gamepad;
+use bevy_has_load_progress::HasLoadProgress;
+use leafwing_input_manager::{axislike::VirtualDPad, prelude::InputMap, user_input::InputKind};
+use serde::{Deserialize, Serialize};
+
+use crate::{platform::Storage, player::input::PlayerAction};
+
+use super::GameMeta;
+
+/// Global settings, stored and accessed through [`crate::platform::Storage`]
+#[derive(HasLoadProgress, Deserialize, Serialize, Debug, Clone)]
+#[has_load_progress(none)]
+pub struct Settings {
+    /// The player controller bindings
+    pub player_controls: PlayerControlMethods,
+    /// The address of the matchmaking server to connect to for online games.
+    pub matchmaking_server: String,
+}
+
+impl Settings {
+    /// The key used to store the settings in the [`crate::platform::Storage`] resource.
+    pub const STORAGE_KEY: &'static str = "settings";
+
+    pub fn get_stored_or_default<'w>(
+        game: &'w GameMeta,
+        storage: &'w mut Storage,
+    ) -> Cow<'w, Self> {
+        if let Some(settings) = storage.get::<Self>(Self::STORAGE_KEY) {
+            Cow::Owned(settings)
+        } else {
+            Cow::Borrowed(&game.default_settings)
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize, Clone, Debug)]
+pub struct PlayerControlMethods {
+    /// Controls for game remotes
+    pub gamepad: PlayerControls,
+    /// Controls for keyboard player 1
+    pub keyboard1: PlayerControls,
+    /// Controls for keyboard player 2
+    pub keyboard2: PlayerControls,
+}
+
+impl PlayerControlMethods {
+    /// Get the input map for the given player index
+    pub fn get_input_map(&self, player_idx: usize) -> InputMap<PlayerAction> {
+        let mut input_map = InputMap::default();
+
+        input_map.set_gamepad(Gamepad { id: player_idx });
+
+        let mut add_controls = |ctrls: &PlayerControls| {
+            input_map.insert(ctrls.movement.clone(), PlayerAction::Move);
+            input_map.insert(ctrls.jump, PlayerAction::Jump);
+            input_map.insert(ctrls.grab, PlayerAction::Grab);
+            input_map.insert(ctrls.shoot, PlayerAction::Shoot);
+            input_map.insert(ctrls.slide, PlayerAction::Slide);
+        };
+
+        add_controls(&self.gamepad);
+
+        match player_idx {
+            0 => add_controls(&self.keyboard1),
+            1 => add_controls(&self.keyboard2),
+            _ => (),
+        }
+
+        input_map
+    }
+}
+
+/// Binds inputs to player actions
+#[derive(Deserialize, Serialize, Clone, Debug)]
+pub struct PlayerControls {
+    pub movement: VirtualDPad,
+    pub jump: InputKind,
+    pub grab: InputKind,
+    pub shoot: InputKind,
+    pub slide: InputKind,
+}
diff --git a/src/metadata/ui.rs b/src/metadata/ui.rs
new file mode 100644
index 0000000000..752390eb19
--- /dev/null
+++ b/src/metadata/ui.rs
@@ -0,0 +1,325 @@
+use std::sync::Arc;
+
+use bevy::utils::HashMap;
+use bevy_egui::egui;
+use serde::Deserializer;
+
+use crate::assets::EguiFont;
+
+use super::*;
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct UIThemeMeta {
+    pub scale: f32,
+    pub font_families: HashMap<String, String>,
+    #[serde(skip)]
+    pub font_handles: HashMap<String, AssetHandle<EguiFont>>,
+    pub font_styles: FontStylesMeta,
+    pub button_styles: ButtonStylesMeta,
+    pub hud: HudThemeMeta,
+    pub panel: PanelThemeMeta,
+    pub colors: UiThemeColors,
+    pub widgets: UiThemeWidgets,
+    pub editor: UiThemeEditor,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct UiThemeEditor {
+    pub icons: UiThemeEditorIcons,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct UiThemeEditorIcons {
+    pub select: ImageMeta,
+    pub spawn: ImageMeta,
+    pub tile: ImageMeta,
+    pub erase: ImageMeta,
+}
+
+impl UiThemeEditorIcons {
+    pub fn as_mut_list(&mut self) -> [&mut ImageMeta; 4] {
+        [
+            &mut self.select,
+            &mut self.spawn,
+            &mut self.tile,
+            &mut self.erase,
+        ]
+    }
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct UiThemeColors {
+    pub positive: ColorMeta,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct UiThemeWidgets {
+    pub border_radius: f32,
+
+    pub active: WidgetStyle,
+    pub default: WidgetStyle,
+    pub hovered: WidgetStyle,
+    pub noninteractive: WidgetStyle,
+    pub menu: WidgetStyle,
+}
+
+impl UiThemeWidgets {
+    pub fn get_egui_widget_style(&self) -> egui::style::Widgets {
+        egui::style::Widgets {
+            noninteractive: self
+                .noninteractive
+                .get_egui_widget_visuals(self.border_radius),
+            inactive: self.default.get_egui_widget_visuals(self.border_radius),
+            hovered: self.hovered.get_egui_widget_visuals(self.border_radius),
+            active: self.active.get_egui_widget_visuals(self.border_radius),
+            open: self.menu.get_egui_widget_visuals(self.border_radius),
+        }
+    }
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct WidgetStyle {
+    pub bg_fill: ColorMeta,
+    pub bg_stroke: ColorMeta,
+    pub text: ColorMeta,
+    #[serde(default)]
+    pub expansion: f32,
+}
+
+impl WidgetStyle {
+    pub fn get_egui_widget_visuals(&self, border_radius: f32) -> egui::style::WidgetVisuals {
+        egui::style::WidgetVisuals {
+            bg_fill: self.bg_fill.into(),
+            bg_stroke: egui::Stroke::new(2.0, self.bg_stroke),
+            fg_stroke: egui::Stroke::new(2.0, self.text),
+            rounding: egui::Rounding::same(border_radius),
+            expansion: self.expansion,
+        }
+    }
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct FontStylesMeta {
+    pub normal: FontMeta,
+    pub heading: FontMeta,
+    pub bigger: FontMeta,
+    pub smaller: FontMeta,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct ButtonStylesMeta {
+    pub normal: ButtonThemeMeta,
+    pub small: ButtonThemeMeta,
+}
+
+impl ButtonStylesMeta {
+    pub fn as_list(&mut self) -> [&mut ButtonThemeMeta; 2] {
+        [&mut self.normal, &mut self.small]
+    }
+}
+
+/// This is a helper to reduce clones on font family strings for egui
+#[derive(Deserialize, Clone, Debug)]
+#[serde(from = "String")]
+pub struct FontFamily(Arc<str>);
+
+impl From<String> for FontFamily {
+    fn from(s: String) -> Self {
+        Self(Arc::from(s))
+    }
+}
+
+impl From<FontFamily> for egui::FontFamily {
+    fn from(family: FontFamily) -> Self {
+        Self::Name(family.0)
+    }
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+#[has_load_progress(none)]
+pub struct FontMeta {
+    pub family: FontFamily,
+    pub size: f32,
+    #[serde(default)]
+    pub color: ColorMeta,
+}
+
+impl From<FontMeta> for egui::FontSelection {
+    fn from(meta: FontMeta) -> Self {
+        egui::FontSelection::FontId(egui::FontId {
+            size: meta.size,
+            family: meta.family.into(),
+        })
+    }
+}
+
+impl FontMeta {
+    pub fn colored(&self, color: ColorMeta) -> Self {
+        let mut meta = self.clone();
+        meta.color = color;
+        meta
+    }
+
+    pub fn font_id(&self) -> egui::FontId {
+        egui::FontId {
+            size: self.size,
+            family: self.family.clone().into(),
+        }
+    }
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct HudThemeMeta {
+    pub player_hud_width: f32,
+    pub portrait_frame: BorderImageMeta,
+    pub font: FontMeta,
+    pub lifebar: ProgressBarMeta,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct PanelThemeMeta {
+    #[serde(default)]
+    pub font_color: ColorMeta,
+    #[serde(default)]
+    pub padding: MarginMeta,
+    pub border: BorderImageMeta,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct ButtonThemeMeta {
+    pub font: FontMeta,
+    #[serde(default)]
+    pub padding: MarginMeta,
+    pub borders: ButtonBordersMeta,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct BorderImageMeta {
+    pub image: String,
+    pub image_size: UVec2,
+    #[serde(default)]
+    pub border_size: MarginMeta,
+    #[serde(default = "f32_one")]
+    pub scale: f32,
+
+    #[serde(skip)]
+    pub handle: AssetHandle<Image>,
+    #[serde(skip)]
+    pub egui_texture: egui::TextureId,
+}
+
+fn f32_one() -> f32 {
+    1.0
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct ProgressBarMeta {
+    pub height: f32,
+    pub background_image: BorderImageMeta,
+    pub progress_image: BorderImageMeta,
+}
+
+#[derive(HasLoadProgress, Deserialize, Clone, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct ButtonBordersMeta {
+    pub default: BorderImageMeta,
+    #[serde(default)]
+    pub focused: Option<BorderImageMeta>,
+    #[serde(default)]
+    pub clicked: Option<BorderImageMeta>,
+}
+
+#[derive(Reflect, HasLoadProgress, Default, Clone, Copy, Debug)]
+#[has_load_progress(none)]
+pub struct ColorMeta(pub Color);
+
+impl<'de> Deserialize<'de> for ColorMeta {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_str(ColorVisitor)
+    }
+}
+
+impl Serialize for ColorMeta {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(&format!(
+            "{:X}{:X}{:X}{:X}",
+            (255.0 * self.0.r()) as u8,
+            (255.0 * self.0.g()) as u8,
+            (255.0 * self.0.b()) as u8,
+            (255.0 * self.0.a()) as u8,
+        ))
+    }
+}
+
+struct ColorVisitor;
+impl<'de> serde::de::Visitor<'de> for ColorVisitor {
+    type Value = ColorMeta;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        formatter.write_str("A hex-encoded RGB or RGBA color")
+    }
+
+    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        Ok(ColorMeta(Color::hex(v).map_err(|e| E::custom(e))?))
+    }
+}
+
+impl From<ColorMeta> for egui::Color32 {
+    fn from(c: ColorMeta) -> Self {
+        let [r, g, b, a] = c.0.as_linear_rgba_f32();
+        egui::Rgba::from_rgba_premultiplied(r, g, b, a).into()
+    }
+}
+
+impl From<ColorMeta> for Color {
+    fn from(c: ColorMeta) -> Self {
+        c.0
+    }
+}
+
+#[derive(HasLoadProgress, Default, Deserialize, Clone, Copy, Debug)]
+#[serde(deny_unknown_fields, default)]
+pub struct MarginMeta {
+    #[serde(default)]
+    pub top: f32,
+    #[serde(default)]
+    pub bottom: f32,
+    #[serde(default)]
+    pub left: f32,
+    #[serde(default)]
+    pub right: f32,
+}
+
+impl From<MarginMeta> for bevy_egui::egui::style::Margin {
+    fn from(m: MarginMeta) -> Self {
+        Self {
+            left: m.left,
+            right: m.right,
+            top: m.top,
+            bottom: m.bottom,
+        }
+    }
+}
diff --git a/src/name.rs b/src/name.rs
new file mode 100644
index 0000000000..d383dc50d4
--- /dev/null
+++ b/src/name.rs
@@ -0,0 +1,26 @@
+use crate::prelude::*;
+
+pub struct NamePlugin;
+
+impl Plugin for NamePlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<EntityName>()
+            .add_system(update_entity_names);
+    }
+}
+
+/// Conceptually identical to the [`Name`] component, but structured so that it can be added and
+/// modified from scripts. Adding an [`EntityName`] component will cause a [`Name`] component to be
+/// added and synced automatically.
+#[derive(Reflect, Component, Default)]
+#[reflect(Component, Default)]
+pub struct EntityName(pub String);
+
+fn update_entity_names(
+    mut commands: Commands,
+    names: Query<(Entity, &EntityName), Changed<EntityName>>,
+) {
+    for (entity, name) in &names {
+        commands.entity(entity).insert(Name::new(name.0.clone()));
+    }
+}
diff --git a/src/network.rs b/src/network.rs
deleted file mode 100644
index 860b4884ac..0000000000
--- a/src/network.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! This module holds the networking core, used
-
-use hecs::World;
-
-pub fn update_network_client(world: &mut World) {
-    update_network_common(world);
-}
-
-pub fn fixed_update_network_client(world: &mut World) {
-    fixed_update_network_common(world);
-}
-
-pub fn update_network_host(world: &mut World) {
-    update_network_common(world);
-}
-
-pub fn fixed_update_network_host(world: &mut World) {
-    fixed_update_network_common(world);
-}
-
-fn update_network_common(_world: &mut World) {}
-
-fn fixed_update_network_common(_world: &mut World) {}
diff --git a/src/networking.rs b/src/networking.rs
new file mode 100644
index 0000000000..fd5903ded2
--- /dev/null
+++ b/src/networking.rs
@@ -0,0 +1,119 @@
+use std::any::TypeId;
+
+use bevy::{reflect::FromReflect, utils::HashMap};
+use once_cell::sync::Lazy;
+use ulid::Ulid;
+
+use crate::{config::ENGINE_CONFIG, prelude::*};
+
+pub mod client;
+pub mod proto;
+pub mod server;
+
+pub struct NetworkingPlugin;
+
+impl Plugin for NetworkingPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<NetIdMap>()
+            .add_plugin(client::ClientPlugin);
+
+        if ENGINE_CONFIG.server_mode {
+            app.add_plugin(server::ServerPlugin);
+        }
+    }
+}
+
+pub static NET_MESSAGE_TYPES: Lazy<Vec<TypeId>> = Lazy::new(|| {
+    [
+        TypeId::of::<proto::Ping>(),
+        TypeId::of::<proto::Pong>(),
+        TypeId::of::<proto::ClientMatchInfo>(),
+        TypeId::of::<proto::match_setup::MatchSetupFromClient>(),
+        TypeId::of::<proto::match_setup::MatchSetupFromServer>(),
+        TypeId::of::<proto::game::PlayerEventFromServer>(),
+        TypeId::of::<proto::game::PlayerEvent>(),
+        TypeId::of::<proto::game::GameEventFromServer>(),
+        TypeId::of::<proto::game::PlayerStateFromServer>(),
+        TypeId::of::<proto::game::PlayerState>(),
+    ]
+    .to_vec()
+});
+
+#[derive(
+    Reflect,
+    FromReflect,
+    Component,
+    Deref,
+    DerefMut,
+    Debug,
+    Clone,
+    Copy,
+    Serialize,
+    Deserialize,
+    Ord,
+    PartialOrd,
+    Eq,
+    PartialEq,
+    Hash,
+)]
+#[reflect_value(PartialEq, Deserialize, Serialize, Hash)]
+pub struct NetId(pub Ulid);
+
+impl NetId {
+    pub fn new() -> Self {
+        Self(Ulid::new())
+    }
+}
+
+impl Default for NetId {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl From<Ulid> for NetId {
+    fn from(u: Ulid) -> Self {
+        Self(u)
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct NetIdMap {
+    ent_to_net: HashMap<Entity, NetId>,
+    net_to_ent: HashMap<NetId, Entity>,
+}
+
+impl NetIdMap {
+    pub fn insert(&mut self, entity: Entity, net_id: NetId) {
+        self.ent_to_net.insert(entity, net_id);
+        self.net_to_ent.insert(net_id, entity);
+    }
+
+    pub fn remove_entity(&mut self, entity: Entity) -> Option<NetId> {
+        if let Some(net_id) = self.ent_to_net.remove(&entity) {
+            self.net_to_ent.remove(&net_id);
+
+            Some(net_id)
+        } else {
+            None
+        }
+    }
+
+    pub fn remove_net_id(&mut self, net_id: NetId) -> Option<Entity> {
+        if let Some(entity) = self.net_to_ent.remove(&net_id) {
+            self.ent_to_net.remove(&entity);
+
+            Some(entity)
+        } else {
+            None
+        }
+    }
+
+    pub fn get_entity(&self, net_id: NetId) -> Option<Entity> {
+        self.net_to_ent.get(&net_id).cloned()
+    }
+
+    pub fn get_net_id(&self, entity: Entity) -> Option<NetId> {
+        self.ent_to_net.get(&entity).cloned()
+    }
+}
diff --git a/src/networking/client.rs b/src/networking/client.rs
new file mode 100644
index 0000000000..df22c70b6d
--- /dev/null
+++ b/src/networking/client.rs
@@ -0,0 +1,371 @@
+use std::{any::TypeId, collections::VecDeque, net::SocketAddr, sync::Arc};
+
+use async_channel::{Receiver, RecvError, Sender};
+use bevy::{tasks::IoTaskPool, utils::HashMap};
+use futures_lite::future;
+use quinn::{ClientConfig, Connection, Endpoint, EndpointConfig};
+use quinn_bevy::BevyIoTaskPoolExecutor;
+use serde::de::DeserializeOwned;
+
+use crate::{metadata::GameMeta, player::input::PlayerInputs, prelude::*};
+
+use super::{proto::ClientMatchInfo, NET_MESSAGE_TYPES};
+
+pub mod game;
+
+pub struct ClientPlugin;
+
+impl Plugin for ClientPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugin(game::ClientGamePlugin)
+            .add_system_to_stage(
+                CoreStage::First,
+                remove_closed_client.run_if_resource_exists::<NetClient>(),
+            )
+            .add_system_to_stage(
+                CoreStage::First,
+                recv_client_match_info
+                    .run_if_resource_exists::<NetClient>()
+                    .run_unless_resource_exists::<ClientMatchInfo>(),
+            )
+            .add_exit_system(
+                GameState::InGame,
+                close_connection_when_leaving_game.run_if_resource_exists::<NetClient>(),
+            );
+    }
+}
+
+fn recv_client_match_info(
+    mut commands: Commands,
+    mut client: ResMut<NetClient>,
+    mut player_inputs: ResMut<PlayerInputs>,
+    game: Res<GameMeta>,
+) {
+    if let Some(match_info) = client.recv_reliable::<ClientMatchInfo>() {
+        info!("Got match info: {:?}", match_info);
+
+        for (i, player) in player_inputs.players.iter_mut().enumerate() {
+            player.active = i < match_info.player_count;
+            player.selected_player = game
+                .player_handles
+                .get(0)
+                .expect("No players in .game.yaml")
+                .clone_weak();
+        }
+
+        commands.insert_resource(match_info);
+    }
+}
+
+fn remove_closed_client(client: Res<NetClient>, mut commands: Commands) {
+    if client.is_closed() {
+        commands.remove_resource::<NetClient>();
+        commands.remove_resource::<ClientMatchInfo>();
+    }
+}
+
+fn close_connection_when_leaving_game(client: Res<NetClient>) {
+    client.close();
+}
+
+mod certs {
+    use std::sync::Arc;
+
+    // Implementation of `ServerCertVerifier` that verifies everything as trustworthy.
+    pub struct SkipServerVerification;
+
+    impl SkipServerVerification {
+        pub fn new() -> Arc<Self> {
+            Arc::new(Self)
+        }
+    }
+
+    impl rustls::client::ServerCertVerifier for SkipServerVerification {
+        fn verify_server_cert(
+            &self,
+            _end_entity: &rustls::Certificate,
+            _intermediates: &[rustls::Certificate],
+            _server_name: &rustls::ServerName,
+            _scts: &mut dyn Iterator<Item = &[u8]>,
+            _ocsp_response: &[u8],
+            _now: std::time::SystemTime,
+        ) -> Result<rustls::client::ServerCertVerified, rustls::Error> {
+            Ok(rustls::client::ServerCertVerified::assertion())
+        }
+    }
+}
+
+fn configure_quic_client() -> ClientConfig {
+    let crypto = rustls::ClientConfig::builder()
+        .with_safe_defaults()
+        .with_custom_certificate_verifier(certs::SkipServerVerification::new())
+        .with_no_client_auth();
+
+    ClientConfig::new(Arc::new(crypto))
+}
+
+pub async fn open_connection(
+    server_addr: impl Into<SocketAddr>,
+) -> anyhow::Result<(Endpoint, Connection)> {
+    let client_config = configure_quic_client();
+    let socket = std::net::UdpSocket::bind("0.0.0.0:0")?;
+    // Bind this endpoint to a UDP socket on the given client address.
+    let endpoint = Endpoint::new(
+        EndpointConfig::default(),
+        None,
+        socket,
+        BevyIoTaskPoolExecutor,
+    )?
+    .0;
+
+    let conn = endpoint
+        .connect_with(client_config, server_addr.into(), "server")?
+        .await?;
+
+    Ok((endpoint, conn))
+}
+
+pub struct NetClient {
+    endpoint: Endpoint,
+    conn: Connection,
+    outgoing_reliable_sender: Sender<Vec<u8>>,
+    outgoing_reliable_receiver: Receiver<Vec<u8>>,
+    outgoing_unreliable_sender: Sender<Vec<u8>>,
+    outgoing_unreliable_receiver: Receiver<Vec<u8>>,
+    incomming_reliable_sender: Sender<Vec<u8>>,
+    incomming_reliable_receiver: Receiver<Vec<u8>>,
+    incomming_unreliable_sender: Sender<Vec<u8>>,
+    incomming_unreliable_receiver: Receiver<Vec<u8>>,
+    incomming_reliable_queue: HashMap<TypeId, VecDeque<Vec<u8>>>,
+    incomming_unreliable_queue: HashMap<TypeId, VecDeque<Vec<u8>>>,
+}
+
+impl NetClient {
+    pub fn new(endpoint: Endpoint, conn: Connection) -> Self {
+        let (outgoing_reliable_sender, outgoing_reliable_receiver) = async_channel::unbounded();
+        let (outgoing_unreliable_sender, outgoing_unreliable_receiver) = async_channel::unbounded();
+        let (incomming_reliable_sender, incomming_reliable_receiver) = async_channel::unbounded();
+        let (incomming_unreliable_sender, incomming_unreliable_receiver) =
+            async_channel::unbounded();
+
+        let client = Self {
+            endpoint,
+            conn,
+            outgoing_reliable_sender,
+            outgoing_reliable_receiver,
+            outgoing_unreliable_sender,
+            outgoing_unreliable_receiver,
+            incomming_reliable_sender,
+            incomming_reliable_receiver,
+            incomming_unreliable_sender,
+            incomming_unreliable_receiver,
+            incomming_reliable_queue: default(),
+            incomming_unreliable_queue: default(),
+        };
+
+        spawn_message_recv_task(&client);
+        spawn_message_send_task(&client);
+
+        client
+    }
+
+    fn update_queue(&mut self) {
+        while let Ok(mut incomming) = self.incomming_reliable_receiver.try_recv() {
+            let type_idx_bytes: [u8; 4] =
+                incomming.split_off(incomming.len() - 4).try_into().unwrap();
+            let type_idx = u32::from_le_bytes(type_idx_bytes);
+            let type_id = NET_MESSAGE_TYPES[type_idx as usize];
+            self.incomming_reliable_queue
+                .entry(type_id)
+                .or_default()
+                .push_back(incomming);
+        }
+        while let Ok(mut incomming) = self.incomming_unreliable_receiver.try_recv() {
+            let type_idx_bytes: [u8; 4] =
+                incomming.split_off(incomming.len() - 4).try_into().unwrap();
+            let type_idx = u32::from_le_bytes(type_idx_bytes);
+            let type_id = NET_MESSAGE_TYPES[type_idx as usize];
+            self.incomming_unreliable_queue
+                .entry(type_id)
+                .or_default()
+                .push_back(incomming);
+        }
+    }
+
+    pub fn send_reliable<S: 'static + Serialize>(&self, message: &S) {
+        let type_id = TypeId::of::<S>();
+        let type_idx = NET_MESSAGE_TYPES
+            .iter()
+            .position(|x| x == &type_id)
+            .expect("Net message type not registered") as u32;
+        let mut message = postcard::to_allocvec(message).expect("Serialize net message");
+        message.extend_from_slice(&(type_idx as u32).to_le_bytes());
+
+        self.outgoing_reliable_sender.try_send(message).ok();
+    }
+
+    pub fn send_unreliable<S: 'static + Serialize>(&self, message: &S) {
+        let type_id = TypeId::of::<S>();
+        let type_idx = NET_MESSAGE_TYPES
+            .iter()
+            .position(|x| x == &type_id)
+            .expect("Net message not registered") as u32;
+        let mut message = postcard::to_allocvec(message).expect("Serialize net message");
+        message.extend_from_slice(&(type_idx as u32).to_le_bytes());
+
+        self.outgoing_unreliable_sender.try_send(message).ok();
+    }
+
+    pub fn recv_reliable<T: 'static + DeserializeOwned>(&mut self) -> Option<T> {
+        let type_id = TypeId::of::<T>();
+        if !NET_MESSAGE_TYPES.contains(&type_id) {
+            panic!("Attempt to receive unregistered message type");
+        }
+        self.update_queue();
+        self.incomming_reliable_queue
+            .get_mut(&type_id)
+            .and_then(|queue| queue.pop_front())
+            .map(|message| postcard::from_bytes(&message).expect("Deserialize net message"))
+    }
+
+    pub fn recv_unreliable<T: 'static + DeserializeOwned>(&mut self) -> Option<T> {
+        let type_id = TypeId::of::<T>();
+        if !NET_MESSAGE_TYPES.contains(&type_id) {
+            panic!("Attempt to receive unregistered message type");
+        }
+        self.update_queue();
+        self.incomming_unreliable_queue
+            .get_mut(&type_id)
+            .and_then(|queue| queue.pop_front())
+            .map(|message| postcard::from_bytes(&message).expect("Deserialize net message"))
+    }
+
+    pub fn conn(&self) -> &Connection {
+        &self.conn
+    }
+    pub fn endpoint(&self) -> &Endpoint {
+        &self.endpoint
+    }
+
+    pub fn close(&self) {
+        self.conn.close(0u8.into(), b"NetClient::close()");
+    }
+
+    pub fn is_closed(&self) -> bool {
+        self.conn.close_reason().is_some()
+    }
+}
+
+fn spawn_message_recv_task(client: &NetClient) {
+    let io_pool = IoTaskPool::get();
+
+    let reliable_sender = client.incomming_reliable_sender.clone();
+    let unreliable_sender = client.incomming_unreliable_sender.clone();
+    let conn = client.conn.clone();
+
+    io_pool
+        .spawn(async move {
+            'connection: loop {
+                let receive_message_result = async {
+                    future::zip(
+                        async {
+                            while let Ok(recv) = conn.accept_uni().await {
+                                let message = recv.read_to_end(1024 * 1024).await?;
+
+                                reliable_sender.try_send(message).ok();
+                            }
+
+                            Ok::<(), anyhow::Error>(())
+                        },
+                        async {
+                            while let Ok(message) = conn.read_datagram().await {
+                                unreliable_sender.try_send(message.to_vec()).ok();
+                            }
+                        },
+                    )
+                    .await
+                    .0?;
+
+                    Ok::<(), anyhow::Error>(())
+                };
+
+                let connection_closed = conn.closed();
+
+                let event = future::or(
+                    async move { either::Left(connection_closed.await) },
+                    async move { either::Right(receive_message_result.await) },
+                )
+                .await;
+
+                match event {
+                    either::Either::Left(closed) => {
+                        debug!("Client connection closed: {closed:?}");
+                        break 'connection;
+                    }
+                    either::Either::Right(message_result) => {
+                        if let Err(e) = message_result {
+                            error!("Error receiving net messages: {e:?}");
+                        }
+                    }
+                }
+            }
+        })
+        .detach();
+}
+
+fn spawn_message_send_task(client: &NetClient) {
+    let io_pool = IoTaskPool::get();
+    let conn = client.conn.clone();
+    let outgoing_reliable_receiver = client.outgoing_reliable_receiver.clone();
+    let outgoing_unreliable_receiver = client.outgoing_unreliable_receiver.clone();
+
+    io_pool
+        .spawn(async move {
+            loop {
+                let handle_reliable_message = async {
+                    loop {
+                        let message = outgoing_reliable_receiver.recv().await?;
+                        let result = async {
+                            let mut sender = conn.open_uni().await?;
+
+                            sender.write_all(&message).await?;
+                            sender.finish().await?;
+
+                            Ok::<(), anyhow::Error>(())
+                        };
+
+                        if let Err(e) = result.await {
+                            error!("Error sending reliable message: {e:?}");
+                        }
+                    }
+
+                    // This is needed to annotate the return type of the block
+                    #[allow(unreachable_code)]
+                    Ok::<(), RecvError>(())
+                };
+
+                let handle_unreliable_message = async {
+                    loop {
+                        let message = outgoing_unreliable_receiver.recv().await?;
+                        let result = conn.send_datagram(message.into());
+
+                        if let Err(e) = result {
+                            error!("Error sending reliable message: {e:?}");
+                        }
+                    }
+
+                    // This is needed to annotate the return type of the block
+                    #[allow(unreachable_code)]
+                    Ok::<(), RecvError>(())
+                };
+
+                if future::race(handle_reliable_message, handle_unreliable_message)
+                    .await
+                    .is_err()
+                {
+                    break;
+                }
+            }
+        })
+        .detach();
+}
diff --git a/src/networking/client/game.rs b/src/networking/client/game.rs
new file mode 100644
index 0000000000..fa0fcd20c0
--- /dev/null
+++ b/src/networking/client/game.rs
@@ -0,0 +1,273 @@
+use std::time::Duration;
+
+use bevy_tweening::{lens::TransformPositionLens, Animator, EaseMethod, Tween, TweeningType};
+
+use crate::{
+    animation::AnimationBankSprite,
+    item::{Item, ItemDropEvent, ItemGrabEvent, ItemUseEvent},
+    networking::{
+        proto::{
+            game::{
+                GameEventFromServer, PlayerEvent, PlayerEventFromServer, PlayerState,
+                PlayerStateFromServer,
+            },
+            tick::{ClientTicks, Tick},
+            ClientMatchInfo,
+        },
+        NetIdMap,
+    },
+    physics::KinematicBody,
+    player::{
+        PlayerDespawnCommand, PlayerDespawnEvent, PlayerIdx, PlayerKillCommand, PlayerKillEvent,
+        PlayerSetInventoryCommand, PlayerUseItemCommand,
+    },
+    prelude::*,
+    FIXED_TIMESTEP,
+};
+
+use super::NetClient;
+
+pub struct ClientGamePlugin;
+
+impl Plugin for ClientGamePlugin {
+    fn build(&self, app: &mut App) {
+        app.add_system_to_stage(
+            FixedUpdateStage::Last,
+            send_game_events
+                .chain(send_player_state)
+                .run_if_resource_exists::<NetClient>()
+                .run_if_resource_exists::<ClientMatchInfo>(),
+        )
+        .add_system_to_stage(
+            FixedUpdateStage::First,
+            handle_game_events_from_server
+                .chain(handle_player_state)
+                .run_if_resource_exists::<NetClient>()
+                .run_if_resource_exists::<ClientMatchInfo>(),
+        );
+    }
+}
+
+fn send_game_events(
+    mut player_kill_events: EventReader<PlayerKillEvent>,
+    mut player_despawn_events: EventReader<PlayerDespawnEvent>,
+    mut item_grab_events: EventReader<ItemGrabEvent>,
+    mut item_drop_events: EventReader<ItemDropEvent>,
+    mut item_use_events: EventReader<ItemUseEvent>,
+    players: Query<(&PlayerIdx, &Transform, &KinematicBody)>,
+    client: Res<NetClient>,
+    client_info: Res<ClientMatchInfo>,
+    net_ids: Res<NetIdMap>,
+) {
+    for event in item_grab_events.iter() {
+        if let Ok((player_idx, ..)) = players.get(event.player) {
+            // As the client, we're only allowed to drop and pick up items for our own player.
+            if client_info.player_idx == player_idx.0 {
+                let net_id = net_ids
+                    .get_net_id(event.item)
+                    .expect("Item in network game without NetId");
+                client.send_reliable(&PlayerEvent::GrabItem(net_id));
+            }
+        }
+    }
+
+    for event in item_drop_events.iter() {
+        if let Ok((player_idx, player_transform, body)) = players.get(event.player) {
+            // As the client, we're only allowed to drop and pick up items for our own player.
+            if client_info.player_idx == player_idx.0 {
+                client.send_reliable(&PlayerEvent::DropItem {
+                    position: player_transform.translation,
+                    velocity: body.velocity,
+                });
+            }
+        }
+    }
+
+    for event in item_use_events.iter() {
+        if let Ok((player_idx, ..)) = players.get(event.player) {
+            // As the client, we're only allowed to drop and pick up items for our own player.
+            if client_info.player_idx == player_idx.0 {
+                let item_id = net_ids
+                    .get_net_id(event.item)
+                    .expect("Item in network game without NetId");
+                client.send_reliable(&PlayerEvent::UseItem {
+                    position: event.position,
+                    item: item_id,
+                });
+            }
+        }
+    }
+
+    for event in player_kill_events.iter() {
+        if let Ok((player_idx, ..)) = players.get(event.player) {
+            // As the client, we're only allowed to kill our own player
+            if client_info.player_idx == player_idx.0 {
+                client.send_reliable(&PlayerEvent::KillPlayer {
+                    position: event.position,
+                    velocity: event.velocity,
+                });
+            }
+        } else {
+            warn!("Received kill event for player that isn't found");
+        }
+    }
+
+    for event in player_despawn_events.iter() {
+        // As the client, we're only able to despawn our own player
+        if client_info.player_idx == event.player_idx {
+            client.send_reliable(&PlayerEvent::DespawnPlayer);
+        }
+    }
+}
+
+fn send_player_state(
+    client: Res<NetClient>,
+    players: Query<(&PlayerIdx, &Transform, &AnimationBankSprite)>,
+    match_info: Res<ClientMatchInfo>,
+) {
+    for (player_idx, transform, sprite) in &players {
+        if player_idx.0 == match_info.player_idx {
+            client.send_unreliable(&PlayerState {
+                tick: Tick::next(),
+                pos: transform.translation,
+                sprite: sprite.clone(),
+            });
+        }
+    }
+}
+
+fn handle_game_events_from_server(
+    mut commands: Commands,
+    mut client: ResMut<NetClient>,
+    players: Query<(Entity, &PlayerIdx)>,
+    mut net_ids: ResMut<NetIdMap>,
+) {
+    while let Some(event) = client.recv_reliable::<PlayerEventFromServer>() {
+        let player_ent = players
+            .iter()
+            .find(|x| x.1 .0 == event.player_idx as usize)
+            .map(|x| x.0);
+
+        match event.kind {
+            PlayerEvent::SpawnPlayer(pos) => {
+                commands
+                    .spawn()
+                    .insert(PlayerIdx(event.player_idx as usize))
+                    .insert(Transform::from_translation(pos));
+            }
+            PlayerEvent::KillPlayer { position, velocity } => {
+                if let Some(player_ent) = player_ent {
+                    commands.add(PlayerKillCommand {
+                        player: player_ent,
+                        position: Some(position),
+                        velocity: Some(velocity),
+                    });
+                } else {
+                    warn!(?event.player_idx, "Net event to kill player that doesn't exist locally");
+                }
+            }
+            PlayerEvent::DespawnPlayer => {
+                if let Some(player_ent) = player_ent {
+                    commands.add(PlayerDespawnCommand::new(player_ent));
+                } else {
+                    warn!(?event.player_idx, "Net event to despawn player that doesn't exist locally");
+                }
+            }
+            PlayerEvent::GrabItem(net_id) => {
+                if let Some(player_ent) = player_ent {
+                    if let Some(item_ent) = net_ids.get_entity(net_id) {
+                        commands.add(PlayerSetInventoryCommand {
+                            player: player_ent,
+                            item: Some(item_ent),
+                            position: None,
+                            velocity: None,
+                        });
+                    } else {
+                        warn!(
+                            "Trying to grab item but could not find local item with given net ID"
+                        );
+                    }
+                } else {
+                    warn!(?event.player_idx, "Net event to kill player that doesn't exist locally");
+                }
+            }
+            PlayerEvent::DropItem { position, velocity } => {
+                if let Some(player_ent) = player_ent {
+                    commands.add(PlayerSetInventoryCommand {
+                        player: player_ent,
+                        item: None,
+                        position: Some(position),
+                        velocity: Some(velocity),
+                    });
+                } else {
+                    warn!(?event.player_idx, "Net event to kill player that doesn't exist locally");
+                }
+            }
+            PlayerEvent::UseItem { position, item } => {
+                if let Some(player_ent) = player_ent {
+                    if let Some(item_ent) = net_ids.get_entity(item) {
+                        commands.add(PlayerUseItemCommand {
+                            player: player_ent,
+                            position: Some(position),
+                            item: Some(item_ent),
+                        });
+                    } else {
+                        warn!(
+                            "Trying to use item but could not find entity for item with given ID"
+                        );
+                    }
+                } else {
+                    warn!(?event.player_idx, "Net event to kill player that doesn't exist locally");
+                }
+            }
+        }
+    }
+    while let Some(event) = client.recv_reliable::<GameEventFromServer>() {
+        match event {
+            GameEventFromServer::SpawnItem {
+                net_id,
+                script,
+                pos,
+            } => {
+                let mut item = commands.spawn();
+                net_ids.insert(item.id(), net_id);
+                item.insert(Transform::from_translation(pos))
+                    .insert(GlobalTransform::default())
+                    .insert(Item { script })
+                    .insert_bundle(VisibilityBundle::default());
+            }
+        }
+    }
+}
+
+fn handle_player_state(
+    mut client_ticks: Local<ClientTicks>,
+    mut client: ResMut<NetClient>,
+    mut players: Query<(
+        Entity,
+        &PlayerIdx,
+        &Transform,
+        &mut Animator<Transform>,
+        &mut AnimationBankSprite,
+    )>,
+) {
+    while let Some(message) = client.recv_unreliable::<PlayerStateFromServer>() {
+        if client_ticks.is_latest(message.player_idx as usize, message.state.tick) {
+            for (_, idx, transform, mut animator, mut sprite) in &mut players {
+                if idx.0 == message.player_idx as usize {
+                    animator.set_tweenable(Tween::new(
+                        EaseMethod::Linear,
+                        TweeningType::Once,
+                        Duration::from_secs_f64(FIXED_TIMESTEP * 2.0),
+                        TransformPositionLens {
+                            start: transform.translation,
+                            end: message.state.pos,
+                        },
+                    ));
+                    *sprite = message.state.sprite;
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/src/networking/proto.rs b/src/networking/proto.rs
new file mode 100644
index 0000000000..76bd73ad94
--- /dev/null
+++ b/src/networking/proto.rs
@@ -0,0 +1,19 @@
+use crate::prelude::*;
+
+pub mod game;
+pub mod match_setup;
+pub mod tick;
+
+/// A resource indicating which player this game client represents, and how many players there are
+/// in the match.j
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct ClientMatchInfo {
+    pub player_idx: usize,
+    pub player_count: usize,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct Ping;
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct Pong;
diff --git a/src/networking/proto/game.rs b/src/networking/proto/game.rs
new file mode 100644
index 0000000000..d56b217453
--- /dev/null
+++ b/src/networking/proto/game.rs
@@ -0,0 +1,41 @@
+use crate::{animation::AnimationBankSprite, networking::NetId, prelude::*};
+
+use super::tick::Tick;
+
+#[derive(Serialize, Deserialize)]
+pub struct PlayerEventFromServer {
+    pub player_idx: u8,
+    pub kind: PlayerEvent,
+}
+
+#[derive(Serialize, Deserialize)]
+pub enum GameEventFromServer {
+    SpawnItem {
+        net_id: NetId,
+        script: String,
+        pos: Vec3,
+    },
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct PlayerStateFromServer {
+    pub player_idx: u8,
+    pub state: PlayerState,
+}
+
+#[derive(Serialize, Deserialize)]
+pub enum PlayerEvent {
+    SpawnPlayer(Vec3),
+    KillPlayer { position: Vec3, velocity: Vec2 },
+    DespawnPlayer,
+    GrabItem(NetId),
+    DropItem { position: Vec3, velocity: Vec2 },
+    UseItem { position: Vec3, item: NetId },
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct PlayerState {
+    pub tick: Tick,
+    pub pos: Vec3,
+    pub sprite: AnimationBankSprite,
+}
diff --git a/src/networking/proto/match_setup.rs b/src/networking/proto/match_setup.rs
new file mode 100644
index 0000000000..7307687993
--- /dev/null
+++ b/src/networking/proto/match_setup.rs
@@ -0,0 +1,23 @@
+use crate::{
+    metadata::{MapMeta, PlayerMeta},
+    prelude::*,
+};
+
+/// Network message sent by client to select a player
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum MatchSetupFromClient {
+    SelectPlayer(AssetHandle<PlayerMeta>),
+    ConfirmSelection(bool),
+    SelectMap(AssetHandle<MapMeta>),
+}
+
+/// Network message sent by server to notify clients of selected players
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub enum MatchSetupFromServer {
+    ClientMessage {
+        player_idx: u8,
+        message: MatchSetupFromClient,
+    },
+    SelectMap,
+    WaitForMapSelect,
+}
diff --git a/src/networking/proto/tick.rs b/src/networking/proto/tick.rs
new file mode 100644
index 0000000000..97ee207402
--- /dev/null
+++ b/src/networking/proto/tick.rs
@@ -0,0 +1,82 @@
+use std::sync::atomic::{AtomicU32, Ordering::Relaxed};
+
+use crate::prelude::*;
+
+/// Internal counter used for provisioning ticks
+static COUNTER: AtomicU32 = AtomicU32::new(0);
+
+/// A tick that can be compared to other ticks from the same server.
+///
+/// It's essentially a [`u32`] but one that increments every time you create a new [`Tick`] and will
+/// loop around to `0` when it gets to `u32::MAX`.
+///
+/// One tick can be compared with another to find out which one is newer, but because of the
+/// wrapping, you can not accurately compare to [`Tick`]'s that are more than `u32::MAX / 2` ticks
+/// appart.
+///
+/// [`AtomicU32`]: std::sync::atomic::AtomicU32
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Default, Clone, Copy)]
+pub struct Tick(u32);
+
+/// A collection of ticks for other clients
+///
+/// It's a helper containing the `is_latest()` function to check if a given tick is the latest we've
+/// seen for a given client, and update the latest tick for that client if it is.
+#[derive(Default)]
+pub struct ClientTicks(Vec<Tick>);
+
+impl ClientTicks {
+    pub fn is_latest(&mut self, client_idx: usize, tick: Tick) -> bool {
+        if client_idx >= self.0.len() {
+            let extra_space = client_idx + 1 - self.0.len();
+            self.0
+                .extend(std::iter::once(Tick::default()).cycle().take(extra_space));
+        }
+
+        let current_tick = self.0[client_idx];
+        if tick > current_tick {
+            self.0[client_idx] = tick;
+            true
+        } else {
+            false
+        }
+    }
+}
+
+impl Tick {
+    pub fn next() -> Self {
+        COUNTER.fetch_add(1, Relaxed);
+        Tick(COUNTER.load(Relaxed))
+    }
+
+    pub fn as_u32(&self) -> u32 {
+        self.0
+    }
+}
+
+impl PartialOrd for Tick {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(if self == other {
+            std::cmp::Ordering::Equal
+
+        // If `self` is greater than `other`, than we have two scenarios:
+        //   - `self` was made later than `other`
+        //   - `other` was made later than `self`, but wrapped around to a lower number To account
+        //
+        // for the second scenario we check what the distance between the two numbers is if we wrapp
+        // around from `self` to the `other` across `u32::MAX`. If the difference between the
+        // numbers wrapped is greater than the distance between them without wrapping, then we
+        // assume that they aren't wrapped, and `other` is actually less than `self.
+        } else if self.0 > other.0 && u32::MAX - self.0 + other.0 > u32::MAX / 2 {
+            std::cmp::Ordering::Greater
+        } else {
+            std::cmp::Ordering::Less
+        })
+    }
+}
+
+impl Ord for Tick {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.partial_cmp(other).unwrap()
+    }
+}
diff --git a/src/networking/server.rs b/src/networking/server.rs
new file mode 100644
index 0000000000..6c6a29bad6
--- /dev/null
+++ b/src/networking/server.rs
@@ -0,0 +1,398 @@
+use std::{any::TypeId, collections::VecDeque};
+
+use crate::{networking::proto, player::input::PlayerInputs};
+use async_channel::{Receiver, RecvError, Sender};
+use bevy::{app::AppExit, tasks::IoTaskPool, utils::HashMap};
+use bytes::Bytes;
+use futures_lite::future;
+use quinn::Connection;
+use serde::de::DeserializeOwned;
+
+use crate::prelude::*;
+
+use super::NET_MESSAGE_TYPES;
+
+pub mod game;
+pub mod match_setup;
+
+pub struct ServerPlugin;
+
+impl Plugin for ServerPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugin(match_setup::ServerPlayerSelectPlugin)
+            .add_plugin(game::ServerGamePlugin)
+            .add_startup_system(spawn_message_recv_tasks)
+            .add_startup_system(spawn_message_send_task)
+            .add_system_to_stage(CoreStage::First, exit_on_disconnect)
+            .add_system(reply_to_ping);
+
+        app.world.resource_scope(|world, server: Mut<NetServer>| {
+            let mut player_inputs = world.resource_mut::<PlayerInputs>();
+
+            for i in 0..server.client_count() {
+                player_inputs.players[i].active = true;
+            }
+        });
+    }
+}
+
+fn reply_to_ping(mut server: ResMut<NetServer>) {
+    while let Some(incomming) = server.recv_reliable::<proto::Ping>() {
+        let client_idx = incomming.client_idx;
+        info!("Ping from client {client_idx}");
+        server.send_reliable(&proto::Pong, client_idx);
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct NetServer {
+    clients: Vec<Connection>,
+    outgoing_reliable_sender: Sender<Outgoing>,
+    outgoing_reliable_receiver: Receiver<Outgoing>,
+    outgoing_unreliable_sender: Sender<Outgoing>,
+    outgoing_unreliable_receiver: Receiver<Outgoing>,
+    incomming_reliable_sender: Sender<Incomming>,
+    incomming_reliable_receiver: Receiver<Incomming>,
+    incomming_unreliable_sender: Sender<Incomming>,
+    incomming_unreliable_receiver: Receiver<Incomming>,
+    incomming_reliable_queue: HashMap<TypeId, VecDeque<Incomming>>,
+    incomming_unreliable_queue: HashMap<TypeId, VecDeque<Incomming>>,
+}
+
+#[derive(Debug)]
+struct Outgoing {
+    data: Vec<u8>,
+    target: MessageTarget,
+}
+
+#[derive(Debug, Clone)]
+struct Incomming {
+    data: Vec<u8>,
+    client_idx: usize,
+}
+
+#[derive(Debug, Clone)]
+pub enum MessageTarget {
+    All,
+    AllExcept(usize),
+    Client(usize),
+}
+
+impl NetServer {
+    pub fn new(clients: Vec<Connection>) -> Self {
+        let (outgoing_reliable_sender, outgoing_reliable_receiver) = async_channel::unbounded();
+        let (outgoing_unreliable_sender, outgoing_unreliable_receiver) = async_channel::unbounded();
+        let (incomming_reliable_sender, incomming_reliable_receiver) = async_channel::unbounded();
+        let (incomming_unreliable_sender, incomming_unreliable_receiver) =
+            async_channel::unbounded();
+
+        Self {
+            clients,
+            outgoing_reliable_sender,
+            outgoing_reliable_receiver,
+            outgoing_unreliable_sender,
+            outgoing_unreliable_receiver,
+            incomming_reliable_sender,
+            incomming_reliable_receiver,
+            incomming_unreliable_sender,
+            incomming_unreliable_receiver,
+            incomming_reliable_queue: default(),
+            incomming_unreliable_queue: default(),
+        }
+    }
+
+    pub fn client_count(&self) -> usize {
+        self.clients.len()
+    }
+
+    /// Update the incomming message queue
+    fn update_queue(&mut self) {
+        while let Ok(mut incomming) = self.incomming_reliable_receiver.try_recv() {
+            let type_idx_bytes: [u8; 4] = incomming
+                .data
+                .split_off(incomming.data.len() - 4)
+                .try_into()
+                .unwrap();
+            let type_idx = u32::from_le_bytes(type_idx_bytes);
+            let type_id = NET_MESSAGE_TYPES[type_idx as usize];
+            self.incomming_reliable_queue
+                .entry(type_id)
+                .or_default()
+                .push_back(incomming);
+        }
+        while let Ok(mut incomming) = self.incomming_unreliable_receiver.try_recv() {
+            let type_idx_bytes: [u8; 4] = incomming
+                .data
+                .split_off(incomming.data.len() - 4)
+                .try_into()
+                .unwrap();
+            let type_idx = u32::from_le_bytes(type_idx_bytes);
+            let type_id = NET_MESSAGE_TYPES[type_idx as usize];
+            self.incomming_unreliable_queue
+                .entry(type_id)
+                .or_default()
+                .push_back(incomming);
+        }
+    }
+
+    pub fn send_reliable_to<S: 'static + Serialize>(&self, message: &S, target: MessageTarget) {
+        let type_id = TypeId::of::<S>();
+        let type_idx = NET_MESSAGE_TYPES
+            .iter()
+            .position(|x| x == &type_id)
+            .expect("Net message not registered") as u32;
+        let mut message = postcard::to_allocvec(message).expect("Serialize net message");
+        message.extend_from_slice(&(type_idx as u32).to_le_bytes());
+        self.outgoing_reliable_sender
+            .try_send(Outgoing {
+                data: message,
+                target,
+            })
+            .ok();
+    }
+
+    pub fn send_unreliable_to<S: 'static + Serialize>(&self, message: &S, target: MessageTarget) {
+        let type_id = TypeId::of::<S>();
+        let type_idx = NET_MESSAGE_TYPES
+            .iter()
+            .position(|x| x == &type_id)
+            .expect("Net message not registered") as u32;
+        let mut message = postcard::to_allocvec(message).expect("Serialize net message");
+        message.extend_from_slice(&(type_idx as u32).to_le_bytes());
+
+        self.outgoing_unreliable_sender
+            .try_send(Outgoing {
+                data: message,
+                target,
+            })
+            .ok();
+    }
+
+    pub fn send_reliable<S: 'static + Serialize>(&self, message: &S, client_idx: usize) {
+        self.send_reliable_to(message, MessageTarget::Client(client_idx));
+    }
+
+    pub fn send_unreliable<S: 'static + Serialize>(&self, message: &S, client_idx: usize) {
+        self.send_unreliable_to(message, MessageTarget::Client(client_idx));
+    }
+
+    pub fn broadcast_reliable<S: 'static + Serialize>(&self, message: &S) {
+        self.send_reliable_to(message, MessageTarget::All);
+    }
+
+    pub fn broadcast_unreliable<S: 'static + Serialize>(&self, message: &S) {
+        self.send_unreliable_to(message, MessageTarget::All);
+    }
+
+    pub fn recv_reliable<T: 'static + DeserializeOwned>(&mut self) -> Option<IncommingMessage<T>> {
+        let type_id = TypeId::of::<T>();
+        if !NET_MESSAGE_TYPES.contains(&type_id) {
+            panic!("Attempt to receive unregistered message type");
+        }
+        self.update_queue();
+        self.incomming_reliable_queue
+            .get_mut(&type_id)
+            .and_then(|queue| queue.pop_front())
+            .map(|incomming| IncommingMessage {
+                message: postcard::from_bytes(&incomming.data).expect("Deserialize net message"),
+                client_idx: incomming.client_idx,
+            })
+    }
+
+    pub fn recv_unreliable<T: 'static + DeserializeOwned>(
+        &mut self,
+    ) -> Option<IncommingMessage<T>> {
+        let type_id = TypeId::of::<T>();
+        if !NET_MESSAGE_TYPES.contains(&type_id) {
+            panic!("Attempt to receive unregistered message type");
+        }
+        self.update_queue();
+        self.incomming_unreliable_queue
+            .get_mut(&type_id)
+            .and_then(|queue| queue.pop_front())
+            .map(|incomming| IncommingMessage {
+                message: postcard::from_bytes(&incomming.data).expect("Deserialize net message"),
+                client_idx: incomming.client_idx,
+            })
+    }
+}
+
+pub struct IncommingMessage<T> {
+    pub message: T,
+    pub client_idx: usize,
+}
+
+fn spawn_message_send_task(server: Res<NetServer>) {
+    let io_pool = IoTaskPool::get();
+
+    let clients = server.clients.clone();
+    let outgoing_reliable_receiver = server.outgoing_reliable_receiver.clone();
+    let outgoing_unreliable_receiver = server.outgoing_unreliable_receiver.clone();
+    io_pool
+        .spawn(async move {
+            loop {
+                let handle_reliable_message = async {
+                    loop {
+                        let message = outgoing_reliable_receiver.recv().await?;
+                        let data = Bytes::from(message.data);
+
+                        let targets = match message.target {
+                            MessageTarget::All => clients.iter().collect::<Vec<_>>(),
+                            MessageTarget::AllExcept(idx) => clients
+                                .iter()
+                                .enumerate()
+                                .filter(|(i, _)| i != &idx)
+                                .map(|(_, x)| x)
+                                .collect::<Vec<_>>(),
+                            MessageTarget::Client(idx) => {
+                                [&clients[idx]].into_iter().collect::<Vec<_>>()
+                            }
+                        };
+
+                        // Broadcast reliable messages to clients
+                        for conn in targets {
+                            let message_ = data.clone();
+
+                            let result = async {
+                                let mut sender = conn.open_uni().await?;
+
+                                sender.write_all(&message_).await?;
+                                sender.finish().await?;
+
+                                Ok::<(), anyhow::Error>(())
+                            };
+
+                            if let Err(e) = result.await {
+                                error!("Error sending reliable message: {e:?}");
+                            }
+                        }
+                    }
+
+                    // This is needed to annotate the return type of the block
+                    #[allow(unreachable_code)]
+                    Ok::<(), RecvError>(())
+                };
+
+                let handle_unreliable_message = async {
+                    loop {
+                        let message = outgoing_unreliable_receiver.recv().await?;
+                        let data = Bytes::from(message.data);
+
+                        let targets = match message.target {
+                            MessageTarget::All => clients.iter().collect::<Vec<_>>(),
+                            MessageTarget::AllExcept(idx) => clients
+                                .iter()
+                                .enumerate()
+                                .filter(|(i, _)| i != &idx)
+                                .map(|(_, x)| x)
+                                .collect::<Vec<_>>(),
+                            MessageTarget::Client(idx) => {
+                                [&clients[idx]].into_iter().collect::<Vec<_>>()
+                            }
+                        };
+
+                        // Broadcast unreliable messages to clients
+                        for conn in targets {
+                            let message_ = data.clone();
+                            let result = conn.send_datagram(message_);
+
+                            if let Err(e) = result {
+                                error!("Error sending unreliable message: {e:?}");
+                            }
+                        }
+                    }
+
+                    // This is needed to annotate the return type of the block
+                    #[allow(unreachable_code)]
+                    Ok::<(), RecvError>(())
+                };
+
+                if future::race(handle_reliable_message, handle_unreliable_message)
+                    .await
+                    .is_err()
+                {
+                    break;
+                }
+            }
+        })
+        .detach();
+}
+
+fn spawn_message_recv_tasks(server: Res<NetServer>) {
+    let io_pool = IoTaskPool::get();
+
+    for (client_idx, conn) in server.clients.iter().enumerate() {
+        let reliable_sender = server.incomming_reliable_sender.clone();
+        let unreliable_sender = server.incomming_unreliable_sender.clone();
+        let conn = conn.clone();
+
+        io_pool
+            .spawn(async move {
+                'connection: loop {
+                    let receive_message_result = async {
+                        future::zip(
+                            async {
+                                while let Ok(recv) = conn.accept_uni().await {
+                                    let message = recv.read_to_end(usize::MAX).await?;
+                                    reliable_sender
+                                        .try_send(Incomming {
+                                            data: message,
+                                            client_idx,
+                                        })
+                                        .ok();
+                                }
+
+                                Ok::<(), anyhow::Error>(())
+                            },
+                            async {
+                                while let Ok(message) = conn.read_datagram().await {
+                                    unreliable_sender
+                                        .try_send(Incomming {
+                                            data: message.to_vec(),
+                                            client_idx,
+                                        })
+                                        .ok();
+                                }
+                            },
+                        )
+                        .await
+                        .0?;
+
+                        Ok::<(), anyhow::Error>(())
+                    };
+
+                    let connection_closed = conn.closed();
+
+                    let event = future::or(
+                        async move { either::Left(connection_closed.await) },
+                        async move { either::Right(receive_message_result.await) },
+                    )
+                    .await;
+
+                    match event {
+                        either::Either::Left(closed) => {
+                            debug!("Client connection closed: {closed:?}");
+                            break 'connection;
+                        }
+                        either::Either::Right(message_result) => {
+                            if let Err(e) = message_result {
+                                error!("Error receiving net messages: {e:?}");
+                            }
+                        }
+                    }
+                }
+            })
+            .detach();
+    }
+}
+
+fn exit_on_disconnect(mut server: ResMut<NetServer>, mut exit_sender: EventWriter<AppExit>) {
+    // Remove disconnected clients
+    server.clients.retain(|conn| conn.close_reason().is_none());
+
+    // If all clients have disconnected, exit the app
+    if server.clients.is_empty() {
+        info!("All clients disconnected from match");
+        exit_sender.send_default();
+    }
+}
diff --git a/src/networking/server/game.rs b/src/networking/server/game.rs
new file mode 100644
index 0000000000..488a2fc645
--- /dev/null
+++ b/src/networking/server/game.rs
@@ -0,0 +1,66 @@
+use crate::{
+    networking::proto::game::{
+        PlayerEvent, PlayerEventFromServer, PlayerState, PlayerStateFromServer,
+    },
+    player::{PlayerDespawnCommand, PlayerIdx, PlayerKillCommand},
+    prelude::*,
+};
+
+use super::{MessageTarget, NetServer};
+
+pub struct ServerGamePlugin;
+
+impl Plugin for ServerGamePlugin {
+    fn build(&self, app: &mut App) {
+        app.add_system(
+            handle_client_messages
+                .run_if_resource_exists::<NetServer>()
+                .run_in_state(GameState::ServerInGame),
+        );
+    }
+}
+
+fn handle_client_messages(
+    mut server: ResMut<NetServer>,
+    players: Query<(Entity, &PlayerIdx)>,
+    mut commands: Commands,
+) {
+    while let Some(incomming) = server.recv_reliable::<PlayerEvent>() {
+        if let PlayerEvent::KillPlayer { position, velocity } = incomming.message {
+            for (entity, player_idx) in &players {
+                if player_idx.0 == incomming.client_idx {
+                    commands.add(PlayerKillCommand {
+                        player: entity,
+                        position: Some(position),
+                        velocity: Some(velocity),
+                    });
+                    break;
+                }
+            }
+        } else if let PlayerEvent::DespawnPlayer = incomming.message {
+            for (entity, player_idx) in &players {
+                if player_idx.0 == incomming.client_idx {
+                    commands.add(PlayerDespawnCommand::new(entity));
+                    break;
+                }
+            }
+        }
+
+        server.send_reliable_to(
+            &PlayerEventFromServer {
+                player_idx: incomming.client_idx.try_into().unwrap(),
+                kind: incomming.message,
+            },
+            MessageTarget::AllExcept(incomming.client_idx),
+        )
+    }
+    while let Some(incomming) = server.recv_unreliable::<PlayerState>() {
+        server.send_unreliable_to(
+            &PlayerStateFromServer {
+                player_idx: incomming.client_idx.try_into().unwrap(),
+                state: incomming.message,
+            },
+            MessageTarget::AllExcept(incomming.client_idx),
+        )
+    }
+}
diff --git a/src/networking/server/match_setup.rs b/src/networking/server/match_setup.rs
new file mode 100644
index 0000000000..95b9b3e5d1
--- /dev/null
+++ b/src/networking/server/match_setup.rs
@@ -0,0 +1,92 @@
+use rand::{thread_rng, Rng};
+
+use crate::{
+    networking::proto::match_setup::{MatchSetupFromClient, MatchSetupFromServer},
+    player::{input::PlayerInputs, MAX_PLAYERS},
+    prelude::*,
+};
+
+use super::NetServer;
+
+pub struct ServerPlayerSelectPlugin;
+
+impl Plugin for ServerPlayerSelectPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_system(
+            handle_client_messages
+                .run_if_resource_exists::<NetServer>()
+                .run_in_state(GameState::ServerPlayerSelect),
+        );
+    }
+}
+
+#[derive(Default, Deref, DerefMut)]
+struct PlayerConfirmations([bool; MAX_PLAYERS]);
+
+impl PlayerConfirmations {
+    fn count(&self) -> usize {
+        let mut count = 0;
+        for confirmed in &self.0 {
+            if *confirmed {
+                count += 1;
+            }
+        }
+
+        count
+    }
+}
+
+fn handle_client_messages(
+    mut players_selected: Local<PlayerConfirmations>,
+    mut player_selecting_map: Local<Option<usize>>,
+    mut commands: Commands,
+    mut server: ResMut<NetServer>,
+    mut player_inputs: ResMut<PlayerInputs>,
+) {
+    while let Some(incomming) = server.recv_reliable::<MatchSetupFromClient>() {
+        match &incomming.message {
+            MatchSetupFromClient::SelectPlayer(handle) => {
+                player_inputs.players[incomming.client_idx].selected_player = handle.clone_weak();
+            }
+            MatchSetupFromClient::ConfirmSelection(confirmed) => {
+                players_selected[incomming.client_idx] = *confirmed;
+            }
+            MatchSetupFromClient::SelectMap(map_handle) => {
+                if let Some(player_selecting_map) = &*player_selecting_map {
+                    if *player_selecting_map == incomming.client_idx {
+                        // Spawn the map
+                        commands.spawn().insert(map_handle.clone_weak());
+
+                        // Start the game
+                        commands.insert_resource(NextState(GameState::ServerInGame));
+                    }
+                }
+            }
+        }
+
+        // If the players have finished selecting their fish
+        if players_selected.count() == server.client_count() && player_selecting_map.is_none() {
+            // Select a random player to pick the map
+            let idx = thread_rng().gen_range(0..server.client_count());
+            *player_selecting_map = Some(idx);
+
+            server.send_reliable_to(
+                &MatchSetupFromServer::WaitForMapSelect,
+                super::MessageTarget::AllExcept(idx),
+            );
+            server.send_reliable(&MatchSetupFromServer::SelectMap, idx);
+
+        // If we are still waiting for players to select fish, map, or get ready
+        } else {
+            // Forward client message to other clients
+            let message = MatchSetupFromServer::ClientMessage {
+                player_idx: incomming.client_idx.try_into().unwrap(),
+                message: incomming.message,
+            };
+            server.send_reliable_to(
+                &message,
+                super::MessageTarget::AllExcept(incomming.client_idx),
+            );
+        }
+    }
+}
diff --git a/src/particles.rs b/src/particles.rs
deleted file mode 100644
index 3acd0b7e0d..0000000000
--- a/src/particles.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-use std::collections::HashMap;
-
-use ff_particles::EmittersCache;
-
-use hecs::World;
-
-use serde::{Deserialize, Serialize};
-
-use core::math::IsZero;
-use core::Transform;
-
-use crate::{AnimatedSpriteMetadata, Resources};
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ParticleEmitterMetadata {
-    /// The id of the particle effect.
-    #[serde(rename = "particle_effect")]
-    pub particle_effect_id: String,
-    /// The offset is added to the `position` provided when calling `draw`
-    #[serde(
-        default,
-        with = "core::json::vec2_def",
-        skip_serializing_if = "Vec2::is_zero"
-    )]
-    pub offset: Vec2,
-    /// Delay before emission will begin
-    #[serde(default, skip_serializing_if = "f32::is_zero")]
-    pub delay: f32,
-    /// The interval between each emission.
-    #[serde(default, skip_serializing_if = "f32::is_zero")]
-    pub interval: f32,
-    /// Amount of emissions per activation. If set to `None` it will emit indefinitely
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub emissions: Option<u32>,
-    /// This is a temporary hack that enables texture based effects until we add texture support
-    /// to our macroquad-particles fork
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub animations: Option<AnimatedSpriteMetadata>,
-    /// If this is set to `true` the `ParticleController` will start to emit automatically
-    #[serde(default, skip_serializing_if = "core::json::is_false")]
-    pub should_autostart: bool,
-}
-
-impl Default for ParticleEmitterMetadata {
-    fn default() -> Self {
-        ParticleEmitterMetadata {
-            particle_effect_id: "".to_string(),
-            offset: Vec2::ZERO,
-            delay: 0.0,
-            emissions: None,
-            interval: 0.0,
-            animations: None,
-            should_autostart: false,
-        }
-    }
-}
-
-pub struct ParticleEmitter {
-    pub particle_effect_id: String,
-    pub offset: Vec2,
-    pub delay: f32,
-    pub emissions: Option<u32>,
-    pub interval: f32,
-    pub emission_cnt: u32,
-    pub delay_timer: f32,
-    pub interval_timer: f32,
-    pub is_active: bool,
-}
-
-impl ParticleEmitter {
-    pub fn new(meta: ParticleEmitterMetadata) -> Self {
-        ParticleEmitter {
-            particle_effect_id: meta.particle_effect_id,
-            offset: meta.offset,
-            delay: meta.delay,
-            interval: meta.interval,
-            emissions: meta.emissions,
-            emission_cnt: 0,
-            delay_timer: 0.0,
-            interval_timer: meta.interval,
-            is_active: meta.should_autostart,
-        }
-    }
-
-    pub fn get_offset(&self, flip_x: bool, flip_y: bool) -> Vec2 {
-        let mut offset = self.offset;
-
-        if flip_x {
-            offset.x = -offset.x;
-        }
-
-        if flip_y {
-            offset.y = -offset.y;
-        }
-
-        offset
-    }
-
-    pub fn activate(&mut self) {
-        self.delay_timer = 0.0;
-        self.interval_timer = self.interval;
-        self.emission_cnt = 0;
-        self.is_active = true;
-    }
-}
-
-impl From<ParticleEmitterMetadata> for ParticleEmitter {
-    fn from(params: ParticleEmitterMetadata) -> Self {
-        ParticleEmitter::new(params)
-    }
-}
-
-pub fn update_one_particle_emitter(
-    mut position: Vec2,
-    rotation: f32,
-    emitter: &mut ParticleEmitter,
-) {
-    let dt = get_frame_time();
-
-    if emitter.is_active {
-        emitter.delay_timer += dt;
-
-        if emitter.delay_timer >= emitter.delay {
-            emitter.interval_timer += dt;
-        }
-
-        if emitter.delay_timer >= emitter.delay && emitter.interval_timer >= emitter.interval {
-            emitter.interval_timer = 0.0;
-
-            if rotation == 0.0 {
-                position += emitter.offset;
-            } else {
-                let offset_position = position + emitter.offset;
-
-                let sin = rotation.sin();
-                let cos = rotation.cos();
-
-                position = Vec2::new(
-                    cos * (offset_position.x - position.x) - sin * (offset_position.y - position.y)
-                        + position.x,
-                    sin * (offset_position.x - position.x)
-                        + cos * (offset_position.y - position.y)
-                        + position.y,
-                );
-            }
-
-            let mut particles = storage::get_mut::<Particles>();
-            let cache = particles
-                .cache_map
-                .get_mut(&emitter.particle_effect_id)
-                .unwrap();
-
-            cache.spawn(position);
-
-            if let Some(emissions) = emitter.emissions {
-                emitter.emission_cnt += 1;
-
-                if emissions > 0 && emitter.emission_cnt >= emissions {
-                    emitter.is_active = false;
-                }
-            }
-        }
-    }
-}
-
-pub fn update_particle_emitters(world: &mut World) {
-    for (_, (transform, emitter)) in world.query_mut::<(&Transform, &mut ParticleEmitter)>() {
-        update_one_particle_emitter(transform.position, transform.rotation, emitter);
-    }
-
-    for (_, (transform, emitters)) in world.query_mut::<(&Transform, &mut Vec<ParticleEmitter>)>() {
-        for emitter in emitters.iter_mut() {
-            update_one_particle_emitter(transform.position, transform.rotation, emitter);
-        }
-    }
-}
-
-pub fn draw_particles(_world: &mut World) {
-    let mut particles = storage::get_mut::<Particles>();
-
-    for cache in particles.cache_map.values_mut() {
-        cache.draw();
-    }
-}
-
-#[derive(Default)]
-pub struct Particles {
-    pub cache_map: HashMap<String, EmittersCache>,
-}
-
-impl Particles {
-    pub fn new() -> Self {
-        let mut cache_map = HashMap::new();
-
-        let resources = storage::get::<Resources>();
-
-        for id in resources.particle_effects.keys() {
-            let config = resources.particle_effects.get(id).cloned().unwrap();
-
-            cache_map.insert(id.clone(), EmittersCache::new(config));
-        }
-
-        Particles { cache_map }
-    }
-}
diff --git a/src/physics.rs b/src/physics.rs
index 77d27c5524..f11a996661 100644
--- a/src/physics.rs
+++ b/src/physics.rs
@@ -1,97 +1,59 @@
-use macroquad::color;
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
+use bevy::{math::vec2, time::FixedTimestep};
 
-use macroquad_platformer::{Actor, Tile};
+use crate::{config::ENGINE_CONFIG, metadata::GameMeta, prelude::*};
 
-use serde::{Deserialize, Serialize};
+use self::collisions::{Actor, Collider, CollisionWorld, Rect, TileCollision};
 
-use hecs::World;
+pub mod collisions;
+pub mod debug;
 
-use crate::{CollisionWorld, Map};
-use core::{
-    math::{deg_to_rad, IsZero},
-    Transform,
-};
+pub struct PhysicsPlugin;
 
-pub const GRAVITY: f32 = 2.5;
-pub const TERMINAL_VELOCITY: f32 = 10.0;
-
-pub fn create_collision_world(map: &Map) -> CollisionWorld {
-    let tile_cnt = (map.grid_size.x * map.grid_size.y) as usize;
-    let mut static_colliders = Vec::with_capacity(tile_cnt);
-    for _ in 0..tile_cnt {
-        static_colliders.push(Tile::Empty);
-    }
-
-    for layer_id in &map.draw_order {
-        let layer = map.layers.get(layer_id).unwrap();
-        if layer.has_collision {
-            for (i, (_, _, tile)) in map.get_tiles(layer_id, None).enumerate() {
-                if let Some(tile) = tile {
-                    if tile
-                        .attributes
-                        .contains(&Map::PLATFORM_TILE_ATTRIBUTE.to_string())
-                    {
-                        static_colliders[i] = Tile::JumpThrough;
-                    } else {
-                        static_colliders[i] = Tile::Solid;
-                    }
-                }
-            }
-        }
-    }
-
-    let mut collision_world = CollisionWorld::new();
-    collision_world.add_static_tiled_layer(
-        static_colliders,
-        map.tile_size.x,
-        map.tile_size.y,
-        map.grid_size.x as usize,
-        1,
-    );
-
-    collision_world
-}
-
-const FRICTION_LERP: f32 = 0.96;
-const STOP_THRESHOLD: f32 = 1.0;
-
-#[derive(Debug, Clone)]
-pub struct PhysicsBodyParams {
-    pub size: Vec2,
-    pub offset: Vec2,
-    pub has_mass: bool,
-    pub has_friction: bool,
-    pub can_rotate: bool,
-    pub angular_velocity: f32,
-    pub bouncyness: f32,
-    pub gravity: f32,
+#[derive(StageLabel)]
+pub enum PhysicsStages {
+    Hydrate,
+    UpdatePhysics,
 }
 
-impl Default for PhysicsBodyParams {
-    fn default() -> Self {
-        PhysicsBodyParams {
-            size: vec2(16.0, 16.0),
-            offset: Vec2::ZERO,
-            has_mass: true,
-            has_friction: true,
-            can_rotate: true,
-            angular_velocity: 0.0,
-            bouncyness: 0.0,
-            gravity: GRAVITY,
+impl Plugin for PhysicsPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<KinematicBody>()
+            .register_type::<Collider>()
+            .add_stage_after(
+                CoreStage::PostUpdate,
+                PhysicsStages::Hydrate,
+                SystemStage::parallel().with_system(hydrate_physics_bodies),
+            )
+            .add_stage_after(
+                PhysicsStages::Hydrate,
+                PhysicsStages::UpdatePhysics,
+                SystemStage::parallel()
+                    .with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP))
+                    .with_system(
+                        update_kinematic_bodies
+                            .run_in_state(GameState::InGame)
+                            .run_not_in_state(InGameState::Paused),
+                    ),
+            );
+
+        if ENGINE_CONFIG.debug_tools {
+            app.add_plugin(debug::PhysicsDebugRenderPlugin);
         }
     }
 }
 
-/// Regular simulated physics bodies.
-/// Note that rotation is abstract, only set on the transform to be used for draws. The colliders
-/// are axis-aligned and will not be affected by rotation.
-pub struct PhysicsBody {
-    pub actor: Actor,
+/// A kinematic physics body
+///
+/// Used primarily for players and things that need to walk around, detect what kind of platform
+/// they are standing on, etc.
+///
+/// For now, all kinematic bodies have axis-aligned, rectangular colliders. This may or may not change in the future.
+#[derive(Reflect, Component, Default, Debug, Clone, Serialize, Deserialize)]
+#[reflect(Component, Default)]
+pub struct KinematicBody {
+    pub velocity: Vec2,
     pub offset: Vec2,
     pub size: Vec2,
-    pub velocity: Vec2,
     /// Angular velocity in degrees per second
     pub angular_velocity: f32,
     pub is_on_ground: bool,
@@ -105,206 +67,171 @@ pub struct PhysicsBody {
     pub bouncyness: f32,
     pub is_deactivated: bool,
     pub gravity: f32,
+    /// Whether or not the body should fall through jump_through platforms
+    pub fall_through: bool,
+    /// Indicates that we should reset the collider like it was just added to the world.
+    ///
+    /// This is important to make sure that it falls through JumpThrough platforms if it happens to
+    /// spawn inside of one.
+    pub is_spawning: bool,
 }
 
-impl PhysicsBody {
-    pub fn new<V: Into<Option<Vec2>>>(
-        actor: Actor,
-        velocity: V,
-        params: PhysicsBodyParams,
-    ) -> Self {
-        let velocity = velocity.into().unwrap_or_default();
-
-        PhysicsBody {
-            actor,
-            offset: params.offset,
-            size: params.size,
-            velocity,
-            angular_velocity: params.angular_velocity,
-            is_on_ground: false,
-            was_on_ground: false,
-            is_on_platform: false,
-            has_mass: params.has_mass,
-            has_friction: params.has_friction,
-            can_rotate: params.can_rotate,
-            bouncyness: params.bouncyness,
-            is_deactivated: false,
-            gravity: params.gravity,
-        }
-    }
-
-    pub fn as_rect(&self, position: Vec2) -> Rect {
-        let position = position + self.offset;
-        Rect::new(position.x, position.y, self.size.x, self.size.y)
+impl KinematicBody {
+    pub fn collider_rect(&self, position: Vec3) -> Rect {
+        Rect::new(
+            position.x + self.offset.x,
+            position.y + self.offset.y,
+            self.size.x,
+            self.size.y,
+        )
     }
 }
 
-pub fn fixed_update_physics_bodies(world: &mut World) {
-    let mut collision_world = storage::get_mut::<CollisionWorld>();
-
-    for (_, (transform, body)) in world.query_mut::<(&mut Transform, &mut PhysicsBody)>() {
-        collision_world.set_actor_position(body.actor, transform.position + body.offset);
-
-        if !body.is_deactivated {
-            let position = collision_world.actor_pos(body.actor);
-
-            {
-                let position = position + vec2(0.0, 1.0);
-
-                body.was_on_ground = body.is_on_ground;
+#[derive(Component)]
+struct KinematicBodyCollider;
 
-                body.is_on_ground = collision_world.collide_check(body.actor, position);
-
-                // FIXME: Using this to set `is_on_ground` caused weird glitching behavior when jumping up through platforms
-                let tile = collision_world.collide_solids(
-                    position,
-                    body.size.x as i32,
-                    body.size.y as i32,
-                );
-
-                body.is_on_platform = tile == Tile::JumpThrough;
-            }
+fn hydrate_physics_bodies(
+    mut commands: Commands,
+    bodies: Query<(Entity, &Transform, &KinematicBody), Without<Collider>>,
+) {
+    for (entity, transform, body) in &bodies {
+        if body.size.x.round() as i32 % 2 != 0 || body.size.y.round() as i32 % 2 != 0 {
+            warn!(
+                "TODO: Non-even widths and heights for colliders may currently \
+                behave incorrectly, getting stuck in walls."
+            );
+        }
+        commands
+            .entity(entity)
+            .insert(Collider {
+                pos: transform.translation.truncate() + body.offset,
+                width: body.size.x,
+                height: body.size.y,
+                ..default()
+            })
+            .insert(Actor);
+    }
+}
 
-            if !body.is_on_ground && body.has_mass {
-                body.velocity.y += body.gravity;
+fn update_kinematic_bodies(
+    game: Res<GameMeta>,
+    mut collision_world: CollisionWorld,
+    mut bodies: Query<(Entity, &mut KinematicBody, &mut Transform)>,
+) {
+    for (actor, mut body, mut transform) in &mut bodies {
+        if body.is_deactivated {
+            continue;
+        }
 
-                if body.velocity.y > TERMINAL_VELOCITY {
-                    body.velocity.y = TERMINAL_VELOCITY;
+        let mut position = transform.translation.truncate() + body.offset;
+
+        // Shove objects out of walls
+        while collision_world.collide_solids(position, body.size.x, body.size.y)
+            == TileCollision::Solid
+        {
+            let rect = collisions::Rect::new(position.x, position.y, body.size.x, body.size.y);
+
+            match (
+                collision_world.collide_tag(1, rect.top_left(), 0.0, 0.0) == TileCollision::Solid,
+                collision_world.collide_tag(1, rect.top_right(), 0.0, 0.0) == TileCollision::Solid,
+                collision_world.collide_tag(1, rect.bottom_right(), 0.0, 0.0)
+                    == TileCollision::Solid,
+                collision_world.collide_tag(1, rect.bottom_left(), 0.0, 0.0)
+                    == TileCollision::Solid,
+            ) {
+                // Check for collisions on each side of the rectangle
+                (false, false, _, _) => position.y += 1.0,
+                (_, false, false, _) => position.x += 1.0,
+                (_, _, false, false) => position.y -= 1.0,
+                (false, _, _, false) => position.x -= 1.0,
+                // If none of the sides of the rectangle are un-collided, then we don't know
+                // which direction to move to get out of the wall, and we just give up.
+                _ => {
+                    break;
                 }
             }
+        }
 
-            if !collision_world.move_h(body.actor, body.velocity.x) {
-                body.velocity.x *= -body.bouncyness;
-            }
-
-            if !collision_world.move_v(body.actor, body.velocity.y) {
-                body.velocity.y *= -body.bouncyness;
-            }
-
-            if body.can_rotate {
-                apply_rotation(
-                    transform,
-                    &mut body.velocity,
-                    body.angular_velocity,
-                    body.is_on_ground,
-                );
-            }
-
-            if body.is_on_ground && body.has_friction {
-                body.velocity.x *= FRICTION_LERP;
-                if body.velocity.x.abs() <= STOP_THRESHOLD {
-                    body.velocity.x = 0.0;
-                }
-            }
+        if body.is_spawning {
+            collision_world.add_actor(actor, position, body.size.x, body.size.y);
+            body.is_spawning = false;
+        }
 
-            transform.position = collision_world.actor_pos(body.actor) - body.offset;
+        if body.fall_through {
+            collision_world.descent(actor);
         }
-    }
-}
 
-pub fn debug_draw_physics_bodies(world: &mut World) {
-    for (_, (transform, body)) in world.query::<(&Transform, &PhysicsBody)>().iter() {
-        if !body.is_deactivated {
-            let rect = body.as_rect(transform.position);
+        collision_world.set_actor_position(actor, position);
 
-            let color = if body.is_on_platform {
-                color::YELLOW
-            } else if body.is_on_ground {
-                color::RED
-            } else {
-                color::GREEN
-            };
+        {
+            let position = position + vec2(0.0, -1.0);
 
-            draw_rectangle_lines(rect.x, rect.y, rect.w, rect.h, 2.0, color);
-        }
-    }
-}
+            body.was_on_ground = body.is_on_ground;
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct RigidBodyParams {
-    #[serde(with = "core::json::vec2_def")]
-    pub offset: Vec2,
-    #[serde(with = "core::json::vec2_def")]
-    pub size: Vec2,
-    #[serde(default, skip_serializing_if = "core::json::is_false")]
-    pub can_rotate: bool,
-}
+            body.is_on_ground = collision_world.collide_check(actor, position);
 
-impl Default for RigidBodyParams {
-    fn default() -> Self {
-        RigidBodyParams {
-            offset: Vec2::ZERO,
-            size: vec2(16.0, 16.0),
-            can_rotate: false,
+            let tile = collision_world.collide_solids(position, body.size.x, body.size.y);
+            body.is_on_platform = tile == TileCollision::JumpThrough;
         }
-    }
-}
-
-/// Simple physics bodies that has a velocity and optional rotation.
-/// Note that rotation is abstract, only set on the transform to be used for draws. The colliders
-/// are axis-aligned and will not be affected by rotation.
-pub struct RigidBody {
-    pub offset: Vec2,
-    pub size: Vec2,
-    pub velocity: Vec2,
-    pub can_rotate: bool,
-}
 
-impl RigidBody {
-    pub fn new<V: Into<Option<Vec2>>>(velocity: V, params: RigidBodyParams) -> Self {
-        let velocity = velocity.into().unwrap_or_default();
+        if !collision_world.move_h(actor, body.velocity.x) {
+            body.velocity.x *= -body.bouncyness;
+        }
 
-        RigidBody {
-            offset: params.offset,
-            size: params.size,
-            velocity,
-            can_rotate: params.can_rotate,
+        if !collision_world.move_v(actor, body.velocity.y) {
+            body.velocity.y *= -body.bouncyness;
         }
-    }
 
-    pub fn as_rect(&self, position: Vec2) -> Rect {
-        let position = position + self.offset;
-        Rect::new(position.x, position.y, self.size.x, self.size.y)
-    }
-}
+        if !body.is_on_ground && body.has_mass {
+            body.velocity.y -= body.gravity;
 
-pub fn fixed_update_rigid_bodies(world: &mut World) {
-    for (_, (transform, body)) in world.query_mut::<(&mut Transform, &mut RigidBody)>() {
-        transform.position += body.velocity;
+            if body.velocity.y < -game.physics.terminal_velocity {
+                body.velocity.y = -game.physics.terminal_velocity;
+            }
+        }
 
         if body.can_rotate {
-            apply_rotation(transform, &mut body.velocity, 0.0, false);
+            apply_rotation(
+                &mut transform,
+                body.velocity,
+                body.angular_velocity,
+                body.is_on_ground,
+            );
         }
-    }
-}
 
-pub fn debug_draw_rigid_bodies(world: &mut World) {
-    for (_, (transform, body)) in world.query::<(&Transform, &RigidBody)>().iter() {
-        let rect = body.as_rect(transform.position);
+        if body.is_on_ground && body.has_friction {
+            body.velocity.x *= game.physics.friction_lerp;
+            if body.velocity.x.abs() <= game.physics.stop_threshold {
+                body.velocity.x = 0.0;
+            }
+        }
 
-        draw_rectangle_lines(rect.x, rect.y, rect.w, rect.h, 2.0, color::RED)
+        transform.translation =
+            (collision_world.actor_pos(actor) - body.offset).extend(transform.translation.z);
     }
 }
 
 fn apply_rotation(
     transform: &mut Transform,
-    velocity: &mut Vec2,
+    velocity: Vec2,
     angular_velocity: f32,
     is_on_ground: bool,
 ) {
-    if !angular_velocity.is_zero() {
-        transform.rotation += deg_to_rad(angular_velocity * get_frame_time());
+    let mut angle = transform.rotation.to_euler(EulerRot::XYZ).2;
+    if angular_velocity != 0.0 {
+        angle += (angular_velocity * crate::FIXED_TIMESTEP as f32).to_radians();
     } else if !is_on_ground {
-        transform.rotation += velocity.x.abs() * 0.00045 + velocity.y.abs() * 0.00015;
+        angle += velocity.x.abs() * 0.00045 + velocity.y.abs() * 0.00015;
     } else {
-        transform.rotation %= std::f32::consts::PI * 2.0;
+        angle %= std::f32::consts::PI * 2.0;
 
         let goal = std::f32::consts::PI * 2.0;
 
-        let rest = goal - transform.rotation;
+        let rest = goal - angle;
         if rest.abs() >= 0.1 {
-            transform.rotation += (rest * 0.1).max(0.1);
+            angle += (rest * 0.1).max(0.1);
         }
     }
+
+    transform.rotation = Quat::from_rotation_z(angle);
 }
diff --git a/src/physics/collisions.rs b/src/physics/collisions.rs
new file mode 100644
index 0000000000..ddcc8d37b6
--- /dev/null
+++ b/src/physics/collisions.rs
@@ -0,0 +1,539 @@
+//! Modified from macroquad platformer:
+//!
+//! Copyright: @ 2019-2021 Fedor Logachev <not.fl3@gmail.com>
+//! Licenses:
+//!   - <https://github.com/not-fl3/macroquad/blob/master/LICENSE-MIT>
+//!   - <https://github.com/not-fl3/macroquad/blob/d706128463f2656c9e0d1a46e48de27403a8feb7/LICENSE-APACHE>
+
+use bevy::{ecs::system::SystemParam, math::vec2};
+use bevy_ecs_tilemap::{
+    prelude::{TilemapGridSize, TilemapTileSize},
+    tiles::TileStorage,
+};
+
+use crate::prelude::*;
+
+use std::collections::HashSet;
+
+#[derive(Debug)]
+pub struct Rect {
+    min: Vec2,
+    max: Vec2,
+}
+
+impl Rect {
+    pub fn new(x: f32, y: f32, width: f32, height: f32) -> Self {
+        let half_size = vec2(width / 2.0, height / 2.0);
+        let min = vec2(x, y) - half_size;
+        let max = min + vec2(width, height);
+        Self { min, max }
+    }
+
+    #[inline]
+    pub fn left(&self) -> f32 {
+        self.min.x
+    }
+
+    #[inline]
+    pub fn right(&self) -> f32 {
+        self.max.x
+    }
+
+    #[inline]
+    pub fn top(&self) -> f32 {
+        self.max.y
+    }
+
+    #[inline]
+    pub fn bottom(&self) -> f32 {
+        self.min.y
+    }
+
+    #[inline]
+    pub fn top_left(&self) -> Vec2 {
+        vec2(self.min.x, self.max.y)
+    }
+
+    #[inline]
+    pub fn top_right(&self) -> Vec2 {
+        vec2(self.max.x, self.max.y)
+    }
+
+    #[inline]
+    pub fn bottom_left(&self) -> Vec2 {
+        vec2(self.min.x, self.min.y)
+    }
+
+    #[inline]
+    pub fn bottom_right(&self) -> Vec2 {
+        vec2(self.max.x, self.min.y)
+    }
+
+    pub fn overlaps(&self, other: &Rect) -> bool {
+        self.left() <= other.right()
+            && self.right() >= other.left()
+            && self.top() >= other.bottom()
+            && self.bottom() <= other.top()
+    }
+
+    pub fn contains(&self, point: Vec2) -> bool {
+        point.x >= self.left()
+            && point.x < self.right()
+            && point.y < self.bottom()
+            && point.y >= self.top()
+    }
+
+    pub fn min(&self) -> Vec2 {
+        self.min
+    }
+
+    pub fn max(&self) -> Vec2 {
+        self.max
+    }
+}
+
+#[derive(Component, DerefMut, Deref)]
+pub struct CollisionLayerTag(pub u8);
+
+impl Default for CollisionLayerTag {
+    fn default() -> Self {
+        Self(1)
+    }
+}
+
+#[derive(SystemParam)]
+pub struct CollisionWorld<'w, 's> {
+    pub commands: Commands<'w, 's>,
+    pub static_tiled_layers: Query<
+        'w,
+        's,
+        (
+            &'static mut TileStorage,
+            &'static TilemapGridSize,
+            &'static TilemapTileSize,
+            &'static CollisionLayerTag,
+        ),
+    >,
+    pub tile_collisions: Query<'w, 's, &'static mut TileCollision>,
+    pub solids: Query<'w, 's, &'static mut Collider, (With<Solid>, Without<Actor>)>,
+    pub actors: Query<'w, 's, (Entity, &'static mut Collider), With<Actor>>,
+}
+
+#[derive(Component, Reflect, Default, Clone, Debug)]
+#[reflect(Component, Default)]
+pub struct Actor;
+
+#[derive(Component, Reflect, Default, Clone, Debug)]
+#[reflect(Component, Default)]
+pub struct Solid;
+
+#[derive(Reflect, Component, Default, Clone, Debug, Serialize, Deserialize)]
+#[reflect(Component, Default)]
+pub struct Collider {
+    pub collidable: bool,
+    pub squished: bool,
+    pub pos: Vec2,
+    pub width: f32,
+    pub height: f32,
+    pub x_remainder: f32,
+    pub y_remainder: f32,
+    #[reflect(ignore)]
+    pub squishers: HashSet<Entity>,
+    pub descent: bool,
+    pub seen_wood: bool,
+}
+
+impl Collider {
+    fn rect(&self) -> Rect {
+        Rect::new(self.pos.x, self.pos.y, self.width, self.height)
+    }
+}
+
+#[derive(Component, Reflect, Default, PartialEq, Eq, Clone, Copy, Debug)]
+#[reflect_value(Component, Default, PartialEq)]
+pub enum TileCollision {
+    #[default]
+    Empty,
+    Solid,
+    JumpThrough,
+    Collider,
+}
+
+impl TileCollision {
+    fn or(self, other: TileCollision) -> TileCollision {
+        match (self, other) {
+            (TileCollision::Empty, TileCollision::Empty) => TileCollision::Empty,
+            (TileCollision::JumpThrough, TileCollision::JumpThrough) => TileCollision::JumpThrough,
+            (TileCollision::JumpThrough, TileCollision::Empty) => TileCollision::JumpThrough,
+            (TileCollision::Empty, TileCollision::JumpThrough) => TileCollision::JumpThrough,
+            _ => TileCollision::Solid,
+        }
+    }
+}
+
+impl<'w, 's> CollisionWorld<'w, 's> {
+    #[allow(unused)]
+    pub fn add_actor(&mut self, actor: Entity, pos: Vec2, width: f32, height: f32) {
+        let mut descent = false;
+        let mut seen_wood = false;
+        let tile = self.collide_solids(pos, width, height);
+        if tile == TileCollision::JumpThrough {
+            descent = true;
+            seen_wood = true;
+        }
+        self.commands.entity(actor).insert(Collider {
+            collidable: true,
+            squished: false,
+            pos,
+            width,
+            height,
+            x_remainder: 0.,
+            y_remainder: 0.,
+            squishers: HashSet::new(),
+            descent,
+            seen_wood,
+        });
+    }
+
+    #[allow(unused)]
+    pub fn add_solid(&mut self, solid: Entity, pos: Vec2, width: f32, height: f32) {
+        self.commands.entity(solid).insert(Collider {
+            collidable: true,
+            squished: false,
+            pos,
+            width,
+            height,
+            x_remainder: 0.,
+            y_remainder: 0.,
+            squishers: HashSet::new(),
+            descent: false,
+            seen_wood: false,
+        });
+    }
+
+    pub fn set_actor_position(&mut self, entity: Entity, pos: Vec2) {
+        let mut collider = self.actors.get_mut(entity).unwrap().1;
+
+        collider.x_remainder = 0.0;
+        collider.y_remainder = 0.0;
+        collider.pos = pos;
+    }
+
+    /// Returns the collisions that one actor has with any other actors
+    pub fn actor_collisions(&self, entity: Entity) -> Vec<Entity> {
+        let mut collisions = Vec::new();
+
+        let collider = if let Ok((_, collider)) = self.actors.get(entity) {
+            collider.clone()
+        } else {
+            return collisions;
+        };
+        let rect = collider.rect();
+
+        for (other_entity, collider) in &self.actors {
+            if entity == other_entity {
+                continue;
+            }
+            let other_rect = collider.rect();
+            if rect.overlaps(&other_rect) {
+                collisions.push(other_entity);
+            }
+        }
+
+        collisions
+    }
+
+    #[allow(unused)]
+    pub fn descent(&mut self, entity: Entity) {
+        let mut collider = self.actors.get_mut(entity).unwrap().1;
+        collider.descent = true;
+    }
+
+    pub fn move_v(&mut self, entity: Entity, dy: f32) -> bool {
+        let mut collider = self.actors.get(entity).unwrap().1.clone();
+
+        collider.y_remainder += dy;
+
+        let mut move_ = collider.y_remainder.round() as i32;
+        if move_ != 0 {
+            collider.y_remainder -= move_ as f32;
+            let sign = move_.signum();
+
+            while move_ != 0 {
+                let tile = self.collide_solids(
+                    collider.pos + vec2(0., sign as f32),
+                    collider.width,
+                    collider.height,
+                );
+
+                // collider wants to go down and collided with jumpthrough tile
+                if tile == TileCollision::JumpThrough && collider.descent {
+                    collider.seen_wood = true;
+                }
+                // collider wants to go up and encoutered jumpthrough obstace
+                if tile == TileCollision::JumpThrough && sign > 0 {
+                    collider.seen_wood = true;
+                    collider.descent = true;
+                }
+                if tile == TileCollision::Empty
+                    || (tile == TileCollision::JumpThrough && collider.descent)
+                {
+                    collider.pos.y += sign as f32;
+                    move_ -= sign;
+                } else {
+                    collider.pos.y = collider.pos.y.floor();
+                    *self.actors.get_mut(entity).unwrap().1 = collider;
+
+                    return false;
+                }
+            }
+        }
+
+        // Final check, if we are out of woods after the move - reset wood flags
+        let tile = self.collide_solids(collider.pos, collider.width, collider.height);
+        if tile != TileCollision::JumpThrough {
+            collider.seen_wood = false;
+            collider.descent = false;
+        }
+
+        *self.actors.get_mut(entity).unwrap().1 = collider;
+        true
+    }
+
+    pub fn move_h(&mut self, entity: Entity, dx: f32) -> bool {
+        let mut collider = self.actors.get(entity).unwrap().1.clone();
+        collider.x_remainder += dx;
+
+        let mut move_ = collider.x_remainder.round() as i32;
+        if move_ != 0 {
+            collider.x_remainder -= move_ as f32;
+            let sign = move_.signum();
+
+            while move_ != 0 {
+                let tile = self.collide_solids(
+                    collider.pos + vec2(sign as f32, 0.),
+                    collider.width,
+                    collider.height,
+                );
+                if tile == TileCollision::JumpThrough {
+                    collider.descent = true;
+                    collider.seen_wood = true;
+                }
+                if tile == TileCollision::Empty || tile == TileCollision::JumpThrough {
+                    collider.pos.x += sign as f32;
+                    move_ -= sign;
+                } else {
+                    collider.pos.x = collider.pos.x.floor();
+                    *self.actors.get_mut(entity).unwrap().1 = collider;
+                    return false;
+                }
+            }
+        }
+        *self.actors.get_mut(entity).unwrap().1 = collider;
+        true
+    }
+
+    #[allow(unused)]
+    pub fn solid_move(&mut self, solid: Entity, dx: f32, dy: f32) {
+        let mut collider = self.solids.get_mut(solid).unwrap();
+
+        collider.x_remainder += dx;
+        collider.y_remainder += dy;
+        let move_x = collider.x_remainder.round() as i32;
+        let move_y = collider.y_remainder.round() as i32;
+
+        let mut riding_actors = vec![];
+        let mut pushing_actors = vec![];
+
+        let riding_rect = Rect::new(
+            collider.pos.x,
+            collider.pos.y - 1.0,
+            collider.width as f32,
+            1.0,
+        );
+        let pushing_rect = Rect::new(
+            collider.pos.x + move_x as f32,
+            collider.pos.y,
+            collider.width as f32,
+            collider.height as f32,
+        );
+
+        for (actor, mut actor_collider) in &mut self.actors {
+            let rider_rect = Rect::new(
+                actor_collider.pos.x,
+                actor_collider.pos.y + actor_collider.height as f32 - 1.0,
+                actor_collider.width as f32,
+                1.0,
+            );
+
+            if riding_rect.overlaps(&rider_rect) {
+                riding_actors.push(actor);
+            } else if pushing_rect.overlaps(&actor_collider.rect()) && !actor_collider.squished {
+                pushing_actors.push(actor);
+            }
+
+            if !pushing_rect.overlaps(&actor_collider.rect()) {
+                actor_collider.squishers.remove(&solid);
+                if actor_collider.squishers.is_empty() {
+                    actor_collider.squished = false;
+                }
+            }
+        }
+
+        self.solids.get_mut(solid).unwrap().collidable = false;
+        for actor in riding_actors {
+            self.move_h(actor, move_x as f32);
+        }
+        for actor in pushing_actors {
+            let squished = !self.move_h(actor, move_x as f32);
+            if squished {
+                let mut collider = self.actors.get_mut(actor).unwrap().1;
+                collider.squished = true;
+                collider.squishers.insert(solid);
+            }
+        }
+        self.solids.get_mut(solid).unwrap().collidable = true;
+
+        let mut collider = self.solids.get_mut(solid).unwrap();
+        if move_x != 0 {
+            collider.x_remainder -= move_x as f32;
+            collider.pos.x += move_x as f32;
+        }
+        if move_y != 0 {
+            collider.y_remainder -= move_y as f32;
+            collider.pos.y += move_y as f32;
+        }
+    }
+
+    #[allow(unused)]
+    pub fn solid_at(&self, pos: Vec2) -> bool {
+        self.tag_at(pos, 1)
+    }
+
+    #[allow(unused)]
+    pub fn tag_at(&self, pos: Vec2, tag: u8) -> bool {
+        for (storage, grid_size, tile_size, layer_tag) in &self.static_tiled_layers {
+            let x = (pos.x / tile_size.y) as i32;
+            let y = (pos.y / tile_size.x) as i32;
+            if x >= 0
+                && x < grid_size.x as i32
+                && y >= 0
+                && y < grid_size.y as i32
+                && storage.get(&UVec2::new(x as _, y as _).into()).is_some()
+            {
+                return **layer_tag == tag;
+            }
+        }
+
+        self.solids
+            .iter()
+            .any(|solid| solid.collidable && solid.rect().contains(pos))
+    }
+
+    pub fn collide_solids(&self, pos: Vec2, width: f32, height: f32) -> TileCollision {
+        let tile = self.collide_tag(1, pos, width, height);
+        if tile != TileCollision::Empty {
+            return tile;
+        }
+
+        self.solids
+            .iter()
+            .find(|solid| {
+                solid.collidable
+                    && solid
+                        .rect()
+                        .overlaps(&Rect::new(pos.x, pos.y, width, height))
+            })
+            .map_or(TileCollision::Empty, |_| TileCollision::Collider)
+    }
+
+    pub fn collide_tag(&self, tag: u8, pos: Vec2, width: f32, height: f32) -> TileCollision {
+        for (storage, grid_size, tile_size, layer_tag) in &self.static_tiled_layers {
+            let check = |pos: Vec2| {
+                let y = (pos.y / tile_size.x) as i32;
+                let x = (pos.x / tile_size.y) as i32;
+                if x >= 0
+                    && x < grid_size.x as i32
+                    && y >= 0
+                    && y < grid_size.y as i32
+                    && **layer_tag == tag
+                {
+                    storage
+                        .get(&UVec2::new(x as _, y as _).into())
+                        .map(|entity| *self.tile_collisions.get(entity).unwrap())
+                        .unwrap_or_default()
+                } else {
+                    TileCollision::Empty
+                }
+            };
+
+            let hw = width / 2.0;
+            let hh = height / 2.0;
+            let tile = check(pos + vec2(-hw, -hh))
+                .or(check(pos + vec2(-hw, hh)))
+                .or(check(pos + vec2(hw, hh)))
+                .or(check(pos + vec2(hw, -hh)));
+
+            if tile != TileCollision::Empty {
+                return tile;
+            }
+
+            if width as i32 > tile_size.x as i32 {
+                let mut x = pos.x - hw;
+
+                while {
+                    x += tile_size.x;
+                    x < pos.x + hw - 1.
+                } {
+                    let tile = check(vec2(x, pos.y - hh)).or(check(vec2(x, pos.y + hh)));
+                    if tile != TileCollision::Empty {
+                        return tile;
+                    }
+                }
+            }
+
+            if height as i32 > tile_size.y as i32 {
+                let mut y = pos.y - hh;
+
+                while {
+                    y += tile_size.y;
+                    y < pos.y + hh - 1.
+                } {
+                    let tile = check(vec2(pos.x - hw, y)).or(check(vec2(pos.x + hw, y)));
+                    if tile != TileCollision::Empty {
+                        return tile;
+                    }
+                }
+            }
+        }
+
+        TileCollision::Empty
+    }
+
+    #[allow(unused)]
+    pub fn squished(&self, actor: Entity) -> bool {
+        self.actors.get(actor).unwrap().1.squished
+    }
+
+    pub fn actor_pos(&self, actor: Entity) -> Vec2 {
+        self.actors.get(actor).unwrap().1.pos
+    }
+
+    #[allow(unused)]
+    pub fn solid_pos(&self, solid: Entity) -> Vec2 {
+        self.solids.get(solid).unwrap().pos
+    }
+
+    pub fn collide_check(&self, collider: Entity, pos: Vec2) -> bool {
+        let collider = self.actors.get(collider).unwrap().1;
+
+        let tile = self.collide_solids(pos, collider.width, collider.height);
+        if collider.descent {
+            tile == TileCollision::Solid || tile == TileCollision::Collider
+        } else {
+            tile == TileCollision::Solid
+                || tile == TileCollision::Collider
+                || tile == TileCollision::JumpThrough
+        }
+    }
+}
diff --git a/src/physics/debug.rs b/src/physics/debug.rs
new file mode 100644
index 0000000000..8839a4ace6
--- /dev/null
+++ b/src/physics/debug.rs
@@ -0,0 +1,217 @@
+use bevy::{
+    ecs::system::SystemParam,
+    math::vec2,
+    prelude::*,
+    utils::{FloatOrd, HashMap},
+};
+use bevy_prototype_lyon::{entity::ShapeBundle, prelude::*};
+
+use crate::damage::DamageRegion;
+
+use super::{collisions::Collider, KinematicBody, PhysicsStages};
+
+/// Physics debug rendering plugin
+pub struct PhysicsDebugRenderPlugin;
+
+/// Resource used to configure debug rendering
+#[derive(Default)]
+pub struct PhysicsDebugRenderConfig {
+    pub enabled: bool,
+}
+
+/// Component that may be added to entities with colliders to change the color of it's collision debug render
+#[derive(Component, Deref, DerefMut)]
+pub struct ColliderDebugColor(pub Color);
+
+/// The stage in which the physics debug shapes are generated
+#[derive(StageLabel)]
+struct PhysicsDebugRenderStage;
+
+impl Plugin for PhysicsDebugRenderPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<PhysicsDebugRenderConfig>()
+            .add_stage_after(
+                PhysicsStages::UpdatePhysics,
+                PhysicsDebugRenderStage,
+                SystemStage::single(render_collision_shapes),
+            );
+    }
+}
+
+const DEFAULT_COLLIDER_COLOR: Color = Color::ORANGE;
+const DEFAULT_DAMAGE_REGION_COLOR: Color = Color::RED;
+
+/// System that renders the debug shapes
+fn render_collision_shapes(mut renderer: DebugRenderer, config: Res<PhysicsDebugRenderConfig>) {
+    if config.enabled {
+        renderer.render();
+    } else {
+        renderer.finish();
+    }
+}
+
+#[derive(Component)]
+struct RapierDebugRenderShapes;
+
+#[derive(Deref, DerefMut)]
+pub struct HashEqColor(Color);
+
+impl std::hash::Hash for HashEqColor {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        let [r, g, b, a] = self.0.as_rgba_f32();
+        FloatOrd(r).hash(state);
+        FloatOrd(g).hash(state);
+        FloatOrd(b).hash(state);
+        FloatOrd(a).hash(state);
+    }
+}
+
+impl std::cmp::PartialEq for HashEqColor {
+    fn eq(&self, other: &Self) -> bool {
+        let [r1, g1, b1, a1] = self.0.as_rgba_f32();
+        let [r2, g2, b2, a2] = other.0.as_rgba_f32();
+        FloatOrd(r1) == FloatOrd(r2)
+            && FloatOrd(g1) == FloatOrd(g2)
+            && FloatOrd(b1) == FloatOrd(b2)
+            && FloatOrd(a1) == FloatOrd(a2)
+    }
+}
+impl std::cmp::Eq for HashEqColor {}
+
+/// Rapier debug rendering backend that uses Egui to draw the lines
+#[derive(SystemParam)]
+struct DebugRenderer<'w, 's> {
+    commands: Commands<'w, 's>,
+    shape_paths: Local<'s, HashMap<HashEqColor, ShapePath>>,
+    paths_query:
+        Query<'w, 's, (&'static mut Path, &'static mut DrawMode), With<RapierDebugRenderShapes>>,
+    custom_colors: Query<'w, 's, &'static ColliderDebugColor>,
+    colliders: Query<'w, 's, (Entity, &'static Collider)>,
+    damage_regions: Query<'w, 's, (Entity, &'static DamageRegion, &'static GlobalTransform)>,
+    kinematic_bodies: Query<'w, 's, &'static KinematicBody>,
+}
+
+impl<'w, 's> DebugRenderer<'w, 's> {
+    /// Render the shapes
+    fn render(&mut self) {
+        self.draw_colliders();
+        self.draw_damage_regions();
+
+        self.finish();
+    }
+
+    /// Draw collider shapes
+    fn draw_colliders(&mut self) {
+        for (entity, collider) in &self.colliders {
+            let color = self.color(entity, DEFAULT_COLLIDER_COLOR);
+
+            let shape_path_ref = self.shape_paths.entry(HashEqColor(color)).or_default();
+            let shape_path = std::mem::take(shape_path_ref);
+
+            *shape_path_ref = shape_path.add(&ColliderRect {
+                pos: collider.pos,
+                size: vec2(collider.width, collider.height),
+            });
+        }
+    }
+
+    /// Draw damage region shapes
+    fn draw_damage_regions(&mut self) {
+        for (entity, damage_region, transform) in &self.damage_regions {
+            let color = self.color(entity, DEFAULT_DAMAGE_REGION_COLOR);
+
+            let shape_path_ref = self.shape_paths.entry(HashEqColor(color)).or_default();
+            let shape_path = std::mem::take(shape_path_ref);
+
+            *shape_path_ref = shape_path.add(&ColliderRect {
+                pos: transform.translation().truncate(),
+                size: vec2(damage_region.size.x, damage_region.size.y),
+            });
+        }
+    }
+
+    /// Called to finish generating shapes
+    fn finish(&mut self) {
+        let mut query_iter = self.paths_query.iter_mut();
+
+        for (color, shape_path) in self.shape_paths.drain() {
+            let path = shape_path.build();
+            let mode = DrawMode::Stroke(StrokeMode::new(*color, 0.75));
+
+            if let Some((mut old_path, mut old_mode)) = query_iter.next() {
+                *old_path = path;
+                *old_mode = mode;
+            } else {
+                self.commands
+                    .spawn_bundle(ShapeBundle {
+                        path,
+                        mode,
+                        // Set the rendering a tiny bit forward to avoid z-fighting with the editor
+                        // overlays.
+                        transform: Transform::from_xyz(0.0, 0.0, -0.1),
+                        ..default()
+                    })
+                    .insert(Name::new("Rapier Debug Render Shapes"))
+                    .insert(RapierDebugRenderShapes);
+            }
+        }
+
+        // Clear out any shape entities we haven't used up
+        for (mut path, _) in query_iter {
+            *path = ShapePath::default().build();
+        }
+    }
+
+    /// Helper to grab the objects custom collider color if it exists
+    fn color(&self, entity: Entity, default_color: Color) -> Color {
+        self.custom_colors
+            .get(entity)
+            .map(|co| co.0)
+            .ok()
+            .unwrap_or_else(|| {
+                let is_deactivated = self
+                    .kinematic_bodies
+                    .get(entity)
+                    .map(|body| body.is_deactivated)
+                    .unwrap_or(false);
+
+                if is_deactivated {
+                    // Make deactivated bodies invisible
+                    Color::rgba(0.0, 0.0, 0.0, 0.0)
+                } else {
+                    default_color
+                }
+            })
+    }
+}
+
+/// Helper type that implements [`Geometry`] for rendering rectangle shapes at a specific location.
+struct ColliderRect {
+    pos: Vec2,
+    size: Vec2,
+}
+
+mod geom {
+    use bevy_prototype_lyon::prelude::tess::{
+        geom::euclid::{Point2D, Size2D},
+        math::Rect,
+        path::traits::PathBuilder,
+    };
+
+    use super::*;
+
+    impl Geometry for ColliderRect {
+        fn add_geometry(&self, b: &mut tess::path::path::Builder) {
+            b.add_rectangle(
+                &Rect {
+                    origin: Point2D::new(
+                        self.pos.x - self.size.x / 2.0,
+                        self.pos.y - self.size.y / 2.0,
+                    ),
+                    size: Size2D::new(self.size.x, self.size.y),
+                },
+                tess::path::Winding::Positive,
+            )
+        }
+    }
+}
diff --git a/src/platform.rs b/src/platform.rs
new file mode 100644
index 0000000000..444d13d28e
--- /dev/null
+++ b/src/platform.rs
@@ -0,0 +1,428 @@
+//! Systems and utilities related to specific platform support or platform abstractions
+
+use async_channel::{Receiver, Sender};
+use bevy::{prelude::*, utils::HashMap};
+use iyes_loopless::prelude::*;
+use serde::{de::DeserializeOwned, Serialize};
+
+use crate::prelude::*;
+
+#[cfg(not(target_arch = "wasm32"))]
+use native as backend;
+
+#[cfg(target_arch = "wasm32")]
+use wasm as backend;
+
+pub struct PlatformPlugin;
+
+impl Plugin for PlatformPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<Storage>()
+            .add_system(load_storage.run_in_state(GameState::LoadingPlatformStorage));
+    }
+}
+
+/// Bevy system that will load the [`Storage`] and wait for it to finish loading so it can be used
+/// throughout the rest of the game without having to check that storage is loaded.
+///
+/// Will transition to [`GameState::LoadingGameData`] when finished.
+pub fn load_storage(
+    mut started: Local<bool>,
+    mut commands: Commands,
+    mut storage: ResMut<Storage>,
+) {
+    // If we haven't started loading
+    if !*started {
+        debug!("Start loading platform storage");
+        // Start loading
+        *started = true;
+        storage.load();
+
+    // If storage has finished loading
+    } else if storage.is_loaded() {
+        debug!("Done loading platform storage");
+        // Load game
+        commands.insert_resource(NextState(GameState::LoadingGameData));
+    }
+}
+
+/// The type of the inner data in [`Storage`]
+type StorageData = HashMap<String, serde_yaml::Value>;
+
+/// Resource for accessing platform specific persistent storage apis through a simple interface.
+pub struct Storage {
+    /// The in-memory storage data that we operate on when getting and setting values.
+    data: Option<StorageData>,
+    /// A data receiver that gets set when we are awaiting the result of a [`Self::load()`] operation.
+    data_receiver: Option<Receiver<StorageData>>,
+    /// The sender we use to send storage requests to the storage backend
+    backend_sender: Sender<StorageRequest>,
+}
+
+impl FromWorld for Storage {
+    fn from_world(_: &mut World) -> Self {
+        let backend_sender = backend::init_storage();
+
+        Self {
+            data: None,
+            data_receiver: None,
+            backend_sender,
+        }
+    }
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum StorageError {
+    #[error("Storage has not been loaded yet")]
+    NotLoaded,
+    #[error("Storage backend connection lost")]
+    BackendLost,
+    #[error("Storage key could not be serizlized/deserialized: {0}")]
+    SerializationError(#[from] serde_yaml::Error),
+}
+
+impl Storage {
+    fn check_pending_data_load(&mut self) {
+        // If we are waiting on a data load response
+        if let Some(receiver) = &mut self.data_receiver {
+            // If the data has been loaded
+            if let Ok(data) = receiver.try_recv() {
+                // Set the local data and clear the load receiver
+                self.data = Some(data);
+                self.data_receiver = None;
+            }
+        }
+    }
+
+    /// Get whether or not storage has been loaded.
+    ///
+    /// Before you may get or set values, you must [`load()`][Self::load] the storage.
+    pub fn is_loaded(&mut self) -> bool {
+        self.check_pending_data_load();
+
+        self.data.is_some()
+    }
+
+    /// Load from platform storage into memory.
+    ///
+    /// This process is asynchronous. Loaded data will not be available immediately, and
+    /// [`Self::is_loaded()`] can be used to check whether or not data has been loaded.
+    pub fn try_load(&mut self) -> Result<(), StorageError> {
+        let (result_sender, data_receiver) = async_channel::unbounded();
+
+        self.data_receiver = Some(data_receiver);
+
+        self.backend_sender
+            .try_send(StorageRequest::Load { result_sender })
+            .map_err(|_| StorageError::BackendLost)?;
+
+        Ok(())
+    }
+
+    /// Load from platform storage into memory.
+    ///
+    /// This process is asynchronous. Loaded data will not be available immediately, and
+    /// [`Self::is_loaded()`] can be used to check whether or not data has been loaded.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the storage backend disconnects for some reason.
+    #[track_caller]
+    pub fn load(&mut self) {
+        self.try_load().expect("Storage load")
+    }
+
+    /// Try to get a value from the in-memory storage cache.
+    pub fn try_get<T>(&mut self, key: &str) -> Result<Option<T>, StorageError>
+    where
+        T: Serialize + DeserializeOwned,
+    {
+        self.check_pending_data_load();
+
+        if let Some(data) = &self.data {
+            let value = data.get(key).cloned();
+
+            if let Some(value) = value {
+                let value = serde_yaml::from_value(value)?;
+
+                Ok(Some(value))
+            } else {
+                Ok(None)
+            }
+        } else {
+            Err(StorageError::NotLoaded)
+        }
+    }
+
+    /// Get a value from the in-memory storage cache.
+    ///
+    /// # Panics
+    ///
+    /// This will panic if storage has not been loaded yet or if there is a deserialization error.
+    #[track_caller]
+    pub fn get<T>(&mut self, key: &str) -> Option<T>
+    where
+        T: Serialize + DeserializeOwned,
+    {
+        match self.try_get(key) {
+            Ok(data) => data,
+            Err(e) => {
+                error!(
+                    "Error deserializing storage key, returning empty value: {}",
+                    e
+                );
+                None
+            }
+        }
+    }
+
+    /// Set a value in the in-memory storage cache.
+    ///
+    /// Changes will not be persisted until [`Self::save()`] is called.
+    pub fn try_set<T>(&mut self, key: &str, value: &T) -> Result<(), StorageError>
+    where
+        T: Serialize + DeserializeOwned,
+    {
+        self.check_pending_data_load();
+
+        if let Some(data) = &mut self.data {
+            let value = serde_yaml::to_value(value)?;
+            data.insert(key.into(), value);
+
+            Ok(())
+        } else {
+            Err(StorageError::NotLoaded)
+        }
+    }
+
+    /// Set a value in the in-memory storage cache.
+    ///
+    ///
+    /// Changes will not be persisted until [`Self::save()`] is called.
+    ///
+    /// # Panics
+    ///
+    /// This will panic if storage has not been loaded yet or if there is a serialization error.
+    #[track_caller]
+    pub fn set<T>(&mut self, key: &str, value: &T)
+    where
+        T: Serialize + DeserializeOwned,
+    {
+        self.try_set(key, value).expect("Set value in storage")
+    }
+
+    /// Saves the in-memory storage cache to persistent storage.
+    ///
+    /// This operation is asynchronous and returns a [`SaveTask`] that can be used to check when the
+    /// operation is complete.
+    pub fn try_save(&mut self) -> Result<SaveTask, StorageError> {
+        self.check_pending_data_load();
+
+        if let Some(data) = &self.data {
+            let (result_sender, result_receiver) = async_channel::unbounded();
+
+            self.backend_sender
+                .try_send(StorageRequest::Save {
+                    data: data.clone(),
+                    result_sender,
+                })
+                .map_err(|_| StorageError::BackendLost)?;
+
+            Ok(SaveTask(result_receiver))
+        } else {
+            Err(StorageError::NotLoaded)
+        }
+    }
+
+    /// Saves the in-memory storage cache to persistent storage.
+    ///
+    /// This operation is asynchronous and returns a [`SaveTask`] that can be used to check when the
+    /// operation is complete.
+    ///
+    /// # Panics
+    ///
+    /// This will panic if the storage hasn't been loaded yet or if the storage backend disconnects
+    /// for some reason.
+    #[track_caller]
+    pub fn save(&mut self) -> SaveTask {
+        self.try_save().expect("Save storage")
+    }
+}
+
+/// [`Storage::save()`] task handle that can be used to check whether or not saving has been
+/// completed.
+pub struct SaveTask(Receiver<()>);
+
+impl SaveTask {
+    /// Get whether or not saving has been completed.
+    #[allow(unused)] // TODO: Remove when we use it
+    pub fn is_complete(&mut self) -> bool {
+        !self.0.is_empty()
+    }
+}
+
+enum StorageRequest {
+    Load {
+        result_sender: Sender<StorageData>,
+    },
+    Save {
+        data: StorageData,
+        result_sender: Sender<()>,
+    },
+}
+
+/// Native platform support
+#[cfg(not(target_arch = "wasm32"))]
+mod native {
+    use std::{
+        fs,
+        io::{Read, Write},
+    };
+
+    use async_channel::Sender;
+    use bevy::{
+        prelude::{error, trace},
+        tasks::IoTaskPool,
+        utils::HashMap,
+    };
+
+    use super::StorageRequest;
+
+    pub(super) fn init_storage() -> Sender<StorageRequest> {
+        trace!("Initialize platform storage backend");
+        let io_task_pool = IoTaskPool::get();
+
+        // Create channel used for sending and receving storage requests
+        let (sender, receiver) = async_channel::unbounded();
+
+        // Identify project storage file path
+        let project_dirs = directories::ProjectDirs::from("org", "FishFolk", "Jumpy")
+            .expect("Identify system data dir path");
+        let file_path = project_dirs.data_dir().join("storage.yml");
+
+        trace!(?file_path, "Platform storage filepath");
+
+        // Spawn an async task that will read and write to the filesystem
+        io_task_pool
+            .spawn(async move {
+                while let Ok(request) = receiver.recv().await {
+                    match request {
+                        StorageRequest::Load { result_sender } => {
+                            let data = if file_path.exists() {
+                                let mut file = fs::OpenOptions::new()
+                                    .read(true)
+                                    .open(&file_path)
+                                    .expect("Open storage file");
+
+                                let mut contents = Vec::new();
+                                file.read_to_end(&mut contents).expect("Read storage file");
+
+                                match serde_yaml::from_slice(&contents) {
+                                    Ok(data) => data,
+                                    Err(e) => {
+                                        error!(
+                                            "Error deserializing storage file. Ignoring existing \
+                                            data and overwriting on next attempt to save: {}",
+                                            e
+                                        );
+                                        Default::default()
+                                    }
+                                }
+                            } else {
+                                HashMap::new()
+                            };
+
+                            result_sender.try_send(data).ok();
+                        }
+                        StorageRequest::Save {
+                            data,
+                            result_sender,
+                        } => {
+                            let data = serde_yaml::to_string(&data).expect("Serialize data");
+                            if let Some(parent) = file_path.parent() {
+                                std::fs::create_dir_all(parent).expect("Create storage dir");
+                            }
+                            let mut file = fs::OpenOptions::new()
+                                .create(true)
+                                .write(true)
+                                .truncate(true)
+                                .open(&file_path)
+                                .expect("Open storage file");
+
+                            file.write_all(data.as_bytes()).expect("Write storage file");
+
+                            result_sender.try_send(()).ok();
+                        }
+                    }
+                }
+            })
+            .detach();
+
+        sender
+    }
+}
+
+/// WASM platform support
+#[cfg(target_arch = "wasm32")]
+mod wasm {
+    use async_channel::Sender;
+    use bevy::{prelude::*, tasks::IoTaskPool};
+
+    use super::StorageRequest;
+
+    const BROWSER_LOCAL_STORAGE_KEY: &str = "jumpy-platform-storage";
+
+    /// Initialize storage backend
+    pub(super) fn init_storage() -> Sender<StorageRequest> {
+        trace!("Initialize platform storage backend");
+        let io_task_pool = IoTaskPool::get();
+
+        // Create channel used for sending and receving storage requests
+        let (sender, receiver) = async_channel::unbounded();
+
+        // Spawn an async task for interfacing with browser local storage
+        io_task_pool.spawn(async move {
+            let local_storage = web_sys::window().unwrap().local_storage().unwrap().unwrap();
+
+            // Loop as long as there are still storage request senders in scope
+            while let Ok(request) = receiver.recv().await {
+                match request {
+                    StorageRequest::Load { result_sender } => {
+                        let data = local_storage
+                            .get_item(BROWSER_LOCAL_STORAGE_KEY)
+                            .unwrap()
+                            .and_then(|data| match serde_yaml::from_str(&data) {
+                                Ok(data) => data,
+                                Err(e) => {
+                                    error!(
+                                        "Error deserializing storage, ignoring existing data \
+                                        and overwriting on next attempt to set data in storage: {}",
+                                        e
+                                    );
+
+                                    None
+                                }
+                            })
+                            .unwrap_or_default();
+
+                        result_sender.try_send(data).ok();
+                    }
+                    StorageRequest::Save {
+                        data,
+                        result_sender,
+                    } => {
+                        let data = serde_yaml::to_string(&data).expect("Serialize platform data");
+
+                        local_storage
+                            .set_item(BROWSER_LOCAL_STORAGE_KEY, &data)
+                            .unwrap();
+
+                        result_sender.try_send(()).ok();
+                    }
+                }
+            }
+        });
+
+        sender
+    }
+}
diff --git a/src/player.rs b/src/player.rs
new file mode 100644
index 0000000000..0abd8f4ffd
--- /dev/null
+++ b/src/player.rs
@@ -0,0 +1,458 @@
+use bevy::ecs::system::Command;
+use bevy_tweening::Animator;
+
+use crate::{
+    item::{Item, ItemDropEvent, ItemGrabEvent, ItemUseEvent},
+    metadata::{GameMeta, PlayerMeta, Settings},
+    networking::{
+        proto::{
+            game::{PlayerEvent, PlayerEventFromServer},
+            ClientMatchInfo,
+        },
+        server::NetServer,
+    },
+    physics::KinematicBody,
+    platform::Storage,
+    prelude::*,
+};
+
+use self::{input::PlayerInputs, state::PlayerState};
+
+pub mod input;
+pub mod state;
+
+/// The maximum number of players we may have in the game. This may change in the future.
+pub const MAX_PLAYERS: usize = 4;
+
+pub struct PlayerPlugin;
+
+impl Plugin for PlayerPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugin(input::PlayerInputPlugin)
+            .add_plugin(state::PlayerStatePlugin)
+            .add_fixed_update_event::<PlayerKillEvent>()
+            .add_fixed_update_event::<PlayerDespawnEvent>()
+            .register_type::<PlayerIdx>()
+            .add_system_to_stage(
+                FixedUpdateStage::PreUpdate,
+                hydrate_players.run_if_resource_exists::<GameMeta>(),
+            );
+    }
+}
+
+/// The player index, for example Player 1, Player 2, and so on.
+#[derive(
+    Component, Deref, DerefMut, Reflect, Default, Serialize, Deserialize, Copy, Clone, Debug,
+)]
+#[reflect(Default, Component)]
+pub struct PlayerIdx(pub usize);
+
+/// Marker component indicating that a player has been killed.
+///
+/// This usually means their death animation is playing, and they are about to be de-spawned.
+#[derive(Component, Reflect, Default, Copy, Clone, Debug)]
+#[reflect(Default, Component)]
+pub struct PlayerKilled;
+
+/// An event sent when a player is killed.
+///
+/// > **Note:** This is different than when the player is despawned. A player is usually killed to
+/// > play their death animation before they are despawned.
+#[derive(Reflect, Clone, Debug)]
+pub struct PlayerKillEvent {
+    /// The index of the player that was killed.
+    pub player: Entity,
+    pub velocity: Vec2,
+    pub position: Vec3,
+}
+
+/// An event sent when a player is despawned.
+///
+/// > **Note:** This is different than when the player is killed. A player is usually killed to
+/// > play their death animation before they are despawned.
+pub struct PlayerDespawnEvent {
+    pub player_idx: usize,
+}
+
+/// A [`Command`] to kill a player.
+///
+/// The command will perform any actions needed for the player kill sequence, including sending
+/// network messages, etc.
+///
+/// > **Note:** This doesn't despawn the player, it just puts the player into it's death animation.
+pub struct PlayerKillCommand {
+    /// The player to kill
+    pub player: Entity,
+    /// An optional position for the kill event.
+    ///
+    /// If [`None`] the position will be automatically determined from the player's [`Transform`].
+    ///
+    /// It may need to be manually specified when killing remote players that don't have accurate
+    /// local positions.
+    pub position: Option<Vec3>,
+    /// An optional velocity for the kill event, used when determining how a carried item will be
+    /// dropped if the player was moving.
+    ///
+    /// If [`None`] the velocity will be automatically determined from the player's kinematic body.
+    ///
+    /// It may need to be manually specified when killing remote players that don't have local
+    /// velocities.
+    pub velocity: Option<Vec2>,
+}
+
+impl PlayerKillCommand {
+    /// Create a command to kill `player`.
+    pub fn new(player: Entity) -> Self {
+        Self {
+            player,
+            position: None,
+            velocity: None,
+        }
+    }
+}
+
+impl Command for PlayerKillCommand {
+    fn write(self, world: &mut World) {
+        let already_killed = world.get::<PlayerKilled>(self.player).is_some();
+        if already_killed {
+            // No need to kill him again.
+            return;
+        }
+
+        world.resource_scope(|world, mut kill_events: Mut<Events<PlayerKillEvent>>| {
+            // If the entity is a player
+            if world.get::<PlayerIdx>(self.player).is_some() {
+                let position = self.position.unwrap_or_else(|| {
+                    world
+                        .get::<Transform>(self.player)
+                        .expect("Player without kinematic body")
+                        .translation
+                });
+                let velocity = self.velocity.unwrap_or_else(|| {
+                    world
+                        .get::<KinematicBody>(self.player)
+                        .expect("Player without kinematic body")
+                        .velocity
+                });
+
+                // Send kill event
+                kill_events.send(PlayerKillEvent {
+                    player: self.player,
+                    velocity,
+                    position,
+                });
+
+                // Drop any items player was carrying
+                PlayerSetInventoryCommand {
+                    player: self.player,
+                    item: None,
+                    position: Some(position),
+                    velocity: Some(velocity),
+                }
+                .write(world);
+                world.entity_mut(self.player).insert(PlayerKilled);
+            } else {
+                warn!("Tried to kill non-player entity")
+            }
+        });
+    }
+}
+
+/// A [`Command`] to despawn a player.
+///
+/// This will send any required network messages.
+///
+/// > **Note:** This is different than the [`PlayerKillCommand`] in that it immediately removes the
+/// > player from the world, while [`PlayerKillCommand`] will usually cause the player to enter the
+/// > death animation.
+/// >
+/// > [`PlayerDespawnCommand`] is usually sent at the end of the player death animation.
+pub struct PlayerDespawnCommand {
+    player: Entity,
+}
+
+impl PlayerDespawnCommand {
+    /// Create a new [`PlayerDespawnCommand`].
+    pub fn new(player: Entity) -> Self {
+        Self { player }
+    }
+}
+
+impl Command for PlayerDespawnCommand {
+    fn write(self, world: &mut World) {
+        world.resource_scope(
+            |world, mut despawn_events: Mut<Events<PlayerDespawnEvent>>| {
+                // If the entity is a player
+                if let Some(player_idx) = world.get::<PlayerIdx>(self.player) {
+                    // Send despawn event
+                    despawn_events.send(PlayerDespawnEvent {
+                        player_idx: player_idx.0,
+                    });
+
+                    // Despawn the player entity
+                    despawn_with_children_recursive(world, self.player);
+                } else {
+                    warn!("Tried to despawn non-player entity")
+                }
+            },
+        );
+    }
+}
+
+/// A [`Command`] to set the player's inventory.
+///
+/// The command will perform any actions needed including sending events, etc.
+pub struct PlayerSetInventoryCommand {
+    /// The player to set the inventory of.
+    pub player: Entity,
+    /// The item to put in the player inventory, or `None` if they should drop any existing item.
+    pub item: Option<Entity>,
+
+    /// An optional position for where to drop/grab the item.
+    ///
+    /// If `position` is [`None`] the position will be determined from the player's [`Transform`].
+    ///
+    /// This is useful when dropping an item for a remote, networked player, which we do not have a
+    /// reliable position for locally.
+    pub position: Option<Vec3>,
+    /// An optional velocity to use when dropping the item.
+    ///
+    /// See `position` above for details.
+    pub velocity: Option<Vec2>,
+}
+
+impl PlayerSetInventoryCommand {
+    /// Conveniently create a new [`PlayerSetInventoryCommand`].
+    pub fn new(player: Entity, item: Option<Entity>) -> Self {
+        Self {
+            player,
+            item,
+            position: None,
+            velocity: None,
+        }
+    }
+}
+
+impl Command for PlayerSetInventoryCommand {
+    fn write(self, world: &mut World) {
+        // Get the effective drop/grab position
+        let position = self.position.unwrap_or_else(|| {
+            world
+                .get::<Transform>(self.player)
+                .expect("Player missing transform")
+                .translation
+        });
+
+        let current_inventory = get_player_inventory(world, self.player);
+
+        world.resource_scope(|world, mut grab_events: Mut<Events<ItemGrabEvent>>| {
+            world.resource_scope(|world, mut drop_events: Mut<Events<ItemDropEvent>>| {
+                // If there was a previous item in the inventory, drop it
+                if let Some(current_item) = current_inventory {
+                    let velocity = self.velocity.unwrap_or_else(|| {
+                        world
+                            .get::<KinematicBody>(self.player)
+                            .map(|x| x.velocity)
+                            // If we get network notified to kill a player before we get notified to
+                            // drop the item they are carrying, we may end up calling this on a
+                            // remote player with no kinematic body.
+                            //
+                            // In this case, because we don't have a velocity for the drop action,
+                            // just do no movement on the drop.
+                            //
+                            // We may need to re-visit this if we find that this causes a de-sync.
+                            .unwrap_or_default()
+                    });
+
+                    drop_events.send(ItemDropEvent {
+                        player: self.player,
+                        item: current_item,
+                        position,
+                        velocity,
+                    });
+                    world
+                        .entity_mut(self.player)
+                        .remove_children(&[current_item]);
+                }
+
+                // If there is a new item in the inventory, add it
+                if let Some(item) = self.item {
+                    grab_events.send(ItemGrabEvent {
+                        player: self.player,
+                        item,
+                        position,
+                    });
+                    world.entity_mut(self.player).push_children(&[item]);
+                }
+            });
+        });
+    }
+}
+
+/// A [`Command`] to have the player use the item they carrying, if any.
+///
+/// This will generate an item use event if there is an item in the players inventory when the
+/// command is flushed.
+pub struct PlayerUseItemCommand {
+    /// The player that is using their item.
+    pub player: Entity,
+
+    /// An optional position to use the item from.
+    ///
+    /// If [`None`] the position will be taken from the player's [`Transform`].
+    ///
+    /// Specifying a specific position is useful when triggering an item use for a remote, networked
+    /// player for which we don't have a reliable position locally.
+    pub position: Option<Vec3>,
+    /// An optional item to use.
+    ///
+    /// If [`None`] the item will be taken from the player's inventory.
+    ///
+    /// Specifying a specific item is useful when triggering an item use for a remote, networked
+    /// player for which our local status for their current item might not be accurate.
+    pub item: Option<Entity>,
+}
+
+impl PlayerUseItemCommand {
+    /// Create a command to have `player` use their item.
+    pub fn new(player: Entity) -> Self {
+        Self {
+            player,
+            position: None,
+            item: None,
+        }
+    }
+}
+
+impl Command for PlayerUseItemCommand {
+    fn write(self, world: &mut World) {
+        let position = self.position.unwrap_or_else(|| {
+            let transform = world
+                .get::<Transform>(self.player)
+                .expect("Player missing transform");
+            transform.translation
+        });
+        let item = self
+            .item
+            .or_else(|| get_player_inventory(world, self.player));
+
+        if let Some(item) = item {
+            let mut use_events = world.resource_mut::<Events<ItemUseEvent>>();
+            use_events.send(ItemUseEvent {
+                player: self.player,
+                item,
+                position,
+            });
+        } else {
+            warn!("Tried to use item when not carrying one");
+        }
+    }
+}
+
+/// Helper function to get the inventory of the player, from the world
+pub fn get_player_inventory(world: &mut World, entity: Entity) -> Option<Entity> {
+    let mut item_ent = None;
+    let mut items_query = world.query_filtered::<Entity, With<Item>>();
+    if let Some(children) = world.get::<Children>(entity) {
+        for child in children {
+            if items_query.get(world, *child).is_ok() {
+                if item_ent.is_none() {
+                    item_ent = Some(*child);
+                } else {
+                    warn!("Multiple items in player inventory is not supported!");
+                }
+            }
+        }
+    }
+    item_ent
+}
+
+/// System to take entities with only a [`PlayerIdx`] and a [`Transform`] and to add the remaining
+/// components to them to make them complete players.
+fn hydrate_players(
+    mut commands: Commands,
+    mut players: Query<(Entity, &PlayerIdx, &mut Transform), Without<PlayerState>>,
+    mut storage: ResMut<Storage>,
+    game: Res<GameMeta>,
+    player_inputs: Res<PlayerInputs>,
+    player_meta_assets: Res<Assets<PlayerMeta>>,
+    server: Option<Res<NetServer>>,
+    client_match_info: Option<Res<ClientMatchInfo>>,
+) {
+    let settings = storage.get(Settings::STORAGE_KEY);
+    let settings = settings.as_ref().unwrap_or(&game.default_settings);
+
+    for (entity, player_idx, mut player_transform) in &mut players {
+        // Mutate the player transform to trigger an update to it's global transform component. This
+        // isn't normally necessary, but since the player may not start off with a GlobalTransform
+        // it may be required.
+        player_transform.set_changed();
+
+        // If we are the server, broadcast a spawn event for each hydrated player
+        if let Some(server) = &server {
+            server.broadcast_reliable(&PlayerEventFromServer {
+                player_idx: player_idx.0.try_into().unwrap(),
+                kind: PlayerEvent::SpawnPlayer(player_transform.translation),
+            });
+        }
+
+        let input = &player_inputs.players[player_idx.0];
+        let meta = player_meta_assets
+            .get(&input.selected_player)
+            .expect("Player meta not loaded");
+
+        let (animation_bank, animation_bank_sprite) =
+            meta.spritesheet.get_animation_bank_and_sprite();
+
+        let mut entity_commands = commands.entity(entity);
+
+        entity_commands
+            .insert(Name::new(format!("Player {}", player_idx.0)))
+            .insert(PlayerState::default())
+            .insert(meta.clone())
+            .insert(animation_bank)
+            .insert(animation_bank_sprite)
+            .insert(GlobalTransform::default())
+            .insert_bundle(VisibilityBundle::default());
+
+        let kinematic_body = KinematicBody {
+            size: Vec2::new(32.0, 48.0), // FIXME: Don't hardcode! Load from player meta.
+            has_mass: true,
+            has_friction: true,
+            gravity: 1.0,
+            ..default()
+        };
+        let input_manager_for_player = |player_idx| InputManagerBundle {
+            input_map: settings.player_controls.get_input_map(player_idx),
+            ..default()
+        };
+
+        if let Some(match_info) = &client_match_info {
+            // Only add physics and input bundle for non-remote players if we are a multiplayer client
+            if match_info.player_idx == player_idx.0 {
+                // If we are a client in a multiplayer game, use the first player's controls
+                let player_input_idx = if client_match_info.is_some() {
+                    0
+                // Otherwise, use the corresponding player's controls
+                } else {
+                    player_idx.0
+                };
+
+                entity_commands
+                    .insert(kinematic_body)
+                    .insert_bundle(input_manager_for_player(player_input_idx));
+
+            // For remote players we add an `Animator` that will be used to tween it's transform for
+            // smoothing player movement.
+            } else {
+                entity_commands.insert(Animator::<Transform>::default());
+            }
+
+        // If this is a local game
+        } else {
+            entity_commands
+                .insert(kinematic_body)
+                .insert_bundle(input_manager_for_player(player_idx.0));
+        }
+    }
+}
diff --git a/src/player/ai.rs b/src/player/ai.rs
deleted file mode 100644
index 21ce6ca471..0000000000
--- a/src/player/ai.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use crate::player::GameInput;
-
-pub struct Ai {
-    jump_cooldown: f32,
-    throw_cooldown: f32,
-    keep_direction_until_event: bool,
-    keep_direction_timeout: f32,
-    fix_direction: i32,
-}
-
-impl Ai {
-    pub fn new() -> Ai {
-        Ai {
-            jump_cooldown: 0.,
-            keep_direction_until_event: false,
-            keep_direction_timeout: 0.,
-            fix_direction: 0,
-            throw_cooldown: 0.,
-        }
-    }
-
-    pub fn update(&mut self, _player: &mut OldPlayer) -> GameInput {
-        let input = GameInput {
-            right: self.fix_direction == 1,
-            left: self.fix_direction == -1,
-            ..Default::default()
-        };
-
-        /*
-        let foe = scene::find_nodes_by_type::<OldPlayer>().next().unwrap();
-
-        let mut following_horiz = false;
-
-        if (player.body.position.x - foe.body.position.x).abs() >= 50. {
-            //
-            if !self.keep_direction_until_event {
-                following_horiz = true;
-                if player.body.position.x > foe.body.position.x {
-                    input.left = true;
-                } else {
-                    input.right = true;
-                }
-            }
-        }
-
-        if !self.keep_direction_until_event
-            && (player.body.position.y - foe.body.position.y).abs() >= 50.
-            && !following_horiz
-        {
-            self.fix_direction = if rand::gen_range(0, 2) == 0 { 1 } else { -1 };
-            self.keep_direction_until_event = true;
-        }
-
-        let dir = if input.left {
-            -1.
-        } else if input.right {
-            1.
-        } else {
-            0.
-        };
-
-        {
-            let collision_world = &mut storage::get_mut::<GameWorld>().collision_world;
-
-            let obstacle_soon = collision_world.collide_check(
-                player.body.collider,
-                player.body.position + vec2(15. * dir, 0.),
-            );
-            let cliff_soon = !collision_world.collide_check(
-                player.body.collider,
-                player.body.position + vec2(5. * dir, 5.),
-            );
-            let wants_descent = player.body.position.y < foe.body.position.y;
-
-            if (cliff_soon || obstacle_soon) && self.keep_direction_timeout <= 0. {
-                self.keep_direction_until_event = false;
-                self.fix_direction = 0;
-                self.keep_direction_timeout = 1.;
-            }
-
-            if (obstacle_soon || (!wants_descent && cliff_soon))
-                && player.body.is_on_ground
-                && self.jump_cooldown <= 0.
-            {
-                input.jump = true;
-                self.jump_cooldown = 0.2;
-            }
-        }
-
-        if rand::gen_range(0, 200) == 5 {
-            self.fix_direction = if rand::gen_range(0, 2) == 0 { 1 } else { -1 };
-            self.keep_direction_until_event = true;
-        }
-
-        if rand::gen_range(0, 800) == 5 {
-            input.pickup = true;
-            self.throw_cooldown = 1.;
-        }
-
-        if player.body.position.distance(foe.body.position) <= 100. || rand::gen_range(0, 180) == 5
-        {
-            //
-            if player.state_machine.state() == OldPlayer::ST_NORMAL && player.weapon.is_some() {
-                player.state_machine.set_state(OldPlayer::ST_ATTACK);
-            }
-        }
-
-        if self.jump_cooldown >= 0. {
-            self.jump_cooldown -= get_frame_time();
-        }
-        if self.throw_cooldown >= 0. {
-            self.throw_cooldown -= get_frame_time();
-        }
-
-        if self.keep_direction_timeout >= 0. {
-            self.keep_direction_timeout -= get_frame_time();
-        }
-
-        if self.throw_cooldown <= 0.0 {
-            for item in scene::find_nodes_by_type::<MapItem>() {
-                let item_collider = item.body.get_collider_rect();
-                if item_collider.point().distance(player.body.position) <= 80. {
-                    input.pickup = true;
-                }
-            }
-            self.throw_cooldown = 1.;
-        }
-
-         */
-
-        input
-    }
-}
diff --git a/src/player/animation.rs b/src/player/animation.rs
deleted file mode 100644
index a952830cd5..0000000000
--- a/src/player/animation.rs
+++ /dev/null
@@ -1,415 +0,0 @@
-use macroquad::prelude::*;
-
-use hecs::World;
-
-use serde::{Deserialize, Serialize};
-
-use crate::player::{
-    Player, PlayerInventory, PlayerState, BODY_ANIMATED_SPRITE_ID, CROUCH_ANIMATION_ID,
-    DEATH_BACK_ANIMATION_ID, DEATH_FORWARD_ANIMATION_ID, FALL_ANIMATION_ID, HAT_MOUNT_TWEEN_ID,
-    IDLE_ANIMATION_ID, ITEM_MOUNT_TWEEN_ID, JUMP_ANIMATION_ID, MOVE_ANIMATION_ID,
-    SLIDE_ANIMATION_ID, WEAPON_MOUNT_TWEEN_ID,
-};
-use crate::{AnimatedSpriteMetadata, AnimationMetadata, Keyframe, TweenMetadata};
-use crate::{Drawable, PhysicsBody};
-
-/// This is used in stead of `AnimationParams`, as we have different data requirements, in the case
-/// of a player character, compared to most other use cases. We want to have a default animation
-/// set, for instance, that corresponds with the way the core game characters are animated, but
-/// still have the possibility to declare custom animation sets, as well as have variation in size,
-///
-/// Refer to `crate::components::animation_player::AnimationParams` for detailed documentation
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct PlayerAnimationMetadata {
-    #[serde(rename = "texture")]
-    pub texture_id: String,
-    #[serde(default)]
-    pub scale: Option<f32>,
-    #[serde(default, with = "core::json::vec2_def")]
-    pub offset: Vec2,
-    #[serde(default, with = "core::json::vec2_opt")]
-    pub pivot: Option<Vec2>,
-    #[serde(
-        default,
-        with = "core::json::color_opt",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub tint: Option<Color>,
-    #[serde(default)]
-    pub animations: PlayerAnimations,
-}
-
-impl From<PlayerAnimationMetadata> for AnimatedSpriteMetadata {
-    fn from(other: PlayerAnimationMetadata) -> Self {
-        AnimatedSpriteMetadata {
-            texture_id: other.texture_id,
-            scale: other.scale,
-            offset: other.offset,
-            pivot: other.pivot,
-            tint: other.tint,
-            animations: other.animations.into_vec(),
-            autoplay_id: Some(IDLE_ANIMATION_ID.to_string()),
-            is_deactivated: false,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct PlayerAnimations {
-    #[serde(default = "PlayerAnimations::default_idle_animation")]
-    pub idle: AnimationMetadata,
-    #[serde(
-        rename = "move",
-        alias = "moving",
-        default = "PlayerAnimations::default_move_animation"
-    )]
-    pub moving: AnimationMetadata,
-    #[serde(default = "PlayerAnimations::default_jump_animation")]
-    pub jump: AnimationMetadata,
-    #[serde(default = "PlayerAnimations::default_fall_animation")]
-    pub fall: AnimationMetadata,
-    #[serde(default = "PlayerAnimations::default_crouch_animation")]
-    pub crouch: AnimationMetadata,
-    #[serde(default = "PlayerAnimations::default_slide_animation")]
-    pub slide: AnimationMetadata,
-    #[serde(default = "PlayerAnimations::default_death_back_animation")]
-    pub death_back: AnimationMetadata,
-    #[serde(default = "PlayerAnimations::default_death_forward_animation")]
-    pub death_forward: AnimationMetadata,
-}
-
-impl PlayerAnimations {
-    pub fn default_idle_animation() -> AnimationMetadata {
-        let keyframes = vec![
-            Keyframe {
-                frame: 0,
-                translation: vec2(0.0, 0.0),
-            },
-            Keyframe {
-                frame: 5,
-                translation: vec2(0.0, 2.0),
-            },
-            Keyframe {
-                frame: 8,
-                translation: vec2(0.0, 0.0),
-            },
-            Keyframe {
-                frame: 11,
-                translation: vec2(0.0, 2.0),
-            },
-        ];
-
-        AnimationMetadata {
-            id: IDLE_ANIMATION_ID.to_string(),
-            row: 0,
-            frames: 14,
-            fps: 12,
-            tweens: vec![
-                TweenMetadata {
-                    id: WEAPON_MOUNT_TWEEN_ID.to_string(),
-                    keyframes: keyframes.clone(),
-                },
-                TweenMetadata {
-                    id: ITEM_MOUNT_TWEEN_ID.to_string(),
-                    keyframes: keyframes.clone(),
-                },
-                TweenMetadata {
-                    id: HAT_MOUNT_TWEEN_ID.to_string(),
-                    keyframes,
-                },
-            ],
-            is_looping: true,
-        }
-    }
-
-    pub fn default_move_animation() -> AnimationMetadata {
-        let keyframes = vec![
-            Keyframe {
-                frame: 0,
-                translation: vec2(0.0, -4.0),
-            },
-            Keyframe {
-                frame: 2,
-                translation: vec2(0.0, 0.0),
-            },
-            Keyframe {
-                frame: 5,
-                translation: vec2(0.0, -4.0),
-            },
-        ];
-
-        AnimationMetadata {
-            id: MOVE_ANIMATION_ID.to_string(),
-            row: 1,
-            frames: 6,
-            fps: 10,
-            tweens: vec![
-                TweenMetadata {
-                    id: WEAPON_MOUNT_TWEEN_ID.to_string(),
-                    keyframes: keyframes.clone(),
-                },
-                TweenMetadata {
-                    id: ITEM_MOUNT_TWEEN_ID.to_string(),
-                    keyframes,
-                },
-                TweenMetadata {
-                    id: HAT_MOUNT_TWEEN_ID.to_string(),
-                    keyframes: vec![
-                        Keyframe {
-                            frame: 0,
-                            translation: vec2(4.0, -4.0),
-                        },
-                        Keyframe {
-                            frame: 2,
-                            translation: vec2(4.0, 0.0),
-                        },
-                        Keyframe {
-                            frame: 5,
-                            translation: vec2(4.0, -4.0),
-                        },
-                    ],
-                },
-            ],
-            is_looping: true,
-        }
-    }
-
-    pub fn default_jump_animation() -> AnimationMetadata {
-        AnimationMetadata {
-            id: JUMP_ANIMATION_ID.to_string(),
-            row: 2,
-            frames: 1,
-            fps: 5,
-            tweens: Vec::new(),
-            is_looping: false,
-        }
-    }
-
-    pub fn default_fall_animation() -> AnimationMetadata {
-        AnimationMetadata {
-            id: FALL_ANIMATION_ID.to_string(),
-            row: 3,
-            frames: 1,
-            fps: 8,
-            tweens: Vec::new(),
-            is_looping: true,
-        }
-    }
-
-    pub fn default_crouch_animation() -> AnimationMetadata {
-        let keyframes = vec![Keyframe {
-            frame: 0,
-            translation: vec2(0.0, 4.0),
-        }];
-
-        AnimationMetadata {
-            id: CROUCH_ANIMATION_ID.to_string(),
-            row: 4,
-            frames: 1,
-            fps: 8,
-            tweens: vec![
-                TweenMetadata {
-                    id: WEAPON_MOUNT_TWEEN_ID.to_string(),
-                    keyframes: keyframes.clone(),
-                },
-                TweenMetadata {
-                    id: ITEM_MOUNT_TWEEN_ID.to_string(),
-                    keyframes: keyframes.clone(),
-                },
-                TweenMetadata {
-                    id: HAT_MOUNT_TWEEN_ID.to_string(),
-                    keyframes,
-                },
-            ],
-            is_looping: false,
-        }
-    }
-
-    pub fn default_slide_animation() -> AnimationMetadata {
-        AnimationMetadata {
-            id: SLIDE_ANIMATION_ID.to_string(),
-            row: 5,
-            frames: 1,
-            fps: 1,
-            tweens: Vec::new(),
-            is_looping: false,
-        }
-    }
-
-    pub fn default_death_back_animation() -> AnimationMetadata {
-        AnimationMetadata {
-            id: DEATH_BACK_ANIMATION_ID.to_string(),
-            row: 5,
-            frames: 7,
-            fps: 10,
-            tweens: Vec::new(),
-            is_looping: false,
-        }
-    }
-
-    pub fn default_death_forward_animation() -> AnimationMetadata {
-        AnimationMetadata {
-            id: DEATH_FORWARD_ANIMATION_ID.to_string(),
-            row: 6,
-            frames: 7,
-            fps: 10,
-            tweens: Vec::new(),
-            is_looping: false,
-        }
-    }
-}
-
-impl Default for PlayerAnimations {
-    fn default() -> Self {
-        PlayerAnimations {
-            idle: Self::default_idle_animation(),
-            moving: Self::default_move_animation(),
-            jump: Self::default_jump_animation(),
-            fall: Self::default_fall_animation(),
-            crouch: Self::default_crouch_animation(),
-            slide: Self::default_slide_animation(),
-            death_back: Self::default_death_back_animation(),
-            death_forward: Self::default_death_forward_animation(),
-        }
-    }
-}
-
-impl From<Vec<AnimationMetadata>> for PlayerAnimations {
-    fn from(vec: Vec<AnimationMetadata>) -> Self {
-        PlayerAnimations {
-            idle: vec
-                .iter()
-                .find(|&anim| anim.id == *IDLE_ANIMATION_ID)
-                .cloned()
-                .unwrap(),
-            moving: vec
-                .iter()
-                .find(|&anim| anim.id == *MOVE_ANIMATION_ID)
-                .cloned()
-                .unwrap(),
-            jump: vec
-                .iter()
-                .find(|&anim| anim.id == *JUMP_ANIMATION_ID)
-                .cloned()
-                .unwrap(),
-            fall: vec
-                .iter()
-                .find(|&anim| anim.id == *FALL_ANIMATION_ID)
-                .cloned()
-                .unwrap(),
-            crouch: vec
-                .iter()
-                .find(|&anim| anim.id == *CROUCH_ANIMATION_ID)
-                .cloned()
-                .unwrap(),
-            slide: vec
-                .iter()
-                .find(|&anim| anim.id == *SLIDE_ANIMATION_ID)
-                .cloned()
-                .unwrap(),
-            death_back: vec
-                .iter()
-                .find(|&anim| anim.id == *DEATH_BACK_ANIMATION_ID)
-                .cloned()
-                .unwrap(),
-            death_forward: vec
-                .iter()
-                .find(|&anim| anim.id == *DEATH_FORWARD_ANIMATION_ID)
-                .cloned()
-                .unwrap(),
-        }
-    }
-}
-
-impl PlayerAnimations {
-    pub fn into_vec(self) -> Vec<AnimationMetadata> {
-        vec![
-            self.idle,
-            self.moving,
-            self.jump,
-            self.fall,
-            self.crouch,
-            self.slide,
-            self.death_back,
-            self.death_forward,
-        ]
-    }
-
-    pub fn to_vec(&self) -> Vec<AnimationMetadata> {
-        vec![
-            self.idle.clone(),
-            self.moving.clone(),
-            self.jump.clone(),
-            self.fall.clone(),
-            self.crouch.clone(),
-            self.slide.clone(),
-            self.death_back.clone(),
-            self.death_forward.clone(),
-        ]
-    }
-}
-
-pub fn update_player_animations(world: &mut World) {
-    for (_, (player, inventory, body, drawable)) in
-        world.query_mut::<(&Player, &mut PlayerInventory, &PhysicsBody, &mut Drawable)>()
-    {
-        let sprite_set = drawable.get_animated_sprite_set_mut().unwrap();
-
-        sprite_set.flip_all_x(player.is_facing_left);
-        sprite_set.flip_all_y(player.is_upside_down);
-
-        let animation_id = match player.state {
-            PlayerState::Dead => {
-                if player.is_facing_left == player.damage_from_left {
-                    DEATH_BACK_ANIMATION_ID
-                } else {
-                    DEATH_FORWARD_ANIMATION_ID
-                }
-            }
-            PlayerState::Incapacitated => {
-                // TODO: implement incapacitated
-                unimplemented!();
-            }
-            PlayerState::Sliding => SLIDE_ANIMATION_ID,
-            PlayerState::Crouching => CROUCH_ANIMATION_ID,
-            _ => {
-                if body.is_on_ground {
-                    if !player.is_attacking && body.velocity.x != 0.0 {
-                        MOVE_ANIMATION_ID
-                    } else {
-                        IDLE_ANIMATION_ID
-                    }
-                } else if body.velocity.y < 0.0 {
-                    JUMP_ANIMATION_ID
-                } else {
-                    FALL_ANIMATION_ID
-                }
-            }
-        };
-
-        sprite_set.set_all(animation_id, false);
-
-        let sprite = sprite_set.map.get(BODY_ANIMATED_SPRITE_ID).unwrap();
-        let animation = sprite.current_animation();
-
-        if let Some(tween) = animation.tweens.get(WEAPON_MOUNT_TWEEN_ID) {
-            inventory.weapon_mount_offset = tween.current_translation;
-        } else {
-            inventory.weapon_mount_offset = Vec2::ZERO;
-        }
-
-        if let Some(tween) = animation.tweens.get(ITEM_MOUNT_TWEEN_ID) {
-            inventory.item_mount_offset = tween.current_translation;
-        } else {
-            inventory.item_mount_offset = Vec2::ZERO;
-        }
-
-        if let Some(tween) = animation.tweens.get(HAT_MOUNT_TWEEN_ID) {
-            inventory.hat_mount_offset = tween.current_translation;
-        } else {
-            inventory.hat_mount_offset = Vec2::ZERO;
-        }
-    }
-}
diff --git a/src/player/character.rs b/src/player/character.rs
deleted file mode 100644
index 1dce3b8fa0..0000000000
--- a/src/player/character.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-//! This implements `PlayerCharacterMetadata`, which is a declaration of a playable character, loaded
-//! from the `player_characters.json` file. This holds information like its name, its description,
-//! which texture to use and how to animate it and should not be confused with `Player`, which is
-//! the actual implementation of the player actor.
-
-use macroquad::prelude::*;
-
-use serde::{Deserialize, Serialize};
-
-use crate::player::PlayerAnimationMetadata;
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct PlayerCharacterMetadata {
-    /// This is the id of the player character. This should be unique, or it will either overwrite
-    /// or be overwritten, depending on load order, if not.
-    pub id: String,
-    /// This is the name of the player character, as shown in character selection
-    pub name: String,
-    /// This is the description for the player character, as shown in character selection
-    #[serde(default)]
-    pub description: String,
-    /// This holds the animation and sprite parameters for the player character. This is flattened,
-    /// meaning that, in JSON, you will declare the members of this struct directly in the
-    /// `PlayerCharacterMetadata` entry.
-    #[serde(flatten, alias = "animation")]
-    pub sprite: PlayerAnimationMetadata,
-    /// The size of the players collider.
-    /// This should, in general, be smaller than the sprite size
-    #[serde(
-        default = "PlayerCharacterMetadata::default_collider_size",
-        with = "core::json::vec2_def"
-    )]
-    pub collider_size: Vec2,
-    /// This is the offset from the position of the player to where the weapon is mounted.
-    /// The position of the player will, typically, be the center bottom of the sprite but this
-    /// can be changed with offsets.
-    #[serde(
-        default = "PlayerCharacterMetadata::default_weapon_mount",
-        with = "core::json::vec2_def"
-    )]
-    pub weapon_mount: Vec2,
-    /// This is the offset from the position of the player to where items are mounted
-    #[serde(
-        default = "PlayerCharacterMetadata::default_item_mount",
-        with = "core::json::vec2_def"
-    )]
-    pub item_mount: Vec2,
-    /// This is the offset from the position of the player to where the hat is mounted
-    #[serde(
-        default = "PlayerCharacterMetadata::default_hat_mount",
-        with = "core::json::vec2_def"
-    )]
-    pub hat_mount: Vec2,
-    /// This is the distance from the top of the collider to where the head ends
-    #[serde(default = "PlayerCharacterMetadata::default_head_threshold")]
-    pub head_threshold: f32,
-    /// This is the distance from the top of the collider to where the legs begin
-    #[serde(default = "PlayerCharacterMetadata::default_legs_threshold")]
-    pub legs_threshold: f32,
-    /// This is the upwards force applied to the player character when it jumps
-    #[serde(default = "PlayerCharacterMetadata::default_jump_force")]
-    pub jump_force: f32,
-    /// This is the movement speed of the player character
-    #[serde(default = "PlayerCharacterMetadata::default_move_speed")]
-    pub move_speed: f32,
-    /// This is the slide speed factor of the player character
-    #[serde(default = "PlayerCharacterMetadata::default_slide_speed_factor")]
-    pub slide_speed_factor: f32,
-    /// This is the slide duration of the player character
-    #[serde(default = "PlayerCharacterMetadata::default_slide_duration")]
-    pub slide_duration: f32,
-    /// This is the amount of time this character will stay incapacitated
-    #[serde(default = "PlayerCharacterMetadata::default_incapacitation_duration")]
-    pub incapacitation_duration: f32,
-    /// This is the float gravity factor of the player character
-    #[serde(default = "PlayerCharacterMetadata::default_float_gravity_factor")]
-    pub float_gravity_factor: f32,
-    /// This is the gravity of the player character
-    #[serde(default = "PlayerCharacterMetadata::default_gravity")]
-    pub gravity: f32,
-}
-
-impl PlayerCharacterMetadata {
-    const DEFAULT_HEAD_THRESHOLD: f32 = 24.0;
-    const DEFAULT_LEGS_THRESHOLD: f32 = 42.0;
-
-    const DEFAULT_GRAVITY: f32 = 1.0;
-
-    const DEFAULT_JUMP_FORCE: f32 = 11.5;
-    const DEFAULT_MOVE_SPEED: f32 = 5.0;
-    const DEFAULT_SLIDE_SPEED_FACTOR: f32 = 3.0;
-    const DEFAULT_SLIDE_DURATION: f32 = 0.1;
-    const DEFAULT_INCAPACITATION_DURATION: f32 = 3.5;
-    const DEFAULT_FLOAT_GRAVITY_FACTOR: f32 = 0.5;
-
-    const DEFAULT_COLLIDER_WIDTH: f32 = 20.0;
-    const DEFAULT_COLLIDER_HEIGHT: f32 = 54.0;
-
-    const DEFAULT_WEAPON_MOUNT_X: f32 = 0.0;
-    const DEFAULT_WEAPON_MOUNT_Y: f32 = 26.0;
-    const DEFAULT_ITEM_MOUNT_X: f32 = 0.0;
-    const DEFAULT_ITEM_MOUNT_Y: f32 = 0.0;
-    const DEFAULT_HAT_MOUNT_X: f32 = 0.0;
-    const DEFAULT_HAT_MOUNT_Y: f32 = -54.0;
-
-    pub fn default_head_threshold() -> f32 {
-        Self::DEFAULT_HEAD_THRESHOLD
-    }
-
-    pub fn default_legs_threshold() -> f32 {
-        Self::DEFAULT_LEGS_THRESHOLD
-    }
-
-    pub fn default_jump_force() -> f32 {
-        Self::DEFAULT_JUMP_FORCE
-    }
-
-    pub fn default_move_speed() -> f32 {
-        Self::DEFAULT_MOVE_SPEED
-    }
-
-    pub fn default_slide_speed_factor() -> f32 {
-        Self::DEFAULT_SLIDE_SPEED_FACTOR
-    }
-
-    pub fn default_slide_duration() -> f32 {
-        Self::DEFAULT_SLIDE_DURATION
-    }
-
-    pub fn default_incapacitation_duration() -> f32 {
-        Self::DEFAULT_INCAPACITATION_DURATION
-    }
-
-    pub fn default_float_gravity_factor() -> f32 {
-        Self::DEFAULT_FLOAT_GRAVITY_FACTOR
-    }
-
-    pub fn default_collider_size() -> Vec2 {
-        vec2(Self::DEFAULT_COLLIDER_WIDTH, Self::DEFAULT_COLLIDER_HEIGHT)
-    }
-
-    pub fn default_weapon_mount() -> Vec2 {
-        vec2(Self::DEFAULT_WEAPON_MOUNT_X, Self::DEFAULT_WEAPON_MOUNT_Y)
-    }
-
-    pub fn default_item_mount() -> Vec2 {
-        vec2(Self::DEFAULT_ITEM_MOUNT_X, Self::DEFAULT_ITEM_MOUNT_Y)
-    }
-
-    pub fn default_hat_mount() -> Vec2 {
-        vec2(Self::DEFAULT_HAT_MOUNT_X, Self::DEFAULT_HAT_MOUNT_Y)
-    }
-
-    pub fn default_gravity() -> f32 {
-        Self::DEFAULT_GRAVITY
-    }
-}
diff --git a/src/player/controller.rs b/src/player/controller.rs
deleted file mode 100644
index 860305df9c..0000000000
--- a/src/player/controller.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use hecs::World;
-
-use macroquad::prelude::*;
-
-use core::network::PlayerId;
-
-use core::input::{collect_local_input, GameInputScheme, PlayerInput};
-
-#[derive(Debug, Clone)]
-pub enum PlayerControllerKind {
-    LocalInput(GameInputScheme),
-    Network(PlayerId),
-}
-
-impl PlayerControllerKind {
-    pub fn is_local(&self) -> bool {
-        matches!(self, PlayerControllerKind::LocalInput(..))
-    }
-}
-
-#[derive(Clone)]
-pub struct PlayerController {
-    pub kind: PlayerControllerKind,
-
-    /// No vertical movement is possible now but you never know what the future holds :)
-    pub move_direction: Vec2,
-
-    pub should_crouch: bool,
-    pub should_jump: bool,
-    pub should_float: bool,
-    pub should_pickup: bool,
-    pub should_attack: bool,
-    pub should_slide: bool,
-}
-
-impl From<PlayerControllerKind> for PlayerController {
-    fn from(kind: PlayerControllerKind) -> Self {
-        PlayerController {
-            kind,
-            move_direction: Vec2::ZERO,
-            should_crouch: false,
-            should_jump: false,
-            should_float: false,
-            should_pickup: false,
-            should_attack: false,
-            should_slide: false,
-        }
-    }
-}
-
-impl PlayerController {
-    pub fn clear(&mut self) {
-        self.move_direction = Vec2::ZERO;
-        self.should_crouch = false;
-        self.should_jump = false;
-        self.should_float = false;
-        self.should_pickup = false;
-        self.should_attack = false;
-        self.should_slide = false;
-    }
-
-    pub fn apply_input(&mut self, input: PlayerInput) {
-        self.clear();
-
-        if input.left {
-            self.move_direction.x -= 1.0;
-        }
-
-        if input.right {
-            self.move_direction.x += 1.0;
-        }
-
-        self.should_crouch = input.crouch;
-        self.should_jump = input.jump;
-        self.should_float = input.float;
-        self.should_pickup = input.pickup;
-        self.should_attack = input.fire;
-        self.should_slide = input.slide;
-    }
-}
-
-pub fn update_player_controllers(world: &mut World) {
-    for (_, controller) in world.query_mut::<&mut PlayerController>() {
-        let input = match &controller.kind {
-            PlayerControllerKind::LocalInput(input_scheme) => collect_local_input(*input_scheme),
-            PlayerControllerKind::Network(_player_id) => PlayerInput::default(),
-        };
-
-        controller.apply_input(input);
-    }
-}
diff --git a/src/player/events.rs b/src/player/events.rs
deleted file mode 100644
index 4a4f4df5d0..0000000000
--- a/src/player/events.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use hecs::{Entity, World};
-use macroquad::time::get_frame_time;
-
-use crate::player::{Player, PlayerState};
-use serde::{Deserialize, Serialize};
-
-#[derive(Default)]
-pub struct PlayerEventQueue {
-    pub queue: Vec<PlayerEvent>,
-}
-
-impl PlayerEventQueue {
-    pub fn new() -> Self {
-        PlayerEventQueue { queue: Vec::new() }
-    }
-}
-
-#[derive(Clone)]
-pub enum PlayerEvent {
-    Update {
-        dt: f32,
-    },
-    ReceiveDamage {
-        is_from_left: bool,
-        damage_from: Option<Entity>,
-    },
-    GiveDamage {
-        damage_to: Option<Entity>,
-    },
-    DamageBlocked {
-        is_from_left: bool,
-    },
-    Incapacitated {
-        incapacitated_by: Option<Entity>,
-    },
-    Collision {
-        is_new: bool,
-        collision_with: Entity,
-    },
-}
-
-/// This is used in JSON to specify which event types an effect should apply to
-#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum PlayerEventKind {
-    Update,
-    ReceiveDamage,
-    GiveDamage,
-    DamageBlocked,
-    Incapacitated,
-    Collision,
-}
-
-impl From<&PlayerEvent> for PlayerEventKind {
-    fn from(params: &PlayerEvent) -> Self {
-        use PlayerEvent::*;
-
-        match params {
-            Update { .. } => Self::Update,
-            ReceiveDamage { .. } => Self::ReceiveDamage,
-            GiveDamage { .. } => Self::GiveDamage,
-            DamageBlocked { .. } => Self::DamageBlocked,
-            Incapacitated { .. } => Self::Incapacitated,
-            Collision { .. } => Self::Collision,
-        }
-    }
-}
-
-pub fn update_player_events(world: &mut World) {
-    for (_, (player, events)) in world.query_mut::<(&mut Player, &mut PlayerEventQueue)>() {
-        let dt = get_frame_time();
-
-        events.queue.push(PlayerEvent::Update { dt });
-
-        let mut damage_blocked_left = false;
-        let mut damage_blocked_right = false;
-
-        for event in events.queue.iter() {
-            if let &PlayerEvent::DamageBlocked { is_from_left } = event {
-                damage_blocked_left = damage_blocked_left || is_from_left;
-                damage_blocked_right = damage_blocked_right || !is_from_left;
-            }
-        }
-
-        while let Some(event) = events.queue.pop() {
-            if let PlayerEvent::ReceiveDamage { is_from_left, .. } = event {
-                if (is_from_left && !damage_blocked_left)
-                    || (!is_from_left && !damage_blocked_right)
-                {
-                    player.state = PlayerState::Dead;
-                    player.damage_from_left = is_from_left;
-                }
-            }
-        }
-    }
-}
diff --git a/src/player/input.rs b/src/player/input.rs
new file mode 100644
index 0000000000..2767799ee4
--- /dev/null
+++ b/src/player/input.rs
@@ -0,0 +1,154 @@
+use super::*;
+
+use bevy::reflect::{FromReflect, Reflect};
+
+use crate::{
+    metadata::PlayerMeta,
+    networking::{proto::ClientMatchInfo, server::NetServer},
+};
+
+pub struct PlayerInputPlugin;
+
+impl Plugin for PlayerInputPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<PlayerInputs>()
+            .register_type::<PlayerInputs>()
+            .register_type::<PlayerInput>()
+            .register_type::<Vec<PlayerInput>>()
+            .register_type::<PlayerControl>()
+            .add_plugin(InputManagerPlugin::<PlayerAction>::default())
+            .add_system_to_stage(
+                CoreStage::PreUpdate,
+                update_user_input.run_unless_resource_exists::<NetServer>(),
+            )
+            .add_system_to_stage(
+                FixedUpdateStage::Last,
+                reset_input.run_unless_resource_exists::<NetServer>(),
+            );
+    }
+}
+
+/// The control inputs that a player may make
+#[derive(Debug, Copy, Clone, Actionlike, Deserialize, Eq, PartialEq, Hash)]
+pub enum PlayerAction {
+    Move,
+    Jump,
+    Shoot,
+    Grab,
+    Slide,
+}
+
+#[derive(Reflect, Clone, Debug)]
+#[reflect(Default, Resource)]
+pub struct PlayerInputs {
+    pub players: Vec<PlayerInput>,
+
+    /// This field indicates whether or not the user input has been updated since the last run of
+    /// the `reset_input` system.
+    pub has_updated: bool,
+}
+
+impl Default for PlayerInputs {
+    fn default() -> Self {
+        Self {
+            players: vec![default(); MAX_PLAYERS],
+            has_updated: false,
+        }
+    }
+}
+
+/// Player input, not just controls, but also other status that comes from the player, such as the
+/// selected player and whether the player is actually active.
+#[derive(Reflect, Default, Clone, Debug, FromReflect)]
+#[reflect(Default)]
+pub struct PlayerInput {
+    /// The player is currently "connected" and actively providing input.
+    pub active: bool,
+    /// This may be a null handle if a player hasn't been selected yet
+    pub selected_player: AssetHandle<PlayerMeta>,
+    /// The player control input
+    pub control: PlayerControl,
+    /// The player control input from the last fixed update
+    pub previous_control: PlayerControl,
+}
+
+/// Player control input state
+#[derive(Reflect, Default, Clone, Debug, FromReflect, Deserialize, Serialize)]
+#[reflect(Default)]
+pub struct PlayerControl {
+    pub just_moved: bool,
+    pub moving: bool,
+    pub move_direction: Vec2,
+
+    pub jump_pressed: bool,
+    pub jump_just_pressed: bool,
+
+    pub shoot_pressed: bool,
+    pub shoot_just_pressed: bool,
+
+    pub grab_pressed: bool,
+    pub grab_just_pressed: bool,
+
+    pub slide_pressed: bool,
+    pub slide_just_pressed: bool,
+}
+
+fn update_user_input(
+    mut player_inputs: ResMut<PlayerInputs>,
+    players: Query<(&PlayerIdx, &ActionState<PlayerAction>)>,
+    client_match_info: Option<Res<ClientMatchInfo>>,
+) {
+    for (player_idx, action_state) in &players {
+        // Nuance: during a network game, this allows the player to use any of the control methods
+        // for any local player to control themselves.
+        let actual_player_idx = if let Some(match_info) = &client_match_info {
+            match_info.player_idx
+        } else {
+            player_idx.0
+        };
+
+        let PlayerInput {
+            control,
+            previous_control,
+            ..
+        } = &mut player_inputs.players[actual_player_idx];
+
+        control.moving = action_state.pressed(PlayerAction::Move);
+        control.just_moved = control.moving && !previous_control.moving;
+        control.move_direction = action_state
+            .axis_pair(PlayerAction::Move)
+            .unwrap_or_default()
+            .xy();
+
+        if action_state.pressed(PlayerAction::Jump) {
+            control.jump_pressed = true;
+            control.jump_just_pressed = !previous_control.jump_pressed;
+        }
+        if action_state.pressed(PlayerAction::Grab) {
+            control.grab_pressed = true;
+            control.grab_just_pressed = !previous_control.grab_pressed;
+        }
+        if action_state.pressed(PlayerAction::Shoot) {
+            control.shoot_pressed = true;
+            control.shoot_just_pressed = !previous_control.shoot_pressed;
+        }
+        if action_state.pressed(PlayerAction::Slide) {
+            control.slide_pressed = true;
+            control.slide_just_pressed = !previous_control.slide_pressed;
+        }
+    }
+
+    player_inputs.has_updated = true;
+}
+
+/// Reset player inputs to prepare for the next update
+fn reset_input(mut player_inputs: ResMut<PlayerInputs>) {
+    if player_inputs.has_updated {
+        for player in &mut player_inputs.players {
+            player.previous_control = player.control.clone();
+            player.control = default();
+        }
+
+        player_inputs.has_updated = false;
+    }
+}
diff --git a/src/player/inventory.rs b/src/player/inventory.rs
deleted file mode 100644
index 9e969c8b58..0000000000
--- a/src/player/inventory.rs
+++ /dev/null
@@ -1,625 +0,0 @@
-use macroquad::prelude::*;
-
-use hecs::{Entity, With, Without, World};
-
-use core::Transform;
-
-use crate::items::{
-    fire_weapon, ItemDepleteBehavior, ItemDropBehavior, RespawnInfo, RespawningItem,
-    RespawningItemKind, Weapon, EFFECT_ANIMATED_SPRITE_ID, GROUND_ANIMATION_ID, ITEMS_DRAW_ORDER,
-    SPRITE_ANIMATED_SPRITE_ID,
-};
-use crate::particles::ParticleEmitter;
-use crate::player::{Player, PlayerController, PlayerState, IDLE_ANIMATION_ID, PICKUP_GRACE_TIME};
-use crate::utils::timer::Timer;
-use crate::{Drawable, Item, Owner, PassiveEffectInstance, PhysicsBody};
-
-const THROW_FORCE: f32 = 5.0;
-
-#[derive(Default)]
-pub struct PlayerInventory {
-    pub weapon_mount: Vec2,
-    pub weapon_mount_offset: Vec2,
-    pub item_mount: Vec2,
-    pub item_mount_offset: Vec2,
-    pub hat_mount: Vec2,
-    pub hat_mount_offset: Vec2,
-    pub weapon: Option<Entity>,
-    pub items: Vec<Entity>,
-    pub hat: Option<Entity>,
-    /// Systems can set this to Some(entity) in order to schedule a replacement of the player's
-    /// current weapon ( if any ) with the specified weapon.
-    pub pending_weapon_replacement: Option<Entity>,
-}
-
-impl PlayerInventory {
-    pub fn new(weapon_mount: Vec2, item_mount: Vec2, hat_mount: Vec2) -> Self {
-        PlayerInventory {
-            weapon_mount,
-            weapon_mount_offset: Vec2::ZERO,
-            item_mount,
-            item_mount_offset: Vec2::ZERO,
-            hat_mount,
-            hat_mount_offset: Vec2::ZERO,
-            weapon: None,
-            items: Vec::new(),
-            hat: None,
-            pending_weapon_replacement: None,
-        }
-    }
-
-    pub fn get_weapon_mount(&self, is_facing_left: bool, is_upside_down: bool) -> Vec2 {
-        flip_offset(
-            self.weapon_mount + self.weapon_mount_offset,
-            None,
-            is_facing_left,
-            is_upside_down,
-        )
-    }
-}
-
-pub fn update_player_inventory(world: &mut World) {
-    let mut item_colliders = world
-        .query::<With<Item, Without<Owner, (&Transform, &PhysicsBody)>>>()
-        .iter()
-        .map(|(e, (transform, body))| (e, body.as_rect(transform.position)))
-        .collect::<Vec<_>>();
-
-    let mut weapon_colliders = world
-        .query::<With<Weapon, Without<Owner, (&Transform, &PhysicsBody)>>>()
-        .iter()
-        .map(|(e, (transform, body))| (e, body.as_rect(transform.position)))
-        .collect::<Vec<_>>();
-
-    let mut picked_up = Vec::new();
-
-    let mut to_drop = Vec::new();
-    let mut to_fire = Vec::new();
-    struct ToDestroy {
-        entity: Entity,
-        respawn_info: Option<RespawnInfo>,
-    }
-    let mut to_destroy = Vec::new();
-
-    for (entity, (transform, player, controller, inventory, body)) in world
-        .query::<(
-            &mut Transform,
-            &mut Player,
-            &PlayerController,
-            &mut PlayerInventory,
-            &mut PhysicsBody,
-        )>()
-        .iter()
-    {
-        if player.state == PlayerState::Dead {
-            for item_entity in inventory.items.drain(0..) {
-                to_drop.push(item_entity);
-            }
-
-            if let Some(weapon_entity) = inventory.weapon.take() {
-                to_drop.push(weapon_entity);
-            }
-        } else {
-            let player_rect = body.as_rect(transform.position);
-
-            let mut i = 0;
-            while i < item_colliders.len() {
-                let &(item_entity, rect) = item_colliders.get(i).unwrap();
-
-                if player_rect.overlaps(&rect) {
-                    let item = world.get::<Item>(item_entity).unwrap();
-
-                    if item.is_hat {
-                        if player.pickup_grace_timer < PICKUP_GRACE_TIME {
-                            i += 1;
-
-                            continue;
-                        }
-
-                        if let Some(hat_entity) = inventory.hat.take() {
-                            to_drop.push(hat_entity);
-                        }
-
-                        inventory.hat = Some(item_entity);
-
-                        player.pickup_grace_timer = 0.0;
-                    } else {
-                        inventory.items.push(item_entity);
-                    }
-
-                    picked_up.push((entity, item_entity));
-                    item_colliders.remove(i);
-
-                    let mut body = world.get_mut::<PhysicsBody>(item_entity).unwrap();
-                    body.is_deactivated = true;
-
-                    let mut drawable = world.get_mut::<Drawable>(item_entity).unwrap();
-                    let sprite_set = drawable.get_animated_sprite_set_mut().unwrap();
-                    sprite_set.set_all(IDLE_ANIMATION_ID, true);
-
-                    continue;
-                }
-
-                i += 1;
-            }
-
-            let mut weapon_entity_to_pick_up = None;
-
-            if let Some(we) = inventory.pending_weapon_replacement.take() {
-                if let Some(weapon_entity) = inventory.weapon.take() {
-                    to_drop.push(weapon_entity);
-                }
-
-                weapon_entity_to_pick_up = Some(we);
-            } else if controller.should_pickup {
-                if let Some(weapon_entity) = inventory.weapon.take() {
-                    to_drop.push(weapon_entity);
-
-                    let velocity = if player.is_facing_left {
-                        vec2(-THROW_FORCE, 0.0)
-                    } else {
-                        vec2(THROW_FORCE, 0.0)
-                    };
-
-                    let mut body = world.get_mut::<PhysicsBody>(weapon_entity).unwrap();
-
-                    body.velocity = velocity;
-                } else if player.pickup_grace_timer >= PICKUP_GRACE_TIME {
-                    for (i, &(we, rect)) in weapon_colliders.iter().enumerate() {
-                        if player_rect.overlaps(&rect) {
-                            weapon_colliders.remove(i);
-                            weapon_entity_to_pick_up = Some(we);
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if let Some(weapon_entity) = weapon_entity_to_pick_up {
-                picked_up.push((entity, weapon_entity));
-
-                inventory.weapon = Some(weapon_entity);
-                player.pickup_grace_timer = 0.0;
-
-                let mut body = world.get_mut::<PhysicsBody>(weapon_entity).unwrap();
-                body.is_deactivated = true;
-
-                let mut drawable = world.get_mut::<Drawable>(weapon_entity).unwrap();
-                let sprite_set = drawable.get_animated_sprite_set_mut().unwrap();
-
-                sprite_set.set_all(IDLE_ANIMATION_ID, true);
-            }
-
-            if let Some(Ok((weapon_entity, mut weapon))) = inventory.weapon.map(|entity| {
-                world
-                    .get_mut::<Weapon>(entity)
-                    .map(|weapon| (entity, weapon))
-            }) {
-                weapon.cooldown_timer += get_frame_time();
-
-                let mut weapon_transform = world.get_mut::<Transform>(weapon_entity).unwrap();
-
-                let weapon_mount = transform.position
-                    + inventory.get_weapon_mount(player.is_facing_left, player.is_upside_down);
-
-                weapon_transform.position = weapon_mount;
-
-                let mut drawable = world.get_mut::<Drawable>(weapon_entity).unwrap();
-                let frame_size = {
-                    let sprite_set = drawable.get_animated_sprite_set_mut().unwrap();
-
-                    sprite_set.flip_all_x(player.is_facing_left);
-                    sprite_set.flip_all_y(player.is_upside_down);
-
-                    sprite_set
-                        .map
-                        .get(SPRITE_ANIMATED_SPRITE_ID)
-                        .map(|sprite| sprite.size())
-                        .unwrap()
-                };
-
-                let mount_offset = flip_offset(
-                    weapon.mount_offset,
-                    frame_size,
-                    player.is_facing_left,
-                    player.is_upside_down,
-                );
-
-                weapon_transform.position += mount_offset;
-
-                if let Ok(mut particle_emitters) =
-                    world.get_mut::<Vec<ParticleEmitter>>(weapon_entity)
-                {
-                    let mut offset = weapon.effect_offset;
-
-                    if player.is_facing_left {
-                        offset.x = frame_size.x - offset.x;
-                    }
-
-                    if player.is_upside_down {
-                        offset.y = frame_size.y - offset.y;
-                    }
-
-                    for emitter in particle_emitters.iter_mut() {
-                        emitter.offset = offset;
-                    }
-                }
-
-                let is_depleted = weapon
-                    .uses
-                    .map(|uses| weapon.use_cnt >= uses)
-                    .unwrap_or_default();
-
-                if is_depleted {
-                    match weapon.deplete_behavior {
-                        ItemDepleteBehavior::Destroy => {
-                            to_destroy.push(ToDestroy {
-                                entity: weapon_entity,
-                                respawn_info: weapon.respawn_info,
-                            });
-                            inventory.weapon = None;
-                        }
-                        ItemDepleteBehavior::Drop => {
-                            to_drop.push(weapon_entity);
-                            inventory.weapon = None;
-                        }
-                        _ => {}
-                    }
-                } else if controller.should_attack {
-                    to_fire.push((weapon_entity, entity));
-                }
-            }
-
-            let mut handle_item = |item_entity| -> bool {
-                let mut res = false;
-
-                let mut item = world.get_mut::<Item>(item_entity).unwrap();
-
-                item.duration_timer += get_frame_time();
-
-                let mut is_depleted = false;
-
-                if let Some(uses) = item.uses {
-                    is_depleted = item.use_cnt >= uses;
-                }
-
-                if let Some(duration) = item.duration {
-                    is_depleted = is_depleted || item.duration_timer >= duration;
-                }
-
-                if is_depleted {
-                    res = true;
-
-                    player.passive_effects.retain(|effect| {
-                        if let Some(effect_item_entity) = effect.item {
-                            effect_item_entity != item_entity
-                        } else {
-                            true
-                        }
-                    });
-                } else {
-                    let position = transform.position;
-
-                    match world.get_mut::<Drawable>(item_entity) {
-                        Ok(mut drawable) => {
-                            let sprite_set = drawable.get_animated_sprite_set_mut().unwrap();
-
-                            sprite_set.flip_all_x(player.is_facing_left);
-                            sprite_set.flip_all_y(player.is_upside_down);
-
-                            let mount_offset = if item.is_hat {
-                                let size = sprite_set.size();
-
-                                vec2(-size.x / 2.0, size.y)
-                                    + inventory.hat_mount
-                                    + inventory.hat_mount_offset
-                            } else {
-                                inventory.item_mount + inventory.item_mount_offset
-                            };
-
-                            let offset = flip_offset(
-                                item.mount_offset + mount_offset,
-                                sprite_set.size(),
-                                player.is_facing_left,
-                                player.is_upside_down,
-                            );
-
-                            let mut item_transform =
-                                world.get_mut::<Transform>(item_entity).unwrap();
-                            item_transform.position = position + offset;
-                        }
-                        Err(err) => {
-                            #[cfg(debug_assertions)]
-                            println!("WARNING: {}", err);
-                        }
-                    }
-                }
-
-                res
-            };
-
-            if let Some(hat_entity) = inventory.hat.take() {
-                if handle_item(hat_entity) {
-                    to_drop.push(hat_entity);
-                } else {
-                    inventory.hat = Some(hat_entity);
-                }
-            }
-
-            let mut i = 0;
-            while i < inventory.items.len() {
-                let item_entity = *inventory.items.get(i).unwrap();
-
-                if handle_item(item_entity) {
-                    inventory.items.remove(i);
-                    to_drop.push(item_entity);
-                } else {
-                    i += 1;
-                }
-            }
-        }
-    }
-
-    for (player_entity, item_entity) in picked_up {
-        world.insert_one(item_entity, Owner(player_entity)).unwrap();
-
-        let player_draw_order = world
-            .get::<Drawable>(player_entity)
-            .map(|drawable| drawable.draw_order)
-            .unwrap();
-
-        let mut drawable = world.get_mut::<Drawable>(item_entity).unwrap();
-        drawable.draw_order = player_draw_order + 1;
-
-        if let Ok(item) = world.get::<Item>(item_entity) {
-            let mut player = world.get_mut::<Player>(player_entity).unwrap();
-
-            for meta in item.effects.clone().into_iter() {
-                let effect_instance = PassiveEffectInstance::new(Some(item_entity), meta);
-                player.passive_effects.push(effect_instance);
-            }
-        }
-    }
-
-    for entity in to_drop {
-        world.remove_one::<Owner>(entity).unwrap();
-
-        let mut should_destroy = None;
-
-        if let Ok(mut weapon) = world.get_mut::<Weapon>(entity) {
-            match weapon.drop_behavior {
-                ItemDropBehavior::ClearState => {
-                    weapon.use_cnt = 0;
-                    weapon.cooldown_timer = weapon.cooldown;
-                }
-                ItemDropBehavior::Destroy => {
-                    should_destroy = Some(ToDestroy {
-                        entity,
-                        respawn_info: weapon.respawn_info,
-                    });
-                }
-                _ => {}
-            }
-        } else if let Ok(mut item) = world.get_mut::<Item>(entity) {
-            match item.drop_behavior {
-                ItemDropBehavior::ClearState => {
-                    item.use_cnt = 0;
-                    item.duration_timer = 0.0;
-                }
-                ItemDropBehavior::PersistState => {
-                    if let Some(uses) = item.uses {
-                        should_destroy = if item.use_cnt >= uses {
-                            Some(ToDestroy {
-                                entity,
-                                respawn_info: item.respawn_info,
-                            })
-                        } else {
-                            None
-                        };
-                    }
-                }
-                ItemDropBehavior::Destroy => {
-                    should_destroy = Some(ToDestroy {
-                        entity,
-                        respawn_info: item.respawn_info,
-                    });
-                }
-            }
-        }
-
-        if let Some(to_destroy) = should_destroy {
-            if let Some(respawn_info) = to_destroy.respawn_info {
-                if let Ok(weapon) = world.remove_one::<Weapon>(entity) {
-                    world
-                        .insert_one(
-                            entity,
-                            RespawningItem {
-                                timer: Timer::new(respawn_info.respawn_delay),
-                                info: respawn_info,
-                                kind: RespawningItemKind::Weapon(weapon),
-                            },
-                        )
-                        .unwrap();
-                } else if let Ok(item) = world.remove_one::<Item>(entity) {
-                    world
-                        .insert_one(
-                            entity,
-                            RespawningItem {
-                                timer: Timer::new(respawn_info.respawn_delay),
-                                info: respawn_info,
-                                kind: RespawningItemKind::Item(item),
-                            },
-                        )
-                        .unwrap();
-                }
-            } else if let Err(err) = world.despawn(entity) {
-                #[cfg(debug_assertions)]
-                println!("WARNING: {}", err);
-            }
-        } else {
-            let mut drawable = world.get_mut::<Drawable>(entity).unwrap();
-            drawable.draw_order = ITEMS_DRAW_ORDER;
-
-            let mut body = world.get_mut::<PhysicsBody>(entity).unwrap();
-
-            body.is_deactivated = false;
-
-            let sprite_set = drawable.get_animated_sprite_set_mut().unwrap();
-
-            sprite_set.restart_all();
-
-            let sprite = sprite_set.map.get_mut(SPRITE_ANIMATED_SPRITE_ID).unwrap();
-
-            if sprite
-                .animations
-                .iter()
-                .any(|a| a.id == *GROUND_ANIMATION_ID)
-            {
-                sprite.set_animation(GROUND_ANIMATION_ID, true);
-            } else {
-                sprite.set_animation(IDLE_ANIMATION_ID, true);
-            }
-
-            if let Some(sprite) = sprite_set.map.get_mut(EFFECT_ANIMATED_SPRITE_ID) {
-                sprite.is_deactivated = true;
-            }
-        }
-    }
-
-    for (entity, owner) in to_fire.drain(0..) {
-        if let Err(err) = fire_weapon(world, entity, owner) {
-            #[cfg(debug_assertions)]
-            println!("WARNING: {}", err);
-        }
-    }
-
-    for to_destroy in to_destroy {
-        let entity = to_destroy.entity;
-        let to_destroy: ToDestroy = to_destroy;
-        if let Some(respawn_info) = to_destroy.respawn_info {
-            if let Ok(weapon) = world.remove_one::<Weapon>(to_destroy.entity) {
-                world
-                    .insert_one(
-                        entity,
-                        RespawningItem {
-                            timer: Timer::new(respawn_info.respawn_delay),
-                            info: respawn_info,
-                            kind: RespawningItemKind::Weapon(weapon),
-                        },
-                    )
-                    .unwrap();
-            } else if let Ok(item) = world.remove_one::<Item>(to_destroy.entity) {
-                world
-                    .insert_one(
-                        entity,
-                        RespawningItem {
-                            timer: Timer::new(respawn_info.respawn_delay),
-                            info: respawn_info,
-                            kind: RespawningItemKind::Item(item),
-                        },
-                    )
-                    .unwrap();
-            }
-        } else if let Err(err) = world.despawn(to_destroy.entity) {
-            #[cfg(debug_assertions)]
-            println!("WARNING: {}", err);
-        }
-    }
-}
-
-const HUD_OFFSET_Y: f32 = 16.0;
-
-const HUD_CONDENSED_USE_COUNT_THRESHOLD: u32 = 12;
-
-const HUD_USE_COUNT_COLOR_FULL: Color = Color {
-    r: 0.8,
-    g: 0.9,
-    b: 1.0,
-    a: 1.0,
-};
-
-const HUD_USE_COUNT_COLOR_EMPTY: Color = Color {
-    r: 0.8,
-    g: 0.9,
-    b: 1.0,
-    a: 0.8,
-};
-
-pub fn draw_weapons_hud(world: &mut World) {
-    for (_, (transform, inventory)) in world.query::<(&Transform, &PlayerInventory)>().iter() {
-        if let Some(Ok(weapon)) = inventory.weapon.map(|entity| world.get::<Weapon>(entity)) {
-            if let Some(uses) = weapon.uses {
-                let is_destroyed_on_depletion =
-                    weapon.deplete_behavior == ItemDepleteBehavior::Destroy;
-
-                if !is_destroyed_on_depletion || uses > 1 {
-                    let remaining = uses - weapon.use_cnt;
-
-                    let mut position = transform.position;
-                    position.y -= HUD_OFFSET_Y;
-
-                    if uses >= HUD_CONDENSED_USE_COUNT_THRESHOLD {
-                        let x = position.x - ((4.0 * uses as f32) / 2.0);
-
-                        for i in 0..uses {
-                            draw_rectangle(
-                                x + 4.0 * i as f32,
-                                position.y - 12.0,
-                                2.0,
-                                12.0,
-                                if i >= remaining {
-                                    HUD_USE_COUNT_COLOR_EMPTY
-                                } else {
-                                    HUD_USE_COUNT_COLOR_FULL
-                                },
-                            )
-                        }
-                    } else {
-                        let x = position.x - (uses as f32 * 14.0) / 2.0;
-
-                        for i in 0..uses {
-                            let x = x + 14.0 * i as f32;
-
-                            if i >= remaining {
-                                draw_circle_lines(
-                                    x,
-                                    position.y - 4.0,
-                                    4.0,
-                                    2.0,
-                                    HUD_USE_COUNT_COLOR_EMPTY,
-                                );
-                            } else {
-                                draw_circle(x, position.y - 4.0, 4.0, HUD_USE_COUNT_COLOR_FULL);
-                            };
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-pub fn flip_offset<S: Into<Option<Vec2>>>(
-    offset: Vec2,
-    size: S,
-    is_facing_left: bool,
-    is_upside_down: bool,
-) -> Vec2 {
-    let mut corrected = Vec2::ZERO;
-
-    let size = size.into().unwrap_or_default();
-
-    if is_facing_left {
-        corrected.x -= offset.x + size.x;
-    } else {
-        corrected.x = offset.x;
-    }
-
-    if is_upside_down {
-        corrected.y -= offset.y + size.y;
-    } else {
-        corrected.y = offset.y;
-    }
-
-    corrected
-}
diff --git a/src/player/mod.rs b/src/player/mod.rs
deleted file mode 100644
index 45e706b8ed..0000000000
--- a/src/player/mod.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
-
-use hecs::{Entity, World};
-
-use core::Transform;
-
-use crate::{
-    AnimatedSprite, AnimatedSpriteMetadata, AnimatedSpriteParams, CollisionWorld, Drawable,
-    GameCamera, PassiveEffectInstance, PhysicsBody, Resources,
-};
-
-mod animation;
-mod character;
-mod controller;
-mod events;
-mod inventory;
-mod state;
-
-pub use animation::*;
-pub use character::*;
-pub use controller::*;
-pub use events::*;
-pub use inventory::*;
-pub use state::*;
-
-use crate::physics::PhysicsBodyParams;
-
-pub const BODY_ANIMATED_SPRITE_ID: &str = "body";
-pub const LEFT_FIN_ANIMATED_SPRITE_ID: &str = "left_fin";
-pub const RIGHT_FIN_ANIMATED_SPRITE_ID: &str = "right_fin";
-
-pub const IDLE_ANIMATION_ID: &str = "idle";
-pub const MOVE_ANIMATION_ID: &str = "move";
-pub const JUMP_ANIMATION_ID: &str = "jump";
-pub const FALL_ANIMATION_ID: &str = "fall";
-pub const CROUCH_ANIMATION_ID: &str = "crouch";
-pub const SLIDE_ANIMATION_ID: &str = "slide";
-pub const DEATH_BACK_ANIMATION_ID: &str = "death_back";
-pub const DEATH_FORWARD_ANIMATION_ID: &str = "death_forward";
-
-pub const WEAPON_MOUNT_TWEEN_ID: &str = "weapon_mount";
-pub const ITEM_MOUNT_TWEEN_ID: &str = "item_mount";
-pub const HAT_MOUNT_TWEEN_ID: &str = "hat_mount";
-
-pub const JUMP_SOUND_ID: &str = "jump";
-pub const LAND_SOUND_ID: &str = "land";
-
-pub const RESPAWN_DELAY: f32 = 2.5;
-pub const PICKUP_GRACE_TIME: f32 = 0.25;
-
-#[derive(Debug, Clone)]
-pub struct PlayerParams {
-    pub index: u8,
-    pub controller: PlayerControllerKind,
-    pub character: PlayerCharacterMetadata,
-}
-
-pub struct Player {
-    pub index: u8,
-    pub state: PlayerState,
-    pub damage_from_left: bool,
-    pub is_facing_left: bool,
-    pub is_upside_down: bool,
-    pub is_attacking: bool,
-    pub jump_frame_counter: u16,
-    pub pickup_grace_timer: f32,
-    pub incapacitation_timer: f32,
-    pub attack_timer: f32,
-    pub respawn_timer: f32,
-    pub camera_box: Rect,
-    pub passive_effects: Vec<PassiveEffectInstance>,
-    pub was_on_ground: bool,
-}
-
-impl Player {
-    pub fn new(index: u8, position: Vec2) -> Self {
-        let camera_box = Rect::new(position.x - 30.0, position.y - 150.0, 100.0, 210.0);
-
-        Player {
-            index,
-            state: PlayerState::None,
-            damage_from_left: false,
-            is_facing_left: false,
-            is_upside_down: false,
-            is_attacking: false,
-            was_on_ground: false,
-            jump_frame_counter: 0,
-            pickup_grace_timer: 0.0,
-            attack_timer: 0.0,
-            incapacitation_timer: 0.0,
-            respawn_timer: 0.0,
-            camera_box,
-            passive_effects: Vec::new(),
-        }
-    }
-}
-
-pub fn update_player_camera_box(world: &mut World) {
-    for (_, (transform, player)) in world.query_mut::<(&Transform, &mut Player)>() {
-        let rect = Rect::new(transform.position.x, transform.position.y, 32.0, 60.0);
-
-        if rect.x < player.camera_box.x {
-            player.camera_box.x = rect.x;
-        }
-
-        if rect.x + rect.w > player.camera_box.x + player.camera_box.w {
-            player.camera_box.x = rect.x + rect.w - player.camera_box.w;
-        }
-
-        if rect.y < player.camera_box.y {
-            player.camera_box.y = rect.y;
-        }
-
-        if rect.y + rect.h > player.camera_box.y + player.camera_box.h {
-            player.camera_box.y = rect.y + rect.h - player.camera_box.h;
-        }
-
-        let mut camera = storage::get_mut::<GameCamera>();
-        camera.add_player_rect(player.camera_box);
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct PlayerAttributes {
-    pub head_threshold: f32,
-    pub legs_threshold: f32,
-    pub weapon_mount: Vec2,
-    pub jump_force: f32,
-    pub move_speed: f32,
-    pub slide_speed_factor: f32,
-    pub incapacitation_duration: f32,
-    pub float_gravity_factor: f32,
-}
-
-impl From<&PlayerCharacterMetadata> for PlayerAttributes {
-    fn from(params: &PlayerCharacterMetadata) -> Self {
-        PlayerAttributes {
-            head_threshold: params.head_threshold,
-            legs_threshold: params.legs_threshold,
-            weapon_mount: params.weapon_mount,
-            jump_force: params.jump_force,
-            move_speed: params.move_speed,
-            slide_speed_factor: params.slide_speed_factor,
-            incapacitation_duration: params.incapacitation_duration,
-            float_gravity_factor: params.float_gravity_factor,
-        }
-    }
-}
-
-impl From<PlayerCharacterMetadata> for PlayerAttributes {
-    fn from(params: PlayerCharacterMetadata) -> Self {
-        PlayerAttributes::from(&params)
-    }
-}
-
-pub fn spawn_player(
-    world: &mut World,
-    index: u8,
-    position: Vec2,
-    controller: PlayerControllerKind,
-    character: PlayerCharacterMetadata,
-) -> Entity {
-    let weapon_mount = character.weapon_mount;
-    let item_mount = character.item_mount;
-    let hat_mount = character.hat_mount;
-
-    let offset = storage::get::<Resources>()
-        .textures
-        .get(&character.sprite.texture_id)
-        .map(|t| {
-            let frame_size = t.frame_size();
-            character.sprite.offset
-                - vec2(frame_size.x / 2.0, frame_size.y - character.collider_size.y)
-        })
-        .unwrap();
-
-    let animations = character
-        .sprite
-        .animations
-        .to_vec()
-        .into_iter()
-        .map(|a| a.into())
-        .collect::<Vec<_>>();
-
-    let texture_id = character.sprite.texture_id.clone();
-
-    let params = {
-        let meta: AnimatedSpriteMetadata = character.sprite.clone().into();
-
-        AnimatedSpriteParams {
-            offset,
-            ..meta.into()
-        }
-    };
-
-    let sprites = vec![(
-        BODY_ANIMATED_SPRITE_ID,
-        AnimatedSprite::new(&texture_id, animations.as_slice(), params),
-    )];
-
-    let draw_order = (index as u32 + 1) * 10;
-
-    let size = character.collider_size.as_i32();
-    let actor = storage::get_mut::<CollisionWorld>().add_actor(position, size.x, size.y);
-
-    let body_params = PhysicsBodyParams {
-        offset: vec2(-character.collider_size.x / 2.0, 0.0),
-        size: character.collider_size,
-        has_friction: false,
-        can_rotate: false,
-        gravity: character.gravity,
-        ..Default::default()
-    };
-
-    world.spawn((
-        Player::new(index, position),
-        Transform::from(position),
-        PlayerController::from(controller),
-        PlayerAttributes::from(&character),
-        PlayerInventory::new(weapon_mount, item_mount, hat_mount),
-        PlayerEventQueue::new(),
-        Drawable::new_animated_sprite_set(draw_order, &sprites),
-        PhysicsBody::new(actor, None, body_params),
-    ))
-}
diff --git a/src/player/state.rs b/src/player/state.rs
index d6588ac7fc..b347a4e66e 100644
--- a/src/player/state.rs
+++ b/src/player/state.rs
@@ -1,305 +1,110 @@
-use macroquad::experimental::collections::storage;
-use macroquad::prelude::*;
+use std::time::Duration;
 
-use hecs::{Entity, World};
+use bevy::{ecs::schedule::ShouldRun, time::FixedTimestep};
+use bevy_mod_js_scripting::run_script_fn_system;
 
-use core::Transform;
+use crate::prelude::*;
 
-use crate::game::play_sound_effect;
-use crate::player::{
-    Player, PlayerAttributes, PlayerController, PlayerEventQueue, JUMP_SOUND_ID, LAND_SOUND_ID,
-    RESPAWN_DELAY,
-};
-use crate::{CollisionWorld, Drawable, DrawableKind, Item, Map, PhysicsBody, PlayerEvent};
+pub struct PlayerStatePlugin;
 
-const SLIDE_STOP_THRESHOLD: f32 = 2.0;
-const JUMP_FRAME_COUNT: u16 = 8;
-const PLATFORM_JUMP_FORCE_MULTIPLIER: f32 = 0.2;
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
-pub enum PlayerState {
-    None,
-    Jumping,
-    Floating,
-    Crouching,
-    Sliding,
-    Incapacitated,
-    Dead,
+#[derive(StageLabel)]
+pub enum PlayerStateStage {
+    // This stage hasn't been used yet and needs more evaulation to see if it is helpful.
+    // CollectExternalTransitions,
+    PerformTransitions,
+    HandleState,
 }
 
-impl Default for PlayerState {
-    fn default() -> Self {
-        PlayerState::None
-    }
+#[derive(Reflect, Component, Default)]
+#[reflect(Component)]
+pub struct PlayerState {
+    /// The unique identifier for the current state
+    id: String,
+    /// The number of frames that this state has been active
+    age: u64,
+    /// The ID of the state that the player was in in the last frame
+    last_state: String,
 }
 
-pub fn update_player_states(world: &mut World) {
-    let query = world.query_mut::<(
-        &mut Transform,
-        &mut Player,
-        &PlayerController,
-        &PlayerAttributes,
-        &mut PhysicsBody,
-    )>();
-    for (_, (transform, player, controller, attributes, body)) in query {
-        // Timers
-        let dt = get_frame_time();
-
-        player.attack_timer -= dt;
-        if player.attack_timer <= 0.0 {
-            player.attack_timer = 0.0;
-        }
-
-        player.is_attacking = player.attack_timer > 0.0;
-
-        player.pickup_grace_timer += dt;
-
-        if player.state == PlayerState::Crouching && !controller.should_crouch {
-            player.state = PlayerState::None;
-        }
-
-        if player.state == PlayerState::Dead {
-            player.respawn_timer += dt;
-
-            player.passive_effects.clear();
-
-            if player.respawn_timer >= RESPAWN_DELAY {
-                player.state = PlayerState::None;
-                player.respawn_timer = 0.0;
-
-                let map = storage::get::<Map>();
-                transform.position = map.get_random_spawn_point();
-            }
-        } else if player.state == PlayerState::Incapacitated {
-            player.incapacitation_timer += dt;
-
-            if player.incapacitation_timer >= attributes.incapacitation_duration {
-                player.state = PlayerState::None;
-                player.incapacitation_timer = 0.0;
-            }
-        }
-
-        if player.state == PlayerState::Sliding && body.velocity.x.abs() <= SLIDE_STOP_THRESHOLD {
-            body.velocity.x = 0.0;
-            player.state = PlayerState::None;
-        }
-
-        // Integration
-        if player.is_attacking
-            || matches!(
-                player.state,
-                PlayerState::Dead | PlayerState::Incapacitated | PlayerState::Sliding
+impl Plugin for PlayerStatePlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<PlayerState>()
+            // .add_stage_after(
+            //     CoreStage::PreUpdate,
+            //     PlayerStateStage::CollectExternalTransitions,
+            //     SystemStage::parallel().with_system(
+            //         run_script_fn_system("playerStateCollectTransitions".into()).at_end(),
+            //     ),
+            // )
+            .add_stage_after(
+                CoreStage::PreUpdate,
+                PlayerStateStage::PerformTransitions,
+                // Note: We use the iyes_loopless FixedTimestepStage here, instead of the FixedTimestep
+                // run critera that we use elsewhere, because it is much easier to compose it with our
+                // state_transition_run_critera.
+                //
+                // The reason we don't _always_ use `FixedTimestepStage` is because it doesn't work with
+                // the `app.add_system_to_stage()` method.
+                FixedTimestepStage::from_stage(
+                    Duration::from_secs_f64(crate::FIXED_TIMESTEP),
+                    SystemStage::single_threaded()
+                        .with_run_criteria(state_transition_run_criteria)
+                        .with_system(
+                            run_script_fn_system("playerStateTransition".into())
+                                .with_run_criteria(in_game_not_paused)
+                                .at_end(),
+                        ),
+                ),
             )
-        {
-            body.has_friction = true;
-
-            player.jump_frame_counter = 0;
-            body.has_mass = true;
-        } else {
-            body.has_friction = false;
-
-            if controller.move_direction.x < 0.0 {
-                player.is_facing_left = true;
-            } else if controller.move_direction.x > 0.0 {
-                player.is_facing_left = false;
-            }
-
-            if controller.should_slide {
-                let velocity = attributes.move_speed * attributes.slide_speed_factor;
-
-                if player.is_facing_left {
-                    body.velocity.x = -velocity;
-                } else {
-                    body.velocity.x = velocity;
-                }
-
-                player.state = PlayerState::Sliding;
-            } else {
-                if controller.move_direction.x < 0.0 {
-                    body.velocity.x = -attributes.move_speed;
-                } else if controller.move_direction.x > 0.0 {
-                    body.velocity.x = attributes.move_speed;
-                } else {
-                    body.velocity.x = 0.0;
-                }
-
-                if controller.should_crouch {
-                    if body.is_on_ground {
-                        body.velocity.x = 0.0;
-                        player.state = PlayerState::Crouching;
-                    } else {
-                        let mut collision_world = storage::get_mut::<CollisionWorld>();
-                        collision_world.descent(body.actor);
-                    }
-                }
-
-                if body.is_on_ground && controller.should_jump {
-                    let jump_force = if controller.should_crouch && body.is_on_platform {
-                        attributes.jump_force * PLATFORM_JUMP_FORCE_MULTIPLIER
-                    } else {
-                        attributes.jump_force
-                    };
-
-                    body.velocity.y = -jump_force;
-
-                    player.state = PlayerState::Jumping;
-
-                    play_sound_effect(JUMP_SOUND_ID, 0.4);
-                } else if player.state == PlayerState::Jumping {
-                    player.jump_frame_counter += 1;
-
-                    if controller.should_float && player.jump_frame_counter <= JUMP_FRAME_COUNT {
-                        body.has_mass = false;
-                    } else {
-                        if matches!(player.state, PlayerState::Jumping | PlayerState::Floating) {
-                            player.state = PlayerState::None;
-                        }
-
-                        player.jump_frame_counter = 0;
-                        body.has_mass = true;
-                    }
-                }
-
-                if !body.is_on_ground && body.velocity.y > 0.0 {
-                    if controller.should_float {
-                        body.velocity.y *= attributes.float_gravity_factor;
-                        player.state = PlayerState::Floating;
-                    }
-                } else if player.state == PlayerState::Floating {
-                    player.state = PlayerState::None;
-                }
-            }
-
-            // Note we can't use `body.was_on_ground` because it is only updated on fixed update,
-            // and this function may run multiple times in one fixed update, resulting in the
-            // landing sound being played more than once.
-            if body.is_on_ground && !player.was_on_ground {
-                if matches!(player.state, PlayerState::Jumping | PlayerState::Floating) {
-                    player.state = PlayerState::None;
-                }
-
-                play_sound_effect(LAND_SOUND_ID, 0.4);
-
-                player.jump_frame_counter = 0;
-                body.has_mass = true;
-            }
-        }
-
-        player.was_on_ground = body.is_on_ground;
+            .add_stage_after(
+                PlayerStateStage::PerformTransitions,
+                PlayerStateStage::HandleState,
+                SystemStage::parallel()
+                    .with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP))
+                    .with_system(
+                        run_script_fn_system("handlePlayerState".into())
+                            .with_run_criteria(in_game_not_paused)
+                            .at_end(),
+                    ),
+            )
+            .add_system_to_stage(FixedUpdateStage::Last, update_player_state_age);
     }
 }
 
-pub fn update_player_passive_effects(world: &mut World) {
-    let mut function_calls = Vec::new();
-
-    let mut sprites_to_spawn = Vec::new();
-    let mut sprites_to_despawn = Vec::new();
-
-    for (entity, (player, player_transform, player_drawable, events)) in world
-        .query::<(&mut Player, &Transform, &Drawable, &mut PlayerEventQueue)>()
-        .iter()
-    {
-        let dt = get_frame_time();
-
-        for effect in &mut player.passive_effects {
-            effect.duration_timer += dt;
-
-            // Move the sprite to follow the player
-            if let Some(sprite_entity) = effect.sprite_entity {
-                let mut transform = world.get_mut::<Transform>(sprite_entity).unwrap();
-                transform.position = player_transform.position;
-            }
-
-            // Spawn the effect sprite if it hasn't been spawned yet
-            if let Some(sprite) = effect.sprite.take() {
-                let sprite_entity = world.reserve_entity();
-
-                let drawable = Drawable {
-                    draw_order: player_drawable.draw_order + 1,
-                    kind: DrawableKind::AnimatedSprite(sprite),
-                };
-
-                sprites_to_spawn.push((sprite_entity, drawable, player_transform.position));
-
-                effect.sprite_entity = Some(sprite_entity);
-            }
-        }
-
-        player.passive_effects.retain(|effect| {
-            if effect.is_depleted() {
-                if let Some(sprite_entity) = effect.sprite_entity {
-                    sprites_to_despawn.push(sprite_entity);
-                }
-
-                false
-            } else {
-                true
-            }
-        });
-
-        events.queue.push(PlayerEvent::Update { dt });
-
-        for event in events.queue.iter() {
-            let kind = event.into();
-
-            for effect in &mut player.passive_effects {
-                if effect.activated_on.contains(&kind) {
-                    effect.use_cnt += 1;
-
-                    if let Some(item_entity) = effect.item {
-                        let mut item = world.get_mut::<Item>(item_entity).unwrap();
-
-                        item.use_cnt += 1;
-                    }
-
-                    if let Some(f) = &effect.function {
-                        function_calls.push((*f, entity, effect.item, event.clone()));
-                    }
-                }
-            }
-        }
-    }
-
-    for (f, player_entity, item_entity, event) in function_calls.drain(0..) {
-        f(world, player_entity, item_entity, event);
+/// Bevy run criteria for when the game is not paused
+fn in_game_not_paused(
+    game_state: Res<CurrentState<GameState>>,
+    in_game_state: Res<CurrentState<InGameState>>,
+) -> ShouldRun {
+    if game_state.0 == GameState::InGame && in_game_state.0 != InGameState::Paused {
+        return ShouldRun::Yes;
     }
 
-    for (sprite_entity, drawable, position) in sprites_to_spawn {
-        world
-            .insert(sprite_entity, (Transform::from(position), drawable))
-            .unwrap();
-    }
-
-    for entity in sprites_to_despawn {
-        world.despawn(entity).unwrap();
-    }
+    ShouldRun::No
 }
 
-pub fn on_player_damage(world: &mut World, damage_from_entity: Entity, damage_to_entity: Entity) {
-    let mut is_from_left = false;
-
-    if let Ok(owner_transform) = world.get::<Transform>(damage_from_entity) {
-        if let Ok(target_transform) = world.get::<Transform>(damage_to_entity) {
-            is_from_left = owner_transform.position.x < target_transform.position.x;
+fn state_transition_run_criteria(
+    mut changed_states: Query<&mut PlayerState, Changed<PlayerState>>,
+) -> ShouldRun {
+    // Note, this will always run once per frame, because the `update_player_state_age` system runs
+    // at the end of every frame.
+    let mut has_changed = false;
+    for mut state in &mut changed_states {
+        has_changed = true;
+        if state.last_state != state.id {
+            state.age = 0;
         }
     }
-
-    {
-        let mut events = world
-            .get_mut::<PlayerEventQueue>(damage_from_entity)
-            .unwrap();
-
-        events.queue.push(PlayerEvent::GiveDamage {
-            damage_to: Some(damage_to_entity),
-        });
+    if has_changed {
+        ShouldRun::YesAndCheckAgain
+    } else {
+        ShouldRun::No
     }
+}
 
-    {
-        let mut events = world.get_mut::<PlayerEventQueue>(damage_to_entity).unwrap();
-
-        events.queue.push(PlayerEvent::ReceiveDamage {
-            is_from_left,
-            damage_from: Some(damage_from_entity),
-        });
+fn update_player_state_age(mut states: Query<&mut PlayerState>) {
+    for mut state in &mut states {
+        state.age = state.age.saturating_add(1);
+        state.last_state = state.id.clone();
     }
 }
diff --git a/src/prelude.rs b/src/prelude.rs
new file mode 100644
index 0000000000..1504140262
--- /dev/null
+++ b/src/prelude.rs
@@ -0,0 +1,8 @@
+pub use crate::{
+    assets::AssetHandle, utils::event::FixedUpdateEventAppExt, FixedUpdateStage, GameState,
+    InGameState,
+};
+pub use bevy::prelude::*;
+pub use iyes_loopless::prelude::*;
+pub use leafwing_input_manager::prelude::*;
+pub use serde::{Deserialize, Serialize};
diff --git a/src/resources.rs b/src/resources.rs
deleted file mode 100644
index ce239da83f..0000000000
--- a/src/resources.rs
+++ /dev/null
@@ -1,694 +0,0 @@
-use std::{collections::HashMap, fs, path::Path};
-
-use macroquad::{
-    audio::{load_sound, Sound},
-    experimental::{collections::storage, coroutines::start_coroutine},
-    prelude::*,
-};
-
-use ff_particles::EmitterConfig;
-
-use serde::{Deserialize, Serialize};
-
-use core::data::{deserialize_json_bytes, deserialize_json_file};
-use core::error::ErrorKind;
-use core::text::ToStringHelper;
-use core::{formaterr, Result};
-
-use crate::gui::GuiResources;
-use crate::map::DecorationMetadata;
-
-use crate::player::PlayerCharacterMetadata;
-use crate::{items::MapItemMetadata, map::Map};
-
-const PARTICLE_EFFECTS_DIR: &str = "particle_effects";
-const SOUNDS_FILE: &str = "sounds";
-const MUSIC_FILE: &str = "music";
-const TEXTURES_FILE: &str = "textures";
-const IMAGES_FILE: &str = "images";
-const MAPS_FILE: &str = "maps";
-const DECORATION_FILE: &str = "decoration";
-const ITEMS_FILE: &str = "items";
-const PLAYER_CHARACTERS_FILE: &str = "player_characters";
-
-const RESOURCE_FILES_EXTENSION: &str = "json";
-
-pub const MAP_EXPORTS_DEFAULT_DIR: &str = "maps";
-pub const MAP_EXPORTS_EXTENSION: &str = "json";
-pub const MAP_EXPORT_NAME_MIN_LEN: usize = 1;
-
-pub const MAP_PREVIEW_PLACEHOLDER_PATH: &str = "maps/no_preview.png";
-pub const MAP_PREVIEW_PLACEHOLDER_ID: &str = "map_preview_placeholder";
-
-const ACTIVE_MODS_FILE_NAME: &str = "active_mods";
-const MOD_FILE_NAME: &str = "jumpy_mod";
-
-#[derive(Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-struct ParticleEffectMetadata {
-    id: String,
-    path: String,
-}
-
-#[derive(Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-struct SoundMetadata {
-    id: String,
-    path: String,
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum TextureKind {
-    Background,
-    Tileset,
-    Spritesheet,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct TextureMetadata {
-    pub id: String,
-    pub path: String,
-    #[serde(default, rename = "type", skip_serializing_if = "Option::is_none")]
-    pub kind: Option<TextureKind>,
-    #[serde(
-        default,
-        alias = "sprite_size",
-        with = "core::json::vec2_opt",
-        skip_serializing_if = "Option::is_none"
-    )]
-    pub frame_size: Option<Vec2>,
-    #[serde(
-        default = "core::json::default_filter_mode",
-        with = "core::json::FilterModeDef"
-    )]
-    pub filter_mode: FilterMode,
-    #[serde(default, skip)]
-    pub size: Vec2,
-}
-
-#[derive(Debug, Clone)]
-pub struct TextureResource {
-    pub texture: Texture2D,
-    pub meta: TextureMetadata,
-}
-
-impl TextureResource {
-    pub fn frame_size(&self) -> Vec2 {
-        self.meta.frame_size.unwrap_or(self.meta.size)
-    }
-}
-
-impl From<&TextureResource> for Texture2D {
-    fn from(res: &TextureResource) -> Self {
-        res.texture
-    }
-}
-
-impl From<TextureResource> for Texture2D {
-    fn from(res: TextureResource) -> Self {
-        res.texture
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ImageMetadata {
-    pub id: String,
-    pub path: String,
-    #[serde(default, skip)]
-    pub size: Vec2,
-}
-
-#[derive(Debug, Clone)]
-pub struct ImageResource {
-    pub image: Image,
-    pub meta: ImageMetadata,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct MapMetadata {
-    pub name: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-    pub path: String,
-    pub preview_path: String,
-    #[serde(default, skip_serializing_if = "core::json::is_false")]
-    pub is_tiled_map: bool,
-    #[serde(default, skip_serializing_if = "core::json::is_false")]
-    pub is_user_map: bool,
-}
-
-#[derive(Debug, Clone)]
-pub struct MapResource {
-    pub map: Map,
-    pub preview: Texture2D,
-    pub meta: MapMetadata,
-}
-
-// TODO: Add an optional requirement for all resource files (for when loading games main resources)
-async fn load_resources_from<P: AsRef<Path>>(path: P, resources: &mut Resources) -> Result<()> {
-    let path = path.as_ref();
-
-    {
-        let particle_effects_file_path = path
-            .join(PARTICLE_EFFECTS_DIR)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        if let Ok(bytes) = load_file(&particle_effects_file_path.to_string_helper()).await {
-            let metadata: Vec<ParticleEffectMetadata> = deserialize_json_bytes(&bytes)?;
-
-            for meta in metadata {
-                let file_path = path.join(&meta.path);
-
-                let cfg: EmitterConfig = deserialize_json_file(&file_path).await?;
-
-                resources.particle_effects.insert(meta.id, cfg);
-            }
-        }
-    }
-
-    {
-        let sounds_file_path = path
-            .join(SOUNDS_FILE)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        if let Ok(bytes) = load_file(&sounds_file_path.to_string_helper()).await {
-            let metadata: Vec<SoundMetadata> = deserialize_json_bytes(&bytes)?;
-
-            for meta in metadata {
-                let file_path = path.join(meta.path);
-
-                let sound = load_sound(&file_path.to_string_helper()).await?;
-
-                resources.sounds.insert(meta.id, sound);
-            }
-        }
-    }
-
-    {
-        let music_file_path = path
-            .join(MUSIC_FILE)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        if let Ok(bytes) = load_file(&music_file_path.to_string_helper()).await {
-            let metadata: Vec<SoundMetadata> = deserialize_json_bytes(&bytes)?;
-
-            for meta in metadata {
-                let file_path = path.join(meta.path);
-
-                let sound = load_sound(&file_path.to_string_helper()).await?;
-
-                resources.music.insert(meta.id, sound);
-            }
-        }
-    }
-
-    {
-        let textures_file_path = path
-            .join(TEXTURES_FILE)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        if let Ok(bytes) = load_file(&textures_file_path.to_string_helper()).await {
-            let metadata: Vec<TextureMetadata> = deserialize_json_bytes(&bytes)?;
-
-            for meta in metadata {
-                let file_path = path.join(&meta.path);
-
-                let texture = load_texture(&file_path.to_string_helper()).await?;
-                texture.set_filter(meta.filter_mode);
-
-                let size = vec2(texture.width(), texture.height());
-
-                let key = meta.id.clone();
-
-                let meta = TextureMetadata { size, ..meta };
-
-                #[cfg(debug_assertions)]
-                if meta.frame_size.is_none()
-                    && meta.kind.is_some()
-                    && meta.kind.unwrap() == TextureKind::Spritesheet
-                {
-                    println!(
-                        "WARNING: The texture '{}' is a spritesheet but no frame size has been set",
-                        &meta.id
-                    );
-                }
-
-                let res = TextureResource { texture, meta };
-
-                resources.textures.insert(key, res);
-            }
-        }
-    }
-
-    {
-        let images_file_path = path
-            .join(IMAGES_FILE)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        if let Ok(bytes) = load_file(&images_file_path.to_string_helper()).await {
-            let metadata: Vec<ImageMetadata> = deserialize_json_bytes(&bytes)?;
-
-            for meta in metadata {
-                let file_path = path.join(&meta.path);
-
-                let image = load_image(&file_path.to_string_helper()).await?;
-
-                let key = meta.id.clone();
-
-                let meta = ImageMetadata {
-                    size: vec2(image.width() as f32, image.height() as f32),
-                    ..meta
-                };
-
-                let res = ImageResource { image, meta };
-
-                resources.images.insert(key, res);
-            }
-        }
-    }
-
-    {
-        let maps_file_path = path
-            .join(MAPS_FILE)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        if let Ok(bytes) = load_file(&maps_file_path.to_string_helper()).await {
-            let metadata: Vec<MapMetadata> = deserialize_json_bytes(&bytes)?;
-
-            for meta in metadata {
-                let map_path = path.join(&meta.path);
-                let preview_path = path.join(&meta.preview_path);
-
-                let map = if meta.is_tiled_map {
-                    Map::load_tiled(map_path, None).await?
-                } else {
-                    Map::load(map_path).await?
-                };
-
-                let preview = load_texture(&preview_path.to_string_helper()).await?;
-
-                let res = MapResource { map, preview, meta };
-
-                resources.maps.push(res)
-            }
-        }
-    }
-
-    {
-        let decoration_file_path = path
-            .join(DECORATION_FILE)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        if let Ok(bytes) = load_file(&decoration_file_path.to_string_helper()).await {
-            let decoration_paths: Vec<String> = deserialize_json_bytes(&bytes)?;
-
-            for decoration_path in decoration_paths {
-                let path = path.join(&decoration_path);
-
-                let params: DecorationMetadata = deserialize_json_file(&path).await?;
-
-                resources.decoration.insert(params.id.clone(), params);
-            }
-        }
-    }
-
-    {
-        let items_file_path = path
-            .join(ITEMS_FILE)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        if let Ok(bytes) = load_file(&items_file_path.to_string_helper()).await {
-            let item_paths: Vec<String> = deserialize_json_bytes(&bytes)?;
-
-            for item_path in item_paths {
-                let path = path.join(&item_path);
-
-                let params: MapItemMetadata = deserialize_json_file(&path).await?;
-
-                resources.items.insert(params.id.clone(), params);
-            }
-        }
-    }
-
-    {
-        let path = path
-            .join(PLAYER_CHARACTERS_FILE)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        if let Ok(bytes) = load_file(&path.to_string_helper()).await {
-            let metadata: Vec<PlayerCharacterMetadata> = deserialize_json_bytes(&bytes)?;
-
-            for meta in metadata {
-                resources.player_characters.insert(meta.id.clone(), meta);
-            }
-        }
-    };
-
-    Ok(())
-}
-
-pub struct Resources {
-    pub assets_dir: String,
-    pub mods_dir: String,
-
-    pub loaded_mods: Vec<ModMetadata>,
-
-    pub particle_effects: HashMap<String, EmitterConfig>,
-    pub sounds: HashMap<String, Sound>,
-    pub music: HashMap<String, Sound>,
-    pub textures: HashMap<String, TextureResource>,
-    pub images: HashMap<String, ImageResource>,
-    pub maps: Vec<MapResource>,
-    pub decoration: HashMap<String, DecorationMetadata>,
-    pub items: HashMap<String, MapItemMetadata>,
-    pub player_characters: HashMap<String, PlayerCharacterMetadata>,
-}
-
-impl Resources {
-    pub async fn new<P: AsRef<Path>>(assets_dir: P, mods_dir: P) -> Result<Resources> {
-        let assets_dir = assets_dir.as_ref();
-        let mods_dir = mods_dir.as_ref();
-
-        let mut resources = Resources {
-            assets_dir: assets_dir.to_string_helper(),
-            mods_dir: mods_dir.to_string_helper(),
-            loaded_mods: Vec::new(),
-            particle_effects: HashMap::new(),
-            sounds: HashMap::new(),
-            music: HashMap::new(),
-            textures: HashMap::new(),
-            decoration: HashMap::new(),
-            images: HashMap::new(),
-            maps: Vec::new(),
-            items: HashMap::new(),
-            player_characters: HashMap::new(),
-        };
-
-        load_resources_from(assets_dir, &mut resources).await?;
-
-        load_mods(mods_dir, &mut resources).await?;
-
-        Ok(resources)
-    }
-
-    pub fn create_map(
-        &self,
-        name: &str,
-        description: Option<&str>,
-        tile_size: Vec2,
-        grid_size: UVec2,
-    ) -> Result<MapResource> {
-        let description = description.map(|str| str.to_string());
-
-        let map_path = Path::new(MAP_EXPORTS_DEFAULT_DIR)
-            .join(map_name_to_filename(name))
-            .with_extension(MAP_EXPORTS_EXTENSION);
-
-        let path = map_path.to_string_helper();
-
-        let preview_path = Path::new(MAP_PREVIEW_PLACEHOLDER_PATH).to_string_helper();
-
-        let meta = MapMetadata {
-            name: name.to_string(),
-            description,
-            path,
-            preview_path,
-            is_tiled_map: false,
-            is_user_map: true,
-        };
-
-        let map = Map::new(tile_size, grid_size);
-
-        let preview = {
-            let res = self.textures.get(MAP_PREVIEW_PLACEHOLDER_ID).unwrap();
-            res.texture
-        };
-
-        Ok(MapResource { map, preview, meta })
-    }
-
-    pub fn save_map(&mut self, map_resource: &MapResource) -> Result<()> {
-        let assets_path = Path::new(&self.assets_dir);
-        let export_path = assets_path.join(&map_resource.meta.path);
-
-        let mut map_already_existed = false;
-        if export_path.exists() {
-            let mut i = 0;
-            while i < self.maps.len() {
-                let res = &self.maps[i];
-                if res.meta.path == map_resource.meta.path {
-                    if res.meta.is_user_map || cfg!(debug_assertions) {
-                        map_already_existed = true;
-                        self.maps[i] = map_resource.clone();
-                        break;
-                    } else {
-                        return Err(formaterr!(
-                            ErrorKind::General,
-                            "Resources: The path '{}' is in use and it is not possible to overwrite. Please choose a different map name",
-                            &map_resource.meta.path,
-                        ));
-                    }
-                }
-
-                i += 1;
-            }
-        }
-
-        map_resource.map.save(export_path)?;
-
-        if !map_already_existed {
-            self.maps.push(map_resource.clone());
-        }
-        self.save_maps_file()?;
-
-        Ok(())
-    }
-
-    pub fn delete_map(&mut self, index: usize) -> Result<()> {
-        let map_resource = self.maps.remove(index);
-
-        let path = Path::new(&self.assets_dir).join(&map_resource.meta.path);
-
-        fs::remove_file(path)?;
-
-        self.save_maps_file()?;
-
-        Ok(())
-    }
-
-    fn save_maps_file(&self) -> Result<()> {
-        let maps_file_path = Path::new(&self.assets_dir)
-            .join(MAPS_FILE)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        let metadata: Vec<MapMetadata> = self.maps.iter().map(|res| res.meta.clone()).collect();
-
-        let str = serde_json::to_string_pretty(&metadata)?;
-        fs::write(maps_file_path, &str)?;
-
-        Ok(())
-    }
-}
-
-pub fn map_name_to_filename(name: &str) -> String {
-    name.replace([' ', '.'], "_").to_lowercase()
-}
-
-pub fn is_valid_map_file_name(file_name: &str) -> bool {
-    if file_name.len() - MAP_EXPORTS_EXTENSION.len() > MAP_EXPORT_NAME_MIN_LEN {
-        if let Some(extension) = Path::new(file_name).extension() {
-            return extension == MAP_EXPORTS_EXTENSION;
-        }
-    }
-
-    false
-}
-
-pub fn is_valid_map_export_path<P: AsRef<Path>>(path: P, should_overwrite: bool) -> bool {
-    let path = path.as_ref();
-
-    if let Some(file_name) = path.file_name() {
-        if is_valid_map_file_name(&file_name.to_string_helper()) {
-            let resources = storage::get::<Resources>();
-
-            let res = resources
-                .maps
-                .iter()
-                .find(|res| Path::new(&res.meta.path) == path);
-
-            if let Some(res) = res {
-                return res.meta.is_user_map && should_overwrite;
-            }
-
-            return true;
-        }
-    }
-
-    false
-}
-
-#[cfg(target_arch = "wasm32")]
-pub async fn load_resources(assets_dir: &str, mods_dir: &str) -> Result<()> {
-    {
-        let resources = Resources::new(assets_dir, mods_dir).await?;
-        storage::store(resources);
-    }
-
-    {
-        let gui_resources = GuiResources::new();
-        storage::store(gui_resources);
-    }
-
-    Ok(())
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-pub async fn load_resources(assets_dir: &str, mods_dir: &str) -> Result<()> {
-    let assets_loading = start_coroutine({
-        let assets_dir = assets_dir.to_string();
-        let mods_dir = mods_dir.to_string();
-        async move {
-            let resources = match Resources::new(&assets_dir, &mods_dir).await {
-                Ok(val) => val,
-                Err(err) => panic!("{}: {}", err.kind().as_str(), err),
-            };
-
-            storage::store(resources);
-        }
-    });
-
-    while !assets_loading.is_done() {
-        clear_background(BLACK);
-        draw_text(
-            &format!(
-                "Loading assets {}",
-                ".".repeat(((get_time() * 2.0) as usize) % 4)
-            ),
-            screen_width() / 2.0 - 160.0,
-            screen_height() / 2.0,
-            40.,
-            WHITE,
-        );
-
-        next_frame().await;
-    }
-
-    {
-        let gui_resources = GuiResources::new();
-        storage::store(gui_resources);
-    }
-
-    Ok(())
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ModMetadata {
-    pub id: String,
-    #[serde(default)]
-    pub name: String,
-    #[serde(default)]
-    pub description: String,
-    pub version: String,
-    #[serde(default)]
-    pub kind: ModKind,
-    #[serde(default)]
-    pub dependencies: Vec<DependencyMetadata>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub game_version: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct DependencyMetadata {
-    pub id: String,
-    pub version: String,
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum ModKind {
-    DataOnly,
-    Full,
-}
-
-impl Default for ModKind {
-    fn default() -> Self {
-        ModKind::Full
-    }
-}
-
-// TODO: Better version checks
-async fn load_mods<P: AsRef<Path>>(mods_dir: P, resources: &mut Resources) -> Result<()> {
-    let mods_dir = mods_dir.as_ref();
-
-    let active_mods_file_path = mods_dir
-        .join(ACTIVE_MODS_FILE_NAME)
-        .with_extension(RESOURCE_FILES_EXTENSION);
-
-    let mod_dirs: Vec<String> = deserialize_json_file(active_mods_file_path).await?;
-
-    for mod_dir in mod_dirs.iter() {
-        let mod_dir_path = mods_dir.join(mod_dir);
-
-        let mod_file_path = mod_dir_path
-            .join(MOD_FILE_NAME)
-            .with_extension(RESOURCE_FILES_EXTENSION);
-
-        let meta: ModMetadata = deserialize_json_file(mod_file_path).await?;
-
-        let mut has_game_version_mismatch = false;
-
-        if let Some(req_version) = &meta.game_version {
-            if *req_version != env!("CARGO_PKG_VERSION") {
-                has_game_version_mismatch = true;
-
-                #[cfg(debug_assertions)]
-                println!(
-                    "Loading mod {} (v{}) failed: Game version requirement mismatch (v{})",
-                    &meta.id, &meta.version, req_version
-                );
-            }
-        }
-
-        if !has_game_version_mismatch {
-            let mut has_unmet_dependencies = false;
-
-            for dependency in &meta.dependencies {
-                let res = resources
-                    .loaded_mods
-                    .iter()
-                    .find(|&meta| meta.id == dependency.id && meta.version == dependency.version);
-
-                if res.is_none() {
-                    has_unmet_dependencies = true;
-
-                    #[cfg(debug_assertions)]
-                    println!(
-                        "Loading mod {} (v{}) failed: Unmet dependency {} (v{})",
-                        &meta.id, &meta.version, &dependency.id, &dependency.version
-                    );
-
-                    break;
-                }
-            }
-
-            if !has_unmet_dependencies {
-                load_resources_from(mod_dir_path, resources).await?;
-
-                #[cfg(debug_assertions)]
-                println!("Loaded mod {} (v{})", &meta.id, &meta.version);
-
-                resources.loaded_mods.push(meta);
-            }
-        }
-    }
-
-    Ok(())
-}
diff --git a/src/run_criteria.rs b/src/run_criteria.rs
new file mode 100644
index 0000000000..deb7dcc644
--- /dev/null
+++ b/src/run_criteria.rs
@@ -0,0 +1,41 @@
+use bevy::ecs::schedule::ShouldRun;
+
+/// Helper trait for dealing with the [`ShouldRun`] type
+pub trait ShouldRunExt {
+    fn new(should_run: bool, check_again: bool) -> Self;
+    fn should_run(&self) -> bool;
+    fn check_again(&self) -> bool;
+    fn merge(&self, other: Self) -> Self;
+}
+
+impl ShouldRunExt for ShouldRun {
+    fn new(should_run: bool, check_again: bool) -> Self {
+        match (should_run, check_again) {
+            (true, true) => ShouldRun::YesAndCheckAgain,
+            (true, false) => ShouldRun::Yes,
+            (false, true) => ShouldRun::NoAndCheckAgain,
+            (false, false) => ShouldRun::No,
+        }
+    }
+
+    fn should_run(&self) -> bool {
+        match self {
+            ShouldRun::YesAndCheckAgain | ShouldRun::Yes => true,
+            ShouldRun::NoAndCheckAgain | ShouldRun::No => false,
+        }
+    }
+
+    fn check_again(&self) -> bool {
+        match self {
+            ShouldRun::Yes | ShouldRun::No => false,
+            ShouldRun::YesAndCheckAgain | ShouldRun::NoAndCheckAgain => true,
+        }
+    }
+
+    fn merge(&self, other: Self) -> Self {
+        Self::new(
+            self.should_run() || other.should_run(),
+            self.check_again() || other.check_again(),
+        )
+    }
+}
diff --git a/src/scripting.rs b/src/scripting.rs
new file mode 100644
index 0000000000..303e4d4165
--- /dev/null
+++ b/src/scripting.rs
@@ -0,0 +1,193 @@
+use std::{
+    any::TypeId,
+    hash::{Hash, Hasher},
+};
+
+use crate::{prelude::*, run_criteria::ShouldRunExt};
+use bevy::{
+    asset::HandleId, ecs::schedule::ShouldRun, reflect::TypeRegistryArc, time::FixedTimestep,
+};
+use bevy_mod_js_scripting::{
+    bevy_reflect_fns::{
+        PassMode, ReflectArg, ReflectFunction, ReflectFunctionError, ReflectMethods,
+    },
+    run_script_fn_system, JsRuntimeConfig, JsScriptingPlugin,
+};
+
+mod ops;
+
+pub struct ScriptingPlugin;
+
+#[derive(StageLabel)]
+pub enum ScriptUpdateStage {
+    First,
+    FirstInGame,
+    PreUpdate,
+    PreUpdateInGame,
+    Update,
+    UpdateInGame,
+    PostUpdate,
+    PostUpdateInGame,
+    Last,
+    LastInGame,
+}
+
+/// A JS that represents a u64 with two u32's that can be serialized to JavaScript `number` types
+/// without losing precision ( I think. )
+#[derive(Serialize, Deserialize)]
+pub struct JsU64(u32, u32);
+
+impl From<u64> for JsU64 {
+    fn from(n: u64) -> Self {
+        JsU64((n >> 32) as u32, n as u32)
+    }
+}
+
+impl From<JsU64> for u64 {
+    fn from(JsU64(n2, n1): JsU64) -> Self {
+        (n2 as u64) << 32 | n1 as u64
+    }
+}
+
+impl Plugin for ScriptingPlugin {
+    fn build(&self, app: &mut App) {
+        let custom_ops = ops::get_ops();
+
+        app.register_type::<Time>()
+            .insert_non_send_resource(JsRuntimeConfig { custom_ops })
+            .add_plugin(JsScriptingPlugin {
+                skip_core_stage_setup: true,
+            });
+
+        {
+            let type_registry = app.world.resource::<TypeRegistryArc>();
+            let mut type_registry = type_registry.write();
+            type_registry
+                .get_mut(TypeId::of::<HandleId>())
+                .unwrap()
+                .insert(ReflectMethods::from_methods([(
+                    "hash",
+                    ReflectFunction {
+                        fn_name: "hash",
+                        signature: [(PassMode::Owned, TypeId::of::<HandleId>())]
+                            .into_iter()
+                            .collect(),
+                        f: hash_handle_id_reflect,
+                    },
+                )]));
+        }
+
+        // Add fixed update stages
+        app.add_stage_after(
+            FixedUpdateStage::First,
+            ScriptUpdateStage::First,
+            SystemStage::single(run_script_fn_system("first".into()))
+                .with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+        )
+        .add_stage_after(
+            FixedUpdateStage::First,
+            ScriptUpdateStage::FirstInGame,
+            SystemStage::single(run_script_fn_system("firstInGame".into())).with_run_criteria(
+                FixedTimestep::step(crate::FIXED_TIMESTEP).chain(is_in_game_run_criteria),
+            ),
+        )
+        .add_stage_after(
+            FixedUpdateStage::PreUpdate,
+            ScriptUpdateStage::PreUpdate,
+            SystemStage::single(run_script_fn_system("preUpdate".into()))
+                .with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+        )
+        .add_stage_after(
+            FixedUpdateStage::PreUpdate,
+            ScriptUpdateStage::PreUpdateInGame,
+            SystemStage::single(run_script_fn_system("preUpdateInGame".into())).with_run_criteria(
+                FixedTimestep::step(crate::FIXED_TIMESTEP).chain(is_in_game_run_criteria),
+            ),
+        )
+        .add_stage_after(
+            FixedUpdateStage::Update,
+            ScriptUpdateStage::Update,
+            SystemStage::single(run_script_fn_system("update".into()))
+                .with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+        )
+        .add_stage_after(
+            FixedUpdateStage::Update,
+            ScriptUpdateStage::UpdateInGame,
+            SystemStage::single(run_script_fn_system("updateInGame".into())).with_run_criteria(
+                FixedTimestep::step(crate::FIXED_TIMESTEP).chain(is_in_game_run_criteria),
+            ),
+        )
+        .add_stage_after(
+            FixedUpdateStage::PostUpdate,
+            ScriptUpdateStage::PostUpdate,
+            SystemStage::single(run_script_fn_system("postUpdate".into()))
+                .with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+        )
+        .add_stage_after(
+            FixedUpdateStage::PostUpdate,
+            ScriptUpdateStage::PostUpdateInGame,
+            SystemStage::single(run_script_fn_system("postUpdateInGame".into())).with_run_criteria(
+                FixedTimestep::step(crate::FIXED_TIMESTEP).chain(is_in_game_run_criteria),
+            ),
+        )
+        .add_stage_after(
+            FixedUpdateStage::Last,
+            ScriptUpdateStage::Last,
+            SystemStage::single(run_script_fn_system("last".into()))
+                .with_run_criteria(FixedTimestep::step(crate::FIXED_TIMESTEP)),
+        )
+        .add_stage_after(
+            FixedUpdateStage::Last,
+            ScriptUpdateStage::LastInGame,
+            SystemStage::single(run_script_fn_system("lastInGame".into())).with_run_criteria(
+                FixedTimestep::step(crate::FIXED_TIMESTEP).chain(is_in_game_run_criteria),
+            ),
+        );
+    }
+}
+
+/// Heper stage run criteria that only runs if we are in a gameplay state.
+fn is_in_game_run_criteria(
+    should_run: In<ShouldRun>,
+    game_state: Option<Res<CurrentState<GameState>>>,
+    in_game_state: Option<Res<CurrentState<InGameState>>>,
+) -> ShouldRun {
+    if should_run.0.should_run() {
+        let is_in_game = game_state
+            .map(|x| x.0 == GameState::InGame)
+            .unwrap_or(false)
+            && in_game_state
+                .map(|x| x.0 != InGameState::Paused)
+                .unwrap_or(false);
+
+        ShouldRun::new(is_in_game, should_run.0.check_again())
+    } else {
+        should_run.0
+    }
+}
+
+/// Helper function to hash a [`HandleId`].
+fn hash_handle_id(id: HandleId) -> String {
+    let mut hasher = fnv::FnvHasher::default();
+    id.hash(&mut hasher);
+    // The bit shift makes the hash fit within the safe integer range for a JavaScript number
+    base64::encode(hasher.finish().to_le_bytes())
+}
+
+/// Wrapper around [`hash_handle_id`] for exposing as a reflect function.
+fn hash_handle_id_reflect(
+    args: &mut [ReflectArg],
+) -> Result<Box<dyn Reflect>, ReflectFunctionError> {
+    let arg_count = args.len();
+    if arg_count != 1 {
+        return Err(ReflectFunctionError::ArgCountMismatch {
+            expected: 1,
+            got: arg_count,
+        });
+    }
+
+    let id = &args[0];
+    let id: HandleId = id.from_reflect()?;
+    let hash = hash_handle_id(id);
+    Ok(Box::new(hash) as _)
+}
diff --git a/src/scripting/ops.rs b/src/scripting/ops.rs
new file mode 100644
index 0000000000..230a3edd41
--- /dev/null
+++ b/src/scripting/ops.rs
@@ -0,0 +1,71 @@
+use bevy_mod_js_scripting::{JsRuntimeOp, OpMap};
+
+pub mod asset;
+pub mod collision_world;
+pub mod entity;
+pub mod item;
+pub mod map;
+pub mod net;
+pub mod player;
+pub mod script;
+pub mod world;
+
+pub fn get_ops() -> OpMap {
+    let mut ops = OpMap::default();
+
+    ops.insert("_component_types_include", Box::new(ComponentTypesInclude));
+    ops.insert(
+        "jumpy_element_get_spawned_entities",
+        Box::new(map::ElementGetSpawnedEntities),
+    );
+    ops.insert("jumpy_item_grab_events", Box::new(item::ItemGrabEvents));
+    ops.insert("jumpy_item_drop_events", Box::new(item::ItemDropEvents));
+    ops.insert("jumpy_item_use_events", Box::new(item::ItemUseEvents));
+    ops.insert(
+        "jumpy_asset_get_handle_id",
+        Box::new(asset::AssetGetHandleId),
+    );
+    ops.insert(
+        "jumpy_asset_get_absolute_path",
+        Box::new(asset::AssetGetAbsolutePath),
+    );
+    ops.insert("jumpy_script_get_info", Box::new(script::ScriptGetInfo));
+    ops.insert("entity_ref_to_js", Box::new(entity::EntityRefToJs));
+    ops.insert("entity_ref_from_js", Box::new(entity::EntityRefFromJs));
+    ops.insert("jumpy_net_info_get", Box::new(net::NetInfoGet));
+    ops.insert("jumpy_player_kill", Box::new(player::PlayerKill));
+    ops.insert("jumpy_player_despawn", Box::new(player::PlayerDespawn));
+    ops.insert(
+        "jumpy_player_kill_events",
+        Box::new(player::PlayerKillEvents),
+    );
+    ops.insert("jumpy_player_use_item", Box::new(player::PlayerUseItem));
+    ops.insert(
+        "jumpy_player_get_inventory",
+        Box::new(player::PlayerGetInventory),
+    );
+    ops.insert(
+        "jumpy_player_set_inventory",
+        Box::new(player::PlayerSetInventory),
+    );
+    ops.insert(
+        "jumpy_collision_world_actor_collisions",
+        Box::new(collision_world::CollisionWorldActorCollisions),
+    );
+
+    ops.insert(
+        "jumpy_world_despawn_recursive",
+        Box::new(world::WorldDespawnRecursive),
+    );
+
+    ops
+}
+
+/// Op that includes the type name constants for components defined in Jumpy. A temporary fix until
+/// they can be auto-generated by bevy_mod_js_scripting.
+struct ComponentTypesInclude;
+impl JsRuntimeOp for ComponentTypesInclude {
+    fn js(&self) -> Option<&'static str> {
+        Some(include_str!("../../lib.jumpy.js"))
+    }
+}
diff --git a/src/scripting/ops/asset.rs b/src/scripting/ops/asset.rs
new file mode 100644
index 0000000000..1db0f1381d
--- /dev/null
+++ b/src/scripting/ops/asset.rs
@@ -0,0 +1,95 @@
+use std::path::PathBuf;
+
+use crate::prelude::*;
+
+use anyhow::Context;
+use bevy::asset::HandleId;
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, JsValueRef, OpContext};
+use normalize_path::NormalizePath;
+
+pub struct AssetGetHandleId;
+impl JsRuntimeOp for AssetGetHandleId {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Assets) {
+                globalThis.Assets = {}
+            }
+            
+            globalThis.Assets.getHandleId = (path) => {
+                return Value.wrapValueRef(bevyModJsScriptingOpSync('jumpy_asset_get_handle_id', path));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        _world: &mut World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (relative_path,): (String,) = serde_json::from_value(args).context("Parse args")?;
+
+        let reflect_refs = ctx.op_state.get_mut().unwrap();
+
+        let path = &ctx.script_info.path;
+        let absolute_path = if relative_path.starts_with('/') {
+            PathBuf::from(relative_path)
+        } else if relative_path.starts_with("./") {
+            path.parent()
+                .unwrap()
+                .join(relative_path.strip_prefix("./").unwrap())
+        } else {
+            path.parent().unwrap().join(relative_path)
+        };
+        let absolute_path = absolute_path.normalize();
+        let path_str = absolute_path.to_str().expect("Non-unicode-path");
+
+        let handle_id: HandleId = path_str.into();
+        let value_ref = JsValueRef::new_free(Box::new(handle_id), reflect_refs);
+
+        Ok(serde_json::to_value(&value_ref)?)
+    }
+}
+
+pub struct AssetGetAbsolutePath;
+impl JsRuntimeOp for AssetGetAbsolutePath {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Assets) {
+                globalThis.Assets = {}
+            }
+            
+            globalThis.Assets.getAbsolutePath = (path) => {
+                return bevyModJsScriptingOpSync('jumpy_asset_get_absolute_path', path);
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        _world: &mut World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (relative_path,): (String,) = serde_json::from_value(args).context("Parse args")?;
+
+        let path = &ctx.script_info.path;
+        let absolute_path = if relative_path.starts_with('/') {
+            PathBuf::from(relative_path)
+        } else if relative_path.starts_with("./") {
+            path.parent()
+                .unwrap()
+                .join(relative_path.strip_prefix("./").unwrap())
+        } else {
+            path.parent().unwrap().join(relative_path)
+        };
+        let absolute_path = absolute_path.normalize();
+        let path_str = absolute_path.to_str().expect("Non-unicode-path");
+
+        Ok(serde_json::to_value(&path_str)?)
+    }
+}
diff --git a/src/scripting/ops/collision_world.rs b/src/scripting/ops/collision_world.rs
new file mode 100644
index 0000000000..d9c186b011
--- /dev/null
+++ b/src/scripting/ops/collision_world.rs
@@ -0,0 +1,59 @@
+use std::sync::Mutex;
+
+use crate::{physics::collisions::CollisionWorld, prelude::*};
+use anyhow::Context;
+use bevy::ecs::system::SystemState;
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, JsValueRef, JsValueRefs, OpContext};
+use once_cell::sync::OnceCell;
+
+#[derive(Serialize)]
+struct JsNetInfo {
+    is_server: bool,
+    is_client: bool,
+}
+
+pub struct CollisionWorldActorCollisions;
+impl JsRuntimeOp for CollisionWorldActorCollisions {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.CollisionWorld) {
+                globalThis.CollisionWorld = {}
+            }
+            
+            globalThis.CollisionWorld.actorCollisions = (entity) => {
+                return bevyModJsScriptingOpSync(
+                    'jumpy_collision_world_actor_collisions',
+                    Value.unwrapValueRef(entity)
+                ).map(x => Value.wrapValueRef(x));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        static STATE: OnceCell<Mutex<SystemState<CollisionWorld>>> = OnceCell::new();
+        let mut state = STATE
+            .get_or_init(|| Mutex::new(SystemState::new(world)))
+            .lock()
+            .unwrap();
+
+        let (value_ref,): (JsValueRef,) = serde_json::from_value(args).context("Parse args")?;
+        let value_refs = ctx.op_state.get_mut::<JsValueRefs>().unwrap();
+        let entity = value_ref.get_entity(world, value_refs)?;
+
+        let collision_world = state.get_mut(world);
+        let collisions = collision_world.actor_collisions(entity);
+        let collisions = collisions
+            .into_iter()
+            .map(|x| JsValueRef::new_free(Box::new(x), value_refs))
+            .collect::<Vec<_>>();
+
+        Ok(serde_json::to_value(&collisions)?)
+    }
+}
diff --git a/src/scripting/ops/entity.rs b/src/scripting/ops/entity.rs
new file mode 100644
index 0000000000..412ec406d1
--- /dev/null
+++ b/src/scripting/ops/entity.rs
@@ -0,0 +1,89 @@
+//! This is a workaround for the fact that we can't store entity refs across frames and we can't
+//! create custom marker components. See for context:
+//! <https://github.com/jakobhellermann/bevy_mod_js_scripting/issues/32>
+
+use anyhow::Context;
+use bevy::prelude::Entity;
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, JsValueRef, JsValueRefs};
+use serde::{Deserialize, Serialize};
+
+use crate::scripting::JsU64;
+
+#[derive(Serialize, Deserialize)]
+struct JsEntity(JsU64);
+
+impl From<Entity> for JsEntity {
+    fn from(e: Entity) -> Self {
+        Self(e.to_bits().into())
+    }
+}
+impl From<JsEntity> for Entity {
+    fn from(e: JsEntity) -> Self {
+        Entity::from_bits(e.0.into())
+    }
+}
+
+pub struct EntityRefToJs;
+impl JsRuntimeOp for EntityRefToJs {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+                if (!globalThis.EntityRef) {
+                    globalThis.EntityRef = {}
+                }
+
+                globalThis.EntityRef.toJs = (valueRef) => {
+                    return bevyModJsScriptingOpSync("entity_ref_to_js", Value.unwrapValueRef(valueRef));
+                }
+                "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: bevy_mod_js_scripting::OpContext<'_>,
+        world: &mut bevy::prelude::World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (value_ref,): (JsValueRef,) = serde_json::from_value(args).context("Parse args")?;
+
+        let value_refs = ctx.op_state.get_mut::<JsValueRefs>().unwrap();
+
+        let entity = value_ref.get_entity(world, value_refs)?;
+
+        Ok(serde_json::to_value(JsEntity::from(entity))?)
+    }
+}
+
+pub struct EntityRefFromJs;
+impl JsRuntimeOp for EntityRefFromJs {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+                if (!globalThis.EntityRef) {
+                    globalThis.EntityRef = {}
+                }
+
+                globalThis.EntityRef.fromJs = (jsRef) => {
+                    return Value.wrapValueRef(bevyModJsScriptingOpSync("entity_ref_from_js", jsRef));
+                }
+                "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: bevy_mod_js_scripting::OpContext<'_>,
+        _world: &mut bevy::prelude::World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (js_ent,): (JsEntity,) = serde_json::from_value(args).context("Parse args")?;
+
+        let value_refs = ctx.op_state.get_mut::<JsValueRefs>().unwrap();
+
+        let entity = Entity::from(js_ent);
+        let entity_ref = JsValueRef::new_free(Box::new(entity), value_refs);
+
+        Ok(serde_json::to_value(entity_ref)?)
+    }
+}
diff --git a/src/scripting/ops/item.rs b/src/scripting/ops/item.rs
new file mode 100644
index 0000000000..80c4c2ac7f
--- /dev/null
+++ b/src/scripting/ops/item.rs
@@ -0,0 +1,180 @@
+use std::{path::PathBuf, sync::Mutex};
+
+use crate::{
+    item::{Item, ItemDropEvent, ItemGrabEvent, ItemUseEvent},
+    prelude::*,
+};
+use bevy::{ecs::system::SystemState, utils::HashMap};
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, JsValueRef, OpContext};
+use once_cell::sync::OnceCell;
+
+pub struct ItemGrabEvents;
+impl JsRuntimeOp for ItemGrabEvents {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Items) {
+                globalThis.Items = {}
+            }
+            
+            globalThis.Items.grabEvents = () => {
+                return bevyModJsScriptingOpSync('jumpy_item_grab_events')
+                    .map(x => globalThis.Value.wrapValueRef(x));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        _args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let script_path = ctx.script_info.path.to_str().expect("non-unicode path");
+
+        type Param<'w, 's> = (
+            Query<'w, 's, &'static Item>,
+            EventReader<'w, 's, ItemGrabEvent>,
+        );
+        static STATE: OnceCell<Mutex<HashMap<PathBuf, SystemState<Param>>>> = OnceCell::new();
+        let mut states = STATE
+            .get_or_init(|| Mutex::new(HashMap::default()))
+            .lock()
+            .unwrap();
+        let state = states
+            .entry(ctx.script_info.path.clone())
+            .or_insert_with(|| SystemState::new(world));
+
+        let value_refs = ctx.op_state.get_mut().unwrap();
+
+        let (items, mut grab_events) = state.get_mut(world);
+
+        let events = grab_events
+            .iter()
+            .filter(|event| {
+                items
+                    .get(event.item)
+                    .map(|item| item.script == script_path)
+                    .unwrap_or(false)
+            })
+            .map(|x| JsValueRef::new_free(Box::new(x.clone()), value_refs))
+            .collect::<Vec<_>>();
+
+        Ok(serde_json::to_value(&events)?)
+    }
+}
+
+pub struct ItemDropEvents;
+impl JsRuntimeOp for ItemDropEvents {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Items) {
+                globalThis.Items = {}
+            }
+            
+            globalThis.Items.dropEvents = () => {
+                return bevyModJsScriptingOpSync('jumpy_item_drop_events')
+                    .map(x => globalThis.Value.wrapValueRef(x));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        _args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let script_path = ctx.script_info.path.to_str().expect("non-unicode path");
+
+        type Param<'w, 's> = (
+            Query<'w, 's, &'static Item>,
+            EventReader<'w, 's, ItemDropEvent>,
+        );
+        static STATE: OnceCell<Mutex<HashMap<PathBuf, SystemState<Param>>>> = OnceCell::new();
+        let mut states = STATE
+            .get_or_init(|| Mutex::new(HashMap::default()))
+            .lock()
+            .unwrap();
+        let state = states
+            .entry(ctx.script_info.path.clone())
+            .or_insert_with(|| SystemState::new(world));
+
+        let value_refs = ctx.op_state.get_mut().unwrap();
+
+        let (items, mut drop_events) = state.get_mut(world);
+
+        let events = drop_events
+            .iter()
+            .filter(|event| {
+                items
+                    .get(event.item)
+                    .map(|item| item.script == script_path)
+                    .unwrap_or(false)
+            })
+            .map(|x| JsValueRef::new_free(Box::new(x.clone()), value_refs))
+            .collect::<Vec<_>>();
+
+        Ok(serde_json::to_value(&events)?)
+    }
+}
+
+pub struct ItemUseEvents;
+impl JsRuntimeOp for ItemUseEvents {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Items) {
+                globalThis.Items = {}
+            }
+            
+            globalThis.Items.useEvents = () => {
+                return bevyModJsScriptingOpSync('jumpy_item_use_events')
+                    .map(x => globalThis.Value.wrapValueRef(x));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        _args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let script_path = ctx.script_info.path.to_str().expect("non-unicode path");
+
+        type Param<'w, 's> = (
+            Query<'w, 's, &'static Item>,
+            EventReader<'w, 's, ItemUseEvent>,
+        );
+        static STATE: OnceCell<Mutex<HashMap<PathBuf, SystemState<Param>>>> = OnceCell::new();
+        let mut states = STATE
+            .get_or_init(|| Mutex::new(HashMap::default()))
+            .lock()
+            .unwrap();
+        let state = states
+            .entry(ctx.script_info.path.clone())
+            .or_insert_with(|| SystemState::new(world));
+
+        let value_refs = ctx.op_state.get_mut().unwrap();
+
+        let (items, mut use_events) = state.get_mut(world);
+
+        let events = use_events
+            .iter()
+            .filter(|event| {
+                items
+                    .get(event.item)
+                    .map(|item| item.script == script_path)
+                    .unwrap_or(false)
+            })
+            .map(|x| JsValueRef::new_free(Box::new(x.clone()), value_refs))
+            .collect::<Vec<_>>();
+
+        Ok(serde_json::to_value(&events)?)
+    }
+}
diff --git a/src/scripting/ops/map.rs b/src/scripting/ops/map.rs
new file mode 100644
index 0000000000..3c7fe36889
--- /dev/null
+++ b/src/scripting/ops/map.rs
@@ -0,0 +1,52 @@
+use crate::{metadata::MapElementMeta, prelude::*};
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, JsValueRef, OpContext};
+
+#[derive(Component)]
+#[component(storage = "SparseSet")]
+pub struct MapElementLoaded;
+
+pub struct ElementGetSpawnedEntities;
+impl JsRuntimeOp for ElementGetSpawnedEntities {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.MapElement) {
+                globalThis.MapElement = {}
+            }
+            
+            globalThis.MapElement.getSpawnedEntities = () => {
+                return bevyModJsScriptingOpSync('jumpy_element_get_spawned_entities')
+                    .map(x => globalThis.Value.wrapValueRef(x));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        _args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let value_refs = ctx.op_state.get_mut().unwrap();
+
+        let entities = world
+            .query_filtered::<(Entity, &MapElementMeta), Without<MapElementLoaded>>()
+            .iter(world)
+            .filter(|(_, meta)| {
+                meta.script_handles
+                    .iter()
+                    .any(|x| x.inner == ctx.script_info.handle)
+            })
+            .map(|(entity, _)| entity)
+            .collect::<Vec<_>>()
+            .into_iter()
+            .map(|entity| {
+                world.entity_mut(entity).insert(MapElementLoaded);
+                JsValueRef::new_free(Box::new(entity), value_refs)
+            })
+            .collect::<Vec<_>>();
+
+        Ok(serde_json::to_value(&entities)?)
+    }
+}
diff --git a/src/scripting/ops/net.rs b/src/scripting/ops/net.rs
new file mode 100644
index 0000000000..accaba0bf7
--- /dev/null
+++ b/src/scripting/ops/net.rs
@@ -0,0 +1,47 @@
+use crate::{
+    networking::{client::NetClient, proto::ClientMatchInfo, server::NetServer},
+    prelude::*,
+};
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, OpContext};
+
+#[derive(Serialize)]
+struct JsNetInfo {
+    is_server: bool,
+    is_client: bool,
+    player_idx: usize,
+}
+
+pub struct NetInfoGet;
+impl JsRuntimeOp for NetInfoGet {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.NetInfo) {
+                globalThis.NetInfo = {}
+            }
+            
+            globalThis.NetInfo.get = () => {
+                return bevyModJsScriptingOpSync('jumpy_net_info_get');
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        _ctx: OpContext,
+        world: &mut World,
+        _args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let is_server = world.contains_resource::<NetServer>();
+        let is_client = world.contains_resource::<NetClient>();
+        let match_info = world.get_resource::<ClientMatchInfo>();
+        let player_idx = match_info.map(|info| info.player_idx).unwrap_or(0);
+
+        Ok(serde_json::to_value(&JsNetInfo {
+            is_server,
+            is_client,
+            player_idx,
+        })?)
+    }
+}
diff --git a/src/scripting/ops/player.rs b/src/scripting/ops/player.rs
new file mode 100644
index 0000000000..a918552826
--- /dev/null
+++ b/src/scripting/ops/player.rs
@@ -0,0 +1,232 @@
+use std::sync::Mutex;
+
+use crate::{
+    player::{
+        PlayerDespawnCommand, PlayerKillCommand, PlayerKillEvent, PlayerSetInventoryCommand,
+        PlayerUseItemCommand,
+    },
+    prelude::*,
+};
+use anyhow::Context;
+use bevy::ecs::system::{Command, SystemState};
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, JsValueRef, JsValueRefs, OpContext};
+use once_cell::sync::OnceCell;
+
+pub struct PlayerKill;
+impl JsRuntimeOp for PlayerKill {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Player) {
+                globalThis.Player = {}
+            }
+            
+            globalThis.Player.kill = (entity) => {
+                return bevyModJsScriptingOpSync('jumpy_player_kill', Value.unwrapValueRef(entity));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (value_ref,): (JsValueRef,) = serde_json::from_value(args).context("Parse args")?;
+        let value_refs = ctx.op_state.get_mut::<JsValueRefs>().unwrap();
+        let entity = value_ref.get_entity(world, value_refs)?;
+
+        PlayerKillCommand::new(entity).write(world);
+
+        Ok(serde_json::Value::Null)
+    }
+}
+
+pub struct PlayerDespawn;
+impl JsRuntimeOp for PlayerDespawn {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Player) {
+                globalThis.Player = {}
+            }
+            
+            globalThis.Player.despawn = (entity) => {
+                return bevyModJsScriptingOpSync('jumpy_player_despawn', Value.unwrapValueRef(entity));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (value_ref,): (JsValueRef,) = serde_json::from_value(args).context("Parse args")?;
+        let value_refs = ctx.op_state.get_mut::<JsValueRefs>().unwrap();
+        let entity = value_ref.get_entity(world, value_refs)?;
+
+        PlayerDespawnCommand::new(entity).write(world);
+
+        Ok(serde_json::Value::Null)
+    }
+}
+
+pub struct PlayerGetInventory;
+impl JsRuntimeOp for PlayerGetInventory {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Player) {
+                globalThis.Player = {}
+            }
+            
+            globalThis.Player.getInventory = (entity) => {
+                return Value.wrapValueRef(bevyModJsScriptingOpSync(
+                    'jumpy_player_get_inventory',
+                    Value.unwrapValueRef(entity)
+                ));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (value_ref,): (JsValueRef,) = serde_json::from_value(args).context("Parse args")?;
+        let value_refs = ctx.op_state.get_mut::<JsValueRefs>().unwrap();
+        let player_ent = value_ref.get_entity(world, value_refs)?;
+
+        let item_ent = crate::player::get_player_inventory(world, player_ent);
+        let inventory = item_ent.map(|x| JsValueRef::new_free(Box::new(x), value_refs));
+
+        Ok(serde_json::to_value(&inventory)?)
+    }
+}
+
+pub struct PlayerKillEvents;
+impl JsRuntimeOp for PlayerKillEvents {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Player) {
+                globalThis.Player = {}
+            }
+            
+            globalThis.Player.killEvents = () => {
+                return bevyModJsScriptingOpSync('jumpy_player_kill_events')
+                    .map(x => globalThis.Value.wrapValueRef(x));
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        _args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        type Param<'w, 's> = EventReader<'w, 's, PlayerKillEvent>;
+
+        static STATE: OnceCell<Mutex<SystemState<Param>>> = OnceCell::new();
+        let mut state = STATE
+            .get_or_init(|| Mutex::new(SystemState::new(world)))
+            .lock()
+            .unwrap();
+
+        let value_refs = ctx.op_state.get_mut().unwrap();
+
+        let events = state
+            .get_mut(world)
+            .iter()
+            .cloned()
+            .map(|x| JsValueRef::new_free(Box::new(x), value_refs))
+            .collect::<Vec<_>>();
+
+        Ok(serde_json::to_value(&events)?)
+    }
+}
+
+pub struct PlayerSetInventory;
+impl JsRuntimeOp for PlayerSetInventory {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Player) {
+                globalThis.Player = {}
+            }
+            
+            globalThis.Player.setInventory = (player, inventory) => {
+                return bevyModJsScriptingOpSync(
+                    'jumpy_player_set_inventory',
+                    Value.unwrapValueRef(player),
+                    Value.unwrapValueRef(inventory)
+                );
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (player_ref, item_ref): (JsValueRef, Option<JsValueRef>) =
+            serde_json::from_value(args).context("Parse args")?;
+        let value_refs = ctx.op_state.get_mut::<JsValueRefs>().unwrap();
+        let player_ent = player_ref.get_entity(world, value_refs)?;
+        let item_ent = item_ref
+            .map(|x| x.get_entity(world, value_refs))
+            .transpose()?;
+
+        PlayerSetInventoryCommand::new(player_ent, item_ent).write(world);
+
+        Ok(serde_json::Value::Null)
+    }
+}
+
+pub struct PlayerUseItem;
+impl JsRuntimeOp for PlayerUseItem {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.Player) {
+                globalThis.Player = {}
+            }
+            
+            globalThis.Player.useItem = (player) => {
+                return bevyModJsScriptingOpSync(
+                    'jumpy_player_use_item',
+                    Value.unwrapValueRef(player)
+                );
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (player_ref,): (JsValueRef,) = serde_json::from_value(args).context("Parse args")?;
+        let value_refs = ctx.op_state.get_mut::<JsValueRefs>().unwrap();
+        let player_ent = player_ref.get_entity(world, value_refs)?;
+
+        PlayerUseItemCommand::new(player_ent).write(world);
+
+        Ok(serde_json::Value::Null)
+    }
+}
diff --git a/src/scripting/ops/script.rs b/src/scripting/ops/script.rs
new file mode 100644
index 0000000000..355e56e9e1
--- /dev/null
+++ b/src/scripting/ops/script.rs
@@ -0,0 +1,84 @@
+use std::hash::{Hash, Hasher};
+
+use crate::{prelude::*, utils::cache_str};
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, JsValueRef, OpContext};
+use normalize_path::NormalizePath;
+
+#[derive(Serialize)]
+struct JsScriptInfo {
+    path: String,
+    handle: JsValueRef,
+    handle_id_hash: String,
+}
+
+pub struct ScriptGetInfo;
+impl JsRuntimeOp for ScriptGetInfo {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            const cloneObj = x => JSON.parse(JSON.stringify(x));
+            if (!globalThis.Script) {
+                globalThis.Script = {}
+            }
+            
+            globalThis.Script.getInfo = () => {
+                return bevyModJsScriptingOpSync('jumpy_script_get_info');
+            }
+
+            globalThis.Script.state = (init) => {
+                const scriptId = Script.getInfo().path;
+                if (!globalThis.scriptState) globalThis.scriptState = {};
+                if (!globalThis.scriptState[scriptId]) globalThis.scriptState[scriptId] = cloneObj(init) || {};
+                return globalThis.scriptState[scriptId];
+            }
+
+            globalThis.Script.entityStates = () => {
+                if (!globalThis.scriptEntityState) globalThis.scriptState = {};
+                if (!globalThis.scriptEntityState[scriptId]) globalThis.scriptState[scriptId] = {};
+                return globalThis.scriptEntityState[scriptId];
+            }
+
+            globalThis.Script.getEntityState = (entity, init) => {
+                const jsEntity = EntityRef.toJs(entity);
+                const entityKey = JSON.stringify(jsEntity);
+                const scriptId = Script.getInfo().path;
+                if (!globalThis.scriptEntityState) globalThis.scriptEntityState = {};
+                if (!globalThis.scriptEntityState[scriptId]) globalThis.scriptEntityState[scriptId] = {};
+                if (!globalThis.scriptEntityState[scriptId][entityKey]) globalThis.scriptEntityState[scriptId][entityKey] = cloneObj(init) || {};
+                return globalThis.scriptEntityState[scriptId][entityKey];
+            }
+            globalThis.Script.setEntityState = (entity, state) => {
+                const jsEntity = EntityRef.toJs(entity);
+                const entityKey = JSON.stringify(jsEntity);
+                const scriptId = Script.getInfo().path;
+                if (!globalThis.scriptEntityState) globalThis.scriptEntityState = {};
+                if (!globalThis.scriptEntityState[scriptId]) globalThis.scriptEntityState[scriptId] = {};
+                globalThis.scriptEntityState[scriptId][entityKey] = state;
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        _world: &mut World,
+        _args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let value_refs = ctx.op_state.entry().or_insert_with(default);
+
+        let mut hasher = fnv::FnvHasher::default();
+        ctx.script_info.handle.id.hash(&mut hasher);
+        let hash = base64::encode(hasher.finish().to_le_bytes());
+        cache_str(&hash);
+
+        let path = ctx.script_info.path.normalize();
+        let path_string = path.to_str().expect("Non-unicode path").to_owned();
+
+        Ok(serde_json::to_value(&JsScriptInfo {
+            path: path_string,
+            handle: JsValueRef::new_free(Box::new(ctx.script_info.handle.clone()), value_refs),
+            handle_id_hash: hash,
+        })?)
+    }
+}
diff --git a/src/scripting/ops/world.rs b/src/scripting/ops/world.rs
new file mode 100644
index 0000000000..ccdfc693af
--- /dev/null
+++ b/src/scripting/ops/world.rs
@@ -0,0 +1,43 @@
+//! Extensions to the script environment `world` global.
+//!
+//! TODO: These ops should be migrated to the `bevy_mod_js_scripting` crate.
+
+use anyhow::Context;
+use bevy_mod_js_scripting::{serde_json, JsRuntimeOp, JsValueRef, JsValueRefs, OpContext};
+
+use crate::prelude::*;
+
+pub struct WorldDespawnRecursive;
+impl JsRuntimeOp for WorldDespawnRecursive {
+    fn js(&self) -> Option<&'static str> {
+        Some(
+            r#"
+            if (!globalThis.WorldTemp) {
+                globalThis.WorldTemp = {}
+            }
+            
+            globalThis.WorldTemp.despawnRecursive = (entity) => {
+                return bevyModJsScriptingOpSync(
+                    'jumpy_world_despawn_recursive',
+                    Value.unwrapValueRef(entity)
+                );
+            }
+            "#,
+        )
+    }
+
+    fn run(
+        &self,
+        ctx: OpContext,
+        world: &mut World,
+        args: serde_json::Value,
+    ) -> anyhow::Result<serde_json::Value> {
+        let (value_ref,): (JsValueRef,) = serde_json::from_value(args).context("Parse args")?;
+        let value_refs = ctx.op_state.get_mut::<JsValueRefs>().unwrap();
+        let entity = value_ref.get_entity(world, value_refs)?;
+
+        despawn_with_children_recursive(world, entity);
+
+        Ok(serde_json::Value::Null)
+    }
+}
diff --git a/src/ui.rs b/src/ui.rs
new file mode 100644
index 0000000000..4443f3cead
--- /dev/null
+++ b/src/ui.rs
@@ -0,0 +1,373 @@
+use std::{collections::hash_map::DefaultHasher, hash::Hasher};
+
+use bevy::{
+    ecs::system::{SystemParam, SystemState},
+    prelude::*,
+    utils::{HashMap, HashSet},
+    window::WindowId,
+};
+use bevy_egui::{egui, EguiContext, EguiInput, EguiPlugin, EguiSettings, EguiSystem};
+use iyes_loopless::prelude::*;
+use leafwing_input_manager::{plugin::InputManagerSystem, prelude::ActionState};
+
+use self::input::MenuAction;
+use crate::{assets::EguiFont, camera::GameCamera, metadata::GameMeta};
+
+pub mod input;
+pub mod widgets;
+
+pub mod debug_tools;
+pub mod editor;
+pub mod main_menu;
+pub mod pause_menu;
+
+pub struct UiPlugin;
+
+impl Plugin for UiPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugin(EguiPlugin)
+            .add_plugin(input::UiInputPlugin)
+            .add_plugin(main_menu::MainMenuPlugin)
+            .add_plugin(editor::EditorPlugin)
+            .add_plugin(debug_tools::DebugToolsPlugin)
+            .add_plugin(pause_menu::PausePlugin)
+            .init_resource::<WidgetAdjacencies>()
+            .init_resource::<DisableMenuInput>()
+            .add_system_to_stage(
+                CoreStage::PreUpdate,
+                handle_menu_input
+                    .run_if_resource_exists::<GameMeta>()
+                    .after(InputManagerSystem::Update)
+                    .after(EguiSystem::ProcessInput)
+                    .before(EguiSystem::BeginFrame),
+            )
+            .add_system(update_egui_fonts)
+            .add_system(update_ui_scale.run_if_resource_exists::<GameMeta>());
+    }
+}
+
+/// Awesome widget system shared by @aevyrie:
+/// <https://github.com/bevyengine/bevy/discussions/5522>
+pub trait WidgetSystem: SystemParam {
+    type Args;
+    fn system(
+        world: &mut World,
+        state: &mut SystemState<Self>,
+        ui: &mut egui::Ui,
+        id: WidgetId,
+        args: Self::Args,
+    );
+}
+
+pub fn widget<S: 'static + WidgetSystem>(
+    world: &mut World,
+    ui: &mut egui::Ui,
+    id: WidgetId,
+    args: S::Args,
+) {
+    // We need to cache `SystemState` to allow for a system's locally tracked state
+    if !world.contains_resource::<StateInstances<S>>() {
+        // Note, this message should only appear once! If you see it twice in the logs, the function
+        // may have been called recursively, and will panic.
+        trace!("Init widget system state {}", std::any::type_name::<S>());
+        world.insert_resource(StateInstances::<S> {
+            instances: HashMap::new(),
+        });
+    }
+    world.resource_scope(|world, mut states: Mut<StateInstances<S>>| {
+        if !states.instances.contains_key(&id) {
+            trace!(
+                "Registering widget system state for widget {id:?} of type {}",
+                std::any::type_name::<S>()
+            );
+            states.instances.insert(id, SystemState::new(world));
+        }
+        let cached_state = states.instances.get_mut(&id).unwrap();
+        S::system(world, cached_state, ui, id, args);
+        cached_state.apply(world);
+    });
+}
+
+/// A UI widget may have multiple instances. We need to ensure the local state of these instances is
+/// not shared. This hashmap allows us to dynamically store instance states.
+#[derive(Default)]
+struct StateInstances<S: WidgetSystem> {
+    instances: HashMap<WidgetId, SystemState<S>>,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct WidgetId(pub u64);
+impl WidgetId {
+    pub fn new(name: &str) -> Self {
+        let bytes = name.as_bytes();
+        // TODO: Use a faster, non-crypto hasher
+        let mut hasher = DefaultHasher::default();
+        hasher.write(bytes);
+        WidgetId(hasher.finish())
+    }
+    pub fn with(&self, name: &str) -> WidgetId {
+        Self::new(&format!("{}{name}", self.0))
+    }
+}
+
+impl From<&str> for WidgetId {
+    fn from(s: &str) -> Self {
+        Self::new(s)
+    }
+}
+
+/// Resource that stores which ui widgets are adjacent to which other widgets.
+///
+/// This is used to figure out which widget to focus on next when you press a direction on the
+/// gamepad, for instance.
+#[derive(Debug, Clone, Default)]
+pub struct WidgetAdjacencies {
+    pub map: HashMap<egui::Id, WidgetAdjacency>,
+    /// These widgets will have the focus change when pressing directional inputs
+    pub text_boxes: HashSet<egui::Id>,
+}
+
+/// The list of widgets in each direction from another widget
+#[derive(Debug, Clone, Default)]
+pub struct WidgetAdjacency {
+    pub up: Option<egui::Id>,
+    pub down: Option<egui::Id>,
+    pub left: Option<egui::Id>,
+    pub right: Option<egui::Id>,
+}
+
+impl WidgetAdjacencies {
+    pub fn widget(&mut self, resp: &egui::Response) -> WidgetAdjacencyEntry {
+        WidgetAdjacencyEntry {
+            id: resp.id,
+            adjacencies: self,
+        }
+    }
+}
+
+pub struct WidgetAdjacencyEntry<'a> {
+    id: egui::Id,
+    adjacencies: &'a mut WidgetAdjacencies,
+}
+
+#[allow(clippy::wrong_self_convention)]
+impl<'a> WidgetAdjacencyEntry<'a> {
+    pub fn to_left_of(self, resp: &egui::Response) -> Self {
+        let other_id = resp.id;
+        self.adjacencies.map.entry(self.id).or_default().right = Some(other_id);
+        self.adjacencies.map.entry(other_id).or_default().left = Some(self.id);
+        self
+    }
+    pub fn to_right_of(self, resp: &egui::Response) -> Self {
+        let other_id = resp.id;
+        self.adjacencies.map.entry(self.id).or_default().left = Some(other_id);
+        self.adjacencies.map.entry(other_id).or_default().right = Some(self.id);
+        self
+    }
+    pub fn above(self, resp: &egui::Response) -> Self {
+        let other_id = resp.id;
+        self.adjacencies.map.entry(self.id).or_default().down = Some(other_id);
+        self.adjacencies.map.entry(other_id).or_default().up = Some(self.id);
+        self
+    }
+    pub fn below(self, resp: &egui::Response) -> Self {
+        let other_id = resp.id;
+        self.adjacencies.map.entry(self.id).or_default().up = Some(other_id);
+        self.adjacencies.map.entry(other_id).or_default().down = Some(self.id);
+        self
+    }
+}
+
+#[derive(Default, Deref, DerefMut)]
+pub struct DisableMenuInput(pub bool);
+
+fn handle_menu_input(
+    disable_menu_input: Res<DisableMenuInput>,
+    mut windows: ResMut<Windows>,
+    input: Query<&ActionState<MenuAction>>,
+    keyboard: Res<Input<KeyCode>>,
+    mut egui_inputs: ResMut<HashMap<WindowId, EguiInput>>,
+    adjacencies: Res<WidgetAdjacencies>,
+    mut egui_ctx: ResMut<EguiContext>,
+) {
+    use bevy::window::WindowMode;
+    let input = input.single();
+
+    // Handle fullscreen toggling
+    if input.just_pressed(MenuAction::ToggleFullscreen) {
+        if let Some(window) = windows.get_primary_mut() {
+            window.set_mode(match window.mode() {
+                WindowMode::BorderlessFullscreen => WindowMode::Windowed,
+                _ => WindowMode::BorderlessFullscreen,
+            });
+        }
+    }
+
+    let events = &mut egui_inputs
+        .get_mut(&WindowId::primary())
+        .unwrap()
+        .raw_input
+        .events;
+
+    if **disable_menu_input {
+        events.retain(|event| match event {
+            egui::Event::Key { key, .. } => key == &egui::Key::Escape,
+            _ => true,
+        });
+        return;
+    }
+
+    if input.just_pressed(MenuAction::Confirm) {
+        events.push(egui::Event::Key {
+            key: egui::Key::Enter,
+            pressed: true,
+            modifiers: egui::Modifiers::NONE,
+        });
+    }
+
+    // Helper to fall back on using tab order instead of adjacency map to determine next focused
+    // widget.
+    let mut tab_fallback = || {
+        if input.just_pressed(MenuAction::Up) || input.just_pressed(MenuAction::Left) {
+            events.push(egui::Event::Key {
+                key: egui::Key::Tab,
+                pressed: true,
+                modifiers: egui::Modifiers::SHIFT,
+            });
+        } else if input.just_pressed(MenuAction::Down) || input.just_pressed(MenuAction::Right) {
+            events.push(egui::Event::Key {
+                key: egui::Key::Tab,
+                pressed: true,
+                modifiers: egui::Modifiers::NONE,
+            });
+        }
+    };
+
+    let mut memory = egui_ctx.ctx_mut().memory();
+    let focused = memory.focus();
+    let is_text_box = focused
+        .map(|id| adjacencies.text_boxes.contains(&id))
+        .unwrap_or(false);
+
+    if !(is_text_box
+        && (keyboard.pressed(KeyCode::Up)
+            || keyboard.pressed(KeyCode::Down)
+            || keyboard.pressed(KeyCode::Left)
+            || keyboard.pressed(KeyCode::Right)))
+    {
+        if let Some(adjacency) = memory.focus().and_then(|id| adjacencies.map.get(&id)) {
+            if input.just_pressed(MenuAction::Up) {
+                if let Some(adjacent) = adjacency.up {
+                    memory.request_focus(adjacent);
+                } else {
+                    tab_fallback()
+                }
+            } else if input.just_pressed(MenuAction::Down) {
+                if let Some(adjacent) = adjacency.down {
+                    memory.request_focus(adjacent);
+                } else {
+                    tab_fallback()
+                }
+            } else if input.just_pressed(MenuAction::Left) {
+                if let Some(adjacent) = adjacency.left {
+                    memory.request_focus(adjacent);
+                } else {
+                    tab_fallback()
+                }
+            } else if input.just_pressed(MenuAction::Right) {
+                if let Some(adjacent) = adjacency.right {
+                    memory.request_focus(adjacent);
+                } else {
+                    tab_fallback()
+                }
+            }
+        } else {
+            tab_fallback();
+        }
+    }
+}
+
+/// Watches for asset events for [`EguiFont`] assets and updates the corresponding fonts from the
+/// [`GameMeta`], inserting the font data into the egui context.
+fn update_egui_fonts(
+    mut font_queue: Local<Vec<Handle<EguiFont>>>,
+    mut egui_ctx: ResMut<EguiContext>,
+    egui_font_definitions: Option<ResMut<egui::FontDefinitions>>,
+    game: Option<Res<GameMeta>>,
+    mut events: EventReader<AssetEvent<EguiFont>>,
+    assets: Res<Assets<EguiFont>>,
+) {
+    // Add any newly updated/created fonts to the queue
+    for event in events.iter() {
+        if let AssetEvent::Created { handle } | AssetEvent::Modified { handle } = event {
+            font_queue.push(handle.clone_weak());
+        }
+    }
+
+    // Update queued fonts if the game is ready
+    if let Some((game, mut egui_font_definitions)) = game.zip(egui_font_definitions) {
+        for handle in font_queue.drain(..) {
+            // Get the game font name associated to this handle
+            let name = game
+                .ui_theme
+                .font_handles
+                .iter()
+                .find_map(|(font_name, font_handle)| {
+                    if font_handle.inner == handle {
+                        Some(font_name.clone())
+                    } else {
+                        None
+                    }
+                });
+
+            // If we were able to find the font handle in our game fonts
+            if let Some(font_name) = name {
+                // Get the font asset
+                if let Some(font) = assets.get(&handle) {
+                    // And insert it into the Egui font definitions
+                    let ctx = egui_ctx.ctx_mut();
+                    egui_font_definitions
+                        .font_data
+                        .insert(font_name.clone(), font.0.clone());
+
+                    egui_font_definitions
+                        .families
+                        .get_mut(&egui::FontFamily::Name(font_name.clone().into()))
+                        .unwrap()
+                        .push(font_name);
+
+                    ctx.set_fonts(egui_font_definitions.clone());
+                }
+            }
+        }
+    }
+}
+
+/// This system makes sure that the UI scale of Egui matches our game scale so that a pixel in egui
+/// will be the same size as a pixel in our sprites.
+fn update_ui_scale(
+    game_meta: Res<GameMeta>,
+    mut egui_settings: ResMut<EguiSettings>,
+    windows: Res<Windows>,
+    projection: Query<&OrthographicProjection, With<GameCamera>>,
+) {
+    if let Some(window) = windows.get_primary() {
+        if let Ok(projection) = projection.get_single() {
+            match projection.scaling_mode {
+                bevy::render::camera::ScalingMode::FixedVertical(height) => {
+                    let window_height = window.height();
+                    let scale = window_height / height;
+                    egui_settings.scale_factor = (scale * game_meta.ui_theme.scale) as f64;
+                }
+                bevy::render::camera::ScalingMode::FixedHorizontal(width) => {
+                    let window_width = window.width();
+                    let scale = window_width / width;
+                    egui_settings.scale_factor = (scale * game_meta.ui_theme.scale) as f64;
+                }
+                bevy::render::camera::ScalingMode::Auto { .. } => (),
+                bevy::render::camera::ScalingMode::None => (),
+                bevy::render::camera::ScalingMode::WindowSize => (),
+            }
+        }
+    }
+}
diff --git a/src/ui/debug_tools.rs b/src/ui/debug_tools.rs
new file mode 100644
index 0000000000..148d69e784
--- /dev/null
+++ b/src/ui/debug_tools.rs
@@ -0,0 +1,194 @@
+use bevy::{
+    diagnostic::{Diagnostics, FrameTimeDiagnosticsPlugin},
+    prelude::*,
+};
+use bevy_egui::*;
+use bevy_fluent::Localization;
+use bevy_inspector_egui::WorldInspectorParams;
+
+use crate::{
+    config::ENGINE_CONFIG, localization::LocalizationExt, physics::debug::PhysicsDebugRenderConfig,
+};
+
+pub struct DebugToolsPlugin;
+
+impl Plugin for DebugToolsPlugin {
+    fn build(&self, app: &mut App) {
+        if ENGINE_CONFIG.debug_tools {
+            app.add_plugin(FrameTimeDiagnosticsPlugin)
+                // .init_resource::<ShowNetworkVisualizer>()
+                .init_resource::<ShowFameTimeDiagnostics>()
+                .add_system(debug_tools_window)
+                .add_system(frame_diagnostic_window);
+        }
+    }
+}
+
+// #[derive(Deref, DerefMut, Default)]
+// pub struct ShowNetworkVisualizer(pub bool);
+
+// fn network_visualizer_window(
+//     show: Res<ShowNetworkVisualizer>,
+//     mut egui_context: ResMut<EguiContext>,
+//     mut visualizer: ResMut<RenetServerVisualizer<200>>,
+//     server: Res<RenetServer>,
+// ) {
+//     if **show {
+//         visualizer.update(&server);
+//         visualizer.show_window(egui_context.ctx_mut());
+//     }
+// }
+
+#[derive(Default, Deref, DerefMut)]
+struct ShowFameTimeDiagnostics(pub bool);
+
+/// System that renders the debug tools window which can be toggled by pressing F12
+fn debug_tools_window(
+    // mut show_network_visualizer: ResMut<ShowNetworkVisualizer>,
+    mut visible: Local<bool>,
+    mut egui_context: ResMut<EguiContext>,
+    mut physics_debug_render: ResMut<PhysicsDebugRenderConfig>,
+    mut show_frame_diagnostics: ResMut<ShowFameTimeDiagnostics>,
+    localization: Res<Localization>,
+    input: Res<Input<KeyCode>>,
+    mut inspector: ResMut<WorldInspectorParams>,
+) {
+    let ctx = egui_context.ctx_mut();
+
+    // Toggle debug window visibility
+    if input.just_pressed(KeyCode::F12) {
+        *visible = !*visible;
+    }
+
+    // Shortcut to toggle collision shapes without having to use the menu
+    if input.just_pressed(KeyCode::F10) {
+        physics_debug_render.enabled = !physics_debug_render.enabled;
+    }
+
+    // Shortcut to toggle the inspector without having to use the menu
+    if input.just_pressed(KeyCode::F9) {
+        inspector.enabled = !inspector.enabled;
+    }
+
+    // Shortcut to toggle frame diagnostics
+    if input.just_pressed(KeyCode::F8) {
+        **show_frame_diagnostics = !**show_frame_diagnostics;
+    }
+
+    // // Shortcut to toggle network visualizers
+    // if input.just_pressed(KeyCode::F7) {
+    //     **show_network_visualizer = !**show_network_visualizer;
+    // }
+
+    // Display debug tool window
+    egui::Window::new(localization.get("debug-tools"))
+        // ID is needed because title comes from localizaition which can change
+        .id(egui::Id::new("debug_tools"))
+        .open(&mut visible)
+        .show(ctx, |ui| {
+            // Show collision shapes
+            ui.checkbox(
+                &mut physics_debug_render.enabled,
+                format!("{} ( F10 )", localization.get("show-collision-shapes")),
+            );
+
+            // Show world inspector
+            ui.checkbox(
+                &mut inspector.enabled,
+                format!("{} ( F9 )", localization.get("show-world-inspector")),
+            );
+
+            // Show frame time diagnostics
+            ui.checkbox(
+                &mut show_frame_diagnostics,
+                format!("{} ( F9 )", localization.get("show-frame-time-diagnostics")),
+            );
+
+            // Show network visualizer
+            // ui.checkbox(
+            //     &mut show_network_visualizer,
+            //     format!("{} ( F7 )", localization.get("show-network-visualizer")),
+            // );
+        });
+}
+
+struct FrameDiagState {
+    min_fps: f64,
+    max_fps: f64,
+    min_frame_time: f64,
+    max_frame_time: f64,
+}
+
+impl Default for FrameDiagState {
+    fn default() -> Self {
+        Self {
+            min_fps: f64::MAX,
+            max_fps: 0.0,
+            min_frame_time: f64::MAX,
+            max_frame_time: 0.0,
+        }
+    }
+}
+
+fn frame_diagnostic_window(
+    mut state: Local<FrameDiagState>,
+    mut egui_context: ResMut<EguiContext>,
+    mut show: ResMut<ShowFameTimeDiagnostics>,
+    diagnostics: Res<Diagnostics>,
+    localization: Res<Localization>,
+) {
+    if **show {
+        let ctx = egui_context.ctx_mut();
+
+        egui::Window::new(&localization.get("frame-diagnostics"))
+            .id(egui::Id::new("frame_diagnostics"))
+            .default_width(500.0)
+            .open(&mut **show)
+            .show(ctx, |ui| {
+                if ui.button(&localization.get("reset-min-max")).clicked() {
+                    *state = default();
+                }
+
+                let fps = diagnostics.get(FrameTimeDiagnosticsPlugin::FPS).unwrap();
+                let fps_value = fps.value().unwrap();
+
+                if fps_value < state.min_fps {
+                    state.min_fps = fps_value;
+                }
+                if fps_value > state.max_fps {
+                    state.max_fps = fps_value;
+                }
+
+                let frame_time = diagnostics
+                    .get(FrameTimeDiagnosticsPlugin::FRAME_TIME)
+                    .unwrap();
+                let frame_time_value = frame_time.value().unwrap();
+
+                if frame_time_value < state.min_frame_time {
+                    state.min_frame_time = frame_time_value;
+                }
+                if frame_time_value > state.max_frame_time {
+                    state.max_frame_time = frame_time_value;
+                }
+
+                ui.monospace(&format!(
+                    "{label:20}: {fps:4.0}{suffix:3} ( {min:4.0}{suffix:3}, {avg:4.0}{suffix:3}, {max:4.0}{suffix:3} )",
+                    label = localization.get("frames-per-second"),
+                    fps = fps_value,
+                    suffix = fps.suffix,
+                    min = state.min_fps,
+                    avg = fps.average().unwrap(),
+                    max = state.max_fps,
+                ));
+                ui.monospace(&format!(
+                    "{label:20}: {fps:4.1}{suffix:3} ( {min:4.1}{suffix:3}, {avg:4.0}{suffix:3}, {max:4.1}{suffix:3} )",
+                    label = localization.get("frame-time"),
+                    fps = frame_time_value * 1000.0,
+                    suffix = "ms",
+                    min = state.min_frame_time * 1000.0,
+                    avg = frame_time.average().unwrap() * 1000.0,
+                    max = state.max_frame_time * 1000.0,
+                ));
+            });
+    }
+}
diff --git a/src/ui/editor.rs b/src/ui/editor.rs
new file mode 100644
index 0000000000..0040b3ea1f
--- /dev/null
+++ b/src/ui/editor.rs
@@ -0,0 +1,976 @@
+use std::{marker::PhantomData, mem::discriminant};
+
+use bevy::{
+    ecs::system::SystemParam, math::Vec3Swizzles, render::camera::Viewport, utils::HashSet,
+};
+use bevy_egui::*;
+use bevy_fluent::Localization;
+
+use crate::{
+    camera::{EditorCamera, GameCamera},
+    localization::LocalizationExt,
+    map::MapGridView,
+    metadata::{GameMeta, MapLayerKind, MapLayerMeta, MapMeta},
+    player::input::PlayerInputs,
+    prelude::*,
+    utils::ResetManager,
+};
+
+use super::{widget, widgets::bordered_button::BorderedButton, WidgetSystem};
+
+pub struct EditorPlugin;
+
+impl Plugin for EditorPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<EditorState>()
+            .add_system(
+                editor_update
+                    .run_in_state(GameState::InGame)
+                    .run_in_state(InGameState::Editing),
+            )
+            .add_system(
+                iyes_loopless::condition::IntoConditionalExclusiveSystem::run_in_state(
+                    editor_ui_system,
+                    GameState::InGame,
+                )
+                .run_in_state(InGameState::Editing)
+                .at_end(),
+            )
+            .add_enter_system(InGameState::Editing, setup_editor)
+            .add_exit_system(InGameState::Editing, cleanup_editor)
+            .add_exit_system(GameState::InGame, cleanup_editor);
+    }
+}
+
+struct EditorState {
+    pub show_grid: bool,
+    pub current_layer_idx: usize,
+    pub hidden_layers: HashSet<usize>,
+}
+
+impl Default for EditorState {
+    fn default() -> Self {
+        Self {
+            show_grid: true,
+            current_layer_idx: 0,
+            hidden_layers: default(),
+        }
+    }
+}
+
+fn setup_editor(
+    game: Res<GameMeta>,
+    mut game_camera: Query<&mut Camera, With<GameCamera>>,
+    mut editor_camera: Query<&mut Camera, (With<EditorCamera>, Without<GameCamera>)>,
+    mut player_inputs: ResMut<PlayerInputs>,
+) {
+    // Disable the game camera
+    let mut game_camera = game_camera.single_mut();
+    game_camera.is_active = false;
+
+    // Make sure there is a player on the map so that there is somebody to use when pressing "Play"
+    if !player_inputs.players[0].active {
+        player_inputs.players[0].active = true;
+        player_inputs.players[0].selected_player = game.player_handles[0].clone_weak();
+    }
+
+    // Enable editor camera
+    //
+    // TODO: Fit map inside of viewport
+    let mut camera = editor_camera.single_mut();
+    camera.is_active = true;
+}
+
+fn editor_update(
+    mut map_grid: Query<&mut Visibility, With<MapGridView>>,
+    settings: Res<EditorState>,
+) {
+    for mut visibility in &mut map_grid {
+        visibility.is_visible = settings.show_grid;
+    }
+}
+
+fn cleanup_editor(
+    mut game_camera: Query<&mut Camera, With<GameCamera>>,
+    mut editor_camera: Query<&mut Camera, (With<EditorCamera>, Without<GameCamera>)>,
+) {
+    // Enable the game camera
+    let mut game_camera = game_camera.single_mut();
+    game_camera.is_active = true;
+
+    // Disable the editor camera
+    let mut editor_camera = editor_camera.single_mut();
+    editor_camera.is_active = false;
+}
+
+pub fn editor_ui_system(world: &mut World) {
+    world.resource_scope(|world: &mut World, mut egui_ctx: Mut<EguiContext>| {
+        let ctx = egui_ctx.ctx_mut();
+
+        egui::TopBottomPanel::top("top-bar").show(ctx, |ui| {
+            widget::<EditorTopBar>(world, ui, "editor-top-bar".into(), ());
+        });
+
+        egui::SidePanel::left("left-toolbar")
+            .width_range(40.0..=40.0)
+            .resizable(false)
+            .show(ctx, |ui| {
+                widget::<EditorLeftToolbar>(world, ui, "editor-left-toolbar".into(), ());
+            });
+
+        egui::SidePanel::right("right-toolbar")
+            .min_width(125.0)
+            .show(ctx, |ui| {
+                widget::<EditorRightToolbar>(world, ui, "editor-right-toolbar".into(), ());
+            });
+
+        egui::CentralPanel::default()
+            .frame(egui::Frame::none())
+            .show(ctx, |ui| {
+                widget::<EditorCentralPanel>(world, ui, "editor-central-panel".into(), ());
+            });
+    });
+}
+
+#[derive(SystemParam)]
+struct EditorTopBar<'w, 's> {
+    game: Res<'w, GameMeta>,
+    camera_commands_resetcontroller: ParamSet<
+        'w,
+        's,
+        (
+            Query<
+                'w,
+                's,
+                (&'static mut Transform, &'static mut OrthographicProjection),
+                With<EditorCamera>,
+            >,
+            Commands<'w, 's>,
+            ResetManager<'w, 's>,
+        ),
+    >,
+    show_map_export_window: Local<'s, bool>,
+    localization: Res<'w, Localization>,
+    map_meta: Query<'w, 's, &'static MapMeta>,
+    map_handle: Query<'w, 's, &'static AssetHandle<MapMeta>>,
+    settings: ResMut<'w, EditorState>,
+}
+
+impl<'w, 's> WidgetSystem for EditorTopBar<'w, 's> {
+    type Args = ();
+
+    fn system(
+        world: &mut World,
+        state: &mut bevy::ecs::system::SystemState<Self>,
+        ui: &mut egui::Ui,
+        _id: super::WidgetId,
+        _args: Self::Args,
+    ) {
+        let mut params: EditorTopBar = state.get_mut(world);
+
+        map_export_window(ui, &mut params);
+
+        ui.horizontal_centered(|ui| {
+            let mut camera = params.camera_commands_resetcontroller.p0();
+            let (mut transform, mut projection): (Mut<Transform>, Mut<OrthographicProjection>) =
+                camera.single_mut();
+            let zoom = 1.0 / projection.scale * 100.0;
+            let [x, y]: [f32; 2] = transform.translation.xy().into();
+
+            ui.label(&params.localization.get("editor"));
+            ui.separator();
+
+            if ui
+                .small_button(&params.localization.get("view-reset"))
+                .clicked()
+            {
+                projection.scale = 1.0;
+                *transform = default();
+            }
+            ui.label(
+                egui::RichText::new(
+                    params
+                        .localization
+                        .get(&format!("view-offset?x={x:.0}&y={y:.0}")),
+                )
+                .small(),
+            );
+            ui.label(
+                egui::RichText::new(
+                    params
+                        .localization
+                        .get(&format!("view-zoom?percent={zoom:.0}")),
+                )
+                .small(),
+            );
+
+            ui.add_space(ui.spacing().icon_spacing);
+
+            ui.checkbox(
+                &mut params.settings.show_grid,
+                &params.localization.get("show-grid"),
+            );
+
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                if ui.button(&params.localization.get("main-menu")).clicked() {
+                    params
+                        .camera_commands_resetcontroller
+                        .p1()
+                        .insert_resource(NextState(GameState::MainMenu));
+                }
+
+                ui.scope(|ui| {
+                    ui.set_enabled(params.map_meta.get_single().is_ok());
+                    if ui.button(&params.localization.get("play")).clicked() {
+                        params
+                            .camera_commands_resetcontroller
+                            .p1()
+                            .insert_resource(NextState(InGameState::Playing));
+                    }
+
+                    let mut reset_controller = params.camera_commands_resetcontroller.p2();
+                    if ui.button(&params.localization.get("export")).clicked() {
+                        *params.show_map_export_window = true;
+                    }
+
+                    if ui.button(&params.localization.get("close")).clicked() {
+                        reset_controller.reset_world();
+                    }
+
+                    if ui.button(&params.localization.get("reload")).clicked() {
+                        let map_handle = params.map_handle.get_single().ok().cloned();
+                        reset_controller.reset_world();
+
+                        if let Some(handle) = map_handle {
+                            params
+                                .camera_commands_resetcontroller
+                                .p1()
+                                .spawn()
+                                .insert(handle);
+                        }
+                    }
+                });
+            });
+        });
+    }
+}
+
+fn map_export_window(ui: &mut egui::Ui, params: &mut EditorTopBar) {
+    if !*params.show_map_export_window {
+        return;
+    }
+    let map = params.map_meta.single();
+    overlay_window(
+        ui,
+        "export-map-window",
+        &params.localization.get("map-export"),
+        params.game.main_menu.menu_width,
+        |ui| {
+            let mut export = serde_yaml::to_string(map).expect("Failure to export to YAMl");
+
+            ui.vertical(|ui| {
+                ui.set_height(params.game.camera_height as f32 * 0.6 * params.game.ui_theme.scale);
+                egui::ScrollArea::vertical().show(ui, |ui| {
+                    ui.add(
+                        egui::TextEdit::multiline(&mut export)
+                            .font(egui::TextStyle::Monospace) // for cursor height
+                            .code_editor()
+                            .desired_width(ui.available_width())
+                            .lock_focus(true),
+                    );
+                });
+
+                ui.add_space(ui.spacing().icon_width);
+
+                ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                    if BorderedButton::themed(
+                        &params.game.ui_theme.button_styles.small,
+                        &params.localization.get("close"),
+                    )
+                    .focus_on_hover(false)
+                    .show(ui)
+                    .clicked()
+                    {
+                        *params.show_map_export_window = false;
+                    }
+                });
+            });
+        },
+    );
+}
+
+#[derive(SystemParam)]
+struct EditorLeftToolbar<'w, 's> {
+    game: Res<'w, GameMeta>,
+    #[system_param(ignore)]
+    _phantom: PhantomData<(&'w (), &'s ())>,
+}
+
+impl<'w, 's> WidgetSystem for EditorLeftToolbar<'w, 's> {
+    type Args = ();
+
+    fn system(
+        world: &mut World,
+        state: &mut bevy::ecs::system::SystemState<Self>,
+        ui: &mut egui::Ui,
+        _id: super::WidgetId,
+        _args: Self::Args,
+    ) {
+        let params: EditorLeftToolbar = state.get_mut(world);
+        let icons = &params.game.ui_theme.editor.icons;
+        let width = ui.available_width();
+        for image in &[&icons.select, &icons.tile, &icons.spawn, &icons.erase] {
+            ui.add_space(ui.spacing().window_margin.top);
+
+            let image_aspect = image.image_size.y / image.image_size.x;
+            let height = width * image_aspect;
+            ui.add(egui::ImageButton::new(
+                image.egui_texture_id,
+                egui::vec2(width, height),
+            ));
+        }
+    }
+}
+
+struct LayerCreateInfo {
+    name: String,
+    kind: MapLayerKind,
+}
+
+impl Default for LayerCreateInfo {
+    fn default() -> Self {
+        Self {
+            name: Default::default(),
+            kind: MapLayerKind::Tile(default()),
+        }
+    }
+}
+
+#[derive(SystemParam)]
+struct EditorRightToolbar<'w, 's> {
+    commands: Commands<'w, 's>,
+    show_layer_create: Local<'s, bool>,
+    layer_create_info: Local<'s, LayerCreateInfo>,
+    game: Res<'w, GameMeta>,
+    localization: Res<'w, Localization>,
+    map: Query<'w, 's, (Entity, &'static mut MapMeta)>,
+    state: ResMut<'w, EditorState>,
+}
+
+impl<'w, 's> WidgetSystem for EditorRightToolbar<'w, 's> {
+    type Args = ();
+
+    fn system(
+        world: &mut World,
+        state: &mut bevy::ecs::system::SystemState<Self>,
+        ui: &mut egui::Ui,
+        _id: super::WidgetId,
+        _args: Self::Args,
+    ) {
+        let mut params: EditorRightToolbar = state.get_mut(world);
+        layer_create_dialog(ui, &mut params);
+
+        let map_query: Option<(_, &MapMeta)> = params.map.get_single().ok();
+
+        ui.set_enabled(map_query.is_some());
+        ui.add_space(ui.spacing().window_margin.top);
+
+        ui.horizontal(|ui| {
+            ui.label(&params.localization.get("map-info"));
+        });
+        ui.separator();
+
+        let row_height = ui.spacing().interact_size.y;
+        ui.push_id("info", |ui| {
+            let table = egui_extras::TableBuilder::new(ui)
+                .cell_layout(egui::Layout::left_to_right(egui::Align::Center))
+                .column(egui_extras::Size::relative(0.5))
+                .column(egui_extras::Size::remainder())
+                .resizable(false);
+
+            table.body(|mut body| {
+                body.row(row_height, |mut row| {
+                    row.col(|ui| {
+                        ui.label(&params.localization.get("name"));
+                    });
+                    row.col(|ui| {
+                        ui.label(map_query.map(|(_, map)| map.name.as_str()).unwrap_or(""));
+                    });
+                });
+                body.row(row_height, |mut row| {
+                    row.col(|ui| {
+                        ui.label(&params.localization.get("grid-size"));
+                    });
+                    if let Some((_, map)) = map_query {
+                        let x = map.grid_size.x;
+                        let y = map.grid_size.y;
+                        row.col(|ui| {
+                            ui.label(format!("{x} x {y}"));
+                        });
+                    }
+                });
+            });
+        });
+
+        ui.add_space(ui.spacing().icon_width);
+
+        ui.separator();
+        ui.horizontal(|ui| {
+            ui.label(&params.localization.get("layers"));
+
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                if ui
+                    .button("➕")
+                    .on_hover_text(&params.localization.get("create-layer"))
+                    .clicked()
+                {
+                    *params.show_layer_create = true;
+                }
+            });
+        });
+        ui.separator();
+
+        if let Some((_, map)) = map_query {
+            let row_height = ui.spacing().interact_size.y * 1.4;
+            ui.push_id("layers", |ui| {
+                let width = ui.available_width() - ui.spacing().item_spacing.x * 4.0;
+                for (i, layer) in map.layers.iter().enumerate() {
+                    let layer: &MapLayerMeta = layer;
+
+                    ui.horizontal(|ui| {
+                        ui.set_width(ui.available_width());
+                        ui.set_height(row_height);
+
+                        let row_rect = ui.max_rect();
+
+                        let hovered = ui
+                            .input()
+                            .pointer
+                            .hover_pos()
+                            .map(|pos| row_rect.contains(pos))
+                            .unwrap_or(false);
+                        let active = hovered && ui.input().pointer.primary_down();
+                        let highlighted = hovered || params.state.current_layer_idx == i;
+                        let clicked = ui.input().pointer.primary_released() && hovered;
+
+                        if highlighted {
+                            ui.painter().rect_filled(
+                                row_rect,
+                                0.0,
+                                if active {
+                                    ui.visuals().widgets.active.bg_stroke.color
+                                } else {
+                                    ui.visuals().widgets.hovered.bg_fill
+                                },
+                            );
+                        }
+
+                        if clicked {
+                            params.state.current_layer_idx = i;
+                        }
+
+                        ui.scope(|ui| {
+                            ui.set_width(width * 0.1);
+                            ui.vertical_centered(|ui| {
+                                ui.add_space(ui.spacing().interact_size.y * 0.2);
+                                match layer.kind {
+                                    MapLayerKind::Tile(_) => {
+                                        ui.label(&params.localization.get("tile-layer-icon"))
+                                            .on_hover_text(&params.localization.get("tile-layer"));
+                                    }
+                                    MapLayerKind::Element(_) => {
+                                        ui.label(&params.localization.get("element-layer-icon"))
+                                            .on_hover_text(
+                                                &params.localization.get("element-layer"),
+                                            );
+                                    }
+                                };
+                            });
+                        });
+
+                        ui.vertical(|ui| {
+                            ui.set_width(width * 0.8);
+                            ui.add_space(ui.spacing().interact_size.y * 0.2);
+                            ui.label(&layer.id);
+                        });
+
+                        ui.vertical_centered(|ui| {
+                            ui.set_width(width * 0.1);
+                            ui.add_space(ui.spacing().interact_size.y * 0.2);
+                            let is_visible = !params.state.hidden_layers.contains(&i);
+                            if ui
+                                .selectable_label(is_visible, "👁")
+                                .on_hover_text(&params.localization.get("toggle-visibility"))
+                                .clicked()
+                            {
+                                if is_visible {
+                                    params.state.hidden_layers.insert(i);
+                                } else {
+                                    params.state.hidden_layers.remove(&i);
+                                }
+                            };
+                        });
+                    });
+                }
+            });
+        }
+    }
+}
+
+fn layer_create_dialog(ui: &mut egui::Ui, params: &mut EditorRightToolbar) {
+    let space = ui.spacing().icon_width;
+
+    if !*params.show_layer_create {
+        return;
+    }
+
+    let is_valid = params.map.get_single().is_ok();
+    overlay_window(
+        ui,
+        "create-map-window",
+        &params.localization.get("create-layer"),
+        params.game.main_menu.menu_width,
+        |ui| {
+            ui.vertical(|ui| {
+                ui.horizontal(|ui| {
+                    ui.label(&params.localization.get("name"));
+                    ui.text_edit_singleline(&mut params.layer_create_info.name);
+                });
+
+                ui.add_space(space / 2.0);
+
+                ui.horizontal(|ui| {
+                    ui.label(&format!("{}: ", params.localization.get("layer-kind")));
+                    ui.add_space(space);
+                    for (label, layer_kind) in [
+                        (
+                            params.localization.get("tile"),
+                            MapLayerKind::Tile(default()),
+                        ),
+                        (
+                            params.localization.get("element"),
+                            MapLayerKind::Element(default()),
+                        ),
+                    ] {
+                        let selected = discriminant(&params.layer_create_info.kind)
+                            == discriminant(&layer_kind);
+
+                        if ui.selectable_label(selected, label).clicked() {
+                            params.layer_create_info.kind = layer_kind;
+                        }
+                    }
+                });
+
+                ui.add_space(space);
+
+                ui.with_layout(egui::Layout::right_to_left(egui::Align::TOP), |ui| {
+                    ui.scope(|ui| {
+                        ui.set_enabled(is_valid);
+
+                        if BorderedButton::themed(
+                            &params.game.ui_theme.button_styles.small,
+                            &params.localization.get("create"),
+                        )
+                        .focus_on_hover(false)
+                        .show(ui)
+                        .clicked()
+                        {
+                            *params.show_layer_create = false;
+                            create_layer(params);
+                        }
+                    });
+
+                    ui.add_space(space);
+
+                    if BorderedButton::themed(
+                        &params.game.ui_theme.button_styles.small,
+                        &params.localization.get("cancel"),
+                    )
+                    .focus_on_hover(false)
+                    .show(ui)
+                    .clicked()
+                    {
+                        *params.layer_create_info = default();
+                        *params.show_layer_create = false;
+                    }
+                });
+            });
+        },
+    );
+}
+
+fn create_layer(params: &mut EditorRightToolbar) {
+    use bevy_ecs_tilemap::prelude::*;
+
+    let layer_info = &*params.layer_create_info;
+    let (map_entity, mut map): (Entity, Mut<MapMeta>) = params.map.single_mut();
+
+    let layer_idx = map.layers.len();
+    let layer_entity = params.commands.spawn().id();
+    map.layers.push(MapLayerMeta {
+        id: layer_info.name.clone(),
+        kind: layer_info.kind.clone(),
+        entity: Some(layer_entity),
+    });
+
+    match &layer_info.kind {
+        MapLayerKind::Tile(_) => {
+            let grid_size = TilemapSize {
+                x: map.grid_size.x,
+                y: map.grid_size.y,
+            };
+            let tile_size = TilemapTileSize {
+                x: map.tile_size.x as f32,
+                y: map.tile_size.y as f32,
+            };
+
+            let storage = TileStorage::empty(grid_size);
+
+            // Spawn the map layer
+            params
+                .commands
+                .entity(map_entity)
+                .push_children(&[layer_entity]);
+            params
+                .commands
+                .entity(layer_entity)
+                .insert_bundle(TilemapBundle {
+                    size: grid_size,
+                    storage,
+                    tile_size,
+                    transform: Transform::from_xyz(0.0, 0.0, layer_idx as f32),
+                    ..default()
+                });
+        }
+        MapLayerKind::Element(_) => (),
+    }
+
+    *params.layer_create_info = default();
+}
+
+#[derive(SystemParam)]
+struct EditorCentralPanel<'w, 's> {
+    show_map_create: Local<'s, bool>,
+    show_map_open: Local<'s, bool>,
+    map_create_info: Local<'s, MapCreateInfo>,
+    commands: Commands<'w, 's>,
+    game: Res<'w, GameMeta>,
+    map: Query<'w, 's, Entity, With<MapMeta>>,
+    camera: Query<
+        'w,
+        's,
+        (
+            &'static mut Camera,
+            &'static mut Transform,
+            &'static mut OrthographicProjection,
+        ),
+        With<EditorCamera>,
+    >,
+    localization: Res<'w, Localization>,
+}
+
+struct MapCreateInfo {
+    name: String,
+    map_width: u32,
+    map_height: u32,
+}
+
+impl Default for MapCreateInfo {
+    fn default() -> Self {
+        Self {
+            name: default(),
+            map_width: 27,
+            map_height: 21,
+        }
+    }
+}
+
+impl MapCreateInfo {
+    fn is_valid(&self) -> bool {
+        !self.name.is_empty() && self.map_width > 10 && self.map_height > 10
+    }
+}
+
+impl<'w, 's> WidgetSystem for EditorCentralPanel<'w, 's> {
+    type Args = ();
+
+    fn system(
+        world: &mut World,
+        state: &mut bevy::ecs::system::SystemState<Self>,
+        ui: &mut egui::Ui,
+        _id: super::WidgetId,
+        _args: Self::Args,
+    ) {
+        let mut params: EditorCentralPanel = state.get_mut(world);
+        let has_map = params.map.get_single().is_ok();
+
+        map_open_dialog(ui, &mut params);
+        map_create_dialog(ui, &mut params);
+
+        if *params.show_map_create || *params.show_map_open {
+            ui.set_enabled(false);
+        }
+
+        if has_map {
+            let response = ui.allocate_response(ui.available_size(), egui::Sense::click_and_drag());
+
+            let rect = response.rect;
+
+            let (mut camera, mut camera_transform, mut projection): (
+                Mut<Camera>,
+                Mut<Transform>,
+                Mut<OrthographicProjection>,
+            ) = params.camera.single_mut();
+
+            // Handle zoom
+            if response.hovered() {
+                projection.scale -= ui.input().scroll_delta.y * 0.005;
+                projection.scale = projection.scale.max(0.05);
+            }
+
+            // Handle pan
+            if response.dragged_by(egui::PointerButton::Middle) || ui.input().modifiers.command {
+                let drag_delta =
+                    response.drag_delta() * params.game.ui_theme.scale * projection.scale;
+                camera_transform.translation.x -= drag_delta.x;
+                camera_transform.translation.y += drag_delta.y;
+            }
+
+            // Handle cursor
+            //
+            // We only change the cursor if it's not been changed by another widget, for instance, for the
+            // resize handle of the right sidebar.
+            if ui.output().cursor_icon == default() {
+                if response.dragged_by(egui::PointerButton::Middle)
+                    || (ui.input().modifiers.command
+                        && response.dragged_by(egui::PointerButton::Primary))
+                {
+                    response.on_hover_cursor(egui::CursorIcon::Grabbing);
+                } else if ui.input().modifiers.command {
+                    response.on_hover_cursor(egui::CursorIcon::Grab);
+                } else {
+                    response.on_hover_cursor(egui::CursorIcon::Crosshair);
+                }
+            }
+
+            // Update camera viewport
+            let ppp = ui.ctx().pixels_per_point();
+            camera.viewport = Some(Viewport {
+                physical_position: UVec2::new(
+                    (rect.min.x * ppp) as u32,
+                    (rect.min.y.floor() * ppp) as u32,
+                ),
+                physical_size: UVec2::new(
+                    (rect.width() * ppp) as u32,
+                    (rect.height() * ppp) as u32,
+                ),
+                ..default()
+            });
+        } else {
+            ui.add_space(ui.available_height() / 2.0);
+            ui.vertical_centered(|ui| {
+                if BorderedButton::themed(
+                    &params.game.ui_theme.button_styles.normal,
+                    &params.localization.get("open-map"),
+                )
+                .show(ui)
+                .clicked()
+                {
+                    *params.show_map_open = true;
+                }
+
+                ui.add_space(ui.spacing().item_spacing.y);
+
+                if BorderedButton::themed(
+                    &params.game.ui_theme.button_styles.normal,
+                    &params.localization.get("create-map"),
+                )
+                .show(ui)
+                .clicked()
+                {
+                    *params.show_map_create = true;
+                    *params.map_create_info = default();
+                }
+            });
+        }
+    }
+}
+
+fn map_open_dialog(ui: &mut egui::Ui, params: &mut EditorCentralPanel) {
+    let space = ui.spacing().icon_width;
+
+    if !*params.show_map_open {
+        return;
+    }
+
+    overlay_window(
+        ui,
+        "open-map-window",
+        &params.localization.get("open-map"),
+        params.game.main_menu.menu_width,
+        |ui| {
+            ui.set_height(params.game.camera_height as f32 * 0.6);
+            ui.vertical_centered_justified(|ui| {
+                ui.add_space(space * 2.5);
+                egui::ScrollArea::vertical().show(ui, |ui| {
+                    #[allow(clippy::unnecessary_to_owned)]
+                    // False alarm, necessary to avoid borrowing params
+                    for (map_name, map_handle) in params.game.maps.to_vec().into_iter().zip(
+                        params
+                            .game
+                            .map_handles
+                            .iter()
+                            .map(|x| x.clone_weak())
+                            .collect::<Vec<_>>()
+                            .into_iter(),
+                    ) {
+                        if ui.button(&map_name).clicked() {
+                            params.commands.spawn().insert(map_handle);
+                            *params.show_map_open = false;
+                        }
+                    }
+                });
+            });
+
+            ui.add_space(space);
+
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| {
+                if BorderedButton::themed(
+                    &params.game.ui_theme.button_styles.small,
+                    &params.localization.get("cancel"),
+                )
+                .focus_on_hover(false)
+                .show(ui)
+                .clicked()
+                {
+                    *params.show_map_open = false;
+                }
+            });
+        },
+    );
+}
+
+fn map_create_dialog(ui: &mut egui::Ui, params: &mut EditorCentralPanel) {
+    let space = ui.spacing().icon_width;
+
+    if !*params.show_map_create {
+        return;
+    }
+
+    let is_valid = params.map_create_info.is_valid();
+    overlay_window(
+        ui,
+        "create-map-window",
+        &params.localization.get("create-map"),
+        params.game.main_menu.menu_width,
+        |ui| {
+            ui.horizontal(|ui| {
+                ui.label(&params.localization.get("name"));
+                ui.text_edit_singleline(&mut params.map_create_info.name);
+            });
+
+            ui.add_space(space / 2.0);
+
+            ui.horizontal(|ui| {
+                ui.label(&params.localization.get("grid-size"));
+                ui.add(egui::DragValue::new(&mut params.map_create_info.map_width));
+                ui.label("X");
+                ui.add(egui::DragValue::new(&mut params.map_create_info.map_height));
+            });
+
+            ui.add_space(space);
+
+            ui.with_layout(egui::Layout::right_to_left(egui::Align::TOP), |ui| {
+                ui.scope(|ui| {
+                    ui.set_enabled(is_valid);
+
+                    if BorderedButton::themed(
+                        &params.game.ui_theme.button_styles.small,
+                        &params.localization.get("create"),
+                    )
+                    .focus_on_hover(false)
+                    .show(ui)
+                    .clicked()
+                    {
+                        *params.show_map_create = false;
+                        create_map(params);
+                    }
+                });
+
+                ui.add_space(space);
+
+                if BorderedButton::themed(
+                    &params.game.ui_theme.button_styles.small,
+                    &params.localization.get("cancel"),
+                )
+                .focus_on_hover(false)
+                .show(ui)
+                .clicked()
+                {
+                    *params.show_map_create = false;
+                }
+            });
+        },
+    );
+}
+
+fn create_map(params: &mut EditorCentralPanel) {
+    let info = &params.map_create_info;
+    let grid_size = UVec2::new(info.map_width, info.map_height);
+    let tile_size = UVec2::new(10, 10);
+    let meta = MapMeta {
+        background_color: params.game.clear_color,
+        name: info.name.clone(),
+        grid_size,
+        tile_size,
+        layers: default(),
+        background_layers: default(),
+    };
+
+    params.commands.spawn().insert(meta);
+    *params.show_map_open = false;
+    *params.show_map_create = false;
+}
+
+/// Helper to render an egui frame in the center of the screen as an overlay
+fn overlay_window<R, F: FnOnce(&mut egui::Ui) -> R>(
+    ui: &mut egui::Ui,
+    id: &str,
+    title: &str,
+    width: f32,
+    f: F,
+) -> egui::InnerResponse<R> {
+    let space = ui.spacing().icon_width;
+    let i = egui::Window::new(title)
+        .auto_sized()
+        .id(egui::Id::new(id))
+        .frame(
+            egui::Frame::window(ui.style()).inner_margin(egui::style::Margin::symmetric(
+                space,
+                ui.spacing().window_margin.top,
+            )),
+        )
+        .default_width(width)
+        .collapsible(false)
+        .title_bar(false)
+        .anchor(egui::Align2::CENTER_CENTER, egui::Vec2::ZERO)
+        .show(ui.ctx(), |ui| {
+            ui.vertical(|ui| {
+                ui.vertical_centered(|ui| {
+                    ui.heading(title);
+                });
+                ui.separator();
+                ui.add_space(space);
+                let r = f(ui);
+                ui.add_space(space / 2.0);
+                r
+            })
+            .inner
+        })
+        .unwrap();
+
+    egui::InnerResponse {
+        inner: i.inner.unwrap(),
+        response: i.response,
+    }
+}
diff --git a/src/ui/input.rs b/src/ui/input.rs
new file mode 100644
index 0000000000..95c5567e81
--- /dev/null
+++ b/src/ui/input.rs
@@ -0,0 +1,22 @@
+use crate::prelude::*;
+
+pub struct UiInputPlugin;
+
+impl Plugin for UiInputPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugin(InputManagerPlugin::<MenuAction>::default());
+    }
+}
+
+#[derive(Debug, Copy, Clone, Actionlike, Deserialize, Eq, PartialEq, Hash)]
+pub enum MenuAction {
+    Up,
+    Down,
+    Left,
+    Right,
+    Confirm,
+    Start,
+    Back,
+    Pause,
+    ToggleFullscreen,
+}
diff --git a/src/ui/main_menu.rs b/src/ui/main_menu.rs
new file mode 100644
index 0000000000..58d62aa039
--- /dev/null
+++ b/src/ui/main_menu.rs
@@ -0,0 +1,357 @@
+use std::marker::PhantomData;
+
+use bevy::{
+    app::AppExit,
+    ecs::system::{SystemParam, SystemState},
+};
+use bevy_egui::*;
+use bevy_fluent::Localization;
+use iyes_loopless::condition::IntoConditionalExclusiveSystem;
+
+use crate::{
+    localization::LocalizationExt,
+    metadata::{GameMeta, Settings},
+    platform::Storage,
+    player::input::PlayerInputs,
+    prelude::*,
+    ui::input::MenuAction,
+    utils::ResetManager,
+};
+
+// use self::settings::ControlInputBindingEvents;
+
+use self::settings::{ModifiedSettings, SettingsTab};
+
+use super::{
+    widget,
+    widgets::{
+        bordered_button::BorderedButton, bordered_frame::BorderedFrame, EguiContextExt,
+        EguiResponseExt, EguiUiExt,
+    },
+    DisableMenuInput, WidgetAdjacencies, WidgetId, WidgetSystem,
+};
+
+pub mod map_select;
+#[cfg(not(target_arch = "wasm32"))]
+pub mod matchmaking;
+pub mod player_select;
+pub mod settings;
+
+pub struct MainMenuPlugin;
+
+impl Plugin for MainMenuPlugin {
+    fn build(&self, app: &mut App) {
+        app.register_type::<MainMenuBackground>()
+            .init_resource::<MenuPage>()
+            .init_resource::<settings::SettingsTab>()
+            .init_resource::<settings::ModifiedSettings>()
+            .init_resource::<player_select::PlayerSelectState>()
+            .add_system(main_menu_system.run_in_state(GameState::MainMenu).at_end())
+            .add_enter_system(GameState::MainMenu, setup_main_menu)
+            .add_exit_system(GameState::MainMenu, clean_up_main_menu);
+    }
+}
+
+#[derive(Component, Reflect)]
+pub struct MainMenuBackground;
+
+/// Spawns the background image for the main menu
+pub fn setup_main_menu(
+    mut commands: Commands,
+    game: Res<GameMeta>,
+    mut reset_controller: ResetManager,
+    mut player_inputs: ResMut<PlayerInputs>,
+) {
+    // Reset the game world
+    reset_controller.reset_world();
+
+    // Reset player list
+    for player in &mut player_inputs.players {
+        player.active = false;
+    }
+
+    // Spawn menu background
+    let bg_handle = game.main_menu.background_image.image_handle.clone();
+    let img_size = game.main_menu.background_image.image_size;
+    let ratio = img_size.x / img_size.y;
+    let height = game.camera_height as f32;
+    let width = height * ratio;
+    commands
+        .spawn()
+        .insert(Name::new("Menu Background Parent"))
+        .insert_bundle(VisibilityBundle::default())
+        .insert_bundle(TransformBundle::default())
+        .insert(MainMenuBackground)
+        .with_children(|parent| {
+            parent
+                .spawn_bundle(SpriteBundle {
+                    texture: bg_handle.inner.clone_weak(),
+                    sprite: Sprite {
+                        custom_size: Some(Vec2::new(width, height)),
+                        ..default()
+                    },
+                    transform: Transform::from_translation(Vec3::new(-width, 0.0, 0.0)),
+                    ..default()
+                })
+                .insert(Name::new("Main Menu Background Left"));
+            parent
+                .spawn_bundle(SpriteBundle {
+                    texture: bg_handle.inner.clone_weak(),
+                    sprite: Sprite {
+                        custom_size: Some(Vec2::new(width, height)),
+                        ..default()
+                    },
+                    ..default()
+                })
+                .insert(Name::new("Main Menu Background Middle"));
+            parent
+                .spawn_bundle(SpriteBundle {
+                    texture: bg_handle.inner,
+                    sprite: Sprite {
+                        custom_size: Some(Vec2::new(width, height)),
+                        ..default()
+                    },
+                    transform: Transform::from_translation(Vec3::new(width, 0.0, 0.0)),
+                    ..default()
+                })
+                .insert(Name::new("Main Menu Background Right"));
+        });
+}
+
+/// Despawns the background image for the main menu
+pub fn clean_up_main_menu(
+    mut commands: Commands,
+    backgrounds: Query<Entity, With<MainMenuBackground>>,
+) {
+    for bg in &backgrounds {
+        commands.entity(bg).despawn_recursive();
+    }
+}
+
+/// Which page of the menu we are on
+#[derive(Clone, Copy)]
+pub enum MenuPage {
+    Home,
+    Settings,
+    PlayerSelect,
+    MapSelect {
+        /// Indicates the client is waiting for the map to be selected, not actually picking the
+        /// map.
+        is_waiting: bool,
+    },
+    Matchmaking,
+}
+
+impl Default for MenuPage {
+    fn default() -> Self {
+        Self::Home
+    }
+}
+
+impl SettingsTab {
+    const TABS: &'static [(Self, &'static str)] = &[
+        (Self::Controls, "controls"),
+        (Self::Networking, "networking"), // For now, hide the sound tab because we don't have it working yet.
+                                          // (Self::Sound, "sound")
+    ];
+}
+
+/// Render the main menu UI
+pub fn main_menu_system(world: &mut World) {
+    world.resource_scope(|world: &mut World, mut egui_ctx: Mut<EguiContext>| {
+        egui::CentralPanel::default()
+            .frame(egui::Frame::none())
+            .show(egui_ctx.ctx_mut(), |ui| {
+                widget::<MainMenu>(world, ui, WidgetId::new("main-menu"), ());
+            });
+    });
+}
+
+#[derive(SystemParam)]
+struct MainMenu<'w, 's> {
+    menu_page: ResMut<'w, MenuPage>,
+    disable_menu_input: ResMut<'w, DisableMenuInput>,
+    #[system_param(ignore)]
+    _phantom: PhantomData<&'s ()>,
+}
+
+impl<'w, 's> WidgetSystem for MainMenu<'w, 's> {
+    type Args = ();
+    fn system(
+        world: &mut World,
+        state: &mut SystemState<Self>,
+        ui: &mut egui::Ui,
+        id: WidgetId,
+        _args: (),
+    ) {
+        let mut params: MainMenu = state.get_mut(world);
+
+        // Disable menu input handling on player select page, so each player can control their own
+        // player selection independently.
+        let is_player_select = matches!(*params.menu_page, MenuPage::PlayerSelect);
+        **params.disable_menu_input = is_player_select;
+
+        // Render the menu based on the current menu selection
+        match *params.menu_page {
+            MenuPage::Home => widget::<HomeMenu>(world, ui, id.with("home"), ()),
+            MenuPage::Matchmaking =>
+            {
+                #[cfg(not(target_arch = "wasm32"))]
+                widget::<matchmaking::MatchmakingMenu>(world, ui, id.with("matchmaking"), ())
+            }
+            MenuPage::PlayerSelect => {
+                widget::<player_select::PlayerSelectMenu>(world, ui, id.with("player-select"), ())
+            }
+            MenuPage::MapSelect { is_waiting } => {
+                widget::<map_select::MapSelectMenu>(world, ui, id.with("map-select"), is_waiting)
+            }
+            MenuPage::Settings => {
+                widget::<settings::SettingsMenu>(world, ui, id.with("settings"), ())
+            }
+        }
+    }
+}
+
+#[derive(SystemParam)]
+struct HomeMenu<'w, 's> {
+    commands: Commands<'w, 's>,
+    menu_page: ResMut<'w, MenuPage>,
+    player_select_state: ResMut<'w, player_select::PlayerSelectState>,
+    modified_settings: ResMut<'w, ModifiedSettings>,
+    game: Res<'w, GameMeta>,
+    localization: Res<'w, Localization>,
+    app_exit: EventWriter<'w, 's, AppExit>,
+    storage: ResMut<'w, Storage>,
+}
+
+impl<'w, 's> WidgetSystem for HomeMenu<'w, 's> {
+    type Args = ();
+    fn system(
+        world: &mut World,
+        state: &mut SystemState<Self>,
+        ui: &mut egui::Ui,
+        _: WidgetId,
+        _: (),
+    ) {
+        let mut params: HomeMenu = state.get_mut(world);
+
+        // Reset player selection when comming to the home menu
+        if params.player_select_state.is_changed() {
+            *params.player_select_state = default();
+        }
+
+        let ui_theme = &params.game.ui_theme;
+
+        ui.vertical_centered(|ui| {
+            ui.add_space(&params.game.main_menu.title_font.size / 4.0);
+            ui.themed_label(
+                &params.game.main_menu.title_font,
+                &params.localization.get("title"),
+            );
+            ui.themed_label(
+                &params.game.main_menu.subtitle_font,
+                &params.localization.get("subtitle"),
+            );
+        });
+
+        ui.add_space(params.game.main_menu.subtitle_font.size / 2.0);
+
+        // Create a vertical list of items, centered horizontally
+        ui.vertical_centered(|ui| {
+            let available_size = ui.available_size();
+
+            let menu_width = params.game.main_menu.menu_width;
+            let x_margin = (available_size.x - menu_width) / 2.0;
+            let outer_margin = egui::style::Margin::symmetric(x_margin, 0.0);
+
+            BorderedFrame::new(&params.game.ui_theme.panel.border)
+                .margin(outer_margin)
+                .padding(params.game.ui_theme.panel.padding.into())
+                .show(ui, |ui| {
+                    let min_button_size = egui::vec2(ui.available_width(), 0.0);
+
+                    // Local Game
+                    let local_game_button = BorderedButton::themed(
+                        &ui_theme.button_styles.normal,
+                        &params.localization.get("local-game"),
+                    )
+                    .min_size(min_button_size)
+                    .show(ui)
+                    .focus_by_default(ui);
+
+                    if local_game_button.clicked() {
+                        *params.menu_page = MenuPage::PlayerSelect;
+                    }
+
+                    // Online Game
+                    #[cfg(not(target_arch = "wasm32"))]
+                    {
+                        let online_game_button = BorderedButton::themed(
+                            &ui_theme.button_styles.normal,
+                            &params.localization.get("online-game"),
+                        )
+                        .min_size(min_button_size)
+                        .show(ui)
+                        .focus_by_default(ui);
+
+                        if online_game_button.clicked() {
+                            *params.menu_page = MenuPage::Matchmaking;
+                        }
+                    }
+
+                    // Map editor
+                    if BorderedButton::themed(
+                        &ui_theme.button_styles.normal,
+                        &params.localization.get("editor"),
+                    )
+                    .min_size(min_button_size)
+                    .show(ui)
+                    .clicked()
+                    {
+                        params
+                            .commands
+                            .insert_resource(NextState(InGameState::Editing));
+                        params
+                            .commands
+                            .insert_resource(NextState(GameState::InGame));
+                    }
+
+                    // Settings button
+                    if BorderedButton::themed(
+                        &ui_theme.button_styles.normal,
+                        &params.localization.get("settings"),
+                    )
+                    .min_size(min_button_size)
+                    .show(ui)
+                    .clicked()
+                    {
+                        *params.menu_page = MenuPage::Settings;
+                        **params.modified_settings = Some(
+                            params
+                                .storage
+                                .get(Settings::STORAGE_KEY)
+                                .unwrap_or_else(|| params.game.default_settings.clone()),
+                        );
+                    }
+
+                    // Quit button
+                    #[cfg(not(target_arch = "wasm32"))]
+                    // Quitting doesn't make sense in a web context
+                    if BorderedButton::themed(
+                        &ui_theme.button_styles.normal,
+                        &params.localization.get("quit"),
+                    )
+                    .min_size(min_button_size)
+                    .show(ui)
+                    .clicked()
+                    {
+                        params.app_exit.send(AppExit);
+                    }
+
+                    // use the app exit variable on WASM to avoid warnings
+                    #[cfg(target_arch = "wasm32")]
+                    let _ = params.app_exit;
+                });
+        });
+    }
+}
diff --git a/src/ui/main_menu/map_select.rs b/src/ui/main_menu/map_select.rs
new file mode 100644
index 0000000000..da985713f0
--- /dev/null
+++ b/src/ui/main_menu/map_select.rs
@@ -0,0 +1,131 @@
+use crate::{
+    metadata::MapMeta,
+    networking::{
+        client::NetClient,
+        proto::match_setup::{MatchSetupFromClient, MatchSetupFromServer},
+    },
+};
+
+use super::*;
+
+#[derive(SystemParam)]
+pub struct MapSelectMenu<'w, 's> {
+    client: Option<ResMut<'w, NetClient>>,
+    menu_page: ResMut<'w, MenuPage>,
+    game: Res<'w, GameMeta>,
+    commands: Commands<'w, 's>,
+    localization: Res<'w, Localization>,
+    map_assets: Res<'w, Assets<MapMeta>>,
+    #[system_param(ignore)]
+    _phantom: PhantomData<(&'w (), &'s ())>,
+}
+
+impl<'w, 's> WidgetSystem for MapSelectMenu<'w, 's> {
+    type Args = bool;
+
+    fn system(
+        world: &mut World,
+        state: &mut SystemState<Self>,
+        ui: &mut egui::Ui,
+        _id: WidgetId,
+        is_waiting: Self::Args,
+    ) {
+        let mut params: MapSelectMenu = state.get_mut(world);
+
+        handle_match_setup_messages(&mut params);
+
+        ui.vertical_centered_justified(|ui| {
+            let bigger_text_style = &params.game.ui_theme.font_styles.bigger;
+            let heading_text_style = &params.game.ui_theme.font_styles.heading;
+            let small_button_style = &params.game.ui_theme.button_styles.small;
+
+            ui.add_space(heading_text_style.size / 4.0);
+            ui.themed_label(heading_text_style, &params.localization.get("local-game"));
+            ui.themed_label(
+                bigger_text_style,
+                &params.localization.get("map-select-title"),
+            );
+            ui.add_space(small_button_style.font.size);
+
+            let available_size = ui.available_size();
+            let menu_width = params.game.main_menu.menu_width;
+            let x_margin = (available_size.x - menu_width) / 2.0;
+            let outer_margin = egui::style::Margin::symmetric(x_margin, 0.0);
+
+            if is_waiting {
+                ui.themed_label(
+                    bigger_text_style,
+                    &params.localization.get("waiting-for-map"),
+                );
+            } else {
+                BorderedFrame::new(&params.game.ui_theme.panel.border)
+                    .margin(outer_margin)
+                    .padding(params.game.ui_theme.panel.padding.into())
+                    .show(ui, |ui| {
+                        ui.set_width(ui.available_width());
+
+                        egui::ScrollArea::vertical().show(ui, |ui| {
+                            // Clippy lint is a false alarm, necessary to avoid borrowing params
+                            #[allow(clippy::unnecessary_to_owned)]
+                            for map_handle in params
+                                .game
+                                .map_handles
+                                .iter()
+                                .map(|x| x.clone_weak())
+                                .collect::<Vec<_>>()
+                                .into_iter()
+                            {
+                                let map_meta = params.map_assets.get(&map_handle).unwrap();
+                                ui.add_space(ui.spacing().item_spacing.y);
+
+                                if BorderedButton::themed(small_button_style, &map_meta.name)
+                                    .show(ui)
+                                    .clicked()
+                                {
+                                    *params.menu_page = MenuPage::Home;
+                                    params.commands.spawn().insert(map_handle.clone_weak());
+                                    params
+                                        .commands
+                                        .insert_resource(NextState(GameState::InGame));
+                                    params
+                                        .commands
+                                        .insert_resource(NextState(InGameState::Playing));
+
+                                    if let Some(client) = &mut params.client {
+                                        client.send_reliable(&MatchSetupFromClient::SelectMap(
+                                            map_handle,
+                                        ));
+                                    }
+                                }
+                            }
+                        });
+                    });
+            }
+        });
+    }
+}
+
+fn handle_match_setup_messages(params: &mut MapSelectMenu) {
+    if let Some(client) = &mut params.client {
+        while let Some(message) = client.recv_reliable::<MatchSetupFromServer>() {
+            match message {
+                MatchSetupFromServer::ClientMessage {
+                    player_idx: _,
+                    message: MatchSetupFromClient::SelectMap(map_handle),
+                } => {
+                    *params.menu_page = MenuPage::Home;
+                    params.commands.spawn().insert(map_handle);
+                    params
+                        .commands
+                        .insert_resource(NextState(GameState::InGame));
+                    params
+                        .commands
+                        .insert_resource(NextState(InGameState::Playing));
+                }
+                message => {
+                    warn!("Unexpected message in map select: {message:?}");
+                }
+            }
+        }
+    }
+}
diff --git a/src/ui/main_menu/matchmaking.rs b/src/ui/main_menu/matchmaking.rs
new file mode 100644
index 0000000000..bcb3750da0
--- /dev/null
+++ b/src/ui/main_menu/matchmaking.rs
@@ -0,0 +1,371 @@
+use std::net::{SocketAddr, ToSocketAddrs};
+
+use anyhow::Context;
+use async_channel::{Receiver, Sender};
+use bevy::tasks::IoTaskPool;
+use futures_lite::future;
+use jumpy_matchmaker_proto::{MatchInfo, MatchmakerRequest, MatchmakerResponse};
+use quinn::{Connection, Endpoint};
+
+use crate::{networking::client::NetClient, player::MAX_PLAYERS};
+
+use super::*;
+
+#[derive(SystemParam)]
+pub struct MatchmakingMenu<'w, 's> {
+    commands: Commands<'w, 's>,
+    menu_page: ResMut<'w, MenuPage>,
+    game: Res<'w, GameMeta>,
+    storage: ResMut<'w, Storage>,
+    localization: Res<'w, Localization>,
+    state: Local<'s, State>,
+    menu_input: Query<'w, 's, &'static mut ActionState<MenuAction>>,
+}
+
+pub struct State {
+    player_count: u8,
+    status: Status,
+    status_receiver: Option<Receiver<Status>>,
+    cancel_sender: Option<Sender<()>>,
+}
+
+#[derive(Debug, Clone, Default)]
+enum Status {
+    #[default]
+    NotConnected,
+    Connecting,
+    Connected,
+    WaitingForPlayers {
+        players: usize,
+    },
+    MatchReady(Endpoint, Connection),
+    Errored(String),
+}
+
+impl Status {
+    fn is_not_connected(&self) -> bool {
+        matches!(self, Status::NotConnected) || matches!(self, Status::Errored(_))
+    }
+    fn is_match_ready(&self) -> bool {
+        matches!(self, Status::MatchReady(_, _))
+    }
+}
+
+impl State {
+    fn update_status(&mut self) {
+        if let Some(receiver) = &mut self.status_receiver {
+            while let Ok(status) = receiver.try_recv() {
+                self.status = status;
+            }
+        }
+    }
+}
+
+impl Default for State {
+    fn default() -> Self {
+        Self {
+            player_count: 4,
+            status: Status::NotConnected,
+            status_receiver: None,
+            cancel_sender: None,
+        }
+    }
+}
+
+impl<'w, 's> WidgetSystem for MatchmakingMenu<'w, 's> {
+    type Args = ();
+    fn system(
+        world: &mut World,
+        state: &mut SystemState<Self>,
+        ui: &mut egui::Ui,
+        _: WidgetId,
+        _: (),
+    ) {
+        let mut params: MatchmakingMenu = state.get_mut(world);
+        let menu_input = params.menu_input.single();
+        params.state.update_status();
+
+        // Transition to player select if match is ready
+        if params.state.status.is_match_ready() {
+            let status = std::mem::take(&mut params.state.status);
+
+            if let Status::MatchReady(endpoint, conn) = status {
+                let client = NetClient::new(endpoint, conn);
+                params.commands.insert_resource(client);
+                *params.menu_page = MenuPage::PlayerSelect;
+                params.state.status_receiver = default();
+                params.state.status = default();
+                params.state.cancel_sender = default();
+            } else {
+                unreachable!("Programmer error in is_match_ready() helper method");
+            }
+        }
+
+        let bigger_text_style = &params.game.ui_theme.font_styles.bigger;
+        let normal_text_style = &params.game.ui_theme.font_styles.normal;
+        let heading_text_style = &params.game.ui_theme.font_styles.heading;
+        let normal_button_style = &params.game.ui_theme.button_styles.normal;
+
+        ui.vertical_centered(|ui| {
+            ui.add_space(heading_text_style.size / 4.0);
+            ui.themed_label(heading_text_style, &params.localization.get("online-game"));
+            ui.themed_label(
+                bigger_text_style,
+                &params.localization.get("configure-match"),
+            );
+            ui.add_space(heading_text_style.size * 4.0);
+        });
+
+        let available_size = ui.available_size();
+        let menu_width = params.game.main_menu.menu_width;
+        let x_margin = (available_size.x - menu_width) / 2.0;
+        let outer_margin = egui::style::Margin::symmetric(x_margin, 0.0);
+
+        BorderedFrame::new(&params.game.ui_theme.panel.border)
+            .margin(outer_margin)
+            .padding(params.game.ui_theme.panel.padding.into())
+            .show(ui, |ui| {
+                ui.set_width(ui.available_width());
+
+                ui.add_space(normal_button_style.font.size);
+                ui.horizontal(|ui| {
+                    ui.themed_label(
+                        bigger_text_style,
+                        &format!("{}: ", params.localization.get("player-count")),
+                    );
+
+                    ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+                        ui.scope(|ui| {
+                            ui.set_enabled(
+                                params.state.player_count < MAX_PLAYERS as u8
+                                    && params.state.status.is_not_connected(),
+                            );
+                            if BorderedButton::themed(normal_button_style, "+")
+                                .focus_on_hover(false)
+                                .show(ui)
+                                .clicked()
+                            {
+                                params.state.player_count += 1;
+                            }
+                        });
+                        ui.themed_label(bigger_text_style, &params.state.player_count.to_string());
+                        ui.scope(|ui| {
+                            ui.set_enabled(
+                                params.state.player_count > 1
+                                    && params.state.status.is_not_connected(),
+                            );
+                            if BorderedButton::themed(normal_button_style, "-")
+                                .focus_on_hover(false)
+                                .show(ui)
+                                .clicked()
+                            {
+                                params.state.player_count -= 1;
+                            }
+                        });
+                    });
+                });
+
+                ui.add_space(normal_button_style.font.size);
+                ui.with_layout(egui::Layout::right_to_left(egui::Align::Min), |ui| {
+                    ui.scope(|ui| {
+                        ui.set_enabled(params.state.status.is_not_connected());
+                        if BorderedButton::themed(
+                            normal_button_style,
+                            &params.localization.get("search-for-match"),
+                        )
+                        .focus_on_hover(false)
+                        .show(ui)
+                        .clicked()
+                        {
+                            let matchmaking_server =
+                                Settings::get_stored_or_default(&params.game, &mut params.storage)
+                                    .matchmaking_server
+                                    .clone();
+
+                            let io_pool = IoTaskPool::get();
+                            let (status_sender, status_receiver) = async_channel::unbounded();
+                            let (cancel_sender, cancel_receiver) = async_channel::bounded(1);
+
+                            params.state.status_receiver = Some(status_receiver);
+                            params.state.cancel_sender = Some(cancel_sender);
+                            params.state.status = Status::Connecting;
+                            io_pool
+                                .spawn(start_matchmaking(
+                                    status_sender,
+                                    cancel_receiver,
+                                    params.state.player_count,
+                                    matchmaking_server,
+                                ))
+                                .detach();
+                        }
+                    });
+
+                    if BorderedButton::themed(
+                        normal_button_style,
+                        &params.localization.get("cancel"),
+                    )
+                    .focus_on_hover(false)
+                    .show(ui)
+                    .clicked()
+                        || menu_input.just_pressed(MenuAction::Back)
+                    {
+                        if let Some(sender) = &mut params.state.cancel_sender {
+                            sender.try_send(()).ok();
+                        }
+                        params.state.status_receiver = default();
+                        params.state.status = default();
+                        params.state.cancel_sender = default();
+                        *params.menu_page = MenuPage::Home;
+                    }
+                });
+
+                ui.add_space(normal_button_style.font.size * 2.0);
+
+                ui.vertical_centered(|ui| match &params.state.status {
+                    Status::NotConnected => (),
+                    Status::Connecting => {
+                        ui.themed_label(normal_text_style, &params.localization.get("connecting"));
+                    }
+                    Status::Connected => {
+                        ui.themed_label(normal_text_style, &params.localization.get("connected"));
+                    }
+                    Status::WaitingForPlayers { players } => {
+                        ui.themed_label(
+                            normal_text_style,
+                            &params.localization.get(&format!(
+                                "waiting-for-players?current={}&total={}",
+                                players, params.state.player_count
+                            )),
+                        );
+                    }
+                    Status::MatchReady(_, _) => {
+                        // We shouldn't get here because we check for a ready match above
+                    }
+                    Status::Errored(e) => {
+                        ui.themed_label(
+                            normal_text_style,
+                            &format!("{}: {e}", params.localization.get("error")),
+                        );
+                    }
+                })
+            });
+    }
+}
+
+async fn start_matchmaking(
+    sender: Sender<Status>,
+    cancel_receiver: Receiver<()>,
+    player_count: u8,
+    matchmaking_server: String,
+) {
+    if let Err(e) = impl_start_matchmaking(
+        sender.clone(),
+        cancel_receiver,
+        player_count,
+        matchmaking_server,
+    )
+    .await
+    {
+        sender.try_send(Status::Errored(e.to_string())).ok();
+        error!("Error while matchmaking: {e}");
+    }
+}
+
+/// Resolve a server address.
+///
+/// Note: This may block the thread
+fn resolve_addr_blocking(addr: &str) -> anyhow::Result<SocketAddr> {
+    let formatting_err =
+        || anyhow::format_err!("Matchmaking server must be in the format `host:port`");
+
+    let mut iter = addr.split(':');
+    let host = iter.next().ok_or_else(formatting_err)?;
+    let port = iter.next().ok_or_else(formatting_err)?;
+    let port: u16 = port.parse().context("Couldn't parse port number")?;
+    if iter.next().is_some() {
+        return Err(formatting_err());
+    }
+
+    let addr = (host, port)
+        .to_socket_addrs()
+        .context("Couldn't resolve matchmaker address")?
+        .find(|x| x.is_ipv4()) // For now, only support IpV4. I don't think IpV6 works right.
+        .ok_or_else(|| anyhow::format_err!("Couldn't resolve matchmaker address"))?;
+
+    Ok(addr)
+}
+
+async fn impl_start_matchmaking(
+    status: Sender<Status>,
+    cancel_receiver: Receiver<()>,
+    player_count: u8,
+    matchmaking_server: String,
+) -> anyhow::Result<()> {
+    let server_addr = blocking::unblock(move || resolve_addr_blocking(&matchmaking_server)).await?;
+
+    let (endpoint, conn) = crate::networking::client::open_connection(server_addr).await?;
+
+    let matchmake = async {
+        status.try_send(Status::Connected).ok();
+
+        let (mut send, recv) = conn.open_bi().await?;
+
+        let message = MatchmakerRequest::RequestMatch(MatchInfo { player_count });
+
+        let message = postcard::to_allocvec(&message)?;
+        send.write_all(&message).await?;
+        send.finish().await?;
+
+        let message = recv.read_to_end(256).await?;
+        let message: MatchmakerResponse = postcard::from_bytes(&message)?;
+
+        if let MatchmakerResponse::Accepted = message {
+            status
+                .try_send(Status::WaitingForPlayers { players: 1 })
+                .ok();
+        } else {
+            status
+                .try_send(Status::Errored("Unexpected response from server".into()))
+                .ok();
+            return Ok::<(), anyhow::Error>(());
+        }
+
+        loop {
+            let recv = conn.accept_uni().await?;
+            let message = recv.read_to_end(256).await?;
+            let message: MatchmakerResponse = postcard::from_bytes(&message)?;
+
+            match message {
+                MatchmakerResponse::PlayerCount(count) => {
+                    status
+                        .try_send(Status::WaitingForPlayers {
+                            players: count as usize,
+                        })
+                        .ok();
+                }
+                MatchmakerResponse::Success => {
+                    status
+                        .try_send(Status::MatchReady(endpoint, conn.clone()))
+                        .ok();
+                    break;
+                }
+                _ => panic!("Unexpected message from server"),
+            }
+        }
+
+        Ok(())
+    };
+
+    match future::or(
+        async move { either::Left(cancel_receiver.recv().await) },
+        async move { either::Right(matchmake.await) },
+    )
+    .await
+    {
+        either::Either::Left(_) => {
+            conn.close(0u8.into(), b"canceled");
+            Ok(())
+        }
+        either::Either::Right(result) => result,
+    }
+}
diff --git a/src/ui/main_menu/player_select.rs b/src/ui/main_menu/player_select.rs
new file mode 100644
index 0000000000..ccfc61ff93
--- /dev/null
+++ b/src/ui/main_menu/player_select.rs
@@ -0,0 +1,456 @@
+use crate::{
+    loading::PlayerInputCollector,
+    metadata::PlayerMeta,
+    networking::{
+        client::NetClient,
+        proto::{
+            match_setup::{MatchSetupFromClient, MatchSetupFromServer},
+            ClientMatchInfo,
+        },
+    },
+    player::input::PlayerAction,
+    player::{input::PlayerInputs, MAX_PLAYERS},
+};
+
+use super::*;
+
+#[derive(Default)]
+pub struct PlayerSelectState {
+    player_slots: [PlayerSlot; MAX_PLAYERS],
+}
+
+#[derive(Default)]
+struct PlayerSlot {
+    confirmed: bool,
+}
+
+#[derive(SystemParam)]
+pub struct PlayerSelectMenu<'w, 's> {
+    game: Res<'w, GameMeta>,
+    menu_page: ResMut<'w, MenuPage>,
+    menu_input: Query<'w, 's, &'static mut ActionState<MenuAction>>,
+    player_inputs: ResMut<'w, PlayerInputs>,
+    player_select_state: ResMut<'w, PlayerSelectState>,
+    keyboard_input: Res<'w, Input<KeyCode>>,
+    localization: Res<'w, Localization>,
+    client: Option<ResMut<'w, NetClient>>,
+    #[system_param(ignore)]
+    _phantom: PhantomData<&'s ()>,
+}
+
+impl<'w, 's> WidgetSystem for PlayerSelectMenu<'w, 's> {
+    type Args = ();
+    fn system(
+        world: &mut World,
+        state: &mut SystemState<Self>,
+        ui: &mut egui::Ui,
+        id: WidgetId,
+        _: (),
+    ) {
+        let mut params: PlayerSelectMenu = state.get_mut(world);
+        let is_online = params.client.is_some();
+
+        handle_match_setup_messages(&mut params);
+
+        // Whether or not the continue button should be enabled
+        let mut ready_players = 0;
+        let mut unconfirmed_players = 0;
+
+        for (i, slot) in params.player_select_state.player_slots.iter().enumerate() {
+            if slot.confirmed {
+                ready_players += 1;
+            } else if params.player_inputs.players[i].active {
+                unconfirmed_players += 1;
+            }
+        }
+        let may_continue =
+            ready_players >= 1 && unconfirmed_players == 0 && params.client.is_none();
+
+        ui.vertical_centered(|ui| {
+            let params: PlayerSelectMenu = state.get_mut(world);
+
+            let bigger_text_style = &params.game.ui_theme.font_styles.bigger;
+            let heading_text_style = &params.game.ui_theme.font_styles.heading;
+            let normal_button_style = &params.game.ui_theme.button_styles.normal;
+
+            ui.add_space(heading_text_style.size / 4.0);
+            if is_online {
+                ui.themed_label(heading_text_style, &params.localization.get("online-game"));
+            } else {
+                ui.themed_label(heading_text_style, &params.localization.get("local-game"));
+            }
+            ui.themed_label(
+                bigger_text_style,
+                &params.localization.get("player-select-title"),
+            );
+            ui.add_space(normal_button_style.font.size);
+
+            ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
+                let mut params: PlayerSelectMenu = state.get_mut(world);
+
+                let normal_button_style = &params.game.ui_theme.button_styles.normal;
+
+                ui.add_space(normal_button_style.font.size * 2.0);
+
+                ui.horizontal(|ui| {
+                    // Calculate button size and spacing
+                    let width = ui.available_width();
+                    let button_width = width / 3.0;
+                    let button_min_size = egui::vec2(button_width, 0.0);
+                    let button_spacing = (width - 2.0 * button_width) / 3.0;
+
+                    ui.add_space(button_spacing);
+
+                    // Back button
+                    let back_button = BorderedButton::themed(
+                        &params.game.ui_theme.button_styles.normal,
+                        &params.localization.get("back"),
+                    )
+                    .min_size(button_min_size)
+                    .show(ui)
+                    .focus_by_default(ui);
+
+                    // Go to menu when back button is clicked
+                    if back_button.clicked()
+                        || (params.menu_input.single().just_pressed(MenuAction::Back)
+                            && !params.player_inputs.players[0].active)
+                    {
+                        *params.menu_page = MenuPage::Home;
+                        if let Some(client) = params.client {
+                            client.close();
+                        }
+                        ui.ctx().clear_focus();
+                    }
+
+                    ui.add_space(button_spacing);
+
+                    // Continue button
+                    let continue_button = ui
+                        .scope(|ui| {
+                            ui.set_enabled(may_continue);
+
+                            BorderedButton::themed(
+                                &params.game.ui_theme.button_styles.normal,
+                                &params.localization.get("continue"),
+                            )
+                            .min_size(button_min_size)
+                            .show(ui)
+                        })
+                        .inner;
+
+                    if continue_button.clicked()
+                        || ((params.menu_input.single().just_pressed(MenuAction::Start)
+                            || params.keyboard_input.just_pressed(KeyCode::Return))
+                            && may_continue)
+                    {
+                        *params.menu_page = MenuPage::MapSelect { is_waiting: false };
+                    }
+                });
+
+                ui.add_space(normal_button_style.font.size);
+
+                ui.vertical_centered(|ui| {
+                    let params: PlayerSelectMenu = state.get_mut(world);
+
+                    let normal_button_style = &params.game.ui_theme.button_styles.normal;
+                    ui.set_width(ui.available_width() - normal_button_style.font.size * 2.0);
+
+                    ui.columns(MAX_PLAYERS, |columns| {
+                        for (i, ui) in columns.iter_mut().enumerate() {
+                            widget::<PlayerSelectPanel>(
+                                world,
+                                ui,
+                                id.with(&format!("player_panel{i}")),
+                                i,
+                            );
+                        }
+                    });
+                });
+            });
+        });
+    }
+}
+
+fn handle_match_setup_messages(params: &mut PlayerSelectMenu) {
+    if let Some(client) = &mut params.client {
+        while let Some(message) = client.recv_reliable::<MatchSetupFromServer>() {
+            match message {
+                MatchSetupFromServer::ClientMessage {
+                    player_idx,
+                    message,
+                } => match message {
+                    MatchSetupFromClient::SelectPlayer(player_handle) => {
+                        params.player_inputs.players[player_idx as usize].selected_player =
+                            player_handle;
+                    }
+                    MatchSetupFromClient::ConfirmSelection(confirmed) => {
+                        params.player_select_state.player_slots[player_idx as usize].confirmed =
+                            confirmed;
+                    }
+                    message => {
+                        warn!("Unexpected message in player select menu: {message:?}");
+                    }
+                },
+                MatchSetupFromServer::SelectMap => {
+                    *params.menu_page = MenuPage::MapSelect { is_waiting: false };
+                }
+                MatchSetupFromServer::WaitForMapSelect => {
+                    *params.menu_page = MenuPage::MapSelect { is_waiting: true };
+                }
+            }
+        }
+    }
+}
+
+#[derive(SystemParam)]
+struct PlayerSelectPanel<'w, 's> {
+    game: Res<'w, GameMeta>,
+    client_match_info: Option<Res<'w, ClientMatchInfo>>,
+    player_inputs: ResMut<'w, PlayerInputs>,
+    player_select_state: ResMut<'w, PlayerSelectState>,
+    players: Query<
+        'w,
+        's,
+        (
+            &'static PlayerInputCollector,
+            &'static ActionState<PlayerAction>,
+        ),
+    >,
+    player_meta_assets: Res<'w, Assets<PlayerMeta>>,
+    client: Option<Res<'w, NetClient>>,
+    localization: Res<'w, Localization>,
+    #[system_param(ignore)]
+    _phantom: PhantomData<&'s ()>,
+}
+
+impl<'w, 's> WidgetSystem for PlayerSelectPanel<'w, 's> {
+    type Args = usize;
+    fn system(
+        world: &mut World,
+        state: &mut SystemState<Self>,
+        ui: &mut egui::Ui,
+        _id: WidgetId,
+        idx: usize,
+    ) {
+        let mut params: PlayerSelectPanel = state.get_mut(world);
+        let dummy_actions = default();
+
+        let player_actions = if let Some(match_info) = &params.client_match_info {
+            if idx == match_info.player_idx {
+                params
+                    .players
+                    .iter()
+                    .find(|(player_idx, _)| player_idx.0 == 0)
+                    .unwrap()
+                    .1
+            } else {
+                &dummy_actions
+            }
+        } else {
+            params
+                .players
+                .iter()
+                .find(|(player_idx, _)| player_idx.0 == idx)
+                .unwrap()
+                .1
+        };
+
+        let player_input = &mut params.player_inputs.players[idx];
+        if !player_input.active && params.client.is_some() {
+            return;
+        }
+
+        let player_handle = &mut player_input.selected_player;
+
+        let slot = &mut params.player_select_state.player_slots[idx];
+
+        if player_actions.just_pressed(PlayerAction::Jump) {
+            if params.client.is_none() {
+                if player_input.active {
+                    slot.confirmed = true;
+                } else {
+                    player_input.active = true;
+                }
+            } else {
+                slot.confirmed = true;
+            }
+
+            if let Some(client) = params.client {
+                client.send_reliable(&MatchSetupFromClient::ConfirmSelection(slot.confirmed));
+            }
+        } else if player_actions.just_pressed(PlayerAction::Grab) {
+            if params.client.is_none() {
+                if slot.confirmed {
+                    slot.confirmed = false;
+                } else {
+                    player_input.active = false;
+                }
+            } else {
+                slot.confirmed = false;
+            }
+            if let Some(client) = params.client {
+                client.send_reliable(&MatchSetupFromClient::ConfirmSelection(slot.confirmed));
+            }
+        } else if player_actions.just_pressed(PlayerAction::Move) && !slot.confirmed {
+            let direction = player_actions
+                .clamped_axis_pair(PlayerAction::Move)
+                .unwrap();
+
+            let current_player_handle_idx = params
+                .game
+                .player_handles
+                .iter()
+                .enumerate()
+                .find(|(_, handle)| handle.inner == player_handle.inner)
+                .map(|(i, _)| i)
+                .unwrap_or(0);
+
+            if direction.x() > 0.0 {
+                *player_handle = params
+                    .game
+                    .player_handles
+                    .get(current_player_handle_idx + 1)
+                    .map(|x| x.clone_weak())
+                    .unwrap_or_else(|| params.game.player_handles[0].clone_weak());
+            } else if direction.x() <= 0.0 {
+                if current_player_handle_idx > 0 {
+                    *player_handle = params
+                        .game
+                        .player_handles
+                        .get(current_player_handle_idx - 1)
+                        .map(|x| x.clone_weak())
+                        .unwrap();
+                } else {
+                    *player_handle = params
+                        .game
+                        .player_handles
+                        .iter()
+                        .last()
+                        .unwrap()
+                        .clone_weak();
+                }
+            }
+
+            if let Some(client) = params.client {
+                client.send_reliable(&MatchSetupFromClient::SelectPlayer(
+                    player_handle.clone_weak(),
+                ));
+            }
+        }
+
+        BorderedFrame::new(&params.game.ui_theme.panel.border)
+            .padding(params.game.ui_theme.panel.padding.into())
+            .show(ui, |ui| {
+                ui.set_width(ui.available_width());
+                ui.set_height(ui.available_height());
+
+                let normal_font = &params.game.ui_theme.font_styles.normal;
+                let heading_font = &params.game.ui_theme.font_styles.heading;
+
+                // Marker for current player in online matches
+                if let Some(match_info) = params.client_match_info {
+                    if match_info.player_idx == idx {
+                        ui.vertical_centered(|ui| {
+                            ui.themed_label(normal_font, &params.localization.get("you-marker"));
+                        });
+                    } else {
+                        ui.add_space(normal_font.size);
+                    }
+                } else {
+                    ui.add_space(normal_font.size);
+                }
+
+                if player_input.active {
+                    ui.vertical_centered(|ui| {
+                        let player_meta =
+                            if let Some(meta) = params.player_meta_assets.get(player_handle) {
+                                meta
+                            } else {
+                                return;
+                            };
+
+                        ui.themed_label(normal_font, &params.localization.get("pick-a-fish"));
+
+                        ui.vertical_centered(|ui| {
+                            ui.set_height(heading_font.size * 1.5);
+
+                            if slot.confirmed {
+                                ui.themed_label(
+                                    &heading_font.colored(params.game.ui_theme.colors.positive),
+                                    &params.localization.get("player-select-ready"),
+                                );
+                            }
+                        });
+
+                        ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
+                            let name_with_arrows = format!("<  {}  >", player_meta.name);
+                            ui.themed_label(
+                                normal_font,
+                                if slot.confirmed {
+                                    &player_meta.name
+                                } else {
+                                    &name_with_arrows
+                                },
+                            );
+
+                            player_image(ui, player_meta);
+                        });
+                    });
+                } else {
+                    ui.vertical_centered(|ui| {
+                        ui.themed_label(
+                            normal_font,
+                            &params.localization.get("press-jump-to-join"),
+                        );
+                    });
+                }
+            });
+    }
+}
+
+fn player_image(ui: &mut egui::Ui, player_meta: &PlayerMeta) {
+    let time = ui.ctx().input().time;
+    let spritesheet = &player_meta.spritesheet;
+    let tile_size = spritesheet.tile_size.as_vec2();
+    let spritesheet_size =
+        tile_size * Vec2::new(spritesheet.columns as f32, spritesheet.rows as f32);
+    let sprite_aspect = tile_size.y / tile_size.x;
+    let width = ui.available_width();
+    let height = sprite_aspect * width;
+    let available_height = ui.available_height();
+    let y_offset = -(available_height - height) / 2.0;
+    let (rect, _) = ui.allocate_exact_size(egui::vec2(width, height), egui::Sense::hover());
+
+    let fps = spritesheet.animation_fps as f64;
+    let anim_clip = spritesheet
+        .animations
+        .get("idle")
+        .expect("Missing `idle` animation");
+    let frame_in_time_idx = (time * fps).round() as usize;
+    let frame_in_clip_idx = frame_in_time_idx % anim_clip.frames.len();
+    let frame_in_sheet_idx = anim_clip.frames.clone().nth(frame_in_clip_idx).unwrap();
+    let x_in_sheet_idx = frame_in_sheet_idx % spritesheet.columns;
+    let y_in_sheet_idx = frame_in_sheet_idx / spritesheet.columns;
+
+    let uv = egui::Rect::from_min_size(
+        egui::pos2(
+            x_in_sheet_idx as f32 * tile_size.x / spritesheet_size.x,
+            y_in_sheet_idx as f32 * tile_size.y / spritesheet_size.y,
+        ),
+        egui::vec2(
+            1.0 / spritesheet.columns as f32,
+            1.0 / spritesheet.rows as f32,
+        ),
+    );
+
+    let mut mesh = egui::Mesh {
+        texture_id: spritesheet.egui_texture_id,
+        ..default()
+    };
+
+    mesh.add_rect_with_uv(rect, uv, egui::Color32::WHITE);
+
+    mesh.translate(egui::vec2(0.0, y_offset));
+
+    ui.painter().add(mesh);
+}
diff --git a/src/ui/main_menu/settings.rs b/src/ui/main_menu/settings.rs
new file mode 100644
index 0000000000..9423082467
--- /dev/null
+++ b/src/ui/main_menu/settings.rs
@@ -0,0 +1,216 @@
+use bevy_inspector_egui::egui::style::Margin;
+use leafwing_input_manager::{axislike::SingleAxis, user_input::InputKind, Actionlike};
+
+use super::*;
+
+mod controls;
+mod networking;
+mod sound;
+
+/// Which settings tab we are on
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum SettingsTab {
+    Controls,
+    #[allow(unused)] // TODO: Just for now until we get sound settings setup
+    Sound,
+    Networking,
+}
+
+impl Default for SettingsTab {
+    fn default() -> Self {
+        Self::Controls
+    }
+}
+
+#[derive(Default, Deref, DerefMut)]
+pub struct ModifiedSettings(pub Option<Settings>);
+
+#[derive(SystemParam)]
+pub struct SettingsMenu<'w, 's> {
+    game: Res<'w, GameMeta>,
+    current_tab: ResMut<'w, SettingsTab>,
+    menu_page: ResMut<'w, MenuPage>,
+    modified_settings: ResMut<'w, ModifiedSettings>,
+    currently_binding_input_idx: Local<'s, Option<usize>>,
+    localization: Res<'w, Localization>,
+    adjacencies: ResMut<'w, WidgetAdjacencies>,
+    storage: ResMut<'w, Storage>,
+    control_inputs: controls::ControlInputBindingEvents<'w, 's>,
+    menu_input: Query<'w, 's, &'static mut ActionState<MenuAction>>,
+    #[system_param(ignore)]
+    _phantom: PhantomData<(&'w (), &'s ())>,
+}
+
+impl<'w, 's> WidgetSystem for SettingsMenu<'w, 's> {
+    type Args = ();
+
+    fn system(
+        world: &mut World,
+        state: &mut SystemState<Self>,
+        ui: &mut egui::Ui,
+        _id: WidgetId,
+        _args: Self::Args,
+    ) {
+        let mut params: SettingsMenu = state.get_mut(world);
+
+        let screen_rect = ui.max_rect();
+
+        // Calculate a margin
+        let outer_margin = screen_rect.size() * 0.10;
+        let outer_margin = Margin {
+            left: outer_margin.x,
+            right: outer_margin.x,
+            // Make top and bottom margins smaller
+            top: outer_margin.y / 1.5,
+            bottom: outer_margin.y / 1.5,
+        };
+
+        BorderedFrame::new(&params.game.ui_theme.panel.border)
+            .margin(outer_margin)
+            .padding(params.game.ui_theme.panel.padding.into())
+            .show(ui, |ui| {
+                // Disable all the buttons if we are currently binding an input
+                ui.set_enabled(params.currently_binding_input_idx.is_none());
+
+                ui.vertical_centered(|ui| {
+                    // Settings Heading
+                    ui.themed_label(
+                        &params.game.ui_theme.font_styles.heading,
+                        &params.localization.get("settings"),
+                    );
+
+                    // Add tab list at the top of the panel
+                    let mut tabs = Vec::new();
+                    ui.horizontal(|ui| {
+                        for (i, (tab, name)) in SettingsTab::TABS.iter().enumerate() {
+                            let name = &params.localization.get(*name);
+                            let mut name = egui::RichText::new(name);
+
+                            // Underline the current tab
+                            if tab == &*params.current_tab {
+                                name = name.underline();
+                            }
+
+                            let mut button = BorderedButton::themed(
+                                &params.game.ui_theme.button_styles.normal,
+                                name,
+                            )
+                            .show(ui);
+
+                            // Focus the first tab by default
+                            if i == 0 {
+                                button = button.focus_by_default(ui);
+                            }
+
+                            // Change tab when clicked
+                            if button.clicked() {
+                                *params.current_tab = *tab;
+                            }
+
+                            tabs.push(button);
+                        }
+                    });
+
+                    // Add buttons to the bottom
+                    ui.with_layout(egui::Layout::bottom_up(egui::Align::Center), |ui| {
+                        // Collect button responses so we can add them to adjacency map later
+                        let bottom_buttons = ui
+                            .horizontal(|ui| {
+                                // Calculate button size and spacing
+                                let width = ui.available_width();
+                                let button_width = width / 4.0;
+                                let button_min_size = egui::vec2(button_width, 0.0);
+                                let button_spacing = (width - 3.0 * button_width) / 4.0;
+
+                                ui.add_space(button_spacing);
+
+                                // Cancel button
+                                let cancel_button = BorderedButton::themed(
+                                    &params.game.ui_theme.button_styles.normal,
+                                    &params.localization.get("cancel"),
+                                )
+                                .min_size(button_min_size)
+                                .show(ui);
+
+                                // Go to menu when cancel is clicked
+                                if cancel_button.clicked()
+                                    || params.menu_input.single().just_pressed(MenuAction::Back)
+                                {
+                                    *params.menu_page = MenuPage::Home;
+                                    ui.ctx().clear_focus();
+                                }
+
+                                ui.add_space(button_spacing);
+
+                                // Reset button
+                                let reset_button = BorderedButton::themed(
+                                    &params.game.ui_theme.button_styles.normal,
+                                    &params.localization.get("reset"),
+                                )
+                                .min_size(button_min_size)
+                                .show(ui);
+
+                                ui.add_space(button_spacing);
+
+                                // Save button
+                                let save_button = BorderedButton::themed(
+                                    &params.game.ui_theme.button_styles.normal,
+                                    &params.localization.get("save"),
+                                )
+                                .min_size(button_min_size)
+                                .show(ui);
+
+                                // Save new settings if settings button clicked
+                                if save_button.clicked() {
+                                    // Update in-memory settings
+                                    params.storage.set(
+                                        Settings::STORAGE_KEY,
+                                        params.modified_settings.0.as_ref().unwrap(),
+                                    );
+                                    // Persist to storage
+                                    params.storage.save();
+
+                                    // Go to main menu
+                                    *params.menu_page = MenuPage::Home;
+                                    ui.ctx().clear_focus();
+                                }
+
+                                [cancel_button, reset_button, save_button]
+                            })
+                            .inner;
+
+                        // Set the last bottom button's adjacency to be to the "left" of the first tab. This way
+                        // you can wrap around from the bottom right button to the top left.
+                        params
+                            .adjacencies
+                            .widget(&bottom_buttons[bottom_buttons.len() - 1])
+                            .to_left_of(&tabs[0]);
+
+                        ui.vertical(|ui| {
+                            // Render selected tab
+                            match *params.current_tab {
+                                SettingsTab::Controls => {
+                                    controls::controls_settings_ui(
+                                        &mut params,
+                                        ui,
+                                        // Reset button clicked
+                                        bottom_buttons[1].clicked(),
+                                        &tabs,
+                                        &bottom_buttons,
+                                    )
+                                }
+                                SettingsTab::Networking => networking::networking_settings_ui(
+                                    &mut params,
+                                    ui,
+                                    bottom_buttons[1].clicked(),
+                                    &tabs,
+                                    &bottom_buttons,
+                                ),
+                                SettingsTab::Sound => sound::sound_settings_ui(ui, &params.game),
+                            }
+                        });
+                    });
+                });
+            });
+    }
+}
diff --git a/src/ui/main_menu/settings/controls.rs b/src/ui/main_menu/settings/controls.rs
new file mode 100644
index 0000000000..379e5fbf6d
--- /dev/null
+++ b/src/ui/main_menu/settings/controls.rs
@@ -0,0 +1,401 @@
+use super::*;
+
+// Render the control input grid
+pub fn controls_settings_ui(
+    params: &mut SettingsMenu,
+    ui: &mut egui::Ui,
+    should_reset: bool,
+    settings_tabs: &[egui::Response],
+    bottom_buttons: &[egui::Response],
+) {
+    use egui_extras::Size;
+
+    let ui_theme = &params.game.ui_theme;
+
+    // Reset the settings when reset button is clicked
+    if should_reset {
+        params.modified_settings.0.as_mut().unwrap().player_controls =
+            params.game.default_settings.player_controls.clone();
+    }
+
+    // Get the font meta for the table headings and labels
+    let bigger_font = &ui_theme
+        .font_styles
+        .bigger
+        .colored(ui_theme.panel.font_color);
+    let label_font = &ui_theme
+        .font_styles
+        .normal
+        .colored(ui_theme.panel.font_color);
+
+    ui.add_space(bigger_font.size * 0.1);
+
+    // Calculate the row height so that it can fit the input buttons
+    let small_button_style = &ui_theme.button_styles.small;
+    let row_height = small_button_style.font.size
+        + small_button_style.padding.top
+        + small_button_style.padding.bottom;
+
+    // Mutably borrow the player controlls settings
+    let controls = &mut params.modified_settings.0.as_mut().unwrap().player_controls;
+
+    // Build the table rows of control bindings as an array of mutable InputKind's
+    let mut input_rows = [
+        (
+            &params.localization.get("move-up"),
+            [
+                &mut controls.keyboard1.movement.up,
+                &mut controls.keyboard2.movement.up,
+                &mut controls.gamepad.movement.up,
+            ],
+        ),
+        (
+            &params.localization.get("move-down"),
+            [
+                &mut controls.keyboard1.movement.down,
+                &mut controls.keyboard2.movement.down,
+                &mut controls.gamepad.movement.down,
+            ],
+        ),
+        (
+            &params.localization.get("move-left"),
+            [
+                &mut controls.keyboard1.movement.left,
+                &mut controls.keyboard2.movement.left,
+                &mut controls.gamepad.movement.left,
+            ],
+        ),
+        (
+            &params.localization.get("move-right"),
+            [
+                &mut controls.keyboard1.movement.right,
+                &mut controls.keyboard2.movement.right,
+                &mut controls.gamepad.movement.right,
+            ],
+        ),
+        (
+            &params.localization.get("jump"),
+            [
+                &mut controls.keyboard1.jump,
+                &mut controls.keyboard2.jump,
+                &mut controls.gamepad.jump,
+            ],
+        ),
+        (
+            &params.localization.get("grab-drop"),
+            [
+                &mut controls.keyboard1.grab,
+                &mut controls.keyboard2.grab,
+                &mut controls.gamepad.grab,
+            ],
+        ),
+        (
+            &params.localization.get("shoot"),
+            [
+                &mut controls.keyboard1.shoot,
+                &mut controls.keyboard2.shoot,
+                &mut controls.gamepad.shoot,
+            ],
+        ),
+        (
+            &params.localization.get("slide"),
+            [
+                &mut controls.keyboard1.slide,
+                &mut controls.keyboard2.slide,
+                &mut controls.gamepad.slide,
+            ],
+        ),
+    ];
+
+    // Collect input button responses for building adjacency graph
+    let mut input_buttons = Vec::new();
+
+    // Create input table
+    egui_extras::TableBuilder::new(ui)
+        .cell_layout(egui::Layout::centered_and_justified(
+            egui::Direction::LeftToRight,
+        ))
+        .column(Size::exact(label_font.size * 7.0))
+        .column(Size::remainder())
+        .column(Size::remainder())
+        .column(Size::remainder())
+        .header(bigger_font.size * 1.5, |mut row| {
+            row.col(|ui| {
+                ui.themed_label(bigger_font, &params.localization.get("action"));
+            });
+            row.col(|ui| {
+                ui.themed_label(bigger_font, &params.localization.get("keyboard-1"));
+            });
+            row.col(|ui| {
+                ui.themed_label(bigger_font, &params.localization.get("keyboard-2"));
+            });
+            row.col(|ui| {
+                ui.themed_label(bigger_font, &params.localization.get("gamepad"));
+            });
+        })
+        .body(|mut body| {
+            // Keep track of the input button index we are on
+            let mut input_idx = 0;
+
+            // Loop through the input rows
+            for (title, inputs) in &mut input_rows {
+                body.row(row_height, |mut row| {
+                    // Add row label
+                    row.col(|ui| {
+                        ui.themed_label(label_font, title);
+                    });
+
+                    // Add buttons for each kind of input
+                    for (button_idx, input) in inputs.iter_mut().enumerate() {
+                        // The last button is a gamepad binding, the others are keyboard
+                        let binding_kind = if button_idx == 2 {
+                            BindingKind::Gamepad
+                        } else {
+                            BindingKind::Keyboard
+                        };
+
+                        // Render the button
+                        row.col(|ui| {
+                            let button = BorderedButton::themed(
+                                &ui_theme.button_styles.small,
+                                format_input(input),
+                            )
+                            .show(ui);
+
+                            // Start an input binding if the button is clicked
+                            if button.clicked() {
+                                *params.currently_binding_input_idx = Some(input_idx);
+                            }
+
+                            // If we are binding an input for this button
+                            if *params.currently_binding_input_idx == Some(input_idx) {
+                                // Render the binding window
+                                egui::Window::new("input_binding_overlay")
+                                    .auto_sized()
+                                    .collapsible(false)
+                                    .anchor(egui::Align2::CENTER_CENTER, egui::Vec2::ZERO)
+                                    .frame(egui::Frame::none())
+                                    .title_bar(false)
+                                    .show(ui.ctx(), |ui| {
+                                        let font = params
+                                            .game
+                                            .ui_theme
+                                            .font_styles
+                                            .normal
+                                            .colored(params.game.ui_theme.panel.font_color);
+
+                                        let border = &params.game.ui_theme.panel.border;
+                                        let m = &border.border_size;
+                                        let s = border.scale;
+                                        BorderedFrame::new(border)
+                                            // Just enough padding to fit the frame's border image
+                                            .padding(Margin {
+                                                left: m.left * s,
+                                                right: m.right * s,
+                                                top: m.top * s,
+                                                bottom: m.bottom * s,
+                                            })
+                                            .show(ui, |ui| {
+                                                ui.themed_label(
+                                                    &font,
+                                                    &params.localization.get("bind-input"),
+                                                );
+
+                                                // See if there has been any inputs of the kind we
+                                                // are binding.
+                                                let get_input =
+                                                    params.control_inputs.get_event(binding_kind);
+
+                                                // If there has been an input
+                                                if let Ok(Some(input_kind)) = get_input {
+                                                    // Stop listening for inputs
+                                                    *params.currently_binding_input_idx = None;
+
+                                                    // Reset the focus on the input button
+                                                    button.request_focus();
+
+                                                    // Set the input for this button to the pressed
+                                                    // input
+                                                    **input = input_kind;
+
+                                                // If the user cancelled the input binding
+                                                } else if get_input.is_err() {
+                                                    // Set the focus back on the button
+                                                    button.request_focus();
+                                                    // And stop listening for inputs
+                                                    *params.currently_binding_input_idx = None;
+                                                }
+
+                                                // Make sure we don't double-trigger any menu
+                                                // actions while on this menu by consuming all menu
+                                                // actions.
+                                                let mut menu_input = params.menu_input.single_mut();
+                                                for action in MenuAction::variants() {
+                                                    menu_input.consume(action);
+                                                }
+                                            });
+                                    });
+                            }
+
+                            // Add input button to the list
+                            input_buttons.push(button);
+                        });
+
+                        // Increment the input button index
+                        input_idx += 1;
+                    }
+                });
+            }
+        });
+
+    // Set adjacency for all of the gamepad input buttons
+    for row_idx in 0..input_rows.len() {
+        if row_idx == 0 {
+            // Reverse button order here so that the first input button gets priority when
+            // navigating down from the tabs.
+            for i in (0..3).rev() {
+                let button = &input_buttons[row_idx * 3 + i];
+
+                // The top row of buttons is below the settings tabs
+                for tab in settings_tabs {
+                    params.adjacencies.widget(tab).above(button);
+                }
+
+                // The last tab is considered to the left of the first button
+                if i == 0 {
+                    params
+                        .adjacencies
+                        .widget(button)
+                        .to_right_of(&settings_tabs[settings_tabs.len() - 1]);
+                }
+            }
+
+        // If this is the last row, the input buttons are above the bottom buttons
+        } else if row_idx == input_rows.len() - 1 {
+            for i in 0..3 {
+                let button_above = &input_buttons[(row_idx - 1) * 3 + i];
+                let button = &input_buttons[row_idx * 3 + i];
+
+                params
+                    .adjacencies
+                    .widget(button)
+                    .above(&bottom_buttons[i])
+                    .below(button_above);
+
+                // The first bottom button is to the right of the last input button
+                if i == 2 {
+                    params
+                        .adjacencies
+                        .widget(button)
+                        .to_left_of(&bottom_buttons[0]);
+                }
+            }
+
+        // If this is a middle row, set the input buttons to be below the ones in the row above
+        } else {
+            for i in 0..3 {
+                let button_above = &input_buttons[(row_idx - 1) * 3 + i];
+                let button = &input_buttons[row_idx * 3 + i];
+
+                params.adjacencies.widget(button).below(button_above);
+            }
+        }
+    }
+}
+
+/// Format an InputKind as a user-facing string
+fn format_input(input: &InputKind) -> String {
+    match input {
+        InputKind::SingleAxis(axis) => {
+            // If we set the positive low to 1.0, then that means we don't trigger on positive
+            // movement, and it must be a negative movement binding.
+            let direction = if axis.positive_low == 1.0 { "-" } else { "+" };
+
+            let stick = match axis.axis_type {
+                leafwing_input_manager::axislike::AxisType::Gamepad(axis) => {
+                    format!("{:?}", axis)
+                }
+                other => format!("{:?}", other),
+            };
+
+            format!("{} {}", stick, direction)
+        }
+        other => other.to_string(),
+    }
+}
+
+/// Helper system param to get input events that we are interested in for input binding.
+#[derive(SystemParam)]
+pub struct ControlInputBindingEvents<'w, 's> {
+    keys: Res<'w, Input<KeyCode>>,
+    gamepad_buttons: Res<'w, Input<GamepadButton>>,
+    gamepad_events: EventReader<'w, 's, GamepadEvent>,
+}
+
+/// The kind of input binding to listen for.
+enum BindingKind {
+    Keyboard,
+    Gamepad,
+}
+
+impl<'w, 's> ControlInputBindingEvents<'w, 's> {
+    // Get the next event, if any
+    fn get_event(&mut self, binding_kind: BindingKind) -> Result<Option<InputKind>, ()> {
+        if self.keys.just_pressed(KeyCode::Escape) {
+            return Err(());
+        }
+
+        Ok(match binding_kind {
+            // If we are looking for keyboard inputs
+            BindingKind::Keyboard => {
+                // Just return the first pressed button we find
+                if let Some(&key_code) = self.keys.get_just_pressed().next() {
+                    Some(key_code.into())
+                } else {
+                    None
+                }
+            }
+            // If we are looking for gamepad events
+            BindingKind::Gamepad => {
+                // Return the first pressed button we find, if any
+                if let Some(&button) = self.gamepad_buttons.get_just_pressed().next() {
+                    Some(button.button_type.into())
+
+                // If we can't find a button pressed
+                } else {
+                    // Look for axes tilted more than 0.5 in either direction.
+                    for gamepad_event in self.gamepad_events.iter() {
+                        if let GamepadEventType::AxisChanged(axis, value) = gamepad_event.event_type
+                        {
+                            // Create an axis positive movement binding
+                            if value > 0.5 {
+                                return Ok(Some(
+                                    SingleAxis {
+                                        axis_type: axis.into(),
+                                        positive_low: 0.1,
+                                        negative_low: -1.0,
+                                        value: None,
+                                    }
+                                    .into(),
+                                ));
+                            // Create an axis negative movement binding
+                            } else if value < -0.5 {
+                                return Ok(Some(
+                                    SingleAxis {
+                                        axis_type: axis.into(),
+                                        positive_low: 1.0,
+                                        negative_low: -0.1,
+                                        value: None,
+                                    }
+                                    .into(),
+                                ));
+                            }
+                        }
+                    }
+
+                    None
+                }
+            }
+        })
+    }
+}
diff --git a/src/ui/main_menu/settings/networking.rs b/src/ui/main_menu/settings/networking.rs
new file mode 100644
index 0000000000..f3fcfa1017
--- /dev/null
+++ b/src/ui/main_menu/settings/networking.rs
@@ -0,0 +1,57 @@
+use super::*;
+
+pub fn networking_settings_ui(
+    params: &mut SettingsMenu,
+    ui: &mut egui::Ui,
+    should_reset: bool,
+    settings_tabs: &[egui::Response],
+    bottom_buttons: &[egui::Response],
+) {
+    let settings = params.modified_settings.0.as_mut().unwrap();
+
+    let bigger_font = &params.game.ui_theme.font_styles.bigger;
+    let normal_font = &params.game.ui_theme.font_styles.normal;
+
+    ui.add_space(bigger_font.size);
+
+    ui.horizontal(|ui| {
+        ui.add_space(bigger_font.size * 2.0);
+        ui.themed_label(
+            bigger_font,
+            &format!("{}:", params.localization.get("matchmaking-server")),
+        );
+
+        if should_reset {
+            settings.matchmaking_server = params.game.default_settings.matchmaking_server.clone();
+        }
+
+        let text_box = &ui.add(
+            egui::TextEdit::singleline(&mut settings.matchmaking_server).font(normal_font.clone()),
+        );
+        let first_bottom_button = bottom_buttons.iter().next().unwrap();
+        let last_bottom_button = bottom_buttons.iter().last().unwrap();
+        let first_top_tab = settings_tabs.iter().next().unwrap();
+        let last_top_tab = settings_tabs.iter().last().unwrap();
+        params.adjacencies.text_boxes.insert(text_box.id);
+
+        params
+            .adjacencies
+            .widget(text_box)
+            .to_right_of(last_top_tab);
+        for tab in settings_tabs {
+            params.adjacencies.widget(text_box).below(tab);
+            params.adjacencies.widget(tab).below(first_bottom_button);
+        }
+        for button in bottom_buttons {
+            params.adjacencies.widget(button).below(text_box);
+        }
+        params
+            .adjacencies
+            .widget(text_box)
+            .above(first_bottom_button);
+        params
+            .adjacencies
+            .widget(last_bottom_button)
+            .to_left_of(first_top_tab);
+    });
+}
diff --git a/src/ui/main_menu/settings/sound.rs b/src/ui/main_menu/settings/sound.rs
new file mode 100644
index 0000000000..2c2ca66c2c
--- /dev/null
+++ b/src/ui/main_menu/settings/sound.rs
@@ -0,0 +1,7 @@
+use super::*;
+
+/// Render the sound settings UI
+pub fn sound_settings_ui(_ui: &mut egui::Ui, _game: &GameMeta) {
+    // This is un-reachable right now
+    todo!("Implement sound settings UI");
+}
diff --git a/src/ui/pause_menu.rs b/src/ui/pause_menu.rs
new file mode 100644
index 0000000000..2e825fcd27
--- /dev/null
+++ b/src/ui/pause_menu.rs
@@ -0,0 +1,159 @@
+use bevy_egui::*;
+use bevy_fluent::Localization;
+
+use crate::{
+    localization::LocalizationExt,
+    metadata::{GameMeta, MapMeta},
+    networking::client::NetClient,
+    prelude::*,
+    ui::input::MenuAction,
+    utils::ResetManager,
+    GameState,
+};
+
+use super::widgets::{
+    bordered_button::BorderedButton, bordered_frame::BorderedFrame, EguiContextExt, EguiUiExt,
+};
+
+pub struct PausePlugin;
+
+impl Plugin for PausePlugin {
+    fn build(&self, app: &mut App) {
+        app.add_system(
+            unpause_system
+                .run_in_state(GameState::InGame)
+                .run_in_state(InGameState::Paused),
+        )
+        .add_system(
+            pause_system
+                .run_in_state(GameState::InGame)
+                .run_in_state(InGameState::Playing),
+        )
+        .add_system(
+            pause_menu
+                .run_in_state(GameState::InGame)
+                .run_in_state(InGameState::Paused),
+        );
+    }
+}
+
+/// Transition game to pause state
+fn pause_system(mut commands: Commands, input: Query<&ActionState<MenuAction>>) {
+    let input = input.single();
+    if input.just_pressed(MenuAction::Pause) {
+        commands.insert_resource(NextState(InGameState::Paused));
+    }
+}
+
+// Transition game out of paused state
+fn unpause_system(mut commands: Commands, input: Query<&ActionState<MenuAction>>) {
+    let input = input.single();
+    if input.just_pressed(MenuAction::Pause) {
+        commands.insert_resource(NextState(InGameState::Playing));
+    }
+}
+
+pub fn pause_menu(
+    mut commands: Commands,
+    mut egui_context: ResMut<EguiContext>,
+    game: Res<GameMeta>,
+    localization: Res<Localization>,
+    map_handle: Query<&AssetHandle<MapMeta>>,
+    mut reset_controller: ResetManager,
+    client: Option<Res<NetClient>>,
+) {
+    let is_online = client.is_some();
+    let ui_theme = &game.ui_theme;
+
+    egui::CentralPanel::default()
+        .frame(egui::Frame::none())
+        .show(egui_context.ctx_mut(), |ui| {
+            let screen_rect = ui.max_rect();
+
+            let pause_menu_width = game.main_menu.menu_width;
+            let x_margin = (screen_rect.width() - pause_menu_width) / 2.0;
+            let outer_margin = egui::style::Margin::symmetric(x_margin, screen_rect.height() * 0.2);
+
+            BorderedFrame::new(&ui_theme.panel.border)
+                .margin(outer_margin)
+                .padding(ui_theme.panel.padding.into())
+                .show(ui, |ui| {
+                    ui.set_min_width(ui.available_width());
+
+                    let heading_font = ui_theme
+                        .font_styles
+                        .heading
+                        .colored(ui_theme.panel.font_color);
+
+                    ui.vertical_centered(|ui| {
+                        ui.themed_label(&heading_font, &localization.get("paused"));
+
+                        ui.add_space(10.0);
+
+                        let width = ui.available_width();
+
+                        let continue_button = BorderedButton::themed(
+                            &ui_theme.button_styles.normal,
+                            &localization.get("continue"),
+                        )
+                        .min_size(egui::vec2(width, 0.0))
+                        .show(ui);
+
+                        // Focus continue button by default
+                        if ui.memory().focus().is_none() {
+                            continue_button.request_focus();
+                        }
+
+                        if continue_button.clicked() {
+                            commands.insert_resource(NextState(InGameState::Playing));
+                        }
+
+                        ui.scope(|ui| {
+                            ui.set_enabled(!is_online);
+                            if BorderedButton::themed(
+                                &ui_theme.button_styles.normal,
+                                &localization.get("restart"),
+                            )
+                            .min_size(egui::vec2(width, 0.0))
+                            .show(ui)
+                            .clicked()
+                            {
+                                commands.insert_resource(NextState(InGameState::Playing));
+                                let map_handle = map_handle.get_single().ok().cloned();
+                                reset_controller.reset_world();
+
+                                if let Some(handle) = map_handle {
+                                    commands.spawn().insert(handle);
+                                }
+                            }
+                        });
+
+                        ui.scope(|ui| {
+                            if BorderedButton::themed(
+                                &ui_theme.button_styles.normal,
+                                &localization.get("edit"),
+                            )
+                            .min_size(egui::vec2(width, 0.0))
+                            .show(ui)
+                            .clicked()
+                            {
+                                commands.insert_resource(NextState(InGameState::Editing));
+                            }
+                        });
+
+                        if BorderedButton::themed(
+                            &ui_theme.button_styles.normal,
+                            &localization.get("main-menu"),
+                        )
+                        .min_size(egui::vec2(width, 0.0))
+                        .show(ui)
+                        .clicked()
+                        {
+                            // Show the main menu
+                            commands.insert_resource(NextState(GameState::MainMenu));
+                            ui.ctx().clear_focus();
+                        }
+                    });
+                })
+        });
+}
diff --git a/src/ui/widgets.rs b/src/ui/widgets.rs
new file mode 100644
index 0000000000..2ee24c0bef
--- /dev/null
+++ b/src/ui/widgets.rs
@@ -0,0 +1,51 @@
+use bevy_egui::egui;
+
+use crate::metadata::FontMeta;
+
+pub mod bordered_button;
+pub mod bordered_frame;
+
+/// Extensions on [`egui::Ui`] for custom widgets
+pub trait EguiUiExt {
+    fn themed_label(self, font_meta: &FontMeta, label: &str) -> egui::Response;
+}
+
+impl EguiUiExt for &mut egui::Ui {
+    fn themed_label(self, font_meta: &FontMeta, label: &str) -> egui::Response {
+        self.add(egui::Label::new(
+            egui::RichText::new(label)
+                .color(font_meta.color)
+                .font(font_meta.font_id()),
+        ))
+    }
+}
+
+/// Extension trait with helpers for the egui context
+pub trait EguiContextExt {
+    /// Clear the UI focus
+    fn clear_focus(self);
+}
+
+impl EguiContextExt for &egui::Context {
+    fn clear_focus(self) {
+        self.memory().request_focus(egui::Id::null());
+    }
+}
+
+/// Extension trait with helpers for egui responses
+pub trait EguiResponseExt {
+    /// Set this response to focused if nothing else is focused
+    fn focus_by_default(self, ui: &mut egui::Ui) -> egui::Response;
+}
+
+impl EguiResponseExt for egui::Response {
+    fn focus_by_default(self, ui: &mut egui::Ui) -> egui::Response {
+        if ui.ctx().memory().focus().is_none() {
+            ui.ctx().memory().request_focus(self.id);
+
+            self
+        } else {
+            self
+        }
+    }
+}
diff --git a/src/ui/widgets/bordered_button.rs b/src/ui/widgets/bordered_button.rs
new file mode 100644
index 0000000000..bb268ca2bd
--- /dev/null
+++ b/src/ui/widgets/bordered_button.rs
@@ -0,0 +1,212 @@
+#![allow(dead_code)] // We haven't used all of these methods yet but we still want them there
+
+/// Bordered button rendering
+///
+/// Adapted from <https://docs.rs/egui/0.18.1/src/egui/widgets/button.rs.html>
+use bevy_egui::egui::{self, *};
+
+use crate::metadata::{BorderImageMeta, ButtonThemeMeta};
+
+use super::bordered_frame::BorderedFrame;
+
+/// A button rendered with a [`BorderImageMeta`]
+pub struct BorderedButton<'a> {
+    text: WidgetText,
+    wrap: Option<bool>,
+    sense: Sense,
+    min_size: Vec2,
+    focus_on_hover: bool,
+    default_border: Option<&'a BorderImageMeta>,
+    on_focus_border: Option<&'a BorderImageMeta>,
+    on_click_border: Option<&'a BorderImageMeta>,
+    margin: egui::style::Margin,
+    padding: egui::style::Margin,
+}
+
+impl<'a> BorderedButton<'a> {
+    // Create a new button
+    #[must_use = "You must call .show() to render the button"]
+    pub fn new(text: impl Into<WidgetText>) -> Self {
+        Self {
+            text: text.into(),
+            sense: Sense::click(),
+            min_size: Vec2::ZERO,
+            focus_on_hover: true,
+            wrap: None,
+            default_border: None,
+            on_focus_border: None,
+            on_click_border: None,
+            margin: Default::default(),
+            padding: Default::default(),
+        }
+    }
+
+    #[must_use = "You must call .show() to render the button"]
+    pub fn themed(
+        button_theme: &'a ButtonThemeMeta,
+        label: impl Into<RichText>,
+    ) -> BorderedButton<'a> {
+        BorderedButton::new(
+            label
+                .into()
+                .font(button_theme.font.font_id())
+                .color(button_theme.font.color),
+        )
+        .border(&button_theme.borders.default)
+        .on_click_border(button_theme.borders.clicked.as_ref())
+        .on_focus_border(button_theme.borders.focused.as_ref())
+        .padding(button_theme.padding.into())
+    }
+
+    /// Set whether or not the button focuses itself automatically when it is hovered over.
+    pub fn focus_on_hover(mut self, focus_on_hover: bool) -> Self {
+        self.focus_on_hover = focus_on_hover;
+        self
+    }
+
+    /// If `true`, the text will wrap to stay within the max width of the [`Ui`].
+    ///
+    /// By default [`Self::wrap`] will be true in vertical layouts
+    /// and horizontal layouts with wrapping,
+    /// and false on non-wrapping horizontal layouts.
+    ///
+    /// Note that any `\n` in the text will always produce a new line.
+    #[inline]
+    #[must_use = "You must call .show() to render the button"]
+    pub fn wrap(mut self, wrap: bool) -> Self {
+        self.wrap = Some(wrap);
+        self
+    }
+
+    /// Set the margin. This will be applied on the outside of the border.
+    #[must_use = "You must call .show() to render the button"]
+    pub fn margin(mut self, margin: egui::style::Margin) -> Self {
+        self.margin = margin;
+
+        self
+    }
+
+    /// Set the padding. This will be applied on the inside of the border.
+    #[must_use = "You must call .show() to render the button"]
+    pub fn padding(mut self, padding: egui::style::Margin) -> Self {
+        self.padding = padding;
+
+        self
+    }
+
+    /// Set the button border image
+    #[must_use = "You must call .show() to render the button"]
+    pub fn border(mut self, border: &'a BorderImageMeta) -> Self {
+        self.default_border = Some(border);
+        self
+    }
+
+    /// Set a different border to use when focusing / hovering over the button
+    #[must_use = "You must call .show() to render the button"]
+    pub fn on_focus_border(mut self, border: Option<&'a BorderImageMeta>) -> Self {
+        self.on_focus_border = border;
+        self
+    }
+
+    /// Set a different border to use when the mouse is clicking on the button
+    #[must_use = "You must call .show() to render the button"]
+    pub fn on_click_border(mut self, border: Option<&'a BorderImageMeta>) -> Self {
+        self.on_click_border = border;
+        self
+    }
+
+    /// By default, buttons senses clicks.
+    /// Change this to a drag-button with `Sense::drag()`.
+    #[must_use = "You must call .show() to render the button"]
+    pub fn sense(mut self, sense: Sense) -> Self {
+        self.sense = sense;
+        self
+    }
+
+    /// Set the minimum size for the button
+    #[must_use = "You must call .show() to render the button"]
+    pub fn min_size(mut self, min_size: Vec2) -> Self {
+        self.min_size = min_size;
+        self
+    }
+
+    /// Render the button
+    #[must_use = "You must call .show() to render the button"]
+    pub fn show(self, ui: &mut Ui) -> egui::Response {
+        self.ui(ui)
+    }
+}
+
+impl<'a> Widget for BorderedButton<'a> {
+    fn ui(self, ui: &mut Ui) -> Response {
+        let BorderedButton {
+            text,
+            sense,
+            min_size,
+            focus_on_hover,
+            wrap,
+            default_border,
+            on_focus_border,
+            on_click_border,
+            margin,
+            padding,
+        }: BorderedButton = self;
+
+        let total_extra = padding.sum() + margin.sum();
+
+        let wrap_width = ui.available_width() - total_extra.x;
+        let text = text.into_galley(ui, wrap, wrap_width, TextStyle::Button);
+
+        let mut desired_size = text.size() + total_extra;
+        desired_size = desired_size.at_least(min_size);
+
+        let (rect, response) = ui.allocate_at_least(desired_size, sense);
+        response.widget_info(|| WidgetInfo::labeled(WidgetType::Button, text.text()));
+
+        // Focus the button automatically when it is hovered and the mouse is moving
+        if response.hovered()
+            && ui.ctx().input().pointer.velocity().length_sq() > 0.0
+            && focus_on_hover
+        {
+            response.request_focus();
+        }
+
+        if ui.is_rect_visible(rect) {
+            let visuals = ui.style().interact(&response);
+
+            let mut text_rect = rect;
+            text_rect.min += padding.left_top() + margin.left_top();
+            text_rect.max -= padding.right_bottom() + margin.right_bottom();
+            text_rect.max.x = text_rect.max.x.max(text_rect.min.x);
+            text_rect.max.y = text_rect.max.y.max(text_rect.min.y);
+
+            let label_pos = ui
+                .layout()
+                .align_size_within_rect(text.size(), text_rect)
+                .min;
+
+            let border = if response.is_pointer_button_down_on() {
+                on_click_border.or(default_border)
+            } else if response.has_focus() || response.hovered() {
+                on_focus_border.or(default_border)
+            } else {
+                default_border
+            };
+
+            let mut border_rect = rect;
+            border_rect.min += margin.left_top();
+            border_rect.max -= margin.right_bottom();
+            border_rect.max.x = border_rect.max.x.max(border_rect.min.x);
+            border_rect.max.y = border_rect.max.y.max(border_rect.min.y);
+
+            if let Some(border) = border {
+                ui.painter()
+                    .add(BorderedFrame::new(border).paint(border_rect));
+            }
+
+            text.paint_with_visuals(ui.painter(), label_pos, visuals);
+        }
+
+        response
+    }
+}
diff --git a/src/ui/widgets/bordered_frame.rs b/src/ui/widgets/bordered_frame.rs
new file mode 100644
index 0000000000..523a9eed55
--- /dev/null
+++ b/src/ui/widgets/bordered_frame.rs
@@ -0,0 +1,274 @@
+use bevy_egui::egui;
+
+use crate::metadata::BorderImageMeta;
+
+/// A 9-patch style bordered frame.
+pub struct BorderedFrame {
+    bg_texture: egui::TextureId,
+    border_scale: f32,
+    texture_size: egui::Vec2,
+    texture_border_size: egui::style::Margin,
+    padding: egui::style::Margin,
+    margin: egui::style::Margin,
+    border_only: bool,
+}
+
+impl BorderedFrame {
+    /// Create a new frame with the given [`BorderImageMeta`]
+    #[must_use = "You must call .show() to render the frame"]
+    pub fn new(border_image: &BorderImageMeta) -> Self {
+        let s = border_image.image_size;
+        Self {
+            bg_texture: border_image.egui_texture,
+            border_scale: border_image.scale,
+            texture_size: egui::Vec2::new(s.x as f32, s.y as f32),
+            texture_border_size: border_image.border_size.into(),
+            padding: Default::default(),
+            margin: Default::default(),
+            border_only: false,
+        }
+    }
+
+    /// Set the padding. This will be applied on the inside of the border.
+    #[must_use = "You must call .show() to render the frame"]
+    pub fn padding(mut self, margin: egui::style::Margin) -> Self {
+        self.padding = margin;
+
+        self
+    }
+
+    /// Set the margin. This will be applied on the outside of the border.
+    #[must_use = "You must call .show() to render the frame"]
+    pub fn margin(mut self, margin: egui::style::Margin) -> Self {
+        self.margin = margin;
+
+        self
+    }
+
+    #[allow(unused)] // We just haven't needed this method yet
+    #[must_use = "You must call .show() to render the frame"]
+    pub fn border_scale(mut self, scale: f32) -> Self {
+        self.border_scale = scale;
+
+        self
+    }
+
+    #[allow(unused)] // We just haven't needed this method yet
+    /// If border_only is set to `true`, then the middle section of the frame will be transparent,
+    /// only the border will be rendered.
+    #[must_use = "You must call .show() to render the frame"]
+    pub fn border_only(mut self, border_only: bool) -> Self {
+        self.border_only = border_only;
+
+        self
+    }
+
+    /// Render the frame
+    pub fn show<R>(
+        self,
+        ui: &mut egui::Ui,
+        add_contents: impl FnOnce(&mut egui::Ui) -> R,
+    ) -> egui::InnerResponse<R> {
+        self.show_dyn(ui, Box::new(add_contents))
+    }
+
+    fn show_dyn<'c, R>(
+        self,
+        ui: &mut egui::Ui,
+        add_contents: Box<dyn FnOnce(&mut egui::Ui) -> R + 'c>,
+    ) -> egui::InnerResponse<R> {
+        let mut prepared = self.begin(ui);
+        let ret = add_contents(&mut prepared.content_ui);
+        let response = prepared.end(ui);
+
+        egui::InnerResponse {
+            inner: ret,
+            response,
+        }
+    }
+
+    fn begin(self, ui: &mut egui::Ui) -> BorderedFramePrepared {
+        let background_shape_idx = ui.painter().add(egui::Shape::Noop);
+
+        let mut content_rect = ui.available_rect_before_wrap();
+        content_rect.min += self.padding.left_top() + self.margin.left_top();
+        content_rect.max -= self.padding.right_bottom() + self.margin.right_bottom();
+
+        // Avoid negative size
+        content_rect.max.x = content_rect.max.x.max(content_rect.min.x);
+        content_rect.max.y = content_rect.max.y.max(content_rect.min.y);
+
+        let content_ui = ui.child_ui(content_rect, *ui.layout());
+
+        BorderedFramePrepared {
+            frame: self,
+            background_shape_idx,
+            content_ui,
+        }
+    }
+
+    pub fn paint(&self, paint_rect: egui::Rect) -> egui::Shape {
+        use egui::{Pos2, Rect, Vec2};
+        let white = egui::Color32::WHITE;
+
+        let mut mesh = egui::Mesh {
+            texture_id: self.bg_texture,
+            ..Default::default()
+        };
+
+        let s = self.texture_size;
+        let b = self.texture_border_size;
+        let pr = paint_rect;
+        // UV border
+        let buv = egui::style::Margin {
+            left: b.left / s.x,
+            right: b.right / s.x,
+            top: b.top / s.y,
+            bottom: b.bottom / s.y,
+        };
+        let b = egui::style::Margin {
+            left: b.left * self.border_scale,
+            right: b.right * self.border_scale,
+            top: b.top * self.border_scale,
+            bottom: b.bottom * self.border_scale,
+        };
+
+        // Build the 9-patches
+
+        // Top left
+        mesh.add_rect_with_uv(
+            Rect::from_min_size(pr.min, Vec2::new(b.left, b.top)),
+            egui::Rect::from_min_size(Pos2::ZERO, Vec2::new(buv.left, buv.top)),
+            white,
+        );
+        // Top center
+        mesh.add_rect_with_uv(
+            Rect::from_min_size(
+                pr.min + Vec2::new(b.left, 0.0),
+                Vec2::new(pr.width() - b.left - b.right, b.top),
+            ),
+            egui::Rect::from_min_size(
+                Pos2::new(buv.left, 0.0),
+                Vec2::new(1.0 - buv.left - buv.right, buv.top),
+            ),
+            white,
+        );
+        // Top right
+        mesh.add_rect_with_uv(
+            Rect::from_min_size(
+                pr.right_top() - Vec2::new(b.right, 0.0),
+                Vec2::new(b.right, b.top),
+            ),
+            egui::Rect::from_min_size(
+                Pos2::new(1.0 - buv.right, 0.0),
+                Vec2::new(buv.right, buv.top),
+            ),
+            white,
+        );
+        // Middle left
+        mesh.add_rect_with_uv(
+            Rect::from_min_size(
+                pr.min + Vec2::new(0.0, b.top),
+                Vec2::new(b.left, pr.height() - b.top - b.bottom),
+            ),
+            egui::Rect::from_min_size(
+                Pos2::new(0.0, buv.top),
+                Vec2::new(buv.left, 1.0 - buv.top - buv.bottom),
+            ),
+            white,
+        );
+        // Middle center
+        if !self.border_only {
+            mesh.add_rect_with_uv(
+                Rect::from_min_size(
+                    pr.min + Vec2::new(b.left, b.top),
+                    Vec2::new(
+                        pr.width() - b.left - b.right,
+                        pr.height() - b.top - b.bottom,
+                    ),
+                ),
+                egui::Rect::from_min_size(
+                    Pos2::new(buv.left, buv.top),
+                    Vec2::new(1.0 - buv.left - buv.top, 1.0 - buv.top - buv.bottom),
+                ),
+                white,
+            );
+        }
+        // Middle right
+        mesh.add_rect_with_uv(
+            Rect::from_min_size(
+                pr.min + Vec2::new(pr.width() - b.right, b.top),
+                Vec2::new(b.right, pr.height() - b.top - b.bottom),
+            ),
+            egui::Rect::from_min_size(
+                Pos2::new(1.0 - buv.right, buv.top),
+                Vec2::new(buv.right, 1.0 - buv.top - buv.bottom),
+            ),
+            white,
+        );
+        // Bottom left
+        mesh.add_rect_with_uv(
+            Rect::from_min_size(
+                pr.min + Vec2::new(0.0, pr.height() - b.bottom),
+                Vec2::new(b.left, b.bottom),
+            ),
+            egui::Rect::from_min_size(
+                Pos2::new(0.0, 1.0 - buv.bottom),
+                Vec2::new(buv.left, buv.bottom),
+            ),
+            white,
+        );
+        // Bottom center
+        mesh.add_rect_with_uv(
+            Rect::from_min_size(
+                pr.min + Vec2::new(b.left, pr.height() - b.bottom),
+                Vec2::new(pr.width() - b.left - b.right, b.bottom),
+            ),
+            egui::Rect::from_min_size(
+                Pos2::new(buv.left, 1.0 - buv.bottom),
+                Vec2::new(1.0 - buv.left - buv.right, buv.bottom),
+            ),
+            white,
+        );
+        // Bottom right
+        mesh.add_rect_with_uv(
+            Rect::from_min_size(
+                pr.min + Vec2::new(pr.width() - b.right, pr.height() - b.bottom),
+                Vec2::new(b.right, b.bottom),
+            ),
+            egui::Rect::from_min_size(
+                Pos2::new(1.0 - buv.right, 1.0 - buv.bottom),
+                Vec2::new(buv.right, buv.bottom),
+            ),
+            white,
+        );
+
+        egui::Shape::Mesh(mesh)
+    }
+}
+
+/// Internal helper struct for rendering the [`BorderedFrame`]
+struct BorderedFramePrepared {
+    frame: BorderedFrame,
+    background_shape_idx: egui::layers::ShapeIdx,
+    content_ui: egui::Ui,
+}
+
+impl BorderedFramePrepared {
+    fn end(self, ui: &mut egui::Ui) -> egui::Response {
+        use egui::Vec2;
+
+        let min_rect = self.content_ui.min_rect();
+        let m = self.frame.padding;
+        let paint_rect = egui::Rect {
+            min: min_rect.min - Vec2::new(m.left, m.top),
+            max: min_rect.max + Vec2::new(m.right, m.bottom),
+        };
+        if ui.is_rect_visible(paint_rect) {
+            let shape = self.frame.paint(paint_rect);
+            ui.painter().set(self.background_shape_idx, shape);
+        }
+
+        ui.allocate_rect(paint_rect, egui::Sense::hover())
+    }
+}
diff --git a/src/utils.rs b/src/utils.rs
new file mode 100644
index 0000000000..2f803d3b97
--- /dev/null
+++ b/src/utils.rs
@@ -0,0 +1,64 @@
+use bevy::ecs::system::SystemParam;
+
+use crate::{loading::PlayerInputCollector, prelude::*, ui::input::MenuAction};
+
+pub mod event;
+
+/// Cache a string using [`wasm_bindgen::intern`] when running on web platforms.
+///
+/// [`wasm_bindgen::intern`]: https://docs.rs/wasm-bindgen/latest/wasm_bindgen/fn.intern.html
+#[allow(unused)]
+#[inline]
+pub fn cache_str(s: &str) {
+    #[cfg(target_arch = "wasm32")]
+    wasm_bindgen::intern(s);
+}
+
+/// System parameter that can be used to reset the game world.
+///
+/// Currently this just means de-spawning all of the entities other than the camera and resetting
+/// the camera position, but in the future this process might be more involved so we centralize the
+/// logic here so it can be re-used.
+#[derive(SystemParam)]
+pub struct ResetManager<'w, 's> {
+    commands: Commands<'w, 's>,
+    camera: Query<
+        'w,
+        's,
+        (
+            &'static mut Camera,
+            &'static mut Transform,
+            &'static mut OrthographicProjection,
+        ),
+        With<Camera>,
+    >,
+    entities_to_despawn: Query<
+        'w,
+        's,
+        Entity,
+        (
+            Without<Camera>,
+            Without<PlayerInputCollector>,
+            Without<ActionState<MenuAction>>,
+        ),
+    >,
+}
+
+impl<'w, 's> ResetManager<'w, 's> {
+    /// Clean up the game world, despawning all the gameplay entities, but leaving necessary
+    /// entities like camera.
+    pub fn reset_world(&mut self) {
+        // Clean up all entities other than the camera and the player entities
+        for entity in self.entities_to_despawn.iter() {
+            self.commands.entity(entity).despawn_recursive();
+        }
+
+        // Reset camera position
+        if let Some((mut camera, mut transform, mut projection)) = self.camera.iter_mut().next() {
+            camera.viewport = default();
+            transform.translation.x = 0.0;
+            transform.translation.y = 0.0;
+            projection.scale = 1.0;
+        }
+    }
+}
diff --git a/src/utils/ease.rs b/src/utils/ease.rs
deleted file mode 100644
index 6506cbf876..0000000000
--- a/src/utils/ease.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use std::f32::consts::PI;
-
-/// Simple easing calculator
-pub struct Ease {
-    pub ease_in: bool,
-    pub ease_out: bool,
-    pub function: EaseFunction,
-    pub progress: f32,
-}
-
-pub enum EaseFunction {
-    Quadratic,
-    Cubic,
-    Sinusoidial,
-}
-
-impl Default for Ease {
-    fn default() -> Self {
-        Self {
-            ease_in: true,
-            ease_out: true,
-            function: EaseFunction::Quadratic,
-            progress: 0.0,
-        }
-    }
-}
-
-impl Ease {
-    pub fn output(&self) -> f32 {
-        let mut k = self.progress;
-
-        // Reference for easing functions:
-        // https://echarts.apache.org/examples/en/editor.html?c=line-easing&lang=ts
-        //
-        // TODO: Add tests to make sure easings are correct
-        match (&self.function, self.ease_in, self.ease_out) {
-            (EaseFunction::Quadratic, true, true) => {
-                k *= 2.0;
-                if k < 1.0 {
-                    0.5 * k * k
-                } else {
-                    k -= 1.0;
-                    -0.5 * (k * (k - 2.0) - 1.0)
-                }
-            }
-            (EaseFunction::Quadratic, true, false) => k * k,
-            (EaseFunction::Quadratic, false, true) => k * (2.0 - k),
-            (EaseFunction::Cubic, true, true) => {
-                k *= 2.0;
-                if k < 1.0 {
-                    0.5 * k * k * k
-                } else {
-                    k -= 2.0;
-                    0.5 * (k * k * k + 2.0)
-                }
-            }
-            (EaseFunction::Cubic, true, false) => k * k * k,
-            (EaseFunction::Cubic, false, true) => {
-                k -= 1.0;
-                k * k * k + 1.0
-            }
-            (EaseFunction::Sinusoidial, true, true) => 0.5 * (1.0 - f32::cos(PI * k)),
-            (EaseFunction::Sinusoidial, true, false) => 1.0 - f32::cos((k * PI) / 2.0),
-            (EaseFunction::Sinusoidial, false, true) => f32::sin((k * PI) / 2.0),
-            (_, false, false) => k,
-        }
-    }
-}
diff --git a/src/utils/event.rs b/src/utils/event.rs
new file mode 100644
index 0000000000..e623e63142
--- /dev/null
+++ b/src/utils/event.rs
@@ -0,0 +1,16 @@
+use bevy::ecs::event::Event;
+
+use crate::prelude::*;
+
+pub trait FixedUpdateEventAppExt {
+    fn add_fixed_update_event<E: Event>(&mut self) -> &mut Self;
+}
+
+impl FixedUpdateEventAppExt for bevy::app::App {
+    fn add_fixed_update_event<E: Event>(&mut self) -> &mut Self {
+        self.init_resource::<Events<E>>()
+            .add_system_to_stage(FixedUpdateStage::First, Events::<E>::update_system);
+
+        self
+    }
+}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
deleted file mode 100644
index e5224f4c09..0000000000
--- a/src/utils/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod ease;
-pub mod timer;
diff --git a/src/utils/timer.rs b/src/utils/timer.rs
deleted file mode 100644
index e021649bfc..0000000000
--- a/src/utils/timer.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-/// A simple timer utility
-#[derive(Debug, Clone, Copy)]
-pub struct Timer {
-    duration: f32,
-    elapsed: f32,
-}
-
-impl Timer {
-    /// Create a new timer with the provider duration
-    pub fn new(duration: f32) -> Self {
-        Timer {
-            duration,
-            elapsed: f32::default(),
-        }
-    }
-
-    /// Get the duration of the timer
-    pub fn duration(&self) -> f32 {
-        self.duration
-    }
-
-    /// Get the time that has been elapsed
-    pub fn elapsed(&self) -> f32 {
-        self.elapsed
-    }
-
-    /// Return the percentage completion of the timer as a number between 0 and 1
-    pub fn progress(&self) -> f32 {
-        self.elapsed / self.duration
-    }
-
-    /// Get whether or not the timer has finished
-    pub fn has_finished(&self) -> bool {
-        self.elapsed > self.duration
-    }
-
-    /// Reset the time elapsed
-    pub fn reset(&mut self) {
-        self.elapsed = 0.0;
-    }
-
-    /// Advanced the elapsed time by the macroquad frame time
-    pub fn tick_frame_time(&mut self) {
-        self.elapsed += macroquad::time::get_frame_time();
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_timer() {
-        let mut t = Timer::new(3.0);
-
-        assert_eq!(t.duration(), 3.0);
-
-        t.elapsed += 0.5;
-        assert_eq!(t.elapsed(), 0.5);
-        assert_eq!(t.has_finished(), false);
-
-        t.elapsed += 2.0;
-        assert_eq!(t.elapsed(), 2.5);
-        assert_eq!(t.has_finished(), false);
-
-        t.elapsed += 1.0;
-        assert_eq!(t.elapsed(), 3.5);
-        assert_eq!(t.has_finished(), true);
-
-        t.reset();
-        assert_eq!(t.duration(), 3.0);
-        assert_eq!(t.elapsed(), 0.0);
-    }
-}
diff --git a/src/workarounds.rs b/src/workarounds.rs
new file mode 100644
index 0000000000..945b54d7df
--- /dev/null
+++ b/src/workarounds.rs
@@ -0,0 +1,32 @@
+//! This module contains temporary workarounds that should be removed once proper solutions can be
+//! put in place.
+
+use bevy::render::camera::CameraUpdateSystem;
+
+use crate::{config::ENGINE_CONFIG, prelude::*};
+
+pub struct WorkaroundsPlugin;
+
+impl Plugin for WorkaroundsPlugin {
+    fn build(&self, app: &mut App) {
+        if !ENGINE_CONFIG.server_mode {
+            app.add_system_to_stage(
+                CoreStage::PostUpdate,
+                update_camera_projection_when_camera_changes.before(CameraUpdateSystem),
+            );
+        }
+    }
+}
+
+/// Workaround for bevy not updating camera projection when viewport changes:
+/// <https://github.com/bevyengine/bevy/issues/5944>
+fn update_camera_projection_when_camera_changes(
+    mut changed_cameras: Query<&mut OrthographicProjection, Changed<Camera>>,
+) {
+    // For every changed camera
+    for mut projection in &mut changed_cameras {
+        // Force a change to the projection in order to trigger a re-building of the camera
+        // projection for the new viewport.
+        projection.set_changed();
+    }
+}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000..8bf559a1b0
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+        "rootDir": "./assets",
+        "target": "es6",
+        "lib": [
+            "es2016"
+        ]
+    },
+    "include": [
+        "./assets/**/*",
+        "./lib.bevy.d.ts",
+        "./lib.bevy.types.ts",
+        "./lib.jumpy.d.ts"
+    ],
+}
\ No newline at end of file
diff --git a/wasm_resources/index.html b/wasm_resources/index.html
new file mode 100644
index 0000000000..8691d92b62
--- /dev/null
+++ b/wasm_resources/index.html
@@ -0,0 +1,138 @@
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <style>
+      body {
+        margin: 0;
+        height: 100vh;
+        background-color: black;
+        user-select: none;
+      }
+      canvas {
+        background-color: black;
+      }
+    </style>
+    <!-- Nifty spinner from: https://github.com/loadingio/css-spinner/blob/088aefa790d015e9c7df664d426374952e65124a/dist/dual-ring.html#L1 -->
+    <style type="text/css">
+      .lds-dual-ring {
+        width: 80px;
+        height: 80px;
+      }
+      .lds-dual-ring:after {
+        content: " ";
+        display: block;
+        width: 64px;
+        height: 64px;
+        border-radius: 50%;
+        border: 6px solid #fff;
+        border-color: #fff transparent #fff transparent;
+        animation: lds-dual-ring 1.2s linear infinite;
+      }
+      @keyframes lds-dual-ring {
+        0% {
+          transform: rotate(0deg);
+        }
+        100% {
+          transform: rotate(360deg);
+        }
+      }
+      .loading-container {
+        z-index: -1;
+        display: flex;
+        flex-direction: column;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        color: white;
+      }
+
+      .loading-container > div {
+        margin: auto;
+        display: flex;
+        flex-direction: column;
+        color: white;
+        align-items: center;
+      }
+
+      .loading-text {
+        font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+        margin-top: 2em;
+        font-size: 1.2em;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="loading-container">
+      <div>
+        <div class="lds-dual-ring"></div>
+        <div class="loading-text">Loading game...</div>
+      </div>
+    </div>
+    <script>
+      // Insert hack to make sound autoplay on Chrome as soon as the user interacts with the tab:
+      // https://developers.google.com/web/updates/2018/11/web-audio-autoplay#moving-forward
+      (function () {
+        // An array of all contexts to resume on the page
+        const audioContextList = [];
+
+        // An array of various user interaction events we should listen for
+        const userInputEventNames = [
+          "click",
+          "contextmenu",
+          "auxclick",
+          "dblclick",
+          "mousedown",
+          "mouseup",
+          "pointerup",
+          "touchend",
+          "keydown",
+          "keyup",
+        ];
+
+        // A proxy object to intercept AudioContexts and
+        // add them to the array for tracking and resuming later
+        self.AudioContext = new Proxy(self.AudioContext, {
+          construct(target, args) {
+            const result = new target(...args);
+            audioContextList.push(result);
+            return result;
+          },
+        });
+
+        // To resume all AudioContexts being tracked
+        function resumeAllContexts(event) {
+          let count = 0;
+
+          audioContextList.forEach((context) => {
+            if (context.state !== "running") {
+              context.resume();
+            } else {
+              count++;
+            }
+          });
+
+          // If all the AudioContexts have now resumed then we
+          // unbind all the event listeners from the page to prevent
+          // unnecessary resume attempts
+          if (count && count == audioContextList.length) {
+            userInputEventNames.forEach((eventName) => {
+              document.removeEventListener(eventName, resumeAllContexts);
+            });
+          }
+        }
+
+        // We bind the resume function for each user interaction
+        // event on the page
+        userInputEventNames.forEach((eventName) => {
+          document.addEventListener(eventName, resumeAllContexts);
+        });
+      })();
+    </script>
+    <script type="module">
+      import init from "./jumpy.js";
+      init();
+    </script>
+  </body>
+</html>
\ No newline at end of file