Reset to before merge with Colin's latest which messed up stateMachine>forceState, etc. Added back my query menu changes.