Initial work on Simulator class