Update simulator.java

Done with everything up until the Branching!