added first validations
Fixed broken controller tests
Merge pull request #1 from derekdapp/derel/iteration_b1

Derel/iteration b1