aharvey
Closed by https://www.openstreetmap.org/changeset/118801365 and https://www.openstreetmap.org/changeset/118801416
I did each zone as their own boundary, which I'm not sure is the right approach but should be okay for now pending further discussion.