Finish remaining CRUD User Stories