CRUD bugs

Still need more work, but it is a start