Updated Gradebook Building Block - Needs Testing