Scenario overhaul
Merge pull request #57 from remear/scenario-overhaul

Scenario overhaul