Some more refactoring. Moved Validators into ValidationService. Still
more to do.