Begin refactoring to move away from Teachers/Students and towards Users