Currently I am using this PR to merge with @colorant's PR. Let me get back to you, because I really would like your validation in a few places in both PRs.