More validation work...

Ugh -.-