Work done so far... (part 2)

https://www.openstreetmap.org/user/CroKimba/diary/20132