Fix sticky issues in the new curriculum

Transfer of students and CA from one school to another is now complicated