Starting to flesh out the validation system