Initial work on making the validation a bit more descriptive