Basis for state machine in, as well as a testing ground for me.
Fixing conflicts