Stuff! (aka 'this should have been like 10 different commits or something')