made Simulator back into a class