Refactored to be ever more RESTful