Refactor the in-progress tuple swap work into a function in base class