--- a/Veneer.xml	Tue Oct 18 01:57:02 2016 -0400
+++ b/Veneer.xml	Tue Oct 18 13:07:21 2016 -0400
@@ -1,5 +1,8 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
+
+  <Script file="Veneer.lua" />
+
   <Font name="VeneerFont" />
 
   <Font name="VeneerFont_Small" font="Fonts\FRIZQT__.TTF" outline="NORMAL" height="16" />
@@ -14,22 +17,26 @@
       </Font>
 
 
-  <Frame name="Veneer" hidden="true" enableMouse="true" movable="true" parent="UIParent" frameStrata="DIALOG">
+  <Frame name="VeneerMixinScripts" virtual="true">
+    <Scripts>
+      <OnLoad method="OnLoad"  />
+      <OnEvent method="OnEvent" />
+      <OnUpdate method="OnUpdate" />
+      <OnShow method="OnShow" />
+      <OnHide method="OnHide" />
+      <OnMouseDown method="OnMouseDown" />
+      <OnSizeChanged method="OnSizeChanged" />
+    </Scripts>
+  </Frame>
+
+  <Frame name="Veneer" inherits="VeneerMixinScripts" mixin="VeneerCore" hidden="true" enableMouse="true" movable="true" frameStrata="DIALOG">
     <Size x="400" y="400" />
     <Anchors>
       <Anchor point="CENTER" relativePoint="CENTER" x="0" y="0" />
     </Anchors>
     <Scripts>
-      <OnLoad>
-        self.DEVIAN_PNAME = 'Veneer'
-        self:RegisterForDrag('LeftButton')
-      </OnLoad>
-      <OnDragStart>
-        self:StartMoving()
-      </OnDragStart>
-      <OnDragStop>
-        self:StopMovingOrSizing()
-      </OnDragStop>
+      <OnDragStart method="OnDragStart" />
+      <OnDragStop method="OnDragStop" />
     </Scripts>
     <Layers>
       <Layer level="BACKGROUND">
@@ -121,51 +128,6 @@
   </Frame>
 
 
-  <Frame name="VeneerBuffTemplate" virtual="true" inherits="VeneerTemplate" hidden="true">
-    <Scripts>
-      <OnLoad>
-        self.duration = self.progress.duration
-        self.count = self.progress.count
-        self.border = self.underlay.bg
-      </OnLoad>
-    </Scripts>
-    <Frames>
-      <Frame name="$parentUnderlay" parentKey="underlay" frameStrata="BACKGROUND">
-        <Layers>
-          <Layer level="BORDER">
-            <Texture parentKey="bg" setAllPoints="true" hidden="true" />
-          </Layer>
-        </Layers>
-      </Frame>
-      <Cooldown name="$parentCooldown" parentKey="cooldown" inherits="CooldownFrameTemplate" reverse="true" setAllPoints="true">
-        <EdgeTexture>
-          <Color a="0" r="0" g="0" b="0" />
-        </EdgeTexture>
-      </Cooldown>
-      <Frame name="$parentProgress" parentKey="progress" frameStrata="MEDIUM">
-        <Layers>
-          <Layer level="BACKGROUND">
-            <Texture parentKey="bg" />
-          </Layer>
-          <Layer level="ARTWORK">
-            <Texture parentKey="fg" />
-          </Layer>
-          <Layer level="OVERLAY">
-            <FontString name="$parentDuration" parentKey="duration" inherits="VeneerNumberFont" />
-            <FontString name="$parentCount" parentKey="count" inherits="VeneerNumberFontLarge" />
-          </Layer>
-        </Layers>
-      </Frame>
-    </Frames>
-  </Frame>
-
-  <Frame name="VeneerMixinScripts" virtual="true">
-    <Scripts>
-      <OnLoad method="OnLoad"  />
-      <OnEvent method="OnEvent" />
-      <OnUpdate method="OnUpdate" />
-    </Scripts>
-  </Frame>
 
   <Frame name="VeneerStatusBarTemplate" virtual="true" hidden="true" inherits="VeneerMixinScripts">
     <Scripts>
@@ -231,108 +193,6 @@
     </Layers>
   </Frame>
 
-  <Script file="Veneer.lua" />
-  <Script file="Modules\OrderHall.lua" />
 
-  <Frame name="VeneerWorldState" mixin="VeneerWorldStateMixin" parent="UIParent" inherits="VeneerMixinScripts">
-    <Anchors>
-      <Anchor point="TOP" />
-    </Anchors>
-    <Size x="600" y="24" />
-    <Frames>
-      <Frame name="$parentProgress" parentKey="Progress" mixin="VeneerWorldStateProgressMixin" inherits="VeneerMixinScripts">
-
-        <Anchors>
-          <Anchor point="TOPLEFT" />
-        </Anchors>
-        <Layers>
-          <Layer level="BORDER">
-            <Texture setAllPoints="true" parentKey="ProgressBG">
-              <Color r="0" g="0" b="0" a="0.5" />
-            </Texture>
-          </Layer>
-          <Layer level="ARTWORK">
-            <Texture parentKey="ProgressBar">
-              <Anchors>
-                <Anchor point="BOTTOMLEFT" />
-              </Anchors>
-              <Color r="1" g="1" b="1" a="0.8" />
-            </Texture>
-            <Texture parentKey="OverflowBar" hidden="true">
-              <Anchors>
-                <Anchor point="BOTTOMLEFT" />
-              </Anchors>
-              <Color a=".6" r="1" g="0" b=".5" />
-            </Texture>
-            <Texture parentKey="ProgressAdded" hidden="true">
-
-              <Color a="1" r="1" g="1" b="1" />
-            </Texture>
-          </Layer>
-          <Layer level="OVERLAY">
-            <FontString parentKey="Label" inherits="VeneerNumberFont">
-              <Anchors>
-                <Anchor point="CENTER" />
-              </Anchors>
-            </FontString>
-          </Layer>
-        </Layers>
-        <Animations>
-          <AnimationGroup parentKey="TransitionFadeOut" setToFinalAlpha="true">
-            <Alpha fromAlpha="1" toAlpha="0" duration="1.12" order="1" />
-            <Scripts>
-              <OnPlay>
-                --print('VnWorldState','fade out')
-              </OnPlay>
-              <OnFinished>
-                self:GetParent():Hide()
-                self:GetParent():Update()
-              </OnFinished>
-            </Scripts>
-          </AnimationGroup>
-          <AnimationGroup parentKey="TransitionFadeIn" setToFinalAlpha="true">
-            <Alpha fromAlpha="0" toAlpha="1" duration="0.15" order="1" />
-            <Scripts>
-              <OnPlay>
-                self:GetParent():ShowPanel()
-                self:GetParent().timeLived = 0
-                --print('VnWorldState', 'fade in')
-              </OnPlay>
-              <OnFinished>
-                self:GetParent().timeLived = 0
-              </OnFinished>
-            </Scripts>
-          </AnimationGroup>
-          <AnimationGroup parentKey="ProgressFlash" setToFinalAlpha="true">
-            <Alpha fromAlpha="0" toAlpha="1" duration="0.15" order="1" childKey="ProgressAdded" />
-            <Alpha fromAlpha="1" toAlpha="0" duration="0.45" order="2" childKey="ProgressAdded" />
-          </AnimationGroup>
-        </Animations>
-      </Frame>
-
-      <Frame name="$parentZoneCurrency" parentKey="ZoneCurrency" mixin="VeneerWorldStateCurrencyMixin" hidden="true" inherits="VeneerMixinScripts">
-        <Anchors>
-          <Anchor point="TOPRIGHT" />
-        </Anchors>
-        <Layers>
-          <Layer level="ARTWORK">
-            <Texture parentKey="Icon" >
-              <Size x="24" y="24" />
-              <Anchors>
-                <Anchor point="LEFT" />
-              </Anchors>
-            </Texture>
-          </Layer>
-          <Layer level="OVERLAY">
-            <FontString parentKey="Label" inherits="VeneerNumberFont">
-              <Anchors>
-                <Anchor point="LEFT" relativePoint="RIGHT" relativeKey="$parent.Icon" x="2" y="0" />
-              </Anchors>
-            </FontString>
-          </Layer>
-        </Layers>
-      </Frame>
-    </Frames>
-  </Frame>
 
 </Ui>
\ No newline at end of file