Hugely irresponsible mega-commit

It has everything in it, because I wasn't doing source control properly.