refactor term row handling, get the validators working