Added add and remove functionality for classmates