diff --git a/Postal.lua b/Postal.lua
index 913160c..49801d9 100644
--- a/Postal.lua
+++ b/Postal.lua
@@ -26,9 +26,7 @@ function Postal:OnInitialize()
 	Postal_BagLinks = {}
 	Postal_ScheduledStack = {}
 	Postal_SelectedItems = {}
-	Postal_PICKDELAY = 1
 	Postal_DELETEDELAY = 1
-	Postal_DELETEEVENTDELAY = 1
 
 	PostalFrame.num = 0
 	PanelTemplates_SetNumTabs(MailFrame, 3)
@@ -65,13 +63,10 @@ function Postal:OnEnable()
 	self:Hook("InboxFrame_OnClick")
 	self:Hook("InboxFrame_Update")
 	self:Hook("CloseMail")
-	self:Hook("TakeInboxItem")
 	self:Hook("OpenMail_Reply")
 	oldTakeInboxMoney = OpenMailMoneyButton:GetScript("OnClick")
 end
 
-local open_all = false
-
 function Postal:MAIL_CLOSED()
 	Postal:ClearItems()
 	PostalGlobalFrame.total = 0
@@ -426,21 +421,16 @@ end
 
 function Postal:ContainerFrame_Update(frame)
 	self.hooks["ContainerFrame_Update"].orig(frame)
-	local id = frame:GetID()
-	if PostalFrame:IsVisible() then
-		local i
-		for i = 1, POSTAL_NUMITEMBUTTONS do
-			local btn = getglobal("PostalButton" .. i)
-			if btn.item and btn.bag then
-				if btn.bag == frame:GetID() then
-					SetItemButtonDesaturated(getglobal(frame:GetName() .. "Item" .. (frame.size-btn.item)+1), 1, 0.5, 0.5, 0.5)
-				end
+	Postal.control.on_next_update(function() 
+		local name = frame:GetName()
+		for j=1, frame.size, 1 do
+			local itemButton = getglobal(name.."Item"..j)
+			local locked = self:GetItemFrame(itemButton:GetParent():GetID(), itemButton:GetID()) or (Postal_addItem and Postal_addItem[1] == itemButton:GetParent():GetID() and Postal_addItem[2] == itemButton:GetID())
+			if locked then
+				SetItemButtonDesaturated(itemButton, true, 0.5, 0.5, 0.5)
 			end
 		end
-	end
-	if Postal_addItem and Postal_addItem[1] == frame:GetID() then
-		SetItemButtonDesaturated(getglobal(frame:GetName() .. "Item" .. (frame.size-Postal_addItem[2])+1), 1, 0.5, 0.5, 0.5)
-	end
+	end)
 end
 
 function Postal:MAIL_SEND_INFO_UPDATE()
@@ -500,25 +490,6 @@ function Postal:TF_Show()
 end
 
 function Postal:Inbox_OnUpdate(elapsed)
-
-	if open_all then
-		local i = 1
-		local _, _, _, _, money, CODAmount, _, hasItem = GetInboxHeaderInfo(i)
-		while CODAmount and CODAmount > 0 do
-			i = i + 1
-			_, _, _, _, money, CODAmount, _, hasItem = GetInboxHeaderInfo(i)
-		end
-		if i > GetInboxNumItems() then
-			open_all = false
-		elseif hasItem then
-			self.hooks["TakeInboxItem"].orig(i)
-		elseif money > 0 then
-			TakeInboxMoney(i)
-		else
-			DeleteInboxItem(i)
-		end
-	end
-	
 	if Postal_addItem then
 		Postal_addItem[4] = Postal_addItem[4] - elapsed
 		if Postal_addItem[4] <= 0 then
@@ -530,55 +501,9 @@ function Postal:Inbox_OnUpdate(elapsed)
 			end
 		end
 	end
-	if this.num and this.timeout then
-		this.timeout = this.timeout - elapsed
-		if this.timeout <= 0 then
-			this.timeout = nil
-			if this.id[1] then
-				local val = this.id[1]
-				local success = Postal:PickMail(val, this.openSelected)
-				if success ~= 2 then
-					tremove(this.id, 1)
-					this.num = this.num - 1
-				end
-				if success == 1 then
-					for key, va in this.id do
-						if va > val then
-							this.id[key] = va - 1
-						end
-					end
-					this.lastVal = val
-					InboxFrame_Update()
-				else
-					this.timeout = Postal_PICKDELAY
-					this.lastVal = nil
-				end
-				if this.num == 0 then
-					this.num = nil
-					Postal:Inbox_DisableClicks(nil)
-				end
-			end
-		end
-	end
-	if this.delete then
-		this.delete[1] = this.delete[1] - elapsed
-		if this.delete[1] <= 0 then
-			local _, _, _, _, money, _, _, itemID, _, _, _  = GetInboxHeaderInfo(this.delete[2])
-			if money == 0 and not itemID then
-				GetInboxText(this.delete[2])
-				DeleteInboxItem(this.delete[2])
-			end
-			this.delete = nil
-			this.timeout = Postal_PICKDELAY
-		end
-	end
 end
 
 function Postal:MAIL_INBOX_UPDATE()
-	if PostalInboxFrame.eventDelete then
-		PostalInboxFrame.delete = { Postal_DELETEEVENTDELAY, PostalInboxFrame.eventDelete }
-		PostalInboxFrame.eventDelete = nil
-	end
 end
 
 function Postal:UI_ERROR_MESSAGE()
@@ -606,38 +531,7 @@ function Postal:Print(msg, r, g, b)
 	DEFAULT_CHAT_FRAME:AddMessage(msg, r, g, b)
 end
 
-function Postal:PickMail(id, openSelected)
-	if not id then
-		return 0
-	end
-	local _, _, sender, subject, money, CODAmount, _, hasItem = GetInboxHeaderInfo(id)
-	if CODAmount > 0 then
-		Postal:Print("Postal: Mail |c00FFFFFF" .. this.numMails - (this.num - 1) .. "|r/|c00FFFFFF" .. this.numMails .. "|r is Cash on Delivery, skipping.", 1, 0, 0)
-		return 0
-	elseif not hasItem and money == 0 and not openSelected then
-		Postal:Print("Postal: Mail |c00FFFFFF" .. this.numMails - (this.num - 1) .. "|r/|c00FFFFFF" .. this.numMails .. "|r has no money or items, skipping.", 1, 1, 0)
-		return 0
-	end
-	Postal:Print("Postal: Opening mail |c00FFFFFF" .. this.numMails - (this.num - 1) .. "|r/|c00FFFFFF" .. this.numMails .. "|r: \"|c00FFFFFF" .. ( subject or "<No Subject>" ) .. "|r\" from |c00FFFFFF" .. ( sender or "<Unknown Sender>" ) .. "|r.", 1, 1, 0)
-	local eventDelete
-	if hasItem then
-		self.hooks["TakeInboxItem"].orig(id)
-		eventDelete = 1
-		if money > 0 then
-			return 2
-		end
-	end
-	if money > 0 then
-		TakeInboxMoney(id)
-		eventDelete = 1
-	end
-	if eventDelete then
-		PostalInboxFrame.eventDelete = id
-	else
-		PostalInboxFrame.delete = { Postal_DELETEDELAY, id }
-	end
-	return 1
-end
+
 
 function Postal_Inbox_SetSelected()
 	local id = this:GetID() + (InboxFrame.pageNum - 1) * 7
@@ -653,29 +547,24 @@ function Postal_Inbox_SetSelected()
 	end
 end
 
-function Postal_Inbox_OpenSelected(openAll)
-	if openAll then
-		open_all = true
+function Postal_Inbox_OpenSelected(open_all)
+	local selected = {}
+	if open_all then
+		for i = 1, GetInboxNumItems() do
+			tinsert(selected, i)
+		end
 	else
-		Postal:Inbox_DisableClicks(1)
-		PostalInboxFrame.num = 0
-		PostalInboxFrame.timeout = Postal_PICKDELAY
-		PostalInboxFrame.id = {}
-		PostalInboxFrame.openSelected = not openAll
-		if openAll then
-			for i = 1, GetInboxNumItems() do
-				PostalInboxFrame.num = PostalInboxFrame.num + 1
-				tinsert(PostalInboxFrame.id, i)
-			end
-		else
-			for k, v in Postal_SelectedItems do
-				PostalInboxFrame.num = PostalInboxFrame.num + 1
-				tinsert(PostalInboxFrame.id, v)
-			end
+		for _, i in Postal_SelectedItems do
+			tinsert(selected, i)
 		end
-		PostalInboxFrame.numMails = PostalInboxFrame.num
-		Postal_SelectedItems = {}
 	end
+	-- Postal:Inbox_DisableClicks(true)
+	-- PostalInboxFrame.num = true -- TODO remove
+	Postal.open.start(selected, function()
+		Postal:Inbox_DisableClicks(false)
+		PostalInboxFrame.num = false
+	end)
+	Postal_SelectedItems = {}
 end
 
 function Postal:InboxFrame_Update()
@@ -722,7 +611,7 @@ function Postal:InboxFrame_OnClick()
 end
 
 function Postal:Inbox_Abort()
-	open_all = nil
+	Postal.open.stop()
 	PostalInboxFrame.num = nil
 	PostalInboxFrame.timeout = nil
 	PostalInboxFrame.id = {}
@@ -735,11 +624,11 @@ function Postal:CloseMail()
 	Postal:Inbox_Abort()
 end
 
-function Postal:TakeInboxItem(id)
-	self.hooks["TakeInboxItem"].orig(id)
-	local name = GetInboxItem(id)
-	tinsert(PostalForwardFrame.pickItem, name)
-end
+-- function Postal:TakeInboxItem(id)
+	-- TakeInboxItem(id)
+	-- local name = GetInboxItem(id)
+	-- tinsert(PostalForwardFrame.pickItem, name)
+-- end
 
 -- Mail Forwarding
 function Postal:DisableAttachments(disable)
@@ -814,7 +703,7 @@ function Postal:SendMailMailButton_OnClick()
 	if name then
 		PostalForwardFrame.searchItem = name
 		PostalForwardFrame.forwardStep = 1
-		self.hooks["TakeInboxItem"].orig(InboxFrame.openMailID)
+		TakeInboxItem(InboxFrame.openMailID)
 	else
 		PostalForwardFrame.forwardStep = 2
 		if money and money > 0 then
diff --git a/Postal.toc b/Postal.toc
index d067790..66aa9d8 100644
--- a/Postal.toc
+++ b/Postal.toc
@@ -12,3 +12,6 @@ libs\AceEvent\AceEvent-2.0.lua
 libs\AceAddon\AceAddon-2.0.lua
 libs\AceHook\AceHook-2.0.lua
 Postal.xml
+util.lua
+control.xml
+open.lua
diff --git a/control.lua b/control.lua
new file mode 100644
index 0000000..f2783ed
--- /dev/null
+++ b/control.lua
@@ -0,0 +1,143 @@
+Postal.control = {}
+
+local event_listeners = {}
+local update_listeners = {}
+
+function Postal.control.on_event()
+	for listener, _ in pairs(event_listeners) do
+		if event == listener.event and not listener.deleted then
+			listener.action()
+		end
+	end
+end
+
+function Postal.control.on_update()
+	event_listeners = Postal.util.set_filter(event_listeners, function(l) return not l.deleted end)
+	update_listeners = Postal.util.set_filter(update_listeners, function(l) return not l.deleted end)
+	
+	for listener, _ in pairs(update_listeners) do
+		if not listener.deleted then
+			listener.action()
+		end
+	end
+end
+
+
+
+function Postal.control.event_listener(event, action)
+	local self = {}
+	
+	local listener = { event=event, action=action }
+	
+	function self.set_action(action)
+		listener.action = action
+	end
+	
+	function self.start()
+		Postal.util.set_add(event_listeners, listener)
+		if not Postal.util.any(event_listeners, function(l) return l.event == event end) then
+			PostalControlFrame:RegisterEvent(event)
+		end
+		return self
+	end
+	
+	function self.stop()
+		listener.deleted = true
+		if not Postal.util.any(event_listeners, function(l) return l.event == event end) then
+			PostalControlFrame:UnregisterEvent(event)
+		end
+		return self
+	end
+	
+	return self
+end
+
+function Postal.control.update_listener(action)
+	local self = {}
+	
+	local listener = { action=action }
+
+	function self.set_action(action)
+		listener.action = action
+	end
+	
+	function self.start()
+		Postal.util.set_add(update_listeners, listener)
+		return self
+	end
+	
+	function self.stop()
+		listener.deleted = true
+		return self
+	end
+	
+	return self
+end
+
+	
+
+function Postal.control.on_next_update(callback)
+	local listener = Postal.control.update_listener()
+	
+	listener.set_action(function()
+		listener:stop()
+		return callback()
+	end)
+	
+	listener.start()
+end
+
+function Postal.control.on_next_event(event, callback)
+	local listener = Postal.control.event_listener(event)
+	
+	listener.set_action(function()
+		listener:stop()
+		return callback()
+	end)
+	
+	listener.start()
+end
+
+function Postal.control.as_soon_as(p, callback)
+	local listener = Postal.control.update_listener()	
+	
+	listener.set_action(function()
+		if p() then
+			listener.stop()
+			return callback()
+		end
+	end)
+	
+	listener.start()
+end
+
+
+
+function Postal.control.controller()
+	local self = {}
+	
+	local state
+	
+	local listener = Postal.control.update_listener()
+	listener.set_action(function()
+		if state and state.p() then
+			local k = state.k
+			state = nil
+			return k()
+		end
+	end)
+	listener.start()
+	
+	function self.wait(p, k)
+		state = {
+			k = k,
+			p = p,
+		}
+	end
+	
+	function self.cleanup()
+		listener.stop()
+	end
+	
+	return self
+end
diff --git a/control.xml b/control.xml
new file mode 100644
index 0000000..af115e6
--- /dev/null
+++ b/control.xml
@@ -0,0 +1,15 @@
+<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/">
+
+	<Script file="control.lua"/> 
+  
+	<Frame name="PostalControlFrame">
+      <Scripts> 
+			<OnEvent> 
+				Postal.control.on_event()
+			</OnEvent>
+			<OnUpdate>
+				Postal.control.on_update()
+			</OnUpdate>
+		</Scripts> 
+	</Frame>
+</Ui>
\ No newline at end of file
diff --git a/open.lua b/open.lua
new file mode 100644
index 0000000..54f68d3
--- /dev/null
+++ b/open.lua
@@ -0,0 +1,93 @@
+Postal.open = {}
+
+local wait_for_update, open, process, inventory_count
+
+local controller = (function()
+	local controller
+	return function()
+		controller = controller or Postal.control.controller()
+		return controller
+	end
+end)()
+
+function wait_for_update(k)
+	return controller().wait(function() return true end, k)
+end
+
+function Postal.open.start(selected, callback)
+	wait_for_update(function()
+	process(selected, function()
+	callback()
+	end)end)
+end
+
+function Postal.open.stop()
+	wait_for_update(function() end)
+end
+
+function process(selected, k)
+	if getn(selected) == 0 then
+		return k()
+	else
+		local index = selected[1]
+		GetInboxText(index)
+		controller().wait(function() return GetInboxText(index) or not (({ GetInboxHeaderInfo })[11] or ({ GetInboxText(index) })[3]) end, function()
+		local _, _, _, _, money, CODAmount, _, hasItem = GetInboxHeaderInfo(index)
+		local bodyText, _, _, isInvoice = GetInboxText(index)
+		
+		snipe.log(bodyText)
+		if CODAmount > 0 then
+			tremove(selected, 1)
+			return process(selected, k)
+		end
+		
+		local inbox_count_before = GetInboxNumItems()
+		open(index, hasItem, money > 0, bodyText and not isInvoice, function()
+		controller().wait(function() return GetInboxNumItems() < inbox_count_before end, function()
+		tremove(selected, 1)
+		for i, _ in selected do
+			selected[i] = selected[i] - 1
+		end
+		return process(selected, k)
+		end)end)end)
+	end
+end
+
+function open(i, has_item, has_money, has_message, k)
+	wait_for_update(function()
+		if has_item then
+			local inventory_count_before = inventory_count()
+			TakeInboxItem(i)
+			controller().wait(function() return inventory_count() > inventory_count_before end, function()
+			return open(i, false, has_money, has_message, k)
+			end)
+		elseif has_money then
+			local money_before = GetMoney()
+			TakeInboxMoney(i)
+			controller().wait(function() return GetMoney() > money_before end, function()
+			return open(i, false, false, has_message, k)
+			end)
+		elseif has_message then
+			local _, _, _, _, money, _, _, hasItem = GetInboxHeaderInfo(i)
+			if not (money > 0) and not hasItem then
+				DeleteInboxItem(i)
+			end
+			return open(i, false, false, false, k)
+		else
+			return k()
+		end
+	end)
+end
+
+function inventory_count()
+	local acc = 0
+	for bag = 0, 4 do
+		if GetBagName(bag) then
+			for slot = 1, GetContainerNumSlots(bag) do
+				local _, count = GetContainerItemInfo(bag, slot)
+				acc = acc + (count or 0)
+			end
+		end
+	end
+	return acc
+end
\ No newline at end of file
diff --git a/util.lua b/util.lua
new file mode 100644
index 0000000..ed37d55
--- /dev/null
+++ b/util.lua
@@ -0,0 +1,83 @@
+Postal.util = {}
+
+function Postal.util.set_add(set, key)
+    set[key] = true
+end
+
+function Postal.util.set_remove(set, key)
+    set[key] = nil
+end
+
+function Postal.util.set_contains(set, key)
+    return set[key] ~= nil
+end
+
+function Postal.util.set_size(set)
+    local size = 0
+	for _,_ in pairs(set) do
+		size = size + 1
+	end
+	return size
+end
+
+function Postal.util.set_to_array(set)
+	local array = {}
+	for element, _ in pairs(set) do
+		tinsert(array, element)
+	end
+	return array
+end
+
+function Postal.util.any(xs, p)
+	holds = false
+	for _, x in ipairs(xs) do
+		holds = holds or p(x)
+	end
+	return holds
+end
+
+function Postal.util.all(xs, p)
+	holds = true
+	for _, x in ipairs(xs) do
+		holds = holds and p(x)
+	end
+	return holds
+end
+
+function Postal.util.set_filter(xs, p)
+	ys = {}
+	for x, _ in pairs(xs) do
+		if p(x) then
+			Postal.util.set_add(ys, x)
+		end
+	end
+	return ys
+end
+
+function Postal.util.filter(xs, p)
+	ys = {}
+	for _, x in ipairs(xs) do
+		if p(x) then
+			tinsert(ys, x)
+		end
+	end
+	return ys
+end
+
+function Postal.util.map(xs, f)
+	ys = {}
+	for _, x in ipairs(xs) do
+		tinsert(ys, f(x))
+	end
+	return ys
+end
+
+function Postal.util.take(n, xs)
+	ys = {}
+	for i=1,n do
+		if xs[i] then
+			tinsert(ys, xs[i])
+		end
+	end
+	return ys
+end
\ No newline at end of file