Almost finished with CRUD implementation