Second swing at validator