diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
new file mode 100644
index 000000000..a776d9f33
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAnimals.java
@@ -0,0 +1,15 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityAnimals;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Animals;
+
+public class CraftAnimals extends CraftCreature implements Animals{
+
+    public CraftAnimals(CraftServer server, EntityAnimals entity) {
+        super(server, entity);
+    }
+
+
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
new file mode 100644
index 000000000..549fcb720
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftChicken.java
@@ -0,0 +1,13 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityChicken;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Chicken;
+
+public class CraftChicken extends CraftAnimals implements Chicken{
+
+    public CraftChicken(CraftServer server, EntityChicken entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java
new file mode 100644
index 000000000..aeb9f36b8
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCow.java
@@ -0,0 +1,13 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityCow;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Cow;
+
+public class CraftCow extends CraftAnimals implements Cow {
+
+    public CraftCow(CraftServer server, EntityCow entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
new file mode 100644
index 000000000..d4a13f98b
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
@@ -0,0 +1,13 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityCreature;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Creature;
+
+public class CraftCreature extends CraftLivingEntity implements Creature{
+
+    public CraftCreature(CraftServer server, EntityCreature entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
new file mode 100644
index 000000000..fddb54a40
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
@@ -0,0 +1,13 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityCreeper;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Creeper;
+
+public class CraftCreeper extends CraftMonster implements Creeper {
+
+    public CraftCreeper(CraftServer server, EntityCreeper entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java
index b1babc6b0..18654b078 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEgg.java
@@ -10,7 +10,7 @@ import org.bukkit.entity.Egg;
  * @author sk89q
  */
 public class CraftEgg extends CraftEntity implements Egg {
-    public CraftEgg(CraftServer server, EntityEgg ent) {
-        super(server, ent);
+    public CraftEgg(CraftServer server, EntityEgg entity) {
+        super(server, entity);
     }
 }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
new file mode 100644
index 000000000..737c4c703
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
@@ -0,0 +1,15 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityFallingSand;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.entity.FallingSand;
+
+public class CraftFallingSand extends CraftEntity implements FallingSand {
+
+    public CraftFallingSand(CraftServer server, EntityFallingSand entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
index 688c43d12..56789c5e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
@@ -6,12 +6,12 @@ import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Fireball;
 
 /**
- * An egg.
+ * A Fireball.
  * 
  * @author Cogito
  */
 public class CraftFireball extends CraftEntity implements Fireball {
-    public CraftFireball(CraftServer server, EntityFireball ent) {
-        super(server, ent);
+    public CraftFireball(CraftServer server, EntityFireball entity) {
+        super(server, entity);
     }
 }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
index ac832c139..0ebd3a94d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
@@ -6,12 +6,12 @@ import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.Fish;
 
 /**
- * An egg.
+ * A Fish.
  * 
  * @author Cogito
  */
 public class CraftFish extends CraftEntity implements Fish {
-    public CraftFish(CraftServer server, EntityFish ent) {
-        super(server, ent);
+    public CraftFish(CraftServer server, EntityFish entity) {
+        super(server, entity);
     }
 }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
new file mode 100644
index 000000000..da1f4eba0
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFlying.java
@@ -0,0 +1,13 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityFlying;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Flying;
+
+public class CraftFlying extends CraftLivingEntity implements Flying {
+
+    public CraftFlying(CraftServer server, EntityFlying entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
new file mode 100644
index 000000000..27258ad0c
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
@@ -0,0 +1,13 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityGhast;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Ghast;
+
+public class CraftGhast extends CraftFlying implements Ghast {
+
+    public CraftGhast(CraftServer server, EntityGhast entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java
new file mode 100644
index 000000000..14ff5dfdd
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGiant.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityZombieSimple;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Giant;
+
+public class CraftGiant extends CraftMonster implements Giant {
+
+    public CraftGiant(CraftServer server, EntityZombieSimple entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
new file mode 100644
index 000000000..ded31774a
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityItem;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Item;
+
+public class CraftItem extends CraftEntity implements Item {
+
+    public CraftItem(CraftServer server, EntityItem entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java
index 21e279d15..da6bd701b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemDrop.java
@@ -14,9 +14,9 @@ import org.bukkit.craftbukkit.CraftServer;
 public class CraftItemDrop extends CraftEntity implements ItemDrop {
     private EntityItem item;
     
-    public CraftItemDrop(CraftServer server, EntityItem ent) {
-        super(server, ent);
-        this.item = ent;
+    public CraftItemDrop(CraftServer server, EntityItem entity) {
+        super(server, entity);
+        this.item = entity;
     }
 
     public ItemStack getItemStack() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index bf908e16e..ed43dba0e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -54,21 +54,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         net.minecraft.server.World world = ((CraftWorld)getWorld()).getHandle();
         EntityEgg egg = new EntityEgg(world, entity);
         world.a(egg);
-        return new CraftEgg(server, egg);
+        return (Egg) egg.getBukkitEntity();
     }
 
     public Snowball throwSnowball() {
         net.minecraft.server.World world = ((CraftWorld)getWorld()).getHandle();
         EntitySnowball snowball = new EntitySnowball(world, entity);
         world.a(snowball);
-        return new CraftSnowball(server, snowball);
+        return (Snowball) snowball.getBukkitEntity();
     }
 
     public Arrow shootArrow() {
         net.minecraft.server.World world = ((CraftWorld)getWorld()).getHandle();
-        EntityArrow snowball = new EntityArrow(world, entity);
-        world.a(snowball);
-        return new CraftArrow(server, snowball);
+        EntityArrow arrow = new EntityArrow(world, entity);
+        world.a(arrow);
+        return (Arrow) arrow.getBukkitEntity();
     }
 
     public boolean isInsideVehicle() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java
new file mode 100644
index 000000000..2e459a70d
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMonster.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityMobs;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Monster;
+
+public class CraftMonster extends CraftCreature implements Monster {
+
+    public CraftMonster(CraftServer server, EntityMobs entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
new file mode 100644
index 000000000..3d070f826
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPainting.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityPainting;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Painting;
+
+public class CraftPainting extends CraftEntity implements Painting {
+
+    public CraftPainting(CraftServer server, EntityPainting entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java
new file mode 100644
index 000000000..91de7c371
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java
@@ -0,0 +1,15 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityPig;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.entity.CraftAnimals;
+import org.bukkit.entity.Pig;
+
+public class CraftPig extends CraftAnimals implements Pig {
+
+    public CraftPig(CraftServer server, EntityPig entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java
new file mode 100644
index 000000000..e0cd7d54f
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPigZombie.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityPigZombie;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.PigZombie;
+
+public class CraftPigZombie extends CraftZombie implements PigZombie {
+
+    public CraftPigZombie(CraftServer server, EntityPigZombie entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
new file mode 100644
index 000000000..a27808044
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySheep;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Sheep;
+
+public class CraftSheep extends CraftAnimals implements Sheep {
+
+    public CraftSheep(CraftServer server, EntitySheep entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
new file mode 100644
index 000000000..6d62f3b4f
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySkeleton;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Skeleton;
+
+public class CraftSkeleton extends CraftMonster implements Skeleton {
+
+    public CraftSkeleton(CraftServer server, EntitySkeleton entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
new file mode 100644
index 000000000..67317bae1
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySlime;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Slime;
+
+public class CraftSlime extends CraftLivingEntity implements Slime {
+
+    public CraftSlime(CraftServer server, EntitySlime entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java
index 220e917e2..ae301ac29 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowball.java
@@ -10,7 +10,7 @@ import org.bukkit.entity.Snowball;
  * @author sk89q
  */
 public class CraftSnowball extends CraftEntity implements Snowball {
-    public CraftSnowball(CraftServer server, EntitySnowball ent) {
-        super(server, ent);
+    public CraftSnowball(CraftServer server, EntitySnowball entity) {
+        super(server, entity);
     }
 }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java
new file mode 100644
index 000000000..7c2c44374
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSpider.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySpider;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Spider;
+
+public class CraftSpider extends CraftMonster implements Spider {
+
+    public CraftSpider(CraftServer server, EntitySpider entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java
new file mode 100644
index 000000000..6c56e7686
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSquid.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntitySquid;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Squid;
+
+public class CraftSquid extends CraftWaterMob implements Squid {
+
+    public CraftSquid(CraftServer server, EntitySquid entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
new file mode 100644
index 000000000..aacaff911
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTNTPrimed.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityTNTPrimed;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.TNTPrimed;
+
+public class CraftTNTPrimed extends CraftEntity implements TNTPrimed {
+
+    public CraftTNTPrimed(CraftServer server, EntityTNTPrimed entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
new file mode 100644
index 000000000..f4ff5a108
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWaterMob.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityWaterMob;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.WaterMob;
+
+public class CraftWaterMob extends CraftCreature implements WaterMob {
+
+    public CraftWaterMob(CraftServer server, EntityWaterMob entity) {
+        super(server, entity);
+    }
+
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
new file mode 100644
index 000000000..b71ff87a4
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
@@ -0,0 +1,14 @@
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityZombie;
+
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Zombie;
+
+public class CraftZombie extends CraftMonster implements Zombie{
+
+    public CraftZombie(CraftServer server, EntityZombie entity) {
+        super(server, entity);
+    }
+
+}