More work on the state machine
Merge branch 'master' of https://github.com/nstehr/ItsAWash