7 is fun
Refactor: Push ugly state checks under the covers