Ben: finish up validation