Added more RESTful approach. In progress.