annoying vs stuff
Moved ValidateEntity into its own class