diff --git a/lms/djangoapps/certificates/views.py b/lms/djangoapps/certificates/views.py
index deb78fe3c7..472215ab5c 100644
--- a/lms/djangoapps/certificates/views.py
+++ b/lms/djangoapps/certificates/views.py
@@ -52,8 +52,7 @@ def certificate_request(request):
             return return_error(survey_response['error'])
 
         grade = None
-        # TODO: (bridger) Update this to use the faster grade instead of grade_sheet
-        student_gradesheet = grades.grade_sheet(request.user)
+        student_gradesheet = grades.grade(request.user, request, course)
         grade = student_gradesheet['grade']
 
         if not grade:
@@ -66,8 +65,7 @@ def certificate_request(request):
     else:
         #This is not a POST, we should render the page with the form
 
-        # TODO: (bridger) Update this to use the faster grade instead of grade_sheet
-        grade_sheet = grades.grade_sheet(request.user)
+        student_gradesheet = grades.grade(request.user, request, course)
         certificate_state = certificate_state_for_student(request.user, grade_sheet['grade'])
 
         if certificate_state['state'] != "requestable":
diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py
index aa7caea31b..ef68335c72 100644
--- a/lms/djangoapps/courseware/grades.py
+++ b/lms/djangoapps/courseware/grades.py
@@ -19,9 +19,18 @@ def yield_module_descendents(module):
    
 def grade(student, request, course, student_module_cache=None):
     """
-    This grades a student as quickly as possible. It reutns the 
-    output from the course grader. More information on the format
-    is in the docstring for CourseGrader.
+    This grades a student as quickly as possible. It retuns the 
+    output from the course grader, augmented with the final letter
+    grade. The keys in the output are:
+    
+    - grade : A final letter grade.
+    - percent : The final percent for the class (rounded up).
+    - section_breakdown : A breakdown of each section that makes
+        up the grade. (For display)
+    - grade_breakdown : A breakdown of the major components that
+        make up the final grade. (For display)
+    
+    More information on the format is in the docstring for CourseGrader.
     """
     
     grading_context = course.grading_context
@@ -84,8 +93,33 @@ def grade(student, request, course, student_module_cache=None):
         totaled_scores[section_format] = format_scores
     
     grade_summary = course.grader.grade(totaled_scores)
-    return grade_summary
     
+    # We round the grade here, to make sure that the grade is an whole percentage and
+    # doesn't get displayed differently than it gets grades
+    grade_summary['percent'] = round(grade_summary['percent'] * 100 + 0.05) / 100
+    
+    letter_grade = grade_for_percentage(course.grade_cutoffs, grade_summary['percent'])
+    grade_summary['grade'] = letter_grade
+    
+    return grade_summary
+
+def grade_for_percentage(grade_cutoffs, percentage):
+    """
+    Returns a letter grade 'A' 'B' 'C' or None.
+    
+    Arguments
+    - grade_cutoffs is a dictionary mapping a grade to the lowest
+        possible percentage to earn that grade.
+    - percentage is the final percent across all problems in a course
+    """
+    
+    letter_grade = None
+    for possible_grade in ['A', 'B', 'C']:
+        if percentage >= grade_cutoffs[possible_grade]:
+            letter_grade = possible_grade
+            break
+    
+    return letter_grade  
 
 def progress_summary(student, course, grader, student_module_cache):
     """
diff --git a/lms/templates/gradebook.html b/lms/templates/gradebook.html
index d4c5461916..e5721969e9 100644
--- a/lms/templates/gradebook.html
+++ b/lms/templates/gradebook.html
@@ -44,15 +44,15 @@
       
       <%def name="percent_data(percentage)">
         <%
-          data_class = "grade_none"
-          if percentage > .87:
-            data_class = "grade_a"
-          elif percentage > .70:
-            data_class = "grade_b"
-          elif percentage > .6:
-            data_class = "grade_c"
-          elif percentage > 0:
-              data_class = "grade_f"
+          letter_grade = 'None'
+          if percentage > 0:
+            letter_grade = 'F'
+            for grade in ['A', 'B', 'C']:
+              if percentage >= course.grade_cutoffs[grade]:
+                letter_grade = grade
+                break
+          
+          data_class = "grade_" + letter_grade
         %>
         <td class="${data_class}">${ "{0:.0%}".format( percentage ) }</td>
       </%def>
diff --git a/lms/templates/profile.html b/lms/templates/profile.html
index 8107bb1923..9fd0055d60 100644
--- a/lms/templates/profile.html
+++ b/lms/templates/profile.html
@@ -18,7 +18,7 @@
 <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.stack.js')}"></script>
 <script type="text/javascript" src="${static.url('js/vendor/flot/jquery.flot.symbol.js')}"></script>
 <script>
-${profile_graphs.body(grade_summary, "grade-detail-graph")}
+${profile_graphs.body(grade_summary, course.grade_cutoffs, "grade-detail-graph")}
 </script>
 
 <script>
diff --git a/lms/templates/profile_graphs.js b/lms/templates/profile_graphs.js
index 58dbeb8ed9..9826250331 100644
--- a/lms/templates/profile_graphs.js
+++ b/lms/templates/profile_graphs.js
@@ -1,6 +1,7 @@
-<%page args="grade_summary, graph_div_id, **kwargs"/>
+<%page args="grade_summary, grade_cutoffs, graph_div_id, **kwargs"/>
 <%!
   import json
+  import math
 %>
 
 $(function () {
@@ -89,8 +90,16 @@ $(function () {
   ticks += [ [overviewBarX, "Total"] ]
   tickIndex += 1 + sectionSpacer
   
-  totalScore = grade_summary['percent']
+  totalScore = math.floor(grade_summary['percent'] * 100) / 100 #We floor it to the nearest percent, 80.9 won't show up like a 90 (an A)
   detail_tooltips['Dropped Scores'] = dropped_score_tooltips
+  
+  
+  ## ----------------------------- Grade cutoffs ------------------------- ##
+  
+  grade_cutoff_ticks = [ [1, "100%"], [0, "0%"] ]
+  for grade in ['A', 'B', 'C']:
+      percent = grade_cutoffs[grade]
+      grade_cutoff_ticks.append( [ percent, "{0} {1:.0%}".format(grade, percent) ] )
   %>
   
   var series = ${ json.dumps( series ) };
@@ -98,6 +107,7 @@ $(function () {
   var bottomTicks = ${ json.dumps(bottomTicks) };
   var detail_tooltips = ${ json.dumps(detail_tooltips) };
   var droppedScores = ${ json.dumps(droppedScores) };
+  var grade_cutoff_ticks = ${ json.dumps(grade_cutoff_ticks) }
   
   //Alwasy be sure that one series has the xaxis set to 2, or the second xaxis labels won't show up
   series.push( {label: 'Dropped Scores', data: droppedScores, points: {symbol: "cross", show: true, radius: 3}, bars: {show: false}, color: "#333"} );
@@ -107,10 +117,10 @@ $(function () {
               lines: {show: false, steps: false },
               bars: {show: true, barWidth: 0.8, align: 'center', lineWidth: 0, fill: .8 },},
     xaxis: {tickLength: 0, min: 0.0, max: ${tickIndex - sectionSpacer}, ticks: ticks, labelAngle: 90},
-    yaxis: {ticks: [[1, "100%"], [0.87, "A 87%"], [0.7, "B 70%"], [0.6, "C 60%"], [0, "0%"]], min: 0.0, max: 1.0, labelWidth: 50},
+    yaxis: {ticks: grade_cutoff_ticks, min: 0.0, max: 1.0, labelWidth: 50},
     grid: { hoverable: true, clickable: true, borderWidth: 1,
-      markings: [ {yaxis: {from: 0.87, to: 1 }, color: "#ddd"}, {yaxis: {from: 0.7, to: 0.87 }, color: "#e9e9e9"}, 
-                  {yaxis: {from: 0.6, to: 0.7 }, color: "#f3f3f3"}, ] },
+      markings: [ {yaxis: {from: ${grade_cutoffs['A']}, to: 1 }, color: "#ddd"}, {yaxis: {from: ${grade_cutoffs['B']}, to: ${grade_cutoffs['A']} }, color: "#e9e9e9"}, 
+                  {yaxis: {from: ${grade_cutoffs['C']}, to: ${grade_cutoffs['B']} }, color: "#f3f3f3"}, ] },
     legend: {show: false},
   };