Rework how state is tracked and allow matches to ACTUALLY track