diff --git a/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_back.nbt b/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_back.nbt
new file mode 100644
index 000000000..6e6d45fb1
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_back.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_front.nbt b/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_front.nbt
new file mode 100644
index 000000000..3177fa75e
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structures/frigate/frigate_front.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_center.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_center.nbt
deleted file mode 100644
index d14fefebf..000000000
Binary files a/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_center.nbt and /dev/null differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_elevator_bottom.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_elevator_bottom.nbt
new file mode 100644
index 000000000..e984ef504
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_elevator_bottom.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_elevator_top.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_elevator_top.nbt
new file mode 100644
index 000000000..784b51161
Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_elevator_top.nbt differ
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/frigate.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/frigate.json
new file mode 100644
index 000000000..131104ad9
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/frigate.json
@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+	"#forge:is_desert",
+	"minecraft:plains"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/laboratory.json b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/laboratory.json
index d024525f3..131104ad9 100644
--- a/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/laboratory.json
+++ b/src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/laboratory.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+	"#forge:is_desert",
 	"minecraft:plains"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json
new file mode 100644
index 000000000..abb65bcde
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json
@@ -0,0 +1,33 @@
+{
+  "type": "minecraft:jigsaw",
+  "biomes": "#overdrive_that_matters:frigate",
+  "max_distance_from_center": 100,
+  "size": 1,
+  "start_height": {
+    "type": "minecraft:uniform",
+    "max_inclusive": {
+      "below_top": 30
+    },
+    "min_inclusive": {
+      "absolute": 100
+    }
+  },
+  "spawn_overrides": {
+    "monster": {
+      "bounding_box": "piece",
+      "spawns": [
+        {
+          "type": "minecraft:pillager",
+          "weight": 1,
+          "minCount": 1,
+          "maxCount": 2
+        }
+      ]
+    }
+  },
+  "start_jigsaw_name": "overdrive_that_matters:frigate_anchor",
+  "start_pool": "overdrive_that_matters:frigate",
+  "step": "surface_structures",
+  "terrain_adaption": "beard_box",
+  "use_expansion_hack": false
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json
index 2b9de972c..a01be41be 100644
--- a/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json
@@ -3,8 +3,9 @@
   "biomes": "#overdrive_that_matters:laboratory",
   "max_distance_from_center": 80,
   "size": 7,
+  "project_start_to_heightmap": "WORLD_SURFACE_WG",
   "start_height": {
-    "absolute": 30
+	  "absolute": 0
   },
   "spawn_overrides": {
     "monster": {
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/frigate.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/frigate.json
new file mode 100644
index 000000000..53be838e6
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure_set/frigate.json
@@ -0,0 +1,14 @@
+{
+  "placement": {
+    "type": "minecraft:random_spread",
+    "salt": 20072342,
+    "separation": 8,
+    "spacing": 24
+  },
+  "structures": [
+    {
+      "structure": "overdrive_that_matters:frigate",
+      "weight": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate.json
new file mode 100644
index 000000000..cef7e9248
--- /dev/null
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate.json
@@ -0,0 +1,24 @@
+{
+  "name": "overdrive_that_matters:rooms",
+  "fallback": "minecraft:empty",
+  "elements": [
+    {
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/frigate_front",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	 {
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:frigate/frigate_back",
+        "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/laboratory/center.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center.json
index fe48e3941..d3139602d 100644
--- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center.json
+++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center.json
@@ -5,7 +5,16 @@
 	 {
       "element": {
 		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/center/lab_center",
+		"location": "overdrive_that_matters:laboratory/center/lab_elevator_top",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/center/lab_elevator_bottom",
         "processors": "minecraft:empty",
 		"projection": "rigid"
       },