Major overhaul to simulator design