refactoring scenario class

back to basics before wrecking it again