Pretty much finished the CRUD