Adding basic crud functionality, not going the angular route
Merging changes with HEAD