Sim is in separate project now.
More upgrades.