diff --git a/.gitignore b/.gitignore
index baa48412..31f825e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,3 @@ run-data
 
 repo
 /src/generated/resources/.cache/
-/CS_1.21.1_src.zip
diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json
index d0130cc6..cf7cad4c 100644
--- a/src/generated/resources/data/c/tags/block/storage_blocks.json
+++ b/src/generated/resources/data/c/tags/block/storage_blocks.json
@@ -2,6 +2,8 @@
   "values": [
     "creatingspace:raw_nickel_block",
     "creatingspace:nickel_block",
+    "creatingspace:raw_cobalt_block",
+    "creatingspace:raw_aluminum_block",
     "creatingspace:aluminum_block",
     "creatingspace:cobalt_block",
     "creatingspace:copronickel_block",
diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json b/src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json
deleted file mode 100644
index 09691f5b..00000000
--- a/src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "creatingspace:crushed_cobalt_ore"
-  ]
-}
\ No newline at end of file
diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials.json
deleted file mode 100644
index 09691f5b..00000000
--- a/src/generated/resources/data/c/tags/item/crushed_raw_materials.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "creatingspace:crushed_cobalt_ore"
-  ]
-}
\ No newline at end of file
diff --git a/src/generated/resources/data/c/tags/item/ingots.json b/src/generated/resources/data/c/tags/item/ingots.json
index 99f0eacf..8e8c16fc 100644
--- a/src/generated/resources/data/c/tags/item/ingots.json
+++ b/src/generated/resources/data/c/tags/item/ingots.json
@@ -6,7 +6,6 @@
     "creatingspace:inconel_ingot",
     "creatingspace:hastelloy_ingot",
     "creatingspace:nickel_ingot",
-    "creatingspace:aluminum_ingot",
     "creatingspace:cobalt_ingot"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/c/tags/item/nuggets.json b/src/generated/resources/data/c/tags/item/nuggets.json
index 0ccbb828..cbf2c9d6 100644
--- a/src/generated/resources/data/c/tags/item/nuggets.json
+++ b/src/generated/resources/data/c/tags/item/nuggets.json
@@ -5,8 +5,6 @@
     "creatingspace:monel_nugget",
     "creatingspace:inconel_nugget",
     "creatingspace:hastelloy_nugget",
-    "creatingspace:nickel_nugget",
-    "creatingspace:aluminum_nugget",
     "creatingspace:cobalt_nugget"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/c/tags/item/ores/cobalt.json b/src/generated/resources/data/c/tags/item/ores/cobalt.json
index 7edfcf02..8c832abc 100644
--- a/src/generated/resources/data/c/tags/item/ores/cobalt.json
+++ b/src/generated/resources/data/c/tags/item/ores/cobalt.json
@@ -1,6 +1,5 @@
 {
   "values": [
-    "creatingspace:crushed_cobalt_ore",
     "creatingspace:moon_cobalt_ore"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/c/tags/item/plates.json b/src/generated/resources/data/c/tags/item/plates.json
index 786d9748..04ed7279 100644
--- a/src/generated/resources/data/c/tags/item/plates.json
+++ b/src/generated/resources/data/c/tags/item/plates.json
@@ -5,8 +5,6 @@
     "creatingspace:monel_sheet",
     "creatingspace:inconel_sheet",
     "creatingspace:hastelloy_sheet",
-    "creatingspace:nickel_sheet",
-    "creatingspace:aluminum_sheet",
     "creatingspace:cobalt_sheet"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/c/tags/item/raw_materials.json b/src/generated/resources/data/c/tags/item/raw_materials.json
index 31423b0d..5ede8498 100644
--- a/src/generated/resources/data/c/tags/item/raw_materials.json
+++ b/src/generated/resources/data/c/tags/item/raw_materials.json
@@ -1,7 +1,6 @@
 {
   "values": [
     "creatingspace:raw_nickel",
-    "creatingspace:raw_aluminum",
     "creatingspace:raw_cobalt"
   ]
 }
\ No newline at end of file
diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json
index d0130cc6..cf7cad4c 100644
--- a/src/generated/resources/data/c/tags/item/storage_blocks.json
+++ b/src/generated/resources/data/c/tags/item/storage_blocks.json
@@ -2,6 +2,8 @@
   "values": [
     "creatingspace:raw_nickel_block",
     "creatingspace:nickel_block",
+    "creatingspace:raw_cobalt_block",
+    "creatingspace:raw_aluminum_block",
     "creatingspace:aluminum_block",
     "creatingspace:cobalt_block",
     "creatingspace:copronickel_block",
diff --git a/src/generated/resources/data/creatingspace/recipe/crafting/aluminum_nugget.json b/src/generated/resources/data/creatingspace/recipe/crafting/aluminum_nugget.json
index a8e75db5..b064b7e5 100644
--- a/src/generated/resources/data/creatingspace/recipe/crafting/aluminum_nugget.json
+++ b/src/generated/resources/data/creatingspace/recipe/crafting/aluminum_nugget.json
@@ -3,7 +3,7 @@
   "category": "misc",
   "ingredients": [
     {
-      "tag": "c:ingots/aluminum"
+      "tag": "c:nuggets/aluminum"
     }
   ],
   "result": {
diff --git a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json
index 9ab6e147..a2147206 100644
--- a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json
+++ b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json
@@ -6,7 +6,6 @@
     "creatingspace:raw_nickel_block",
     "creatingspace:nickel_block",
     "creatingspace:moon_aluminum_ore",
-    "creatingspace:raw_aluminum_block",
     "creatingspace:aluminum_block",
     "creatingspace:cobalt_block",
     "creatingspace:copronickel_block",
diff --git a/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java b/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java
index 0bcb746f..74db2932 100644
--- a/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java
+++ b/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java
@@ -633,6 +633,7 @@ public class BlockInit {
             .initialProperties(() -> Blocks.RAW_IRON_BLOCK)
             .tag(BlockTags.NEEDS_DIAMOND_TOOL)
             .transform(TagGen.pickaxeOnly())
+            .tag(Tags.Blocks.STORAGE_BLOCKS)
             .tag(TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_cobalt")))
             .recipe((c, p) ->
                     ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1)
@@ -643,6 +644,7 @@ public class BlockInit {
                             .unlockedBy("has_" + c.getName(), has(c.get()))
                             .save(p, resource("crafting/" + c.getName())))
             .item()
+            .tag(Tags.Items.STORAGE_BLOCKS)
             .tag(TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_cobalt")))
             .transform(customItemModel("raw_cobalt_block"))
             .register();
@@ -669,8 +671,8 @@ public class BlockInit {
     public static final BlockEntry<Block> RAW_ALUMINUM_BLOCK = REGISTRATE.block(
                     "raw_aluminum_block", Block::new)
             .initialProperties(() -> Blocks.RAW_IRON_BLOCK)
-            .tag(BlockTags.NEEDS_IRON_TOOL)
             .transform(TagGen.pickaxeOnly())
+            .tag(Tags.Blocks.STORAGE_BLOCKS)
             .tag(TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_aluminum")))
             .recipe((c, p) ->
                     ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1)
@@ -681,6 +683,7 @@ public class BlockInit {
                             .unlockedBy("has_" + c.getName(), has(c.get()))
                             .save(p, resource("crafting/" + c.getName())))
             .item()
+            .tag(Tags.Items.STORAGE_BLOCKS)
             .tag(TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_aluminum")))
             .transform(customItemModel("raw_aluminum_block"))
             .register();
diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipe/duplicate_blueprint.json b/src/main/resources/data/creatingspace/recipe/engine_recipe/duplicate_blueprint.json
index e644abcb..c21d8d0e 100644
--- a/src/main/resources/data/creatingspace/recipe/engine_recipe/duplicate_blueprint.json
+++ b/src/main/resources/data/creatingspace/recipe/engine_recipe/duplicate_blueprint.json
@@ -10,7 +10,8 @@
   "loops": 1,
   "results": [
     {
-      "id": "creatingspace:engine_blueprint"
+      "id": "creatingspace:engine_blueprint",
+      "count": 2
     }
   ],
   "sequence": [