simple CRUD operations working fine, lots of other clean up