Transitioned to state machine architecture
Merge remote-tracking branch 'origin/master' into experimental_rush