A whole bunch of changes I don't want to break into a bunch of commits