First crack at remove and insert