Reorder some stuff
Wut?