First major changes

https://map.bnnd.eu.org/user/Cyniqmaster/diary/7887