Trying to correct CRUD issues