Feature/ian/updated scenarios

PR created, getting ready for monster merge, so the new scenarios get played with next week.