Cleanup and addition of Restful groundwork.