Done the stupid validation stupidness