Just about finished with the RESTful refactor.  Now for some testing.