--- a/ClassPlan.xml	Thu Oct 13 05:32:43 2016 -0400
+++ b/ClassPlan.xml	Thu Oct 13 09:08:38 2016 -0400
@@ -3,8 +3,11 @@
 
   <Script file="ClassPlan.lua" />
 
+  <Font name="ClassPlanFont" font="Interface\AddOns\Veneer\Font\ArchivoNarrow-Regular.ttf" height="14" outline="NORMAL" virtual="true" />
+  <Font name="ClassPlanNumberFont" font="Interface\AddOns\Veneer\Font\ArchivoNarrow-Bold.ttf" height="14" outline="NORMAL" virtual="true" />
+
   <Frame name="ClassOrderPlan" mixin="ClassOrderPlanCore" parent="UIParent" hidden="true">
-    <Size x="500" y="40" />
+    <Size x="600" y="40" />
     <Anchors>
       <Anchor point="TOP" />
     </Anchors>
@@ -31,6 +34,8 @@
     <Scripts>
       <OnUpdate method="OnUpdate" />
       <OnShow method="OnShow" />
+      <OnEnter method="OnEnter" />
+      <OnLeave method="OnLeave" />
     </Scripts>
     <Layers>
       <Layer level="BACKGROUND">
@@ -47,22 +52,101 @@
         </Texture>
       </Layer>
       <Layer level="OVERLAY">
-        <FontString name="$parentLabel" inherits="GameFontNormal" parentKey="Label" text="base text">
+        <FontString name="$parentLabel" inherits="ClassPlanFont" parentKey="Label" text="base text">
           <Anchors>
             <Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeKey="$parent.Icon" x="4" y="0" />
           </Anchors>
         </FontString>
-        <FontString name="$parentTimeLeft" inherits="GameFontNormalSmall" parentKey="TimeLeft" text="base text">
+        <FontString name="$parentTimeLeft" inherits="ClassPlanNumberFont" parentKey="TimeLeft" text="base text">
           <Anchors>
             <Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.Label" x="4" y="-2" />
           </Anchors>
         </FontString>
-        <FontString name="$parentOwner" inherits="GameFontNormalSmall" parentKey="Owner" text="base text">
+        <FontString name="$parentOwner" inherits="ClassPlanFont" parentKey="Owner" text="base text">
+          <Anchors>
+            <Anchor point="TOPRIGHT" />
+          </Anchors>
+        </FontString>
+      </Layer>
+      <Layer level="HIGHLIGHT">
+        <Texture setAllPoints="true" alphaMode="ADD">
+          <Color a="1" r="0.1" g="0.1" b="0.1" />
+        </Texture>
+      </Layer>
+    </Layers>
+  </Frame>
+
+  <Frame name="ClassPlanShipment" mixin="ClassPlanShipmentMixin" virtual="true">
+    <Scripts>
+      <OnUpdate method="OnUpdate" />
+      <OnShow method="OnShow" />
+      <OnEnter method="OnEnter" />
+      <OnLeave method="OnLeave" />
+    </Scripts>
+    <Size x="200" y="32" />
+    <Layers>
+      <Layer level="BACKGROUND">
+        <Texture parentKey="Background" setAllPoints="true" />
+      </Layer>
+      <Layer level="BACKGROUND" textureSubLevel="1">
+        <Texture parentKey="Icon" alpha="0.5" desaturated="true">
+          <Size x="30" y="30"/>
+          <Anchors>
+            <Anchor point="LEFT"/>
+          </Anchors>
+        </Texture>
+      </Layer>
+      <Layer level="BORDER">
+        <Texture parentKey="Done" atlas="GarrLanding-ShipmentCompleteGlow">
+          <Size x="32" y="32" />
+          <Anchors>
+            <Anchor point="LEFT"/>
+          </Anchors>
+        </Texture>
+      </Layer>
+      <Layer level="ARTWORK">
+        <FontString parentKey="Name" inherits="ClassPlanFont" justifyV="TOP" justifyH="CENTER">
+          <Anchors>
+            <Anchor point="TOPLEFT" relativePoint="TOPRIGHT" relativeKey="$parent.Icon" x="2" y="-2"/>
+          </Anchors>
+          <Color r=".75" g=".75" b=".73"/>
+        </FontString>
+      </Layer>
+      <Layer level="OVERLAY">
+        <FontString parentKey="TimeLeft" inherits="ClassPlanFont" justifyH="CENTER">
+          <Anchors>
+            <Anchor point="TOPLEFT" relativePoint="BOTTOMLEFT" relativeKey="$parent.Name" x="0" y="-2"/>
+          </Anchors>
+        </FontString>
+        <FontString parentKey="Count" inherits="WorldPlanFont" justifyH="CENTER">
+          <Anchors>
+            <Anchor point="BOTTOM" relativeKey="$parent.Icon" x="0" y="0"/>
+          </Anchors>
+        </FontString>
+        <FontString name="$parentOwner" inherits="WorldPlanFont" parentKey="Owner" text="base text">
           <Anchors>
             <Anchor point="TOPRIGHT" />
           </Anchors>
         </FontString>
       </Layer>
     </Layers>
+    <Frames>
+      <Cooldown parentKey="Swipe" reverse="true" hideCountdownNumbers="true">
+        <Size x="32" y="32"/>
+        <Anchors>
+          <Anchor point="LEFT"/>
+        </Anchors>
+        <SwipeTexture file="Interface\Garrison\GarrLanding-TradeskillTimerFill"/>
+        <Scripts>
+          <OnCooldownStart>
+            self:Show()
+          </OnCooldownStart>
+          <OnCoolDownDone>
+            -- update via event
+            C_Garrison.RequestLandingPageShipmentInfo();
+          </OnCoolDownDone>
+        </Scripts>
+      </Cooldown>
+    </Frames>
   </Frame>
 </Ui>
\ No newline at end of file