Converted ValidateEntity to use output
Cleanup + beginning to use expressions