Reworked how we are matching up tokens.