Enrolment options

Supplement #18