diff --git a/lib/CitizensAPI.jar b/lib/CitizensAPI.jar
index f2d6b1bad..2a64d90a1 100644
Binary files a/lib/CitizensAPI.jar and b/lib/CitizensAPI.jar differ
diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java
index 1904f2da9..6ccb45e06 100644
--- a/src/main/java/net/citizensnpcs/Citizens.java
+++ b/src/main/java/net/citizensnpcs/Citizens.java
@@ -14,6 +14,7 @@ import net.citizensnpcs.api.trait.Character;
 import net.citizensnpcs.api.trait.DefaultInstanceFactory;
 import net.citizensnpcs.api.trait.InstanceFactory;
 import net.citizensnpcs.api.trait.Trait;
+import net.citizensnpcs.api.trait.trait.Equipment;
 import net.citizensnpcs.api.trait.trait.Inventory;
 import net.citizensnpcs.api.trait.trait.MobType;
 import net.citizensnpcs.api.trait.trait.Owner;
@@ -60,7 +61,7 @@ public class Citizens extends JavaPlugin {
     private volatile CitizensNPCManager npcManager;
     private final InstanceFactory<Character> characterManager = DefaultInstanceFactory.create();
     private final InstanceFactory<Trait> traitManager = DefaultInstanceFactory.create(Owner.class, Spawned.class,
-            LookClose.class, SpawnLocation.class, Inventory.class, MobType.class, Waypoints.class);
+            LookClose.class, SpawnLocation.class, Inventory.class, MobType.class, Waypoints.class, Equipment.class);
     private final CommandManager commands = new CommandManager();
     private Settings config;
     private Storage saves;
diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
index 72457e469..98b90a5c2 100644
--- a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
+++ b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
@@ -2,14 +2,17 @@ package net.citizensnpcs.editor;
 
 import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.api.trait.trait.Equipment;
 import net.citizensnpcs.util.Messaging;
 
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event.Result;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
 
 public class EquipmentEditor extends Editor {
     private final Citizens plugin;
@@ -27,7 +30,7 @@ public class EquipmentEditor extends Editor {
         Messaging.send(player, "<a>Entered the equipment editor!");
         Messaging.send(player, "<a>Right click to equip armor and items.");
         Messaging.send(player, "<a>Right click while crouching to equip armor in the NPC's hand.");
-        Messaging.send(player, "<a>Left click to remove all armor and items.");
+        Messaging.send(player, "<a>Right click with an empty hand to remove all armor and items.");
     }
 
     @Override
@@ -48,6 +51,62 @@ public class EquipmentEditor extends Editor {
                 || !event.getPlayer().getName().equals(player.getName()))
             return;
 
-        npc.chat("You clicked me!");
+        ItemStack hand = player.getItemInHand();
+        Equipment trait = npc.getTrait(Equipment.class);
+        int slot = 0;
+        // First, determine the slot to edit
+        switch (hand.getType()) {
+        case PUMPKIN:
+        case JACK_O_LANTERN:
+        case LEATHER_HELMET:
+        case CHAINMAIL_HELMET:
+        case GOLD_HELMET:
+        case IRON_HELMET:
+        case DIAMOND_HELMET:
+            if (!player.isSneaking())
+                slot = 1;
+            break;
+        case LEATHER_CHESTPLATE:
+        case CHAINMAIL_CHESTPLATE:
+        case GOLD_CHESTPLATE:
+        case IRON_CHESTPLATE:
+        case DIAMOND_CHESTPLATE:
+            if (!player.isSneaking())
+                slot = 2;
+            break;
+        case LEATHER_LEGGINGS:
+        case CHAINMAIL_LEGGINGS:
+        case GOLD_LEGGINGS:
+        case IRON_LEGGINGS:
+        case DIAMOND_LEGGINGS:
+            if (!player.isSneaking())
+                slot = 3;
+            break;
+        case LEATHER_BOOTS:
+        case CHAINMAIL_BOOTS:
+        case GOLD_BOOTS:
+        case IRON_BOOTS:
+        case DIAMOND_BOOTS:
+            if (!player.isSneaking())
+                slot = 4;
+            break;
+        case AIR:
+            for (int i = 0; i < 4; i++) {
+                if (trait.getEquipment(i) != null && trait.getEquipment(i).getType() != Material.AIR) {
+                    player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.getEquipment(i));
+                    trait.setEquipment(i, null);
+                }
+            }
+            Messaging.send(player, "<e>" + npc.getName() + " <a>had all of its items removed.");
+        }
+        // Now edit the equipment based on the slot
+        if (trait.getEquipment(slot) != null && trait.getEquipment(slot).getType() != Material.AIR)
+            player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.getEquipment(slot));
+        trait.setEquipment(slot, hand);
+        if (hand.getAmount() > 1)
+            hand.setAmount(hand.getAmount() - 1);
+        else
+            hand = null;
+        player.setItemInHand(hand);
     }
 }
\ No newline at end of file