Enrolment options

CR-171
CR-172
CR-173