Code written for setting up dynamic scenarios - testing pending.

-- Tested that static scenarios still run OK.