simplified the way validation is done (hopefuly)
9 files changed