Reworked to be more RESTful