more scenario changes. last commit before trying to implememnt overhaul