splitting Simulator to use new objects