Gotta say, I'm loving the village upgrades as a new distraction.
There's an Oak Village on the water not more than a couple stone throws SE of the Savanna Village, with
another Mending guy @22 emeralds. I though they were super-rare, but maybe these 2 villages are just lucky. I upgraded it and put a portal in (just S of the SE nether portal).
Also, I see on the map that Turtle's been helping one in the North. Looks like a refurbished old one from the map... fun stuff. I'm going out there tonight for sure.
