Deploy validation in two spots

Start testing like a insane person.