Enrolment options

Supplement #19