Partway through re-factoring - a step backwards in order to go forwards.