WIP New validator

This still needs some comments and tests but the basic structure is there. Tear it up.
Missing the replacement functionality for all these?