Refactoring and in the middle of building history into stepper