Mawr refactoring.
User can jump back steps.

[Finishes #68216836]