Added a flag `USE_NEW` in EnrollmentController to flip between old and new implementations (temporary, until new ones are complete)