Working on the edit/delete