Move things around
Hopefully better documented