Rewrote Validation Pairing

I decided to start from scratch. I can't believe this actually worked :)