diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ZombieWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ZombieWatcher.java
new file mode 100644
index 00000000..a7841da5
--- /dev/null
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/ZombieWatcher.java
@@ -0,0 +1,23 @@
+package me.libraryaddict.disguise.DisguiseTypes.Watchers;
+
+import me.libraryaddict.disguise.DisguiseTypes.FlagWatcher;
+
+public class ZombieWatcher extends FlagWatcher {
+
+    public ZombieWatcher(int entityId) {
+        super(entityId);
+        setValue(13, (byte) 0);
+    }
+
+    public void setVillager(boolean villager) {
+        if (isVillager() != villager) {
+            setValue(13, (byte) (villager ? 1 : 0));
+            sendData(13);
+        }
+    }
+
+    public boolean isVillager() {
+        return (Byte) getValue(13) == 1;
+    }
+
+}
diff --git a/src/me/libraryaddict/disguise/LibsDisguises.java b/src/me/libraryaddict/disguise/LibsDisguises.java
index 077e5621..910ac233 100644
--- a/src/me/libraryaddict/disguise/LibsDisguises.java
+++ b/src/me/libraryaddict/disguise/LibsDisguises.java
@@ -3,7 +3,6 @@ package me.libraryaddict.disguise;
 import java.util.List;
 
 import me.libraryaddict.disguise.DisguiseTypes.Disguise;
-import me.libraryaddict.disguise.DisguiseTypes.DisguiseType;
 import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise;
 import net.minecraft.server.v1_5_R3.WatchableObject;
 
@@ -20,7 +19,6 @@ import com.comphenix.protocol.reflect.StructureModifier;
 
 public class LibsDisguises extends JavaPlugin {
 
-    @Override
     public void onEnable() {
         getCommand("disguise").setExecutor(new DisguiseCommand());
         ProtocolLibrary.getProtocolManager().addPacketListener(