More shuffling around, more RESTful GET stuff, lots of things to check over...