diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt
index d26e76d66..0d56dce4b 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt
@@ -14,6 +14,14 @@ fun addBlockModels(provider: MatteryBlockModelProvider) {
 		resourceCubeAll(MBlocks.DEEPSLATE_DILITHIUM_ORE)
 		resourceCubeAll(MBlocks.DILITHIUM_CRYSTAL_BLOCK)
 
+		cubeAll(MBlocks.FLYWHEEL_HOUSING)
+		column(MBlocks.FLYWHEEL_BEARING, "block/flywheel_bearing","block/flywheel_bearing_top")
+		column(MBlocks.FLYWHEEL_SHAFT, "block/flywheel_shaft","block/flywheel_shaft_top")
+
+		cubeAll(MBlocks.GENERATOR_BLOCK)
+		cubeAll(MBlocks.ENERGY_INPUT_INTERFACE)
+		cubeAll(MBlocks.ENERGY_OUTPUT_INTERFACE)
+
 		cable("crude_energy_cable", "block/power_cable_0", powered = true)
 		cable("regular_energy_cable", "block/power_cable_1", powered = true)
 		cable("advanced_energy_cable", "block/power_cable_2", powered = true)
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
index ea7f3a860..d8dc2f935 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt
@@ -310,4 +310,11 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
 			return@forAllStates generated.toTypedArray()
 		}
 	}
+	provider.block(MBlocks.FLYWHEEL_HOUSING)
+	provider.block(MBlocks.FLYWHEEL_BEARING)
+	provider.block(MBlocks.FLYWHEEL_SHAFT)
+
+	provider.block(MBlocks.GENERATOR_BLOCK)
+	provider.block(MBlocks.ENERGY_INPUT_INTERFACE)
+	provider.block(MBlocks.ENERGY_OUTPUT_INTERFACE)
 }
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
index f386dcd52..1116fd053 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt
@@ -228,6 +228,14 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 	provider.block(MItems.STORAGE_IMPORTER)
 	provider.block(MItems.STORAGE_EXPORTER)
 
+	provider.block(MItems.FLYWHEEL_HOUSING)
+	provider.block(MItems.FLYWHEEL_BEARING)
+	provider.block(MItems.FLYWHEEL_SHAFT)
+
+	provider.block(MItems.GENERATOR_BLOCK)
+	provider.block(MItems.ENERGY_INPUT_INTERFACE)
+	provider.block(MItems.ENERGY_OUTPUT_INTERFACE)
+
 	for (item in MItems.TRITANIUM_ANVIL) {
 		provider.block(item)
 	}
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt
index c587551d2..6494663c6 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt
@@ -26,6 +26,14 @@ class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(eve
 		return "Block Models: $modid"
 	}
 
+	fun cubeAll(vararg blocks: Block) {
+		for (block in blocks) {
+			exec {
+				cubeAll(block.registryName!!.path, modLocation("block/${block.registryName!!.path}"))
+			}
+		}
+	}
+
 	fun decorativeGlassAll(blocks: Collection<Block>) {
 		for (block in blocks) {
 			exec {
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_rework.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_rework.json
new file mode 100644
index 000000000..966ebfe8c
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_rework.json
@@ -0,0 +1,84 @@
+{
+	"credit": "Made with Blockbench",
+	"texture_size": [32, 32],
+	"elements": [
+		{
+			"from": [0, 0, 1],
+			"to": [16, 9, 15],
+			"color": 5,
+			"faces": {
+				"north": {"uv": [0, 0, 8, 4.5], "texture": "#missing"},
+				"east": {"uv": [0, 0, 7, 4.5], "texture": "#missing"},
+				"south": {"uv": [0, 0, 8, 4.5], "texture": "#missing"},
+				"west": {"uv": [0, 0, 7, 4.5], "texture": "#missing"},
+				"up": {"uv": [0, 0, 8, 7], "texture": "#missing"},
+				"down": {"uv": [0, 0, 8, 7], "texture": "#missing"}
+			}
+		},
+		{
+			"from": [2, 3, 0],
+			"to": [14, 15, 16],
+			"color": 9,
+			"faces": {
+				"north": {"uv": [0, 0, 6, 6], "texture": "#missing"},
+				"east": {"uv": [0, 0, 8, 6], "texture": "#missing"},
+				"south": {"uv": [0, 0, 6, 6], "texture": "#missing"},
+				"west": {"uv": [0, 0, 8, 6], "texture": "#missing"},
+				"up": {"uv": [0, 0, 6, 8], "texture": "#missing"},
+				"down": {"uv": [0, 0, 6, 8], "texture": "#missing"}
+			}
+		},
+		{
+			"from": [1, 9, 12],
+			"to": [15, 16, 14],
+			"color": 1,
+			"faces": {
+				"north": {"uv": [0, 0, 7, 3.5], "texture": "#missing"},
+				"east": {"uv": [0, 0, 1, 3.5], "texture": "#missing"},
+				"south": {"uv": [0, 0, 7, 3.5], "texture": "#missing"},
+				"west": {"uv": [0, 0, 1, 3.5], "texture": "#missing"},
+				"up": {"uv": [0, 0, 7, 1], "texture": "#missing"},
+				"down": {"uv": [0, 0, 7, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"from": [1, 9, 2],
+			"to": [15, 16, 4],
+			"color": 1,
+			"faces": {
+				"north": {"uv": [0, 0, 7, 3.5], "texture": "#missing"},
+				"east": {"uv": [0, 0, 1, 3.5], "texture": "#missing"},
+				"south": {"uv": [0, 0, 7, 3.5], "texture": "#missing"},
+				"west": {"uv": [0, 0, 1, 3.5], "texture": "#missing"},
+				"up": {"uv": [0, 0, 7, 1], "texture": "#missing"},
+				"down": {"uv": [0, 0, 7, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"from": [0, 14, 5],
+			"to": [6, 16, 11],
+			"color": 5,
+			"faces": {
+				"north": {"uv": [0, 0, 3, 1], "texture": "#missing"},
+				"east": {"uv": [0, 0, 3, 1], "texture": "#missing"},
+				"south": {"uv": [0, 0, 3, 1], "texture": "#missing"},
+				"west": {"uv": [0, 0, 3, 1], "texture": "#missing"},
+				"up": {"uv": [0, 0, 3, 3], "texture": "#missing"},
+				"down": {"uv": [0, 0, 3, 3], "texture": "#missing"}
+			}
+		},
+		{
+			"from": [1, 12, 6],
+			"to": [2, 14, 10],
+			"color": 5,
+			"faces": {
+				"north": {"uv": [0, 0, 0.5, 1], "texture": "#missing"},
+				"east": {"uv": [0, 0, 2, 1], "texture": "#missing"},
+				"south": {"uv": [0, 0, 0.5, 1], "texture": "#missing"},
+				"west": {"uv": [0, 0, 2, 1], "texture": "#missing"},
+				"up": {"uv": [0, 0, 0.5, 2], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_interface.png b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_interface.png
new file mode 100644
index 000000000..0833c7b67
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_interface.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/energy_output_interface.png b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_output_interface.png
new file mode 100644
index 000000000..23ee29bf1
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_output_interface.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing.png
new file mode 100644
index 000000000..0752f0dc1
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing_top.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing_top.png
new file mode 100644
index 000000000..485df8e08
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing_top.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_controller.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_controller.png
new file mode 100644
index 000000000..8f803caa8
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_controller.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_housing.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_housing.png
new file mode 100644
index 000000000..986c10b97
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_housing.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft.png
new file mode 100644
index 000000000..0c12c0971
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png
new file mode 100644
index 000000000..62235518a
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png
new file mode 100644
index 000000000..f32271606
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png differ