diff --git a/Cargo.lock b/Cargo.lock
index 3a40664..dd52fe4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,6 +54,28 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "alsa"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18"
+dependencies = [
+ "alsa-sys",
+ "bitflags",
+ "libc",
+ "nix",
+]
+
+[[package]]
+name = "alsa-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "android_log-sys"
 version = "0.1.2"
@@ -73,7 +95,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cbd542dd180566fad88fd2729a53a62a734843c626638006a9d63ec0688484e"
 dependencies = [
  "android_log-sys 0.1.2",
- "env_logger",
+ "env_logger 0.7.1",
  "lazy_static",
  "log",
 ]
@@ -84,7 +106,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 dependencies = [
- "winapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -120,7 +142,7 @@ version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c69a8137596e84c22d57f3da1b5de1d4230b1742a710091c85f4d7ce50f00f38"
 dependencies = [
- "libloading",
+ "libloading 0.6.7",
 ]
 
 [[package]]
@@ -154,12 +176,29 @@ version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
+[[package]]
+name = "base-x"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
+
 [[package]]
 name = "base64"
 version = "0.10.1"
@@ -223,7 +262,7 @@ dependencies = [
  "crossbeam-channel",
  "downcast-rs",
  "js-sys",
- "ndk-glue",
+ "ndk-glue 0.2.1",
  "notify",
  "parking_lot",
  "rand",
@@ -235,6 +274,22 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "bevy_audio"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ca3cf9ce76696665e37a68b27ad6f6b0e2d0d85ccad36d8f018d3006812dbde"
+dependencies = [
+ "anyhow",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_ecs",
+ "bevy_reflect",
+ "bevy_utils",
+ "parking_lot",
+ "rodio",
+]
+
 [[package]]
 name = "bevy_core"
 version = "0.5.0"
@@ -277,6 +332,16 @@ dependencies = [
  "parking_lot",
 ]
 
+[[package]]
+name = "bevy_dynamic_plugin"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3219befe938ee89dd8b2b78a02cfd835ef93fa930113a91631b093381005ed"
+dependencies = [
+ "bevy_app",
+ "libloading 0.7.0",
+]
+
 [[package]]
 name = "bevy_ecs"
 version = "0.5.0"
@@ -310,6 +375,51 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "bevy_ecs_tilemap"
+version = "0.2.0"
+source = "git+https://github.com/StarArawn/bevy_ecs_tilemap?rev=50ec3c12c68079cf0d624e4dcade349351c3ae6c#50ec3c12c68079cf0d624e4dcade349351c3ae6c"
+dependencies = [
+ "bevy",
+ "dyn-clone",
+ "log",
+]
+
+[[package]]
+name = "bevy_gilrs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b28a12e991a63fe044605aacf806b8dcdc5aa3af2d4482ba6cb9a1b74fc9392"
+dependencies = [
+ "bevy_app",
+ "bevy_ecs",
+ "bevy_input",
+ "bevy_utils",
+ "gilrs",
+]
+
+[[package]]
+name = "bevy_gltf"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9233bfb7e2cf053b51f01d2e57ea5a549438c0e5f08735d595b6a6504d00639e"
+dependencies = [
+ "anyhow",
+ "base64 0.13.0",
+ "bevy_app",
+ "bevy_asset",
+ "bevy_core",
+ "bevy_ecs",
+ "bevy_math",
+ "bevy_pbr",
+ "bevy_reflect",
+ "bevy_render",
+ "bevy_scene",
+ "bevy_transform",
+ "gltf",
+ "thiserror",
+]
+
 [[package]]
 name = "bevy_input"
 version = "0.5.0"
@@ -330,10 +440,14 @@ checksum = "53c568981b2911567cba7f6dae7190bac295ffd411bca777edb1b5152b1ccd62"
 dependencies = [
  "bevy_app",
  "bevy_asset",
+ "bevy_audio",
  "bevy_core",
  "bevy_derive",
  "bevy_diagnostic",
+ "bevy_dynamic_plugin",
  "bevy_ecs",
+ "bevy_gilrs",
+ "bevy_gltf",
  "bevy_input",
  "bevy_log",
  "bevy_math",
@@ -350,7 +464,7 @@ dependencies = [
  "bevy_wgpu",
  "bevy_window",
  "bevy_winit",
- "ndk-glue",
+ "ndk-glue 0.2.1",
 ]
 
 [[package]]
@@ -544,6 +658,9 @@ version = "0.2.4"
 dependencies = [
  "anyhow",
  "bevy",
+ "bevy_ecs_tilemap",
+ "env_logger 0.8.3",
+ "log",
  "tiled",
 ]
 
@@ -653,6 +770,25 @@ dependencies = [
  "winit",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"
+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.2"
@@ -698,6 +834,12 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
+[[package]]
+name = "bytes"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
+
 [[package]]
 name = "cache-padded"
 version = "1.1.1"
@@ -713,6 +855,21 @@ 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.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
+dependencies = [
+ "nom",
+]
+
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -740,7 +897,18 @@ dependencies = [
  "libc",
  "num-integer",
  "num-traits",
- "winapi",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading 0.7.0",
 ]
 
 [[package]]
@@ -789,6 +957,16 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "combine"
+version = "4.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
 [[package]]
 name = "concurrent-queue"
 version = "1.2.2"
@@ -814,6 +992,16 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536"
 
+[[package]]
+name = "core-foundation"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
+dependencies = [
+ "core-foundation-sys 0.6.2",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.7.0"
@@ -834,6 +1022,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.7.0"
@@ -896,6 +1090,50 @@ dependencies = [
  "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.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa"
+dependencies = [
+ "bindgen",
+]
+
+[[package]]
+name = "cpal"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25"
+dependencies = [
+ "alsa",
+ "core-foundation-sys 0.6.2",
+ "coreaudio-rs",
+ "jni",
+ "js-sys",
+ "lazy_static",
+ "libc",
+ "mach 0.3.2",
+ "ndk 0.3.0",
+ "ndk-glue 0.3.0",
+ "nix",
+ "oboe",
+ "parking_lot",
+ "stdweb 0.1.3",
+ "thiserror",
+ "web-sys",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.2.1"
@@ -933,8 +1171,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a60cceb22c7c53035f8980524fdc7f17cf49681a3c154e6757d30afbec6ec4"
 dependencies = [
  "bitflags",
- "libloading",
- "winapi",
+ "libloading 0.6.7",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -993,6 +1231,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -1005,6 +1249,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
+
 [[package]]
 name = "env_logger"
 version = "0.7.1"
@@ -1015,6 +1265,19 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "erased-serde"
 version = "0.3.13"
@@ -1057,7 +1320,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "redox_syscall",
- "winapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1121,6 +1384,22 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+dependencies = [
+ "bitflags",
+ "fuchsia-zircon-sys",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+
 [[package]]
 name = "futures-core"
 version = "0.3.13"
@@ -1191,7 +1470,7 @@ dependencies = [
  "bitflags",
  "gfx-auxil",
  "gfx-hal",
- "libloading",
+ "libloading 0.6.7",
  "log",
  "parking_lot",
  "range-alloc",
@@ -1199,7 +1478,7 @@ dependencies = [
  "smallvec",
  "spirv_cross",
  "thunderdome",
- "winapi",
+ "winapi 0.3.9",
  "wio",
 ]
 
@@ -1221,7 +1500,7 @@ dependencies = [
  "raw-window-handle",
  "smallvec",
  "spirv_cross",
- "winapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1248,7 +1527,7 @@ dependencies = [
  "glow",
  "js-sys",
  "khronos-egl",
- "libloading",
+ "libloading 0.6.7",
  "log",
  "naga",
  "parking_lot",
@@ -1301,7 +1580,7 @@ dependencies = [
  "parking_lot",
  "raw-window-handle",
  "smallvec",
- "winapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1316,6 +1595,38 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "gilrs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e986f911d937f4395dfc2a39618dcef452773d32dcdbe0828c623f76588f749"
+dependencies = [
+ "fnv",
+ "gilrs-core",
+ "log",
+ "uuid",
+ "vec_map",
+]
+
+[[package]]
+name = "gilrs-core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a5e5bb97bf9a0d9519a28cf38839cf1d6d9bb572b48e3c67202271fec2ed5e7"
+dependencies = [
+ "core-foundation 0.6.4",
+ "io-kit-sys",
+ "libc",
+ "libudev-sys",
+ "log",
+ "nix",
+ "rusty-xinput",
+ "stdweb 0.4.20",
+ "uuid",
+ "vec_map",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "glam"
 version = "0.13.0"
@@ -1325,6 +1636,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+
 [[package]]
 name = "glow"
 version = "0.7.2"
@@ -1337,6 +1654,41 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gltf"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6fb0d1d772daf10ea74528c3aeb12215f6d5b820adf2ecfc93a6578d6779c3c"
+dependencies = [
+ "byteorder",
+ "gltf-json",
+ "lazy_static",
+]
+
+[[package]]
+name = "gltf-derive"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6636de7bf52227363554f1ca2d9cd180fc666129ddd0933097e1f227dfa7293"
+dependencies = [
+ "inflections",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "gltf-json"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3fc3deb81e6fa04bf808f6be7c3983229552a95b77f687ad96af00f6d3e7d6c"
+dependencies = [
+ "gltf-derive",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
 [[package]]
 name = "glyph_brush_layout"
 version = "0.2.1"
@@ -1433,6 +1785,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1452,6 +1810,7 @@ dependencies = [
  "num-rational",
  "num-traits",
  "png",
+ "scoped_threadpool",
 ]
 
 [[package]]
@@ -1464,6 +1823,12 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "inflections"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
+
 [[package]]
 name = "inotify"
 version = "0.9.2"
@@ -1502,12 +1867,45 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "io-kit-sys"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0"
+dependencies = [
+ "core-foundation-sys 0.6.2",
+ "mach 0.2.3",
+]
+
+[[package]]
+name = "iovec"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
+[[package]]
+name = "jni"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf"
+dependencies = [
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
 [[package]]
 name = "jni-sys"
 version = "0.3.0"
@@ -1533,13 +1931,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "khronos-egl"
-version = "3.0.2"
+name = "kernel32-sys"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b19cc4a81304db2a0ad69740e83cdc3a9364e3f9bd6d88a87288a4c2deec927b"
+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
+
+[[package]]
+name = "khronos-egl"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b19cc4a81304db2a0ad69740e83cdc3a9364e3f9bd6d88a87288a4c2deec927b"
 dependencies = [
  "libc",
- "libloading",
+ "libloading 0.6.7",
 ]
 
 [[package]]
@@ -1548,6 +1956,12 @@ 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 = "libc"
 version = "0.2.89"
@@ -1573,7 +1987,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
 dependencies = [
  "cfg-if 1.0.0",
- "winapi",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "libloading"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
+dependencies = [
+ "cfg-if 1.0.0",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1582,6 +2006,16 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
 
+[[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.2"
@@ -1600,6 +2034,24 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
+[[package]]
+name = "mach"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
+dependencies = [
+ "libc",
+]
+
+[[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"
@@ -1618,6 +2070,12 @@ dependencies = [
  "regex-automata",
 ]
 
+[[package]]
+name = "maybe-uninit"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+
 [[package]]
 name = "memchr"
 version = "2.3.4"
@@ -1638,6 +2096,26 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "minimp3"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372"
+dependencies = [
+ "minimp3-sys",
+ "slice-deque",
+ "thiserror",
+]
+
+[[package]]
+name = "minimp3-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.3.7"
@@ -1647,6 +2125,25 @@ dependencies = [
  "adler32",
 ]
 
+[[package]]
+name = "mio"
+version = "0.6.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
+dependencies = [
+ "cfg-if 0.1.10",
+ "fuchsia-zircon",
+ "fuchsia-zircon-sys",
+ "iovec",
+ "kernel32-sys",
+ "libc",
+ "log",
+ "miow 0.2.2",
+ "net2",
+ "slab",
+ "winapi 0.2.8",
+]
+
 [[package]]
 name = "mio"
 version = "0.7.10"
@@ -1655,9 +2152,33 @@ checksum = "2182a122f3b7f3f5329cb1972cee089ba2459a0a80a56935e6e674f096f8d839"
 dependencies = [
  "libc",
  "log",
- "miow",
+ "miow 0.3.6",
  "ntapi",
- "winapi",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "mio-extras"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
+dependencies = [
+ "lazycell",
+ "log",
+ "mio 0.6.23",
+ "slab",
+]
+
+[[package]]
+name = "miow"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
+dependencies = [
+ "kernel32-sys",
+ "net2",
+ "winapi 0.2.8",
+ "ws2_32-sys",
 ]
 
 [[package]]
@@ -1667,7 +2188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
 dependencies = [
  "socket2",
- "winapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1694,7 +2215,19 @@ checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73"
 dependencies = [
  "jni-sys",
  "ndk-sys",
- "num_enum",
+ "num_enum 0.4.3",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
+dependencies = [
+ "jni-sys",
+ "ndk-sys",
+ "num_enum 0.5.1",
  "thiserror",
 ]
 
@@ -1708,7 +2241,21 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "ndk",
+ "ndk 0.2.1",
+ "ndk-macro",
+ "ndk-sys",
+]
+
+[[package]]
+name = "ndk-glue"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "ndk 0.3.0",
  "ndk-macro",
  "ndk-sys",
 ]
@@ -1732,6 +2279,39 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d"
 
+[[package]]
+name = "net2"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "nix"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "5.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+dependencies = [
+ "memchr",
+ "version_check",
+]
+
 [[package]]
 name = "notify"
 version = "5.0.0-pre.6"
@@ -1746,9 +2326,9 @@ dependencies = [
  "fsevent-sys",
  "inotify",
  "libc",
- "mio",
+ "mio 0.7.10",
  "walkdir",
- "winapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1757,7 +2337,18 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
 dependencies = [
- "winapi",
+ "winapi 0.3.9",
+]
+
+[[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]]
@@ -1818,7 +2409,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
 dependencies = [
  "derivative",
- "num_enum_derive",
+ "num_enum_derive 0.4.3",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
+dependencies = [
+ "derivative",
+ "num_enum_derive 0.5.1",
 ]
 
 [[package]]
@@ -1833,6 +2434,18 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "num_enum_derive"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -1852,6 +2465,29 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "oboe"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cfb2390bddb9546c0f7448fd1d2abdd39e6075206f960991eb28c7fa7f126c4"
+dependencies = [
+ "jni",
+ "ndk 0.3.0",
+ "ndk-glue 0.3.0",
+ "num-derive",
+ "num-traits",
+ "oboe-sys",
+]
+
+[[package]]
+name = "oboe-sys"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe069264d082fc820dfa172f79be3f2e088ecfece9b1c47b0c9fd838d2bef103"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.7.2"
@@ -1895,9 +2531,21 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "winapi",
+ "winapi 0.3.9",
 ]
 
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "percent-encoding"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+
 [[package]]
 name = "petgraph"
 version = "0.5.1"
@@ -1914,6 +2562,12 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
 
+[[package]]
+name = "pkg-config"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+
 [[package]]
 name = "png"
 version = "0.16.8"
@@ -2062,6 +2716,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac"
 
+[[package]]
+name = "rodio"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f"
+dependencies = [
+ "cpal",
+ "minimp3",
+]
+
 [[package]]
 name = "ron"
 version = "0.6.4"
@@ -2073,6 +2737,32 @@ dependencies = [
  "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",
+]
+
+[[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 0.3.9",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.5"
@@ -2088,12 +2778,33 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "scoped_threadpool"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
+
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[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-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
 [[package]]
 name = "serde"
 version = "1.0.124"
@@ -2125,6 +2836,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+
 [[package]]
 name = "shaderc"
 version = "0.7.2"
@@ -2154,6 +2871,29 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shlex"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
+
+[[package]]
+name = "slab"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"
+
+[[package]]
+name = "slice-deque"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25"
+dependencies = [
+ "libc",
+ "mach 0.3.2",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "slotmap"
 version = "0.4.0"
@@ -2177,7 +2917,7 @@ checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "winapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2215,6 +2955,63 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "stdweb"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
+
+[[package]]
+name = "stdweb"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
+dependencies = [
+ "discard",
+ "rustc_version",
+ "serde",
+ "serde_json",
+ "stdweb-derive",
+ "stdweb-internal-macros",
+ "stdweb-internal-runtime",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "stdweb-derive"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "syn",
+]
+
+[[package]]
+name = "stdweb-internal-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
+dependencies = [
+ "base-x",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1",
+ "syn",
+]
+
+[[package]]
+name = "stdweb-internal-runtime"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
+
 [[package]]
 name = "storage-map"
 version = "0.3.0"
@@ -2263,6 +3060,15 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 
+[[package]]
+name = "termcolor"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.24"
@@ -2432,6 +3238,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d"
 
+[[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.3"
@@ -2451,7 +3263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 dependencies = [
  "same-file",
- "winapi",
+ "winapi 0.3.9",
  "winapi-util",
 ]
 
@@ -2595,6 +3407,12 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -2605,6 +3423,12 @@ dependencies = [
  "winapi-x86_64-pc-windows-gnu",
 ]
 
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
@@ -2617,7 +3441,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2642,15 +3466,19 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "ndk",
- "ndk-glue",
+ "mio 0.6.23",
+ "mio-extras",
+ "ndk 0.2.1",
+ "ndk-glue 0.2.1",
  "ndk-sys",
  "objc",
  "parking_lot",
+ "percent-encoding",
  "raw-window-handle",
  "wasm-bindgen",
  "web-sys",
- "winapi",
+ "winapi 0.3.9",
+ "x11-dl",
 ]
 
 [[package]]
@@ -2659,7 +3487,29 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
 dependencies = [
- "winapi",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "ws2_32-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
+
+[[package]]
+name = "x11-dl"
+version = "2.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "maybe-uninit",
+ "pkg-config",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 3af01b4..048f7dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,5 +28,10 @@ web = [
 
 [dependencies]
 anyhow = "1.0"
-bevy = { version = "0.5", default-features = false }
+bevy = { version = "0.5" }
+bevy_ecs_tilemap = { git="https://github.com/StarArawn/bevy_ecs_tilemap", rev="50ec3c12c68079cf0d624e4dcade349351c3ae6c" }
+log = "0.4"
 tiled = { version = "0.9", default-features = false }
+
+[dev-dependencies]
+env_logger = "0.8"
diff --git a/README.md b/README.md
index 04f9220..414e06b 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@ https://www.mapeditor.org/
 
 Feel free to use this code as a reference for your own custom tile mapping solution as well.
 
+This plugin uses bevy_ecs_tilemap(https://github.com/StarArawn/bevy_ecs_tilemap) to render tiled data.
+
 ## Bevy Versions
 
 The `main` branch of this repository targets Bevy 0.5. When using bevy_tiled, please make sure your version of Bevy matches the version referenced by this library. There are versions for 0.4 and 0.3 as well.
@@ -37,6 +39,7 @@ In these examples, you should be able to use the wasd keys to pan across the map
 # Features
 ## Toplevel Entity Support
 
+TODO: REWRITE THIS SECTION
 For now, TiledMapBundle is just a configuration object. If you would like access to a toplevel entity that can be transformed, pass into the configuration:
 
     parent_option: Some(entity)
@@ -44,6 +47,8 @@ For now, TiledMapBundle is just a configuration object. If you would like access
 Then, both chunks and objects will be inserted as children to this entity, which will be tagged with MapRoot. This API is likely to change, but we have an [example](/examples/parent_entity.rs) for how it currently works.
 ## Object Group Support
 
+TODO: REWRITE THIS SECTION
+
 Object Grous are now supported. They will be skipped if not visible. Individual objects that are invisible
 will be spawned with is_visible set to false. You may pass into the configuration object:
 
@@ -83,6 +88,8 @@ Then when you save your map, it should update in the application.
 
 ## WASM and bevy_webgl2
 
+## TODO see if web still works? :/
+
 Use `default-features=false, features=["web"]` in your project's `Cargo.toml`. Tiled maps using Zstd compression are not supported.
 
 ## Top-needed features
@@ -90,4 +97,4 @@ Use `default-features=false, features=["web"]` in your project's `Cargo.toml`. T
   * better support for isometric maps
   * support for embeded objects in tiles
   * support for embedded images in Tmx files
-  * support for animations
+  * ~~support for animations~~ done
diff --git a/examples/iso_main.rs b/examples/iso_main.rs
index 8c9599a..0951687 100644
--- a/examples/iso_main.rs
+++ b/examples/iso_main.rs
@@ -1,21 +1,23 @@
-use bevy::{prelude::*, render::camera::Camera};
-use bevy_tiled_prototype::TiledMapCenter;
+use bevy::{app::CoreStage::PreUpdate, prelude::*, render::{camera::Camera}};
+use bevy_tiled_prototype::prelude::*;
+
+mod utils;
 
 fn main() {
     App::build()
         .add_plugins(DefaultPlugins)
-        .add_plugin(bevy_tiled_prototype::TiledMapPlugin)
+        .add_plugin(TiledMapPlugin)
         .add_system(bevy::input::system::exit_on_esc_system.system())
         .add_startup_system(setup.system())
         .add_system(camera_movement.system())
+        // Needs to run before rendering to set texture atlas filter for new tiles- would be better to use states
+        .add_system_to_stage(PreUpdate, utils::texture_sampler::set_texture_filters_to_nearest.system())
         .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn_bundle(bevy_tiled_prototype::TiledMapBundle {
+    commands.spawn_bundle(TiledMapBundle {
         map_asset: asset_server.load("iso-map.tmx"),
-        center: TiledMapCenter(true),
-        origin: Transform::from_scale(Vec3::new(4.0, 4.0, 1.0)),
         ..Default::default()
     });
     commands.spawn_bundle(OrthographicCameraBundle::new_2d());
diff --git a/examples/ortho_debug.rs b/examples/ortho_debug.rs
deleted file mode 100644
index 3dee569..0000000
--- a/examples/ortho_debug.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use bevy::prelude::*;
-use bevy_tiled_prototype::{DebugConfig, Object, TiledMapCenter};
-
-// this example demonstrates debugging objects. Hit spacebar to toggle them
-
-const SCALE: f32 = 2.0;
-
-fn main() {
-    App::build()
-        .add_plugins(DefaultPlugins)
-        .add_plugin(bevy_tiled_prototype::TiledMapPlugin)
-        .add_system(bevy::input::system::exit_on_esc_system.system())
-        .add_system(toggle_debug.system())
-        .add_startup_system(setup.system())
-        .run();
-}
-
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn_bundle(bevy_tiled_prototype::TiledMapBundle {
-        map_asset: asset_server.load("ortho-map.tmx"),
-        center: TiledMapCenter(true),
-        origin: Transform::from_scale(Vec3::new(SCALE, SCALE, 1.0)),
-        debug_config: DebugConfig {
-            enabled: true,
-            material: None,
-        },
-        ..Default::default()
-    });
-    commands.spawn_bundle(OrthographicCameraBundle::new_2d());
-}
-
-fn toggle_debug(keyboard_input: Res<Input<KeyCode>>, mut query: Query<&mut Visible, With<Object>>) {
-    for mut visible in query.iter_mut() {
-        if keyboard_input.just_released(KeyCode::Space) {
-            visible.is_visible = !visible.is_visible;
-        }
-    }
-}
diff --git a/examples/ortho_main.rs b/examples/ortho_main.rs
index 60a8ebb..246ecd4 100644
--- a/examples/ortho_main.rs
+++ b/examples/ortho_main.rs
@@ -1,7 +1,13 @@
 use bevy::{app::CoreStage::PreUpdate, prelude::*, render::camera::Camera};
-use bevy_tiled_prototype::{MapReadyEvent, TiledMapCenter};
+use bevy_tiled_prototype::prelude::*;
+
+mod utils;
 
 fn main() {
+    env_logger::Builder::from_default_env()
+    .filter_level(log::LevelFilter::Error)
+    .init();
+
     App::build()
         .add_plugins(DefaultPlugins)
         .add_plugin(bevy_tiled_prototype::TiledMapPlugin)
@@ -9,15 +15,15 @@ fn main() {
         .add_startup_system(setup.system())
         .add_system(camera_movement.system())
         // Needs to run before rendering to set texture atlas filter for new tiles- would be better to use states
-        .add_system_to_stage(PreUpdate, set_texture_filters_to_nearest.system())
+        .add_system_to_stage(PreUpdate, utils::texture_sampler::set_texture_filters_to_nearest.system())
         .run();
 }
 
 fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn_bundle(bevy_tiled_prototype::TiledMapBundle {
+    asset_server.watch_for_changes().unwrap();
+    
+    commands.spawn_bundle(TiledMapBundle {
         map_asset: asset_server.load("ortho-map.tmx"),
-        center: TiledMapCenter(true),
-        origin: Transform::from_scale(Vec3::new(4.0, 4.0, 1.0)),
         ..Default::default()
     });
     commands.spawn_bundle(OrthographicCameraBundle::new_2d());
@@ -61,20 +67,3 @@ fn camera_movement(
         transform.translation += time.delta_seconds() * direction * 1000.;
     }
 }
-
-// demo of https://github.com/StarArawn/bevy_tiled/issues/47#issuecomment-817126515
-//  Would be cleaner to put this in a separate AppState, transitioning out after textures loaded
-fn set_texture_filters_to_nearest(
-    mut map_ready_events: EventReader<MapReadyEvent>,
-    mut textures: ResMut<Assets<Texture>>,
-    texture_atlases: Res<Assets<TextureAtlas>>,
-) {
-    // quick and dirty, run this for all textures every time a map is created/modified
-    if map_ready_events.iter().count() > 0 {
-        for (_, atlas) in texture_atlases.iter() {
-            if let Some(texture) = textures.get_mut(atlas.texture.clone()) {
-                texture.sampler.min_filter = bevy::render::texture::FilterMode::Nearest;
-            }
-        }
-    }
-}
diff --git a/examples/parent_entity.rs b/examples/parent_entity.rs
index c9da377..30c75ee 100644
--- a/examples/parent_entity.rs
+++ b/examples/parent_entity.rs
@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy_tiled_prototype::{MapRoot, TiledMapCenter};
+use bevy_tiled_prototype::prelude::*;
 
 // this example demonstrates moving the map mesh entities using
 // the MapRoot marker on a passed-in parent element
@@ -11,6 +11,8 @@ struct MovementData {
     transform: Transform,
 }
 
+struct MapRoot;
+
 fn main() {
     App::build()
         .insert_resource(MovementData::default())
@@ -34,14 +36,14 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                 ..Default::default()
             },
         ))
+        .insert(MapRoot)
         .id();
 
-    commands.spawn_bundle(bevy_tiled_prototype::TiledMapBundle {
-        map_asset: asset_server.load("ortho-map.tmx"),
-        parent_option: Some(parent),
-        center: TiledMapCenter(true),
-        origin: Transform::from_scale(Vec3::new(4.0, 4.0, 1.0)),
+    commands.entity(parent).with_children(|child_builder| {
+        child_builder.spawn_bundle(TiledMapBundle {
+            map_asset: asset_server.load("ortho-map.tmx"),
         ..Default::default()
+        });
     });
     commands.spawn_bundle(OrthographicCameraBundle::new_2d());
 }
diff --git a/examples/utils/mod.rs b/examples/utils/mod.rs
new file mode 100644
index 0000000..793fa05
--- /dev/null
+++ b/examples/utils/mod.rs
@@ -0,0 +1 @@
+pub mod texture_sampler;
diff --git a/examples/utils/texture_sampler.rs b/examples/utils/texture_sampler.rs
new file mode 100644
index 0000000..8ac7008
--- /dev/null
+++ b/examples/utils/texture_sampler.rs
@@ -0,0 +1,20 @@
+use bevy::{prelude::*, render::texture::FilterMode};
+
+// demo of https://github.com/StarArawn/bevy_tiled/issues/47#issuecomment-817126515
+//  Would be cleaner to put this in a separate AppState, transitioning out after textures loaded
+pub fn set_texture_filters_to_nearest(
+    mut texture_events: EventReader<AssetEvent<Texture>>,
+    mut textures: ResMut<Assets<Texture>>,
+) {
+    // quick and dirty, run this for all textures every time a map is created/modified
+    for event in texture_events.iter() {
+        match event {
+            AssetEvent::Created { handle } => {
+                if let Some(mut texture) = textures.get_mut(handle){
+                    texture.sampler.min_filter = FilterMode::Nearest;
+                }
+            }
+            _ => ()
+        }
+    }
+}
diff --git a/src/animation.rs b/src/animation.rs
new file mode 100644
index 0000000..7d363ef
--- /dev/null
+++ b/src/animation.rs
@@ -0,0 +1,38 @@
+use bevy::prelude::*;
+use bevy_ecs_tilemap::prelude::Tile;
+
+/// Information specific to the current frame in the animation. 
+#[derive(Clone)]
+pub struct Frame {
+    /// Tile id.
+    pub tile_id: u32,
+    /// Duration until next frame.
+    pub duration: f64,
+}
+
+/// Information about the tiles animation state.
+pub struct Animation {
+    /// Frame info.
+    pub frames: Vec<Frame>,
+    /// The current frame.
+    pub current_frame: usize,
+    pub last_update: f64,
+}
+
+pub fn update(
+    time: Res<Time>,
+    mut query: Query<(&mut Tile, &mut Animation)>,
+) {
+    let current_time = time.seconds_since_startup();
+    for (mut tile, mut animation) in query.iter_mut() {
+        let frame = animation.frames[animation.current_frame].clone();
+        if (current_time - animation.last_update) > frame.duration {
+            animation.current_frame += 1;
+            tile.texture_index = frame.tile_id;
+            if animation.current_frame > animation.frames.len() - 1 {
+                animation.current_frame = 0;
+            }
+            animation.last_update = current_time;
+        }
+    }
+}
diff --git a/src/layers.rs b/src/layers.rs
index 0c48fb4..4ac1c37 100644
--- a/src/layers.rs
+++ b/src/layers.rs
@@ -1,126 +1,112 @@
-use crate::{utils::project_iso, utils::project_ortho, LayerChunk, TileChunk};
 use bevy::prelude::*;
+use bevy_ecs_tilemap::prelude::*;
 
-#[derive(Debug)]
-pub struct TilesetLayer {
-    pub tile_size: Vec2,
-    pub chunks: Vec<Vec<LayerChunk>>,
-    pub tileset_guid: u32,
-    pub offset_x: f32,
-    pub offset_y: f32,
-}
-impl TilesetLayer {
-    pub fn new(map: &tiled::Map, layer: &tiled::Layer, tileset: &tiled::Tileset) -> TilesetLayer {
-        let target_chunk_x = 32;
-        let target_chunk_y = 32;
+use crate::prelude::{Animation, Frame};
 
-        let chunk_size_x = (map.width as f32 / target_chunk_x as f32).ceil().max(1.0) as usize;
-        let chunk_size_y = (map.height as f32 / target_chunk_y as f32).ceil().max(1.0) as usize;
+#[derive(Debug)]
+pub struct TilesetLayer;
 
+impl TilesetLayer {
+    pub fn new(
+        parent_entity: Entity,
+        commands: &mut Commands,
+        meshes: &mut ResMut<Assets<Mesh>>,
+        material: Handle<ColorMaterial>,
+        tiled_map: &tiled::Map,
+        layer: &tiled::Layer,
+        tileset: &tiled::Tileset,
+    ) -> Entity {
         let tile_width = tileset.tile_width as f32;
         let tile_height = tileset.tile_height as f32;
-        let tile_space = tileset.spacing as f32;
-
-        let mut chunks = Vec::new();
-        // 32 x 32 tile chunk sizes
-        for chunk_x in 0..chunk_size_x {
-            let mut chunks_y = Vec::new();
-            for chunk_y in 0..chunk_size_y {
-                let mut tiles = Vec::new();
 
-                for tile_x in 0..target_chunk_x {
-                    let mut tiles_y = Vec::new();
-                    for tile_y in 0..target_chunk_y {
-                        let lookup_x = (chunk_x * target_chunk_x) + tile_x;
-                        let lookup_y = (chunk_y * target_chunk_y) + tile_y;
-                        let chunk_pos = Vec2::new(lookup_x as f32, lookup_y as f32);
+        let _tile_space = tileset.spacing as f32; // TODO: re-add tile spacing.. :p
 
-                        tiles_y.push(
-                            if lookup_x < map.width as usize && lookup_y < map.height as usize {
-                                let map_tile = match &layer.tiles {
-                                    tiled::LayerData::Finite(tiles) => &tiles[lookup_y][lookup_x],
-                                    _ => panic!("Infinte maps not supported"),
-                                };
-                                // tile not in this set
-                                if map_tile.gid < tileset.first_gid
-                                    || map_tile.gid
-                                        >= tileset.first_gid + tileset.tilecount.unwrap()
-                                {
-                                    continue;
-                                }
-                                // Calculate positions
-                                let vertex = match map.orientation {
-                                    tiled::Orientation::Orthogonal => {
-                                        let center =
-                                            project_ortho(chunk_pos, tile_width, tile_height);
+        let mut map = Map::new(
+            Vec2::new((tiled_map.width as f32 / 64.0).ceil(), (tiled_map.height as f32 / 64.0).ceil()).into(), 
+            Vec2::new(64.0, 64.0).into(),
+            Vec2::new(tile_width, tile_height),
+            Vec2::new(tileset.images[0].width as f32, tileset.images[0].height as f32), // TODO: support multiple tileset images?
+            layer.layer_index,
+        );
+        map.mesher = match tiled_map.orientation {
+            tiled::Orientation::Hexagonal => {
+              Box::new(HexChunkMesher::new(HexType::ColumnEven))
+            },
+            tiled::Orientation::Isometric => {
+                Box::new(IsoChunkMesher)
+            },
+            tiled::Orientation::Orthogonal => {
+                Box::new(SquareChunkMesher)
+            },
+            _ => panic!("Unknown tile map orientation!")
+        };
 
-                                        let start = Vec2::new(
-                                            center.x,
-                                            center.y - tile_height - tile_space,
-                                        );
+        // Create layer map rendering entity as child of the tiled map.
+        let mut map_entity = None;
+        commands.entity(parent_entity).with_children(|child_builder| {
+            map_entity = Some(child_builder.spawn().id());
+        });
+        let map_entity = map_entity.unwrap();
 
-                                        let end =
-                                            Vec2::new(center.x + tile_width + tile_space, center.y);
+        map.build(commands, meshes, material, map_entity, false);
+        for x in 0..tiled_map.width as usize {
+            for y in 0..tiled_map.height as usize {
+                let map_tile = match &layer.tiles {
+                    tiled::LayerData::Finite(tiles) => &tiles[y][x],
+                    _ => panic!("Infinite maps not supported"),
+                };
 
-                                        Vec4::new(start.x, start.y, end.x, end.y)
-                                    }
-                                    tiled::Orientation::Isometric => {
-                                        let center =
-                                            project_iso(chunk_pos, tile_width, tile_height);
+                if map_tile.gid < tileset.first_gid
+                    || map_tile.gid
+                        >= tileset.first_gid + tileset.tilecount.unwrap()
+                {
+                    continue;
+                }
 
-                                        let start = Vec2::new(
-                                            center.x - tile_width / 2.0,
-                                            center.y - tile_height,
-                                        );
+                let tile_id = map_tile.gid - tileset.first_gid;
+                let mut tile_pos = MapVec2::new(
+                    x as i32, //(x as f32 / tile_size_x_diff) as i32,
+                    y as i32, //(y as f32 / tile_size_y_diff) as i32
+                );
+                if tiled_map.orientation == tiled::Orientation::Orthogonal {
+                    tile_pos.y = tiled_map.height as i32 - tile_pos.y;
+                }
+                let tile_entity = map.add_tile(commands, tile_pos, Tile {
+                    texture_index: tile_id,
+                    flip_x: map_tile.flip_h || map_tile.flip_d,
+                    flip_y: map_tile.flip_v || map_tile.flip_d,
+                    ..Default::default()
+                }).unwrap();
 
-                                        let end = Vec2::new(center.x + tile_width / 2.0, center.y);
+                if let Some(tile) = tileset.tiles.iter().find(|tile| tile.id == tile_id) {
+                    if let Some(animations) = tile.animation.clone() {
+                        let animation = Animation {
+                            frames: animations.iter().map(|frame| Frame {
+                                tile_id: frame.tile_id,
+                                duration: (frame.duration as f64) / 1000.0,
+                            }).collect(),
+                            current_frame: 0,
+                            last_update: 0.0,
+                        };
 
-                                        Vec4::new(start.x, start.y, end.x, end.y)
-                                    }
-                                    _ => {
-                                        panic!("Unsupported orientation {:?}", map.orientation)
-                                    }
-                                };
-                                // Get chunk tile.
-                                TileChunk::from_layer_and_tileset(
-                                    map_tile, tileset, chunk_pos, vertex,
-                                )
-                            } else {
-                                // Empty tile
-                                TileChunk {
-                                    tile_id: 0,
-                                    pos: chunk_pos,
-                                    vertex: Vec4::new(0.0, 0.0, 0.0, 0.0),
-                                    uv: Vec4::new(0.0, 0.0, 0.0, 0.0),
-                                    flip_d: false,
-                                    flip_h: false,
-                                    flip_v: false,
-                                }
-                            },
-                        ); // end tiles_y.push(chunk_tile);
+                        commands.entity(tile_entity).insert(animation);
                     }
-                    tiles.push(tiles_y);
                 }
-
-                let chunk = LayerChunk {
-                    position: Vec2::new(chunk_x as f32, chunk_y as f32),
-                    tiles,
-                };
-                chunks_y.push(chunk);
+                
             }
-            chunks.push(chunks_y);
         }
 
-        TilesetLayer {
-            tile_size: Vec2::new(tile_width, tile_height),
-            chunks,
-            tileset_guid: tileset.first_gid,
-            offset_x: layer.offset_x,
-            offset_y: layer.offset_y,
-        }
+        commands.entity(map_entity).insert_bundle(MapBundle {
+            map,
+            transform: Transform::from_xyz(
+                layer.offset_x,
+                -layer.offset_y,
+                layer.layer_index as f32
+            ),
+            ..Default::default()
+        });
+
+
+        map_entity
     }
 }
-#[derive(Debug)]
-pub struct MapLayer {
-    pub tileset_layers: Vec<TilesetLayer>,
-}
diff --git a/src/lib.rs b/src/lib.rs
index 51f93bf..8c883e8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,19 +1,12 @@
 use bevy::{asset::AssetServerSettings, prelude::*};
+use bevy_ecs_tilemap::prelude::*;
+use tiled_map::{MapReadyEvent, process_loaded_tile_maps};
 
-mod utils;
-pub use utils::*;
-
-mod loader;
-mod map;
-pub use map::*;
 mod layers;
-pub use layers::*;
-mod objects;
-pub use objects::*;
+mod loader;
+mod tiled_map;
+mod animation;
 
-mod view;
-pub use view::*;
-/// Adds support for GLTF file loading to Apps
 #[derive(Default)]
 pub struct TiledMapPlugin;
 
@@ -26,13 +19,18 @@ impl Plugin for TiledMapPlugin {
             .asset_folder
             .clone();
 
-        app.add_asset::<map::Map>()
+        app
+            .add_plugin(TileMapPlugin)
+            .add_asset::<tiled_map::TiledMap>()
             .add_asset_loader(loader::TiledMapLoader::new(asset_folder))
-            .add_event::<ObjectReadyEvent>()
             .add_event::<MapReadyEvent>()
-            .add_system(process_loaded_tile_maps.system());
-
-        let world = app.world_mut();
-        add_tile_map_graph(world);
+            .add_system(process_loaded_tile_maps.system())
+            .add_system(animation::update.system());
     }
 }
+
+pub mod prelude {
+    pub use crate::TiledMapPlugin;
+    pub use crate::tiled_map::{TiledMapBundle, MapReadyEvent};
+    pub use crate::animation::{Animation, Frame};
+}
diff --git a/src/loader.rs b/src/loader.rs
index 061ffcc..1a3c862 100644
--- a/src/loader.rs
+++ b/src/loader.rs
@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use crate::map::Map;
+use crate::tiled_map::TiledMap;
 use anyhow::Result;
 use bevy::{
     asset::{AssetLoader, AssetPath, LoadContext, LoadedAsset},
@@ -16,19 +16,8 @@ impl TiledMapLoader {
             asset_folder: path.as_ref().to_path_buf(),
         }
     }
-
-    pub fn remove_tile_flags(tile: u32) -> u32 {
-        let tile = tile & !ALL_FLIP_FLAGS;
-        tile
-    }
 }
 
-const FLIPPED_HORIZONTALLY_FLAG: u32 = 0x80000000;
-const FLIPPED_VERTICALLY_FLAG: u32 = 0x40000000;
-const FLIPPED_DIAGONALLY_FLAG: u32 = 0x20000000;
-const ALL_FLIP_FLAGS: u32 =
-    FLIPPED_HORIZONTALLY_FLAG | FLIPPED_VERTICALLY_FLAG | FLIPPED_DIAGONALLY_FLAG;
-
 impl AssetLoader for TiledMapLoader {
     fn load<'a>(
         &'a self,
@@ -37,7 +26,7 @@ impl AssetLoader for TiledMapLoader {
     ) -> BoxedFuture<'a, Result<(), anyhow::Error>> {
         Box::pin(async move {
             let path = load_context.path();
-            let mut map = Map::try_from_bytes(self.asset_folder.as_path(), path, bytes.into())?;
+            let mut map = TiledMap::try_from_bytes(self.asset_folder.as_path(), path, bytes.into())?;
             let dependencies = map
                 .asset_dependencies
                 .drain(..)
diff --git a/src/map.rs b/src/map.rs
deleted file mode 100644
index 5a4fa89..0000000
--- a/src/map.rs
+++ /dev/null
@@ -1,488 +0,0 @@
-use crate::{
-    objects::ObjectGroup, utils::project_iso, utils::project_ortho, ChunkBundle, MapLayer,
-    TileMapChunk, TilesetLayer,
-};
-use anyhow::Result;
-use bevy::{
-    prelude::*,
-    reflect::TypeUuid,
-    utils::{HashMap, HashSet},
-};
-use std::{
-    io::BufReader,
-    path::{Path, PathBuf},
-};
-// objects include these by default for now
-pub use tiled;
-pub use tiled::LayerData;
-pub use tiled::ObjectShape;
-pub use tiled::Properties;
-pub use tiled::PropertyValue;
-
-// An asset for maps
-#[derive(Debug, TypeUuid)]
-#[uuid = "5f6fbac8-3f52-424e-a928-561667fea074"]
-pub struct Map {
-    pub map: tiled::Map,
-    pub meshes: Vec<(u32, u32, Mesh)>,
-    pub layers: Vec<MapLayer>,
-    pub groups: Vec<ObjectGroup>,
-    pub tile_size: Vec2,
-    pub image_folder: std::path::PathBuf,
-    pub asset_dependencies: Vec<PathBuf>,
-}
-
-impl Map {
-    pub fn center(&self, origin: Transform) -> Transform {
-        let tile_size = Vec2::new(self.map.tile_width as f32, self.map.tile_height as f32);
-        let map_center = Vec2::new(self.map.width as f32 / 2.0, self.map.height as f32 / 2.0);
-        match self.map.orientation {
-            tiled::Orientation::Orthogonal => {
-                let center = project_ortho(map_center, tile_size.x, tile_size.y);
-                Transform::from_matrix(
-                    origin.compute_matrix() * Mat4::from_translation(-center.extend(0.0)),
-                )
-            }
-            tiled::Orientation::Isometric => {
-                let center = project_iso(map_center, tile_size.x, tile_size.y);
-                Transform::from_matrix(
-                    origin.compute_matrix() * Mat4::from_translation(-center.extend(0.0)),
-                )
-            }
-            _ => panic!("Unsupported orientation {:?}", self.map.orientation),
-        }
-    }
-
-    pub fn try_from_bytes(asset_folder: &Path, asset_path: &Path, bytes: Vec<u8>) -> Result<Map> {
-        #[cfg(all(not(target_arch = "wasm32"), not(target_os = "android")))]
-        let root_dir = bevy::asset::FileAssetIo::get_root_path();
-        #[cfg(any(target_arch = "wasm32", target_os = "android"))]
-        let root_dir = PathBuf::from("");
-
-        let map = tiled::parse_with_path(
-            BufReader::new(bytes.as_slice()),
-            &root_dir.join(&asset_folder.join(asset_path)),
-        )?;
-
-        let mut layers = Vec::new();
-        let mut groups = Vec::new();
-
-        // this only works if gids are uniques across all maps used - todo move into ObjectGroup?
-        let mut tile_gids: HashMap<u32, u32> = Default::default();
-
-        for tileset in &map.tilesets {
-            for i in tileset.first_gid..(tileset.first_gid + tileset.tilecount.unwrap_or(1)) {
-                tile_gids.insert(i, tileset.first_gid);
-            }
-        }
-
-        let mut object_gids: HashSet<u32> = Default::default();
-        for object_group in map.object_groups.iter() {
-            // recursively creates objects in the groups:
-            let tiled_o_g = ObjectGroup::new_with_tile_ids(object_group, &tile_gids);
-            // keep track of which objects will need to have tiles loaded
-            tiled_o_g.objects.iter().for_each(|o| {
-                tile_gids.get(&o.gid).map(|first_gid| {
-                    object_gids.insert(*first_gid);
-                });
-            });
-            groups.push(tiled_o_g);
-        }
-
-        let tile_size = Vec2::new(map.tile_width as f32, map.tile_height as f32);
-        let image_folder: PathBuf = asset_path.parent().unwrap().into();
-        let mut asset_dependencies = Vec::new();
-
-        for layer in map.layers.iter() {
-            if !layer.visible {
-                continue;
-            }
-            let mut tileset_layers = Vec::new();
-
-            for tileset in map.tilesets.iter() {
-                let tile_path = image_folder.join(tileset.images.first().unwrap().source.as_str());
-                asset_dependencies.push(tile_path);
-
-                tileset_layers.push(TilesetLayer::new(&map, &layer, &tileset));
-            }
-
-            let layer = MapLayer { tileset_layers };
-            layers.push(layer);
-        }
-
-        let mut meshes = Vec::new();
-        for (layer_id, layer) in layers.iter().enumerate() {
-            for tileset_layer in layer.tileset_layers.iter() {
-                for x in 0..tileset_layer.chunks.len() {
-                    let chunk_x = &tileset_layer.chunks[x];
-                    for y in 0..chunk_x.len() {
-                        if let Some(mesh) = chunk_x[y].build_uv_mesh(tileset_layer.tileset_guid) {
-                            meshes.push((layer_id as u32, tileset_layer.tileset_guid, mesh));
-                        };
-                    }
-                }
-            }
-        }
-
-        let map = Map {
-            map,
-            meshes,
-            layers,
-            groups,
-            tile_size,
-            image_folder,
-            asset_dependencies,
-        };
-
-        Ok(map)
-    }
-}
-
-#[derive(Default)]
-pub struct TiledMapCenter(pub bool);
-
-pub struct MapRoot; // used so consuming application can query for parent
-
-pub struct DebugConfig {
-    pub enabled: bool,
-    pub material: Option<Handle<ColorMaterial>>,
-}
-
-impl Default for DebugConfig {
-    fn default() -> Self {
-        Self {
-            enabled: false,
-            material: Default::default(),
-        }
-    }
-}
-
-/// A bundle of tiled map entities.
-#[derive(Bundle)]
-pub struct TiledMapBundle {
-    pub map_asset: Handle<Map>,
-    pub parent_option: Option<Entity>,
-    pub materials: HashMap<u32, Handle<ColorMaterial>>,
-    pub atlases: HashMap<u32, Handle<TextureAtlas>>,
-    pub origin: Transform,
-    pub center: TiledMapCenter,
-    pub debug_config: DebugConfig,
-    pub created_entities: CreatedMapEntities,
-}
-
-impl Default for TiledMapBundle {
-    fn default() -> Self {
-        Self {
-            map_asset: Handle::default(),
-            parent_option: None,
-            materials: HashMap::default(),
-            atlases: HashMap::default(),
-            center: TiledMapCenter::default(),
-            origin: Transform::default(),
-            debug_config: Default::default(),
-            created_entities: Default::default(),
-        }
-    }
-}
-
-#[derive(Default, Debug)]
-pub struct CreatedMapEntities {
-    // maps layer id and tileset_gid to mesh entities
-    created_layer_entities: HashMap<(usize, u32), Vec<Entity>>,
-    // maps object guid to texture atlas sprite entity
-    created_object_entities: HashMap<u32, Vec<Entity>>,
-}
-
-pub fn process_loaded_tile_maps(
-    mut commands: Commands,
-    asset_server: Res<AssetServer>,
-    mut map_events: EventReader<AssetEvent<Map>>,
-    mut ready_events: EventWriter<ObjectReadyEvent>,
-    mut map_ready_events: EventWriter<MapReadyEvent>,
-    mut maps: ResMut<Assets<Map>>,
-    mut meshes: ResMut<Assets<Mesh>>,
-    mut materials: ResMut<Assets<ColorMaterial>>,
-    mut texture_atlases: ResMut<Assets<TextureAtlas>>,
-    mut query: Query<(
-        Entity,
-        &TiledMapCenter,
-        &Handle<Map>,
-        &Option<Entity>,
-        &mut HashMap<u32, Handle<ColorMaterial>>,
-        &mut HashMap<u32, Handle<TextureAtlas>>,
-        &Transform,
-        &mut DebugConfig,
-        &mut CreatedMapEntities,
-    )>,
-) {
-    let mut changed_maps = HashSet::<Handle<Map>>::default();
-    for event in map_events.iter() {
-        match event {
-            AssetEvent::Created { handle } => {
-                changed_maps.insert(handle.clone());
-            }
-            AssetEvent::Modified { handle } => {
-                changed_maps.insert(handle.clone());
-            }
-            AssetEvent::Removed { handle } => {
-                // if mesh was modified and removed in the same update, ignore the modification
-                // events are ordered so future modification events are ok
-                changed_maps.remove(handle);
-            }
-        }
-    }
-
-    let mut new_meshes = HashMap::<&Handle<Map>, Vec<(u32, u32, Handle<Mesh>)>>::default();
-
-    for changed_map in changed_maps.iter() {
-        let map = maps.get_mut(changed_map).unwrap();
-
-        for (_, _, map_handle, _, mut materials_map, mut texture_atlas_map, _, _, _) in
-            query.iter_mut()
-        {
-            // only deal with currently changed map
-            if map_handle != changed_map {
-                continue;
-            }
-
-            for tileset in &map.map.tilesets {
-                if !materials_map.contains_key(&tileset.first_gid) {
-                    let texture_path = map
-                        .image_folder
-                        .join(tileset.images.first().unwrap().source.as_str());
-                    let texture_handle = asset_server.load(texture_path);
-                    materials_map.insert(
-                        tileset.first_gid,
-                        materials.add(texture_handle.clone().into()),
-                    );
-
-                    // only generate texture_atlas for tilesets used in objects
-                    let object_gids: Vec<_> = map
-                        .groups
-                        .iter()
-                        .flat_map(|og| og.objects.iter().map(|o| o.tileset_gid))
-                        .collect();
-                    if object_gids.contains(&Some(tileset.first_gid)) {
-                        // For simplicity use textureAtlasSprite for object layers
-                        // these insertions should be limited to sprites referenced by objects
-                        let tile_width = tileset.tile_width as f32;
-                        let tile_height = tileset.tile_height as f32;
-                        let image = tileset.images.first().unwrap();
-                        let texture_width = image.width as f32;
-                        let texture_height = image.height as f32;
-                        let columns = (texture_width / tile_width).floor() as usize;
-                        let rows = (texture_height / tile_height).floor() as usize;
-
-                        let has_new = (0..(columns * rows) as u32).fold(false, |total, next| {
-                            total || !texture_atlas_map.contains_key(&(tileset.first_gid + next))
-                        });
-                        if has_new {
-                            let atlas = TextureAtlas::from_grid(
-                                texture_handle.clone(),
-                                Vec2::new(tile_width, tile_height),
-                                columns,
-                                rows,
-                            );
-                            let atlas_handle = texture_atlases.add(atlas);
-                            for i in 0..(columns * rows) as u32 {
-                                if texture_atlas_map.contains_key(&(tileset.first_gid + i)) {
-                                    continue;
-                                }
-                                // println!("insert: {}", tileset.first_gid + i);
-                                texture_atlas_map
-                                    .insert(tileset.first_gid + i, atlas_handle.clone());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        for mesh in map.meshes.drain(0..map.meshes.len()) {
-            let handle = meshes.add(mesh.2);
-            if new_meshes.contains_key(changed_map) {
-                let mesh_list = new_meshes.get_mut(changed_map).unwrap();
-                mesh_list.push((mesh.0, mesh.1, handle));
-            } else {
-                let mut mesh_list = Vec::new();
-                mesh_list.push((mesh.0, mesh.1, handle));
-                new_meshes.insert(changed_map, mesh_list);
-            }
-        }
-    }
-
-    for (
-        _,
-        center,
-        map_handle,
-        optional_parent,
-        materials_map,
-        texture_atlas_map,
-        origin,
-        mut debug_config,
-        mut created_entities,
-    ) in query.iter_mut()
-    {
-        if new_meshes.contains_key(map_handle) {
-            let map = maps.get(map_handle).unwrap();
-
-            let tile_map_transform = if center.0 {
-                map.center(origin.clone())
-            } else {
-                origin.clone()
-            };
-
-            let mesh_list = new_meshes.get_mut(map_handle).unwrap();
-
-            for (layer_id, layer) in map.layers.iter().enumerate() {
-                for tileset_layer in layer.tileset_layers.iter() {
-                    let material_handle = materials_map.get(&tileset_layer.tileset_guid).unwrap();
-                    // let mut mesh_list = mesh_list.iter_mut().filter(|(mesh_layer_id, _)| *mesh_layer_id == layer_id as u32).drain(0..mesh_list.len()).collect::<Vec<_>>();
-                    let chunk_mesh_list = mesh_list
-                        .iter()
-                        .filter(|(mesh_layer_id, tileset_guid, _)| {
-                            *mesh_layer_id == layer_id as u32
-                                && *tileset_guid == tileset_layer.tileset_guid
-                        })
-                        .collect::<Vec<_>>();
-
-                    // removing entities consumes the record of created entities
-                    created_entities
-                        .created_layer_entities
-                        .remove(&(layer_id, tileset_layer.tileset_guid))
-                        .map(|entities| {
-                            // println!("Despawning previously-created mesh for this chunk");
-                            for entity in entities.iter() {
-                                // println!("calling despawn on {:?}", entity);
-                                commands.entity(*entity).despawn();
-                            }
-                        });
-                    let mut chunk_entities: Vec<Entity> = Default::default();
-                    let layer_transform = tile_map_transform
-                        * Transform::from_translation(Vec3::new(
-                            tileset_layer.offset_x,
-                            -tileset_layer.offset_y,
-                            0.0,
-                        ));
-
-                    for (_, tileset_guid, mesh) in chunk_mesh_list.iter() {
-                        // TODO: Sadly bevy doesn't support multiple meshes on a single entity with multiple materials.
-                        // Change this once it does.
-
-                        // Instead for now spawn a new entity per chunk.
-                        let chunk_entity = commands
-                            .spawn_bundle(ChunkBundle {
-                                chunk: TileMapChunk {
-                                    // TODO: Support more layers here..
-                                    layer_id: layer_id as f32,
-                                },
-                                material: material_handle.clone(),
-                                mesh: mesh.clone(),
-                                map_parent: map_handle.clone(),
-                                transform: layer_transform,
-                                ..Default::default()
-                            })
-                            .id();
-
-                        // println!("added created_entry after spawn");
-                        created_entities
-                            .created_layer_entities
-                            .entry((layer_id, *tileset_guid))
-                            .or_insert_with(|| Vec::new())
-                            .push(chunk_entity);
-                        chunk_entities.push(chunk_entity);
-                    }
-                    // if parent was passed in add children and mark it as MapRoot (temp until map bundle returns real entity)
-                    if let Some(parent_entity) = optional_parent {
-                        commands
-                            .entity(parent_entity.clone())
-                            .push_children(&chunk_entities)
-                            .insert(MapRoot);
-                    }
-                }
-            }
-
-            if debug_config.enabled && debug_config.material.is_none() {
-                debug_config.material =
-                    Some(materials.add(ColorMaterial::from(Color::rgba(0.4, 0.4, 0.9, 0.5))));
-            }
-            for object_group in map.groups.iter() {
-                for object in object_group.objects.iter() {
-                    created_entities
-                        .created_object_entities
-                        .remove(&object.gid)
-                        .map(|entities| {
-                            // println!("Despawning previously-created object sprite");
-                            for entity in entities.iter() {
-                                // println!("calling despawn on {:?}", entity);
-                                commands.entity(*entity).despawn();
-                            }
-                        });
-                }
-                if !object_group.visible {
-                    continue;
-                }
-
-                let mut object_entities: Vec<Entity> = Default::default();
-
-                // TODO: use object_group.name, opacity, colour (properties)
-                for object in object_group.objects.iter() {
-                    // println!("in object_group {}, object {:?}, grp: {}", object_group.name, &object.tileset_gid, object.gid);
-                    let atlas_handle = object
-                        .tileset_gid
-                        .and_then(|tileset_gid| texture_atlas_map.get(&tileset_gid));
-
-                    let entity = object
-                        .spawn(
-                            &mut commands,
-                            atlas_handle,
-                            &map.map,
-                            map_handle.clone(),
-                            &tile_map_transform,
-                            &debug_config,
-                        )
-                        .id();
-                    // when done spawning, fire event
-                    let evt = ObjectReadyEvent {
-                        entity: entity.clone(),
-                        map_handle: map_handle.clone(),
-                        map_entity_option: optional_parent.clone(),
-                    };
-                    ready_events.send(evt);
-
-                    created_entities
-                        .created_object_entities
-                        .entry(object.gid)
-                        .or_insert_with(|| Vec::new())
-                        .push(entity);
-                    object_entities.push(entity);
-                }
-
-                // if parent was passed in add children
-                if let Some(parent_entity) = optional_parent {
-                    commands
-                        .entity(parent_entity.clone())
-                        .push_children(&object_entities);
-                }
-            }
-            let evt = MapReadyEvent {
-                map_handle: map_handle.clone(),
-                map_entity_option: optional_parent.clone(),
-            };
-            map_ready_events.send(evt);
-        }
-    }
-}
-
-// events fired when entity has been created
-
-pub struct ObjectReadyEvent {
-    pub entity: Entity,
-    pub map_handle: Handle<Map>,
-    pub map_entity_option: Option<Entity>,
-}
-
-pub struct MapReadyEvent {
-    pub map_handle: Handle<Map>,
-    pub map_entity_option: Option<Entity>,
-}
diff --git a/src/objects.rs b/src/objects.rs
deleted file mode 100644
index 6083bc2..0000000
--- a/src/objects.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-use bevy::{ecs::system::EntityCommands, prelude::*, utils::HashMap};
-
-use crate::{DebugConfig, Map, loader::TiledMapLoader};
-
-#[derive(Debug)]
-pub struct ObjectGroup {
-    pub name: String,
-    pub opacity: f32,
-    pub visible: bool,
-    pub objects: Vec<Object>,
-}
-
-impl ObjectGroup {
-    pub fn new_with_tile_ids(
-        inner: &tiled::ObjectGroup,
-        tile_gids: &HashMap<u32, u32>,
-    ) -> ObjectGroup {
-        // println!("grp {}", inner.name.to_string());
-        ObjectGroup {
-            name: inner.name.to_string(),
-            opacity: inner.opacity,
-            visible: inner.visible,
-            objects: inner
-                .objects
-                .iter()
-                .map(|obj| Object::new_with_tile_ids(obj, tile_gids))
-                .collect(),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Object {
-    pub shape: tiled::ObjectShape,
-    pub props: tiled::Properties,
-    pub position: Vec2,
-    pub size: Vec2,
-    pub name: String,
-    pub obj_type: String,
-    pub visible: bool,
-    pub gid: u32,                 // sprite ID from tiled::Object
-    pub tileset_gid: Option<u32>, // AKA first_gid
-    pub sprite_index: Option<u32>,
-}
-
-impl Object {
-    pub fn new(original_object: &tiled::Object) -> Object {
-        // println!("obj {} {}", original_object.name, original_object.visible.to_string());
-        Object {
-            shape: original_object.shape.clone(),
-            props: original_object.properties.clone(),
-            gid: TiledMapLoader::remove_tile_flags(original_object.gid), // zero for most non-tile objects
-            visible: original_object.visible,
-            tileset_gid: None,
-            sprite_index: None,
-            position: Vec2::new(original_object.x, original_object.y),
-            size: Vec2::new(original_object.height, original_object.width),
-            name: original_object.name.clone(),
-            obj_type: original_object.obj_type.clone(),
-        }
-    }
-
-    pub fn is_shape(&self) -> bool {
-        self.tileset_gid.is_none()
-    }
-
-    pub fn new_with_tile_ids(
-        original_object: &tiled::Object,
-        tile_gids: &HashMap<u32, u32>,
-    ) -> Object {
-        // println!("obj {}", original_object.gid.to_string());
-        let mut o = Object::new(original_object);
-        o.set_tile_ids(tile_gids);
-        o
-    }
-    pub fn set_tile_ids(&mut self, tile_gids: &HashMap<u32, u32>) {
-        self.tileset_gid = tile_gids.get(&self.gid).cloned();
-        self.sprite_index = self.tileset_gid.map(|first_gid| &self.gid - first_gid);
-    }
-
-    pub fn transform_from_map(
-        &self,
-        map: &tiled::Map,
-        map_transform: &Transform,
-        tile_scale: Option<Vec3>,
-    ) -> Transform {
-        // tile scale being None means this is not a tile object
-
-        // clone entire map transform
-        let mut transform = map_transform.clone();
-
-        //// this was made obsolete by Kurble's branch changes
-        // let map_tile_width = map.tile_width as f32;
-        // let map_tile_height = map.tile_height as f32;
-        //// offset transform position by 1/2 map tile
-        // transform.translation -= map_transform.scale * Vec3::new(map_tile_width, -map_tile_height, 0.0) / 2.0;
-
-        let map_orientation: tiled::Orientation = map.orientation;
-        // replacing map Z with something far in front for objects -- should probably be configurable
-        // transform.translation.z = 1000.0;
-        let z_relative_to_map = 15.0; // used for a range of 5-25 above tile Z coordinate for items (max 20k map)
-        match self.shape {
-            tiled::ObjectShape::Rect { width, height } => {
-                match map_orientation {
-                    tiled::Orientation::Orthogonal => {
-                        let mut center_offset = Vec2::new(self.position.x, -self.position.y);
-                        match tile_scale {
-                            None => {
-                                // shape object x/y represent top left corner
-                                center_offset += Vec2::new(width, -height) / 2.0;
-                            }
-                            Some(tile_scale) => {
-                                // tile object x/y represents bottom left corner
-                                center_offset += Vec2::new(width, height) / 2.0;
-                                // tile object scale based on map scale and passed-in scale from image dimensions
-                                transform.scale = tile_scale * transform.scale;
-                            }
-                        }
-                        // apply map scale to object position, if this is a tile
-                        center_offset *= map_transform.scale.truncate();
-                        // offset transform by object position
-                        transform.translation +=
-                            center_offset.extend(z_relative_to_map - center_offset.y / 2000.0);
-                        // ^ HACK only support up to 20k pixels maps, TODO: configure in API
-                    }
-                    // tiled::Orientation::Isometric => {
-
-                    // }
-                    _ => panic!("Sorry, {:?} objects aren't supported -- please hide this object layer for now.", map_orientation),
-                }
-            }
-            tiled::ObjectShape::Ellipse {
-                width: _,
-                height: _,
-            } => {}
-            tiled::ObjectShape::Polyline { points: _ } => {}
-            tiled::ObjectShape::Polygon { points: _ } => {}
-            tiled::ObjectShape::Point(_, _) => {}
-        }
-        transform
-    }
-
-    pub fn spawn<'a, 'b>(
-        &self,
-        commands: &'b mut Commands<'a>,
-        texture_atlas: Option<&Handle<TextureAtlas>>,
-        map: &tiled::Map,
-        map_handle: Handle<Map>,
-        tile_map_transform: &Transform,
-        debug_config: &DebugConfig,
-    ) -> EntityCommands<'a, 'b> {
-        let mut new_entity_commands = if let Some(texture_atlas) = texture_atlas {
-            let sprite_index = self.sprite_index.expect("missing sprite index");
-            let tileset_gid = self.tileset_gid.expect("missing tileset");
-
-            // fetch tile for this object if it exists
-            let object_tile_size = map
-                .tilesets
-                .iter()
-                .find(|ts| ts.first_gid == tileset_gid)
-                .map(|ts| Vec2::new(ts.tile_width as f32, ts.tile_height as f32));
-            // object dimensions
-            let dims = self.dimensions();
-            // use object dimensions and tile size to determine extra scale to apply for tile objects
-            let tile_scale = if let (Some(dims), Some(size)) = (dims, object_tile_size) {
-                Some((dims / size).extend(1.0))
-            } else {
-                None
-            };
-            commands.spawn_bundle(SpriteSheetBundle {
-                transform: self.transform_from_map(&map, tile_map_transform, tile_scale),
-                texture_atlas: texture_atlas.clone(),
-                sprite: TextureAtlasSprite {
-                    index: sprite_index,
-                    ..Default::default()
-                },
-                visible: Visible {
-                    is_visible: self.visible,
-                    is_transparent: true,
-                    ..Default::default()
-                },
-                ..Default::default()
-            })
-        } else {
-            // commands.spawn((self.map_transform(&map.map, &tile_map_transform, None), GlobalTransform::default()))
-            let dimensions = self
-                .dimensions()
-                .expect("Don't know how to handle object without dimensions");
-            let transform = self.transform_from_map(&map, &tile_map_transform, None);
-            commands
-                // Debug box.
-                .spawn_bundle(SpriteBundle {
-                    material: debug_config
-                        .material
-                        .clone()
-                        .unwrap_or_else(|| Handle::<ColorMaterial>::default()),
-                    sprite: Sprite::new(dimensions),
-                    transform,
-                    visible: Visible {
-                        is_visible: debug_config.enabled,
-                        is_transparent: true,
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                })
-        };
-
-        new_entity_commands.insert_bundle((map_handle, self.clone()));
-        new_entity_commands
-    }
-
-    pub fn dimensions(&self) -> Option<Vec2> {
-        match self.shape {
-            tiled::ObjectShape::Rect { width, height }
-            | tiled::ObjectShape::Ellipse { width, height } => Some(Vec2::new(width, height)),
-            tiled::ObjectShape::Polyline { points: _ }
-            | tiled::ObjectShape::Polygon { points: _ }
-            | tiled::ObjectShape::Point(_, _) => Some(Vec2::splat(1.0)),
-        }
-    }
-}
diff --git a/src/tiled_map.rs b/src/tiled_map.rs
new file mode 100644
index 0000000..6afda2b
--- /dev/null
+++ b/src/tiled_map.rs
@@ -0,0 +1,196 @@
+use anyhow::Result;
+use bevy::{prelude::*, reflect::TypeUuid, utils::{HashMap, HashSet}};
+use std::{
+    io::BufReader,
+    path::{Path, PathBuf},
+};
+// objects include these by default for now
+pub use tiled;
+pub use tiled::LayerData;
+pub use tiled::ObjectShape;
+pub use tiled::Properties;
+pub use tiled::PropertyValue;
+
+use crate::layers::TilesetLayer;
+
+// An asset for maps
+#[derive(TypeUuid)]
+#[uuid = "5f6fbac8-3f52-424e-a928-561667fea074"]
+pub struct TiledMap {
+    pub map: tiled::Map,
+    pub image_folder: std::path::PathBuf,
+    pub asset_dependencies: Vec<PathBuf>,
+}
+
+impl TiledMap {
+    pub fn try_from_bytes(asset_folder: &Path, asset_path: &Path, bytes: Vec<u8>) -> Result<Self> {
+        #[cfg(all(not(target_arch = "wasm32"), not(target_os = "android")))]
+        let root_dir = bevy::asset::FileAssetIo::get_root_path();
+        #[cfg(any(target_arch = "wasm32", target_os = "android"))]
+        let root_dir = PathBuf::from("");
+
+        let map = tiled::parse_with_path(
+            BufReader::new(bytes.as_slice()),
+            &root_dir.join(&asset_folder.join(asset_path)),
+        )?;
+
+        // this only works if gids are uniques across all maps used - todo move into ObjectGroup?
+        let mut tile_gids: HashMap<u32, u32> = Default::default();
+
+        for tileset in &map.tilesets {
+            for i in tileset.first_gid..(tileset.first_gid + tileset.tilecount.unwrap_or(1)) {
+                tile_gids.insert(i, tileset.first_gid);
+            }
+        }
+        let image_folder: PathBuf = asset_path.parent().unwrap().into();
+        let mut asset_dependencies = Vec::new();
+
+        for layer in map.layers.iter() {
+            if !layer.visible {
+                continue;
+            }
+
+            for tileset in map.tilesets.iter() {
+                let tile_path = image_folder.join(tileset.images.first().unwrap().source.as_str());
+                asset_dependencies.push(tile_path);
+            }
+        }
+
+        let map = Self {
+            map,
+            image_folder,
+            asset_dependencies,
+        };
+
+        Ok(map)
+    }
+}
+
+/// A component that keeps track of layers within the tiled map.
+pub struct Layers {
+    pub map_layer_entities: Vec<Entity>,
+}
+
+/// A bundle of tiled map entities.
+#[derive(Bundle)]
+pub struct TiledMapBundle {
+    pub map_asset: Handle<TiledMap>,
+    pub layers: Layers,
+    pub materials: HashMap<u32, Handle<ColorMaterial>>,
+    pub transform: Transform,
+    pub global_transform: GlobalTransform,
+}
+
+impl Default for TiledMapBundle {
+    fn default() -> Self {
+        Self {
+            map_asset: Handle::default(),
+            layers: Layers {
+                map_layer_entities: Vec::new(),
+            },
+            materials: HashMap::default(),
+            transform: Transform::default(),
+            global_transform: GlobalTransform::default(),
+        }
+    }
+}
+
+pub fn process_loaded_tile_maps(
+    mut commands: Commands,
+    asset_server: Res<AssetServer>,
+    mut map_events: EventReader<AssetEvent<TiledMap>>,
+    mut map_ready_events: EventWriter<MapReadyEvent>,
+    maps: Res<Assets<TiledMap>>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<ColorMaterial>>,
+    mut query: Query<(
+        Entity,
+        Option<&Children>,
+        &Handle<TiledMap>,
+        &mut Layers,
+        &mut HashMap<u32, Handle<ColorMaterial>>,
+    )>,
+) {
+    let mut changed_maps = HashSet::<Handle<TiledMap>>::default();
+    for event in map_events.iter() {
+        match event {
+            AssetEvent::Created { handle } => {
+                log::info!("Map added!");
+                changed_maps.insert(handle.clone());
+            }
+            AssetEvent::Modified { handle } => {
+                log::info!("Map changed!");
+                changed_maps.insert(handle.clone());
+            }
+            AssetEvent::Removed { handle } => {
+                log::info!("Map removed!");
+                // if mesh was modified and removed in the same update, ignore the modification
+                // events are ordered so future modification events are ok
+                changed_maps.remove(handle);
+            }
+        }
+    }
+
+    for changed_map in changed_maps.iter() {
+        let tiled_map_asset = maps.get(changed_map).unwrap();
+
+        for (
+            entity,
+            children,
+            map_handle,
+            mut layers,
+            mut materials_map,
+        ) in query.iter_mut() {
+            // only deal with currently changed map
+            if map_handle != changed_map {
+                continue;
+            }
+
+            let mut texture_handles = Vec::new();
+
+            // Clear out child entities
+            if let Some(children) = children {
+                for child in children.iter() {
+                    // TODO: Remove tile entities from map before despawning.
+                    commands.entity(*child).despawn_recursive();
+                }
+            }
+
+            for tileset in &tiled_map_asset.map.tilesets {
+                if !materials_map.contains_key(&tileset.first_gid) {
+                    let texture_path = tiled_map_asset
+                        .image_folder
+                        .join(tileset.images.first().unwrap().source.as_str());
+                    log::info!("loading image: {:?}", texture_path);
+                    let texture_handle = asset_server.load(texture_path);
+                    texture_handles.push(texture_handle.clone());
+                    materials_map.insert(
+                        tileset.first_gid,
+                        materials.add(texture_handle.clone().into()),
+                    );
+                }
+
+                if let Some(material) = materials_map.get(&tileset.first_gid) {
+                    // Once materials have been created/added we need to then create the layers.
+                    for layer in tiled_map_asset.map.layers.iter() {
+                        let layer_entity = TilesetLayer::new(entity, &mut commands, &mut meshes, material.clone(), &tiled_map_asset.map, layer, tileset);
+                        layers.map_layer_entities.push(layer_entity);
+                    }
+                }
+            }
+            
+            let evt = MapReadyEvent {
+                map_handle: map_handle.clone(),
+                textures: texture_handles,
+            };
+            map_ready_events.send(evt);
+        }
+    }
+}
+
+// events fired when entity has been created
+
+pub struct MapReadyEvent {
+    pub map_handle: Handle<TiledMap>,
+    pub textures: Vec<Handle<Texture>>,
+}
diff --git a/src/utils.rs b/src/utils.rs
deleted file mode 100644
index 2dfd9c4..0000000
--- a/src/utils.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use bevy::math::Vec2;
-
-pub fn project_ortho(pos: Vec2, tile_width: f32, tile_height: f32) -> Vec2 {
-    let x = tile_width * pos.x;
-    let y = tile_height * pos.y;
-    Vec2::new(x, -y)
-}
-pub fn unproject_ortho(pos: Vec2, tile_width: f32, tile_height: f32) -> Vec2 {
-    let x = pos.x / tile_width;
-    let y = -(pos.y) / tile_height;
-    Vec2::new(x, y)
-}
-pub fn project_iso(pos: Vec2, tile_width: f32, tile_height: f32) -> Vec2 {
-    let x = (pos.x - pos.y) * tile_width / 2.0;
-    let y = (pos.x + pos.y) * tile_height / 2.0;
-    Vec2::new(x, -y)
-}
-pub fn unproject_iso(pos: Vec2, tile_width: f32, tile_height: f32) -> Vec2 {
-    let half_width = tile_width / 2.0;
-    let half_height = tile_height / 2.0;
-    let x = ((pos.x / half_width) + (-(pos.y) / half_height)) / 2.0;
-    let y = ((-(pos.y) / half_height) - (pos.x / half_width)) / 2.0;
-    Vec2::new(x.round(), y.round())
-}
diff --git a/src/view.rs b/src/view.rs
deleted file mode 100644
index 4e24049..0000000
--- a/src/view.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-mod pipeline;
-pub use pipeline::*;
-mod tile_map;
-pub use tile_map::*;
-mod tile_chunk;
-pub use tile_chunk::*;
diff --git a/src/view/pipeline.rs b/src/view/pipeline.rs
deleted file mode 100644
index 280415f..0000000
--- a/src/view/pipeline.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use crate::TileMapChunk;
-use bevy::{
-    prelude::*,
-    reflect::TypeUuid,
-    render::{
-        pipeline::{
-            BlendFactor, BlendOperation, BlendState, ColorTargetState, ColorWrite, CompareFunction,
-            DepthBiasState, DepthStencilState, PipelineDescriptor, StencilFaceState, StencilState,
-        },
-        render_graph::{base, RenderGraph, RenderResourcesNode},
-        shader::{ShaderStage, ShaderStages},
-        texture::TextureFormat,
-    },
-};
-
-pub const TILE_MAP_PIPELINE_HANDLE: HandleUntyped =
-    HandleUntyped::weak_from_u64(PipelineDescriptor::TYPE_UUID, 4129645945969645246);
-
-pub fn build_tile_map_pipeline(shaders: &mut Assets<Shader>) -> PipelineDescriptor {
-    PipelineDescriptor {
-        depth_stencil: Some(DepthStencilState {
-            format: TextureFormat::Depth32Float,
-            depth_write_enabled: true,
-            depth_compare: CompareFunction::LessEqual,
-            stencil: StencilState {
-                front: StencilFaceState::IGNORE,
-                back: StencilFaceState::IGNORE,
-                read_mask: 0,
-                write_mask: 0,
-            },
-            bias: DepthBiasState {
-                constant: 0,
-                slope_scale: 0.0,
-                clamp: 0.0,
-            },
-            clamp_depth: false,
-        }),
-        color_target_states: vec![ColorTargetState {
-            format: TextureFormat::Bgra8UnormSrgb,
-            color_blend: BlendState {
-                src_factor: BlendFactor::SrcAlpha,
-                dst_factor: BlendFactor::OneMinusSrcAlpha,
-                operation: BlendOperation::Add,
-            },
-            alpha_blend: BlendState {
-                src_factor: BlendFactor::One,
-                dst_factor: BlendFactor::One,
-                operation: BlendOperation::Add,
-            },
-            write_mask: ColorWrite::ALL,
-        }],
-        ..PipelineDescriptor::new(ShaderStages {
-            vertex: shaders.add(Shader::from_glsl(
-                ShaderStage::Vertex,
-                if cfg!(feature = "web") {
-                    include_str!("tile_map_webgl2.vert")
-                } else {
-                    include_str!("tile_map.vert")
-                },
-            )),
-            fragment: Some(shaders.add(Shader::from_glsl(
-                ShaderStage::Fragment,
-                if cfg!(feature = "web") {
-                    include_str!("tile_map_webgl2.frag")
-                } else {
-                    include_str!("tile_map.frag")
-                },
-            ))),
-        })
-    }
-}
-
-pub mod node {
-    pub const TILE_MAP_CHUNK: &'static str = "tile_map_chunk";
-}
-
-pub(crate) fn add_tile_map_graph(world: &mut World) {
-    world.resource_scope(|world, mut pipelines: Mut<Assets<PipelineDescriptor>>| {
-        world.resource_scope(|world, mut shaders: Mut<Assets<Shader>>| {
-            let mut graph = world.get_resource_mut::<RenderGraph>().unwrap();
-            pipelines.set_untracked(
-                TILE_MAP_PIPELINE_HANDLE,
-                build_tile_map_pipeline(&mut shaders),
-            );
-            graph.add_system_node(
-                node::TILE_MAP_CHUNK,
-                RenderResourcesNode::<TileMapChunk>::new(true),
-            );
-            graph
-                .add_node_edge(node::TILE_MAP_CHUNK, base::node::MAIN_PASS)
-                .unwrap();
-        });
-    });
-}
diff --git a/src/view/tile_chunk.rs b/src/view/tile_chunk.rs
deleted file mode 100644
index a4116eb..0000000
--- a/src/view/tile_chunk.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-use bevy::{
-    math::{Vec2, Vec4},
-    render::{
-        draw::Visible,
-        mesh::{Indices, VertexAttributeValues},
-        pipeline::{PrimitiveTopology, RenderPipeline},
-        render_graph::base::MainPass,
-    },
-};
-use tiled::{LayerTile, Tileset};
-
-use crate::{loader::TiledMapLoader, Map, TileMapChunk, TILE_MAP_PIPELINE_HANDLE};
-use bevy::prelude::*;
-
-#[derive(Debug)]
-pub struct LayerChunk {
-    pub position: Vec2,
-    pub tiles: Vec<Vec<TileChunk>>,
-}
-impl LayerChunk {
-    pub fn build_uv_mesh(&self, tileset_guid: u32) -> Option<Mesh> {
-        let mut positions: Vec<[f32; 3]> = Vec::new();
-        let mut uvs: Vec<[f32; 2]> = Vec::new();
-        let mut indices: Vec<u32> = Vec::new();
-
-        let mut i = 0;
-        for tile in self.tiles.iter().flat_map(|tiles_y| tiles_y.iter()) {
-            if tile.tile_id < tileset_guid {
-                continue;
-            }
-
-            // X, Y
-            positions.push([tile.vertex.x, tile.vertex.y, 0.0]);
-            // X, Y + 1
-            positions.push([tile.vertex.x, tile.vertex.w, 0.0]);
-            // X + 1, Y + 1
-            positions.push([tile.vertex.z, tile.vertex.w, 0.0]);
-            // X + 1, Y
-            positions.push([tile.vertex.z, tile.vertex.y, 0.0]);
-
-            let mut next_uvs = [
-                // X, Y
-                [tile.uv.x, tile.uv.w],
-                // X, Y + 1
-                [tile.uv.x, tile.uv.y],
-                // X + 1, Y + 1
-                [tile.uv.z, tile.uv.y],
-                // X + 1, Y
-                [tile.uv.z, tile.uv.w],
-            ];
-            if tile.flip_d {
-                next_uvs.swap(0, 2);
-            }
-            if tile.flip_h {
-                next_uvs.reverse();
-            }
-            if tile.flip_v {
-                next_uvs.reverse();
-                next_uvs.swap(0, 2);
-                next_uvs.swap(1, 3);
-            }
-
-            next_uvs.iter().for_each(|uv| uvs.push(*uv));
-
-            indices.extend_from_slice(&[i + 0, i + 2, i + 1, i + 0, i + 3, i + 2]);
-
-            i += 4;
-        }
-
-        if positions.len() > 0 {
-            let mut mesh = Mesh::new(PrimitiveTopology::TriangleList);
-            mesh.set_attribute("Vertex_Position", VertexAttributeValues::Float3(positions));
-            mesh.set_attribute("Vertex_Uv", VertexAttributeValues::Float2(uvs));
-            mesh.set_indices(Some(Indices::U32(indices)));
-            Some(mesh)
-        } else {
-            None
-        }
-    }
-}
-
-#[derive(Bundle)]
-pub struct ChunkBundle {
-    pub map_parent: Handle<Map>, // tmp:chunks should be child entities of a toplevel map entity.
-    pub chunk: TileMapChunk,
-    pub main_pass: MainPass,
-    pub material: Handle<ColorMaterial>,
-    pub render_pipeline: RenderPipelines,
-    pub visible: Visible,
-    pub draw: Draw,
-    pub mesh: Handle<Mesh>,
-    pub transform: Transform,
-    pub global_transform: GlobalTransform,
-}
-
-impl Default for ChunkBundle {
-    fn default() -> Self {
-        Self {
-            map_parent: Handle::default(),
-            chunk: TileMapChunk::default(),
-            visible: Visible {
-                is_transparent: true,
-                ..Default::default()
-            },
-            draw: Default::default(),
-            main_pass: MainPass,
-            mesh: Handle::default(),
-            material: Handle::default(),
-            render_pipeline: RenderPipelines::from_pipelines(vec![RenderPipeline::new(
-                TILE_MAP_PIPELINE_HANDLE.typed(),
-            )]),
-            transform: Default::default(),
-            global_transform: Default::default(),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct TileChunk {
-    pub tile_id: u32,
-    pub pos: Vec2,
-    pub vertex: Vec4,
-    pub uv: Vec4,
-    pub flip_d: bool,
-    pub flip_h: bool,
-    pub flip_v: bool,
-}
-
-impl TileChunk {
-    pub fn from_layer_and_tileset(
-        layer_tile: &LayerTile,
-        tileset: &Tileset,
-        chunk_pos: Vec2,
-        vertex: Vec4,
-    ) -> TileChunk {
-        let tile_width = tileset.tile_width as f32;
-        let tile_height = tileset.tile_height as f32;
-        let tile_space = tileset.spacing as f32;
-        let image = tileset.images.first().unwrap();
-        let texture_width = image.width as f32;
-        let texture_height = image.height as f32;
-        let columns = ((texture_width + tile_space) / (tile_width + tile_space)).floor(); // account for no end tile
-
-        let tile =
-            (TiledMapLoader::remove_tile_flags(layer_tile.gid) as f32) - tileset.first_gid as f32;
-
-        // This calculation is much simpler we only care about getting the remainder
-        // and multiplying that by the tile width.
-        let sprite_sheet_x: f32 =
-            ((tile % columns) * (tile_width + tile_space) - tile_space).floor();
-
-        // Calculation here is (tile / columns).round_down * (tile_space + tile_height) - tile_space
-        // Example: tile 30 / 28 columns = 1.0714 rounded down to 1 * 16 tile_height = 16 Y
-        // which is the 2nd row in the sprite sheet.
-        // Example2: tile 10 / 28 columns = 0.3571 rounded down to 0 * 16 tile_height = 0 Y
-        // which is the 1st row in the sprite sheet.
-        let sprite_sheet_y: f32 =
-            (tile / columns).floor() * (tile_height + tile_space) - tile_space;
-
-        // Calculate UV:
-        let start_u: f32 = sprite_sheet_x / texture_width;
-        let end_u: f32 = (sprite_sheet_x + tile_width) / texture_width;
-        let start_v: f32 = sprite_sheet_y / texture_height;
-        let end_v: f32 = (sprite_sheet_y + tile_height) / texture_height;
-
-        TileChunk {
-            tile_id: layer_tile.gid,
-            pos: chunk_pos.clone(),
-            vertex: vertex.clone(),
-            uv: Vec4::new(start_u, start_v, end_u, end_v),
-            flip_d: layer_tile.flip_d,
-            flip_h: layer_tile.flip_h,
-            flip_v: layer_tile.flip_v,
-        }
-    }
-}
diff --git a/src/view/tile_map.frag b/src/view/tile_map.frag
deleted file mode 100644
index 9683598..0000000
--- a/src/view/tile_map.frag
+++ /dev/null
@@ -1,24 +0,0 @@
-#version 450
-
-layout(location = 0) in vec2 v_Uv;
-
-layout(location = 0) out vec4 o_Target;
-
-layout(set = 1, binding = 0) uniform ColorMaterial_color {
-    vec4 Color;
-};
-
-# ifdef COLORMATERIAL_TEXTURE 
-layout(set = 1, binding = 1) uniform texture2D ColorMaterial_texture;
-layout(set = 1, binding = 2) uniform sampler ColorMaterial_texture_sampler;
-# endif
-
-void main() {
-    vec4 color = Color;
-# ifdef COLORMATERIAL_TEXTURE
-    color *= texture(
-        sampler2D(ColorMaterial_texture, ColorMaterial_texture_sampler),
-        v_Uv);
-# endif
-    o_Target = color;
-}
diff --git a/src/view/tile_map.rs b/src/view/tile_map.rs
deleted file mode 100644
index 5bf518f..0000000
--- a/src/view/tile_map.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use bevy::core::Byteable;
-use bevy::render::renderer::{RenderResource, RenderResources};
-
-#[repr(C)]
-#[derive(Default, RenderResources, RenderResource)]
-#[render_resources(from_self)]
-pub struct TileMapChunk {
-    pub layer_id: f32,
-}
-
-// SAFE: sprite is repr(C) and only consists of byteables
-unsafe impl Byteable for TileMapChunk {}
diff --git a/src/view/tile_map.vert b/src/view/tile_map.vert
deleted file mode 100644
index 8b1d73f..0000000
--- a/src/view/tile_map.vert
+++ /dev/null
@@ -1,23 +0,0 @@
-#version 450
-
-layout(location = 0) in vec3 Vertex_Position;
-layout(location = 2) in vec2 Vertex_Uv;
-
-layout(location = 0) out vec2 v_Uv;
-
-layout(set = 0, binding = 0) uniform CameraViewProj {
-    mat4 ViewProj;
-};
-
-layout(set = 2, binding = 0) uniform Transform {
-    mat4 Model;
-};
-
-layout(set = 2, binding = 1) uniform TileMapChunk {
-    float layer_id;
-};
-
-void main() {
-    v_Uv = Vertex_Uv;
-    gl_Position = ViewProj * Model * vec4(Vertex_Position.xy, layer_id, 1.0);
-}
\ No newline at end of file
diff --git a/src/view/tile_map_webgl2.frag b/src/view/tile_map_webgl2.frag
deleted file mode 100644
index 1cae269..0000000
--- a/src/view/tile_map_webgl2.frag
+++ /dev/null
@@ -1,35 +0,0 @@
-#version 300 es
-
-precision highp float;
-
-in vec2 v_Uv;
-
-out vec4 o_Target;
-
-layout(std140) uniform ColorMaterial_color {  // set = 1, binding = 0
-    vec4 Color;
-};
-
-# ifdef COLORMATERIAL_TEXTURE
-uniform sampler2D ColorMaterial_texture;  // set = 1, binding = 1
-# endif
-
-vec4 encodeSRGB(vec4 linearRGB_in)
-{
-    vec3 linearRGB = linearRGB_in.rgb;
-    vec3 a = 12.92 * linearRGB;
-    vec3 b = 1.055 * pow(linearRGB, vec3(1.0 / 2.4)) - 0.055;
-    vec3 c = step(vec3(0.0031308), linearRGB);
-    return vec4(mix(a, b, c), linearRGB_in.a);
-}
-
-void main() {
-    vec4 color = Color;
-# ifdef COLORMATERIAL_TEXTURE
-    color *= texture(
-        ColorMaterial_texture,
-        v_Uv
-    );
-# endif
-    o_Target = encodeSRGB(color);
-}
\ No newline at end of file
diff --git a/src/view/tile_map_webgl2.vert b/src/view/tile_map_webgl2.vert
deleted file mode 100644
index 35cdb05..0000000
--- a/src/view/tile_map_webgl2.vert
+++ /dev/null
@@ -1,23 +0,0 @@
-#version 300 es
-
-layout(location = 0) in vec3 Vertex_Position;
-layout(location = 2) in vec2 Vertex_Uv;
-
-out vec2 v_Uv;
-
-layout(std140) uniform CameraViewProj {
-    mat4 ViewProj;
-};
-
-layout(std140) uniform Transform {  // set = 2, binding = 0
-    mat4 Model;
-};
-
-layout(std140) uniform TileMapChunk {  // set = 2, binding = 1
-    float layer_id;
-};
-
-void main() {
-    v_Uv = Vertex_Uv;
-    gl_Position = ViewProj * Model * vec4(Vertex_Position.xy, layer_id, 1.0);
-}
\ No newline at end of file