Some testing code to see if we desync DONOTMERGE
state: Move some logic into find*
Half-working reworked state tracker...