--- a/AskMrRobot.toc	Tue Feb 24 21:50:13 2015 -0800
+++ b/AskMrRobot.toc	Fri Jun 05 11:05:15 2015 -0700
@@ -1,56 +1,49 @@
 ## Interface: 60100
 ## Title: Ask Mr. Robot
 ## Author: Team Robot, Inc.
-## Version: 20
-## Notes: Exports/Imports data to/from askmrrobot.com.
+## Version: 21
+## Notes: Gear import/export, combat logging, and more.
 ## URL: www.askmrrobot.com
-## DefaultState: Enabled
-## LoadOnDemand: 0
-## SavedVariablesPerCharacter: AmrDb
-## SavedVariables: AmrSettings
+## SavedVariables: AskMrRobotDb2
 
-#@no-lib-strip@
-Libs\LibStub\Libstub.lua
-Libs\CallbackHandler-1.0\CallbackHandler-1.0.lua
-#@end-no-lib-strip@
+Libs\LibStub\LibStub.lua
+Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
+Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
+Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
+Libs\AceAddon-3.0\AceAddon-3.0.xml
+Libs\AceSerializer-3.0\AceSerializer-3.0.xml
+Libs\AceEvent-3.0\AceEvent-3.0.xml
+Libs\AceComm-3.0\AceComm-3.0.xml
+Libs\AceConsole-3.0\AceConsole-3.0.xml
+Libs\AceDB-3.0\AceDB-3.0.xml
+Libs\AceLocale-3.0\AceLocale-3.0.xml
+Libs\AceGUI-3.0\AceGUI-3.0.xml
 
-Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
+localization\enUS.lua
 
-#@no-lib-strip@
-Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
-#@end-no-lib-strip@
+AskMrRobot-Serializer\AskMrRobot-Serializer.xml
 
-#translations first
-Localization\localization.en.lua
-Localization\localization.de.lua
+Core.lua
+Constants.lua
+ui\Ui.lua
 
-wait.lua
-sort.lua
+ui\AmrUiLabel.lua
+ui\AmrUiButton.lua
+ui\AmrUiTextButton.lua
+ui\AmrUiCheckBox.lua
+ui\AmrUiTextarea.lua
+ui\AmrUiDropDown.lua
+ui\AmrUiPanel.lua
+ui\AmrUiFrame.lua
+ui\AmrUiTabGroup.lua
+ui\AmrUiIcon.lua
+ui\AmrUiScrollFrame.lua
 
-ui\Components.lua
-amr-constants.lua
-AskMrRobot.lua
-AskMrRobotUi.lua
-ui\RobotStamp.lua
-ui\ItemTooltipFrame.lua
-ui\ItemLinkText.lua
-ui\ItemIcon.lua
-ui\GemIcon.lua
-ui\EnchantLinkText.lua
-ui\FontString.lua
-ui\ScrollFrame.lua
-ui\ExportTab.lua
-ui\JewelPanel.lua
-ui\SummaryTab.lua
-ui\GemTab.lua
-ui\EnchantTab.lua
-ui\HelpTab.lua
-ui\ImportTab.lua
-ui\ShoppingListTab.lua
-ui\GearComparisonTab.lua
-ui\CombatLogTab.lua
-ui\SettingsTab.lua
-
-AskMrRobot.xml
-
-
+Export.lua
+Import.lua
+Shopping.lua
+Gear.lua
+CombatLog.lua
+Loot.lua
+TeamOptimizer.lua
+Options.lua
\ No newline at end of file