Started refactor to restful returns from model.