Continued work on simulator.