Scenario2 Final Push

Fixed some issues, optimized some things in prep for scenario3