diff --git a/Scion/Scion.html b/Scion/Scion.html
index 35900979a0..38db03d2f3 100644
--- a/Scion/Scion.html
+++ b/Scion/Scion.html
@@ -1,3 +1,5 @@
+<div>
+
 <!-- Set up the Tabs -->
 <input type="radio" class="sheet-tab sheet-tab1" name="attr_core-tab" value="1" title="Attributes & Abilities" checked="checked"/> 
     <span class="sheet-tab sheet-tab1" style='line-height: 20px;'>Attributes &<br> Abilities</span>
@@ -9,6 +11,8 @@
     <span class="sheet-tab sheet-tab4" style='line-height: 20px;'>History &<br> Gear</span>
 <input type="radio" class="sheet-tab sheet-tab5" name="attr_core-tab" value="5" title="Combat" /> 
     <span class="sheet-tab sheet-tab5" style='line-height: 40px;'>Combat</span>
+<input type="radio" class="sheet-tab sheet-tab6" name="attr_core-tab" value="6" title="Advancement" /> 
+    <span class="sheet-tab sheet-tab6" style='line-height: 40px;'>Advancement</span>
 <input type="radio" class="sheet-tab sheet-tab99" name="attr_core-tab" value="99" title="All" />
     <span class="sheet-tab sheet-tab99" style='line-height: 40px;'>All</span>
 <!-- End Tab setup -->
@@ -321,7 +325,7 @@
             <table class="sheet-skill_table">
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Academics-box" value="1"/><span></span></td>
-                    <td><button type='roll' class="sheet-skill_btn" name="roll_Academics" value='&{template:wod} {{name= @{character_name} }} {{pool= Academics }} {{attr= @{Melee_attrib}:@{Academics_AttRating} }} {{skill= Academics: @{Academics}}} {{mod= Modifier ?{Modifier?|0} }} {{injury= @{injury}}} {{result= [[ {( @{Academics_AttRating} + @{Academics} + ?{Modifier?|0} + @{injury} )d10s}>7f1]] }} {{epic= @{Academics_EpicRating}}}'/>Academics</td> 
+                    <td><button type='roll' class="sheet-skill_btn" name="roll_Academics" value='&{template:wod} {{name= @{character_name} }} {{pool= Academics }} {{attr= @{Academics_attrib}:@{Academics_AttRating} }} {{skill= Academics: @{Academics}}} {{mod= Modifier ?{Modifier?|0} }} {{injury= @{injury}}} {{result= [[ {( @{Academics_AttRating} + @{Academics} + ?{Modifier?|0} + @{injury} )d10s}>7f1]] }} {{epic= @{Academics_EpicRating}}}'/>Academics</td> 
                     <td>
                         <input type="radio" class="sheet-normal sheet-zero" name="attr_Academics" value="0" checked="checked" /><span></span>
                         <input type="radio" class="sheet-normal" name="attr_Academics" value="1" /><span></span>
@@ -1244,7 +1248,8 @@
                     <div class="sheet-center" ><button type="roll" class="sheet-big" value="/e rolls Willpower! [[ { (@{Willpower} + ?{Modifier?|0})d10!}>7 ]]">Willpower</button></th>
                         <table class="sheet-grid">
                             <tr>
-                                <td colspan="10">
+                                <td colspan="11">
+                                    <input type="radio" name="attr_Willpower" class="sheet-Advantage sheet-zero"  value="0" /><span></span>&nbsp;&nbsp;
                                     <input type="radio" name="attr_Willpower" value="1" class="sheet-Advantage" checked/><span></span>&nbsp;&nbsp;
                                     <input type="radio" name="attr_Willpower" value="2" class="sheet-Advantage"/><span></span>&nbsp;&nbsp;
                                     <input type="radio" name="attr_Willpower" value="3" class="sheet-Advantage"/><span></span>&nbsp;&nbsp;
@@ -1258,6 +1263,7 @@
                                 </td>
                             </tr>
                             <tr>
+                                <td><div style="width:20px;"></div></td>
                                 <td><input type="checkbox" name="attr_willpower_box_1" value="1" class="sheet-bigcheck"/><span></span></td>
                                 <td><input type="checkbox" name="attr_willpower_box_2" value="1" class="sheet-bigcheck"/><span></span></td>
                                 <td><input type="checkbox" name="attr_willpower_box_3" value="1" class="sheet-bigcheck"/><span></span></td>
@@ -1273,7 +1279,8 @@
                         <div class="sheet-center" ><button type="roll" class="sheet-big" value="/e rolls Legend! [[ { (@{Legend} + ?{Modifier?|0})d10!}>7 ]]">Legend</button></th>
                             <table class="sheet-grid">
                                <tr>
-                                    <td colspan="10">
+                                    <td colspan="11">
+                                        <input type="radio" name="attr_Legend" class="sheet-Advantage sheet-zero"  value="0" /><span></span>&nbsp;&nbsp;
                                         <input type="radio" name="attr_Legend" value="1" class="sheet-Advantage" checked/><span></span>&nbsp;&nbsp;
                                         <input type="radio" name="attr_Legend" value="2" class="sheet-Advantage"/><span></span>&nbsp;&nbsp;
                                         <input type="radio" name="attr_Legend" value="3" class="sheet-Advantage"/><span></span>&nbsp;&nbsp;
@@ -1287,6 +1294,7 @@
                                     </td>
                                 </tr>
                                 <tr>
+                                    <td><div style="width:20px;"></div></td>
                                     <td><input type="checkbox" name="attr_Legend_box_1" value="1" class="sheet-bigcheck"/><span></span></td>
                                     <td><input type="checkbox" name="attr_Legend_box_2" value="1" class="sheet-bigcheck"/><span></span></td>
                                     <td><input type="checkbox" name="attr_Legend_box_3" value="1" class="sheet-bigcheck"/><span></span></td>
@@ -1299,7 +1307,9 @@
                                     <td><input type="checkbox" name="attr_Legend_box_10" value="1" class="sheet-bigcheck"/><span></span></td>
                                 </tr>
                                 <tr>
-                                    <th colspan="10"><input type="text" class="sheet-textbox" name="attr_Legend_Points" placeholder="Legend Points"/></th>
+                                    <th colspan="5"><input type="text" class="sheet-textbox" style="text-align:center;" name="attr_Legend_Points" placeholder="Legend Points"/></th>
+                                    <td></td>
+                                    <th colspan="5"><input type="text" class="sheet-textbox" style="text-align:center;" name="attr_Legend_Points_most" value="@{Legend_Points} * @{Legend_Points}" disabled="true" /></th>
                                 </tr>
                             </table>
                         </div>
@@ -1861,9 +1871,10 @@
             <fieldset class="repeating_weapons">
                 <table style="display:inline;">
                     <tr>
-                        <th><button type="roll" class="sheet-adv2" value="&{template:wod} {{name= @{character_name} }} {{pool= @{weapon_name} }} {{injury= @{injury}}} {{attr= @{weapon_attribute_name}: @{weapon_attribute} }} {{epic= @{weapon_epic}}} {{skill= @{weapon_skill_name}: @{weapon_skill} }} {{mod= Modifier @{weapon_Modifier} }} {{result= [[{(@{weapon_attribute} + @{weapon_skill} + @{weapon_Modifier} + @{injury} )d10s}>7f1]] }} {{range= @{weapon_Range} }}">Attack</button></th>
-                        <th><button type="roll" class="sheet-adv3" value="&{template:wod} {{name= @{character_name} }} {{pool= @{weapon_name} }} {{attr= Weapon Damage: @{weapon_Damage} }} {{mod= Attack Successes: ?{Successes?|1} }} {{note= @{weapon_Damage_Type} }} @{weapon_StrengthDamage}">Damage</button></th>
+                        <th><button type="roll" class="sheet-adv2" name="roll_weapon_attack" value="&{template:wod} {{name= @{character_name} }} {{pool= Attack:@{weapon_name} }} {{injury= @{injury}}} {{attr= @{weapon_attribute_name}: @{weapon_attribute} }} {{epic= @{weapon_epic}}} {{skill= @{weapon_skill_name}: @{weapon_skill} }} {{mod= Modifier @{weapon_Modifier} }} {{result= [[{(@{weapon_attribute} + @{weapon_skill} + @{weapon_Modifier} + @{injury} )d10s}>7f1]] }} {{range= @{weapon_Range} }}">Attack</button></th>
+                        <th><button type="roll" class="sheet-adv3" name="roll_weapon_damage" value="&{template:wod} {{name= @{character_name} }} {{pool= Damage:@{weapon_name} }} {{skill= Weapon Damage: @{weapon_Damage} }} {{mod= Attack Successes: ?{Successes?|1} }} {{note= @{weapon_Damage_Type} }} @{weapon_StrengthDamage}">Damage</button></th>
                         <th><input type="text" class="sheet-textbox"  style="width:150px;" name="attr_weapon_name" value=""/></th>
+                        <th><button type="roll" class="sheet-adv2" name="roll_weapon_parry" value="&{template:wod} {{name= @{character_name} }} {{pool= Parry:@{weapon_name} }} {{attr= @{weapon_attribute_name}: @{weapon_attribute} }} {{epic= @{weapon_epic}}} {{skill= @{weapon_skill_name}: @{weapon_skill} }} {{mod= Modifier @{weapon_parry_Modifier} }} {{result= [[floor((@{weapon_attribute} [Attribute] + @{weapon_skill} [Skill] + @{weapon_parry_Modifier} [Weapon])/2) + @{parry_mod} [Flat Modifier] + @{Dexterity_box} [Epic Dexterity] ]] }} ">Parry</button></th>
                     </tr>
                 </table>
                 <input type="checkbox" class="sheet-bigcheck sheet-hider" name="attr_weapon_show" style="display:inline"/><span></span>
@@ -1877,6 +1888,7 @@
                             <th><div style="width:50px">Rate</div></th>
                             <th><div style="width:50px">Clip</div></th>
                             <th><div style="width:50px">Speed</div></th>
+                            <th><div style="width:50px">DV</div></th>
                         </tr>
                         <tr>
                             <td></td>
@@ -1919,24 +1931,30 @@
                             <th><input type="number" class="sheet-textbox" name="attr_weapon_Rate" value="0"/></th>
                             <th><input type="number" class="sheet-textbox" name="attr_weapon_Clip" value="0"/></th>
                             <th><input type="number" class="sheet-textbox" name="attr_weapon_Speed" value="0"/></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_weapon_parry_Modifier" value="0"/></th>
                         </tr>
                         <tr>
                             <td></td>
                             <th>Damage</th>
-                            <th>Add Strength?</th>
+                            <th>Damage Attribute</th>
                             <th>Type</th>
                             <th>Tags</th>
                         </tr>
                         <tr>
                             <td></td>
                             <th><input type="number" class="sheet-textbox" name="attr_weapon_Damage" value="0"/></th>
-                            <th style="width:80px">
-                                <div class="sheet-Query">
-                                    <input type="radio" class="sheet-Query sheet-no" name="attr_weapon_StrengthDamage" value="{{result= [[{(@{weapon_Damage} + ?{Successes?|1} )d10s}>7f1]] }}" checked="checked" />
-                                    <input type="radio" class="sheet-Query sheet-yes" name="attr_weapon_StrengthDamage" value="{{result= [[{(@{weapon_Damage} + @{Strength} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Strength_box}}}"/> 
-                                    <span class="sheet-Query sheet-no">No</span>
-                                    <span class="sheet-Query sheet-yes">Yes</span>
-                                </div>
+                            <th><select class="sheet-textbox" style="width:90px" name="attr_weapon_StrengthDamage" value="0" >
+                                    <option value="{{result= [[{(@{weapon_Damage} + ?{Successes?|1} )d10s}>7f1]] }}" selected>None</option> 
+                                    <option value="{{attr= Strength: @{Strength} }} {{result= [[{(@{weapon_Damage} + @{Strength} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Strength_box}}}">Strength</option> 
+                                    <option value="{{attr= Dexterity: @{Dexterity} }} {{result= [[{(@{weapon_Damage} + @{Dexterity} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Dexterity_box}}}">Dexterity</option> 
+                                    <option value="{{attr= Stamina: @{Stamina} }} {{result= [[{(@{weapon_Damage} + @{Stamina} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Stamina_box}}}">Stamina</option> 
+                                    <option value="{{attr= Charisma: @{Charisma} }} {{result= [[{(@{weapon_Damage} + @{Charisma} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Charisma_box}}}">Charisma</option> 
+                                    <option value="{{attr= Manipulation: @{Manipulation} }} {{result= [[{(@{weapon_Damage} + @{Manipulation} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Manipulation_box}}}">Manipulation</option> 
+                                    <option value="{{attr= Appearance: @{Appearance} }} {{result= [[{(@{weapon_Damage} + @{Appearance} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Appearance_box}}}">Appearance</option> 
+                                    <option value="{{attr= Perception: @{Perception} }} {{result= [[{(@{weapon_Damage} + @{Perception} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Perception_box}}}">Perception</option>
+                                    <option value="{{attr= Intelligence: @{Intelligence} }} {{result= [[{(@{weapon_Damage} + @{Intelligence} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Intelligence_box}}}">Intelligence</option> 
+                                    <option value="{{attr= Wits: @{Wits} }} {{result= [[{(@{weapon_Damage} + @{Wits} + ?{Successes?|1} )d10s}>7f1]] }} {{epic= @{Wits_box}}}">Wits</option> 
+                                </select>
                             </th>
                             <th><select class="sheet-textbox" style="width:70px" name="attr_weapon_Damage_Type" value="0" >
                                     <option value="Bashing" selected>Bashing</option> 
@@ -1957,7 +1975,7 @@
         <div class="sheet-row-panel">
             <div class='sheet-2colrow'>
                 <div class='sheet-col'>
-                <h2 class="sheet-center">Health</h2>
+                    <h2 class="sheet-center">Health</h2>
                     <table class="sheet-center" style="width:100%">
                         <tr>
                             <td>Penalty</td>
@@ -2353,11 +2371,82 @@
                                 <option value="Aggravated">X</option>
                                 </select>
                             </td>
-                            <td><input type="text" class="sheet-" name="attr_injury" style="width:30px;" value="0"/></td>
+                            <td><input type="hidden" class="sheet-" name="attr_injury" style="width:30px;" value="0"/></td>
+                            <td><input type="hidden" class="sheet-" name="attr_injury_subtotal" style="width:30px;" value="0"/></td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td colspan="4">Penalties to ignore:</td>
+                            <td><input type="text" class="sheet-textbox2" name="attr_injury_ignore" style="width:30px;" value="0"/></td>
+                        </tr>
+                    </table>
+                    <br>
+                    
+                    <h2 class="sheet-center">Movement</h2>
+                    <table class="sheet-center" style="width:100%">
+                        <tr>
+                            <td></td>
+                            <td>Base</td>
+                            <td>Flat Mod.</td>
+                            <td>Multiplier</td>
+                            <td>Total</td>
+                        </tr>
+                        <tr>
+                            <td>Move</td>
+                            <td><input type="number" class="sheet-textbox" name="attr_Move_base" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_Move_mod" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_Move_multi" value="1" /></td>
+                            <td><input type="number" class="sheet-textbox2" name="attr_Move_total" value="0" /></td>
+                        </tr>
+                        <tr>
+                            <td>Dash</td>
+                            <td><input type="number" class="sheet-textbox" name="attr_Dash_base" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_Dash_mod" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_Dash_multi" value="1" /></td>
+                            <td><input type="number" class="sheet-textbox2" name="attr_Dash_total" value="0" /></td>
+                        </tr>
+                        <tr>
+                            <td>Jump</td>
+                            <td><input type="number" class="sheet-textbox" name="attr_Jump_base" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_Jump_mod" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_Jump_multi" value="1" /></td>
+                            <td><input type="number" class="sheet-textbox2" name="attr_Jump_up_total" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox2" name="attr_Jump_over_total" value="0" /></td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td>Up</td>
+                            <td>Over</td>
                         </tr>
                     </table>
                 </div>
                 <div class='sheet-col'>
+                    <h2 style="text-align: center">Join Battle</h2>
+                    <table class="sheet-center" style="width:100%">
+                        <tr>
+                            <th><button type="roll" class="sheet-adv2" name="roll_join_battle" value="&{template:wod} {{name= @{character_name} }} {{pool= Join Battle }} {{injury= @{injury}}} {{attr= @{join_battle_attribute_name}: @{join_battle_attribute} }} {{epic= @{join_battle_epic}}} {{skill= Awareness: @{Awareness} }} {{mod= Modifier @{join_battle_Modifier} }} {{result= [[{(@{join_battle_attribute} + @{Awareness} + @{join_battle_Modifier} + @{injury} )d10s}>7f1 &{tracker}]] }}"><i>Fight!</i></button></th>
+                            <th><select class="sheet-textbox" style="width:90px" name="attr_join_battle_attribute" >
+                                    <option value="0"></option> 
+                                    <option value="@{Strength}">Strength</option> 
+                                    <option value="@{Dexterity}">Dexterity</option> 
+                                    <option value="@{Stamina}">Stamina</option> 
+                                    <option value="@{Charisma}">Charisma</option> 
+                                    <option value="@{Manipulation}">Manipulation</option> 
+                                    <option value="@{Appearance}">Appearance</option> 
+                                    <option value="@{Perception}">Perception</option>
+                                    <option value="@{Intelligence}">Intelligence</option> 
+                                    <option value="@{Wits}" selected>Wits</option> 
+                                </select>
+                                <input type="hidden" class="sheet-textbox" name="attr_join_battle_attribute_name" value=""/>
+                                <input type="hidden" class="sheet-textbox" name="attr_join_battle_epic" value=""/>
+                            </td>
+                            <td><input type="text" class="sheet-textbox" name="attr_join_battle_awareness_name" value="Awareness" readonly/></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_join_battle_Modifier" value="0"/></td>
+                        </tr>
+                    </table>
                     <h2 style="text-align: center">Defense Values</h2>
                     <table class="sheet-center" style="width:100%">
                         <tr>
@@ -2370,45 +2459,39 @@
                         <tr>
                             <td>Dodge</td>
                             <td></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_parry_dodge-base" value="floor((@{Dexterity} + @{Athletics})/2)" disabled="true"/></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_parry_dodge-mod" value="0"/></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_parry_dodge-total" value="floor((@{Dexterity} + @{Athletics} + @{Legend} + @{parry_dodge-mod})/2)" disabled="true"/></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_parry_dodge_base" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_parry_dodge_mod" value="0"/></td>
+                            <td><input type="number" class="sheet-textbox2" name="attr_parry_dodge_total" value="0"/></td>
                         </tr>
                         <tr>
                             <td>Parry</td>
-                            <td>Unarmed</td>
-                            <td><input type="number" class="sheet-textbox" name="attr_parry_unarmed-base" value="@{Dexterity} + @{Brawl}" disabled="true"/></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_parry_unarmed-mod" value="0"/></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_parry_unarmed-total" value="floor((@{Dexterity} + @{Brawl} + @{parry_unarmed-mod})/2)" disabled="true"/></td>
-                        </tr>
-                        <tr>
-                            <td>Parry</td>
-                            <td>Melee</td>
-                            <td><input type="number" class="sheet-textbox" name="attr_parry_Melee-base" value="floor((@{Dexterity} + @{Brawl})/2)" disabled="true"/></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_parry_Melee-mod" value="0"/></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_parry_unarmed-total" value="floor((@{Dexterity} + @{Melee} + @{parry_Melee-mod})/2)" disabled="true"/></td>
+                            <td>Modifier</td>
+                            <td><input type="number" class="sheet-textbox" name="attr_parry_mod" value="0"/></td>
                         </tr>
                     </table>
                     <br>
                     <h2 style="text-align: center">Armor</h2>
                     <table class="sheet-center" style="width:100%">
                         <tr>
+                            <td></td>
                             <th>Armor</th>
                             <th>Bashing</th>
                             <th>Lethal</th>
                             <th>Aggravated</th>
                         </tr>
                         <tr>
+                            <td><input type="radio" class="sheet-armor" name="attr_armor_select" value="1" checked/><span></span></td>
                             <td>None</td>
-                            <td><input type="number" class="sheet-textbox" name="attr_armor_none-Bashing" value="0" /></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_armor_none-Lethal" value="0" /></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_armor_none-Aggravated" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_armor_none_Bashing" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_armor_none_Lethal" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_armor_none_Aggravated" value="0" /></td>
                         </tr>
                         <tr>
+                            <td><input type="radio" class="sheet-armor" name="attr_armor_select" value="2" /><span></span></td>
                             <td><input type="text" class="sheet-textbox" name="attr_armor_name" /></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_armor_rating-Bashing" value="0" /></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_armor_rating-Lethal" value="0" /></td>
-                            <td><input type="number" class="sheet-textbox" name="attr_armor_rating-Aggravated" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_armor_rating_Bashing" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_armor_rating_Lethal" value="0" /></td>
+                            <td><input type="number" class="sheet-textbox" name="attr_armor_rating_Aggravated" value="0" /></td>
                         </tr>
                     </table> 
                     <br>
@@ -2423,24 +2506,24 @@
                         </tr>
                         <tr>
                             <th>Bashing</th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak-Bashing" value="@{Stamina}" disabled="true"/></th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak_mod-Bashing" value="0" /></th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak_armor-Bashing" value="@{armor_rating-Bashing}" disabled='true'/></th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak_total-Bashing" value="@{Soak-Bashing} + @{Soak_mod-Bashing} + @{Soak_armor-Bashing}" disabled="true"/></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_Soak_Bashing" value="0"/></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_Soak_mod_Bashing" value="0" /></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_Soak_armor_Bashing" value='0'/></th>
+                            <th><input type="number" class="sheet-textbox2" name="attr_Soak_total_Bashing" value="0"/></th>
                         </tr>
                         <tr>
                             <th>Lethal</th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak-Lethal" value="floor(@{Stamina}/2)" disabled="true"/></th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak_mod-Lethal" value="0" /></th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak_armor-Lethal" value="@{armor_rating-Lethal}" disabled='true'/></th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak_total-Lethal" value="@{Soak-Lethal} + @{Soak_mod-Lethal} + @{Soak_armor-Lethal}" disabled="true"/></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_Soak_Lethal" value="0"/></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_Soak_mod_Lethal" value="0" /></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_Soak_armor_Lethal" value='0'/></th>
+                            <th><input type="number" class="sheet-textbox2" name="attr_Soak_total_Lethal" value="0"/></th>
                         </tr>
                         <tr>
                             <th>Aggravated</th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak-Aggravated" value="0" disabled="true"/></th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak_mod-Aggravated" value="0" /></th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak_armor-Aggravated" value="@{armor_rating-Aggravated}" disabled='true'/></th>
-                            <th><input type="number" class="sheet-textbox" name="attr_Soak_total-Aggravated" value="@{Soak-Aggravated} + @{Soak_mod-Aggravated} + @{Soak_armor-Aggravated}" disabled="true"/></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_Soak_Aggravated" value="0" /></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_Soak_mod_Aggravated" value="0" /></th>
+                            <th><input type="number" class="sheet-textbox" name="attr_Soak_armor_Aggravated" value='0'/></th>
+                            <th><input type="number" class="sheet-textbox2" name="attr_Soak_total_Aggravated" value="0"/></th>
                         </tr>
                     </table>
                 </div>
@@ -2448,7 +2531,172 @@
         </div>
     </div>
 </div>
+<!--  Tab 5 Advancement -->
+<div class="sheet-section-6">
+    <div class='sheet-2colrow'>
+        <div class="sheet-col">
+            <div class="center"><h2>Experience Points</h2></div>
+            <table>
+                <tr>
+                    <td><input type="number" style="width:80px;" class="sheet-textbox" name="attr_xp_earned_total" value="0"/>
+                    <td>Total Earned</td>
+                </tr>
+                <tr>
+                    <td><input type="number" style="width:80px;" class="sheet-textbox" name="attr_xp_spent_total" readonly/>
+                    <td>Total Spent</td>
+                </tr>
+                <tr>
+                    <td><input type="number" style="width:80px;" class="sheet-textbox" name="attr_remaining" value="@{xp_earned_total} - @{xp_spent_total}"disabled="true"/>
+                    <td>Remaining</td>
+                </tr>
+            </table>
+        </div>
+        <div class="sheet-col">
+            <div class="center"><h2>Bonus Points</h2></div>
+            <textarea name="attr_bp" rows="3" wrap="soft" style="width:320px"></textarea>
+        </div>
+    </div>
+    <div>
+        <hr>
+        <table class="sheet-darktext" style="width:800px;">
+            <tr>
+                <td style="width:400px;">Trait</td>
+                <td style="width:120x;">Cost</td>
+            </tr>
+        </table>
+        <fieldset class="repeating_xp">
+            <table>
+                <tr>
+                    <td><input type="text" class="sheet-textbox" style="width:400px;" name="attr_Trait" /></td>
+                    <td><input type="number" class="sheet-textbox" style="width:120px;" name="attr_cost" value="0"/></td>
+                </tr>
+            </table>
+        </fieldset>
+    
+        <div>TheAaronSheet :: <a href="https://github.com/shdwjk/TheAaronSheet">https://github.com/shdwjk/TheAaronSheet</a></div>
+    </div>
+    <div class='sheet-2colrow'>
+        <div class="sheet-col">
+            <div>
+                Increase Cost
+                <input type="checkbox" class="sheet-bigcheck sheet-hider" name="attr_increase_show"  value="1" style="display:inline"/><span></span>
+        		<div class="sheet-hide sheet-border">
+                    <table>
+                        <tr>
+                            <td><b>Trait Increase</b></td>
+                            <td><b>Cost</b></td>
+                        </tr>
+                        <tr>
+                            <td>Attribute</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-attribute" value="rating x 4" /></td>
+                        </tr>
+                        <tr>
+                            <td>Ability</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Ability" value="(rating x 2) – 1" /></td>
+                        </tr>
+                        <tr>
+                            <td>Favored Ability</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Ability_Favored" value="rating x 2" /></td>
+                        </tr>
+                        <tr>
+                            <td>Virtue</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Virtue" value="rating x 3" /></td>
+                        </tr>
+                        <tr>
+                            <td>Willpower</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Willpower" value="rating x 2" /></td>
+                        </tr>
+                        <tr>
+                            <td>Legend</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Virtue" value="Legend x 8" /></td>
+                        </tr>
+                        <tr>
+                            <td>Favored Epic Attribute</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Virtue" value="rating x 4" /></td>
+                        </tr>
+                        <tr>
+                            <td>Epic Attribute</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Virtue" value="rating x 5" /></td>
+                        </tr>
+                        <tr>
+                            <td>Pantheon-Specific Purview</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Virtue" value="rating x 4" /></td>
+                        </tr>
+                        <tr>
+                            <td>Favored Special Purview</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Virtue" value="rating x 4" /></td>
+                        </tr>
+                        <tr>
+                            <td>Special Purview</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp-Virtue" value="rating x 5" /></td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div class="sheet-col">
+            <div>
+                New Trait Cost
+                <input type="checkbox" class="sheet-bigcheck sheet-hider" name="attr_new_show" value="1" style="display:inline"/><span></span>
+        		<div class="sheet-hide sheet-border">
+                    <table>
+                        <tr>
+                            <td><b>Trait Increase</b></td>
+                            <td><b>Cost</b></td>
+                        </tr>
+                        <tr>
+                            <td>Ability</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-Ability" value="3" /></td>
+                        </tr>
+                        <tr>
+                            <td>Favored Epic Attribute</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-Virtue" value="8" /></td>
+                        </tr>
+                        <tr>
+                            <td>Epic Attribute</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-Virtue" value="10" /></td>
+                        </tr>
+                        <tr>
+                            <td>Knack</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-Knack" value="5" /></td>
+                        </tr>
+                        <tr>
+                            <td>Favored All Purpose Purview Boon</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-ap_purveiw_boon_favored" value="rating x 4" /></td>
+                        </tr>
+                        <tr>
+                            <td>All Purpose Purview Boon</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-ap_purveiw_boon" value="rating x 5" /></td>
+                        </tr>
+                        <tr>
+                            <td>Pantheon-Specific Purview</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-pantheon_purveiw" value="3" /></td>
+                        </tr>
+                        <tr>
+                            <td>Favored Special Purview</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-sp_purveiw_favored" value="3" /></td>
+                        </tr>
+                        <tr>
+                            <td>Special Purview</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-sp_purveiw" value="4" /></td>
+                        </tr>
+                        <tr>
+                            <td>Favored Spell</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-spell_favored" value="rating x 4" /></td>
+                        </tr>
+                        <tr>
+                            <td>Spell</td>
+                            <td><input type="text" class="sheet-textbox3" name="attr_xp_new-spell" value="rating x 5" /></td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+        
+</div>
 
+</div>
 <!--  Roll Templates -->
 <div class="sheet-hidden">
     <rolltemplate class="sheet-rolltemplate-wod">
@@ -2636,17 +2884,167 @@
     </rolltemplate>
 </div>
 <script type="text/worker">
-    //wounds
+    //weapon Attribute Showing
+on("change:join_battle_attribute sheet:opened", function() {
+    getAttrs(['join_battle_attribute', 'Strength_box', 'Dexterity_box', 'Stamina_box', 'Charisma_box', 'Manipulation_box', 'Appearance_box', 'Intelligence_box', 'Wits_box', 'Perception_box'], function(values) {
+            if (values.join_battle_attribute == '@{Strength}' ) {
+                setAttrs({
+                    join_battle_attribute_name: 'Strength',
+                    join_battle_epic: values.Strength_box
+                })
+            }
+            else if (values.join_battle_attribute == '@{Dexterity}' ) {
+                setAttrs({
+                    join_battle_attribute_name: 'Dexterity',
+                    join_battle_epic: values.Dexterity_box
+                })
+            }
+            else if (values.join_battle_attribute == '@{Stamina}' ) {
+                setAttrs({
+                    join_battle_attribute_name: 'Stamina',
+                    join_battle_epic: values.Stamina_box
+                })
+            }
+            else if (values.join_battle_attribute == '@{Charisma}' ) {
+                setAttrs({
+                    join_battle_attribute_name: 'Charisma',
+                    join_battle_epic: values.Charisma_box
+                })
+            }
+            else if (values.join_battle_attribute == '@{Manipulation}' ) {
+                setAttrs({
+                    join_battle_attribute_name: 'Manipulation',
+                    join_battle_epic: values.Manipulation_box
+                })
+            }
+            else if (values.join_battle_attribute == '@{Appearance}' ) {
+                setAttrs({
+                    join_battle_attribute_name: 'Appearance',
+                    join_battle_epic: values.Appearance_box
+                })
+            }
+            else if (values.join_battle_attribute == '@{Intelligence}' ) {
+                setAttrs({
+                    join_battle_attribute_name: 'Intelligence',
+                    join_battle_epic: values.Intelligence_box
+                })
+            }
+            else if (values.join_battle_attribute == '@{Wits}' ) {
+                setAttrs({
+                    join_battle_attribute_name: 'Wits',
+                    join_battle_epic: values.Wits_box
+                })
+            }
+            else if (values.join_battle_attribute == '@{Perception}' ) {
+                setAttrs({
+                    join_battle_attribute_name: 'Perception',
+                    join_battle_epic: values.Perception_box
+                })
+            }
+            else if (values.join_battle_attribute == 0 ) {
+                setAttrs({
+                    join_battle_attribute_name: None,
+                    join_battle_epic: 'None'
+                })
+            }
+        });
+    }); 
+    //Jump
+on("change:Strength change:Athletics change:Jump_mod change:Jump_multi sheet:opened", function() {
+    getAttrs(['Strength', 'Athletics', 'Jump_mod', 'Jump_multi'], function(values) {
+        setAttrs({ 
+            Jump_base: (+values.Strength + +values.Athletics) * +values.Jump_multi,
+            Jump_up_total: (+values.Strength + +values.Athletics + +values.Jump_mod) * +values.Jump_multi,
+            Jump_over_total: ((+values.Strength + +values.Athletics + +values.Jump_mod) * +values.Jump_multi) * 2
+        });
+    });
+});
+    //Move
+on("change:Dexterity change:Move_mod change:Dexterity change:Move_multi sheet:opened", function() {
+    getAttrs(['Dexterity', 'Move_mod', 'Move_multi'], function(values) {
+        setAttrs({ 
+            Move_base: (+values.Dexterity),
+            Move_total: (+values.Dexterity + +values.Move_mod) * +values.Move_multi
+        });
+    });
+});
+    //dash
+on("change:Dexterity change:Dash_mod change:Dexterity sheet:opened", function() {
+    getAttrs(['Dexterity', 'Dash_mod', 'Dash_multi'], function(values) {
+        setAttrs({ 
+            Dash_base: (+values.Dexterity + 6),
+            Dash_total: (+values.Dexterity + +values.Dash_mod + 6) * +values.Dash_multi
+        });
+    });
+});
+on("change:Dexterity change:Athletics change:Dexterity_box change:Legend change:parry_dodge_mod sheet:opened", function() {
+    getAttrs(['Dexterity', 'Athletics', 'Dexterity_box', "parry_dodge_mod"], function(values) {
+        setAttrs({ 
+            parry_dodge_base: Math.floor((+values.Dexterity + +values.Athletics)/2) + +values.Dexterity_box,  
+            parry_dodge_total:  Math.floor((+values.Dexterity + +values.Athletics)/2) + +values.parry_dodge_mod + +values.Dexterity_box
+        });
+    });
+});
+    //armor_select
+on("change:armor_select sheet:opened", function() {
+    getAttrs(['armor_select', 'armor_none_Bashing', 'armor_none_Lethal', 'armor_none_Aggravated', 'armor_rating_Bashing', 'armor_rating_Lethal', 'armor_rating_Aggravated'], function(values) {
+            if (values.armor_select == 1 ) {
+                setAttrs({
+                    Soak_armor_Bashing: +values.armor_none_Bashing,
+                    Soak_armor_Lethal: +values.armor_none_Lethal,
+                    Soak_armor_Aggravated: +values.armor_none_Aggravated
+                })
+            }
+            else if (values.armor_select == 2 ) {
+                setAttrs({
+                    Soak_armor_Bashing: +values.armor_rating_Bashing,
+                    Soak_armor_Lethal: +values.armor_rating_Lethal,
+                    Soak_armor_Aggravated: +values.armor_rating_Aggravated
+                })
+            }
+        });
+    }); 
+    //injury_ignore
+on("change:Stamina change:Soak_mod_Bashing change:Soak_mod_Lethal change:Soak_mod_Aggravated change:Soak_armor_Bashing change:Soak_armor_Lethal change:Soak_armor_Aggravated sheet:opened", function() {
+    getAttrs(['Stamina', 'Soak_mod_Bashing', 'Soak_mod_Lethal', 'Soak_mod_Aggravated', 'Soak_armor_Bashing', 'Soak_armor_Lethal', 'Soak_armor_Aggravated'], function(values) {
+        setAttrs({ 
+            Soak_total_Bashing: +values.Stamina + +values.Soak_mod_Bashing + +values.Soak_armor_Bashing, 
+            Soak_total_Lethal: Math.floor(+values.Stamina/2) + +values.Soak_mod_Lethal + +values.Soak_armor_Lethal, 
+            Soak_total_Aggravated: 0 + +values.Soak_mod_Aggravated + +values.Soak_armor_Aggravated, 
+            Soak_Bashing: values.Stamina, 
+            Soak_Lethal: Math.floor(+values.Stamina/2), 
+            Soak_Aggravated: 0
+        });
+    });
+});
+
+    //injury_ignore
+on("change:Stamina_box sheet:opened", function() {
+    getAttrs(['Stamina_box'], function(values) {
+        setAttrs({ 
+            injury_ignore: values.Stamina_box 
+        });
+    });
+});
+    //injury_subtotal
 on("change:Bruised1 change:Hurt1 change:Injured1 change:Wounded1 change:Mauled1 change:Crippled1 sheet:opened", function() {
     getAttrs(['Bruised1', 'Hurt1', 'Injured1', 'Wounded1', 'Mauled1', 'Crippled1'], function(values) {
         setAttrs({ 
-            injury: ((Math.floor(Math.max.apply(null, Object.values(values)))) * -1) 
+            injury_subtotal: ((Math.floor(Math.max.apply(null, Object.values(values)))) * -1) 
+        });
+    });
+});
+    //
+on("change:injury_subtotal change:injury_ignore sheet:opened", function() {
+    getAttrs(['injury_subtotal', 'injury_ignore'], function(values) {
+        setAttrs({ 
+            injury: Math.min(+values.injury_subtotal + +values.injury_ignore, 0)
         });
     });
 });
     //Attribute Showing
 var stats = ['Appearance', 'Charisma', 'Dexterity', 'Intelligence', 'Manipulation', 'Perception', 'Strength', 'Stamina', 'Wits'],
-  skills = ['Academics', 'Animal_Ken', 'Art', 'Athletics', 'Awareness', 'Brawl', 'Control', 'Craft', 'Empathy', 'Fortitude', 'Integrity', 'Investigation', 'Larceny', 'Marksmanship', 'Medicine', 'Melee', 'Occult', 'Politics', 'Presence', 'Science', 'Stealth', 'Survival', 'Thrown', 'Other1', 'Other2', 'Other3', 'Other4', 'Other5', 'Other6', 'Other7', 'Other8', 'Other9'];
+  skills = ['Academics', 'Animal_Ken', 'Art', 'Athletics', 'Awareness', 'Brawl', 'Control', 'Craft', 'Empathy', 'Fortitude', 'Integrity', 'Investigation', 'Larceny', 'Marksmanship', 'Medicine', 'Melee', 'Occult', 'Politics', 'Presence', 'Science', 'Stealth', 'Survival', 'Thrown', 'Other1', 'Other2', 'Other3', 'Other4', 'Other5', 'Other6', 'Other7', 'Other8', 'Other9', 'join_battle'];
 skills.forEach(function (skill) {
   'use strict';
   // relevantAttrs is e.g. ['Apperance', 'Charisma', ... , 'Appearance_box', ... , 'Academics_attrib']
@@ -2797,4 +3195,658 @@ on("change:repeating_weapons:weapon_skill sheet:opened", function() {
             }
         });
     }); 
+    
+    
+/* ---- BEGIN: TheAaronSheet.js ---- */
+// Github:   https://github.com/shdwjk/TheAaronSheet/blob/master/TheAaronSheet.js
+// By:       The Aaron, Arcane Scriptomancer
+// Contact:  https://app.roll20.net/users/104025/the-aaron
+
+var TAS = TAS || (function(){
+    'use strict';
+
+    var version = '0.2.3',
+        lastUpdate = 1457098056,
+
+        loggingSettings = {
+            debug: {
+                key:     'debug',
+                title:   'DEBUG',
+                color: {
+                    bgLabel: '#7732A2',
+                    label:   '#F2EF40',
+                    bgText:  '#FFFEB7',
+                    text:    '#7732A2'
+                }
+            },
+            error: {
+                key:     'error',
+                title:   'Error',
+                color: {
+                    bgLabel: '#C11713',
+                    label:   'white',
+                    bgText:  '#C11713',
+                    text:    'white'
+                }
+            },
+            warn: {
+                key:     'warn',
+                title:   'Warning',
+                color: {
+                    bgLabel: '#F29140',
+                    label:   'white',
+                    bgText:  '#FFD8B7',
+                    text:    'black'
+                }
+            },
+            info: {
+                key:     'info',
+                title:   'Info',
+                color: {
+                    bgLabel: '#413FA9',
+                    label:   'white',
+                    bgText:  '#B3B2EB',
+                    text:    'black'
+                }
+            },
+            notice: {
+                key:     'notice',
+                title:   'Notice',
+                color: {
+                    bgLabel: '#33C133',
+                    label:   'white',
+                    bgText:  '#ADF1AD',
+                    text:    'black'
+                }
+            },
+            log: {
+                key:     'log',
+                title:   'Log',
+                color: {
+                    bgLabel: '#f2f240',
+                    label:   'black',
+                    bgText:  '#ffff90',
+                    text:    'black'
+                }
+            },
+            callstack: {
+                key:     'TAS',
+                title:   'function',
+                color: {
+                    bgLabel: '#413FA9',
+                    label:   'white',
+                    bgText:  '#B3B2EB',
+                    text:    'black'
+                }
+            },
+            callstack_async: {
+                key:     'TAS',
+                title:   'ASYNC CALL',
+                color: {
+                    bgLabel: '#413FA9',
+                    label:   'white',
+                    bgText:  '#413FA9',
+                    text:    'white'
+                }
+            },
+            TAS: {
+                key:     'TAS',
+                title:   'TAS',
+                color: {
+                    bgLabel: 'grey',
+                    label:   'black;background:linear-gradient(#304352,#d7d2cc,#d7d2cc,#d7d2cc,#304352)',
+                    bgText:  'grey',
+                    text:    'black;background:linear-gradient(#304352,#d7d2cc,#d7d2cc,#d7d2cc,#304352)'
+                }
+            }
+        },
+
+
+        config = {
+            debugMode: false,
+            logging: {
+                log: true,
+                notice: true,
+                info: true,
+                warn: true,
+                error: true,
+                debug: false
+            }
+        },
+
+        callstackRegistry = [],
+		queuedUpdates = {}, //< Used for delaying saves till the last momment.
+
+    complexType = function(o){
+        switch(typeof o){
+            case 'string':
+                return 'string';
+            case 'boolean':
+                return 'boolean';
+            case 'number':
+                return (_.isNaN(o) ? 'NaN' : (o.toString().match(/\./) ? 'decimal' : 'integer'));
+            case 'function':
+                return 'function: '+(o.name ? o.name+'()' : '(anonymous)');
+            case 'object':
+                return (_.isArray(o) ? 'array' : (_.isArguments(o) ? 'arguments' : ( _.isNull(o) ? 'null' : 'object')));
+            default:
+                return typeof o;
+        }
+    },
+
+	dataLogger = function(primaryLogger,secondaryLogger,data){
+        _.each(data,function(m){
+            var type = complexType(m);
+            switch(type){
+                case 'string':
+                    primaryLogger(m);
+                    break;
+                case 'undefined':
+                case 'null':
+                case 'NaN':
+                    primaryLogger('['+type+']');
+                    break;
+                case 'number':
+                case 'not a number':
+                case 'integer':
+                case 'decimal':
+                case 'boolean':
+                    primaryLogger('['+type+']: '+m);
+                    break;
+                default:
+                    primaryLogger('['+type+']:=========================================');
+                    secondaryLogger(m);
+                    primaryLogger('=========================================================');
+                    break;
+            }
+        });
+	},
+
+
+    colorLog = function(options){
+        var coloredLoggerFunction,
+            key = options.key,
+            label = options.title || 'TAS',
+            lBGColor = (options.color && options.color.bgLabel) || 'blue',
+            lTxtColor = (options.color && options.color.label) || 'white',
+            mBGColor = (options.color && options.color.bgText) || 'blue',
+            mTxtColor = (options.color && options.color.text) || 'white';
+
+        coloredLoggerFunction = function(message){
+            console.log(
+                '%c '+label+': %c '+message + ' ',
+                'background-color: '+lBGColor+';color: '+lTxtColor+'; font-weight:bold;',
+                'background-color: '+mBGColor+';color: '+mTxtColor+';'
+            ); 
+        };
+        return function(){
+            if('TAS'===key || config.logging[key]){
+               dataLogger(coloredLoggerFunction,function(m){console.log(m);},_.toArray(arguments)); 
+            }
+        };
+    },
+
+    logDebug  = colorLog(loggingSettings.debug),
+    logError  = colorLog(loggingSettings.error),
+    logWarn   = colorLog(loggingSettings.warn),
+    logInfo   = colorLog(loggingSettings.info),
+    logNotice = colorLog(loggingSettings.notice),
+    logLog    = colorLog(loggingSettings.log),
+    log       = colorLog(loggingSettings.TAS),
+    logCS     = colorLog(loggingSettings.callstack),
+    logCSA    = colorLog(loggingSettings.callstack_async),
+
+    registerCallstack = function(callstack,label){
+        var idx=_.findIndex(callstackRegistry,function(o){
+            return (_.difference(o.stack,callstack).length === _.difference(callstack,o.stack).length) &&
+                _.difference(o.stack,callstack).length === 0 &&
+                o.label === label;
+        });
+        if(-1 === idx){
+            idx=callstackRegistry.length;
+            callstackRegistry.push({
+                stack: callstack,
+                label: label
+            });
+        }
+        return idx;
+    },
+
+    setConfigOption = function(options){
+        var newconf =_.defaults(options,config);
+        newconf.logging=_.defaults(
+            (options && options.logging)||{},
+            config.logging
+        );
+        config=newconf;
+    },
+    
+    debugMode = function(){
+        config.logging.debug=true;
+        config.debugMode = true;
+    },
+
+    getCallstack = function(){
+        var e = new Error('dummy'),
+            stack = _.map(_.rest(e.stack.replace(/^[^\(]+?[\n$]/gm, '')
+            .replace(/^\s+at\s+/gm, '')
+            .replace(/^Object.<anonymous>\s*\(/gm, '{anonymous}()@')
+            .split('\n')),function(l){
+                return l.replace(/\s+.*$/,'');
+            });
+        return stack;
+    },
+    logCallstackSub = function(cs){
+        var matches, csa;
+        _.find(cs,function(line){
+            matches = line.match(/TAS_CALLSTACK_(\d+)/);
+            if(matches){
+               csa=callstackRegistry[matches[1]];
+               logCSA( '===================='+(csa.label ? '> '+csa.label+' <' : '')+'====================');
+               logCallstackSub(csa.stack);
+               return true;
+            } 
+            logCS(line);
+            return false;
+        });
+    },
+    logCallstack = function(){
+        var cs;
+        if(config.debugMode){
+            cs = getCallstack();
+            cs.shift();
+            log('==============================> CALLSTACK <==============================');
+            logCallstackSub(cs);
+            log('=========================================================================');
+        }
+    },
+
+
+    wrapCallback = function (label, callback, context){
+        var callstack;
+        if('function' === typeof label){
+            context=callback;
+            callback=label;
+            label=undefined;
+        }
+        if(!config.debugMode){
+            return (function(cb,ctx){
+                return function(){
+                    cb.apply(ctx||{},arguments);
+                };
+            }(callback,context));
+        }
+        
+        callstack = getCallstack();
+        callstack.shift();
+        
+        return (function(cb,ctx,cs,lbl){
+            var ctxref=registerCallstack(cs,lbl);
+
+            /*jshint -W054 */
+            return new Function('cb','ctx','TASlog',
+                "return function TAS_CALLSTACK_"+ctxref+"(){"+
+                    "TASlog('Entering: '+(cb.name||'(anonymous function)'));"+
+                    "cb.apply(ctx||{},arguments);"+
+                    "TASlog('Exiting: '+(cb.name||'(anonymous function)'));"+
+                "};")(cb,ctx,log);
+            /*jshint +W054 */
+        }(callback,context,callstack,label));
+    },
+
+
+    prepareUpdate = function( attribute, value ){
+        queuedUpdates[attribute]=value;
+    },
+
+    applyQueuedUpdates = function() {
+      setAttrs(queuedUpdates);
+      queuedUpdates = {};
+    },
+
+	namesFromArgs = function(args,base){
+        return _.chain(args)
+            .reduce(function(memo,attr){
+                if('string' === typeof attr) {
+                    memo.push(attr);
+                } else if(_.isArray(args) || _.isArguments(args)){
+                    memo = namesFromArgs(attr,memo);
+                }
+                return memo;
+            },(_.isArray(base) && base) || [])
+            .uniq()
+            .value();
+	},
+
+	addId = function(obj,value){
+		Object.defineProperty(obj,'id',{
+			value: value,
+			writeable: false,
+			enumerable: false
+		});
+	},
+
+	addProp = function(obj,prop,value,fullname){
+		(function(){
+            var pname=(_.contains(['S','F','I','D'],prop) ? '_'+prop : prop),
+			    full_pname = fullname || prop,
+                pvalue=value;
+
+            _.each(['S','I','F'],function(p){
+                if( !_.has(obj,p)){
+                    Object.defineProperty(obj, p, {
+                        value: {},
+                        enumerable: false,
+                        readonly: true
+                    });
+                }
+            });
+            if( !_.has(obj,'D')){
+                Object.defineProperty(obj, 'D', {
+                    value: _.reduce(_.range(10),function(m,d){
+                            Object.defineProperty(m, d, {
+                                value: {},
+                                enumerable: true,
+                                readonly: true
+                            });
+                            return m;
+                        },{}),
+                    enumerable: false,
+                    readonly: true
+                });
+            }
+
+
+            // Raw value
+			Object.defineProperty(obj, pname, {
+                enumerable: true,
+				set: function(v){
+                    if(v!==pvalue) {
+                        pvalue=v;
+                        prepareUpdate(full_pname,v);
+                    }
+				},
+				get: function(){
+					return pvalue;
+				}
+			});
+            
+            // string value
+			Object.defineProperty(obj.S, pname, {
+                enumerable: true,
+				set: function(v){
+                    var val=v.toString();
+                    if(val !== pvalue) {
+                        pvalue=val;
+                        prepareUpdate(full_pname,val);
+                    }
+				},
+				get: function(){
+					return pvalue.toString();
+				}
+			});
+
+            // int value
+			Object.defineProperty(obj.I, pname, {
+                enumerable: true,
+				set: function(v){
+                    var val=parseInt(v,10) || 0;
+                    if(val !== pvalue){
+                        pvalue=val;
+                        prepareUpdate(full_pname,val);
+                    }
+				},
+				get: function(){
+					return parseInt(pvalue,10) || 0;
+				}
+			});
+
+            // float value
+			Object.defineProperty(obj.F, pname, {
+                enumerable: true,
+				set: function(v){
+                    var val=parseFloat(v) || 0;
+                    if(val !== pvalue) {
+                        pvalue=val;
+                        prepareUpdate(full_pname,val);
+                    }
+				},
+				get: function(){
+					return parseFloat(pvalue) || 0;
+				}
+			});
+            _.each(_.range(10),function(d){
+                Object.defineProperty(obj.D[d], pname, {
+                    enumerable: true,
+                    set: function(v){
+                        var val=(parseFloat(v) || 0).toFixed(d);
+                        if(val !== pvalue){
+                            pvalue=val;
+                            prepareUpdate(full_pname,val);
+                        }
+                    },
+                    get: function(){
+                        return (parseFloat(pvalue) || 0).toFixed(d);
+                    }
+                });
+            });
+
+		}());
+	},
+	
+	repeating = function( section ) {
+		return (function(s){
+			var sectionName = s,
+				attrNames = [],
+				fieldNames = [],
+				operations = [],
+                after = [],
+			
+			repAttrs = function TAS_Repeating_Attrs(){
+				attrNames = namesFromArgs(arguments,attrNames);
+				return this;
+			},
+			repFields = function TAS_Repeating_Fields(){
+				fieldNames = namesFromArgs(arguments,fieldNames);
+				return this;
+			},
+			repReduce = function TAS_Repeating_Reduce(func, initial, final, context) { 
+				operations.push({
+                    type: 'reduce',
+                    func: (func && _.isFunction(func) && func) || _.noop,
+                    memo: (_.isUndefined(initial) && 0) || initial,
+                    final: (final && _.isFunction(final) && final) || _.noop,
+                    context: context || {}
+                });
+				return this;
+			},
+			repMap = function TAS_Repeating_Map(func, final, context) {
+				operations.push({
+                    type: 'map',
+                    func: (func && _.isFunction(func) && func) || _.noop,
+                    final: (final && _.isFunction(final) && final) || _.noop,
+                    context: context || {}
+                });
+				return this;
+			},
+            repEach = function TAS_Repeating_Each(func, final, context) {
+				operations.push({
+                    type: 'each',
+                    func: (func && _.isFunction(func) && func) || _.noop,
+                    final: (final && _.isFunction(final) && final) || _.noop,
+                    context: context || {}
+                });
+				return this;
+            },
+            repTap = function TAS_Repeating_Tap(final, context) {
+				operations.push({
+                    type: 'tap',
+                    final: (final && _.isFunction(final) && final) || _.noop,
+                    context: context || {}
+                });
+				return this;
+            },
+            repAfter = function TAS_Repeating_After(callback,context) {
+				after.push({
+                    callback: (callback && _.isFunction(callback) && callback) || _.noop,
+                    context: context || {}
+                });
+				return this;
+            },
+			repExecute = function TAS_Repeating_Execute(callback,context){
+				var rowSet = {},
+					attrSet = {},
+					fieldIds = [],
+					fullFieldNames = [];
+
+                repAfter(callback,context);
+
+				// call each operation per row.
+				// call each operation's final
+				getSectionIDs("repeating_"+sectionName,function(ids){
+					fieldIds = ids;
+					fullFieldNames = _.reduce(fieldIds,function(memo,id){
+						return memo.concat(_.map(fieldNames,function(name){
+							return 'repeating_'+sectionName+'_'+id+'_'+name;  
+						}));
+					},[]);
+					getAttrs( _.uniq(attrNames.concat(fullFieldNames)), function(values){
+						_.each(attrNames,function(aname){
+							if(values.hasOwnProperty(aname)){
+								addProp(attrSet,aname,values[aname]);
+							}
+						});
+
+						rowSet = _.reduce(fieldIds,function(memo,id){
+							var r={};
+							addId(r,id);
+							_.each(fieldNames,function(name){
+								var fn = 'repeating_'+sectionName+'_'+id+'_'+name;  
+								addProp(r,name,values[fn],fn);
+							});
+
+							memo[id]=r;
+
+							return memo;
+						},{});
+
+                        _.each(operations,function(op){
+                            var res;
+                            switch(op.type){
+                                case 'tap':
+                                    _.bind(op.final,op.context,rowSet,attrSet)();
+                                    break;
+
+                                case 'each':
+                                    _.each(rowSet,function(r){
+                                        _.bind(op.func,op.context,r,attrSet,r.id,rowSet)();
+                                    });
+                                    _.bind(op.final,op.context,rowSet,attrSet)();
+                                    break;
+
+                                case 'map':
+                                    res = _.map(rowSet,function(r){
+                                        return _.bind(op.func,op.context,r,attrSet,r.id,rowSet)();
+                                    });
+                                    _.bind(op.final,op.context,res,rowSet,attrSet)();
+                                    break;
+
+                                case 'reduce':
+                                    res = op.memo;
+                                    _.each(rowSet,function(r){
+                                        res = _.bind(op.func,op.context,res,r,attrSet,r.id,rowSet)();
+                                    });
+                                    _.bind(op.final,op.context,res,rowSet,attrSet)();
+                                    break;
+                            }
+                        });
+
+                        // finalize attrs
+                        applyQueuedUpdates();
+                        _.each(after,function(op){
+                            _.bind(op.callback,op.context)();
+                        });
+					});
+				});
+			};
+				
+			return {
+				attrs: repAttrs,
+				attr: repAttrs,
+
+				column: repFields,
+				columns: repFields,
+				field: repFields,
+				fields: repFields,
+
+				reduce: repReduce,
+				inject: repReduce,
+				foldl: repReduce,
+
+				map: repMap,
+				collect: repMap,
+
+				each: repEach,
+                forEach: repEach,
+
+                tap: repTap,
+                'do': repTap,
+
+				after: repAfter,
+				last: repAfter,
+				done: repAfter,
+
+				execute: repExecute,
+				go: repExecute,
+				run: repExecute
+			};
+		}(section));
+	},
+
+
+    repeatingSimpleSum = function(section, field, destination){
+        repeating(section)
+            .attr(destination)
+            .field(field)
+            .reduce(function(m,r){
+                return m + (r.F[field]);
+            },0,function(t,r,a){
+                a.S[destination]=t;
+            })
+            .execute();
+    };
+
+	console.log('%c•.¸¸.•*´¨`*•.¸¸.•*´¨`*•.¸  The Aaron Sheet  v'+version+'  ¸.•*´¨`*•.¸¸.•*´¨`*•.¸¸.•','background: linear-gradient(to right,green,white,white,green); color:black;text-shadow: 0 0 8px white;');
+	console.log('%c•.¸¸.•*´¨`*•.¸¸.•*´¨`*•.¸  Last update: '+(new Date(lastUpdate*1000))+'  ¸.•*´¨`*•.¸¸.•*´¨`*•.¸¸.•','background: linear-gradient(to right,green,white,white,green); color:black;text-shadow: 0 0 8px white;');
+
+
+    return {
+        /* Repeating Sections */
+        repeatingSimpleSum: repeatingSimpleSum,
+		repeating: repeating,
+
+        /* Configuration */
+        config: setConfigOption,
+
+        /* Debugging */
+        callback: wrapCallback,
+        callstack: logCallstack,
+        debugMode: debugMode,
+        _fn: wrapCallback,
+
+        /* Logging */
+        debug: logDebug,
+        error: logError,
+        warn: logWarn,
+        info: logInfo,
+        notice: logNotice,
+        log: logLog
+    };
+}());
+
+/* ---- END: TheAaronSheet.js ---- */
+//xp
+on('change:repeating_xp sheet:opened', function(){
+    TAS.repeatingSimpleSum('xp','cost','xp_spent_total');
+});
 </script>