Class Roster Part 2 commit