Moved scenario building to Scenario class.

WIP - Do Not Merge