The state machine debacle has finally been resolved. After making a mess of my project in an attempt to make my state machine modular, I learned some new git techniques and sent my project further int...