And more VO...
Scaffolding updates for Scenarios 2 and 3.
Minor fixes - added in loop blocks for level 3 scenarios