Rearranging a few things

A bit of a mess right now.