All CRUD operations functional
Final commit, Day 1
fix merge conflicts