Moved around sim specific state-machines
Played around with state-machine access