Stepping working correctly

TODO: Refactor basic functionality into ModelController and
ModelProcessor