wip: first pass at fixing validation