Bring back validation, but in a separate class now.