diff --git a/src/main/java/mod/acgaming/spackenmobs/items/ItemRAM.java b/src/main/java/mod/acgaming/spackenmobs/items/ItemBase.java
similarity index 74%
rename from src/main/java/mod/acgaming/spackenmobs/items/ItemRAM.java
rename to src/main/java/mod/acgaming/spackenmobs/items/ItemBase.java
index ff86660..1e8cb72 100644
--- a/src/main/java/mod/acgaming/spackenmobs/items/ItemRAM.java
+++ b/src/main/java/mod/acgaming/spackenmobs/items/ItemBase.java
@@ -7,13 +7,13 @@ import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class ItemRAM extends Item
+public class ItemBase extends Item
 {
-    public ItemRAM()
+    public ItemBase(String name, CreativeTabs tab)
     {
-        setRegistryName("ram");
-        setUnlocalizedName(Spackenmobs.MODID + ".ram");
-        setCreativeTab(CreativeTabs.MISC);
+        setRegistryName(name);
+        setUnlocalizedName(Spackenmobs.MODID + "." + name);
+        setCreativeTab(tab);
     }
     
     @SideOnly(Side.CLIENT)
diff --git a/src/main/java/mod/acgaming/spackenmobs/items/ItemPotion.java b/src/main/java/mod/acgaming/spackenmobs/items/ItemPotion.java
new file mode 100644
index 0000000..b5e21ad
--- /dev/null
+++ b/src/main/java/mod/acgaming/spackenmobs/items/ItemPotion.java
@@ -0,0 +1,13 @@
+package mod.acgaming.spackenmobs.items;
+import net.minecraft.potion.Potion;
+
+public class ItemPotion extends Potion
+{
+	public ItemPotion(String name, boolean isBadPotion, int color, int iconIndexX, int iconIndexY)
+	{
+		super(isBadPotion, color);
+		setPotionName("effect." + name);
+		setIconIndex(iconIndexX, iconIndexY);
+		setRegistryName(name);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/mod/acgaming/spackenmobs/items/ItemRAMOnAStick.java b/src/main/java/mod/acgaming/spackenmobs/items/ItemRAMOnAStick.java
deleted file mode 100644
index a506078..0000000
--- a/src/main/java/mod/acgaming/spackenmobs/items/ItemRAMOnAStick.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package mod.acgaming.spackenmobs.items;
-import mod.acgaming.spackenmobs.Spackenmobs;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.item.ItemCarrotOnAStick;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public class ItemRAMOnAStick extends ItemCarrotOnAStick
-{
-    public ItemRAMOnAStick()
-    {
-        setRegistryName("ram_on_a_stick");
-        setUnlocalizedName(Spackenmobs.MODID + ".ram_on_a_stick");
-    }
-    
-    @SideOnly(Side.CLIENT)
-    public void initModel()
-    {
-    	ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/mod/acgaming/spackenmobs/items/ItemSurstroemming.java b/src/main/java/mod/acgaming/spackenmobs/items/ItemSurstroemming.java
deleted file mode 100644
index 94de8a2..0000000
--- a/src/main/java/mod/acgaming/spackenmobs/items/ItemSurstroemming.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package mod.acgaming.spackenmobs.items;
-import mod.acgaming.spackenmobs.Spackenmobs;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public class ItemSurstroemming extends Item
-{
-    public ItemSurstroemming()
-    {
-        setRegistryName("surstroemming");
-        setUnlocalizedName(Spackenmobs.MODID + ".surstroemming");
-        setCreativeTab(CreativeTabs.MISC);
-    }
-    
-    @SideOnly(Side.CLIENT)
-    public void initModel()
-    {
-    	ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory"));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/mod/acgaming/spackenmobs/misc/ModItems.java b/src/main/java/mod/acgaming/spackenmobs/misc/ModItems.java
index f4d68c9..b5695c4 100644
--- a/src/main/java/mod/acgaming/spackenmobs/misc/ModItems.java
+++ b/src/main/java/mod/acgaming/spackenmobs/misc/ModItems.java
@@ -1,12 +1,13 @@
 package mod.acgaming.spackenmobs.misc;
 import mod.acgaming.spackenmobs.Spackenmobs;
+import mod.acgaming.spackenmobs.items.ItemBase;
 import net.minecraft.item.Item;
 import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
 
 @ObjectHolder(Spackenmobs.MODID)
 public class ModItems
 {
-    public static final Item RAM = null;
-    public static final Item RAM_ON_A_STICK = null;
-    public static final Item SURSTROEMMING = null;
+    public static final Item RAM = new ItemBase("ram", Spackenmobs.SPACKENMOBS_TAB);
+    public static final Item RAM_ON_A_STICK = new ItemBase("ram_on_a_stick", Spackenmobs.SPACKENMOBS_TAB);
+    public static final Item SURSTROEMMING = new ItemBase("surstroemming", Spackenmobs.SPACKENMOBS_TAB);
 }
\ No newline at end of file
diff --git a/src/main/java/mod/acgaming/spackenmobs/misc/ModPotions.java b/src/main/java/mod/acgaming/spackenmobs/misc/ModPotions.java
new file mode 100644
index 0000000..30397dc
--- /dev/null
+++ b/src/main/java/mod/acgaming/spackenmobs/misc/ModPotions.java
@@ -0,0 +1,6 @@
+package mod.acgaming.spackenmobs.misc;
+
+public class ModPotions
+{
+	
+}
\ No newline at end of file