First cut of moving validators into datatypes