validation stuff
Merge branch 'ben'