Lots of changes I didn't bother committing before because nobody else was writing any code