--- a/ObjectiveUI.lua	Fri Apr 01 12:27:05 2016 -0400
+++ b/ObjectiveUI.lua	Fri Apr 01 14:40:14 2016 -0400
@@ -36,7 +36,8 @@
   self.initialButton = nil
   self.modChatLink = nil
   self.modQuestWatch = nil
-  print('|cFFFF8800'..tostring(self:GetName())..':MouseUp()|r ->',self.info.trackingID)
+  print(IsModifiedClick("CHATLINK"), IsModifiedClick("QUESTWATCHTOGGLE"))
+  print('|cFFFF8800'..tostring(self:GetName())..':MouseUp()|r')
 end
 
 Tracker.OnMouseDown = function(self, button)
@@ -44,6 +45,7 @@
   self.modChatLink = IsModifiedClick("CHATLINK")
   self.modQuestWatch = IsModifiedClick("QUESTWATCHTOGGLE")
   self:SetStyle('Active')
+  print(IsModifiedClick("CHATLINK"), IsModifiedClick("QUESTWATCHTOGGLE"))
   print(self.info.title)
 end
 
@@ -72,11 +74,6 @@
 Quest.Remove = function(self)
   print('removing', self.info.questLogIndex, 'from watcher')
   RemoveQuestWatch(self.info.questLogIndex)
-
-  mod.Quest.LogBlock[self.info.questLogIndex] = nil
-  mod.Quest.QuestBlock[self.info.questID] = nil
-  QuestPOIUpdateIcons()
-  mod.UpdateWrapper()
 end
 
 
@@ -84,12 +81,18 @@
 --- CHEEVS
 Cheevs.Select = function(self)
 end
+Cheevs.Remove = function(self)
+  RemoveTrackedAchievement(self.info.cheevID)
+end
+Cheevs.OnMouseUp = function(self)
+  Tracker.OnMouseUp(self)
+  self:SetStyle('CheevNormal')
+end
 Cheevs.Link = function(self)
-    local achievementLink = GetAchievementLink(self.info.cheevID);
-    if ( achievementLink ) then
-      ChatEdit_InsertLink(achievementLink);
-    end
-  self:SetStyle('CheevNormal')
+  local achievementLink = GetAchievementLink(self.info.cheevID);
+  if ( achievementLink ) then
+    ChatEdit_InsertLink(achievementLink);
+  end
 end
 
 Cheevs.Open = function(self)
@@ -249,37 +252,42 @@
 --- Get a usable widget for the given achievement criteria set.
  -- Returns a frame object with dimensioning parameters needed to size the receiving tracker block
 mod.SetWidget = function(obj, info)
+  local print = B.print('ObjectiveWidgets')
   local widgetType = obj.type
   local widget
+  if wr[widgetType] and wr[widgetType].used[obj.criteriaID] then
+    widget = wr[widgetType].used[obj.criteriaID]
+    print('|cFF00FF00Updating ('..obj.criteriaID..')', widget)
+  elseif not wr[widgetType] or #wr[widgetType].free == 0 then
+    widget = CreateFrame('Frame', 'VeneerObjective' .. widgetType .. (wr[widgetType] and (wr[widgetType].lastn+1) or (1)), VeneerObjectiveScroll, 'VeneerObjectiveCriteria' .. widgetType)
 
-  if not wr[widgetType] or #wr[widgetType].free == 0 then
-    print('VeneerObjectiveCriteria' .. widgetType)
-    widget = CreateFrame('Frame', nil, VeneerObjectiveScroll, 'VeneerObjectiveCriteria' .. widgetType)
+    print('|cFFFF0088Creating `'..widget:GetName()..'` id', wr[widgetType].lastn)
+  else
+    widget = tremove(wr[widgetType].free)
+    print('|cFFFFFF00Acquiring released widget', widget:GetName())
   end
-  local free = wr[widgetType].free
-  local used = wr[widgetType].used
 
-  widget = tremove(free)
-  local index = #used+1
-  used[index] = widget
-  wr[widgetType].usedIndex[widget] = index
+  wr[widgetType].used[obj.criteriaID] = widget
   widget.info = obj
   widget.parentInfo = info
   mod.InitializeWidget(widget)
-
   return widget
 end
 
---- Fired by OnLoad() when a new frame is spawned
+--- WidgetTemplate 'OnLoad'
 mod.RegisterWidget = function(frame)
+  local print = B.print('ObjectiveWidgets')
   local widgetType = frame.widgetType
-  local obj = frame.info
   if not wr[frame.widgetType] then
     print('|cFFFF4400[[WidgetTemplate]]|r', widgetType)
-    wr[widgetType] = { lastn = 0, free = {}, used = {}, usedIndex = {}, freeIndex = {} }
+    wr[widgetType] = { lastn = 1, free = {}, used = {}, usedIndex = {}, freeIndex = {} }
+  else
+    print('|cFF0088FF+ [[WidgetTemplate]]r', widgetType, wr[widgetType].lastn)
+    wr[widgetType].lastn = wr[widgetType].lastn + 1
   end
-  tinsert(wr[frame.widgetType].free, frame)
 end
+
+--- WidgetTemplate 'OnShow'
 mod.InitializeWidget = setmetatable({}, {
   __call = function(t, frame)
     -- todo: config pull
@@ -301,6 +309,8 @@
     return t[frame.widgetType](frame)
   end,
 })
+
+--- WidgetTemplate 'OnEvent'
 mod.UpdateWidget = setmetatable({}, {
   __call = function(t, frame)
     if not frame.widgetType then
@@ -312,13 +322,35 @@
   end
 })
 
+--- WidgetTemplate 'OnHide'
 mod.ReleaseWidget = function(frame)
+  local print = B.print('ObjectiveWidgets')
   local reg = wr[frame.widgetType]
-  if reg and reg.usedIndex[frame] then
-    tremove(reg.used, reg.usedIndex[frame])
-    reg.usedIndex[frame] = nil
+  if reg and reg.used[frame.info.criteriaID] then
+    reg.used[frame.info.criteriaID] = nil
+    frame.info = nil
+    frame.parentInfo = nil
     frame:UnregisterAllEvents()
     tinsert(reg.free, frame)
+    print('|cFFBBBBBBreleased from service', frame:GetName())
+  end
+end
+
+--- RemoveTrackedAchievement post-hook
+mod.CleanWidgets = function()
+  local print = B.print('ObjectiveWidgets')
+  local tracked = {GetTrackedAchievements() }
+  for type, reg in pairs(mod.WidgetRegistry) do
+    print('collecting', type)
+    for criteriaID, frame in pairs(reg.used) do
+      local id = frame.info.cheevID
+
+      if id and not tContains(tracked, id) then
+
+        print('  untracked achievement', id, 'associated with', criteriaID, frame:GetName())
+        frame:Hide()
+      end
+    end
   end
 end
 
@@ -331,26 +363,27 @@
 }
 
 mod.InitializeWidget.ProgressBar = function(self)
+  local print = B.print('ObjectiveWidgets')
   local params = mod.WidgetParams[self.widgetType]
   self.height = params.height
   self:SetHeight(20)
   self.bg:SetHeight(20)
-  self.fg:SetHeight(18)
+  self.fg:SetHeight(16)
   self.fg:SetPoint('BOTTOMLEFT', self.bg, 'BOTTOMLEFT', 1, 1)
   self.quantityString:SetFontObject(params.quantityString.SetFontObject)
   self.quantityString:SetText(self.info.quantityString)
 end
 
 mod.UpdateWidget.ProgressBar = function (self)
+  local print = B.print('ObjectiveWidgets')
   local quantity, requiredQuantity = self.info.quantity, self.info.requiredQuantity
-  self.fg:SetPoint('TOPLEFT', self, 'TOPLEFT', 0, 0)
+
   if self.info.finished then
     self.fg:SetWidth(self.bg:GetWidth() - 2)
   elseif quantity == 0 then
     self.fg:Hide()
   else
     self.fg:Show()
-    self.fg:SetWidth(self:GetWidth() * (quantity / requiredQuantity))
+    self.fg:SetWidth((self:GetWidth()-2) * (quantity / requiredQuantity))
   end
-
-end
+end
\ No newline at end of file