Address progress 2

https://www.openstreetmap.org/user/contrapunctus/diary/48362