Part 2 of moving to RESTful API