Add/delete/edit now works