add basic step forward functionality, known bugs