diff --git a/data/canopy/advancements/a_flower_in_your_hare.json b/data/canopy/advancements/a_flower_in_your_hare.json
new file mode 100644
index 0000000..8c0267b
--- /dev/null
+++ b/data/canopy/advancements/a_flower_in_your_hare.json
@@ -0,0 +1,25 @@
+{
+    "display": {
+        "icon": {
+            "item": "minecraft:dandelion"
+        },
+        "title": "A flower in your hare",
+        "description": "Thanks Hanny!",
+        "frame": "task",
+        "announce_to_chat": true
+    },
+    "parent": "canopy:root",
+    "criteria": {
+        "give_flower": {
+            "trigger": "minecraft:player_interacted_with_entity",
+            "conditions": {
+                "item": {
+                    "items": ["minecraft:dandelion"]
+                },
+                "entity": {
+                    "type": "minecraft:rabbit"
+                }
+            }
+        }
+    }
+}
diff --git a/data/canopy/advancements/feeling_caged_in.json b/data/canopy/advancements/feeling_caged_in.json
index c7108be..4664388 100644
--- a/data/canopy/advancements/feeling_caged_in.json
+++ b/data/canopy/advancements/feeling_caged_in.json
@@ -16,7 +16,7 @@
                         "dimension": "minecraft:overworld",
                         "position": {
                                 "x": {
-                                        "min": 23999
+                                        "min": 100000
                                 }
                         }
                 }
@@ -27,7 +27,7 @@
 			"dimension": "minecraft:overworld",
 			"position": {
 				"x": {
-					"max": -23999
+					"max": -100000
 				}
 			}
 		}
@@ -38,7 +38,7 @@
                         "dimension": "minecraft:overworld",
                         "position": {
                                 "z": {
-                                        "min": 23999
+                                        "min": 100000
                                 }
                         }
                 }
@@ -49,7 +49,7 @@
                         "dimension": "minecraft:overworld",
                         "position": {
                                 "z": {
-                                        "max": -23999
+                                        "max": -100000
                                 }
                         }
                 }
diff --git a/data/canopy/advancements/the_prized_sed.json b/data/canopy/advancements/the_prized_sed.json
deleted file mode 100644
index 5f124db..0000000
--- a/data/canopy/advancements/the_prized_sed.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:bucket"
-        },
-        "title": "The Prized Sed",
-        "description": "A cup of the most sought after sed on the server, won from a community event.",
-        "frame": "challenge",
-        "announce_to_chat": true
-    },
-    "parent": "canopy:root",
-    "criteria": {
-        "get_award": {
-            "trigger": "minecraft:impossible"
-            }
-        }
-}
diff --git a/data/canopy/advancements/yggdrasil.json b/data/canopy/advancements/yggdrasil.json
deleted file mode 100644
index 10e3a06..0000000
--- a/data/canopy/advancements/yggdrasil.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:dark_oak_sapling"
-        },
-        "title": "Yggdrasil",
-        "description": "Visit Yggdrasil at E490.",
-        "frame": "task",
-        "announce_to_chat": true
-    },
-    "parent": "landmarks:markets_and_malls",
-    "criteria": {
-        "yggdrasil": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:overworld",
-                "position": {
-                    "x": {
-                        "min": 3780,
-                        "max": 3870
-                    },
-                    "y": {
-                        "min": 50,
-                        "max": 120
-                    },
-                    "z": {
-                        "min": 2800,
-                        "max": 2900
-                    }
-                },
-                "player":  {
-                    "player": {
-                        "gamemode": "survival"
-		    }
-                }
-            }
-        }
-    }
-}
diff --git a/data/landmarks/advancements/deviltown.json b/data/landmarks/advancements/deviltown.json
deleted file mode 100644
index 2d0d28b..0000000
--- a/data/landmarks/advancements/deviltown.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:warped_nylium"
-        },
-        "title": "DevilTown",
-        "description": "Visit DevilTown at N987.",
-        "frame": "task",
-        "announce_to_chat": true
-    },
-    "parent": "landmarks:markets_and_malls",
-    "criteria": {
-        "southern_market": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:the_nether",
-                "position": {
-                    "x": {
-                        "min": -91,
-                        "max": 41
-                    },
-                    "y": {
-                        "min": 128,
-                        "max": 160
-                    },
-                    "z": {
-                        "min": -1054,
-                        "max": -923
-                    }
-                },
-                "player":  {
-                    "player": {
-                        "gamemode": "survival"
-		    }
-                }
-            }
-        }
-    }
-}
diff --git a/data/landmarks/advancements/ixos_mall.json b/data/landmarks/advancements/ixos_mall.json
deleted file mode 100644
index 92a2a37..0000000
--- a/data/landmarks/advancements/ixos_mall.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:chiseled_quartz_block"
-        },
-        "title": "Ixos Mall",
-        "description": "Visit the Ixos Mall at N66.",
-        "frame": "task",
-        "announce_to_chat": true
-    },
-    "parent": "landmarks:markets_and_malls",
-    "criteria": {
-        "southern_market": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:overworld",
-                "position": {
-                    "x": {
-                        "min": -125,
-                        "max": 50
-                    },
-                    "y": {
-                        "min": 50,
-                        "max": 100
-                    },
-                    "z": {
-                        "min": -640,
-                        "max": -460
-                    }
-                },
-                "player":  {
-                    "player": {
-                        "gamemode": "survival"
-		    }
-                }
-            }
-        }
-    }
-}
diff --git a/data/landmarks/advancements/markets_and_malls.json b/data/landmarks/advancements/markets_and_malls.json
deleted file mode 100644
index 6cfc103..0000000
--- a/data/landmarks/advancements/markets_and_malls.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:shulker_box"
-        },
-        "title": "Markets and Malls",
-        "description": "I'm gonna need more shulkers for all this loot...",
-        "frame": "task",
-	"show_toast": false,
-        "announce_to_chat": false
-    },
-    "parent": "landmarks:shops",
-    "criteria": {
-        "instant": {
-            "trigger": "minecraft:tick"
-        }
-    }
-}
diff --git a/data/landmarks/advancements/myconia.json b/data/landmarks/advancements/myconia.json
deleted file mode 100644
index 5a9cbf4..0000000
--- a/data/landmarks/advancements/myconia.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:red_mushroom"
-        },
-        "title": "Myconia",
-        "description": "Visit Myconia at S722.",
-        "frame": "task",
-        "announce_to_chat": true
-    },
-    "parent": "landmarks:shops",
-    "criteria": {
-        "southern_market": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:overworld",
-                "position": {
-                    "x": {
-                        "min": -147,
-                        "max": 190
-                    },
-                    "y": {
-                        "min": 50,
-                        "max": 100
-                    },
-                    "z": {
-                        "min": 5700,
-                        "max": 6070
-                    }
-                },
-                "player":  {
-                    "player": {
-                        "gamemode": "survival"
-		    }
-                }
-            }
-        }
-    }
-}
diff --git a/data/landmarks/advancements/noob_nest.json b/data/landmarks/advancements/noob_nest.json
deleted file mode 100644
index 28e13aa..0000000
--- a/data/landmarks/advancements/noob_nest.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:egg"
-        },
-        "title": "Noob Nest",
-        "description": "Get your starting feathies here!",
-        "frame": "task",
-        "announce_to_chat": true
-    },
-    "parent": "landmarks:root",
-    "criteria": {
-        "southern_market": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:overworld",
-                "position": {
-                    "x": {
-                        "min": -15,
-                        "max": 6
-                    },
-                    "y": {
-                        "min": 80,
-                        "max": 115
-                    },
-                    "z": {
-                        "min": -8,
-                        "max": 10
-                    }
-                },
-                "player":  {
-                    "player": {
-                        "gamemode": "survival"
-		    }
-                }
-            }
-        }
-    }
-}
diff --git a/data/landmarks/advancements/root.json b/data/landmarks/advancements/root.json
deleted file mode 100644
index 19de941..0000000
--- a/data/landmarks/advancements/root.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:filled_map"
-        },
-        "title": "Sightseeing",
-        "description": "Spread your wings and explore the server!",
-        "frame": "task",
-        "background": "minecraft:textures/environment/end_sky.png",
-        "show_toast": false,
-	"hidden": false,
-        "announce_to_chat": false
-
-    },
-    "criteria": {
-        "instant": {
-            "trigger": "minecraft:tick"
-        }
-    }
-}
diff --git a/data/landmarks/advancements/shops.json b/data/landmarks/advancements/shops.json
deleted file mode 100644
index 6120cd8..0000000
--- a/data/landmarks/advancements/shops.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:chest"
-        },
-        "title": "Shops",
-        "description": "Who needs diamonds anyways?",
-        "frame": "task",
-	"show_toast": false,
-        "announce_to_chat": false
-    },
-    "parent": "landmarks:root",
-    "criteria": {
-        "instant": {
-            "trigger": "minecraft:tick"
-        }
-    }
-}
diff --git a/data/landmarks/advancements/shrine_of_the_eeegh.json b/data/landmarks/advancements/shrine_of_the_eeegh.json
deleted file mode 100644
index d61a540..0000000
--- a/data/landmarks/advancements/shrine_of_the_eeegh.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "display":{
-        "icon":{
-            "item":"minecraft:dragon_egg"
-        },
-        "title":"Shrine of the Eeegh",
-        "description":"Anyone up for an omelette?",
-        "frame":"task",
-        "announce_to_chat":true
-    },
-    "parent":"landmarks:noob_nest",
-    "criteria":{
-        "southern_market":{
-            "trigger":"minecraft:location",
-            "conditions":{
-                "dimension":"minecraft:overworld",
-                "position":{
-                    "x":{
-                        "min":-64,
-                        "max":-34
-                    },
-                    "y":{
-                        "min":60,
-                        "max":79
-                    },
-                    "z":{
-                        "min":-13,
-                        "max":20
-                    }
-                },
-                "player":  {
-                    "player": {
-                        "gamemode": "survival"
-		    }
-                }
-            }
-        }
-    }
-}
diff --git a/data/landmarks/advancements/southern_market.json b/data/landmarks/advancements/southern_market.json
deleted file mode 100644
index 337d675..0000000
--- a/data/landmarks/advancements/southern_market.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:diamond"
-        },
-        "title": "Southern Market",
-        "description": "Visit the Southern Market at S50.",
-        "frame": "task",
-        "announce_to_chat": true
-    },
-    "parent": "landmarks:markets_and_malls",
-    "criteria": {
-        "southern_market": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:overworld",
-                "position": {
-                    "x": {
-                        "min": -98,
-                        "max": 125
-                    },
-                    "y": {
-                        "min": 60,
-                        "max": 100
-                    },
-                    "z": {
-                        "min": 301,
-                        "max": 489
-                    }
-                },
-                "player":  {
-                    "player": {
-                        "gamemode": "survival"
-		    }
-                }
-            }
-        }
-    }
-}
diff --git a/data/landmarks/advancements/the_ender_ender.json b/data/landmarks/advancements/the_ender_ender.json
deleted file mode 100644
index 4a7e62b..0000000
--- a/data/landmarks/advancements/the_ender_ender.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:player_head",
-	    "nbt": "{SkullOwner:\"Endermen\"}"
-	},
-        "title": "The Ender Ender",
-        "description": "They aren't gonna end themselves. Did someone say xp?",
-        "frame": "task",
-        "announce_to_chat": true,
-	"hidden": false
-    },
-    "parent": "landmarks:shrine_of_the_eeegh",
-    "criteria": {
-        "ender_ender": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:the_end",
-                "position": {
-                    "x": {
-                        "min": 308,
-                        "max": 325
-                    },
-                    "y": {
-                        "min": 0,
-                        "max": 10
-                    },
-                    "z": {
-                        "min": -15,
-                        "max": 5
-                    }
-                },
-                "player":  {
-                    "player": {
-                        "gamemode": "survival"
-		    }
-                }
-            }
-        }
-    }
-}
diff --git a/data/landmarks/advancements/waterloo_market.json b/data/landmarks/advancements/waterloo_market.json
deleted file mode 100644
index 2287234..0000000
--- a/data/landmarks/advancements/waterloo_market.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:water_bucket"
-        },
-        "title": "Waterloo Market",
-        "description": "Visit the Waterloo Market at W738.",
-        "frame": "task",
-        "announce_to_chat": true
-    },
-    "parent": "landmarks:markets_and_malls",
-    "criteria": {
-        "southern_market": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:overworld",
-                "position": {
-                    "x": {
-                        "min": -5910,
-                        "max": -5800
-                    },
-                    "y": {
-                        "min": 60,
-                        "max": 100
-                    },
-                    "z": {
-                        "min": -1775,
-                        "max": -1664
-                    }
-                },
-                "player":  {
-                    "player": {
-                        "gamemode": "survival"
-		    }
-                }
-            }
-        }
-    }
-}