Forked and renamed

Forked and renamed to lay basis for new enrolment method.