Scenario 7 skeleton, plus refactoring