WIP beforeStep.
Adding BeforeStep.