diff --git a/src/main/java/storagecraft/proxy/CommonProxy.java b/src/main/java/storagecraft/proxy/CommonProxy.java
index 65e13611c..9a279c2ef 100644
--- a/src/main/java/storagecraft/proxy/CommonProxy.java
+++ b/src/main/java/storagecraft/proxy/CommonProxy.java
@@ -340,45 +340,10 @@ public class CommonProxy
 		);
 
 		// Storage Blocks
-		GameRegistry.addRecipe(ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, EnumStorageType.TYPE_1K.getId())),
-			"EPE",
-			"RMR",
-			"EEE",
-			'R', new ItemStack(Items.redstone),
-			'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K),
-			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
-			'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING)
-		);
-
-		GameRegistry.addRecipe(ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, EnumStorageType.TYPE_4K.getId())),
-			"EPE",
-			"RMR",
-			"EEE",
-			'R', new ItemStack(Items.redstone),
-			'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K),
-			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
-			'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING)
-		);
-
-		GameRegistry.addRecipe(ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, EnumStorageType.TYPE_16K.getId())),
-			"EPE",
-			"RMR",
-			"EEE",
-			'R', new ItemStack(Items.redstone),
-			'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K),
-			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
-			'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING)
-		);
-
-		GameRegistry.addRecipe(ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, EnumStorageType.TYPE_64K.getId())),
-			"EPE",
-			"RMR",
-			"EEE",
-			'R', new ItemStack(Items.redstone),
-			'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K),
-			'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON),
-			'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING)
-		);
+		SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K));
+		SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K));
+		SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_16K, ItemStoragePart.TYPE_16K));
+		SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_64K, ItemStoragePart.TYPE_64K));
 	}
 
 	public void init(FMLInitializationEvent e)
diff --git a/src/main/java/storagecraft/storage/CellStorage.java b/src/main/java/storagecraft/storage/CellStorage.java
index cfb1b10ca..b36ee38aa 100644
--- a/src/main/java/storagecraft/storage/CellStorage.java
+++ b/src/main/java/storagecraft/storage/CellStorage.java
@@ -7,7 +7,6 @@ public class CellStorage extends NBTStorage
 {
 	public CellStorage(ItemStack cell)
 	{
-		// @TODO: Priority on this stuff
 		super(cell.getTagCompound(), getCapacity(cell), 0);
 	}
 
diff --git a/src/main/java/storagecraft/tile/solderer/SoldererRecipeStorage.java b/src/main/java/storagecraft/tile/solderer/SoldererRecipeStorage.java
new file mode 100644
index 000000000..64779e389
--- /dev/null
+++ b/src/main/java/storagecraft/tile/solderer/SoldererRecipeStorage.java
@@ -0,0 +1,51 @@
+package storagecraft.tile.solderer;
+
+import net.minecraft.item.ItemStack;
+import storagecraft.StorageCraftBlocks;
+import storagecraft.StorageCraftItems;
+import storagecraft.block.EnumStorageType;
+import storagecraft.item.ItemBlockStorage;
+import storagecraft.item.ItemProcessor;
+
+public class SoldererRecipeStorage implements ISoldererRecipe
+{
+	private EnumStorageType type;
+	private int storagePart;
+
+	public SoldererRecipeStorage(EnumStorageType type, int storagePart)
+	{
+		this.type = type;
+		this.storagePart = storagePart;
+	}
+
+	@Override
+	public ItemStack getRow(int row)
+	{
+		if (row == 0)
+		{
+			return new ItemStack(StorageCraftItems.STORAGE_PART, 1, storagePart);
+		}
+		else if (row == 1)
+		{
+			return new ItemStack(StorageCraftBlocks.MACHINE_CASING);
+		}
+		else if (row == 2)
+		{
+			return new ItemStack(StorageCraftItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
+		}
+
+		return null;
+	}
+
+	@Override
+	public ItemStack getResult()
+	{
+		return ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, type.getId()));
+	}
+
+	@Override
+	public int getDuration()
+	{
+		return 200;
+	}
+}