Updated, working on edit/delete functions