--- a/ObjectiveUI.lua	Wed Apr 06 07:54:19 2016 -0400
+++ b/ObjectiveUI.lua	Fri Apr 08 06:12:05 2016 -0400
@@ -6,7 +6,7 @@
 local B = select(2,...).frame
 local mod = B:RegisterModule("ObjectiveTracker", _G.VeneerObjectiveWrapper, 'BuffFrame')
 local print = B.print('Objectives')
-local DefaultTracker, AutoQuest, Quest, Cheevs = mod.DefaultTracker, mod.AutoQuest, mod.Quest, mod.Cheevs
+local Default, AutoQuest, Quest, Cheevs = mod.DefaultHandler, mod.AutoQuest, mod.Quest, mod.Cheevs
 local itemButtonSize, itemButtonSpacing =  36, 1
 local tremove, tremovebyval = table.remove, table.removebyval
 
@@ -16,14 +16,14 @@
 --- -
 --------------------------------------------------------------------
 
-DefaultTracker.Select = function(self) end
-DefaultTracker.Open = function(self) end
-DefaultTracker.Remove = function(self) end
-DefaultTracker.Report = function(self)
+Default.Select = function(self) end
+Default.Open = function(self) end
+Default.Remove = function(self) end
+Default.Report = function(self)
   print('Stats:', self.numWatched,'items tracked,', self.numBlocks,'blocks assigned.')
 end
 
-DefaultTracker.OnMouseUp = function(self, button)
+Default.OnMouseUp = function(self, button)
   print(self.handler.name, self.mainStyle, self.subStyle)
   if button == 'LeftButton' then
     if IsModifiedClick("CHATLINK") and ChatEdit_GetActiveWindow() then
@@ -39,12 +39,11 @@
   self.initialButton = nil
   self.modChatLink = nil
   self.modQuestWatch = nil
-  self:SetStyle('TrackerBlock',  self.handler.name, self.mainStyle, self.subStyle)
+  mod:Update(self.handler.updateReasonModule)
   print('|cFFFF8800'..tostring(self:GetName())..':MouseUp()|r')
 end
 
-DefaultTracker.OnMouseDown = function(self, button)
-  self:SetStyle('TrackerBlock', self.handler.name, 'MouseDown')
+Default.OnMouseDown = function(self, button)
   print(IsModifiedClick("CHATLINK"), IsModifiedClick("QUESTWATCHTOGGLE"))
   print(self.info.title)
 end
@@ -86,13 +85,13 @@
 -----------------------------
 --- CHEEVS
 Cheevs.Select = function(self)
-  self:SetStyle('TrackerBlock',  self.info.type, 'Normal')
+  --mod:Update(OBJECTIVE_TRACKER_UPDATE_MODULE_ACHIEVEMENT)
 end
 Cheevs.Remove = function(self)
   RemoveTrackedAchievement(self.info.cheevID)
 end
 Cheevs.OnMouseUp = function(self, button)
-  DefaultTracker.OnMouseUp(self, button)
+  Default.OnMouseUp(self, button)
 end
 Cheevs.Link = function(self)
   local achievementLink = GetAchievementLink(self.info.cheevID);
@@ -111,3 +110,6 @@
   AchievementFrame_SelectAchievement(self.info.cheevID);
 end
 
+local Bonus = mod.Bonus
+Bonus.Remove = function(self, questID)
+end
\ No newline at end of file