Added more of the basic sim infrastructure.