Merge pull request #129 from dmcdougall/fix-the-oopsie

Fix the oopsie
Separate implementation of ModelValidation