Finished with #8 and have setup for #9. Just need RESTful API fix to finish