Working on context edit/delete