Cleanup of error returning
Updated validation framework

Cleaned up validation to allow collection of errors to be halted/fixed