Added match validation controller

Seems to work as a charm :)