Additional strucutre for state machine.  Bug in disarm state, not functional.