More playing around with edit functionality