Now saves class data with score