Organizing upgrades, adding a few
Prepping Simulator for separation
Prepping Simulator for separation
Making the Simulator private to prep for webworker
Fixing crashes from Simulator refactor
merge featured into master, fix conflicts