diff --git a/entities/standard/hostile/evoker.json b/entities/standard/hostile/evoker.json
new file mode 100644
index 00000000..0ead7d00
--- /dev/null
+++ b/entities/standard/hostile/evoker.json
@@ -0,0 +1,4 @@
+{
+    "type": "EVOKER",
+    "spawnEffectRiseOutOfGround": true,
+}
diff --git a/entities/standard/hostile/vindicator.json b/entities/standard/hostile/vindicator.json
new file mode 100644
index 00000000..f1801bc0
--- /dev/null
+++ b/entities/standard/hostile/vindicator.json
@@ -0,0 +1,4 @@
+{
+    "type": "VINDICATOR",
+    "spawnEffectRiseOutOfGround": true,
+}
diff --git a/entities/standard/passive/allay.json b/entities/standard/passive/allay.json
new file mode 100644
index 00000000..5903da0b
--- /dev/null
+++ b/entities/standard/passive/allay.json
@@ -0,0 +1 @@
+{"type": "ALLAY"}
diff --git a/jigsaw-pieces/ancient_city/ancient_city.json b/jigsaw-pieces/ancient_city/ancient_city.json
new file mode 100644
index 00000000..1465fd8b
--- /dev/null
+++ b/jigsaw-pieces/ancient_city/ancient_city.json
@@ -0,0 +1,5 @@
+{
+    "object": "jigsaw/ancient_city/ancient_city",
+    "connectors": [],
+    "preprocessors": []
+}
diff --git a/jigsaw-pieces/mansion/mansion.json b/jigsaw-pieces/mansion/mansion.json
new file mode 100644
index 00000000..88b0edbb
--- /dev/null
+++ b/jigsaw-pieces/mansion/mansion.json
@@ -0,0 +1,5 @@
+{
+    "object": "jigsaw/mansion/mansion",
+    "connectors": [],
+    "preprocessors": []
+}
diff --git a/jigsaw-pools/ancient_city/ancient_city.json b/jigsaw-pools/ancient_city/ancient_city.json
new file mode 100644
index 00000000..39a63145
--- /dev/null
+++ b/jigsaw-pools/ancient_city/ancient_city.json
@@ -0,0 +1,3 @@
+{"pieces": [
+    "ancient_city/ancient_city"
+]}
diff --git a/jigsaw-pools/mansion/mansion.json b/jigsaw-pools/mansion/mansion.json
new file mode 100644
index 00000000..b1f9181b
--- /dev/null
+++ b/jigsaw-pools/mansion/mansion.json
@@ -0,0 +1,3 @@
+{"pieces": [
+    "mansion/mansion"
+]}
diff --git a/jigsaw-structures/ancient_city.json b/jigsaw-structures/ancient_city.json
new file mode 100644
index 00000000..beb7dc05
--- /dev/null
+++ b/jigsaw-structures/ancient_city.json
@@ -0,0 +1,7 @@
+{
+    "maxDepth": 1,
+    "pieces": ["ancient_city/ancient_city"],
+	"lockY": 12,
+    "terminate": false
+
+}
diff --git a/jigsaw-structures/mansion.json b/jigsaw-structures/mansion.json
index ab661f01..d554a50f 100644
--- a/jigsaw-structures/mansion.json
+++ b/jigsaw-structures/mansion.json
@@ -1,5 +1,5 @@
 {
-    "maxDepth": 20,
-    "pieces": ["mansion/main/a1"],
-    "terminate": true
+    "maxDepth": 1,
+    "pieces": ["mansion/mansion"],
+    "terminate": false
 }
diff --git a/loot/ancient_city.json b/loot/ancient_city.json
new file mode 100644
index 00000000..c0819e23
--- /dev/null
+++ b/loot/ancient_city.json
@@ -0,0 +1,162 @@
+{
+    "name": "Ancient_City",
+    "rarity": 1,
+    "minPicked": 4,
+    "maxPicked": 9,
+    "loot": [
+        {
+            "type": "coal",
+            "maxAmount": 15,
+            "minAmount": 6,
+            "rarity": 2,
+            "slotTypes": "STORAGE"
+        },
+        {
+            "type": "bone",
+            "maxAmount": 15,
+			"minAmount": 1,
+            "rarity": 2,
+            "slotTypes": "STORAGE"
+        },
+        {
+            "type": "soul_torch",
+            "maxAmount": 15,
+			"minAmount": 1,
+            "rarity": 3,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "book",
+            "maxamount": 10,
+			"minAmount": 3,
+            "rarity": 3,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "potion_of_regeneration",
+            "maxamount": 3,
+            "minAmount": 1,
+            "rarity": 3,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "enchanted_book",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 3,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "disc_fragment",
+            "maxamount": 3,
+            "minAmount": 1,
+            "rarity": 3,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "echo_shard",
+            "maxamount": 3,
+            "minAmount": 1,
+            "rarity": 3,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "amethyst_shard",
+            "maxamount": 15,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "glow_berries",
+            "maxamount": 15,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "sculk",
+            "maxamount": 10,
+            "minAmount": 4,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "candle",
+            "maxamount": 4,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "experience_bottle",
+            "maxamount": 3,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "sculk_sensor",
+            "maxamount": 3,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "sculk_catalyst",
+            "maxamount": 2,
+            "minAmount": 1,
+            "rarity": 8,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "compass",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 8,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "music_disc",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 8,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "lead",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 8,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "name_tag",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 8,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "saddle",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 8,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "diamond_horse_armor",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 8,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "enchanted_golden_apple",
+            "maxamount": 2,
+            "minAmount": 1,
+            "rarity": 16,
+            "slottypes": "STORAGE"
+        }
+    ]
+}
diff --git a/loot/mansion.json b/loot/mansion.json
new file mode 100644
index 00000000..605e34e5
--- /dev/null
+++ b/loot/mansion.json
@@ -0,0 +1,169 @@
+{
+    "name": "Mansion",
+    "rarity": 1,
+    "minPicked": 4,
+    "maxPicked": 9,
+    "loot": [
+        {
+            "type": "bone",
+            "maxAmount": 8,
+            "minAmount": 1,
+            "rarity": 2,
+            "slotTypes": "STORAGE"
+        },
+        {
+            "type": "gunpowder",
+            "maxAmount": 8,
+			"minAmount": 1,
+            "rarity": 2,
+            "slotTypes": "STORAGE"
+        },
+        {
+            "type": "rotten_flesh",
+            "maxAmount": 8,
+			"minAmount": 1,
+            "rarity": 2,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "string",
+            "maxamount": 8,
+			"minAmount": 1,
+            "rarity": 2,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "wheat",
+            "maxamount": 4,
+            "minAmount": 1,
+            "rarity": 3,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "coal",
+            "maxamount": 4,
+            "minAmount": 1,
+            "rarity": 4,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "redstone_dust",
+            "maxamount": 4,
+            "minAmount": 1,
+            "rarity": 4,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "beetroot_seeds",
+            "maxamount": 4,
+            "minAmount": 2,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "melon_seeds",
+            "maxamount": 4,
+            "minAmount": 2,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "pumpkin_seeds",
+            "maxamount": 4,
+            "minAmount": 2,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "iron_ingot",
+            "maxamount": 4,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "bread",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 3,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "lead",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 4,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "name_tag",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 4,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "gold_ingot",
+            "maxamount": 4,
+            "minAmount": 1,
+            "rarity": 10,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "music_disc",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "golden_apple",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "diamond_hoe",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "bucket",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 5,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "enchanted_book",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 6,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "chainmail_chestplate",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 6,
+            "slottypes": "STORAGE"
+        },
+		{
+            "type": "diamond_chestplate",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 12,
+            "slottypes": "STORAGE"
+        },
+        {
+            "type": "enchanted_golden_apple",
+            "maxamount": 1,
+            "minAmount": 1,
+            "rarity": 30,
+            "slottypes": "STORAGE"
+        }
+    ]
+}
diff --git a/markers/allay.json b/markers/allay.json
new file mode 100644
index 00000000..c424794a
--- /dev/null
+++ b/markers/allay.json
@@ -0,0 +1,5 @@
+{
+    "removeOnChange": true,
+    "spawners": ["allay"],
+    "exhaustionChance": 0.75
+}
diff --git a/markers/evoker.json b/markers/evoker.json
new file mode 100644
index 00000000..db564be0
--- /dev/null
+++ b/markers/evoker.json
@@ -0,0 +1,5 @@
+{
+    "removeOnChange": true,
+    "spawners": ["evoker"],
+    "exhaustionChance": 0.75
+}
diff --git a/markers/vindicator.json b/markers/vindicator.json
new file mode 100644
index 00000000..78c4a19a
--- /dev/null
+++ b/markers/vindicator.json
@@ -0,0 +1,5 @@
+{
+    "removeOnChange": true,
+    "spawners": ["vindicator"],
+    "exhaustionChance": 0.75
+}
diff --git a/objects/jigsaw/ancient_city/ancient_city.iob b/objects/jigsaw/ancient_city/ancient_city.iob
new file mode 100644
index 00000000..be94461a
Binary files /dev/null and b/objects/jigsaw/ancient_city/ancient_city.iob differ
diff --git a/objects/jigsaw/mansion/mansion.iob b/objects/jigsaw/mansion/mansion.iob
new file mode 100644
index 00000000..ad0dcd6c
Binary files /dev/null and b/objects/jigsaw/mansion/mansion.iob differ
diff --git a/spawners/evoker.json b/spawners/evoker.json
new file mode 100644
index 00000000..fc5a1cd9
--- /dev/null
+++ b/spawners/evoker.json
@@ -0,0 +1,13 @@
+{
+    "maximumRate": {
+        "amount": 3,
+        "per": {"minecraftDays": 6}
+    },
+    "maxEntitiesPerChunk": 2,
+    "initialSpawns": [{
+        "entity": "standard/hostile/evoker",
+        "rarity": 2,
+        "maxSpawns": 2,
+        "minSpawns": 1
+    }]
+}
diff --git a/spawners/vindicator.json b/spawners/vindicator.json
new file mode 100644
index 00000000..954a949f
--- /dev/null
+++ b/spawners/vindicator.json
@@ -0,0 +1,13 @@
+{
+    "maximumRate": {
+        "amount": 3,
+        "per": {"minecraftDays": 6}
+    },
+    "maxEntitiesPerChunk": 2,
+    "initialSpawns": [{
+        "entity": "standard/hostile/vindicator",
+        "rarity": 2,
+        "maxSpawns": 2,
+        "minSpawns": 1
+    }]
+}