diff --git a/elepower_dynamics/craftitems.lua b/elepower_dynamics/craftitems.lua
index 48bb853..ba06ef6 100644
--- a/elepower_dynamics/craftitems.lua
+++ b/elepower_dynamics/craftitems.lua
@@ -87,6 +87,12 @@ minetest.register_craftitem("elepower_dynamics:xycrone_lump", {
 
 -- Special
 
+minetest.register_craftitem("elepower_dynamics:graphite_rod", {
+	description = "Graphite Rod",
+	inventory_image = "elepower_graphite_rod.png",
+	groups = {graphite = 1, rod = 1}
+})
+
 minetest.register_craftitem("elepower_dynamics:carbon_fiber", {
 	description = "Carbon Fibers",
 	inventory_image = "elepower_carbon_fiber.png",
diff --git a/elepower_nuclear/textures/elenuclear_graphite_rod.png b/elepower_dynamics/textures/elepower_graphite_rod.png
similarity index 100%
rename from elepower_nuclear/textures/elenuclear_graphite_rod.png
rename to elepower_dynamics/textures/elepower_graphite_rod.png
diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua
index 5aad3f0..24d1d45 100644
--- a/elepower_machines/crafting.lua
+++ b/elepower_machines/crafting.lua
@@ -129,6 +129,10 @@ local grinding_recipes = {
 	{
 		recipe = { "default:mese_crystal" },
 		output = "default:mese_crystal_fragment 9",
+	},
+	{
+		recipe = { "elepower_dynamics:graphite_ingot" },
+		output = "elepower_dynamics:graphite_rod 3",
 	}
 }
 
diff --git a/elepower_nuclear/crafting.lua b/elepower_nuclear/crafting.lua
index 8a5c19f..4a41de7 100644
--- a/elepower_nuclear/crafting.lua
+++ b/elepower_nuclear/crafting.lua
@@ -14,28 +14,18 @@ minetest.register_craft({
 	output = "elepower_nuclear:enrichment_plant",
 	recipe = {
 		{"elepower_dynamics:induction_coil_advanced", "elepower_dynamics:soc", "elepower_dynamics:induction_coil_advanced"},
-		{"elepower_nuclear:graphite_rod", "elepower_nuclear:machine_block", "elepower_nuclear:graphite_rod"},
+		{"elepower_dynamics:graphite_rod", "elepower_nuclear:machine_block", "elepower_dynamics:graphite_rod"},
 		{"elepower_dynamics:wound_silver_coil", "elepower_dynamics:electrum_gear", "elepower_dynamics:wound_silver_coil"},
 	}
 })
 
--- Graphite Moderator
-minetest.register_craft({
-	output = "elepower_nuclear:graphite_moderator",
-	recipe = {
-		{"", "elepower_nuclear:graphite_rod", ""},
-		{"elepower_nuclear:graphite_rod", "elepower_dynamics:graphite_ingot", "elepower_nuclear:graphite_rod"},
-		{"", "elepower_nuclear:graphite_rod", ""},
-	}
-})
-
 -- Reactor Controller
 minetest.register_craft({
 	output = "elepower_nuclear:fission_controller",
 	recipe = {
-		{"elepower_dynamics:wound_copper_coil", "elepower_nuclear:graphite_moderator", "elepower_dynamics:wound_copper_coil"},
-		{"elepower_nuclear:graphite_moderator", "elepower_nuclear:machine_block", "elepower_nuclear:graphite_moderator"},
-		{"elepower_dynamics:electrum_gear", "elepower_nuclear:graphite_moderator", "elepower_dynamics:electrum_gear"},
+		{"elepower_dynamics:wound_copper_coil", "elepower_nuclear:control_rod_assembly", "elepower_dynamics:wound_copper_coil"},
+		{"basic_materials:motor", "elepower_nuclear:machine_block", "basic_materials:motor"},
+		{"elepower_dynamics:electrum_gear", "elepower_nuclear:control_plate", "elepower_dynamics:electrum_gear"},
 	}
 })
 
@@ -43,9 +33,9 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "elepower_nuclear:fission_core",
 	recipe = {
-		{"elepower_dynamics:induction_coil_advanced", "elepower_dynamics:graphite_ingot", "elepower_dynamics:induction_coil_advanced"},
-		{"elepower_nuclear:graphite_moderator", "elepower_nuclear:machine_block", "elepower_nuclear:graphite_moderator"},
-		{"elepower_dynamics:electrum_gear", "elepower_dynamics:copper_plate", "elepower_dynamics:electrum_gear"},
+		{"elepower_dynamics:induction_coil_advanced", "elepower_nuclear:control_plate", "elepower_dynamics:induction_coil_advanced"},
+		{"elepower_dynamics:steel_plate", "elepower_nuclear:pressure_vessel", "elepower_dynamics:steel_plate"},
+		{"elepower_dynamics:electrum_gear", "elepower_nuclear:machine_block", "elepower_dynamics:electrum_gear"},
 	}
 })
 
@@ -54,7 +44,7 @@ minetest.register_craft({
 	output = "elepower_nuclear:reactor_fluid_port",
 	recipe = {
 		{"elepower_dynamics:portable_tank", "elepower_dynamics:copper_plate", "elepower_dynamics:portable_tank"},
-		{"elepower_nuclear:graphite_moderator", "elepower_nuclear:machine_block", "elepower_nuclear:graphite_moderator"},
+		{"elepower_dynamics:servo_valve", "elepower_nuclear:heat_exchanger", "elepower_dynamics:servo_valve"},
 		{"elepower_dynamics:electrum_gear", "elepower_dynamics:copper_plate", "elepower_dynamics:electrum_gear"},
 	}
 })
@@ -89,14 +79,6 @@ minetest.register_craft({
 	}
 })
 
--- Graphite Rod
-elepm.register_craft({
-	type   = "grind",
-	recipe = { "elepower_dynamics:graphite_ingot" },
-	output = "elepower_nuclear:graphite_rod 3",
-	time   = 6,
-})
-
 -- Cold Coolant
 minetest.register_craft({
 	output = "elepower_nuclear:bucket_coolant",
@@ -207,3 +189,43 @@ elepm.register_craft({
 	},
 	time = 16
 })
+
+-- Control Rod
+minetest.register_craft({
+	output = "elepower_nuclear:control_rod",
+	recipe = {
+		{"", "elepower_dynamics:silver_plate", "moreores:silver_ingot"},
+		{"elepower_dynamics:silver_plate", "moreores:silver_ingot", "elepower_dynamics:silver_plate"},
+		{"moreores:silver_ingot", "elepower_dynamics:silver_plate", ""},
+	}
+})
+
+-- Control Rod Assembly
+minetest.register_craft({
+	output = "elepower_nuclear:control_rod_assembly",
+	recipe = {
+		{"elepower_nuclear:control_rod", "elepower_dynamics:steel_plate", "elepower_nuclear:control_rod"},
+		{"elepower_dynamics:graphite_ingot", "elepower_dynamics:graphite_ingot", "elepower_dynamics:graphite_ingot"},
+		{"elepower_nuclear:control_rod", "elepower_dynamics:steel_plate", "elepower_nuclear:control_rod"},
+	}
+})
+
+-- Pressure Vessel
+minetest.register_craft({
+	output = "elepower_nuclear:pressure_vessel",
+	recipe = {
+		{"elepower_dynamics:steel_plate", "elepower_dynamics:steel_plate", "elepower_dynamics:steel_plate"},
+		{"default:steelblock", "elepower_dynamics:portable_tank", "default:steelblock"},
+		{"elepower_dynamics:steel_plate", "default:steelblock", "elepower_dynamics:steel_plate"},
+	}
+})
+
+-- Control Plate
+minetest.register_craft({
+	output = "elepower_nuclear:control_plate",
+	recipe = {
+		{"elepower_dynamics:steel_plate", "elepower_dynamics:graphite_rod", "elepower_dynamics:steel_plate"},
+		{"elepower_dynamics:silver_plate", "", "elepower_dynamics:silver_plate"},
+		{"elepower_dynamics:bronze_plate", "", "elepower_dynamics:bronze_plate"},
+	}
+})
diff --git a/elepower_nuclear/craftitems.lua b/elepower_nuclear/craftitems.lua
index 26104f5..a802806 100644
--- a/elepower_nuclear/craftitems.lua
+++ b/elepower_nuclear/craftitems.lua
@@ -49,6 +49,34 @@ minetest.register_craftitem("elepower_nuclear:fuel_rod_depleted", {
 	max_stack = 1,
 })
 
+-- Control rods
+
+minetest.register_craftitem("elepower_nuclear:control_rod", {
+	description = "Control Rod",
+	inventory_image = "elenuclear_control_rod.png",
+	max_stack = 4,
+})
+
+minetest.register_craftitem("elepower_nuclear:control_rod_assembly", {
+	description = "Control Rod Assembly",
+	inventory_image = "elenuclear_control_rod_assembly.png",
+	max_stack = 1,
+})
+
+minetest.register_craftitem("elepower_nuclear:control_plate", {
+	description = "Perforated Control Plate",
+	inventory_image = "elenuclear_control_plate.png",
+	max_stack = 1,
+})
+
+-- Pressure vessel
+
+minetest.register_craftitem("elepower_nuclear:pressure_vessel", {
+	description = "Reactor Pressure Vessel",
+	inventory_image = "elenuclear_pressure_vessel.png",
+	max_stack = 1,
+})
+
 --------------------------
 -- Fusion-related items --
 --------------------------
@@ -58,15 +86,3 @@ minetest.register_craftitem("elepower_nuclear:fuel_rod_depleted", {
 -------------------------
 -- Crafting components --
 -------------------------
-
--- Graphite
-
-minetest.register_craftitem("elepower_nuclear:graphite_rod", {
-	description = "Graphite Rod",
-	inventory_image = "elenuclear_graphite_rod.png"
-})
-
-minetest.register_craftitem("elepower_nuclear:graphite_moderator", {
-	description = "Graphite Moderator",
-	inventory_image = "elenuclear_graphite_moderator.png"
-})
diff --git a/elepower_nuclear/textures/elenuclear_control_plate.png b/elepower_nuclear/textures/elenuclear_control_plate.png
new file mode 100644
index 0000000..7585dad
Binary files /dev/null and b/elepower_nuclear/textures/elenuclear_control_plate.png differ
diff --git a/elepower_nuclear/textures/elenuclear_control_rod.png b/elepower_nuclear/textures/elenuclear_control_rod.png
new file mode 100644
index 0000000..45b102c
Binary files /dev/null and b/elepower_nuclear/textures/elenuclear_control_rod.png differ
diff --git a/elepower_nuclear/textures/elenuclear_control_rod_assembly.png b/elepower_nuclear/textures/elenuclear_control_rod_assembly.png
new file mode 100644
index 0000000..03a1249
Binary files /dev/null and b/elepower_nuclear/textures/elenuclear_control_rod_assembly.png differ
diff --git a/elepower_nuclear/textures/elenuclear_graphite_moderator.png b/elepower_nuclear/textures/elenuclear_graphite_moderator.png
deleted file mode 100644
index d5aa6d1..0000000
Binary files a/elepower_nuclear/textures/elenuclear_graphite_moderator.png and /dev/null differ
diff --git a/elepower_nuclear/textures/elenuclear_pressure_vessel.png b/elepower_nuclear/textures/elenuclear_pressure_vessel.png
new file mode 100644
index 0000000..5e555bb
Binary files /dev/null and b/elepower_nuclear/textures/elenuclear_pressure_vessel.png differ