--- a/ObjectiveTracker/Quests.lua	Wed Apr 13 20:19:37 2016 -0400
+++ b/ObjectiveTracker/Quests.lua	Wed Apr 13 21:53:24 2016 -0400
@@ -7,10 +7,9 @@
 local print = B.print('Tracker')
 local lprint = B.print('Line')
 local iprint = B.print('Info')
+local colors = T.colors
+local tprint = B.print('Tracker')
 
-local colors = T.colors
-
-local tprint = B.print('Tracker')
 Quest.Update = function(self, reason, ...)
   local print = tprint
   print('QuestTracker:Update() received')
@@ -322,30 +321,29 @@
 end
 
 
-Quest.Select = function(self)
-
-  if self.info.isAutoComplete and self.info.isComplete then
-    ShowQuestComplete(self.info.questLogIndex)
+Quest.Select = function (handler, block)
+  if block.info.isAutoComplete and block.info.isComplete then
+    ShowQuestComplete(block.info.questLogIndex)
   else
-    SetSuperTrackedQuestID(self.info.questID)
+    SetSuperTrackedQuestID(block.info.questID)
   end
 end
 
-Quest.Link = function(self)
+Quest.Link = function(handler, block)
 
-  local questLink = GetQuestLink(self.info.questLogIndex);
+  local questLink = GetQuestLink(block.info.questLogIndex);
   if ( questLink ) then
     ChatEdit_InsertLink(questLink);
   end
 end
 
-Quest.Open = function(self)
+Quest.Open = function(handler, block)
 
-  QuestMapFrame_OpenToQuestDetails(self.info.questID)
+  QuestMapFrame_OpenToQuestDetails(block.info.questID)
 end
 
-Quest.Remove = function(self)
+Quest.Remove = function(handler, block)
 
-  print('removing', self.info.questLogIndex, 'from watcher')
-  RemoveQuestWatch(self.info.questLogIndex)
-end
\ No newline at end of file
+  print('removing', block.info.questLogIndex, 'from watcher')
+  RemoveQuestWatch(block.info.questLogIndex)
+end