--- a/ObjectiveTracker/Quests.lua	Thu Apr 14 17:11:13 2016 -0400
+++ b/ObjectiveTracker/Quests.lua	Thu Apr 14 19:39:05 2016 -0400
@@ -77,28 +77,7 @@
 Quest.UpdateLine = function(handler, block, line, data)
   local print = lprint
   local objectiveType = data.type
-  local r, g, b, a = 0, 1, 1, 1
-
-  line.progress = 0
-  if data.finished then
-    line.progress = 2
-    r, g, b, a = 0, 1, 0, 1
-  elseif objectiveType == 'monster' then
-    r, g, b, a = 1, .55, .2, 1
-  elseif objectiveType == 'item' then
-    r, g, b, a = .8, .8, .8, 1
-  elseif objectiveType == 'object' then
-    r, g, b, a = 1, 1, 1, 1
-  elseif objectiveType == 'player' then
-    r, g, b, a = 0, 0.8, 1, 1
-  end
-  print(format('     |cFF%02X%02X%02X%0.1f, %0.1f, %0.1f|r', (r * 255), g * 255, b * 255, r, g, b))
-
-  line.displayColor = {r, g, b, a}
-  line.status:SetTextColor(r, g, b, a)
-  line.displayText = data.text
-
-  return data.text, nil
+  return data.text, nil, objectiveType
 end
 
 -----------------------------
@@ -213,6 +192,7 @@
         requiredMoney = requiredMoney,
         playerMoney = playerMoney,
       }
+      tinsert(objectives, moneyInfo)
     end
 
     -- time limit
@@ -225,6 +205,7 @@
           timeElapsed = timeElapsed,
           failureTime = failureTime,
         }
+        tinsert(objectives, timerInfo)
       end
     end
   end
@@ -363,6 +344,7 @@
   q.isComplete = isComplete
   q.isStory = isStory
   q.isTask = isTask
+  q.statusKey = temp_status
 
   q.selected =  (questID == superTrackQuestID) -- call directly so artifact data doesn't become an issue
   self.WatchInfo[watchIndex] = q