diff --git a/clusterio_0.0.2/data.lua b/clusterio_0.0.2/data.lua
index 45134a36..f63a603b 100644
--- a/clusterio_0.0.2/data.lua
+++ b/clusterio_0.0.2/data.lua
@@ -55,6 +55,7 @@ function MakeLogisticEntity(entity, name, pictureFilename, pictureTablePath, ico
 			stack_size = 50
 		}
 	})
+	return entity
 end
 
 --adds a recipe to a tech and returns true or if that fails returns false
@@ -83,11 +84,87 @@ MakeLogisticEntity(table.deepcopy(data.raw["logistic-container"]["logistic-chest
 MakeLogisticEntity(table.deepcopy(data.raw["container"]["iron-chest"]), 					    INPUT_CHEST_NAME,  INPUT_CHEST_PICTURE_PATH, { "picture" },  INPUT_CHEST_ICON_PATH)
 
 --make tanks
-MakeLogisticEntity(table.deepcopy(data.raw["storage-tank"]["storage-tank"]), OUTPUT_TANK_NAME, OUTPUT_TANK_PICTURE_PATH, { "pictures", "picture", "sheet" }, OUTPUT_TANK_ICON_PATH)
+--MakeLogisticEntity(table.deepcopy(data.raw["storage-tank"]["storage-tank"]), OUTPUT_TANK_NAME, OUTPUT_TANK_PICTURE_PATH, { "pictures", "picture", "sheet" }, OUTPUT_TANK_ICON_PATH)
 MakeLogisticEntity(table.deepcopy(data.raw["storage-tank"]["storage-tank"]),  INPUT_TANK_NAME,  INPUT_TANK_PICTURE_PATH, { "pictures", "picture", "sheet" },  INPUT_TANK_ICON_PATH)
 
 
+data:extend(
+{
+	{
+		type = "recipe-category",
+		name = "crafting-fluids"
+	}
+})
 
+local fluidCreator = MakeLogisticEntity(table.deepcopy(data.raw["assembling-machine"]["assembling-machine-3"]), OUTPUT_TANK_NAME, OUTPUT_TANK_PICTURE_PATH, { "animation" }, OUTPUT_TANK_ICON_PATH)
+fluidCreator.fluid_boxes =
+{
+	{
+		production_type = "output",
+		pipe_picture = assembler3pipepictures(),
+		pipe_covers = pipecoverspictures(),
+		base_area = 250,
+		base_level = 1,
+		pipe_connections = 
+		{
+			{ 
+				type="output", position = {0, 2} 
+			},
+			{ 
+				type="output", position = {0, -2} 
+			},
+			{ 
+				type="output", position = {2, 0} 
+			},
+			{ 
+				type="output", position = {-2, 0} 
+			},
+		}
+	},
+	off_when_no_fluid_recipe = false
+}
+fluidCreator.crafting_categories = {"crafting-fluids"}
+--fluidCreator.energy_source = nil
+fluidCreator.energy_usage = "1kW"
+fluidCreator.ingredient_count = 1
+fluidCreator.module_specification.module_slots = 0
+
+for k,v in pairs(data.raw.fluid) do
+	data:extend(
+	{
+		{
+			type = "recipe",
+			name = v.name,
+			icon = v.icon,
+			category = "crafting-fluids",
+			energy_required = 1,
+			subgroup = "barrel",
+			order = "b[fill-crude-oil-barrel]",
+			enabled = true,
+			ingredients =
+			{
+				{type="item", name="none", amount=1}
+			},
+			results=
+			{
+			  {type="fluid", name=v.name, amount=-1}
+			}
+		}
+	})
+end
+
+data:extend(
+{
+	{
+		type = "item",
+		name = "none",
+		icon = "__clusterio__/graphics/icons/none.png",
+		flags = { "goes-to-quickbar" },
+		subgroup = "intermediate-product",
+		order = "c[other]-a[power-switch]",
+		stack_size= 1,
+  }
+})
 
 
 
diff --git a/clusterio_0.0.2/graphics/icons/none.png b/clusterio_0.0.2/graphics/icons/none.png
new file mode 100644
index 00000000..67c44794
Binary files /dev/null and b/clusterio_0.0.2/graphics/icons/none.png differ