WIP: adding XA state tracker based EXA