Still working on correcting CRUD