Move to a more-RESTful API
Work on better API