Scenario 3 skeleton and refactoring (move previous 3 to 9)