diff --git a/Classified/Classified.css b/Classified/Classified.css
index 51ffcbd0bb..858eff479c 100644
--- a/Classified/Classified.css
+++ b/Classified/Classified.css
@@ -83,7 +83,7 @@
 
 	.sheet-mjrNPCbuttonsGrid {
 		display: grid;
-		grid-template-columns:   max-content max-content;
+		grid-template-columns:   max-content max-content max-content;
 		grid-gap: 10px;		
 	}
 
@@ -3180,7 +3180,7 @@ background: #848c8e;
 .sheet-squadbuttonsGrid
 {
     display: grid;
-    grid-template-columns: max-content max-content;
+    grid-template-columns: max-content max-content max-content;
     grid-gap: 5px;
     line-height: 0px;    
 }
diff --git a/Classified/Classified.html b/Classified/Classified.html
index 7bc9119fe4..71f4e4f395 100644
--- a/Classified/Classified.html
+++ b/Classified/Classified.html
@@ -2136,16 +2136,16 @@
 				<div class="sheet-buttonsWrapper">
 					<div class="sheet-buttonsGrid">
 						<div>
-							<button type="roll" class="sheet-text_roll sheet-Attack btn ui-draggable" value="&{template:damage} {{QR=[[?{SR:|1|2|3|4|}]]}} {{DR=[[?{DR:|A,1|B,2|A,1|B,2|C,3|D,4|E,5|F,6|A,1|F,7|G,8|H,9|I,10|J,10|K,11|L,12|J(3),13|K(3),14|L,15}]]}}" data-i18n="Damage">Damage</button>
+							<button type="roll" class="sheet-text_roll sheet-Attack " value="&{template:damage} {{QR=[[?{SR:|1|2|3|4|}]]}} {{DR=[[?{DR:|A,1|B,2|A,1|B,2|C,3|D,4|E,5|F,6|A,1|F,7|G,8|H,9|I,10|J,10|K,11|L,12|J(3),13|K(3),14|L,15}]]}}" data-i18n="Damage">Damage</button>
 						</div>
 						<div>
-							<button type="roll" class="sheet-text_roll sheet-Attack btn ui-draggable" value="&{template:scar} {{scarRoll=[[1d100]]}} {{scarLocRoll=[[1D100]]}} {{scarChance=[[?{Wound:|MW,5|HW,15|INCAP,25}]]}}" data-i18n="Scar">Scar</button>
+							<button type="roll" class="sheet-text_roll sheet-Attack " value="&{template:scar} {{scarRoll=[[1d100]]}} {{scarLocRoll=[[1D100]]}} {{scarChance=[[?{Wound:|MW,5|HW,15|INCAP,25}]]}}" data-i18n="Scar">Scar</button>
 						</div>
 						<div>
-							<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="&{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDf}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+							<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="&{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDf}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 						</div>
 						<div>
-							<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="&{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDf}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+							<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="&{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDf}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 						</div>
 						<input type="text" name="attr_h2hDf" value="1000" style="display:none">
 					</div>
@@ -4479,11 +4479,14 @@ Fields of Experience:
 						</div>
 						<div class="sheet-mjrNPCbuttonsGrid">
 							<div>
-								<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDf}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+								<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDf}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 							</div>
 							<div>
-								<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDf}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+								<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDf}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 							</div>
+							<div>
+								<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatus1}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+							</div>							
 						</div>						
 						<input type="text" class="sheet-hideIt" value="0" name="attr_wndStatus1">	
 					</div>
@@ -5518,12 +5521,14 @@ Ammo: xx/xx  #x
 </textarea>
 								<div class="sheet-squadbuttonsGrid">
 									<div>
-										<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd1}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+										<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd1}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 									</div>
 									<div>
-										<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd1}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+										<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd1}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+									</div>
+									<div>
+										<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd1}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
 									</div>
-									
 								</div>									
 						</div>
 						<div>
@@ -5569,11 +5574,14 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd2}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd2}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd2}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd2}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
+									<div>
+										<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd2}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+									</div>										
 										
 									</div>									
 							</div>																
@@ -5621,11 +5629,14 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd3}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd3}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd3}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd3}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
+									<div>
+										<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd3}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+									</div>										
 										
 									</div>									
 							</div>																	
@@ -5673,11 +5684,14 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd4}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd4}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd4}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd4}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
+									<div>
+										<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd4}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+									</div>										
 										
 									</div>									
 							</div>																
@@ -5726,11 +5740,14 @@ Ammo: xx/xx  #x
 </textarea>
 								<div class="sheet-squadbuttonsGrid">
 									<div>
-										<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd5}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+										<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd5}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 									</div>
 									<div>
-										<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd5}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+										<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd5}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 									</div>
+									<div>
+										<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd5}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+									</div>									
 									
 								</div>									
 						</div>
@@ -5777,11 +5794,14 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd6}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd6}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd6}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd6}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
+									<div>
+										<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd6}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+									</div>										
 										
 									</div>									
 							</div>																
@@ -5829,11 +5849,14 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd7}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd7}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd7}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd7}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
+									<div>
+										<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd7}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+									</div>										
 										
 									</div>									
 							</div>																	
@@ -5881,11 +5904,14 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd8}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd8}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd8}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd8}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
+									<div>
+										<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd8}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+									</div>										
 										
 									</div>									
 							</div>																
@@ -5934,11 +5960,14 @@ Ammo: xx/xx  #x
 </textarea>
 										<div class="sheet-squadbuttonsGrid">
 											<div>
-												<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd9}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+												<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd9}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 											</div>
 											<div>
-												<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd9}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+												<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd9}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 											</div>
+											<div>
+												<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd9}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+											</div>											
 											
 										</div>									
 								</div>
@@ -5985,11 +6014,14 @@ Ammo: xx/xx  #x
 </textarea>
 											<div class="sheet-squadbuttonsGrid">
 												<div>
-													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd10}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd10}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 												</div>
 												<div>
-													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd10}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd10}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 												</div>
+												<div>
+													<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd10}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+												</div>												
 												
 											</div>									
 									</div>																
@@ -6037,11 +6069,14 @@ Ammo: xx/xx  #x
 </textarea>
 											<div class="sheet-squadbuttonsGrid">
 												<div>
-													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd11}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd11}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 												</div>
 												<div>
-													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd11}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd11}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 												</div>
+												<div>
+													<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd11}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+												</div>												
 												
 											</div>									
 									</div>																	
@@ -6089,11 +6124,14 @@ Ammo: xx/xx  #x
 </textarea>
 											<div class="sheet-squadbuttonsGrid">
 												<div>
-													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd12}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd12}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 												</div>
 												<div>
-													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd12}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack " value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd12}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 												</div>
+												<div>
+													<button type="roll" class="sheet-text_roll sheet-Draw" data-i18n="Draw" value="&amp;{template:drawroll} {{draw=[[1d100+({@{wndStatusSqd12}*20,0}kl1)+(@{speed}*20)+?{Drawing Weapon|No, 0|Yes, -40}+?{Draw Mod.|0}]]}}">Draw</button>
+												</div>												
 												
 											</div>									
 									</div>