WIP seems to work, but not perfect
Merge branch 'master' of github.com:chrisbobo/chrisbobo-validation-module