Internal refactor, SimpleStep, WIP