Final push with validation rules added

Validation rules added