diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/rooms/office_a.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/rooms/office_a.nbt
index 4d90ecb1a..1cc37bf40 100644
Binary files a/src/main/resources/data/overdrive_that_matters/structures/laboratory/rooms/office_a.nbt and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/rooms/office_a.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/cargo_container.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/cargo_container.json
new file mode 100644
index 000000000..2cbd03f77
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/cargo_container.json
@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+	"#forge:is_desert",
+	"minecraft:beach"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/ocean_container.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/ocean_container.json
new file mode 100644
index 000000000..2235e7ce9
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/ocean_container.json
@@ -0,0 +1,12 @@
+{
+  "replace": false,
+  "values": [
+	"minecraft:ocean",
+	"minecraft:deep_ocean",
+	"minecraft:cold_ocean",
+	"minecraft:deep_cold_ocean"
+	"minecraft:frozen_ocean",
+	"minecraft:deep_frozen_ocean",
+	"minecraft:deep_lukewarm_ocean"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure/cargo_container.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure/cargo_container.json
new file mode 100644
index 000000000..d0f13ebd3
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure/cargo_container.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:jigsaw",
+  "start_pool": "overdrive_that_matters:cargo_container",
+  "biomes": "#overdrive_that_matters:cargo_container",
+  "project_start_to_heightmap": "OCEAN_FLOOR_WG",
+  "start_height": {
+	  "absolute": 0
+  },
+  "max_distance_from_center": 4,
+  "size": 2,
+  "spawn_overrides": {
+  },
+  "step": "surface_structures",
+  "terrain_adaption": "bury",
+  "use_expansion_hack": false
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure/ocean_container.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure/ocean_container.json
new file mode 100644
index 000000000..9187f40d1
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure/ocean_container.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:jigsaw",
+  "start_pool": "overdrive_that_matters:ocean_container",
+  "biomes": "#overdrive_that_matters:ocean_container",
+  "project_start_to_heightmap": "OCEAN_FLOOR_WG",
+  "start_height": {
+	  "absolute": 0
+  },
+  "max_distance_from_center": 4,
+  "size": 2,
+  "spawn_overrides": {
+  },
+  "step": "surface_structures",
+  "terrain_adaption": "bury",
+  "use_expansion_hack": false
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/cargo_container.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/cargo_container.json
new file mode 100644
index 000000000..26f9243fe
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/cargo_container.json
@@ -0,0 +1,14 @@
+{
+  "structures":[
+    {
+      "structure": "overdrive_that_matters:cargo_container",
+      "weight": 1
+    }
+  ],
+  "placement": {
+	  "type": "minecraft:random_spread",
+	  "spacing": 120,
+	  "separation": 1,
+	  "salt": 10387312
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/ocean_container.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/ocean_container.json
new file mode 100644
index 000000000..ebbfdbd92
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/ocean_container.json
@@ -0,0 +1,14 @@
+{
+  "structures":[
+    {
+      "structure": "overdrive_that_matters:ocean_container",
+      "weight": 1
+    }
+  ],
+  "placement": {
+	  "type": "minecraft:random_spread",
+	  "spacing": 60,
+	  "separation": 1,
+	  "salt": 20072342
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/cargo_container.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/cargo_container.json
new file mode 100644
index 000000000..6f7167dd7
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/cargo_container.json
@@ -0,0 +1,24 @@
+{
+  "name": "overdrive_that_matters:cargo_container",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "overdrive_that_matters:abandoned_cargo_a",
+        "processors": "minecraft:empty",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
+	{
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "overdrive_that_matters:abandoned_cargo_b",
+        "processors": "minecraft:empty",
+        "projection": "rigid"
+      },
+      "weight": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/ocean_container.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/ocean_container.json
new file mode 100644
index 000000000..82000dfc5
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/ocean_container.json
@@ -0,0 +1,15 @@
+{
+  "name": "overdrive_that_matters:ocean_container",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "overdrive_that_matters:abandoned_cargo_ocean",
+        "processors": "minecraft:empty",
+        "projection": "rigid"
+      },
+      "weight": 1
+    }
+  ]
+}
\ No newline at end of file