What I forgot to push 2 month ago

This has some re-arrangement's that probably shouldn't have been left this long before merging.