Lots of changed and stuff, REST API mostly complete, I think. Also, a minor reorg