Validation refactor work in progress.