progress working on scenario steps
refactoring