Started enrollment feature, modifications still need