Implemented simulator states and various other stuff