diff --git a/core/assets/bazaar.png b/core/assets/bazaar.png
new file mode 100644
index 0000000..d5dca56
Binary files /dev/null and b/core/assets/bazaar.png differ
diff --git a/core/assets/bazaar.tsx b/core/assets/bazaar.tsx
new file mode 100644
index 0000000..ac51b72
--- /dev/null
+++ b/core/assets/bazaar.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.4" tiledversion="1.4.3" name="bazaar" tilewidth="32" tileheight="32" tilecount="40" columns="8">
+ <image source="bazaar.png" width="256" height="160"/>
+</tileset>
diff --git a/core/assets/dark-wood.png b/core/assets/dark-wood.png
new file mode 100644
index 0000000..a58e23c
Binary files /dev/null and b/core/assets/dark-wood.png differ
diff --git a/core/assets/floor.tsx b/core/assets/floor.tsx
new file mode 100644
index 0000000..39544e6
--- /dev/null
+++ b/core/assets/floor.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.4" tiledversion="1.4.3" name="floor" tilewidth="32" tileheight="32" tilecount="12" columns="3">
+ <image source="table.png" width="96" height="128"/>
+</tileset>
diff --git a/core/assets/furniture.tsx b/core/assets/furniture.tsx
new file mode 100644
index 0000000..5656284
--- /dev/null
+++ b/core/assets/furniture.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.4" tiledversion="1.4.3" name="furniture" tilewidth="32" tileheight="32" tilecount="512" columns="16">
+ <image source="dark-wood.png" width="512" height="1024"/>
+</tileset>
diff --git a/core/assets/houseInside.tsx b/core/assets/houseInside.tsx
new file mode 100644
index 0000000..445b1ed
--- /dev/null
+++ b/core/assets/houseInside.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.4" tiledversion="1.4.3" name="houseInside" tilewidth="32" tileheight="32" tilecount="176" columns="11">
+ <image source="tileset_other.png" width="368" height="512"/>
+</tileset>
diff --git a/core/assets/map2.tmx b/core/assets/map2.tmx
index f273ebe..ad0cc3b 100644
--- a/core/assets/map2.tmx
+++ b/core/assets/map2.tmx
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="41">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="45">
  <tileset firstgid="1" source="nice2.tsx"/>
+ <tileset firstgid="484" source="terrain.tsx"/>
  <layer id="1" name="Kachelebene 1" width="100" height="100">
   <data encoding="csv">
 234,233,235,234,234,232,236,234,236,232,232,233,234,236,232,234,233,236,237,237,234,237,236,233,235,237,233,235,234,237,232,235,233,234,232,234,235,232,236,236,235,235,236,232,232,235,237,236,232,232,232,237,232,236,233,232,235,232,237,235,235,233,236,234,232,232,235,235,236,235,237,233,237,233,235,234,236,234,233,232,235,233,236,233,237,235,232,237,233,234,237,232,234,232,234,233,236,232,237,235,
@@ -144,10 +145,10 @@
 200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
 200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
 200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
-200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
-200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
-200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,302,302,302,302,302,302,302,302,302,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
-200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,322,323,323,323,323,323,323,323,323,323,324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
+200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,829,829,829,829,829,829,829,829,829,829,829,829,829,
+200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
+200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,301,302,302,302,302,302,302,302,302,302,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
+200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,322,323,323,323,323,323,323,323,323,323,324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,829,829,829,829,829,829,829,829,829,829,829,829,829,
 200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,322,323,323,323,323,323,323,323,323,323,324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
 200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,322,323,323,323,260,261,323,323,362,323,324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
 200,201,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,322,323,323,323,281,282,323,323,323,323,324,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,199,200,
@@ -236,7 +237,9 @@
   <object id="30" x="0" y="3168" width="3200" height="32"/>
   <object id="33" x="0" y="0" width="64" height="3200"/>
   <object id="35" x="0" y="0" width="3200" height="64"/>
-  <object id="37" x="3136" y="0" width="64" height="3200"/>
+  <object id="42" x="3136" y="0" width="64" height="1184"/>
+  <object id="43" x="3136" y="1312" width="64" height="1664"/>
+  <object id="44" x="3136" y="2976" width="64" height="192"/>
  </objectgroup>
  <objectgroup id="4" name="tuerebene">
   <object id="40" x="192" y="2720" width="64" height="64">
@@ -247,5 +250,13 @@
     <property name="id" type="int" value="0"/>
    </properties>
   </object>
+  <object id="41" x="3136" y="1184" width="64" height="128">
+   <properties>
+    <property name="destinationDoor" type="int" value="0"/>
+    <property name="destinationMap" type="int" value="4"/>
+    <property name="exit" type="int" value="1"/>
+    <property name="id" type="int" value="1"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/core/assets/map3.tmx b/core/assets/map3.tmx
new file mode 100644
index 0000000..398ac53
--- /dev/null
+++ b/core/assets/map3.tmx
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="20" height="16" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="25">
+ <tileset firstgid="1" source="floor.tsx"/>
+ <tileset firstgid="13" source="furniture.tsx"/>
+ <tileset firstgid="525" source="houseInside.tsx"/>
+ <tileset firstgid="701" source="nice2.tsx"/>
+ <tileset firstgid="1184" source="tileset.tsx"/>
+ <tileset firstgid="1822" source="worldborder.tsx"/>
+ <layer id="1" name="Kachelebene 1" width="20" height="16">
+  <data encoding="csv">
+1824,1822,1822,1822,1822,1822,1822,1822,1822,1822,1822,1822,1822,1822,1822,1822,1822,1822,1822,1825,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1826,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1823,
+1828,1827,1827,1827,1827,1827,1827,1827,5,5,5,5,1827,1827,1827,1827,1827,1827,1827,1829
+</data>
+ </layer>
+ <layer id="2" name="Kachelebene 2" width="20" height="16">
+  <data encoding="csv">
+0,195,196,0,0,0,0,0,393,394,395,390,0,322,323,324,325,0,85,0,
+0,211,212,0,0,0,0,0,409,410,411,406,0,338,339,340,341,0,101,0,
+0,0,0,0,0,0,0,0,425,426,427,422,0,354,355,356,357,0,117,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,97,98,99,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,281,113,114,115,282,0,0,0,0,429,430,0,0,0,0,
+0,0,0,0,0,0,113,114,115,0,0,0,0,0,445,446,0,0,0,0,
+0,0,0,0,0,281,129,130,131,282,0,0,0,0,461,462,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,155,155,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,18,19,20,21,22,0,0,0,0,0,0,0,0,0,0,0,0,366,0,
+0,34,35,36,37,38,0,0,0,0,0,0,0,0,0,0,0,0,382,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,398,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,24,42,42,24,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="3" name="Objektebene 1">
+  <object id="3" x="0" y="0" width="640" height="32"/>
+  <object id="4" x="608" y="32" width="32" height="480"/>
+  <object id="5" x="384" y="480" width="224" height="32"/>
+  <object id="6" x="0" y="480" width="256" height="32"/>
+  <object id="7" x="0" y="32" width="32" height="448"/>
+  <object id="8" x="32" y="32" width="64" height="32"/>
+  <object id="11" x="32" y="333" width="161" height="35"/>
+  <object id="12" x="160" y="160" width="32" height="32"/>
+  <object id="13" x="160" y="224" width="32" height="32"/>
+  <object id="14" x="288" y="160" width="32" height="32"/>
+  <object id="15" x="288" y="224" width="32" height="32"/>
+  <object id="17" x="200" y="145" width="80" height="108"/>
+  <object id="18" x="256" y="32" width="128" height="64"/>
+  <object id="19" x="430" y="31" width="104" height="58"/>
+  <object id="20" x="450" y="192" width="60" height="59"/>
+  <object id="22" x="453" y="263" width="52" height="18"/>
+  <object id="23" x="577" y="327" width="30" height="84"/>
+ </objectgroup>
+ <objectgroup id="4" name="tuerebene">
+  <object id="24" x="256.5" y="489.5" width="126.5" height="23">
+   <properties>
+    <property name="destinationDoor" type="int" value="1"/>
+    <property name="destinationMap" type="int" value="4"/>
+    <property name="exit" type="int" value="0"/>
+    <property name="id" type="int" value="0"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/core/assets/map4.tmx b/core/assets/map4.tmx
new file mode 100644
index 0000000..60f54ae
--- /dev/null
+++ b/core/assets/map4.tmx
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="35" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="24">
+ <tileset firstgid="1" source="tileset.tsx"/>
+ <tileset firstgid="639" source="terrain.tsx"/>
+ <tileset firstgid="2687" source="bazaar.tsx"/>
+ <tileset firstgid="2727" source="nice2.tsx"/>
+ <layer id="1" name="Kachelebene 1" width="35" height="30">
+  <data encoding="csv">
+256,206,140,140,128,169,206,210,233,204,227,207,256,210,204,207,169,206,140,205,207,227,169,207,207,207,256,128,140,169,207,227,128,207,205,
+207,169,128,210,204,128,233,207,233,207,207,227,169,210,128,227,207,169,204,206,256,206,233,204,210,206,227,140,204,233,207,227,206,206,140,
+233,205,210,233,207,207,227,204,256,204,140,207,128,256,206,207,207,140,140,207,206,169,207,169,233,256,140,210,256,205,206,256,227,233,207,
+169,206,169,227,205,233,169,256,128,207,207,227,207,207,206,206,233,140,205,227,227,210,140,207,205,206,140,227,210,205,140,204,205,140,204,
+233,210,233,210,205,205,256,169,205,169,205,169,207,204,233,204,205,205,206,140,256,206,205,210,205,256,256,169,256,204,205,210,256,233,169,
+210,233,206,206,233,210,205,128,210,233,227,233,205,205,204,140,206,204,206,169,128,206,205,128,128,140,169,169,205,207,210,207,227,206,128,
+206,206,207,210,206,233,227,256,206,204,128,140,227,210,140,205,227,233,206,210,140,256,227,206,204,227,227,233,210,204,169,256,140,233,204,
+233,227,205,128,207,210,256,210,227,233,140,140,169,227,210,233,204,227,256,205,128,207,128,210,205,256,210,140,128,207,128,227,128,140,227,
+227,140,210,140,206,233,210,233,227,169,227,204,207,128,140,128,204,233,169,128,207,169,210,256,128,207,204,207,207,204,210,204,206,204,205,
+256,169,169,227,227,207,128,204,207,207,206,169,205,233,205,233,256,233,210,233,984,984,256,204,233,233,128,169,140,256,227,169,207,205,233,
+128,140,227,169,128,207,128,204,206,210,206,128,128,227,227,256,227,128,984,205,140,207,207,169,227,207,204,140,205,227,207,210,210,256,169,
+206,169,206,128,210,256,128,207,204,204,205,204,204,205,169,206,227,210,984,169,169,227,207,227,140,233,169,169,205,207,128,210,204,205,206,
+207,204,128,227,205,233,169,140,128,205,256,227,256,204,204,256,233,206,210,207,233,233,233,140,207,207,210,128,128,204,169,256,207,256,140,
+169,207,169,128,204,256,169,210,256,140,210,204,169,256,169,205,204,984,169,205,169,210,206,985,984,210,207,205,204,256,140,169,128,207,210,
+128,233,128,205,207,233,169,128,227,204,206,227,210,140,205,207,169,984,227,227,128,205,128,985,984,210,233,206,256,207,169,169,128,140,204,
+205,256,227,206,205,210,128,128,256,227,204,256,256,204,204,204,128,207,210,140,128,205,140,227,227,207,205,206,140,256,256,233,207,227,204,
+210,227,207,169,227,233,205,140,227,206,140,204,205,206,169,140,128,206,206,128,256,128,207,140,233,207,205,140,210,205,205,256,227,207,256,
+140,207,206,140,233,206,206,128,205,207,204,204,128,140,169,256,227,210,205,140,233,207,207,128,210,210,205,233,256,140,227,233,169,233,204,
+128,210,207,256,204,256,128,207,210,204,205,128,233,233,204,210,210,205,210,206,210,205,256,210,227,207,204,256,206,233,210,204,128,140,256,
+128,210,140,233,204,205,210,140,206,227,169,207,205,140,256,128,210,169,169,233,207,233,204,128,210,256,207,227,140,227,256,204,207,210,227,
+205,227,128,128,169,233,128,205,210,205,207,206,233,227,227,128,233,140,128,207,205,140,169,233,207,233,140,205,233,128,227,206,207,206,169,
+169,210,233,256,204,227,233,169,204,256,210,227,204,169,233,140,169,233,204,256,206,206,204,128,233,206,207,169,169,210,140,256,207,128,256,
+128,227,206,204,205,169,204,128,206,140,210,206,169,256,169,210,233,256,233,207,207,204,128,169,205,206,233,128,233,207,256,210,128,204,169,
+207,140,204,210,169,207,128,128,256,206,210,206,233,204,210,204,227,256,256,205,210,210,206,205,128,233,169,204,227,128,128,205,207,204,169,
+256,233,207,256,233,227,128,227,128,206,233,207,140,140,128,169,227,256,210,206,140,207,128,207,205,205,128,233,205,207,140,204,227,169,205,
+256,207,204,233,233,140,210,140,205,227,210,210,204,206,205,256,210,233,206,140,210,233,205,233,210,256,205,205,205,205,256,233,204,227,210,
+128,256,128,205,210,140,204,233,205,210,204,204,205,140,210,140,128,233,210,256,140,210,256,233,169,206,233,210,227,206,256,205,206,227,210,
+256,140,128,233,128,210,169,210,205,128,140,206,205,169,204,206,140,206,227,204,233,256,140,169,206,205,233,210,256,210,227,210,207,256,206,
+207,206,207,207,128,204,205,204,233,206,128,227,256,204,210,128,140,206,210,206,210,206,233,205,205,233,233,205,256,227,207,128,205,128,140,
+140,205,233,206,205,210,205,256,205,205,205,204,205,204,227,206,204,204,227,207,169,256,256,204,204,256,207,206,205,207,210,227,206,210,140
+</data>
+ </layer>
+ <layer id="2" name="Kachelebene 2" width="35" height="30">
+  <data encoding="csv">
+2907,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2909,
+2928,2866,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2867,2930,
+2928,2930,0,0,1,2,3,4,5,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2928,2930,
+2928,2930,0,0,30,31,32,33,34,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2928,2930,
+2928,2930,0,0,59,60,61,62,63,64,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2928,2930,
+2928,2930,0,0,88,89,90,91,92,93,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2928,2930,
+2928,2930,0,0,117,118,119,120,121,122,123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2928,2930,
+2928,2930,0,0,146,147,148,149,150,151,152,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2928,2930,
+2928,2930,0,0,175,176,177,178,179,180,181,0,0,0,0,0,0,0,0,0,2713,2714,0,0,0,0,0,0,0,0,0,0,0,2928,2930,
+2928,2930,0,0,0,983,984,984,985,0,0,0,0,0,0,0,0,2687,2688,0,2721,2722,0,2711,2712,0,0,0,0,0,0,0,0,2928,2930,
+2928,2930,0,0,0,983,984,984,985,0,0,0,0,0,0,0,0,2695,2696,951,984,920,953,2719,2720,0,0,0,0,0,0,0,0,2928,2930,
+2928,2930,0,0,0,983,984,984,985,0,0,0,0,0,0,0,0,2703,2704,984,984,984,984,953,0,0,0,0,0,0,0,0,0,2928,2930,
+2949,2951,951,952,952,921,984,984,985,0,0,0,0,0,0,0,2691,2692,951,984,984,984,984,920,2693,2694,0,0,0,0,0,0,0,2928,2930,
+952,952,921,984,984,984,984,984,985,0,0,0,0,0,0,0,2699,2700,984,984,984,984,984,984,2701,2702,0,0,0,0,0,0,0,2928,2930,
+984,984,984,984,984,984,984,984,984,952,952,952,952,953,0,0,2707,2708,984,984,984,984,984,984,2709,2710,0,0,0,0,0,0,0,2928,2930,
+984,984,984,984,984,984,984,984,984,984,984,984,984,920,952,952,921,984,984,984,984,984,984,984,984,920,953,0,0,0,0,0,0,2928,2930,
+984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,985,0,0,0,0,0,0,2928,2930,
+1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,889,984,984,984,984,984,984,984,984,984,984,984,984,984,985,0,0,0,0,0,0,2928,2930,
+2907,2909,0,0,0,0,0,0,0,0,0,0,1015,1016,1016,1016,1016,1016,1016,1016,1016,889,984,888,1016,1016,1017,395,396,397,0,0,0,2928,2930,
+2928,2930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,983,984,985,0,0,423,424,425,426,0,0,0,2928,2930,
+2928,2930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,983,984,985,0,0,452,453,454,455,0,0,0,2928,2930,
+2928,2930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,983,984,985,0,0,481,482,483,484,412,413,0,2928,2930,
+2928,2930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,983,984,985,0,0,510,511,512,513,441,442,0,2928,2930,
+2928,2930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,983,984,920,952,952,539,540,541,542,470,471,0,2928,2930,
+2928,2930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,983,984,984,984,888,1016,1016,1017,0,0,0,0,2928,2930,
+2928,2930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1015,1016,1016,1016,1017,160,157,157,157,157,157,192,2928,2930,
+2928,2930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,188,189,219,190,219,186,219,191,2928,2930,
+2928,2930,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,217,248,248,248,248,248,248,248,2928,2930,
+2928,2887,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2908,2888,2930,
+2949,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950,2950
+</data>
+ </layer>
+ <objectgroup id="4" name="Objektebene 1">
+  <object id="1" x="0" y="0" width="64" height="416"/>
+  <object id="2" x="64" y="0" width="1056" height="64"/>
+  <object id="3" x="1056" y="64" width="64" height="896"/>
+  <object id="4" x="0" y="896" width="1056" height="64"/>
+  <object id="5" x="0" y="576" width="64" height="384"/>
+  <object id="6" x="128" y="96" width="64" height="192"/>
+  <object id="7" x="192" y="96" width="64" height="32"/>
+  <object id="8" x="192" y="128" width="64" height="96"/>
+  <object id="9" x="256" y="96" width="32" height="192"/>
+  <object id="10" x="288" y="145.333" width="63.3333" height="141.333"/>
+  <object id="11" x="288.667" y="84.6667" width="30" height="59.3333"/>
+  <object id="12" x="164" y="72.6667" width="89.3333" height="22"/>
+  <object id="13" x="512" y="384" width="64" height="96"/>
+  <object id="14" x="544" y="288" width="64" height="96"/>
+  <object id="15" x="640" y="256" width="64" height="64"/>
+  <object id="16" x="736" y="288" width="64" height="64"/>
+  <object id="17" x="768" y="384" width="64" height="96"/>
+  <object id="18" x="832" y="640" width="32" height="128"/>
+  <object id="19" x="864" y="576" width="96" height="128"/>
+  <object id="20" x="928" y="704" width="32" height="64"/>
+  <object id="21" x="977.333" y="672.667" width="48" height="77.3333"/>
+ </objectgroup>
+ <objectgroup id="5" name="tuerebene">
+  <object id="22" x="0" y="416" width="32" height="160">
+   <properties>
+    <property name="destinationDoor" type="int" value="1"/>
+    <property name="destinationMap" type="int" value="2"/>
+    <property name="exit" type="int" value="3"/>
+    <property name="id" type="int" value="0"/>
+   </properties>
+  </object>
+  <object id="23" x="192" y="224" width="64" height="64">
+   <properties>
+    <property name="destinationDoor" type="int" value="0"/>
+    <property name="destinationMap" type="int" value="3"/>
+    <property name="exit" type="int" value="2"/>
+    <property name="id" type="int" value="1"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/core/assets/table.png b/core/assets/table.png
new file mode 100644
index 0000000..00b8a19
Binary files /dev/null and b/core/assets/table.png differ
diff --git a/core/assets/terrain-v7.png b/core/assets/terrain-v7.png
new file mode 100644
index 0000000..32cfde8
Binary files /dev/null and b/core/assets/terrain-v7.png differ
diff --git a/core/assets/terrain.tsx b/core/assets/terrain.tsx
new file mode 100644
index 0000000..1c0f9fa
--- /dev/null
+++ b/core/assets/terrain.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.4" tiledversion="1.4.3" name="terrain" tilewidth="32" tileheight="32" tilecount="2048" columns="32">
+ <image source="terrain-v7.png" width="1024" height="2048"/>
+</tileset>
diff --git a/core/assets/tileset.tsx b/core/assets/tileset.tsx
new file mode 100644
index 0000000..12f8fc5
--- /dev/null
+++ b/core/assets/tileset.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.4" tiledversion="1.4.3" name="tileset" tilewidth="32" tileheight="32" tilecount="638" columns="29">
+ <image source="tilesetStart5.png" width="944" height="720"/>
+</tileset>
diff --git a/core/assets/tilesetStart5.png b/core/assets/tilesetStart5.png
new file mode 100644
index 0000000..88dab03
Binary files /dev/null and b/core/assets/tilesetStart5.png differ
diff --git a/core/assets/tileset_other.png b/core/assets/tileset_other.png
new file mode 100644
index 0000000..320a076
Binary files /dev/null and b/core/assets/tileset_other.png differ
diff --git a/core/assets/worldBorder.png b/core/assets/worldBorder.png
new file mode 100644
index 0000000..7e77447
Binary files /dev/null and b/core/assets/worldBorder.png differ
diff --git a/core/assets/worldborder.tsx b/core/assets/worldborder.tsx
new file mode 100644
index 0000000..d176099
--- /dev/null
+++ b/core/assets/worldborder.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.4" tiledversion="1.4.3" name="worldborder" tilewidth="32" tileheight="32" tilecount="8" columns="4">
+ <image source="worldBorder.png" width="128" height="64"/>
+</tileset>
diff --git a/core/src/com/trs/main/MovingNpc.java b/core/src/com/trs/main/MovingNpc.java
index 4112bf4..1ac6274 100644
--- a/core/src/com/trs/main/MovingNpc.java
+++ b/core/src/com/trs/main/MovingNpc.java
@@ -47,8 +47,9 @@ public class MovingNpc extends Actor{
         movementX = 0;
         movementY = 0;
         
-        String[] ans = {"Antwort1", "Antwort2"};
-        this.t = new Textbox("Frage", ans, getX()+getWidth()/2, getY()+getHeight()/2, Main.CAMERA_WIDTH, Main.CAMERA_HEIGHT);
+        String[] ans = {"Das ist Wahr", "sehr wahr..."};
+        this.t = new Textbox("Frage ist eine gute Frage, eine sehr gute Frage jaja VoltaicMoth ist ein Noob in r6 jajajajajja jajaja jajaaj ja jajaaj aj aj jaj aja j"
+        + "Frage ist eine gute Frage, eine sehr gute Frage jaja VoltaicMoth ist ein Noob in r6 jajajajajja jajaja jajaaj ja jajaaj aj aj jaj aja j", ans, getX()+getWidth()/2, getY()+getHeight()/2);
         
         setBounds(xPos, yPos, animatedSprite.getSprite().getWidth(), animatedSprite.getSprite().getHeight());
     }
diff --git a/core/src/com/trs/main/Player.java b/core/src/com/trs/main/Player.java
index 0f3807c..94042fb 100644
--- a/core/src/com/trs/main/Player.java
+++ b/core/src/com/trs/main/Player.java
@@ -29,7 +29,7 @@ public class Player extends Actor{
     float movementX = 0;
     float movementY = 0;
     float speed = 3f;
-    float velocity = 0.2f;
+    float velocity = 0.8f;
     // 0: up, 1: left, 2: down, 3: right
     int facing = 0;
     
@@ -56,7 +56,11 @@ public class Player extends Actor{
     @Override
     public void act(float delta) {
     	if(Main.gamestate == 0) {
-    		if(Gdx.input.isKeyPressed(Input.Keys.D)){
+            if(Gdx.input.isKeyPressed(Input.Keys.SHIFT_LEFT)){
+                speed = 9;
+            }
+            else speed = 3;
+            if(Gdx.input.isKeyPressed(Input.Keys.D)){
                 movementX = speed;
                 facing = 3;
             }
@@ -72,6 +76,10 @@ public class Player extends Actor{
                 movementY = -speed;
                 facing = 2;
             }
+            
+            if(Gdx.input.isKeyPressed(Input.Keys.NUM_1)){
+                movementY = -8;
+            }
             if(Gdx.input.isKeyJustPressed(Input.Keys.E)) {
                 Actor a = collidingActor();
                 if(a != null && a instanceof MovingNpc){
diff --git a/core/src/com/trs/main/Textbox.java b/core/src/com/trs/main/Textbox.java
index d4dfd62..b94f95f 100644
--- a/core/src/com/trs/main/Textbox.java
+++ b/core/src/com/trs/main/Textbox.java
@@ -39,47 +39,63 @@ public class Textbox extends Actor{
     
     String[] ans;
     
-    public Textbox(String toPrint, String[] ans, float xPos, float yPos, float cameraWidth, float cameraHeight) {
-        renderer = new ShapeRenderer();
-        printLine = 0;
-        printChar = 0;
-        this.ans = ans;
-        setName("textbox");
-        font = new BitmapFont();
-        r = new Rectangle(xPos - cameraWidth/2 + 20, yPos - cameraHeight/2 + 20, cameraWidth - 40, cameraHeight/5);
-        setBounds(r.getX(), r.getY(), r.getWidth(), r.getHeight());
+    float textHeight;
+    
+    public Textbox(String toPrint, String[] ans, float xPos, float yPos) {
         FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("font.ttf"));
         FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter();
         parameter.size = 21;
         font = generator.generateFont(parameter);
         generator.dispose();
         font.setColor(Color.BLACK);
-        state = 0;
-        splitted = getSplitted(toPrint, (int)getWidth());
-    }
-    
-    public Textbox(Textbox t, float xPos, float yPos){
-        splitted = t.splitted;
-        r = new Rectangle(xPos - Main.CAMERA_WIDTH/2 + 20, yPos - Main.CAMERA_HEIGHT/2 + 20, Main.CAMERA_WIDTH - 40, Main.CAMERA_HEIGHT/5);
         
         renderer = new ShapeRenderer();
+        textHeight = getTextHeight("A");
         printLine = 0;
         printChar = 0;
-        this.ans = t.ans;
+        this.ans = ans;
         setName("textbox");
-        
         font = new BitmapFont();
+        splitted = getSplitted(toPrint, (int)(Main.CAMERA_WIDTH/2));
+        
+        // CALCULATE NEEDED HEIGHT
+        float height = splitted.size() * 1.2f * textHeight + (ans.length+1) * 1.2f * textHeight;
+        
+        r = new Rectangle(xPos - Main.CAMERA_WIDTH/2 + 20, yPos - Main.CAMERA_HEIGHT/2 + 20, Main.CAMERA_WIDTH/2, height);
         setBounds(r.getX(), r.getY(), r.getWidth(), r.getHeight());
+        
+        state = 0;
+    }
+    
+    public Textbox(Textbox t, float xPos, float yPos){
+        font = new BitmapFont();
         FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("font.ttf"));
         FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter();
         parameter.size = 21;
         font = generator.generateFont(parameter);
         generator.dispose();
         font.setColor(Color.BLACK);
+        
+        textHeight = getTextHeight("A");
+        this.splitted = t.splitted;
+        this.ans = t.ans;
+        System.out.println(splitted.size());
+        float height = this.splitted.size() * 1.2f * textHeight + (this.ans.length+2) * 1.2f * textHeight;
+        r = new Rectangle(xPos - Main.CAMERA_WIDTH/2 + 20, yPos - Main.CAMERA_HEIGHT/2 + 20, Main.CAMERA_WIDTH - 40, height);
+        setBounds(r.getX(), r.getY(), r.getWidth(), r.getHeight());
+        
+        renderer = new ShapeRenderer();
+        printLine = 0;
+        printChar = 0;
+        setName("textbox");
+        
     }
 
     @Override
     public void act(float delta) {
+        
+        
+        
         if(state == 1){
             if(Gdx.input.isKeyJustPressed(Input.Keys.DOWN)){
                 if(selectedAsw < ans.length - 1) {
@@ -111,7 +127,12 @@ public class Textbox extends Actor{
             else{
                 printChar++;
             }
+            if(Gdx.input.isKeyJustPressed(Input.Keys.ENTER)){
+                state = 1;
+                printLine = splitted.size()-1;
+            }
         }
+
         super.act(delta);
     }
     
@@ -141,16 +162,16 @@ public class Textbox extends Actor{
         if(state == 0){
             for(int i = 0; i < splitted.size(); i++){
                 if(i == printLine){
-                    font.draw(batch, splitted.get(i).substring(0, printChar), getX(), getY() + getHeight()-i*1.2f*getTextHeight("A"));
+                    font.draw(batch, splitted.get(i).substring(0, printChar), getX()+5, getY() + getHeight()-i*1.2f*textHeight - 5);
                 }
                 else if(i < printLine){
-                    font.draw(batch, splitted.get(i), getX(), getY() + getHeight()-i*1.2f*getTextHeight("A"));
+                    font.draw(batch, splitted.get(i), getX()+5, getY() + getHeight()-i*1.2f*textHeight - 5);
                 }
             }
         }
         else{
             for(int i = 0; i <= printLine; i++){
-                    font.draw(batch, splitted.get(i), getX(), getY() + getHeight()-i*1.2f*getTextHeight("A"));
+                    font.draw(batch, splitted.get(i), getX()+5, getY() + getHeight()-i*1.2f*textHeight - 5);
             }
             
             for(int i = 0; i < ans.length; i++) {
@@ -161,7 +182,7 @@ public class Textbox extends Actor{
             		font.setColor(Color.BLACK);
             	}
             	
-            	font.draw(batch, ans[i], getX(), getY() + getHeight() - ((splitted.size() + i + 1) * 1.2f * getTextHeight("A")));
+            	font.draw(batch, ans[i], getX()+5, getY() + getHeight() - ((splitted.size() + i + 1) * 1.2f * textHeight - 5));
             }
         }
         super.draw(batch, parentAlpha);
@@ -182,14 +203,14 @@ public class Textbox extends Actor{
         ArrayList<String> toReturn = new ArrayList<>();
         String string = new String();
         for(String s : words){
-                if(getTextWidth(string)+getTextWidth(s) > maxLength){
-                    toReturn.add(string);
-                    string = new String();
-                    string += s;
-                }
-                else if(getTextWidth(string)+getTextWidth(s) < maxLength){
-                    string += s;
-                }
+            if(getTextWidth(string)+getTextWidth(s) >= maxLength){
+                toReturn.add(string);
+                string = new String();
+                string += s;
+            }
+            else if(getTextWidth(string)+getTextWidth(s) < maxLength){
+                string += s;
+            }
         }
         toReturn.add(string);