diff --git a/src/main/java/refinedstorage/RefinedStorageItems.java b/src/main/java/refinedstorage/RefinedStorageItems.java
index 4ff98535a..a4796a2a6 100755
--- a/src/main/java/refinedstorage/RefinedStorageItems.java
+++ b/src/main/java/refinedstorage/RefinedStorageItems.java
@@ -16,4 +16,5 @@ public final class RefinedStorageItems {
     public static final ItemGridFilter GRID_FILTER = new ItemGridFilter();
     public static final ItemNetworkCard NETWORK_CARD = new ItemNetworkCard();
     public static final ItemFluidStorageDisk FLUID_STORAGE_DISK = new ItemFluidStorageDisk();
+    public static final ItemFluidStoragePart FLUID_STORAGE_PART = new ItemFluidStoragePart();
 }
diff --git a/src/main/java/refinedstorage/item/ItemFluidStoragePart.java b/src/main/java/refinedstorage/item/ItemFluidStoragePart.java
new file mode 100755
index 000000000..bbf502d80
--- /dev/null
+++ b/src/main/java/refinedstorage/item/ItemFluidStoragePart.java
@@ -0,0 +1,28 @@
+package refinedstorage.item;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import java.util.List;
+
+public class ItemFluidStoragePart extends ItemBase {
+    public static final int TYPE_64K = 0;
+    public static final int TYPE_128K = 1;
+    public static final int TYPE_256K = 2;
+    public static final int TYPE_512K = 3;
+
+    public ItemFluidStoragePart() {
+        super("fluid_storage_part");
+
+        setHasSubtypes(true);
+        setMaxDamage(0);
+    }
+
+    @Override
+    public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
+        for (int i = 0; i <= 3; ++i) {
+            list.add(new ItemStack(item, 1, i));
+        }
+    }
+}
diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java
index 0be843712..d5695a78e 100755
--- a/src/main/java/refinedstorage/proxy/ClientProxy.java
+++ b/src/main/java/refinedstorage/proxy/ClientProxy.java
@@ -232,6 +232,7 @@ public class ClientProxy extends CommonProxy {
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.PATTERN.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory"));
diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java
index 80ff35e92..c5aeb01b6 100755
--- a/src/main/java/refinedstorage/proxy/CommonProxy.java
+++ b/src/main/java/refinedstorage/proxy/CommonProxy.java
@@ -121,6 +121,7 @@ public class CommonProxy {
         registerItem(RefinedStorageItems.GRID_FILTER);
         registerItem(RefinedStorageItems.NETWORK_CARD);
         registerItem(RefinedStorageItems.FLUID_STORAGE_DISK);
+        registerItem(RefinedStorageItems.FLUID_STORAGE_PART);
 
         OreDictionary.registerOre("itemSilicon", RefinedStorageItems.SILICON);
 
@@ -257,7 +258,7 @@ public class CommonProxy {
             new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.FLUID.getId()),
             500,
             new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
-            new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.FLUID.getId()),
+            new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
             new ItemStack(Items.BUCKET)
         ));
 
@@ -399,6 +400,47 @@ public class CommonProxy {
             'S', new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K)
         );
 
+        // Fluid Storage Parts
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K),
+            "SES",
+            "GRG",
+            "SGS",
+            'R', new ItemStack(Items.BUCKET),
+            'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+            'S', "itemSilicon",
+            'G', "blockGlass"
+        ));
+
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K),
+            "PEP",
+            "SRS",
+            "PSP",
+            'R', new ItemStack(Items.BUCKET),
+            'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+            'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+            'S', new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K)
+        ));
+
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K),
+            "PEP",
+            "SRS",
+            "PSP",
+            'R', new ItemStack(Items.BUCKET),
+            'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+            'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
+            'S', new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K)
+        ));
+
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_512K),
+            "PEP",
+            "SRS",
+            "PSP",
+            'R', new ItemStack(Items.BUCKET),
+            'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON),
+            'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+            'S', new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K)
+        ));
+
         // Storage Housing
         GameRegistry.addRecipe(new ShapedOreRecipe(ItemStorageNBT.createStackWithNBT(new ItemStack(RefinedStorageItems.STORAGE_HOUSING)),
             "GRG",
@@ -429,6 +471,26 @@ public class CommonProxy {
             );
         }
 
+        // Fluid Storage Parts
+        for (int type = 0; type <= 3; ++type) {
+            ItemStack disk = ItemStorageNBT.createStackWithNBT(new ItemStack(RefinedStorageItems.FLUID_STORAGE_DISK, 1, type));
+
+            GameRegistry.addRecipe(new ShapedOreRecipe(disk,
+                "GRG",
+                "RPR",
+                "EEE",
+                'G', "blockGlass",
+                'R', new ItemStack(Items.REDSTONE),
+                'P', new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, type),
+                'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+            ));
+
+            GameRegistry.addShapelessRecipe(disk,
+                new ItemStack(RefinedStorageItems.STORAGE_HOUSING),
+                new ItemStack(RefinedStorageItems.FLUID_STORAGE_PART, 1, type)
+            );
+        }
+
         // Pattern
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.PATTERN),
             "GRG",
diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang
index 967b2be81..a2e61612d 100755
--- a/src/main/resources/assets/refinedstorage/lang/en_US.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang
@@ -155,6 +155,10 @@ item.refinedstorage:storage_part.0.name=1k Storage Part
 item.refinedstorage:storage_part.1.name=4k Storage Part
 item.refinedstorage:storage_part.2.name=16k Storage Part
 item.refinedstorage:storage_part.3.name=64k Storage Part
+item.refinedstorage:fluid_storage_part.0.name=64k Fluid Storage Part
+item.refinedstorage:fluid_storage_part.1.name=128k Fluid Storage Part
+item.refinedstorage:fluid_storage_part.2.name=256k Fluid Storage Part
+item.refinedstorage:fluid_storage_part.3.name=512k Fluid Storage Part
 item.refinedstorage:pattern.name=Pattern
 item.refinedstorage:upgrade.0.name=Upgrade
 item.refinedstorage:upgrade.1.name=Range Upgrade