Add in a new Scenario class to significantly reduce the complexity.