Added validation helper, tested, updated validation rules on models