Got validation working