Scenario Fix

NOW we can have multiple scenarios. Built with Hugh's models