Merge Me

Fully tested ValidateManager. Merge me if you approve.