         else
           null
       
-      # TO DO - add a function to calculate overall FNCLCC grade.
-
+      # TODO - add a function to calculate overall FNCLCC grade.
+
+      # Determine the composite score and stage from the given TNM
+      # and grade. This function creates a staging object consisting
+      # of the following properties:
+      # * t_value - the tumor size (the TNM T parameter)
+      # * g_value - the TNM grade (the TNM G parameter)
+      # * tumor_score - the composite TNM score
+      # * tumor_stage - the I-IV stage defined in TUMOR_STAGES
+      #
+      # @param the TNM object
+      # @param grade the tumor type-specific detail grade, e.g.
+      #   Nottingham for Breast or FNCLCC for Sarcoma
+      # @returns the staging object
       getTumorStaging = (tnm, grade) ->
+        # TODO - Create a separate helper in this Clinical service for
+        # each tumor type, e.g.
+        #   Breast =
+        #     GRADES = ...
+        #     STAGES = ...
+        #     getOverallGrade: (tnm) -> ...
+        #     getStage: (tnm) ->
+        # Remove all type-specific references in this main function.
+        # All type-specific code should be contained in the respecive
+        # service, so calls are by tumor type lookup, e.g.:
+        #   FORMATTERS =
+        #     Breast: Breast
+        #     Sarcoma: Sarcoma
+        #   formatter = FORMATTERS[coll]
+        #   grade = formatter.getOverallGrade(tnm)
+        #   ...
+        # There should be no conditions like the following:
+        #   if coll == 'Breast'
+        #   else if coll == 'Sarcoma'
+        #   ...
+        #
+        # TODO - The REST TNM model size field will become a composite
+        # Size object. After this REST model change takes effect, remove
+        # parsing the size string value and instead get the values
+        # directly from the size object.
+        #
         # Breast or sarcoma collection.
         coll = subject.collection
         # Obtain the T value without any prefixes (i.e. c or p).

        null: 'Not specified'
      }

    # Test result categorized as positive or negative.
    TEST_RESULTS =
      {
        false: 'negative'
        true: 'positive'

            [
              {
                label: 'Result'
                accessor: (outcome) -> POS_NEG_RESULTS[outcome.progestrogen.positive]
              }
              {
                label: 'Intensity'
