Working through edit/delete issues