More moving values in to keys madness

https://map.bnnd.eu.org/user/SimonPoole/diary/46838