reworked the FSM, but still need to fix the tunnel vision problem and re merge everything