Start refactoring lots of crap.