Work in progress...

https://www.openstreetmap.org/user/Anxe/diary/23485