CRUD functionality nearly complete