Merging Wah Chun's updates to schoolregistration