diff --git a/.gitignore b/.gitignore
index 1077e4a..ca570d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 build
-2D_Engine_Casio_Tool
-GameData.bin
-assets/__pycache__
+assets/converters/__pycache__
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 53755ca..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "files.associations": {
-        "fxconv": "python",
-        "*.MIT": "markdown",
-        "complex": "cpp",
-        "string": "cpp",
-        "iterator": "cpp",
-        "string_view": "cpp",
-        "random": "cpp",
-        "fstream": "cpp",
-        "iomanip": "cpp",
-        "iosfwd": "cpp",
-        "istream": "cpp",
-        "ostream": "cpp",
-        "sstream": "cpp",
-        "streambuf": "cpp",
-        "system_error": "cpp",
-        "stdexcept": "cpp",
-        "iostream": "cpp",
-        "ios": "cpp",
-        "vector2d.hpp": "c",
-        "cctype": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "any": "cpp",
-        "array": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "bitset": "cpp",
-        "codecvt": "cpp",
-        "compare": "cpp",
-        "concepts": "cpp",
-        "condition_variable": "cpp",
-        "cstdint": "cpp",
-        "deque": "cpp",
-        "forward_list": "cpp",
-        "list": "cpp",
-        "map": "cpp",
-        "set": "cpp",
-        "unordered_map": "cpp",
-        "vector": "cpp",
-        "exception": "cpp",
-        "algorithm": "cpp",
-        "functional": "cpp",
-        "memory": "cpp",
-        "memory_resource": "cpp",
-        "numeric": "cpp",
-        "optional": "cpp",
-        "ratio": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "utility": "cpp",
-        "initializer_list": "cpp",
-        "limits": "cpp",
-        "mutex": "cpp",
-        "new": "cpp",
-        "numbers": "cpp",
-        "ranges": "cpp",
-        "semaphore": "cpp",
-        "span": "cpp",
-        "stop_token": "cpp",
-        "thread": "cpp",
-        "cfenv": "cpp",
-        "cinttypes": "cpp",
-        "typeindex": "cpp",
-        "typeinfo": "cpp",
-        "valarray": "cpp",
-        "variant": "cpp"
-    }
-}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 3cca5c0..1944ab7 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ ASSETS := \
   assets/props-sheets/lever_sheet.png \
   assets/props-sheets/small_chest_sheet.png \
   assets/props-sheets/big_chest_sheet.png \
-  assets/maps/example.json
+  assets/maps/dungeon_entry.json
 
 # Output target name
 OUTPUT := 2D_Engine_Casio_Tool
@@ -31,7 +31,7 @@ LDFLAGS = -m32 -no-pie
 
 # Converter flags
 FXCONV_FLAGS = --cg --toolchain= --arch=i386 --outputtarget=elf32-x86-64
-FXCONV_CONVERTER = assets/converters.py
+FXCONV_CONVERTERS = assets/converters/map_converter.py
 
 # Change output location
 OUTPUT := $(BUILD_DIR)/$(OUTPUT)
@@ -78,7 +78,7 @@ $(BUILD_DIR)/%.o: %
 	$(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE)+1))))
 	$(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE)*100/$(TOTAL_FILES)))))
 	@echo "[$(PERCENTAGE)%] $(GREEN)Building FXCONV object $@$(RESET)"
-	$(Q)fxconv $(FXCONV_FLAGS) --converter=$(FXCONV_CONVERTER) $< -o $@
+	$(Q)fxconv $(FXCONV_FLAGS) $(FXCONV_CONVERTERS:%=--converter=%) $< -o $@
 	$(Q)objcopy --add-section .note.GNU-stack=/dev/null $@
 
 # Source files dependencies
@@ -95,3 +95,4 @@ end: $(OUTPUT)
 .PHONY: clean
 clean:
 	$(Q)rm -rf $(BUILD_DIR)
+	$(Q)rm -rf $(dir $(FXCONV_CONVERTERS))/__pycache__
diff --git a/assets/converters.py b/assets/converters/map_converter.py
similarity index 92%
rename from assets/converters.py
rename to assets/converters/map_converter.py
index 9d7849b..8f554e5 100644
--- a/assets/converters.py
+++ b/assets/converters/map_converter.py
@@ -13,6 +13,9 @@ def convert_map(input, output, params, target):
     with open(input, "r") as fp:
         map = json.load(fp)
 
+    with open(input.replace(".json", "_entities.json"), "r") as fp:
+        map_entities = json.load(fp)
+
     TRANSFORM_COMPONENT = 0
     SPRITE_COMPONENT    = 1
     ANIMATION_SYSTEM    = 2
@@ -24,7 +27,7 @@ def convert_map(input, output, params, target):
 
     entities = fxconv.Structure()
 
-    for e in map["Entities"]:
+    for e in map_entities["Entities"]:
         entities += u16(e["ID"])
         entities += u32(len(e["Components"]))
 
@@ -70,7 +73,7 @@ def convert_map(input, output, params, target):
     o += ref(background_layer2)
     o += ref(background_layer3)
     o += ref(foreground)
-    o += u32(len(map["Entities"]))
+    o += u32(len(map_entities["Entities"]))
     o += ref(entities)
 
     fxconv.elf(o, output, params["name"], **target)
diff --git a/assets/maps/dungeon_entry.json b/assets/maps/dungeon_entry.json
new file mode 100644
index 0000000..9e59ff0
--- /dev/null
+++ b/assets/maps/dungeon_entry.json
@@ -0,0 +1,135 @@
+{
+    "MapWidth": 32,
+    "MapHeight": 24,
+
+    "BackgroundLayer1": [
+        734, 733, 734, 734, 734, 732, 732, 733, 738, 707, 986, 987, 988, 648, 649, 650, 651, 652, 733, 732, 2069, 2070, 2071, 2072, 733, 734, 734, 734, 733, 1774, 1775, 1776,
+        986, 987, 988, 734, 733, 734, 1432, 734, 733, 734, 1035, 1036, 1037, 697, 698, 699, 700, 701, 734, 2163, 2118, 2119, 2120, 2121, 732, 546, 733, 732, 943, 944, 945, 733,
+        1035, 1036, 1037, 615, 1717, 732, 1481, 733, 732, 1083, 1084, 1085, 1086, 746, 747, 748, 749, 750, 733, 2166, 2167, 2168, 2169, 2170, 594, 595, 596, 991, 992, 993, 994, 995,
+        732, 1085, 1086, 664, 733, 734, 1530, 1531, 732, 733, 733, 734, 734, 795, 796, 797, 798, 733, 1378, 2215, 2216, 2217, 2218, 2219, 643, 644, 645, 1040, 1041, 1042, 1043, 1044,
+        733, 733, 733, 732, 714, 1578, 1579, 1580, 732, 733, 734, 733, 734, 734, 734, 846, 733, 734, 1427, 1428, 2265, 2266, 2267, 1497, 692, 693, 694, 1089, 1090, 1091, 1092, 1093,
+        732, 734, 732, 733, 732, 1627, 1628, 1629, 733, 733, 733, 734, 734, 732, 732, 1287, 734, 734, 1476, 1477, 2314, 2315, 734, 1546, 732, 742, 743, 1138, 1139, 1140, 1141, 1142,
+        733, 732, 732, 732, 734, 1676, 1677, 1678, 734, 732, 733, 734, 733, 85, 35, 85, 85, 36, 36, 733, 1283, 733, 733, 733, 732, 733, 734, 1187, 1188, 1189, 1190, 1191,
+        1923, 732, 733, 733, 732, 1725, 1726, 1727, 1728, 734, 33, 231, 230, 231, 230, 230, 230, 231, 230, 230, 34, 732, 733, 1644, 733, 733, 734, 734, 732, 734, 733, 733,
+        1972, 732, 908, 734, 732, 1774, 1775, 1776, 732, 33, 130, 131, 180, 180, 229, 720, 721, 229, 131, 131, 129, 230, 34, 732, 734, 733, 734, 733, 733, 734, 732, 734,
+        2021, 2022, 733, 733, 959, 732, 1823, 546, 33, 130, 228, 180, 229, 229, 229, 769, 770, 180, 229, 180, 227, 229, 129, 34, 734, 732, 1721, 733, 734, 734, 732, 733,
+        2070, 2071, 732, 733, 1008, 732, 594, 595, 596, 228, 280, 278, 278, 278, 278, 818, 819, 278, 278, 278, 276, 180, 227, 229, 733, 734, 1770, 1771, 733, 733, 734, 732,
+        2119, 2120, 733, 733, 734, 733, 643, 644, 645, 280, 279, 732, 733, 732, 732, 734, 732, 732, 732, 733, 277, 278, 276, 180, 734, 734, 1819, 1820, 733, 734, 734, 732,
+        2168, 2169, 734, 732, 733, 734, 692, 693, 694, 279, 733, 733, 734, 734, 734, 734, 734, 733, 733, 734, 733, 733, 277, 734, 732, 733, 733, 1869, 885, 733, 734, 732,
+        2217, 2218, 2219, 734, 733, 732, 733, 742, 734, 734, 732, 733, 732, 734, 733, 733, 732, 733, 734, 732, 732, 734, 732, 732, 732, 732, 732, 733, 934, 733, 734, 733,
+        2266, 2267, 733, 943, 944, 945, 732, 733, 734, 734, 732, 733, 732, 732, 734, 734, 733, 732, 734, 733, 732, 733, 732, 732, 734, 733, 546, 982, 983, 732, 1432, 733,
+        733, 733, 991, 992, 993, 994, 995, 733, 733, 85, 734, 734, 734, 732, 732, 732, 732, 732, 734, 733, 734, 734, 733, 733, 732, 594, 595, 596, 732, 734, 1481, 732,
+        734, 734, 1040, 1041, 1042, 1043, 1044, 732, 733, 732, 733, 734, 733, 734, 734, 734, 732, 734, 734, 734, 734, 733, 732, 732, 733, 643, 644, 645, 733, 733, 1530, 1531,
+        733, 733, 1089, 1090, 1091, 1092, 1093, 733, 733, 733, 733, 733, 732, 734, 35, 35, 36, 734, 734, 733, 732, 733, 734, 732, 734, 692, 693, 694, 734, 732, 1579, 1580,
+        734, 732, 1138, 1139, 1140, 1141, 1142, 732, 733, 734, 733, 732, 732, 734, 85, 36, 85, 732, 734, 734, 732, 733, 732, 733, 885, 741, 742, 733, 732, 1627, 1628, 1629,
+        732, 732, 1187, 1188, 1189, 1190, 734, 733, 733, 732, 733, 732, 733, 35, 35, 85, 35, 732, 732, 732, 733, 734, 734, 734, 934, 733, 732, 732, 732, 1676, 1677, 1678,
+        733, 734, 733, 734, 1238, 1721, 734, 732, 732, 734, 732, 732, 732, 36, 85, 85, 36, 732, 734, 734, 733, 732, 734, 733, 983, 732, 732, 732, 732, 1725, 1726, 1727,
+        733, 732, 733, 733, 1287, 1770, 1771, 733, 733, 733, 734, 732, 734, 85, 85, 35, 85, 732, 734, 732, 733, 732, 734, 733, 733, 732, 732, 734, 733, 1774, 1775, 1776,
+        734, 732, 734, 734, 734, 1819, 1820, 734, 733, 732, 732, 732, 734, 35, 35, 36, 35, 36, 732, 732, 734, 733, 732, 734, 734, 734, 732, 732, 734, 734, 733, 732,
+        732, 733, 733, 733, 733, 732, 732, 733, 732, 734, 733, 732, 734, 732, 85, 35, 36, 35, 734, 733, 733, 732, 734, 733, 734, 732, 733, 734, 732, 733, 733, 734
+    ],
+    "BackgroundLayer2": [
+        937, 938, 939, 940, 1127, 1128, 1621, 737, 706, 0, 708, 0, 647, 0, 2412, 0, 0, 2414, 2113, 2114, 1298, 1299, 1300, 1301, 496, 497, 1052, 1053, 1773, 895, 896, 0,
+        0, 0, 565, 989, 1176, 1177, 0, 786, 787, 1034, 757, 758, 696, 0, 0, 0, 2412, 0, 702, 2117, 1347, 1348, 1349, 544, 545, 1352, 1101, 1102, 0, 0, 0, 1825,
+        0, 613, 614, 0, 616, 1718, 618, 1482, 1081, 805, 806, 807, 745, 2411, 0, 0, 0, 2413, 751, 1330, 1396, 1397, 1398, 593, 1400, 1401, 990, 0, 0, 0, 0, 0,
+        1084, 662, 663, 0, 1766, 1767, 0, 0, 1479, 854, 855, 1134, 792, 0, 0, 0, 2413, 799, 0, 1379, 1380, 1446, 1447, 642, 1449, 1450, 1039, 0, 0, 0, 0, 0,
+        1133, 1134, 712, 713, 0, 715, 716, 0, 1528, 903, 1182, 1183, 1184, 1047, 1048, 0, 2373, 2352, 0, 0, 1429, 1495, 1496, 0, 1498, 1499, 1088, 0, 0, 0, 0, 0,
+        1182, 1183, 1184, 762, 763, 764, 765, 0, 951, 1382, 953, 954, 0, 1285, 1286, 0, 1288, 0, 0, 1233, 1478, 1235, 2230, 0, 741, 1548, 1137, 0, 0, 0, 0, 0,
+        539, 809, 810, 811, 1675, 813, 814, 0, 1679, 1001, 520, 2454, 1912, 307, 359, 359, 359, 359, 308, 1526, 1592, 2278, 2279, 1595, 790, 791, 1186, 1575, 0, 0, 0, 0,
+        0, 858, 859, 860, 1724, 862, 863, 0, 0, 1442, 307, 359, 359, 355, 0, 0, 0, 0, 354, 359, 308, 1642, 543, 784, 1182, 1183, 1184, 1236, 1479, 1238, 1239, 1240,
+        0, 907, 0, 909, 1773, 911, 912, 497, 709, 307, 355, 0, 0, 0, 0, 0, 0, 0, 0, 0, 354, 359, 308, 1693, 834, 1382, 1672, 1285, 1528, 1287, 1288, 0,
+        0, 956, 957, 958, 0, 1823, 961, 0, 307, 355, 0, 1491, 1492, 1493, 0, 0, 0, 0, 450, 451, 2059, 0, 354, 308, 883, 1720, 0, 1334, 1335, 1336, 1337, 1149,
+        0, 914, 1006, 1007, 0, 1009, 0, 0, 0, 0, 0, 1540, 1541, 1542, 0, 0, 0, 0, 499, 500, 1961, 2009, 0, 132, 508, 1769, 0, 0, 2276, 1196, 1197, 1198,
+        962, 963, 1055, 1622, 1057, 1058, 0, 0, 0, 0, 1230, 0, 0, 1618, 0, 0, 0, 2352, 0, 0, 0, 490, 0, 132, 557, 1818, 0, 835, 1821, 1245, 1246, 1247,
+        1011, 1012, 2170, 1643, 1644, 1645, 0, 0, 0, 0, 2401, 1681, 1682, 0, 0, 0, 0, 0, 1622, 793, 0, 539, 0, 132, 606, 1867, 1868, 933, 0, 1294, 1295, 1296,
+        0, 1061, 893, 1692, 1693, 740, 1381, 0, 84, 793, 0, 0, 506, 0, 0, 0, 0, 0, 0, 0, 0, 2504, 31, 83, 850, 656, 497, 933, 0, 1343, 1344, 1345,
+        0, 941, 2268, 0, 0, 0, 1430, 791, 82, 181, 32, 1573, 0, 2450, 505, 0, 0, 0, 1000, 0, 0, 31, 83, 2114, 2115, 545, 0, 547, 0, 984, 0, 1394,
+        2315, 2316, 0, 1161, 0, 0, 0, 1183, 1184, 356, 82, 32, 0, 0, 0, 0, 0, 0, 0, 31, 181, 83, 0, 2163, 2164, 0, 0, 1031, 1032, 1033, 0, 1443,
+        1207, 1039, 1209, 1210, 0, 0, 0, 2278, 705, 2363, 2362, 82, 181, 182, 182, 181, 181, 181, 181, 83, 2512, 793, 2178, 2212, 642, 0, 0, 0, 1081, 1529, 0, 0,
+        1589, 1590, 1258, 1259, 1260, 1574, 1575, 0, 0, 0, 793, 2366, 2471, 2472, 307, 359, 308, 2422, 2423, 0, 705, 2509, 1182, 1183, 691, 837, 0, 0, 695, 1578, 0, 0,
+        1638, 1639, 1307, 1308, 1309, 1623, 1624, 0, 0, 0, 0, 2401, 0, 0, 310, 0, 358, 2471, 2472, 0, 0, 2513, 0, 2277, 0, 886, 0, 743, 744, 0, 0, 0,
+        1687, 1688, 1356, 1357, 1671, 1672, 1191, 0, 0, 471, 0, 0, 0, 307, 355, 0, 358, 0, 0, 0, 0, 849, 0, 0, 0, 790, 791, 792, 1675, 0, 0, 0,
+        1231, 1232, 1236, 1237, 1720, 1408, 1240, 0, 0, 2463, 0, 0, 0, 310, 0, 305, 357, 0, 1181, 0, 0, 0, 0, 490, 0, 1182, 1183, 707, 1724, 0, 0, 0,
+        1280, 1281, 1454, 1286, 1769, 0, 0, 0, 2461, 0, 1279, 754, 0, 310, 0, 354, 308, 0, 0, 0, 0, 2412, 2415, 539, 1032, 1033, 932, 756, 1773, 0, 0, 0,
+        1329, 1330, 1334, 1335, 1336, 0, 0, 0, 1181, 0, 2462, 0, 0, 356, 306, 0, 354, 308, 0, 0, 2597, 2413, 892, 0, 1081, 980, 981, 805, 806, 1823, 1824, 1825,
+        1378, 1379, 1552, 1553, 494, 1868, 1869, 0, 0, 0, 843, 0, 0, 1000, 356, 306, 0, 358, 0, 793, 0, 0, 2414, 1080, 0, 1029, 1030, 854, 855, 856, 0, 0
+    ],
+    "BackgroundLayer3": [
+        0, 0, 0, 0, 1619, 1620, 1383, 1384, 0, 0, 0, 0, 2415, 0, 0, 0, 0, 0, 653, 2068, 0, 0, 0, 0, 1302, 1303, 498, 893, 894, 0, 0, 0,
+        0, 0, 0, 566, 1668, 1669, 0, 1433, 755, 756, 0, 0, 0, 0, 0, 0, 0, 0, 1280, 2117, 0, 0, 0, 1350, 1351, 0, 547, 942, 0, 0, 0, 946,
+        0, 0, 0, 0, 0, 1480, 0, 0, 804, 0, 0, 0, 0, 0, 0, 0, 0, 1328, 1329, 0, 0, 0, 0, 1399, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 665, 1529, 0, 0, 853, 0, 0, 856, 1193, 0, 0, 0, 0, 1377, 0, 0, 1445, 0, 0, 1448, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 711, 0, 0, 0, 0, 0, 0, 902, 2323, 2324, 2325, 2326, 2327, 845, 0, 847, 848, 0, 0, 1494, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        490, 760, 761, 0, 0, 0, 0, 0, 1630, 952, 2373, 2374, 2375, 2376, 0, 0, 0, 1475, 0, 0, 1234, 1544, 2316, 0, 1547, 0, 0, 0, 0, 0, 0, 0,
+        1874, 1875, 0, 0, 812, 0, 0, 0, 0, 1680, 1002, 1003, 0, 1334, 1335, 1336, 1337, 1524, 1525, 1282, 1592, 1284, 494, 735, 1596, 0, 1574, 0, 0, 0, 0, 0,
+        0, 1924, 0, 0, 861, 0, 0, 0, 0, 661, 1443, 1863, 0, 0, 0, 0, 0, 0, 0, 1331, 1332, 1333, 1643, 0, 785, 0, 1623, 1624, 1237, 0, 1050, 1051,
+        0, 1973, 1974, 0, 910, 0, 496, 0, 1777, 710, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 520, 1692, 833, 0, 1671, 0, 2177, 1286, 1098, 1099, 1100,
+        0, 0, 2023, 867, 0, 960, 545, 0, 547, 548, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 882, 459, 460, 0, 2226, 2227, 1147, 1148, 0,
+        0, 0, 2072, 916, 0, 593, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2412, 0, 0, 0, 358, 1919, 509, 0, 0, 1772, 0, 0, 0,
+        0, 0, 2121, 1594, 966, 642, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 358, 1968, 558, 0, 0, 836, 837, 0, 0,
+        0, 0, 1013, 1014, 1015, 691, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 358, 2017, 607, 0, 0, 0, 886, 0, 0,
+        0, 0, 1062, 894, 895, 736, 741, 0, 310, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 305, 357, 2066, 496, 0, 498, 0, 935, 1383, 1384,
+        1109, 1110, 942, 1112, 1113, 1114, 790, 0, 356, 306, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 305, 357, 0, 544, 0, 0, 0, 548, 1431, 0, 1433,
+        1158, 990, 1160, 0, 1162, 1163, 1164, 2228, 0, 2366, 309, 306, 0, 0, 0, 0, 0, 0, 0, 305, 309, 357, 0, 0, 593, 0, 0, 0, 597, 1480, 0, 1482,
+        0, 1208, 0, 0, 1211, 1212, 0, 0, 0, 0, 0, 356, 309, 309, 309, 309, 309, 309, 309, 357, 0, 0, 0, 0, 0, 0, 0, 0, 646, 0, 0, 0,
+        1256, 1088, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2404, 2405, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2228, 836, 0, 0, 0, 1577, 0, 0, 0,
+        0, 1137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2601, 2602, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1626, 0, 0, 0,
+        0, 1186, 0, 0, 1358, 1359, 1673, 0, 0, 0, 0, 0, 0, 0, 2503, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 935, 657, 658, 659, 0, 0, 0,
+        0, 1404, 1405, 1406, 1407, 0, 1722, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 984, 706, 0, 708, 0, 0, 0,
+        1452, 1453, 0, 1455, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2504, 0, 0, 0, 0, 0, 0, 0, 0, 931, 755, 0, 757, 758, 0, 0,
+        1501, 1502, 1503, 1504, 1818, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 804, 0, 0, 807, 0, 0,
+        0, 0, 1380, 0, 1867, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 853, 0, 0, 0, 0, 0
+    ],
+    "Foreground": [
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1231, 1232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 567, 1431, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1281, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 617, 0, 0, 1483, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 666, 0, 0, 1532, 0, 0, 0, 794, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 1581, 0, 904, 905, 1046, 0, 0, 0, 0, 1426, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2176, 2177, 2178, 2179, 2180, 2181, 2182, 0, 1543, 0, 1545, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2225, 2226, 2227, 2228, 2229, 2230, 2231, 0, 0, 1593, 1594, 0, 736, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1729, 2326, 2327, 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2176, 2177, 2178, 2179, 2180, 2225, 2181, 2181, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 2176, 2177, 2178, 2180, 498, 1778, 2375, 2376, 0, 0, 0, 0, 0, 0, 0, 2225, 2226, 2227, 2228, 2229, 2230, 2279, 2280, 1673, 2178, 2179, 2180, 2181,
+        0, 0, 0, 0, 2225, 544, 2227, 2229, 2230, 2231, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2274, 2275, 2276, 2277, 2278, 2279, 2280, 0, 1722, 1723, 2228, 2229, 2230,
+        0, 0, 915, 0, 2274, 2275, 2276, 2278, 2279, 597, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1917, 1918, 0, 1920, 0, 0, 0, 2277, 2278, 2279,
+        0, 0, 964, 965, 0, 0, 0, 0, 0, 646, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1965, 1966, 1967, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 695, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2014, 2015, 2016, 0, 2018, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 1063, 1064, 896, 0, 0, 743, 744, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2063, 2064, 2065, 2128, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 1111, 0, 0, 0, 946, 2179, 2181, 2182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2112, 2113, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 1159, 0, 0, 0, 0, 0, 996, 2230, 2231, 0, 0, 2306, 2307, 0, 0, 0, 0, 0, 0, 0, 0, 2162, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 1045, 2279, 2280, 0, 0, 2355, 2356, 2424, 0, 0, 0, 0, 0, 2176, 2177, 2211, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 1257, 0, 0, 0, 0, 0, 1094, 0, 0, 0, 0, 0, 0, 2473, 0, 0, 2552, 2553, 2424, 2225, 2226, 2227, 835, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 1306, 0, 0, 0, 0, 0, 1143, 0, 0, 0, 0, 2520, 2521, 2522, 0, 0, 0, 0, 2473, 2274, 2275, 2276, 884, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 1355, 0, 0, 0, 0, 0, 1192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2521, 2522, 0, 0, 0, 933, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 1723, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 982, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 1772, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1031, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 1821, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2323, 2324, 2325, 2326, 2327, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 1870, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2372, 2373, 2374, 2375, 2376, 0, 0, 0, 0, 0
+    ],
+    "HitBoxes": [
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    ]
+}
diff --git a/assets/maps/dungeon_entry.tmx b/assets/maps/dungeon_entry.tmx
index 0e26b73..a300360 100644
--- a/assets/maps/dungeon_entry.tmx
+++ b/assets/maps/dungeon_entry.tmx
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.1" orientation="orthogonal" renderorder="left-up" width="32" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="10" nextobjectid="8">
+<map version="1.10" tiledversion="1.11.1" orientation="orthogonal" renderorder="left-up" width="32" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="12" nextobjectid="12">
  <editorsettings>
-  <export target="dungeon_entry.example" format="example"/>
+  <export target="dungeon_entry.json" format="json"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/tileset.tsx"/>
- <group id="4" name="Background">
-  <layer id="3" name="Background Layer 1" width="32" height="24">
-   <data encoding="base64" compression="zlib">
+ <layer id="3" name="BackgroundLayer1" width="32" height="24">
+  <data encoding="base64" compression="zlib">
    eJx9ljlsU0EQhtfv2c+OAkgcCYlEABGnAiooOSRuKKAAXAENDQ0VIeHogkHiMDRQuAcSjgKQDFKAECSgCBU0QUkeBhLsSAlHaij4V2+HNztvneLT857/zOzsrKueUp9BlREadP8keAPGfaUmQAguo30FXAXXQMnM1Wtac0otB22gPZfcW7d/BUr9BnOBvW+V2VLO2O0FaaUWgkVgEO3n4AV4CYbMnG7o7QZ7wF6wLxfZ1MnsewSdx+CJH/XxfU+g/TSI5o1k4jWbMLYZbAFbwQz6ZsEP8FP7Y/bvhd4ZcBacA+fBQfQfAofBF2h+Bd/AJJjyo/1p3zLz9w/0/2bic+BxXIF1HWAlWGX8OI65A9C7B+6DB+AhKGLsIrgEFkNjCVgKloGWdLw3+foerEUM1oH1Qaxf9ZJnecCP+25C/xYYg+Y4mABjaFd0TMEzsA1628EOsBPsSkf7U86RDUegexQcC2z7ZH7mMnHfW/x+B5qbcKZNUV+zsb8OpsEp6HWD06AH9KZjTUKvK2HddXAjsG2jGBSUUnkVfTVdBj2WziRjSmtvQ+8OuAv6wQAoZu0z1r+HoPsKDIPXxoY12H8a1Nm37mh3qni/k4E7dlWmVzH6JT8e5/czNNoXQBFUDDXwAWMfveh30dAn7OB5w22hsRr069l4bNjcidXZ6N6S9nemS3iY6/txv/5Omd99xgbSGgyScdBtqlXUnjP6/N5q7fYU5go2YO5G3+5rSdl2kOYM9GeDZAyoVvF+/eX3Vmu3pew7wu8Nr9etwo7/NQPx7MgmY0C1SuY5v7daW+aRrOnyjLUdfE/Nfuj3+Lb/vFbRelpTd5yXzF9uc6O48Pj0+7atVKv0b/428H2lfujZvode0vZQ9OtcHsW+n8zeZVEnXG8DjRWUHW+Xb7I+8/jwXKa5IxnbD9fbwH1p9AaEos3jQOt4LpNd9L5R2/U28Phwf7RG3tTgLpXUlTWG5zL10/tGbdfbIP3msaa6X1B2DGTMdL7XvCiXXe8b7SnfBleO05d8p3dI5jg/C8p3Poe/b/JcR9NRrZzvPpHfFIP57gPlO4e/b9wvjX7TZa2U51lQ9hvs+g8h48f7+PvmymGqlfLcXbmXZzGQdcB1ZxvdEZnjLl+4nwVhg/SXn6m8Ezym/wB9MCI6
   </data>
-  </layer>
-  <layer id="5" name="Background Layer 2" width="32" height="24">
-   <data encoding="base64" compression="zlib">
-   eJyNlnuIFVUcx8+9d2buHVN01UpLl7trrJJh+Nwso9J1IfABaqlUGOnuXVFXKU0skkQCCwlrodWgtTBL1tc/4a6KCu72sLeStttDI1DXtdRMkzSjz+n8hjkze2/5x2fO+/f9zXn8zmlMKbUVtsF2qHGUmg+Pekr9nFSqBRJKqQ8lXSPpIt+kmsXkx2eUmgB9XKX6ws1wC/xGh4swEJvFcA67L6KzKhWO14zB7nHqNtDnTcfU9aHcF26i/AftV2B3Mjou8OMA9ZXoV6A5ESqhhLpSeJj8FGxMdaJjS9MmraZPTuzOJ23CxwWknzHuXsaU4cNgGAKd1C/0o3ZqKV+gfiT9l8GzsBymUbeC9Dk4EfvfgPuxX0+/9aJ/Gu0OL2z/hLEzGTsLFtO3f6qrdlbq5tG3Ct6HLbAam42kW6GXk1+/1jF2D9H3U/Hhc9IvJP8nY9dgfyN93oZ3oJ/2Q+xVoj/cmo836N8G7a4pf0/6AzxUQN+2ew3Nv+A6/C36zWjnGL+HdK/8p0c5LfZ9N7R1BBsfU/6GtClj6k5hpwfz+XQB/QG034ndoXAXrKXvMNK7RWsd5U7yPv3q+c8V7JlRNNTEGA1X0B5L/9Nod8A48rcyth9sQn+Il9+Hx2h/HJ6AffSZQ/qktc6b3KjmvERXG3MtPxZgI4u/RbF1O+qY/fQtaRu0y5ysFa1XU+Z8riN9LWXO7UdJo51PMx+2Hw3YmiDr97Jn1k3vp4wbXbd99NkPB8SPLHN8UPI3qt3CpxW6Z0I/tA9LsbNb5r0czXv0GulzDSvl/+vocx4uiObFAmf1v7jE5zI04vt3EldegutkOq11P4l/29HdATuhBa1WyJKfSb9S0kF59upXVt302D4aHotHZxOh/jDW73bxpwKdYvLHsXUCfoJL1F2G5/FrIXYXQW2effoUGq9TX1dgD2vfb0uFZyrQn0N+EpqT4T1p76njERTJHijDj5W0veWZPXOSMdXS9ogK7Wqu3cBeOKRjIukMPVd6LyfNXg70H9TxCMaLxg7qf8xEbdS75txOJ78LSrSf8u912L8a8+OM5WOgre/Dioy5g3T9HZK2S99n0OiOrR6yfq/E1j04t1UJ40fJ//x3VnydIeWlaC+z/iuDLR+6ic676Dc75m7YA3tj+jqOHcTncfh3nx/ORZOwK4bWPeyb9VrN2M0ZcwfZNvV9etU6+2OY03I4S/0v8CsM9rrGSm3zAWxXQbUfxkN9xkdRHi1zqP390g/j3gf6XWCtTTPloZbtHPkaGIBPA6EYZlGeXeAMBPlyWf9cIvQpaDsi+VMy98tFvwPtM7H5WI/OBpis3yj6rvVMrNxirUVbbK/ZMTGX5zxMi8Wv4A7qL/eb3fY1OoflbjjmmFi5yg3vhn/3YSy+BP8+gk+15BvyxKwgDgVr0Zo091ukH1pJ2Cl3emesvUG0FW2/J6P6QYyP6+o34RLfxKFgv2/WcS5p7je77wjXvNvsuyGiL/+10ZoDfR5HFvChrJt5k72QCvf7UfLHUuE7Ut9vJWnz/pzrmndbEX71hvMJEyunpKN+TLLWVMca24dgD9hxUr/Jx4rvHmnaCd+Rs61+/wBAje4m
+ </layer>
+ <layer id="5" name="BackgroundLayer2" width="32" height="24">
+  <data encoding="base64" compression="zlib">
+   eJyNln1oVWUcx8+995xz7zGlllZaOu5WTNEw1HRZRqVrEKiBWiolRuruRJ3iS8siSSSwkLAGTYOm4Utrpv4TbiomuJXau+LW1otGoM5p+ZImaUafp+d3OM85O5f643Oet9/z+/6e99OQsqxt8BFsh0rbsubC065l/ZK0rGZIWJb1qaSrJV3g6VSxkPzYjGWNg96OZfWB2+B2uIjBJRiAz0L4Db+vorMyFfRXjMLvcerWY/Ouret6U+4DN1H+g/arsDsZ7ufHsZ/6cvTL0HwcyqGIumJ4gvxEfDxph/sWp3VagU1O/M4lbSTGeaRf0O9B+pQQw0AYBF3Uz/fCfqooX6B+BPbL4AWohknULSd9CU5ExuvzMP5rsVsn+qfR7nSD9kP0nUrfabAQ236p7tpZqZuN7Rz4AOphFT4bSLfBLXa8fpWt/R7G9nOJ4UvSryT/J31X438DNhvhfeir4hB/5egPM+bjHezbocPR5R9If4TH8uibfq+j+RfcgL9FvwntHP33kO6VcbqU0+LfcwJfR/FxkPIx0saMrjuFn17M5+I8+v1pH4zfIXAvrMF2KOl9orWWchd5D7taxrmcPXM/DZURRsJVtEdjfxrtThhD/g769oVN6A9y42N4hvZnYQbsw2Ym6XPGOm9ywpqzE919zDLimIePLPEWRNat1db76TvSduiQOVkjWm+m9PlcS/pWSp/bz5JaO04zDjOOOnyNk/V73dXrpvZTxgmv2z5sPoH9EkeWOT4geVP7GH1aoc3prtvMpwV6ZoI4VAxL8bNb5r2Ufg+oNVLnGlbI+GuwOQ8XRPNSnrPqqDFAOmYdL/O5Ag3E/r3cK6/BDTJdhv1J4tuO7g7YCc1otUCW/FTsiknvjtmr3xh1kyP6wyL30dlEoD+U9btL4ilDp5D8cXydgJ/hMnVX4GXimo/fBVAVM77n0Xib+po8e1jFfmcqOFO+/kzy49GcAFul/WZ1H0GBrGMJcayg7T1X75mT9KmQtqeswK/i+v/Yh4fVnUg6Rc2V2stJvZd9/UfVfQRjRWMH9T9lwj5qHX1uJ5PfBUUqThl7Df6vReI4Y8Toa6v3sCyj3yBVf4+kHWK7BI2e+Ool6/dGZN39czsnoeMo+o9xZyXWKVJeivYyY1wZfHnQQ3Q2o99k67dhD+yN6Kt77AAxjyG+h7xgLhqFXRGU7hFPr9cq+m7J6DfI9Kne02vG+R3FnJbCWerPwa8w0O1+Vyqfj+C7Hj70gvtQnfFqyi/KHKp4v/aCe+9j9V9grE0T5SGG7xz5SuhPTAOgEKZRnp7nDPj5Uln/XCKIyW87KvlTMvfVot+J9pnIfKxDZz1MUP8o6q119V1Zb6xFe2SvmXdiLuY8TIrcX/4b1E/eN7PtW3SOyNvQZuu7cqUTvA3/7sPI/eKPfTifCsnXxdxZ/j3kr0VLUr9vITu0krBT3vSuSHudaFu0/Z4M6/t3fFRX/RMu8vQ95O/3LeqeS+r3zbQd7uj/NvNtCOnLuDYYc6DO44g8MZT00P9kr6SC/d5Kvi0V/Eeq960orf8/Zzn6v62AuG6F8wl9V05Mh+MYb6ypumvMGPw9YN6T6p98tMTukqbt4D9yumH3D5OQ8mQ=
   </data>
-  </layer>
-  <layer id="7" name="Background Layer 3" width="32" height="24">
-   <data encoding="base64" compression="zlib">
-   eJy1lltsTEEYgM/udrttwgtqK/VCNBWJiGLrEhGSXlDUbakmiKhLQiI88KDthlTdxTXSxJNGkLilVWnwIIg2eJIQL9p6EFIiVLd4EN9k/7XjdM7e6MN35pzZmfn+mfPPznFZluXSWJFpWSthi9eytnr//k2xI3tgneK427JysgbW+xkjF3p5qPVYVp3H3F9RxBj1uA9kRp4b6feNuj63c58/0LbE5i+lrkzmMI4xbtjczQ6xdGjzzo8Tb5TJtC80rNUeQ10iGonzp9YvqPkrub+aMbDPBq39Je3+SpL+9jjr24BzBO88B0aCH3JhscRVQblUi/FVinPu4fJDzdkhhnXkQhvjl+AshTKYb8vBR5rzBeuTTZ+h0mZIZnz/ch8574s9TzS875OM0UP9R/mtCN90mAEzoQ/C4FF1tPVSfqZhF3OaLf6COHHUa/61Bv85xmlSueyLP5eptJkGAdgmvmEy3mqeK+Gl5E8e5Wi5b2XcOzL2CWn/xRUpv9LnSTL7TyOb9hfoN0/GOiix7GN/+ohtId5yWKTl8nv8G6X9A8qx4lT7Nj9Ff5RdjPOMm+cyl2b8LbAXb41tH42i/qz4l6Xp227Ly81cQszrlytW98khDxbgn6XWmhj2p+m3o/y38E/SxitWe8mQY2Hq+uE7tPxH/1v8623j7Tb4CzIiZ0MIumn/TvoUudJzF3LZBMOzYrncK+VlT+x8C+JdlRE5Gyop10AV+CXGai5TUowh6lb3Y2xzV7l8Xv6v1PnWgKsT1yHJxyOUR+EY3JbzbA55FUgiDuUNaG6XIZeD7tj59lTKNm0v3OP+vuGMia5FIA6614kGWzwfcM118P0rav2Kbbk2wbD/dg6S30SVwX9R8y/hnVTA4QTnVrvDd5gJle+nWPfTcMawt2vw1UIdhCQn7ibwp8Jr/A/F+9jmv4bvujhvpvG91JHEOjR5It+R6j5M2a/F8AZnJ3RBN+QlOGPTRf+OHG/4/6uWuZcPkj9ocCp+A7wWfQ4=
+ </layer>
+ <layer id="7" name="BackgroundLayer3" width="32" height="24">
+  <data encoding="base64" compression="zlib">
+   eJy1lltsTEEYgM/ptt1uwwuqlXohmkpFRLF1iQhJLyjqtlQTRLRISIQHHvQSUnUX10gTTxpB4pYWafAgiDZ4khAv2noQUiJUt3gQ32T/teN0zt7Cw3fmnNmZ+f6Z88/OsS3LsjVWpFvWSticZllb0v7+TbHdN7hOcSzFsrIyBtdnM0YO9PFQ57Gseo+5v6KIMRpx708PPTfT7xt1/Snuff5A2xKHv5S6MpnDOMa47nC3usTSqc07L0q8YSbTvtCwVrsNdbFoJs6fWr+A5q/k/krq4D4btPYXtfvLcfo7oqxvE84RvPMsGAnZkAOLJa4KyqVajK8SnHMvlx9qzi4xrCMX2hm/BGcplMF8Rw4+0pwvWB8ffYZKmyHp0f3LveS8N/I80fC+TzBGL/Uf5bcifNNhBsyEfgiCR9XRNo3yMw27mdNs8edHiaNR8681+M8yTovKZW/0uUylzTTww1bxDZPxVvNcCS8lf3IpR8v9bca9I2Mfl/Zf7FD5lT5P4tl/Gj7an6ffPBnrgMSyl/3pJbaFeMthkZbL7/FvlPYPKMeKU+3bvAT9YXYyzjNunstcWvG3wR68tY59NIr6M+JflqRvmyMvN3FpYF6/7EjdJ5c8WIB/llprYtiXpN+J8t/EP0kbr1jtJUOOBakbgO/Q9g/9b/Gvd4y3y+DPTw2dDQ3QQ/t30qfITs5dyKUGhmdEcrlPykueyPkWwLsqNXQ2VFKugSrIlhiruUxJMIawW92Pccxd5fI5+b9S51sTri5cByUfD1MegaNwS86zOeSVP444lNevuW1DLgdSIufbUynbtb1wj/v7hjMmvBb+KOheN5oc8XzANdfFZ4yBtahx+QZxotav2JFrBYb9tyMBv4mCTMuakBlf2yqD/4LmX8I7qYBDMc6tjjjXwJZ8P8m6n4LThr1di68O6qFBcuJuDH8ivMb/ULyPHf6r+K6J80YS30udcaxDiyf0Hanug5QDWgxvcHZBN/RAbowzNln078jxhv+/apl7+X/yBwxOxW+ouH5Q
   </data>
-  </layer>
- </group>
+ </layer>
  <layer id="6" name="Foreground" width="32" height="24">
   <data encoding="base64" compression="zlib">
-   eJy9lrtLw1AUh2+TmoeTirZCQXDTxUlBdFLUKgjiIv4NriLURamPVrvqILiKWAeV1kfBToJODjqJOmip1VZw6iz4C0lomt7U3N7q8NGS9Jzv9Nzcc+MhhHjqwJ2XkHsvf55+gZCdhtpihRrj7MwJpe+3dcrJwq7F/23zB8T/raVH0j834Y0BP2WNt/6xR2GFkBWwCtbAOoiAqKLfV4x6G6W/8SfgSYJTcAbOwQVIKaXfDMA9aPgzAr/zCrn8KiHtIAvPG8iBd/AB8qCg0HuTMPoTUdy5rDm0+CIuFuEfh3tCra03Zn0xqXLdaDk6BT0HrbfVqNYb7f4l/GmpvDYzdluszGHGz9SwhksyIcuy0VO5/J61NvPaNfw3Dns7yug/gu8YnMhscU6kGP0v8L6CjOHPuqyjC7OlG4QtfcjDXWD0N6GvzaAFTLt8dmZtcy0p6s+pdba4ZQi/H2aI2XA4N3Ni5fMvYg96f9mHGvOMNdPwecv3j0Yv3H1gUaXXZM6PPQb/p8P/D1KuH8ATB4e2HoSMmqwzaMTlWRlwOL9CFP8jHE/gWaXXZJ0fCy79kw7+OMP7lL0mjX3Od4U05xn6wOn/4vQrnO+jHRzzsxVr0QZ8aunsZs0xxeEfhW8MBNXqZ/cPhvR1yg==
+   eJy9lrtLw1AUh2+TmIeTirZCQXDTxUlBdFLUKgjiIv4NriLootRHq111EFxFsINK66NgJ0EnB51EHbTUais4dVIQ/IUkNE2TmNtbHT5akpzznZyb+/ARQnw14EYg5FZgz9PLEbJdV10sV2WclRmu9P+6Rjlp2DH5vy3+IP+/tXSJ2u8GvDEQsBnjzX/sUVgmZBmsgFWwBiIgKmv3Zb3eevFv/Al4kuAYnIBTcAZScumZPrj7dX+GY3deIFdAIaQVZOF5ATnwCt5AHhRk+94k9P5EZG8ucw41voiLRfhH4R5TquuNUV9MrBw3uxztnJbDrrduuPVGvX8Of1osr82I3eIrcxjxU1WM4aJEyJKk91Qqv2euzbh2Cf+Vw9yOUvoP4DsERxJdnBMpSv8TvM8go/uzHuvowNrSCcKmPuThLlD6G9DXRtAEJj1+O9OWdS3Ja9+peW3xygCeH6SIWXfYN3N85ffPYw4Kv8xDlVnKmu3wC+XzR6Ub7h6w4FCDsX7sUvjfHd4/5HKeiJv8n/j/pddkXoOGPO6VQYf9a97Gfw/HA3i0ef+4ZX2e8+gfd/DvU5yn7GraYzwrpBn30DtG/wejX2Y8j7YxrJ/NGIsW4FdKezdtjgkG/zB8IyCkuO/dP8HZdHQ=
   </data>
  </layer>
 </map>
diff --git a/assets/maps/dungeon_entry_entities.json b/assets/maps/dungeon_entry_entities.json
new file mode 100644
index 0000000..c712587
--- /dev/null
+++ b/assets/maps/dungeon_entry_entities.json
@@ -0,0 +1,3 @@
+{
+    "Entities": []
+}
\ No newline at end of file
diff --git a/assets/maps/hiitboxes.tsx b/assets/maps/hiitboxes.tsx
new file mode 100644
index 0000000..6c8a029
--- /dev/null
+++ b/assets/maps/hiitboxes.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.11.1" name="hiitboxes" tilewidth="16" tileheight="16" tilecount="2" columns="2">
+ <image source="hitboxes.png" width="32" height="16"/>
+</tileset>
diff --git a/assets/maps/hitboxes.png b/assets/maps/hitboxes.png
new file mode 100644
index 0000000..2073790
Binary files /dev/null and b/assets/maps/hitboxes.png differ
diff --git a/assets/maps/tiled-python-extension/json_export_tool.py b/assets/maps/tiled-python-extension/json_export_tool.py
index 4dfb4a7..85b11ff 100644
--- a/assets/maps/tiled-python-extension/json_export_tool.py
+++ b/assets/maps/tiled-python-extension/json_export_tool.py
@@ -1,5 +1,4 @@
 from tiled import *
-import json
 
 class Json_Export_Tool(Plugin):
     @classmethod
@@ -13,27 +12,20 @@ class Json_Export_Tool(Plugin):
     @classmethod
     def write(cls, tileMap, fileName):
         with open(fileName, 'w') as fileHandle:
+            print("{", file=fileHandle)
+            print(f'    "MapWidth": {tileMap.width()},', file=fileHandle)
+            print(f'    "MapHeight": {tileMap.height()},\n', file=fileHandle)
+
             for i in range(tileMap.layerCount()):
                 if isTileLayerAt(tileMap, i):
                     tileLayer = tileLayerAt(tileMap, i)
-                    for y in range(tileLayer.height()):
-                        tiles = []
-                        for x in range(tileLayer.width()):
-                            if tileLayer.cellAt(x, y).tile() != None:
-                                tiles.append(str(tileLayer.cellAt(x, y).tile().id()))
-                            else:
-                                tiles.append(str(-1))
-                        line = ','.join(tiles)
-                        if y == tileLayer.height() - 1:
-                            line += ';'
-                        else:
-                            line += ','
-                        print(line, file=fileHandle)
-        return True
+                    print(f'    "{tileLayer.name()}": [', file=fileHandle)
+                    for cell_y in range(tileLayer.height()):
+                        row = []
+                        for cell_x in range(tileLayer.width()):
+                            row.append(tileLayer.cellAt(cell_x, cell_y).tile().id())
+                        print("        " + ", ".join(str(tile) for tile in row) + ("," if cell_y != (tileLayer.height() - 1) else ""), file=fileHandle)
+                    print("    ]," if i != (tileMap.layerCount() - 1) else "    ]", file=fileHandle)
+            print("}", file=fileHandle)
 
-    def write(cls, tileMap, fileName):
-        map = {}
-        with open(fileName, 'w') as fileHandle:
-            for i in tileMap.layerCount():
-                tileLayer = tileLayerAt(tileMap, i)
-                print("caca", file=fileHandle)
+        return True
diff --git a/src/game_data/maps.hpp b/src/game_data/maps.hpp
index 98f0492..7548137 100644
--- a/src/game_data/maps.hpp
+++ b/src/game_data/maps.hpp
@@ -18,10 +18,10 @@ typedef struct map_t {
     const entity_t *entities;
 } __attribute__((packed, aligned(4))) map_t;
 
-extern map_t map_example;
+extern map_t map_dungeon_entry;
 
 static const map_t *MAPS[] = {
-    &map_example
+    &map_dungeon_entry
 };
 
 #define NB_MAPS 1