diff --git a/core/assets/sprites/playerFullHealth.png b/core/assets/sprites/playerFullHealth.png
new file mode 100644
index 0000000..e48e433
Binary files /dev/null and b/core/assets/sprites/playerFullHealth.png differ
diff --git a/core/assets/sprites/playerHalfHealth.png b/core/assets/sprites/playerHalfHealth.png
new file mode 100644
index 0000000..53b136a
Binary files /dev/null and b/core/assets/sprites/playerHalfHealth.png differ
diff --git a/core/assets/sprites/playerZeroHealth.png b/core/assets/sprites/playerZeroHealth.png
new file mode 100644
index 0000000..bf32870
Binary files /dev/null and b/core/assets/sprites/playerZeroHealth.png differ
diff --git a/core/assets/tilesets/haha.png b/core/assets/tilesets/haha.png
new file mode 100644
index 0000000..08b6fef
Binary files /dev/null and b/core/assets/tilesets/haha.png differ
diff --git a/core/assets/tilesets/tileset_floor_1_Kilian.png b/core/assets/tilesets/tileset_floor_1_Kilian.png
deleted file mode 100644
index b6a1655..0000000
Binary files a/core/assets/tilesets/tileset_floor_1_Kilian.png and /dev/null differ
diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index f8bc16f..6c422de 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -61,7 +61,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         volume = 0.01f;
         
         arrows = new Entity[10];
-        roomX = 10;
+        roomX = 13;
         roomY = 6;
         
         batch = new SpriteBatch();
@@ -313,14 +313,12 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                         d.setCurrentEntities(m.playerAttack(d.getCurrentEntities(), d.getPlayer(), batch));
                     }
                 }
-                /*
-                if(keycode == Input.Keys.F){
+                /*if(keycode == Input.Keys.F){
                     if(v != null){}
                     if(m != null){
                         d.setCurrentItemContainer(m.playerPickUp(d.getCurrentItemContainer(), d.getPlayer()));
                     }
-                }
-                */
+                }*/
                 if(keycode == Input.Keys.UP){
                     volume += 0.1f;
                     
@@ -414,6 +412,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
       }
       if(m != null){
           
+        
         return true;
       }
     }
diff --git a/core/src/com/dungeoncrawler/model/Entity.java b/core/src/com/dungeoncrawler/model/Entity.java
index a2ffdaf..3c68e4d 100644
--- a/core/src/com/dungeoncrawler/model/Entity.java
+++ b/core/src/com/dungeoncrawler/model/Entity.java
@@ -15,6 +15,7 @@ public abstract class Entity {
     protected float movementY;
     protected int id;
     protected int facing;
+    protected Inventory inv;
     
     
 
diff --git a/core/src/com/dungeoncrawler/model/Inventory.java b/core/src/com/dungeoncrawler/model/Inventory.java
index 8b2e88f..79c605e 100644
--- a/core/src/com/dungeoncrawler/model/Inventory.java
+++ b/core/src/com/dungeoncrawler/model/Inventory.java
@@ -6,14 +6,13 @@ public class Inventory {
     Item items[][];
     Item equipped[];
     
-    Inventory(int width, int height){
+    public Inventory(int width, int height){
         items = new Item[width][height];
         equipped = new Item[2];
     }
     
     public void addItem(Item i)
     {
-        
         for(int n = 0; n <= items.length; n++){
             for(int m = 0; m <= items[0].length; m++){
                 if(items[n][m] == null){
diff --git a/core/src/com/dungeoncrawler/model/entities/Player.java b/core/src/com/dungeoncrawler/model/entities/Player.java
index 8ba7f6b..b069463 100644
--- a/core/src/com/dungeoncrawler/model/entities/Player.java
+++ b/core/src/com/dungeoncrawler/model/entities/Player.java
@@ -7,6 +7,8 @@ package com.dungeoncrawler.model.entities;
 
 
 import com.dungeoncrawler.model.Entity;
+import com.dungeoncrawler.model.Inventory;
+import com.dungeoncrawler.model.Item;
 import com.dungeoncrawler.model.ItemContainer;
 /**
  *
@@ -22,11 +24,12 @@ public class Player extends Entity {
         
         this.dmg = 3*lvl;
         id = -1;
+        inv = new Inventory(3,2);
         // TODO: Sinnvolle Werte finden
     }
     
-    public void pickUp(ItemContainer items){
-        
+    public void pickUp(Item item){
+        inv.addItem(item);
     }
     
 }
diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java
index 54b0844..eddcaa1 100644
--- a/core/src/com/dungeoncrawler/view/GameScreen.java
+++ b/core/src/com/dungeoncrawler/view/GameScreen.java
@@ -90,7 +90,7 @@ public class GameScreen {
                 camera = new OrthographicCamera(1, h/w);
                 camera.translate(300f, 200f);
                 
-                MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tilesets/tileset_floor_1.png")));
+                MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tilesets/haha.png")));
                 
                 m = mg.generateMap(d);
                 mg.ichWillSpielen(m.getMaps());
@@ -346,11 +346,13 @@ public class GameScreen {
         /*
         public ItemContainer playerPickUp(ItemContainer[] items, Player p){
             for(int i = 0; i < items.length; i++){
-                if(Intersector.overlaps(player.getBoundingRectangle(), itemSprite[i].getBoundingRectangle())){
-                    player.pickUp(items[i].getItem());
-                    items[i] = null;
+                if(items[i] != null){
+                    if(Intersector.overlaps(player.getBoundingRectangle(), itemSprite[i].getBoundingRectangle())){
+                        player.pickUp(items[i].getItem());
+                        items[i] = null;
+                    }
                 }
-                    
+                
             }
             return items;
             
diff --git a/core/src/com/dungeoncrawler/view/MapGenerator.java b/core/src/com/dungeoncrawler/view/MapGenerator.java
index 5a9d8b4..a3b0e17 100644
--- a/core/src/com/dungeoncrawler/view/MapGenerator.java
+++ b/core/src/com/dungeoncrawler/view/MapGenerator.java
@@ -63,7 +63,7 @@ public class MapGenerator {
                 Room room = l.getRooms()[x][y];
                 
                 if(room != null){
-                    int tempX = 9;
+                    int tempX = 12;
                     int tempY = 5;
                     
                     int mapDimensionX = tempX + 2;