diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/SoundDataProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/SoundDataProvider.kt
index 6b9fcb943..32ea83048 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/SoundDataProvider.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/SoundDataProvider.kt
@@ -39,11 +39,15 @@ class SoundDataProvider(event: GatherDataEvent) : SoundDefinitionsProvider(event
 			definition().subtitle("otm.sound.android.shockwave")
 				.with(SoundDefinition.Sound.sound(modLocation("android/shockwave"), SoundDefinition.SoundType.SOUND)))
 
+		add(
+			MSoundEvents.BLACK_HOLE,
+			definition().subtitle("otm.sound.black_hole")
+				.with(SoundDefinition.Sound.sound(modLocation("singularity/amb_singularity"), SoundDefinition.SoundType.SOUND).stream()))
+
 		add(
 			MSoundEvents.ANDROID_PROJ_PARRY,
 			definition().subtitle("otm.sound.android.projectile_parry")
-				.with(SoundDefinition.Sound.sound(modLocation("android/punch_projectile"), SoundDefinition.SoundType.SOUND))
-		)
+				.with(SoundDefinition.Sound.sound(modLocation("android/punch_projectile"), SoundDefinition.SoundType.SOUND)))
 	}
 
 	private inline fun add(value: SoundEvent, block: SoundDefinition.() -> Unit) {
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 f5a25c061..018e5bfc9 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
@@ -24,10 +24,16 @@ fun addBlockModels(provider: MatteryBlockModelProvider) {
 		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)
+		column(MBlocks.GENERATOR_BLOCK, "block/generator_block","block/generator_block_top")
 		cubeAll(MBlocks.ENERGY_INPUT_INTERFACE)
 		cubeAll(MBlocks.ENERGY_OUTPUT_INTERFACE)
 
+		orientable(MBlocks.MATTER_INPUT_HATCH,"block/hatch","block/matter_input_hatch")
+		orientable(MBlocks.MATTER_OUTPUT_HATCH,"block/hatch","block/matter_output_hatch")
+
+		orientable(MBlocks.ENERGY_INPUT_HATCH,"block/hatch","block/energy_input_hatch")
+		orientable(MBlocks.ENERGY_OUTPUT_HATCH,"block/hatch","block/energy_output_hatch")
+
 		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 834a3254a..480e06e0e 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
@@ -342,4 +342,10 @@ fun addBlockStates(provider: MatteryBlockStateProvider) {
 	provider.block(MBlocks.GENERATOR_BLOCK)
 	provider.block(MBlocks.ENERGY_INPUT_INTERFACE)
 	provider.block(MBlocks.ENERGY_OUTPUT_INTERFACE)
+
+	provider.block(MBlocks.ENERGY_INPUT_HATCH)
+	provider.block(MBlocks.ENERGY_OUTPUT_HATCH)
+
+	provider.block(MBlocks.MATTER_INPUT_HATCH)
+	provider.block(MBlocks.MATTER_OUTPUT_HATCH)
 }
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 bf6dfa75a..1dd0bfcc9 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
@@ -241,6 +241,14 @@ fun addItemModels(provider: MatteryItemModelProvider) {
 	provider.block(MItems.ENERGY_INPUT_INTERFACE)
 	provider.block(MItems.ENERGY_OUTPUT_INTERFACE)
 
+	provider.block(MItems.ENERGY_INPUT_HATCH)
+	provider.block(MItems.ENERGY_OUTPUT_HATCH)
+
+	provider.block(MItems.MATTER_INPUT_HATCH)
+	provider.block(MItems.MATTER_OUTPUT_HATCH)
+
+
+
 	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 6494663c6..645325e3a 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
@@ -94,6 +94,12 @@ class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(eve
 		}
 	}
 
+	fun orientable(block: Block, side: String, front: String) {
+		exec {
+			orientable(block.registryName!!.path, modLocation(side), modLocation(front), modLocation(side))
+		}
+	}
+
 	fun decorativeColumn(it: Block, side: String, end: String) {
 		column(it, "block/decorative/$side", "block/decorative/$end")
 	}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MSoundEvents.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MSoundEvents.kt
index cfc556f38..a235706e8 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MSoundEvents.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MSoundEvents.kt
@@ -22,6 +22,8 @@ object MSoundEvents {
 	val ANDROID_SHOCKWAVE		by make("android.shockwave")
 	val ANDROID_PROJ_PARRY		by make("android.projectile_parry")
 
+	val BLACK_HOLE		by make("black_hole")
+
 	fun register(bus: IEventBus) {
 		registry.register(bus)
 	}
diff --git a/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity.ogg b/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity.ogg
new file mode 100644
index 000000000..53273a867
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity.ogg differ
diff --git a/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity_ring_0.ogg b/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity_ring_0.ogg
new file mode 100644
index 000000000..9d366e52a
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity_ring_0.ogg differ
diff --git a/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity_ring_1.ogg b/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity_ring_1.ogg
new file mode 100644
index 000000000..e7079335d
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity_ring_1.ogg differ
diff --git a/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity_ring_2.ogg b/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity_ring_2.ogg
new file mode 100644
index 000000000..2ccf1f0f7
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/sounds/singularity/amb_singularity_ring_2.ogg differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_hatch.png b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_hatch.png
new file mode 100644
index 000000000..e728d0122
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_hatch.png differ
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
index 0833c7b67..23529c66e 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_interface.png 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_hatch.png b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_output_hatch.png
new file mode 100644
index 000000000..1c015fbd7
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_output_hatch.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
index 23ee29bf1..688d6df7d 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/energy_output_interface.png 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/generator_block_top.png b/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block_top.png
new file mode 100644
index 000000000..2c2eac5d8
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block_top.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/hatch.png b/src/main/resources/assets/overdrive_that_matters/textures/block/hatch.png
new file mode 100644
index 000000000..9b4e71a71
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/hatch.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_input_hatch.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_input_hatch.png
new file mode 100644
index 000000000..8ef02fe56
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_input_hatch.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_input_interface.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_input_interface.png
new file mode 100644
index 000000000..3d614f2ff
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_input_interface.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_output_hatch.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_output_hatch.png
new file mode 100644
index 000000000..97995e7d5
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_output_hatch.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_output_interface.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_output_interface.png
new file mode 100644
index 000000000..dc897a839
Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_output_interface.png differ
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/misc/singularity_ring.png b/src/main/resources/assets/overdrive_that_matters/textures/misc/singularity_ring.png
index 9a88947ff..b37767673 100644
Binary files a/src/main/resources/assets/overdrive_that_matters/textures/misc/singularity_ring.png and b/src/main/resources/assets/overdrive_that_matters/textures/misc/singularity_ring.png differ