Design changes, and working on CRUD