First major changes

https://www.openstreetmap.org/user/Cyniqmaster/diary/7887