Starting a complete re-factor to take a two-step approach, delete first, then insert