overhaul to validator, closer to being in line with current spec