First draft of new validation rules