diff --git a/data/mods/Sky_Island/itemgroups/exodii_cbms.json b/data/mods/Sky_Island/itemgroups/exodii_cbms.json
new file mode 100644
index 0000000000000..3406a1c0b06a0
--- /dev/null
+++ b/data/mods/Sky_Island/itemgroups/exodii_cbms.json
@@ -0,0 +1,91 @@
+[
+  {
+    "id": "SUS_exodii_storage_lowvalue",
+    "type": "item_group",
+    "copy-from": "SUS_exodii_storage_lowvalue",
+    "subtype": "distribution",
+    "extend": { "entries": [ { "group": "si_exodii_cbms_low_value", "prob": 20 } ] }
+  },
+  {
+    "id": "SUS_exodii_storage_medvalue",
+    "type": "item_group",
+    "copy-from": "SUS_exodii_storage_medvalue",
+    "subtype": "distribution",
+    "extend": {
+      "entries": [
+        {
+          "collection": [
+            { "group": "si_exodii_cbms_low_value", "prob": 50, "count": [ 1, 2 ] },
+            { "group": "si_exodii_cbms_med_value", "prob": 20 }
+          ],
+          "prob": 10
+        }
+      ]
+    }
+  },
+  {
+    "id": "SUS_exodii_storage_highvalue",
+    "type": "item_group",
+    "copy-from": "SUS_exodii_storage_highvalue",
+    "subtype": "distribution",
+    "extend": {
+      "entries": [
+        {
+          "collection": [
+            { "group": "si_exodii_cbms_low_value", "prob": 80, "count": [ 1, 3 ] },
+            { "group": "si_exodii_cbms_med_value", "prob": 50, "count": [ 1, 2 ] },
+            { "group": "si_exodii_cbms_high_value", "prob": 20 }
+          ],
+          "prob": 25
+        }
+      ]
+    }
+  },
+  {
+    "id": "si_exodii_cbms_low_value",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      {
+        "distribution": [ { "item": "bio_power_storage", "prob": 90 }, { "item": "bio_power_storage_mkII", "prob": 10 } ],
+        "prob": 80
+      },
+      { "group": "Zomborg_CBM_harvest_structural", "prob": 40 },
+      { "group": "Zomborg_CBM_harvest_utility", "prob": 60 },
+      { "group": "Zomborg_CBM_harvest_charging_tools", "prob": 30 }
+    ]
+  },
+  {
+    "id": "si_exodii_cbms_med_value",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      {
+        "distribution": [ { "item": "bio_power_storage", "prob": 90 }, { "item": "bio_power_storage_mkII", "prob": 10 } ],
+        "prob": 30
+      },
+      { "group": "Zomborg_CBM_harvest_structural", "prob": 40 },
+      { "group": "Zomborg_CBM_harvest_stat_enhancements", "prob": 30 },
+      { "group": "Zomborg_CBM_harvest_sensors", "prob": 60 },
+      {
+        "distribution": [
+          { "group": "Zomborg_CBM_harvest_melee_weapons", "prob": 70 },
+          { "group": "Zomborg_CBM_harvest_ranged_weapons", "prob": 40 }
+        ],
+        "prob": 30
+      },
+      { "group": "Zomborg_CBM_harvest_sensors", "prob": 60 }
+    ]
+  },
+  {
+    "id": "si_exodii_cbms_high_value",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      { "group": "Zomborg_CBM_harvest_stat_enhancements", "prob": 60 },
+      { "group": "Zomborg_CBM_harvest_fancy_defense", "prob": 50 },
+      { "group": "Zomborg_CBM_harvest_expensive_utilities", "prob": 30 },
+      { "group": "Zomborg_CBM_harvest_expensive_combat_systems", "prob": 20 }
+    ]
+  }
+]
diff --git a/data/mods/Sky_Island/mapgen/exodii_crashes.json b/data/mods/Sky_Island/mapgen/exodii_crashes.json
new file mode 100644
index 0000000000000..d15c765f7493c
--- /dev/null
+++ b/data/mods/Sky_Island/mapgen/exodii_crashes.json
@@ -0,0 +1,25 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "nest_exodii_crash_building_big_2",
+    "object": {
+      "mapgensize": [ 5, 5 ],
+      "rows": [
+        "|||||",
+        "||A||",
+        "|_C_|",
+        "||M||",
+        "||m||"
+      ],
+      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
+      "palettes": [ "exodii_crash_palette" ],
+      "terrain": { "A": "t_metal_floor", "C": "t_metal_floor" },
+      "furniture": { "A": "f_autodoc", "C": "f_autodoc_couch" },
+      "items": {
+        "_": [ { "item": "SUS_exodii_storage_highvalue", "chance": 40 }, { "item": "si_exodii_cbms_high_value", "chance": 33 } ]
+      },
+      "place_nested": [ { "chunks": [ "nest_exodii_crash_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
+    }
+  }
+]