Rewrote Validation Pairing _Again_

THAT WAS HARD!