More work on Edit/Delete