diff --git a/Hollow_Knight_Unofficial_TTRPG/HKTTRPGbetatest1.css b/Hollow_Knight_Unofficial_TTRPG/HKRPG.css
similarity index 93%
rename from Hollow_Knight_Unofficial_TTRPG/HKTTRPGbetatest1.css
rename to Hollow_Knight_Unofficial_TTRPG/HKRPG.css
index 312ec744be..f0e714b998 100644
--- a/Hollow_Knight_Unofficial_TTRPG/HKTTRPGbetatest1.css
+++ b/Hollow_Knight_Unofficial_TTRPG/HKRPG.css
@@ -46,37 +46,37 @@
 
 .insight {
   position: absolute;
-  top: 151px;
+  top: 154px;
   left: 194px;
 }
 
 .insight-mod {
   position: absolute;
-  top: 181px;
+  top: 185px;
   left: 194px;
 }
 
 .shell {
   position: absolute;
-  top: 237px;
+  top: 240px;
   left: 194px;
 }
 
 .shell-mod {
   position: absolute;
-  top: 267px;
+  top: 270px;
   left: 194px;
 }
 
 .grace {
   position: absolute;
-  top: 325px;
+  top: 334px;
   left: 194px;
 }
 
 .grace-mod {
   position: absolute;
-  top: 355px;
+  top: 365px;
   left: 194px;
 }
 
@@ -88,19 +88,19 @@
 
 .checkinsight {
   position: absolute;
-  top: 149px;
+  top: 152px;
   left: 48px;
 }
 
 .checkshell {
   position: absolute;
-  top: 235px;
+  top: 236px;
   left: 48px;
 }
 
 .checkgrace {
   position: absolute;
-  top: 323px;
+  top: 332px;
   left: 48px;
 }
 
@@ -435,7 +435,7 @@
 .bulka {
   position: absolute;
   top: 806px;
-  left: 285px;
+  left: 286px;
 }
 
 .dr {
@@ -444,22 +444,52 @@
   left: 319px;
 }
 
+.armdurmax {
+  position: absolute;
+  top: 806px;
+  left: 367px;
+}
+
+.armname {
+  position: absolute;
+  top: 806px;
+  left: 54px;
+}
+
+.armsoak {
+  position: absolute;
+  top: 840px;
+  left: 59px;
+}
+
+.armsoakreroll {
+  position: absolute;
+  top: 840px;
+  left: 163px;
+}
+
+.armdur {
+  position: absolute;
+  top: 840px;
+  left: 293px;
+}
+
 .bulktotal {
   position: absolute;
-  top: 97px;
+  top: 64px;
   left: 321px;
 }
 
 .load {
   position: absolute;
-  top: 97px;
+  top: 64px;
   left: 390px;
 }
 
 .toggle {
   position: absolute;
   top: 445px;
-  left: 450px;
+  left: 446px;
 }
 
 .equipped {
@@ -568,8 +598,8 @@
 
 .init {
   position: absolute;
-  top: 139px;
-  left: 266px;
+  top: 373px;
+  left: 80px;
 }
 
 .grapple {
@@ -580,8 +610,14 @@
 
 .turn {
   position: absolute;
-  top: 139px;
-  left: 342px;
+  top: 100px;
+  left: 266px;
+}
+
+.endturn {
+  position: absolute;
+  top: 100px;
+  left: 352px;
 }
 
 .paral {
@@ -680,10 +716,16 @@
 
 .absorption {
   position: absolute;
-  top: 271px;
+  top: 276px;
   left: 153px;
 }
 
+.absorptiondur {
+  position: absolute;
+  top: 298px;
+  left: 80px;
+}
+
 .drisk {
   position: absolute;
   top: 233px;
@@ -714,6 +756,24 @@
   left: 365px;
 }
 
+.se1 {
+  position: absolute;
+  top: 134px;
+  left: 282px;
+}
+
+.se2 {
+  position: absolute;
+  top: 134px;
+  left: 330px;
+}
+
+.se3 {
+  position: absolute;
+  top: 134px;
+  left: 378px;
+}
+
 .dot1 {
   position: absolute;
   top: 381px;
@@ -732,18 +792,6 @@
   left: 378px;
 }
 
-.armdur {
-  position: absolute;
-  top: 806px;
-  left: 362px;
-}
-
-.armname {
-  position: absolute;
-  top: 806px;
-  left: 54px;
-}
-
 .heart {
   position: absolute;
   top: 807px;
diff --git a/Hollow_Knight_Unofficial_TTRPG/HKTTRPGbetatest1.html b/Hollow_Knight_Unofficial_TTRPG/HKRPG.html
similarity index 62%
rename from Hollow_Knight_Unofficial_TTRPG/HKTTRPGbetatest1.html
rename to Hollow_Knight_Unofficial_TTRPG/HKRPG.html
index 260d10b7cb..298ee09653 100644
--- a/Hollow_Knight_Unofficial_TTRPG/HKTTRPGbetatest1.html
+++ b/Hollow_Knight_Unofficial_TTRPG/HKRPG.html
@@ -7,78 +7,152 @@
 
 <div class="sheet-page2">
     <h2>Character</h2>
-    <h4>Work in Progress, this page will include spells, paths, social rolls, and other features I forgot to add (which will hopefully be made apparent through this beta test)</h4>
+        <h4>Work in Progress, this page will include spells, paths, social rolls, and other features I forgot to add (which will hopefully be made apparent through this beta test)</h4>
 </div>
 
 <div class="sheet-modifiers">
     <h2>Modifiers</h2>
 
-  <div class="unimod">
-      <input type="number" name="attr_unimod" style="width: 43px;">{WORK IN PROGRESS} Universal Bonus</div>
+  <p><div class="unimod">
+      <input type="number" name="attr_unimod" style="width: 43px;">{WORK IN PROGRESS} Universal Bonus</div></p>
+  
   <div class="soakmod">
-      <input type="number" name="attr_soakmod" style="width: 43px;">+Soak</div>
-  <div class="soakmagicmod">
-      <input type="number" name="attr_soakmagicmod" style="width: 43px;">+Soak (magic damage)</div>
+      <p>Normal Resist:
+      <input type="number" name="attr_soakmod" style="width: 43px;">+Soak&nbsp;&nbsp;
+      <input type="number" name="attr_soakrerollmod" style="width: 43px;">+Soak Reroll</p></div>
+  <p><div class="soakmagicmod">
+      Magical Resist:
+      <input type="number" name="attr_soakmagicmod" style="width: 43px;">+Soak&nbsp;&nbsp;
+      <input type="number" name="attr_soakmagicrerollmod" style="width: 43px;">+Soak Reroll</div>
   <div class="soakmagicradio">
       <input type="radio" name="attr_soakmagicradio" value="1" style="width: 43px;">Add "Normal" Soak against Magic Damage&nbsp;&nbsp;
-      <input type="radio" name="attr_soakmagicradio" value="0" style="width: 43px;" checked>Don't do that</div>
-  <div class="soakenviromod">
-      <input type="number" name="attr_soakenviromod" style="width: 43px;">+Soak (enviornmental damage)</div>
+      <input type="radio" name="attr_soakmagicradio" value="0" style="width: 43px;" checked>Don't do that</div></p>
+  <p><div class="soakenviromod">
+      Enviornmental Resist:
+      <input type="number" name="attr_soakenviromod" style="width: 43px;">+Soak&nbsp;&nbsp;
+      <input type="number" name="attr_soakenvirorerollmod" style="width: 43px;">+Soak Reroll</div>
   <div class="soakenviroradio">
       <input type="radio" name="attr_soakenviroradio" value="1" style="width: 43px;">Add "Normal" Soak against Enviornment Damage&nbsp;&nbsp;
-      <input type="radio" name="attr_soakenviroradio" value="0" style="width: 43px;" checked>Don't do that</div>
-  <div class="grapplerollmod">
-      <input type="number" name="attr_grapplerollmod" style="width: 43px;">+Grapple</div>
-  <div class="grapplearms">
-      <input type="number" name="attr_grapplearms" min="0" max="2" style="width: 43px;">Additional Arms for Grappling (beyond the first)</div>
-  <div class="loadmod">
+      <input type="radio" name="attr_soakenviroradio" value="0" style="width: 43px;" checked>Don't do that</div></p>
+      
+  <p><div class="loadmod">
       <input type="number" name="attr_loadmod" style="width: 43px;">+Load</div>
+  <div class="footworkmod">
+      <input type="number" name="attr_footworkmod" style="width: 43px;">+Footwork</div>
+  <div class="beltmod">
+      <input type="number" name="attr_beltmod" style="width: 43px;">+Belt</div>
   <div class="initmod">
-      <input type="number" name="attr_initmod" style="width: 43px;">+Initative</div>
-  <div class="stamtaxinstantmod">
+      <input type="number" name="attr_initmod" style="width: 43px;">+Initative&nbsp;&nbsp;
+      <input type="number" name="attr_initrerollmod" style="width: 43px;">+Initative Reroll</div></p>
+
+  <p><div class="cutespook">
+      <input type="number" name="attr_cutererollmod" style="width: 43px;">+Cute Reroll&nbsp;&nbsp;
+      <input type="number" name="attr_spookrerollmod" style="width: 43px;">+Spook Reroll</div></p>
+  
+  <p><div class="bellylostmod">
+      <input type="number" name="attr_bellylostmod" style="width: 43px;">{WORK IN PROGRESS} Custom Belly Lost</div></p>
+      
+  <p><div class="stamtaxinstantmod">
       <input type="number" name="attr_stamtaxinstantmod" style="width: 43px;">+Stamina Tax</div>
   <div class="stamtaxmod">
       <input type="number" name="attr_stamtaxmod" style="width: 43px;">+Stamina Tax (upon clicking "Start Turn")</div>
   <div class="stamtaxtax">
-      <input type="number" name="attr_stamtaxtax" style="width: 43px;">+Stamina Tax (upon clicking "Attack")</div>
-  <div class="bellylostmod">
-      <input type="number" name="attr_bellylostmod" style="width: 43px;">{WORK IN PROGRESS} Custom Belly Lost</div>
-  <div class="stamattackmod">
+      <input type="number" name="attr_stamtaxtax" style="width: 43px;">+Stamina Tax (upon clicking "Attack")</div></p>
+      
+  <p><div class="stamattackmod">
       <input type="number" name="attr_stamattackmod" style="width: 43px;">+Stamina Cost (Attack)</div>
   <div class="stamparrymod">
       <input type="number" name="attr_stamparrymod" style="width: 43px;">+Stamina Cost (Parry)</div>
   <div class="stamdodgemod">
       <input type="number" name="attr_stamdodgemod" style="width: 43px;">+Stamina Cost (Dodge)</div>
   <div class="stamgrapplemod">
-      <input type="number" name="attr_stamgrapplemod" style="width: 43px;">+Stamina Cost (Grapple)</div>
+      <input type="number" name="attr_stamgrapplemod" style="width: 43px;">+Stamina Cost (Grapple)</div></p>
+      
+<p><div class="mtoggle">
+    Have Melee Attacks use:
+      <input type="radio" name="attr_meleeradio" value="1" style="width: 13px;" checked>Might&nbsp;&nbsp;
+      <input type="radio" name="attr_meleeradio" value="2" style="width: 13px;">Grace&nbsp;&nbsp;
+      <input type="radio" name="attr_meleeradio" value="3" style="width: 13px;">Insight</div></p>
+
+<p><div class="rtoggle">
+    Have Ranged Attacks use:
+      <input type="radio" name="attr_rangedradio" value="1" style="width: 13px;">Might&nbsp;&nbsp;
+      <input type="radio" name="attr_rangedradio" value="2" style="width: 13px;" checked>Grace&nbsp;&nbsp;
+      <input type="radio" name="attr_rangedradio" value="3" style="width: 13px;">Insight</div></p>
+
+  <p><div class="grapplerollmod">
+      <input type="number" name="attr_grapplerollmod" style="width: 43px;">+Grapple&nbsp;&nbsp;
+      <input type="number" name="attr_grapplererollmod" style="width: 43px;">+Grapple Reroll</div>
+  <div class="grapplearms">
+      <input type="number" name="attr_grapplearms" min="0" max="2" style="width: 43px;">Additional Arms for Grappling (beyond the first)</div></p>
+
+<p><div class="attackbuff">
+      <input type="number" name="attr_attackbuff" style="width: 43px;">+Attack Dice&nbsp;&nbsp;
+      <input type="number" name="attr_attackrerollbuff" style="width: 43px;">+Attack Reroll</div>
   <div class="mightattackmod">
-      <input type="number" name="attr_mightattackmod" style="width: 43px;">{WORK IN PROGRESS} +Attack Dice (Might)</div>
+      <input type="number" name="attr_mightattackmod" style="width: 43px;">+Attack Dice (Might)&nbsp;&nbsp;
+      <input type="number" name="attr_mightattackrerollmod" style="width: 43px;">+Attack Reroll (Might)</div>
   <div class="graceattackmod">
-      <input type="number" name="attr_graceattackmod" style="width: 43px;">{WORK IN PROGRESS} +Attack Dice (Grace)</div>
-  <div class="attackbuff">
-      <input type="number" name="attr_attackbuff" style="width: 43px;">+Attack Dice</div>
+      <input type="number" name="attr_graceattackmod" style="width: 43px;">+Attack Dice (Grace)&nbsp;&nbsp;
+      <input type="number" name="attr_graceattackrerollmod" style="width: 43px;">+Attack Reroll (Grace)</div>
+  <div class="insightattackmod">
+      <input type="number" name="attr_insightattackmod" style="width: 43px;">+Attack Dice (Insight)&nbsp;&nbsp;
+      <input type="number" name="attr_insightattackrerollmod" style="width: 43px;">+Attack Reroll (Insight)</div>
   <div class="dodgebuff">
-      <input type="number" name="attr_dodgebuff" style="width: 43px;">+Dodge Dice</div>
+      <input type="number" name="attr_dodgebuff" style="width: 43px;">+Dodge Dice&nbsp;&nbsp;
+      <input type="number" name="attr_dodgererollbuff" style="width: 43px;">+Dodge Reroll</div>
   <div class="parrybuff">
-      <input type="number" name="attr_parrybuff" style="width: 43px;">+Parry Dice</div>
-  <div class="damredbuff">
+      <input type="number" name="attr_parrybuff" style="width: 43px;">+Parry Dice&nbsp;&nbsp;
+      <input type="number" name="attr_parryrerollbuff" style="width: 43px;">+Parry Reroll</div>
+  <div class="parryweaponbuff">
+      <input type="number" name="attr_parryweaponbuff" style="width: 43px;">+Parry Dice (Weapon Specific)&nbsp;&nbsp;
+      <input type="number" name="attr_parryweaponrerollbuff" style="width: 43px;">+Parry Reroll (Weapon Specific)</div>
+  <div class="parryshieldbuff">
+      <input type="number" name="attr_parryshieldbuff" style="width: 43px;">+Parry Dice (Shield Specific)&nbsp;&nbsp;
+      <input type="number" name="attr_parryshieldrerollbuff" style="width: 43px;">+Parry Reroll (Shield Specific)</div></p>
+  
+  <p><div class="shieldbashradio">
+      Apply "Balanced Modifier" to:
+      <input type="checkbox" name="attr_shieldbashradio1" value="1" style="width: 10px;" unchecked>Shield Slot 1&nbsp;&nbsp;
+      <input type="checkbox" name="attr_shieldbashradio2" value="1" style="width: 10px;" unchecked>Shield Slot 2&nbsp;&nbsp;
+      <input type="checkbox" name="attr_shieldbashradio3" value="1" style="width: 10px;" unchecked>Shield Slot 3&nbsp;&nbsp;
+      <input type="checkbox" name="attr_shieldbashradio4" value="1" style="width: 10px;" unchecked>Shield Slot 4&nbsp;&nbsp;
+      <input type="checkbox" name="attr_shieldbashradio5" value="1" style="width: 10px;" unchecked>Shield Slot 5</div>
+
+  <div class="shieldqtybonus">
+      Bonus Shield Quality Upgrades and modifiers (input the shield's base quality in page 1's "Weapons & Shields"):
+      <input type="number" name="attr_shieldqtybonus1" style="width: 43px;">Shield Slot 1&nbsp;&nbsp;
+      <input type="number" name="attr_shieldqtybonus2" style="width: 43px;">Shield Slot 2&nbsp;&nbsp;
+      <input type="number" name="attr_shieldqtybonus3" style="width: 43px;">Shield Slot 3&nbsp;&nbsp;
+      <input type="number" name="attr_shieldqtybonus4" style="width: 43px;">Shield Slot 4&nbsp;&nbsp;
+      <input type="number" name="attr_shieldqtybonus5" style="width: 43px;">Shield Slot 5</div></p>
+
+  <p><div class="damredbuff">
       <input type="number" name="attr_damredbuff" style="width: 43px;">+Damage Reduction</div>
   <div class="damriskbuff">
-      <input type="number" name="attr_damriskbuff" style="width: 43px;">+Damage Risk</div>
-  <div class="mightcheckbuff">
-      <input type="number" name="attr_mightcheckbuff" style="width: 43px;">+Might Based Rolls</div>
+      <input type="number" name="attr_damriskbuff" style="width: 43px;">+Damage Risk</div></p>
+      
+  <p><div class="mightcheckbuff">
+      <input type="number" name="attr_mightcheckbuff" style="width: 43px;">+Might Based Rolls&nbsp;&nbsp;
+      <input type="number" name="attr_mightrerollmod" style="width: 43px;">+Might Reroll</div>
   <div class="shellcheckbuff">
-      <input type="number" name="attr_shellcheckbuff" style="width: 43px;">+Shell Based Rolls</div>
+      <input type="number" name="attr_shellcheckbuff" style="width: 43px;">+Shell Based Rolls&nbsp;&nbsp;
+      <input type="number" name="attr_shellrerollmod" style="width: 43px;">+Shell Reroll</div>
   <div class="insightcheckbuff">
-      <input type="number" name="attr_insightcheckbuff" style="width: 43px;">+Insight Based Rolls</div>
+      <input type="number" name="attr_insightcheckbuff" style="width: 43px;">+Insight Based Rolls&nbsp;&nbsp;
+      <input type="number" name="attr_insightrerollmod" style="width: 43px;">+Insight Reroll</div>
   <div class="gracecheckbuff">
-      <input type="number" name="attr_gracecheckbuff" style="width: 43px;">+Grace Based Rolls</div>
-  <div class="setsuccessattack">
+      <input type="number" name="attr_gracecheckbuff" style="width: 43px;">+Grace Based Rolls&nbsp;&nbsp;
+      <input type="number" name="attr_gracererollmod" style="width: 43px;">+Grace Reroll</div></p>
+      
+  <p><div class="setsuccessattack">
       <input type="number" name="attr_setsuccessattack" value="5" min="1" max="6" style="width: 43px;">Threadshold for Success (Attack)</div>
   <div class="setsuccessparry">
       <input type="number" name="attr_setsuccessparry" value="5" min="1" max="6" style="width: 43px;">Threadshold for Success (Parry)</div>
   <div class="setsuccessdodge">
       <input type="number" name="attr_setsuccessdodge" value="5" min="1" max="6" style="width: 43px;">Threadshold for Success (Dodge)</div>
+  <div class="setsuccesssoak">
+      <input type="number" name="attr_setsuccesssoak" value="5" min="1" max="6" style="width: 43px;">Threadshold for Success (Soak)</div></p>
 
 
 </div>
@@ -109,34 +183,31 @@ on(`sheet:opened`, function() {
 <div class="container">
 
 <div class="image">
-    <img src="https://i.imgur.com/Y52CMuO.png" alt="sheet"></div>
-  
-  <div class="testest">
-      <input type="number" name="attr_geo" style="width: 73px;"></div>
+    <img src="https://i.imgur.com/D9oBFIW.png" alt="sheet"></div>
   
   <div class="might">
-      <input type="number" name="attr_might" value="3" min="0" step="0.5" style="width: 43px;"></div>  
+      <input type="text" name="attr_might" value="3" min="0" step="0.5" style="width: 33px;"></div>  
 
   <div class="might-mod">
-      <input type="number" name="attr_mightmod" min="0" style="width: 33px;"></div> 
+      <input type="text" name="attr_mightmod" min="0" style="width: 33px;"></div> 
   
   <div class="insight">
-      <input type="number" name="attr_insight" value="3" min="0" step="0.5" style="width: 43px;"></div>  
+      <input type="text" name="attr_insight" value="3" min="0" step="0.5" style="width: 33px;"></div>  
 
   <div class="insight-mod">
-      <input type="number" name="attr_insightmod" min="0" style="width: 33px;"></div> 
+      <input type="text" name="attr_insightmod" min="0" style="width: 33px;"></div> 
   
   <div class="shell">
-      <input type="number" name="attr_shell" value="3" min="0" step="0.5" style="width: 43px;"></div>  
+      <input type="text" name="attr_shell" value="3" min="0" step="0.5" style="width: 33px;"></div>  
   
   <div class="shell-mod">
-      <input type="number" name="attr_shellmod" min="0" style="width: 33px;"></div>   
+      <input type="text" name="attr_shellmod" min="0" style="width: 33px;"></div>   
   
   <div class="grace">
-      <input type="number" name="attr_grace" value="3" min="0" step="0.5" style="width: 43px;"></div>
+      <input type="text" name="attr_grace" value="3" min="0" step="0.5" style="width: 33px;"></div>
 
   <div class="grace-mod">
-      <input type="number" name="attr_gracemod" min="0" style="width: 33px;"></div> 
+      <input type="text" name="attr_gracemod" min="0" style="width: 33px;"></div> 
       
   <div class="grapplefinal">
       <input type="text" name="attr_grapplefinal" min="0" step="0.5" style="width: 34px;" readonly></div>
@@ -200,15 +271,15 @@ on(`sheet:opened`, function() {
       <input type="text" name="attr_eqmnt10load" style="width: 27px;"></div>
 
   <div class="result1">
-      <input type="number" name="attr_result1" step="0.5" style="width: 43px;" readonly></div>
+      <input type="text" name="attr_result1" step="0.5" style="width: 43px;" readonly></div>
   <div class="result2">
-      <input type="number" name="attr_result2" step="0.5" style="width: 43px;" readonly></div>  
+      <input type="text" name="attr_result2" step="0.5" style="width: 43px;" readonly></div>  
   <div class="result3">
-      <input type="number" name="attr_result3" step="0.5" style="width: 43px;" readonly></div>  
+      <input type="text" name="attr_result3" step="0.5" style="width: 43px;" readonly></div>  
   <div class="result4">
-      <input type="number" name="attr_result4" step="0.5" style="width: 43px;" readonly></div>  
+      <input type="text" name="attr_result4" step="0.5" style="width: 43px;" readonly></div>  
   <div class="result5">
-      <input type="number" name="attr_result5" step="0.5" style="width: 43px;" readonly></div>  
+      <input type="text" name="attr_result5" step="0.5" style="width: 43px;" readonly></div>  
 
   
   <div class="weapon1">
@@ -220,73 +291,80 @@ on(`sheet:opened`, function() {
   <div class="weapon4">
       <input type="text" name="attr_weapon4"></div>
   <div class="weapon5">
-      <input type="text" name="attr_weapon5" value="Unarmed Strike"></div>
+      <input type="text" name="attr_weapon5"></div>
 
 
   <div class="bulk1">
-      <input type="number" name="attr_bulk1" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_bulk1" min="0" style="width: 33px;"></div>
   <div class="bulk2">
-      <input type="number" name="attr_bulk2" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_bulk2" min="0" style="width: 33px;"></div>
   <div class="bulk3">
-      <input type="number" name="attr_bulk3" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_bulk3" min="0" style="width: 33px;"></div>
   <div class="bulk4">
-      <input type="number" name="attr_bulk4" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_bulk4" min="0" style="width: 33px;"></div>
   <div class="bulk5">
-      <input type="number" name="attr_bulk5" min="0" style="width: 33px;" value="0"></div>
+      <input type="text" name="attr_bulk5" min="0" style="width: 33px;"></div>
 
       
   <div class="dmg1">
-      <input type="number" name="attr_dmg1" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_dmg1" min="0" style="width: 33px;"></div>
   <div class="dmg2">
-      <input type="number" name="attr_dmg2" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_dmg2" min="0" style="width: 33px;"></div>
   <div class="dmg3">
-      <input type="number" name="attr_dmg3" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_dmg3" min="0" style="width: 33px;"></div>
   <div class="dmg4">
-      <input type="number" name="attr_dmg4" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_dmg4" min="0" style="width: 33px;"></div>
   <div class="dmg5">
-      <input type="number" name="attr_dmg5" min="0" style="width: 33px;" value="1"></div>
+      <input type="text" name="attr_dmg5" min="0" style="width: 33px;"></div>
 
 
   <div class="rng1">
-      <input type="number" name="attr_rng1" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_rng1" min="0" style="width: 33px;"></div>
   <div class="rng2">
-      <input type="number" name="attr_rng2" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_rng2" min="0" style="width: 33px;"></div>
   <div class="rng3">
-      <input type="number" name="attr_rng3" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_rng3" min="0" style="width: 33px;"></div>
   <div class="rng4">
-      <input type="number" name="attr_rng4" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_rng4" min="0" style="width: 33px;"></div>
   <div class="rng5">
-      <input type="number" name="attr_rng5" min="0" style="width: 33px;" value="1"></div>
+      <input type="text" name="attr_rng5" min="0" style="width: 33px;"></div>
 
   
   <div class="qty1">
-      <input type="number" name="attr_qty1" min="-1" style="width: 33px;"></div>
+      <input type="text" name="attr_qty1" min="-1" style="width: 33px;"></div>
   <div class="qty2">
-      <input type="number" name="attr_qty2" min="-1" style="width: 33px;"></div>
+      <input type="text" name="attr_qty2" min="-1" style="width: 33px;"></div>
   <div class="qty3">
-      <input type="number" name="attr_qty3" min="-1" style="width: 33px;"></div>
+      <input type="text" name="attr_qty3" min="-1" style="width: 33px;"></div>
   <div class="qty4">
-      <input type="number" name="attr_qty4" min="-1" style="width: 33px;"></div>
+      <input type="text" name="attr_qty4" min="-1" style="width: 33px;"></div>
   <div class="qty5">
-      <input type="number" name="attr_qty5" min="-1" style="width: 33px;" value="1"></div>
+      <input type="text" name="attr_qty5" min="-1" style="width: 33px;"></div>
 
 <div class="bulka">
-      <input type="number" name="attr_bulka" style="width: 33px;"></div>
+      <input type="text" name="attr_bulka" style="width: 25px;"></div>
 <div class="armname">
       <input type="text" name="attr_armname"></div>
-
+<div class="armdur">
+      <input type="text" name="attr_armdur" min="0" style="width: 30px;"></div>
+<div class="armdurmax">
+      <input type="text" name="attr_armdurmax" min="0" style="width: 30px;"></div>
 <div class="dr">
-      <input type="number" name="attr_dr" style="width: 33px;"></div>  
+      <input type="text" name="attr_dr" style="width: 25px;"></div>  
+<div class="armsoak">
+      <input type="text" name="attr_armsoak" style="width: 26px;"></div>
+<div class="armsoakreroll">
+      <input type="text" name="attr_armsoakreroll" style="width: 26px;"></div>
 
   <div class="bulktotal">
       <input type="text" name="attr_bulktotal" min="0" style="width: 33px;"></div>
 
   <div class="load">
-      <input type="number" name="attr_load" min="0" style="width: 33px;" readonly></div>
+      <input type="text" name="attr_load" min="0" style="width: 33px;" readonly></div>
 
  <div class="toggle">
-      <input type="radio" name="attr_toggle" value="1"/>Might&nbsp;&nbsp;
-      <input type="radio" name="attr_toggle" value="2" checked/>Grace</div>
+      <input type="radio" name="attr_toggle" value="1" checked/>Melee&nbsp;&nbsp;
+      <input type="radio" name="attr_toggle" value="2"/>Ranged</div>
 
  <div class="equipped">
       <input type="radio" name="attr_atkequip" value="1" checked/>Atk.&nbsp;&nbsp;
@@ -333,7 +411,7 @@ on(`sheet:opened`, function() {
       <input type="number" name="attr_atkboxcovered" min="0" max="0.75" step="0.25" style="width: 50px;"></div>
 
  <div class="dmgboxhit">
-      <input type="number" name="attr_dmgboxhit" min="0" style="width: 34px;"></div>
+      <input type="text" name="attr_dmgboxhit" min="0" style="width: 34px;"></div>
 
 <div class="atkboxgrapple">
     <input type="checkbox" name="attr_atkboxgrapple" value="1" unchecked></div>
@@ -347,7 +425,7 @@ on(`sheet:opened`, function() {
     <input type="checkbox" name="attr_atkboxunseen" value="1" unchecked></div>
 
 <div class="defboxbulk">
-    <input type="number" name="attr_defboxbulk" min="0" style="width: 34px;"></div>
+    <input type="text" name="attr_defboxbulk" min="0" style="width: 34px;"></div>
 
 <div class="defboxgrapple">
     <input type="checkbox" name="attr_defboxgrapple" value="1" unchecked></div>
@@ -364,10 +442,12 @@ on(`sheet:opened`, function() {
     <input type="checkbox" name="attr_softbody" value="1" unchecked></div>
     
 <div class="absorption">
-      <input type="number" name="attr_absorption" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_absorption" min="0" style="width: 23px;"></div>
+<div class="absorptiondur">
+      <input type="text" name="attr_absorptiondur" style="width: 23px;"></div>
 
 <div class="drisk">
-      <input type="number" name="attr_drisk" min="0" style="width: 36px;"></div>
+      <input type="text" name="attr_drisk" min="0" style="width: 36px;"></div>
 
  <div class="magicsoak">
       <input type="radio" name="attr_resistradio" value="0" checked/>Normal&nbsp;&nbsp;
@@ -377,18 +457,23 @@ on(`sheet:opened`, function() {
   <div class="stamtax">
       <input type="text" name="attr_stamtax" min="0" style="width: 33px;" readonly></div>
   <div class="offbal">
-      <input type="number" name="attr_offbal" min="0" max="3" style="width: 33px;"></div>
+      <input type="text" name="attr_offbal" min="0" max="3" style="width: 33px;"></div>
   <div class="dot1">
-      <input type="number" name="attr_dot1" min="0" style="width: 33px;"></div> 
+      <input type="text" name="attr_dot1" min="0" style="width: 33px;"></div> 
   <div class="dot2">
-      <input type="number" name="attr_dot2" min="0" style="width: 33px;"></div> 
+      <input type="text" name="attr_dot2" min="0" style="width: 33px;"></div> 
   <div class="dot3">
-      <input type="number" name="attr_dot3" min="0" style="width: 33px;"></div>
+      <input type="text" name="attr_dot3" min="0" style="width: 33px;"></div>
   <div class="paral">
-      <input type="number" name="attr_paral" min="0" max="20" style="width: 43px;"></div> 
+      <input type="text" name="attr_paral" min="0" max="20" style="width: 43px;"></div> 
+  <div class="se1">
+      <input type="text" name="attr_se1" min="0" max="30" style="width: 33px;"></div> 
+  <div class="se2">
+      <input type="text" name="attr_se2" min="0" max="30" style="width: 33px;"></div> 
+  <div class="se3">
+      <input type="text" name="attr_se3" min="0" max="30" style="width: 33px;"></div> 
+
 
-  <div class="armdur">
-      <input type="text" name="attr_armdur" min="0" style="width: 42px;"></div> 
   <div class="heart">
       <input type="text" name="attr_heart" min="0" style="width: 46px; font-size:30px;"></div>
   <div class="heartmax">
@@ -439,7 +524,7 @@ on(`sheet:opened`, function() {
   <div class="spook">
       <input type="text" name="attr_spook" min="0" style="width: 33px;"></div>
   <div class="belt">
-      <input type="text" name="attr_shelltotal" min="0" style="width: 33px;" readonly></div>
+      <input type="text" name="attr_belt" min="0" style="width: 33px;" readonly></div>
   <div class="speedmax">
       <input type="text" name="attr_speedmax" min="0" style="width: 33px;"></div>
   <div class="speed">
@@ -456,6 +541,9 @@ on(`sheet:opened`, function() {
 
 <div class="turn">
     <button type="action" name="act_turn">Start Turn</button></div>
+    
+<div class="endturn">
+    <button type="action" name="act_endturn">End Turn</button></div>
 
 <div class="grapple">
       <button type="action" name="act_grapple">Grapple!</button></div>
@@ -466,12 +554,12 @@ on(`sheet:opened`, function() {
 <div class="parry">
       <button type="action" name="act_parry">Parry!</button></div>
 <div class="parrytotal">
-    <input type="number" name="attr_parrytotal" min="0" style="width: 43px;" readonly></div>
+    <input type="text" name="attr_parrytotal" min="0" style="width: 43px;" readonly></div>
 
 <div class="dodge">
       <button type="action" name="act_dodge">Dodge!</button></div>
 <div class="dodgetotal">
-    <input type="number" name="attr_dodgetotal" min="0" style="width: 43px;" readonly></div>
+    <input type="text" name="attr_dodgetotal" min="0" style="width: 43px;" readonly></div>
       
 <div class="calcdmg">
       <button type="action" name="act_calcdmg">Calculate Damage</button></div>
@@ -659,8 +747,9 @@ on(`sheet:opened`, function() {
 <script type="text/worker">
 
     on('clicked:attack', (info) => {
-          getAttrs(["result","resultreroll","dedsta","stam","stamtemp","atkboxpaired","atkboxopportunity","stamtax","stamtaxtax","stamattackmod","setsuccessattack"], function(values) {
-        let atkboxopportunity = parseInt(values.atkboxopportunity)||0;        
+          getAttrs(["result","resultreroll","dedsta","stam","stamtemp","atkboxpaired","atkboxopportunity","stamtax","stamtaxtax","stamattackmod","setsuccessattack","wpntype"], function(values) {
+        let atkboxopportunity = parseInt(values.atkboxopportunity)||0;
+        let wpntype = parseInt(values.wpntype)||0;
         let dedsta = parseInt(values.dedsta)||0;
         let stamattackmod = parseInt(values.stamattackmod)||0;
         let stam = parseInt(values.stam)||0;
@@ -673,8 +762,8 @@ on(`sheet:opened`, function() {
         let spentstam = dedsta + 1 + stamtax + stamattackmod - paired;
         if(spentstam <= stamtotal) {
             let rollString = "&{template:attack} {{name=Attack}} {{rollattack=[[[[floor(@{result})]]d6s>@{setsuccessattack}]]}}";
-            if(values.resultreroll == "1") {
-                rollString += "{{rollattackr1=[[1d6>5]]}}";
+            if(values.resultreroll >= "1") {
+                rollString += "{{rollattackr1=[[@{resultreroll}d6>@{setsuccessattack}]]}}";
             } else {
             // this else branch is just to make the later code easier. In your roll temmplate you'd only display it if it has a value > 0
                 rollString += "{{rollattackr1=[[0]]}}";
@@ -683,7 +772,8 @@ on(`sheet:opened`, function() {
                 const result = parseInt(values.result)||0;
                 const roll = results.results.rollattack.result;
                 const reroll_calculated = results.results.rollattackr1.result;
-                const reroll = (roll != result) ? reroll_calculated : 0;
+                const rerollmin = (result - roll <= 0) ? 0 : result - roll;
+                const reroll = (rerollmin - reroll_calculated <= 0) ? rerollmin : reroll_calculated;
                 const total = roll + reroll;
             finishRoll(results.rollId, {
                 rollattack: total
@@ -718,6 +808,12 @@ on(`sheet:opened`, function() {
                 "stam": stam - spentstam
             });  
         }
+        setAttrs({
+            "dedstafloating": dedsta
+        });
+        setAttrs({
+            "wpntypefloating": wpntype
+        });
         setAttrs({
             "dedsta": 0
         });
@@ -739,7 +835,7 @@ on(`sheet:opened`, function() {
 });
 
     on('clicked:grapple', (info) => {
-          getAttrs(["grapplefinal","resultrerollgrapple","dedsta","stam","stamtemp","atkboxpaired","atkboxopportunity","stamtax","stamtaxtax","grappletoggle","stamgrapplemod"], function(values) {
+          getAttrs(["grapplefinal","resultrerollgrapple","dedsta","stam","stamtemp","atkboxpaired","atkboxopportunity","stamtax","stamtaxtax","grappletoggle","stamgrapplemod","setsuccessattack"], function(values) {
         let atkboxopportunity = parseInt(values.atkboxopportunity)||0;
         let grappletoggle = parseInt(values.grappletoggle)||0;
         let stamgrapplemod = parseInt(values.stamgrapplemod)||0;
@@ -753,9 +849,9 @@ on(`sheet:opened`, function() {
         let stamtotal = stam + stamtemp;
         let spentstam = (grappletoggle == 1) ? dedsta + 1 + stamtax + stamgrapplemod - paired : dedsta;
         if(spentstam <= stamtotal && grappletoggle == "1") {
-            let rollString = "&{template:grapple} {{name=Grapple}} {{rollgrapple=[[[[floor(@{grapplefinal})]]d6s>5]]}}";
-            if(values.resultrerollgrapple == "1") {
-                rollString += "{{rollgrappler1=[[1d6>5]]}}";
+            let rollString = "&{template:grapple} {{name=Grapple}} {{rollgrapple=[[[[floor(@{grapplefinal})]]d6s>@{setsuccessattack}]]}}";
+            if(values.resultrerollgrapple >= "1") {
+                rollString += "{{rollgrappler1=[[@{resultrerollgrapple}d6>@{setsuccessattack}]]}}";
             } else {
             // this else branch is just to make the later code easier. In your roll temmplate you'd only display it if it has a value > 0
                 rollString += "{{rollgrappler1=[[0]]}}";
@@ -764,7 +860,8 @@ on(`sheet:opened`, function() {
                 const result = parseInt(values.grapplefinal)||0;
                 const roll = results.results.rollgrapple.result;
                 const reroll_calculated = results.results.rollgrappler1.result;
-                const reroll = (roll != result) ? reroll_calculated : 0;
+                const rerollmin = (result - roll <= 0) ? 0 : result - roll;
+                const reroll = (rerollmin - reroll_calculated <= 0) ? rerollmin : reroll_calculated;
                 const total = roll + reroll;
             finishRoll(results.rollId, {
                 rollgrapple: total
@@ -810,9 +907,9 @@ on(`sheet:opened`, function() {
         });
         }
     if (spentstam <= stamtotal && grappletoggle == "2") {
-            let rollString = "&{template:grapple} {{name=Grapple}} {{rollgrapple=[[[[floor(@{grapplefinal})]]d6s>5]]}}";
-            if(values.resultrerollgrapple == "1") {
-                rollString += "{{rollgrappler1=[[1d6>5]]}}";
+            let rollString = "&{template:grapple} {{name=Grapple}} {{rollgrapple=[[[[floor(@{grapplefinal})]]d6s>@{setsuccessattack}]]}}";
+            if(values.resultrerollgrapple >= "1") {
+                rollString += "{{rollgrappler1=[[@{resultrerollgrapple}d6>@{setsuccessattack}]]}}";
             } else {
             // this else branch is just to make the later code easier. In your roll temmplate you'd only display it if it has a value > 0
                 rollString += "{{rollgrappler1=[[0]]}}";
@@ -821,7 +918,8 @@ on(`sheet:opened`, function() {
                 const result = parseInt(values.grapplefinal)||0;
                 const roll = results.results.rollgrapple.result;
                 const reroll_calculated = results.results.rollgrappler1.result;
-                const reroll = (roll != result) ? reroll_calculated : 0;
+                const rerollmin = (result - roll <= 0) ? 0 : result - roll;
+                const reroll = (rerollmin - reroll_calculated <= 0) ? rerollmin : reroll_calculated;
                 const total = roll + reroll;
             finishRoll(results.rollId, {
                 rollgrapple: total
@@ -856,7 +954,7 @@ on(`sheet:opened`, function() {
 });
 
     on('clicked:dodge', (info) => {
-          getAttrs(["dodgetotal","gracereroll","dedsta","stam","stamtemp","offbal","defboxmove","bulkcheck","stamdodgemod","setsuccessdodge"], function(values) {
+          getAttrs(["dodgetotal","gracereroll","dedsta","stam","stamtemp","offbal","defboxmove","bulkcheck","stamdodgemod","setsuccessdodge","dodgereroll"], function(values) {
         let dedsta = parseInt(values.dedsta)||0;
         let stamdodgemod = parseInt(values.stamdodgemod)||0;
         let stam = parseInt(values.stam)||0;
@@ -868,8 +966,8 @@ on(`sheet:opened`, function() {
         let spentstam = dedsta + 1 + bulkcheck + stamdodgemod;
         if(spentstam <= stamtotal) {
             let rollString = "&{template:dodge} {{name=Dodge}} {{rolldodge=[[[[floor(@{dodgetotal})]]d6s>@{setsuccessdodge}]]}}";
-            if(values.gracereroll == "1") {
-                rollString += "{{rolldodger1=[[1d6>5]]}}";
+            if(values.dodgereroll >= "1") {
+                rollString += "{{rolldodger1=[[@{dodgereroll}d6>@{setsuccessdodge}]]}}";
             } else {
             // this else branch is just to make the later code easier. In your roll temmplate you'd only display it if it has a value > 0
                 rollString += "{{rolldodger1=[[0]]}}";
@@ -878,7 +976,8 @@ on(`sheet:opened`, function() {
             const dodgetotal = parseInt(values.dodgetotal)||0;
             const roll = results.results.rolldodge.result;
             const reroll_calculated = results.results.rolldodger1.result;
-            const reroll = (roll != dodgetotal) ? reroll_calculated : 0;
+            const rerollmin = (dodgetotal - roll <= 0) ? 0 : dodgetotal - roll;
+            const reroll = (rerollmin - reroll_calculated <= 0) ? rerollmin : reroll_calculated;
             const total = roll + reroll;
             finishRoll(results.rollId, {
                 rolldodge: total
@@ -932,8 +1031,18 @@ on(`sheet:opened`, function() {
     });
 });
 
+on("change:gracereroll change:dodgererollbuff sheet:opened", function() {  
+  getAttrs(["gracereroll","dodgererollbuff"], function(values) {
+    let gracereroll = parseFloat(values.gracereroll)||0;
+    let dodgererollbuff = parseInt(values.dodgererollbuff)||0;
+    setAttrs({
+        "dodgereroll": gracereroll + dodgererollbuff
+    });
+  });
+});
+
     on('clicked:parry', (info) => {
-          getAttrs(["parrytotal","mightreroll","dedsta","stam","stamtemp","bulkcheck","stamparrymod","setsuccessparry"], function(values) {
+          getAttrs(["parrytotal","mightreroll","dedsta","stam","stamtemp","bulkcheck","stamparrymod","setsuccessparry","parryreroll"], function(values) {
         let dedsta = parseInt(values.dedsta)||0;
         let stamparrymod = parseInt(values.stamparrymod)||0;
         let stam = parseInt(values.stam)||0;
@@ -943,8 +1052,8 @@ on(`sheet:opened`, function() {
         let spentstam = dedsta + 1 + bulkcheck + stamparrymod;
         if(spentstam <= stamtotal) {
             let rollString = "&{template:parry} {{name=Parry}} {{rollparry=[[[[floor(@{parrytotal})]]d6s>@{setsuccessparry}]]}}";
-            if(values.mightreroll == "1") {
-                rollString += "{{rollparryr1=[[1d6>5]]}}";
+            if(values.parryreroll >= "1") {
+                rollString += "{{rollparryr1=[[@{parryreroll}d6>@{setsuccessparry}]]}}";
             } else {
             // this else branch is just to make the later code easier. In your roll temmplate you'd only display it if it has a value > 0
                 rollString += "{{rollparryr1=[[0]]}}";
@@ -953,7 +1062,8 @@ on(`sheet:opened`, function() {
             const parrytotal = parseInt(values.parrytotal)||0;
             const roll = results.results.rollparry.result;
             const reroll_calculated = results.results.rollparryr1.result;
-            const reroll = (roll != parrytotal) ? reroll_calculated : 0;
+            const rerollmin = (parrytotal - roll <= 0) ? 0 : parrytotal - roll;
+            const reroll = (rerollmin - reroll_calculated <= 0) ? rerollmin : reroll_calculated;
             const total = roll + reroll;
             finishRoll(results.rollId, {
                 rollparry: total
@@ -999,15 +1109,56 @@ on(`sheet:opened`, function() {
     });
 });
 
+on("change:mightreroll change:parryrerollbuff change:parrytype change:parryweaponrerollbuff change:parryshieldrerollbuff sheet:opened", function() {  
+  getAttrs(["mightreroll","parryrerollbuff","parrytype","parryweaponrerollbuff","parryshieldrerollbuff"], function(values) {
+    let mightreroll = parseFloat(values.mightreroll)||0;
+    let parryrerollbuff = parseInt(values.parryrerollbuff)||0;
+    let parrytype = parseInt(values.parrytype)||0;
+    let parryweaponrerollbuff = parseInt(values.parryweaponrerollbuff)||0;
+    let parryshieldrerollbuff = parseInt(values.parryshieldrerollbuff)||0;
+    let parryrerollequipbuff = (parrytype == "1") ? parryweaponrerollbuff : parryshieldrerollbuff;
+    setAttrs({
+        "parryreroll": mightreroll + parryrerollbuff + parryrerollequipbuff
+    });
+  });
+});
+
+on("change:grapplefinal change:grapplererollmod sheet:opened", function() {  
+  getAttrs(["grapplefinal","grapplererollmod"], function(values) {
+    let recheck = parseFloat(values.grapplefinal)||0;
+    let grapplererollmod = parseInt(values.grapplererollmod)||0;
+    let resultreroll = recheck - Math.floor(recheck);
+    if(resultreroll == "0") {
+        setAttrs({
+            "resultrerollgrapple": 0 + grapplererollmod
+        });}
+    if(resultreroll == "0.5") {
+        setAttrs({
+            "resultrerollgrapple": 1 + grapplererollmod
+    });}
+  });
+});
+
 on("change:dmgboxhit sheet:opened", function() {  
-  getAttrs(["dmgboxhit","dmgcrt"], function(values) {
+  getAttrs(["dmgboxhit","dmgcrt","dedstafloating","wpntypefloating","shieldbashcrt"], function(values) {
     let dmgboxhit = parseInt(values.dmgboxhit)||0;
     let dmgcrt = parseInt(values.dmgcrt)||0;
+    let dedsta = parseInt(values.dedstafloating)||0;
+    let wpntype = parseInt(values.wpntypefloating)||0;
+    let shieldbashcrt = parseInt(values.shieldbashcrt)||0;
+    let rollovercap = (dedsta >= dmgcrt) ? dedsta : dmgcrt;
     let rollover = dmgboxhit - 1;
-    const output = {}; // create the output variable to contain the final values.
-    output.damageriskz = (dmgboxhit == 0) ? 0 : 1;
-    output.damagerisk = ((dmgcrt >= rollover) && (dmgboxhit != 0)) ? rollover + dmgcrt : dmgcrt * 2;
-    setAttrs(output);
+    let damageriskwpn = ((rollovercap >= rollover) && (dmgboxhit != 0)) ? rollover + dmgcrt : dmgcrt + rollovercap;
+    let damageriskshield1 = ((rollovercap >= rollover) && (dmgboxhit != 0)) ? rollover + dmgcrt : dmgcrt + rollovercap;
+    let damageriskshield2 = (shieldbashcrt == 0) ? dmgcrt : damageriskshield1;
+    let damageriskz = (dmgboxhit == 0) ? 0 : 1;
+    let damagerisk = (wpntype == 1) ? damageriskwpn : damageriskshield2;
+    setAttrs({
+        "damageriskz": damageriskz
+    });
+    setAttrs({
+        "damagerisk": damagerisk
+    });
   });
 });
 
@@ -1046,10 +1197,10 @@ on("change:initmod change:gracetotal sheet:opened", function() {
 });
 
     on('clicked:init', (info) => {
-          getAttrs(["inittotal","gracereroll"], function(values) {
+          getAttrs(["inittotal","initreroll","gracereroll"], function(values) {
             let rollString = "&{template:init} {{name=Test}} {{rollinit=[[[[@{inittotal}]]d6s &{tracker}]]}}";
-            if(values.gracereroll == "1") {
-                rollString += "{{rollinitreroll=[[1d6]]}}";
+            if(values.initreroll >= "1") {
+                rollString += "{{rollinitreroll=[[@{initreroll}d6]]}}";
             } else {
             // this else branch is just to make the later code easier. In your roll temmplate you'd only display it if it has a value > 0
                 rollString += "{{rollinitreroll=[[0]]}}";
@@ -1062,12 +1213,105 @@ on("change:initmod change:gracetotal sheet:opened", function() {
     });
 });
 
-on("change:toggle change:mighttotalfloat change:gracetotalfloat sheet:opened", function() {  
-  getAttrs(["mighttotalfloat","gracetotalfloat","toggle"], function(values) {
+on("change:gracereroll change:initrerollmod sheet:opened", function() {  
+  getAttrs(["gracereroll","initrerollmod"], function(values) {
+    let recheck = parseFloat(values.gracereroll)||0;
+    let initrerollmod = parseInt(values.initrerollmod)||0;
+    setAttrs({
+        "initreroll": recheck + initrerollmod
+    });
+  });
+});
+
+on("change:gracereroll change:initrerollmod sheet:opened", function() {  
+  getAttrs(["gracereroll","initrerollmod"], function(values) {
+    let recheck = parseFloat(values.gracereroll)||0;
+    let initrerollmod = parseInt(values.initrerollmod)||0;
+    setAttrs({
+        "initreroll": recheck + initrerollmod
+    });
+  });
+});
+
+</script>
+
+<script type="text/worker">
+
+on("change:toggle change:mighttotalfloat change:gracetotalfloat change:insighttotalfloat change:meleeradio change:rangedradio change:mightattackmod change:graceattackmod change:insightattackmod change:mightattackrerollmod change:graceattackrerollmod change:insightattackrerollmod change:mightreroll change:gracereroll change:insightreroll sheet:opened", function() {  
+  getAttrs(["mighttotalfloat","gracetotalfloat","insighttotalfloat","toggle","meleeradio","rangedradio","mightattackmod","graceattackmod","insightattackmod","mightattackrerollmod","graceattackrerollmod","insightattackrerollmod","mightreroll","gracereroll","insightreroll"], function(values) {
     let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
+    let mightattackmod = parseInt(values.mightattackmod)||0;
+    let mightattackrerollmod = parseInt(values.mightattackrerollmod)||0;
+    let mightreroll = parseInt(values.mightreroll)||0;
     let gracetotalfloat = parseFloat(values.gracetotalfloat)||0;
+    let graceattackmod = parseInt(values.graceattackmod)||0;
+    let graceattackrerollmod = parseInt(values.graceattackrerollmod)||0;
+    let gracereroll = parseInt(values.gracereroll)||0;
+    let insighttotalfloat = parseFloat(values.insighttotalfloat)||0;
+    let insightattackmod = parseInt(values.insightattackmod)||0;
+    let insightattackrerollmod = parseInt(values.insightattackrerollmod)||0;
+    let insightreroll = parseInt(values.insightreroll)||0;
+    let toggle = parseInt(values.toggle)||0;
+    let meleeradio = parseInt(values.meleeradio)||0;
+    let rangedradio = parseInt(values.rangedradio)||0;
+    if (meleeradio == "1") {
+        setAttrs({
+            "meleetotal": mighttotalfloat + mightattackmod
+        });
+        setAttrs({
+            "meleererolltotal": mightattackrerollmod + mightreroll
+        });
+    }
+    if (meleeradio == "2") {
+        setAttrs({
+            "meleetotal": gracetotalfloat + graceattackmod
+        });
+        setAttrs({
+            "meleererolltotal": graceattackrerollmod + gracereroll
+        });
+    }
+    if (meleeradio == "3") {
+        setAttrs({
+            "meleetotal": insighttotalfloat + insightattackmod
+        });
+        setAttrs({
+            "meleererolltotal": insightattackrerollmod + insightreroll
+        });
+    }
+    if (rangedradio == "1") {
+        setAttrs({
+            "rangedtotal": mighttotalfloat + mightattackmod
+        });
+        setAttrs({
+            "rangedrerolltotal": mightattackrerollmod + mightreroll
+        });
+    }
+    if (rangedradio == "2") {
+        setAttrs({
+            "rangedtotal": gracetotalfloat + graceattackmod
+        });
+        setAttrs({
+            "rangedrerolltotal": graceattackrerollmod + gracereroll
+        });
+    }
+    if (rangedradio == "3") {
+        setAttrs({
+            "rangedtotal": insighttotalfloat + insightattackmod
+        });
+        setAttrs({
+            "rangedrerolltotal": insightattackrerollmod + insightreroll
+        });
+    }
+  });
+});
+
+on("change:toggle change:meleetotal change:rangedtotal sheet:opened", function() {  
+  getAttrs(["toggle","meleetotal","rangedtotal"], function(values) {
+    let toggle = parseInt(values.toggle)||0;
+    let meleetotal = parseFloat(values.meleetotal)||0;
+    let rangedtotal = parseFloat(values.rangedtotal)||0;
     const output = {};
-    output.mg = (values.toggle == "1") ? mighttotalfloat : gracetotalfloat;
+    output.mg = (toggle == "1") ? meleetotal : rangedtotal;
     setAttrs(output);
   });
 });
@@ -1076,8 +1320,12 @@ on("change:toggle change:mighttotalfloat change:gracetotalfloat sheet:opened", f
 
 <script type="text/worker">
 
-on("change:mg change:qty1 change:bulk1 change:rng1 change:dmg1 change:resultmod change:dedsta change:result1zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle sheet:opened", function() {  
-  getAttrs(["qty1","mg","resultmod","dedsta","result1zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle"], function(values) {
+on("change:mg change:qty1 change:bulk1 change:rng1 change:dmg1 change:resultmod change:dedsta change:result1zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle change:shieldbashradio1 change:wpntype1 change:shieldqtybonus1 sheet:opened", function() {  
+  getAttrs(["qty1","mg","resultmod","dedsta","result1zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle","shieldbashradio1","wpntype1","shieldqtybonus1"], function(values) {
+    let shieldbashradio = parseInt(values.shieldbashradio1)||0;
+    let shieldqtybonus = parseInt(values.shieldqtybonus1)||0;
+    let wpntype = parseInt(values.wpntype1)||0;
+    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
     let mg = parseFloat(values.mg)||0;
     let qty1 = parseFloat(values.qty1)||0;
     let resultmod = parseInt(values.resultmod)||0;
@@ -1085,16 +1333,23 @@ on("change:mg change:qty1 change:bulk1 change:rng1 change:dmg1 change:resultmod
     let paraltier = parseInt(values.paraltier)||0;
     let paraldebuff = (paraltier >= 2) ? 1 : 0;
     let mindice = mg + qty1 + 1 + dedsta - resultmod - paraldebuff;
-    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
+    let mindiceshield = (shieldbashradio == 0) ? mighttotalfloat + 1 + dedsta - resultmod - paraldebuff : mighttotalfloat + shieldqtybonus + 1 + 1 + dedsta - resultmod - paraldebuff;
     let gplequip = parseFloat(values.gplequip)||0;
     let grapplearms = parseInt(values.grapplearms)||0;
-    let grapplerollmod = parseInt(values.grapplerollmod)||0;    
+    let grapplerollmod = parseInt(values.grapplerollmod)||0;
     let grappletoggle = parseInt(values.grappletoggle)||0;
     let grappleval = (gplequip == 1) ? 1 : 0;
     let grappledice = (grappletoggle == 1) ? (mindice + mighttotalfloat + grapplerollmod + grapplearms - mg) : (mindice + mighttotalfloat + grapplerollmod + grapplearms + resultmod - mg - qty1 - 1);
-    setAttrs({                            
-      "result1": mindice
-    });
+    if (wpntype == "1") {
+        setAttrs({
+        "result1": mindice
+        });
+    }
+    if (wpntype == "2") {
+        setAttrs({
+        "result1": mindiceshield
+        });
+    }
     if(values.result1zero == "0") {
         setAttrs({
             "result1": 0
@@ -1106,8 +1361,16 @@ on("change:mg change:qty1 change:bulk1 change:rng1 change:dmg1 change:resultmod
   });
 });
 
-on("change:mg change:qty2 change:bulk2 change:rng2 change:dmg2 change:resultmod change:dedsta change:result2zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle sheet:opened", function() {  
-  getAttrs(["qty2","mg","resultmod","dedsta","result2zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle"], function(values) {
+</script>
+
+<script type="text/worker">
+
+on("change:mg change:qty2 change:bulk2 change:rng2 change:dmg2 change:resultmod change:dedsta change:result2zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle change:shieldbashradio2 change:wpntype2 change:shieldqtybonus2 sheet:opened", function() {  
+  getAttrs(["qty2","mg","resultmod","dedsta","result2zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle","shieldbashradio2","wpntype2","shieldqtybonus2"], function(values) {
+    let shieldbashradio = parseInt(values.shieldbashradio2)||0;  
+    let shieldqtybonus = parseInt(values.shieldqtybonus2)||0;
+    let wpntype = parseInt(values.wpntype2)||0;
+    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
     let mg = parseFloat(values.mg)||0;
     let qty2 = parseFloat(values.qty2)||0;
     let resultmod = parseInt(values.resultmod)||0;
@@ -1115,16 +1378,23 @@ on("change:mg change:qty2 change:bulk2 change:rng2 change:dmg2 change:resultmod
     let paraltier = parseInt(values.paraltier)||0;
     let paraldebuff = (paraltier >= 2) ? 1 : 0;
     let mindice = mg + qty2 + 1 + dedsta - resultmod - paraldebuff;
-    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
+    let mindiceshield = (shieldbashradio == 0) ? mighttotalfloat + 1 + dedsta - resultmod - paraldebuff : mighttotalfloat + shieldqtybonus + 1 + 1 + dedsta - resultmod - paraldebuff;
     let gplequip = parseFloat(values.gplequip)||0;
     let grapplearms = parseInt(values.grapplearms)||0;
     let grapplerollmod = parseInt(values.grapplerollmod)||0;    
     let grappletoggle = parseInt(values.grappletoggle)||0;
     let grappleval = (gplequip == 2) ? 1 : 0;
     let grappledice = (grappletoggle == 1) ? (mindice + mighttotalfloat + grapplerollmod + grapplearms - mg) : (mindice + mighttotalfloat + grapplerollmod + grapplearms + resultmod - mg - qty2 - 1);
-    setAttrs({                            
-      "result2": mindice
-    });
+    if (wpntype == "1") {
+        setAttrs({                            
+        "result2": mindice
+        });
+    }
+    if (wpntype == "2") {
+        setAttrs({                            
+        "result2": mindiceshield
+        });
+    }
         if(values.result2zero == "0") {
         setAttrs({
             "result2": 0
@@ -1136,8 +1406,12 @@ on("change:mg change:qty2 change:bulk2 change:rng2 change:dmg2 change:resultmod
   });
 });
 
-on("change:mg change:qty3 change:bulk3 change:rng3 change:dmg3 change:resultmod change:dedsta change:result3zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle sheet:opened", function() {  
-  getAttrs(["qty3","mg","resultmod","dedsta","result3zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle"], function(values) {
+on("change:mg change:qty3 change:bulk3 change:rng3 change:dmg3 change:resultmod change:dedsta change:result3zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle change:shieldbashradio3 change:wpntype3 change:shieldqtybonus3 sheet:opened", function() {  
+  getAttrs(["qty3","mg","resultmod","dedsta","result3zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle","shieldbashradio3","wpntype3","shieldqtybonus3"], function(values) {
+    let shieldbashradio = parseInt(values.shieldbashradio3)||0;
+    let shieldqtybonus = parseInt(values.shieldqtybonus3)||0;
+    let wpntype = parseInt(values.wpntype3)||0;
+    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
     let mg = parseFloat(values.mg)||0;
     let qty3 = parseFloat(values.qty3)||0;
     let resultmod = parseInt(values.resultmod)||0;
@@ -1145,16 +1419,23 @@ on("change:mg change:qty3 change:bulk3 change:rng3 change:dmg3 change:resultmod
     let paraltier = parseInt(values.paraltier)||0;
     let paraldebuff = (paraltier >= 2) ? 1 : 0;
     let mindice = mg + qty3 + 1 + dedsta - resultmod - paraldebuff;
-    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
+    let mindiceshield = (shieldbashradio == 0) ? mighttotalfloat + 1 + dedsta - resultmod - paraldebuff : mighttotalfloat + shieldqtybonus + 1 + 1 + dedsta - resultmod - paraldebuff;
     let gplequip = parseFloat(values.gplequip)||0;
     let grapplearms = parseInt(values.grapplearms)||0;
     let grapplerollmod = parseInt(values.grapplerollmod)||0;    
     let grappletoggle = parseInt(values.grappletoggle)||0;
     let grappleval = (gplequip == 3) ? 1 : 0;
     let grappledice = (grappletoggle == 1) ? mindice + mighttotalfloat + grapplerollmod + grapplearms - mg : mindice + mighttotalfloat + grapplerollmod + grapplearms + resultmod - mg - qty3 - 1;
-    setAttrs({                            
-      "result3": mindice
-    });
+    if (wpntype == "1") {
+        setAttrs({                            
+        "result3": mindice
+        });
+    }
+    if (wpntype == "2") {
+        setAttrs({                            
+        "result3": mindiceshield
+        });
+    }
         if(values.result3zero == "0") {
         setAttrs({
             "result3": 0
@@ -1166,8 +1447,12 @@ on("change:mg change:qty3 change:bulk3 change:rng3 change:dmg3 change:resultmod
   });
 });
 
-on("change:mg change:qty4 change:bulk4 change:rng4 change:dmg4 change:resultmod change:dedsta change:result4zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle sheet:opened", function() {  
-  getAttrs(["qty4","mg","resultmod","dedsta","result4zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle"], function(values) {
+on("change:mg change:qty4 change:bulk4 change:rng4 change:dmg4 change:resultmod change:dedsta change:result4zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle change:shieldbashradio4 change:wpntype4 change:shieldqtybonus4 sheet:opened", function() {  
+  getAttrs(["qty4","mg","resultmod","dedsta","result4zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle","shieldbashradio4","wpntype4","shieldqtybonus4"], function(values) {
+    let shieldbashradio = parseInt(values.shieldbashradio4)||0;
+    let shieldqtybonus = parseInt(values.shieldqtybonus4)||0;
+    let wpntype = parseInt(values.wpntype4)||0;
+    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
     let mg = parseFloat(values.mg)||0;
     let qty4 = parseFloat(values.qty4)||0;
     let resultmod = parseInt(values.resultmod)||0;
@@ -1175,16 +1460,23 @@ on("change:mg change:qty4 change:bulk4 change:rng4 change:dmg4 change:resultmod
     let paraltier = parseInt(values.paraltier)||0;
     let paraldebuff = (paraltier >= 2) ? 1 : 0;
     let mindice = mg + qty4 + 1 + dedsta - resultmod - paraldebuff;
-    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
+    let mindiceshield = (shieldbashradio == 0) ? mighttotalfloat + 1 + dedsta - resultmod - paraldebuff : mighttotalfloat + shieldqtybonus + 1 + 1 + dedsta - resultmod - paraldebuff;
     let gplequip = parseFloat(values.gplequip)||0;
     let grapplearms = parseInt(values.grapplearms)||0;
     let grapplerollmod = parseInt(values.grapplerollmod)||0;    
     let grappletoggle = parseInt(values.grappletoggle)||0;
     let grappleval = (gplequip == 4) ? 1 : 0;
     let grappledice = (grappletoggle == 1) ? mindice + mighttotalfloat + grapplerollmod + grapplearms - mg : mindice + mighttotalfloat + grapplerollmod + grapplearms + resultmod - mg - qty4 - 1;
-    setAttrs({                            
-      "result4": mindice
-    });
+    if (wpntype == "1") {
+        setAttrs({                            
+        "result4": mindice
+        });
+    }
+    if (wpntype == "2") {
+        setAttrs({                            
+        "result4": mindiceshield
+        });
+    }
         if(values.result4zero == "0") {
         setAttrs({
             "result4": 0
@@ -1200,8 +1492,12 @@ on("change:mg change:qty4 change:bulk4 change:rng4 change:dmg4 change:resultmod
 
 <script type="text/worker">
 
-on("change:mg change:qty5 change:bulk5 change:rng5 change:dmg5 change:resultmod change:dedsta change:result5zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle sheet:opened", function() {  
-  getAttrs(["qty5","mg","resultmod","dedsta","result5zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle"], function(values) {
+on("change:mg change:qty5 change:bulk5 change:rng5 change:dmg5 change:resultmod change:dedsta change:result5zero change:paraltier change:gplequip change:grapplerollmod change:grapplearms change:grappletoggle change:shieldbashradio5 change:wpntype5 change:shieldqtybonus5 sheet:opened", function() {  
+  getAttrs(["qty5","mg","resultmod","dedsta","result5zero","paraltier","gplequip","mighttotalfloat","grapplerollmod","grapplearms","grappletoggle","shieldbashradio5","wpntype5","shieldqtybonus5"], function(values) {
+    let shieldbashradio = parseInt(values.shieldbashradio5)||0;
+    let shieldqtybonus = parseInt(values.shieldqtybonus5)||0;
+    let wpntype = parseInt(values.wpntype5)||0;
+    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
     let mg = parseFloat(values.mg)||0;
     let qty5 = parseFloat(values.qty5)||0;
     let resultmod = parseInt(values.resultmod)||0;
@@ -1209,7 +1505,7 @@ on("change:mg change:qty5 change:bulk5 change:rng5 change:dmg5 change:resultmod
     let paraltier = parseInt(values.paraltier)||0;
     let paraldebuff = (paraltier >= 2) ? 1 : 0;
     let mindice = mg + qty5 + 1 + dedsta - resultmod - paraldebuff;
-    let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
+    let mindiceshield = (shieldbashradio == 0) ? mighttotalfloat + 1 + dedsta - resultmod - paraldebuff : mighttotalfloat + shieldqtybonus + 1 + 1 + dedsta - resultmod - paraldebuff;
     let gplequip = parseFloat(values.gplequip)||0;
     let grapplearms = parseInt(values.grapplearms)||0;
     let grapplerollmod = parseInt(values.grapplerollmod)||0;
@@ -1218,9 +1514,16 @@ on("change:mg change:qty5 change:bulk5 change:rng5 change:dmg5 change:resultmod
     let grapplemath1 = mindice + mighttotalfloat + grapplerollmod + grapplearms - mg;
     let grapplemath2 = mindice + mighttotalfloat + grapplerollmod + grapplearms + resultmod - mg - qty5 - 1;
     let grappledice = (grappletoggle == 1) ? grapplemath1 : grapplemath2;
-    setAttrs({                            
-      "result5": mindice
-    });
+    if (wpntype == "1") {
+        setAttrs({                            
+        "result5": mindice
+        });
+    }
+    if (wpntype == "2") {
+        setAttrs({                            
+        "result5": mindiceshield
+        });
+    }
         if(values.result5zero == "0") {
         setAttrs({
             "result5": 0
@@ -1232,36 +1535,208 @@ on("change:mg change:qty5 change:bulk5 change:rng5 change:dmg5 change:resultmod
   });
 });
 
+on("change:result change:attackrerollbuff change:meleererolltotal change:rangedrerolltotal change:toggle sheet:opened", function() {  
+  getAttrs(["result","attackrerollbuff","meleererolltotal","rangedrerolltotal","toggle"], function(values) {
+    let recheck = parseFloat(values.result)||0;
+    let toggle = parseInt(values.toggle)||0;
+    let attackrerollbuff = parseInt(values.attackrerollbuff)||0;
+    let meleererolltotal = parseInt(values.meleererolltotal)||0;
+    let rangedrerolltotal = parseInt(values.rangedrerolltotal)||0;
+    let togglereroll = (toggle == "1") ? meleererolltotal : rangedrerolltotal;
+    let resultreroll = recheck - Math.floor(recheck);
+    setAttrs({
+        "resultreroll": attackrerollbuff + togglereroll
+    });
+  });
+});
+
 </script>
 
 <script type="text/worker">
 
-on("change:result sheet:opened", function() {  
-  getAttrs(["result"], function(values) {
-    let recheck = parseFloat(values.result)||0;
-    let resultreroll = recheck - Math.floor(recheck);
-    if(resultreroll == "0") {
-        setAttrs({
-            "resultreroll": 0
-        });}
-    if(resultreroll == "0.5") {
-        setAttrs({
-            "resultreroll": 1
-    });}
+on("change:shieldbashradio1 change:dmg1 change:bulk1 change:wpntype1 sheet:opened", function() {  
+  getAttrs(["shieldbashradio1","dmg1","bulk1","wpntype1"], function(values) {
+    let shieldbashradio1 = parseFloat(values.shieldbashradio1)||0;
+    let dmg1 = parseInt(values.dmg1)||0;
+    let bulk1 = parseInt(values.bulk1)||0;
+    let wpntype1 = parseInt(values.wpntype1)||0;
+    if (shieldbashradio1 == "1" && wpntype1 == "2") {
+        if (bulk1 <= "0") {
+            setAttrs({
+                "dmg1": 2
+            });   
+        }
+        if (bulk1 == "1") {
+            setAttrs({
+                "dmg1": 3
+            });   
+        }
+        if (bulk1 >= "2") {
+            setAttrs({
+                "dmg1": 4
+            });   
+        }
+    }
+    if (shieldbashradio1 == "0" && wpntype1 == "2") {
+        if (dmg1 == "0" || dmg1 == "2") {
+            setAttrs({
+                "dmg1": 2
+            });          
+        }
+    }
   });
 });
 
-on("change:grapplefinal sheet:opened", function() {  
-  getAttrs(["grapplefinal"], function(values) {
+</script>
+
+<script type="text/worker">
+
+on("change:shieldbashradio2 change:dmg2 change:bulk2 change:wpntype2 sheet:opened", function() {  
+  getAttrs(["shieldbashradio2","dmg2","bulk2","wpntype2"], function(values) {
+    let shieldbashradio = parseFloat(values.shieldbashradio2)||0;
+    let dmg = parseInt(values.dmg2)||0;
+    let bulk = parseInt(values.bulk2)||0;
+    let wpntype = parseInt(values.wpntype2)||0;
+    if (shieldbashradio == "1" && wpntype == "2") {
+        if (bulk <= "0") {
+            setAttrs({
+                "dmg2": 2
+            });   
+        }
+        if (bulk == "1") {
+            setAttrs({
+                "dmg2": 3
+            });   
+        }
+        if (bulk >= "2") {
+            setAttrs({
+                "dmg2": 4
+            });
+        }
+    }
+    if (shieldbashradio == "0" && wpntype == "2") {
+        setAttrs({
+            "dmg2": 2
+        });
+    }
+  });
+});
+
+on("change:shieldbashradio3 change:dmg3 change:bulk3 change:wpntype3 sheet:opened", function() {  
+  getAttrs(["shieldbashradio3","dmg3","bulk3","wpntype3"], function(values) {
+    let shieldbashradio = parseFloat(values.shieldbashradio3)||0;
+    let dmg = parseInt(values.dmg3)||0;
+    let bulk = parseInt(values.bulk3)||0;
+    let wpntype = parseInt(values.wpntype3)||0;
+    if (shieldbashradio == "1" && wpntype == "2") {
+        if (bulk <= "0") {
+            setAttrs({
+                "dmg3": 2
+            });   
+        }
+        if (bulk == "1") {
+            setAttrs({
+                "dmg3": 3
+            });   
+        }
+        if (bulk >= "2") {
+            setAttrs({
+                "dmg3": 4
+            });   
+        }
+    }
+    if (shieldbashradio == "0" && wpntype == "2") {
+        if (dmg == "0" || dmg == "2") {
+            setAttrs({
+                "dmg3": 2
+            });          
+        }
+    }
+  });
+});
+
+on("change:shieldbashradio4 change:dmg4 change:bulk4 change:wpntype4 sheet:opened", function() {  
+  getAttrs(["shieldbashradio4","dmg4","bulk4","wpntype4"], function(values) {
+    let shieldbashradio = parseFloat(values.shieldbashradio4)||0;
+    let dmg = parseInt(values.dmg4)||0;
+    let bulk = parseInt(values.bulk4)||0;
+    let wpntype = parseInt(values.wpntype4)||0;
+    if (shieldbashradio == "1" && wpntype == "2") {
+        if (bulk <= "0") {
+            setAttrs({
+                "dmg4": 2
+            });   
+        }
+        if (bulk == "1") {
+            setAttrs({
+                "dmg4": 3
+            });   
+        }
+        if (bulk >= "2") {
+            setAttrs({
+                "dmg4": 4
+            });   
+        }
+    }
+    if (shieldbashradio == "0" && wpntype == "2") {
+        if (dmg == "0" || dmg == "2") {
+            setAttrs({
+                "dmg4": 2
+            });          
+        }
+    }
+  });
+});
+
+on("change:shieldbashradio5 change:dmg5 change:bulk5 change:wpntype5 sheet:opened", function() {  
+  getAttrs(["shieldbashradio5","dmg5","bulk5","wpntype5"], function(values) {
+    let shieldbashradio = parseFloat(values.shieldbashradio5)||0;
+    let dmg = parseInt(values.dmg5)||0;
+    let bulk = parseInt(values.bulk5)||0;
+    let wpntype = parseInt(values.wpntype5)||0;
+    if (shieldbashradio == "1" && wpntype == "2") {
+        if (bulk <= "0") {
+            setAttrs({
+                "dmg5": 2
+            });   
+        }
+        if (bulk == "1") {
+            setAttrs({
+                "dmg5": 3
+            });   
+        }
+        if (bulk >= "2") {
+            setAttrs({
+                "dmg5": 4
+            });   
+        }
+    }
+    if (shieldbashradio == "0" && wpntype == "2") {
+        if (dmg == "0" || dmg == "2") {
+            setAttrs({
+                "dmg5": 2
+            });          
+        }
+    }
+  });
+});
+
+</script>
+
+<script type="text/worker">
+
+on("change:grapplefinal change:grapplererollmod sheet:opened", function() {  
+  getAttrs(["grapplefinal","grapplererollmod"], function(values) {
     let recheck = parseFloat(values.grapplefinal)||0;
+    let grapplererollmod = parseInt(values.grapplererollmod)||0;
     let resultreroll = recheck - Math.floor(recheck);
     if(resultreroll == "0") {
         setAttrs({
-            "resultrerollgrapple": 0
+            "resultrerollgrapple": 0 + grapplererollmod
         });}
     if(resultreroll == "0.5") {
         setAttrs({
-            "resultrerollgrapple": 1
+            "resultrerollgrapple": 1 + grapplererollmod
     });}
   });
 });
@@ -1286,8 +1761,8 @@ on("change:parrymod change:mighttotalfloat change:parrybonus change:paraltier ch
   getAttrs(["parrymod","mighttotalfloat","parrybonus","paraltier","parrybuff"], function(values) {
     let mighttotalfloat = parseFloat(values.mighttotalfloat)||0;
     let parrybuff = parseInt(values.parrybuff)||0;
-    let parrymod = values.parrymod||0;
-    let parrybonus = values.parrybonus||0;
+    let parrymod = parseInt(values.parrymod)||0;
+    let parrybonus = parseInt(values.parrybonus)||0;
     let paraltier = parseInt(values.paraltier)||0;
     let paraldebuff = (paraltier >= 2) ? 1 : 0;
     setAttrs({                            
@@ -1306,11 +1781,12 @@ on("change:might change:loadmod sheet:opened", function() {
   });
 });
 
-on("change:might sheet:opened change:mightmod change:bulkcheck change:mightcheckbuff", function() {  
-  getAttrs(["might","mightmod","bulkcheck","mightcheckbuff"], function(values) {
+on("change:might sheet:opened change:mightmod change:bulkcheck change:mightcheckbuff change:mightrerollmod", function() {  
+  getAttrs(["might","mightmod","bulkcheck","mightcheckbuff","mightrerollmod"], function(values) {
     let might = parseFloat(values.might)||0;
     let mightmod = parseFloat(values.mightmod)||0;
     let mightcheckbuff = parseInt(values.mightcheckbuff)||0;
+    let mightrerollmod = parseInt(values.mightrerollmod)||0;
     let bulkcheck = parseInt(values.bulkcheck)||0;
     let mighttotal = might + mightmod + mightcheckbuff - bulkcheck;
     let mightreroll = mighttotal - Math.floor(mighttotal);
@@ -1322,20 +1798,21 @@ on("change:might sheet:opened change:mightmod change:bulkcheck change:mightcheck
     });
     if(mightreroll == "0") {
         setAttrs({
-            "mightreroll": 0
+            "mightreroll": 0 + mightrerollmod
         });}
     if(mightreroll == "0.5") {
         setAttrs({
-            "mightreroll": 1
+            "mightreroll": 1 + mightrerollmod
         });}
   });
 });
 
-on("change:grace sheet:opened change:gracemod change:bulkcheck change:gracecheckbuff", function() {  
-  getAttrs(["grace","gracemod","bulkcheck","gracecheckbuff"], function(values) {
+on("change:grace sheet:opened change:gracemod change:bulkcheck change:gracecheckbuff change:gracererollmod", function() {  
+  getAttrs(["grace","gracemod","bulkcheck","gracecheckbuff","gracererollmod"], function(values) {
     let grace = parseFloat(values.grace)||0;
     let gracemod = parseFloat(values.gracemod)||0;
     let gracecheckbuff = parseInt(values.gracecheckbuff)||0;
+    let gracererollmod = parseInt(values.gracererollmod)||0;
     let bulkcheck = parseInt(values.bulkcheck)||0;
     let gracetotal = grace + gracemod + gracecheckbuff - bulkcheck;
     let gracereroll = gracetotal - Math.floor(gracetotal);
@@ -1347,20 +1824,21 @@ on("change:grace sheet:opened change:gracemod change:bulkcheck change:gracecheck
     });
     if(gracereroll == "0") {
         setAttrs({
-            "gracereroll": 0
+            "gracereroll": 0 + gracererollmod
         });}
     if(gracereroll == "0.5") {
         setAttrs({
-            "gracereroll": 1
+            "gracereroll": 1 + gracererollmod
         });}
   });
 });
 
-on("change:shell sheet:opened change:shellmod change:shellcheckbuff", function() {  
-  getAttrs(["shell","shellmod","shellcheckbuff"], function(values) {
+on("change:shell sheet:opened change:shellmod change:shellcheckbuff change:shellrerollmod", function() {  
+  getAttrs(["shell","shellmod","shellcheckbuff","shellrerollmod"], function(values) {
     let shell = parseFloat(values.shell)||0;
     let shellmod = parseFloat(values.shellmod)||0;
     let shellcheckbuff = parseInt(values.shellcheckbuff)||0;
+    let shellrerollmod = parseInt(values.shellrerollmod)||0;
     let shelltotal = shell + shellmod + shellcheckbuff;
     let shellreroll = shelltotal - Math.floor(shelltotal);
     setAttrs({                            
@@ -1371,20 +1849,21 @@ on("change:shell sheet:opened change:shellmod change:shellcheckbuff", function()
     });
     if(shellreroll == "0") {
         setAttrs({
-            "shellreroll": 0
+            "shellreroll": 0 + shellrerollmod
         });}
     if(shellreroll == "0.5") {
         setAttrs({
-            "shellreroll": 1
+            "shellreroll": 1 + shellrerollmod
         });}
   });
 });
 
-on("change:insight sheet:opened change:insightmod change:insightcheckbuff", function() {  
-  getAttrs(["insight","insightmod","insightcheckbuff"], function(values) {
+on("change:insight sheet:opened change:insightmod change:insightcheckbuff change:insightrerollmod", function() {  
+  getAttrs(["insight","insightmod","insightcheckbuff","insightrerollmod"], function(values) {
     let insight = parseFloat(values.insight)||0;
     let insightmod = parseFloat(values.insightmod)||0;
     let insightcheckbuff = parseInt(values.insightcheckbuff)||0;
+    let insightrerollmod = parseInt(values.insightrerollmod)||0;
     let insighttotal = insight + insightmod + insightcheckbuff;
     let insightreroll = insighttotal - Math.floor(insighttotal);
     setAttrs({                            
@@ -1395,18 +1874,19 @@ on("change:insight sheet:opened change:insightmod change:insightcheckbuff", func
     });
     if(insightreroll == "0") {
         setAttrs({
-            "insightreroll": 0
+            "insightreroll": 0 + insightrerollmod
         });}
     if(insightreroll == "0.5") {
         setAttrs({
-            "insightreroll": 1
+            "insightreroll": 1 + insightrerollmod
         });}
   });
 });
 
-on("change:cute sheet:opened", function() {  
-  getAttrs(["cute"], function(values) {
+on("change:cute change:cutererollmod sheet:opened", function() {  
+  getAttrs(["cute","cutererollmod"], function(values) {
     let cute = parseFloat(values.cute)||0;
+    let cutererollmod = parseInt(values.cutererollmod)||0;
     let cutereroll = cute - Math.floor(cute);
     setAttrs({                            
       "cutetotal": Math.floor(cute)
@@ -1416,18 +1896,19 @@ on("change:cute sheet:opened", function() {
     });
     if(cutereroll == "0") {
         setAttrs({
-            "cutereroll": 0
+            "cutereroll": 0 + cutererollmod
         });}
     if(cutereroll == "0.5") {
         setAttrs({
-            "cutereroll": 1
+            "cutereroll": 1 + cutererollmod
         });}
   });
 });
 
-on("change:spook sheet:opened", function() {  
-  getAttrs(["spook"], function(values) {
+on("change:spook change:spookrerollmod sheet:opened", function() {  
+  getAttrs(["spook","spookrerollmod"], function(values) {
     let spook = parseFloat(values.spook)||0;
+    let spookrerollmod = parseInt(values.spookrerollmod)||0;
     let spookreroll = spook - Math.floor(spook);
     setAttrs({                            
       "spooktotal": Math.floor(spook)
@@ -1437,11 +1918,11 @@ on("change:spook sheet:opened", function() {
     });
     if(spookreroll == "0") {
         setAttrs({
-            "spookreroll": 0
+            "spookreroll": 0 + spookrerollmod
         });}
     if(spookreroll == "0.5") {
         setAttrs({
-            "spookreroll": 1
+            "spookreroll": 1 + spookrerollmod
         });}
   });
 });
@@ -1558,131 +2039,197 @@ on("change:grapplemod change:squeezemod change:pairedmod change:opportunitymod c
   });
 });
 
+</script>
 
-on("change:atkequip change:pryequip change:result1 change:result2 change:result3 change:result4 change:result5 change:wpntype1 change:wpntype2 change:wpntype3 change:wpntype4 change:wpntype5 change:qty1 change:qty2 change:qty3 change:qty4 change:qty5 change:dmg1 change:dmg2 change:dmg3 change:dmg4 change:dmg5 sheet:opened", function() {  
-  getAttrs(["atkequip","pryequip","result1","result2","result3","result4","result5","wpntype1","wpntype2","wpntype3","wpntype4","wpntype5","qty1","qty2","qty3","qty4","qty5","dmg1","dmg2","dmg3","dmg4","dmg5"], function(values) {
+<script type="text/worker">
+
+on("change:atkequip change:pryequip change:result1 change:result2 change:result3 change:result4 change:result5 change:wpntype1 change:wpntype2 change:wpntype3 change:wpntype4 change:wpntype5 change:qty1 change:qty2 change:qty3 change:qty4 change:qty5 change:dmg1 change:dmg2 change:dmg3 change:dmg4 change:dmg5 change:shieldqtybonus1 change:shieldqtybonus2 change:shieldqtybonus3 change:shieldqtybonus4 change:shieldqtybonus5 change:shieldbashradio1 change:shieldbashradio2 change:shieldbashradio3 change:shieldbashradio4 change:shieldbashradio5 sheet:opened", function() {  
+  getAttrs(["atkequip","pryequip","result1","result2","result3","result4","result5","wpntype1","wpntype2","wpntype3","wpntype4","wpntype5","qty1","qty2","qty3","qty4","qty5","dmg1","dmg2","dmg3","dmg4","dmg5","shieldqtybonus1","shieldqtybonus2","shieldqtybonus3","shieldqtybonus4","shieldqtybonus5","shieldbashradio1","shieldbashradio2","shieldbashradio3","shieldbashradio4","shieldbashradio5"], function(values) {
+    let atkequip = parseInt(values.atkequip)||0;
+    let pryequip = parseInt(values.pryequip)||0;
     let result1 = parseFloat(values.result1)||0;
     let result2 = parseFloat(values.result2)||0;
     let result3 = parseFloat(values.result3)||0;
     let result4 = parseFloat(values.result4)||0;
     let result5 = parseFloat(values.result5)||0;
+    let dmg1 = parseInt(values.dmg1)||0;
+    let dmg2 = parseInt(values.dmg2)||0;
+    let dmg3 = parseInt(values.dmg3)||0;
+    let dmg4 = parseInt(values.dmg4)||0;
+    let dmg5 = parseInt(values.dmg5)||0;
+    let qty1 = parseInt(values.qty1)||0;
+    let qty2 = parseInt(values.qty2)||0;
+    let qty3 = parseInt(values.qty3)||0;
+    let qty4 = parseInt(values.qty4)||0;
+    let qty5 = parseInt(values.qty5)||0;
     let wpntype1 = parseFloat(values.wpntype1)||0;
     let wpntype2 = parseFloat(values.wpntype2)||0;
     let wpntype3 = parseFloat(values.wpntype3)||0;
     let wpntype4 = parseFloat(values.wpntype4)||0;
     let wpntype5 = parseFloat(values.wpntype5)||0;
-    if(values.atkequip == "1") {
+    let shieldqtybonus1 = parseInt(values.shieldqtybonus1)||0;
+    let shieldqtybonus2 = parseInt(values.shieldqtybonus2)||0;
+    let shieldqtybonus3 = parseInt(values.shieldqtybonus3)||0;
+    let shieldqtybonus4 = parseInt(values.shieldqtybonus4)||0;
+    let shieldqtybonus5 = parseInt(values.shieldqtybonus5)||0;
+    let shieldbashradio1 = parseInt(values.shieldbashradio1)||0;
+    let shieldbashradio2 = parseInt(values.shieldbashradio2)||0;
+    let shieldbashradio3 = parseInt(values.shieldbashradio3)||0;
+    let shieldbashradio4 = parseInt(values.shieldbashradio4)||0;
+    let shieldbashradio5 = parseInt(values.shieldbashradio5)||0;
+
+    if(atkequip == "1") {
         setAttrs({
             "result": result1
         });
         setAttrs({
-            "dmgcrt": values.dmg1
+            "dmgcrt": dmg1
+        });
+        setAttrs({
+            "wpntype": wpntype1
+        });
+        setAttrs({
+            "shieldbashcrt": shieldbashradio1
         });
     }
-    if(values.atkequip == "2") {
+    if(atkequip == "2") {
         setAttrs({
             "result": result2
         });
         setAttrs({
-            "dmgcrt": values.dmg2
+            "dmgcrt": dmg2
+        });
+        setAttrs({
+            "wpntype": wpntype2
+        });
+        setAttrs({
+            "shieldbashcrt": shieldbashradio2
         });
     }
-    if(values.atkequip == "3") {
+    if(atkequip == "3") {
         setAttrs({
             "result": result3
         });
         setAttrs({
-            "dmgcrt": values.dmg3
+            "dmgcrt": dmg3
+        });
+        setAttrs({
+            "wpntype": wpntype3
+        });
+        setAttrs({
+            "shieldbashcrt": shieldbashradio3
         });
     }
-    if(values.atkequip == "4") {
+    if(atkequip == "4") {
         setAttrs({
             "result": result4
         });
         setAttrs({
-            "dmgcrt": values.dmg4
+            "dmgcrt": dmg4
+        });
+        setAttrs({
+            "wpntype": wpntype4
+        });
+        setAttrs({
+            "shieldbashcrt": shieldbashradio4
         });
     }
-    if(values.atkequip == "5") {
+    if(atkequip == "5") {
         setAttrs({
             "result": result5
         });
         setAttrs({
-            "dmgcrt": values.dmg5
+            "dmgcrt": dmg5
+        });
+        setAttrs({
+            "wpntype": wpntype5
+        });
+        setAttrs({
+            "shieldbashcrt": shieldbashradio5
         });
     }
-    if(values.pryequip == "1") {
+    if(pryequip == "1") {
         setAttrs({
             "parrytype": wpntype1
         });
         setAttrs({
-            "qtycrt": values.qty1
+            "qtycrt": qty1 + shieldqtybonus1
         });
     }
-    if(values.pryequip == "2") {
+    if(pryequip == "2") {
         setAttrs({
             "parrytype": wpntype2
         });
         setAttrs({
-            "qtycrt": values.qty2
+            "qtycrt": qty2 + shieldqtybonus2
         });
     }
-    if(values.pryequip == "3") {
+    if(pryequip == "3") {
         setAttrs({
             "parrytype": wpntype3
         });
         setAttrs({
-            "qtycrt": values.qty3
+            "qtycrt": qty3 + shieldqtybonus3
         });
     }
-    if(values.pryequip == "4") {
+    if(pryequip == "4") {
         setAttrs({
             "parrytype": wpntype4
         });
         setAttrs({
-            "qtycrt": values.qty4
+            "qtycrt": qty4 + shieldqtybonus4
         });
     }
-    if(values.pryequip == "5") {
+    if(pryequip == "5") {
         setAttrs({
             "parrytype": wpntype5
         });
         setAttrs({
-            "qtycrt": values.qty5
+            "qtycrt": qty5 + shieldqtybonus5
         });
     }
   });
 });
 
-on("change:parrytype change:dedsta change:qtycrt sheet:opened", function() {  
-  getAttrs(["parrytype","dedsta","qtycrt"], function(values) {
+</script>
+
+<script type="text/worker">
+
+on("change:parrytype change:dedsta change:qtycrt change:parryweaponbuff change:parryshieldbuff sheet:opened", function() {  
+  getAttrs(["parrytype","dedsta","qtycrt","parryweaponbuff","parryshieldbuff"], function(values) {
     let parrytype = parseInt(values.parrytype)||0;
     let dedsta = parseInt(values.dedsta)||0;
     let qtycrt = parseInt(values.qtycrt)||0;
-    if(values.parrytype == "1") {
-        if(values.qtycrt >= values.dedsta) {
+    let parryweaponbuff = parseInt(values.parryweaponbuff)||0;
+    let parryshieldbuff = parseInt(values.parryshieldbuff)||0;
+    if(parrytype == "1") {
+        if(qtycrt >= dedsta) {
             let parrybonus = dedsta * 2;
             setAttrs({
-                "parrybonus": parrybonus
+                "parrybonus": parrybonus + parryweaponbuff
             });    
         }
-        if(values.qtycrt < values.dedsta) {
+        if(qtycrt < dedsta) {
             let parrymin = qtycrt * 2;
-            let parrybonus = parrymin + dedsta - qtycrt;
+            let parrybonus = parrymin + dedsta + parryweaponbuff - qtycrt;
             setAttrs({
                 "parrybonus": parrybonus
             });    
         }
         
     }
-    if(values.parrytype == "2") {
-        let parrybonus = qtycrt + dedsta;
+    if(parrytype == "2") {
+        let parrybonus = qtycrt + dedsta + parryshieldbuff;
         setAttrs({
             "parrybonus": parrybonus
         });}
   });
 });
 
+</script>
+
+<script type="text/worker">
+
 on("change:bulk1 change:bulk2 change:bulk3 change:bulk4 change:bulk5 change:dmg1 change:dmg2 change:dmg3 change:dmg4 change:dmg5 change:rng1 change:rng2 change:rng3 change:rng4 change:rng5 change:qty1 change:qty2 change:qty3 change:qty4 change:qty5 sheet:opened", function() {  
   getAttrs(["bulk1","bulk2","bulk3","bulk4","bulk5","dmg1","dmg2","dmg3","dmg4","dmg5","rng1","rng2","rng3","rng4","rng5","qty1","qty2","qty3","qty4","qty5"], function(values) {
         if(values.bulk1 == 0 && values.dmg1 == 0 && values.rng1 == 0 && values.qty1 == 0) {
@@ -1832,35 +2379,96 @@ on('change:dedsta change:stam change:stamtemp sheet:opened', () => {
     });
 });
 
-on('change:speed sheet:opened', () => {
-    getAttrs(['speed', 'speedmax'], function(values) {
-        let speedmax = parseInt(values.speedmax)||0;
-        let speed = parseInt(values.speed)||0;
-        if(speed > speedmax) {
-            setAttrs({
-                "speed": speedmax
-                });
-        }
-    });
-});
+//on('change:speed change:speedmax sheet:opened', () => {
+//    getAttrs(['speed','speedmax'], function(values) {
+//        let speedmax = parseInt(values.speedmax)||0;
+//        let speed = parseInt(values.speed)||0;
+//        if(speed > speedmax) {
+//           setAttrs({
+//                "speed": speedmax
+//                });
+//        }
+//    });
+//});
 
-on('change:gracetotalfloat sheet:opened', () => {
-    getAttrs(['gracetotalfloat'], function(values) {
-        let gtf = parseFloat(values.gracetotalfloat)||0;
-        let footwork = Math.ceil(gtf / 2);
+on('change:gracetotal change:footworkmod sheet:opened', () => {
+    getAttrs(['gracetotal','footworkmod'], function(values) {
+        let gt = parseInt(values.gracetotal)||0;
+        let fwm = parseInt(values.footworkmod)||0;
+        let fwt = gt + (fwm * 2);
+        let footwork = Math.ceil(fwt / 2);
         setAttrs({
             "footwork": footwork
         });
     });
 });
 
+on('change:shelltotal change:beltmod sheet:opened', () => {
+    getAttrs(['shelltotal','beltmod'], function(values) {
+        let shelltotal = parseInt(values.shelltotal)||0;
+        let beltmod = parseInt(values.beltmod)||0;
+        let belt = shelltotal + beltmod;
+        setAttrs({
+            "belt": belt
+        });
+    });
+});
+
+
+on('change:armdur change:armdurmax sheet:opened', () => {
+    getAttrs(['armdur','armdurmax'], function(values) {
+        let armdurmax = parseInt(values.armdurmax)||0;
+        let armdur = parseInt(values.armdur)||0;
+        if(armdur > armdurmax) {
+            setAttrs({
+                "armdur": armdurmax
+                });
+        }
+    });
+});
+
+
 </script>
 
 <script type="text/worker">
 
-on("change:softbody change:resistradio change:shelltotal change:soakmod change:soakmagicmod change:soakenviromod change:soakmagicradio change:soakenviroradio change:drisk change:dr change:damredbuff change:damriskbuff sheet:opened", function() {  
-  getAttrs(["shelltotal","soakmod","soakmagicmod","soakenviromod","softbody","soakmagicradio","soakenviroradio","resistradio","drisk","dr","damredbuff","damriskbuff"], function(values) {
-    let dr = parseInt(values.dr)||0;
+on('change:dr change:armdur change:armsoak change:armsoakreroll sheet:opened', () => {
+    getAttrs(['armdur','dr','armsoak','armsoakreroll'], function(values) {
+        let armdur = parseInt(values.armdur)||0;
+        let armsoak = parseInt(values.armsoak)||0;
+        let armsoakreroll = parseInt(values.armsoakreroll)||0;
+        let dr = parseInt(values.dr)||0;
+        const output = {};
+        output.drarb = (armdur > "0") ? dr : 0;
+        output.armsoakarb = (armdur > "0") ? armsoak : 0;
+        output.armsoakrerollarb = (armdur > "0") ? armsoakreroll : 0;
+        setAttrs(output);
+    });
+});
+
+on('change:soakrerollmod change:armsoakrerollarb change:soakmagicrerollmod change:soakenvirorerollmod change:soakmagicradio change:soakenviroradio change:softbody change:shellreroll sheet:opened', () => {
+    getAttrs(["soakrerollmod","armsoakrerollarb","soakmagicrerollmod","soakenvirorerollmod","soakmagicradio","soakenviroradio","softbody","shellreroll"], function(values) {
+        let shellreroll = parseInt(values.shellreroll)||0;
+        let softbody = parseInt(values.softbody)||0;
+        let soakrerollmod = parseInt(values.soakrerollmod)||0;
+        let armsoakreroll = parseInt(values.armsoakrerollarb)||0;
+        let soakmagicrerollmod = parseInt(values.soakmagicrerollmod)||0;
+        let soakenvirorerollmod = parseInt(values.soakenvirorerollmod)||0;
+        let soakmagicradio = parseInt(values.soakmagicradio)||0;
+        let soakenviroradio = parseInt(values.soakenviroradio)||0;
+        let shellrerollcheck = (softbody == 0) ? shellreroll : 0;
+        let soakrerollnormal = soakrerollmod + armsoakreroll + shellrerollcheck;
+        const output = {};
+        output.soakrerollnormal = soakrerollnormal;
+        output.soakrerollmagic = (soakmagicradio == "1") ? soakmagicrerollmod + soakrerollnormal : soakmagicrerollmod;
+        output.soakrerollenviro = (soakenviroradio == "1") ? soakenvirorerollmod + soakrerollnormal : soakenvirorerollmod;
+        setAttrs(output);
+    });
+});
+
+on("change:softbody change:resistradio change:shelltotal change:armsoakarb change:soakmod change:soakmagicmod change:soakenviromod change:soakmagicradio change:soakenviroradio change:drisk change:drarb change:damredbuff change:damriskbuff change:soakrerollnormal change:soakrerollmagic change:soakrerollenviro sheet:opened", function() {  
+  getAttrs(["shelltotal","armsoakarb","soakmod","soakmagicmod","soakenviromod","softbody","soakmagicradio","soakenviroradio","resistradio","drisk","drarb","damredbuff","damriskbuff","soakrerollnormal","soakrerollmagic","soakrerollenviro"], function(values) {
+    let dr = parseInt(values.drarb)||0;
     let damredbuff = parseInt(values.damredbuff)||0;
     let damriskbuff = parseInt(values.damriskbuff)||0;
     let drisk = parseInt(values.drisk)||0;
@@ -1871,29 +2479,42 @@ on("change:softbody change:resistradio change:shelltotal change:soakmod change:s
     let softbody = parseInt(values.softbody)||0;
     let resistradio = parseInt(values.resistradio)||0;
     let shelltotal = parseInt(values.shelltotal)||0;
+    let armsoak = parseInt(values.armsoakarb)||0;
     let soakmod = parseInt(values.soakmod)||0;
     let soakmagicmod = parseInt(values.soakmagicmod)||0;
     let soakenviromod = parseInt(values.soakenviromod)||0;
+    let soakrerollnormal = parseInt(values.soakrerollnormal)||0;
+    let soakrerollmagic = parseInt(values.soakrerollmagic)||0;
+    let soakrerollenviro = parseInt(values.soakrerollenviro)||0;
     let soakmagicradio = parseInt(values.soakmagicradio)||0;
     let soakenviroradio = parseInt(values.soakenviroradio)||0;
     let shellbonus = (softbody == 0) ? shelltotal : 0;
-    let shellsoakbonus = soakmod + shellbonus;
+    let shellsoakbonus = soakmod + shellbonus + armsoak;
     let shellsoakbonusmagic = (soakmagicradio == 1) ? (shellsoakbonus + soakmagicmod) : soakmagicmod;
     let shellsoakbonusenviro = (soakenviroradio == 1) ? (shellsoakbonus + soakenviromod) : soakenviromod;
     if(resistradio == 0) {
         setAttrs({
             "soaktotal": shellsoakbonus
         });
+        setAttrs({
+            "soakreroll": soakrerollnormal
+        });
     }
     if(resistradio == 1) {
         setAttrs({
             "soaktotal": shellsoakbonusmagic
         });
+        setAttrs({
+            "soakreroll": soakrerollmagic
+        });
     }
     if(resistradio == 2) {
         setAttrs({
             "soaktotal": shellsoakbonusenviro
         });
+        setAttrs({
+            "soakreroll": soakrerollenviro
+        });
     }
   });
 });
@@ -1902,27 +2523,38 @@ on("change:softbody change:resistradio change:shelltotal change:soakmod change:s
 
 <script type="text/worker">
 
+on('change:absorption change:absorptiondur sheet:opened', () => {
+    getAttrs(['absorption','absorptiondur'], function(values) {
+        let absorption = parseInt(values.absorption)||0;
+        let absorptiondur = parseInt(values.absorptiondur)||0;
+        const output = {};
+        output.absorptionarb = (absorptiondur > "0") ? absorption : 0;
+        setAttrs(output);
+    });
+});
+
 on("clicked:resist", function(info) {  
-  getAttrs(["driskdr","absorption","resistradio","softbody","shelltotal","shellreroll","drisk","soaktotal"], function(values) {
+  getAttrs(["driskdr","absorptionarb","resistradio","softbody","shelltotal","shellreroll","drisk","soaktotal","soakreroll","setsuccesssoak"], function(values) {
+    let soakreroll = parseInt(values.soakreroll)||0;
     let driskdr = parseInt(values.driskdr)||0;
     let drisk = parseInt(values.drisk)||0;
-    let absorption = parseInt(values.absorption)||0;
+    let absorption = parseInt(values.absorptionarb)||0;
     let radio = parseInt(values.resistradio)||0;
     let soaktotal = parseInt(values.soaktotal)||0;
     let raidoalt  = (radio >= 1) ? 1 : 0;
     if(drisk != 0) {
-        let rollString = "&{template:soak} {{name=Soak}} {{rollsoak=[[[[floor(@{soaktotal})]]d6s>5]]}}";
-        if(values.shellreroll == "1") {
-            rollString += "{{rollsoakr1=[[1d6>5]]}}";
+        let rollString = "&{template:soak} {{name=Soak}} {{rollsoak=[[[[floor(@{soaktotal})]]d6s>@{setsuccesssoak}]]}}";
+        if(soakreroll >= "1") {
+            rollString += "{{rollsoakr1=[[@{soakreroll}d6>5]]}}";
         } else {
             // this else branch is just to make the later code easier. In your roll temmplate you'd only display it if it has a value > 0
             rollString += "{{rollsoakr1=[[0]]}}";
         }
         startRoll(rollString, results => {
-            const shelltotal = parseInt(values.shelltotal)||0;
             const roll = results.results.rollsoak.result;
             const reroll_calculated = results.results.rollsoakr1.result;
-            const reroll = (roll != shelltotal) ? reroll_calculated : 0;
+            const rerollmin = (soaktotal - roll <= 0) ? 0 : soaktotal - roll;
+            const reroll = (rerollmin - reroll_calculated <= 0) ? rerollmin : reroll_calculated;
             const total = driskdr - roll - reroll;
             const absconst = ((total <= 0) || (absorption <= 0)) ? 0 : 1;
             const totalfinal = (total <= 0) ? 0 : total;
@@ -1958,20 +2590,14 @@ on("clicked:turn", function() {
     let dot1 = parseInt(values.dot1)||0;
     let dot2 = parseInt(values.dot2)||0;
     let dot3 = parseInt(values.dot3)||0;
-    let bulkcheck = parseInt(values.bulkcheck)||0;
-    let stamtaxinstantmod = parseInt(values.stamtaxinstantmod)||0;
     let speedmax = parseInt(values.speedmax)||0;
-    let paral = parseInt(values.paral)||0;
     let stamtax = parseInt(values.stamtax)||0;
     let offbal = parseInt(values.offbal)||0;
     let stammax = parseInt(values.stammax)||0;
     let heart = parseInt(values.heart)||0;
     let hearttemp = parseInt(values.hearttemp)||0;
     let paraltier = parseInt(values.paraltier)||0;
-    let stamtaxmod = parseInt(values.stamtaxmod)||0;
     let paraldebuff = (paraltier >= 1) ? 1 : 0;
-    let parallock = (paraltier >= 3) ? 0 : 1;
-    let paralfinal = (paral != 0) ? paral - parallock : 0;
     let offbalfinal = (offbal != 0) ? offbal - 1 : 0;
     let dot1final = (dot1 != 0) ? dot1 - 1 : 0;
     let dot2final = (dot2 != 0) ? dot2 - 1 : 0;
@@ -1981,12 +2607,6 @@ on("clicked:turn", function() {
     let heartfinal = (heartmath < 0) ? 0 : heartmath;
     let stammath = stammax - offbal - paraldebuff;
     let stamfinal = (stammath < 0) ? 0 : stammath;
-    setAttrs({
-        "stamtax": stamtaxmod + bulkcheck + stamtaxinstantmod
-    });
-    setAttrs({
-        "stamtaxnebulous": stamtaxmod + bulkcheck + stamtaxinstantmod
-    });
     setAttrs({
         "offbal": offbalfinal
     });
@@ -2024,10 +2644,48 @@ on("clicked:turn", function() {
         "stam": stamfinal
     });
     setAttrs({
-        "paral": paralfinal
+        "speed": speedmax
+    });
+  });
+});
+
+</script>
+
+<script type="text/worker">
+
+on("clicked:endturn", function() {  
+  getAttrs(["se1","se2","se3","stamtax","paral","paraltier","stamtaxmod","stamtaxinstantmod","bulkcheck"], function(values) {
+    let se1 = parseInt(values.se1)||0;
+    let se2 = parseInt(values.se2)||0;
+    let se3 = parseInt(values.se3)||0;
+    let bulkcheck = parseInt(values.bulkcheck)||0;
+    let stamtaxinstantmod = parseInt(values.stamtaxinstantmod)||0;
+    let paral = parseInt(values.paral)||0;
+    let paraltier = parseInt(values.paraltier)||0;
+    let stamtax = parseInt(values.stamtax)||0;
+    let stamtaxmod = parseInt(values.stamtaxmod)||0;
+    let se1final = (se1 != 0) ? se1 - 1 : 0;
+    let se2final = (se2 != 0) ? se2 - 1 : 0;
+    let se3final = (se3 != 0) ? se3 - 1 : 0;
+    let parallock = (paraltier >= 3) ? 0 : 1;
+    let paralfinal = (paral != 0) ? paral - parallock : 0;
+    setAttrs({
+        "se1": se1final
     });
     setAttrs({
-        "speed": speedmax
+        "se2": se2final
+    });
+    setAttrs({
+        "se3": se3final
+    });
+    setAttrs({
+        "stamtax": stamtaxmod + bulkcheck + stamtaxinstantmod
+    });
+    setAttrs({
+        "stamtaxnebulous": stamtaxmod + bulkcheck + stamtaxinstantmod
+    });
+    setAttrs({
+        "paral": paralfinal
     });
   });
 });
diff --git a/Hollow_Knight_Unofficial_TTRPG/HKRPG.png b/Hollow_Knight_Unofficial_TTRPG/HKRPG.png
new file mode 100644
index 0000000000..f7679a9e22
Binary files /dev/null and b/Hollow_Knight_Unofficial_TTRPG/HKRPG.png differ
diff --git a/Hollow_Knight_Unofficial_TTRPG/HKTTRPGpreviewimage.png b/Hollow_Knight_Unofficial_TTRPG/HKTTRPGpreviewimage.png
deleted file mode 100644
index b7f4895bb5..0000000000
Binary files a/Hollow_Knight_Unofficial_TTRPG/HKTTRPGpreviewimage.png and /dev/null differ
diff --git a/Hollow_Knight_Unofficial_TTRPG/sheet.json b/Hollow_Knight_Unofficial_TTRPG/sheet.json
index 5d2a5a5f00..29be65dd59 100644
--- a/Hollow_Knight_Unofficial_TTRPG/sheet.json
+++ b/Hollow_Knight_Unofficial_TTRPG/sheet.json
@@ -1,8 +1,8 @@
 {    
-    "html": "HKTTRPGbetatest1.html",
-    "css": "HKTTRPGbetatest1.css",
+    "html": "HKRPG.html",
+    "css": "HKRPG.css",
     "authors": "Ccmaci",
     "roll20userid": "4023225",
-    "preview": "HKTTRPGpreviewimage.png",
-    "instructions": "This is a beta test for the Unofficial Hollow Knight TTRPG. A second page accounting for spells and classes will be developed in the futureBut as of now, I wish to give players access to what I have completed so far, as to see how affective the character sheet is at simplifying gameplay."
+    "preview": "HKRPG.png",
+    "instructions": "This is a beta test for the Unofficial Hollow Knight TTRPG. More pages accounting for spells and classes will be developed in the future. But as of now, I wish to give players access to what I have completed so far, as to see how affective the character sheet is at simplifying gameplay. So far, page 1 has been 99.9% developed."
 }
\ No newline at end of file