A whole bunch of changes

Stuff and stuff