diff --git a/src/de/miaurizius/jgame2d/core/handlers/AssetSetter.java b/src/de/miaurizius/jgame2d/core/handlers/AssetSetter.java
index f23b104..c294352 100644
--- a/src/de/miaurizius/jgame2d/core/handlers/AssetSetter.java
+++ b/src/de/miaurizius/jgame2d/core/handlers/AssetSetter.java
@@ -1,6 +1,7 @@
 package de.miaurizius.jgame2d.core.handlers;
 
 import de.miaurizius.jgame2d.core.GamePanel;
+import de.miaurizius.jgame2d.entity.item.KeyObj;
 import de.miaurizius.jgame2d.entity.npc.OldManNPC;
 import de.miaurizius.jgame2d.entity.monster.GreenSlimeMON;
 
@@ -13,7 +14,21 @@ public class AssetSetter {
     }
 
     public void setObject() {
+        int i = 0;
+        panel.obj[i] = new KeyObj(panel);
+        panel.obj[i].worldX = panel.tileSize*25;
+        panel.obj[i].worldY = panel.tileSize*23;
+        i++;
 
+        panel.obj[i] = new KeyObj(panel);
+        panel.obj[i].worldX = panel.tileSize*21;
+        panel.obj[i].worldY = panel.tileSize*19;
+        i++;
+
+        panel.obj[i] = new KeyObj(panel);
+        panel.obj[i].worldX = panel.tileSize*26;
+        panel.obj[i].worldY = panel.tileSize*21;
+        i++;
     }
 
     public void setNPC() {
diff --git a/src/de/miaurizius/jgame2d/entity/Player.java b/src/de/miaurizius/jgame2d/entity/Player.java
index 3e46b51..370e9ee 100644
--- a/src/de/miaurizius/jgame2d/entity/Player.java
+++ b/src/de/miaurizius/jgame2d/entity/Player.java
@@ -21,6 +21,7 @@ public class Player extends Entity {
     // STATE
     public boolean attackCancel;
     public ArrayList<Entity> inventory = new ArrayList<>();
+    public final int maxInvSize = 20;
 
     public Player(GamePanel panel, KeyHandler keyH) {
         super(panel);
@@ -121,6 +122,14 @@ public class Player extends Entity {
     // INTERACTION
     public void pickObject(int index) {
         if(index == 999) return;
+        if(inventory.size() == maxInvSize) {
+            panel.ui.addMessage("Your inventory is full!");
+            return;
+        }
+        inventory.add(panel.obj[index]);
+        panel.playSE(1);
+        panel.ui.addMessage("Picked up " + panel.obj[index].name);
+        panel.obj[index] = null;
     }
 
     public void interactMonster(int index) {