holy crap a whole bunch of things that dont belong in a single commit