Move getting grade data into the view