Removed name from Location
Added gradeLevel to School