diff --git a/Beacon/Assets/hp.png b/Beacon/Assets/hp.png
index 5cea72757d..73a78038d2 100644
Binary files a/Beacon/Assets/hp.png and b/Beacon/Assets/hp.png differ
diff --git a/Beacon/beacon.css b/Beacon/beacon.css
index fa54c213cc..51668abffc 100644
--- a/Beacon/beacon.css
+++ b/Beacon/beacon.css
@@ -3,8 +3,8 @@
 
 /* overall wrapper to fix moving width issues with overflow on hidden sections */
 .charsheet .sheet-overall-wrapper {
-    max-width: 832px;
-	min-width: 700px;
+    max-width: 830px;
+	min-width: 830px;
 }
 
 /* Tweak repeating section buttons so they have a bottom margin and dont overflow when in edit mode. */
@@ -40,21 +40,17 @@
 div.sheet-maintab-content 
 { 
   display: none;
-  /*visibility: hidden;
-  opacity: 0;
-  max-height: 0;
-  overflow: hidden; */
 }
-
+input.sheet-player:checked ~ div.sheet-player,
 input.sheet-update:checked ~ div.sheet-update,
-input.sheet-player:checked ~ div.sheet-player
+input.sheet-monster:checked ~ div.sheet-monster
 {
   display: block;
 }
 
 input.sheet-maintab
 {
-    width: 20%;
+    width: 15%;
     height: 16px;
     cursor: pointer;	
     position: relative;
@@ -62,24 +58,27 @@ input.sheet-maintab
     z-index: 9999;
 }
 
-.charsheet input.sheet-maintab:checked + span.sheet-player,
-.charsheet input.sheet-maintab:checked + span.sheet-update {
-    background: #009e73;    /*GREEN*/
-    color: white;
-	border-radius: 4px;
-}
-
-span.sheet-maintab {
+span.sheet-maintab 
+{
   	text-align: center;
     display: inline-block;    
     width: 15%;
     height: 16px;
-    font-size: 9px;
+    font-size: 10px;
 	background: #ce0632;  /*REDish*/
 	color: white;
 	font-weight: bold;
 	border-radius: 4px;
-	margin-left: -20% 
+	margin-left: -15% 
+}
+
+.charsheet input.sheet-maintab:checked + span.sheet-player,
+.charsheet input.sheet-maintab:checked + span.sheet-update,
+.charsheet input.sheet-maintab:checked + span.sheet-monster
+{
+    background: #009e73;    /*GREEN*/
+    color: white;
+	border-radius: 4px;
 }
 
 div.sheet-maintab-content
@@ -97,7 +96,7 @@ label div
     font-weight: normal;
 }
 
-/* Main Sheet Tabs */
+/* Player Sheet Tabs */
 .charsheet div[class^="sheet-section"] { 	
 	visibility: hidden;
 	opacity: 0;
@@ -117,14 +116,16 @@ label div
 	overflow: auto;
 }
 
-.charsheet input.sheet-tab99:checked ~ div[class^="sheet-section"] { 	
+.charsheet input.sheet-tab99:checked ~ div[class^="sheet-section"] 
+{ 	
 	max-height: 999999px;
 	visibility: visible;
 	opacity: 1;
 	transition: opacity 0.5s linear 0s;
 }
 
-.charsheet input.sheet-tab {
+.charsheet input.sheet-tab 
+{
     width: 87px;
     height: 20px;
     cursor: pointer;	
@@ -133,7 +134,8 @@ label div
 	z-index: 9999;
 }
 
-.charsheet span.sheet-tab {
+.charsheet span.sheet-tab 
+{
 	text-align: center;
     display: inline-block;   
 	font-size: 13px;	
@@ -153,28 +155,30 @@ label div
 .charsheet input.sheet-tab3:checked + span.sheet-tab3,
 .charsheet input.sheet-tab4:checked + span.sheet-tab4,
 .charsheet input.sheet-tab5:checked + span.sheet-tab5,
-.charsheet input.sheet-tab99:checked + span.sheet-tab99 {
+.charsheet input.sheet-tab99:checked + span.sheet-tab99 
+{
     background: #009e73;    
     color: white;
 	border-radius: 4px;
 }
-
-/* END Main sheet tabs */
+/* END Player sheet tabs */
 
 /* Graphic Boxes */
-
-.charsheet .sheet-2colrow .sheet-col {
+.charsheet .sheet-2colrow .sheet-col 
+{
 	width: calc(50% - 3px) !important;
 	height: 32px;
 	margin-right: 2px !important;
 }
 
-.charsheet .sheet-2colrow .sheet-col:last-child {
+.charsheet .sheet-2colrow .sheet-col:last-child 
+{
 	margin-right: 0 !important;
 }
 
 .charsheet input.sheet-AC,
-.charsheet input.sheet-HP {
+.charsheet input.sheet-HP 
+{
 	margin-top: 16px;
 	margin-bottom: 34px;
 	padding: 0px;
@@ -188,7 +192,8 @@ label div
 	border: 0;
 }
 
-.charsheet input.sheet-HP2 {
+.charsheet input.sheet-HP2 
+{
 	margin-top: 16px;
 	margin-bottom: 34px;
 	padding: 0px;
@@ -201,19 +206,20 @@ label div
 	text-align: center;
 	border: 1;
 }
-
-.charsheet .sheet-ACBG {
+.charsheet .sheet-ACBG 
+{
 	background: url('https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Beacon/Assets/shield.png') no-repeat 20% 0% / 6.6em auto;
 }
 
-.charsheet .sheet-HPBG {
+.charsheet .sheet-HPBG 
+{
 	background: url('https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Beacon/Assets/hp.png') no-repeat 20% 0% / 6.6em auto;
 }
-
 /* END Graphic Boxes */
 
 /* Spell Page Settings */
-.charsheet div[class^="sheet-spell-page"] { 	
+.charsheet div[class^="sheet-spell-page"] 
+{ 	
 	visibility: hidden;
 	opacity: 0;
 	max-height:0;
@@ -226,14 +232,16 @@ label div
 .charsheet input.sheet-spelltab3:checked ~ div.sheet-spell-page3,
 .charsheet input.sheet-spelltab4:checked ~ div.sheet-spell-page4,
 .charsheet input.sheet-spelltab5:checked ~ div.sheet-spell-page5,
-.charsheet input.sheet-spelltab6:checked ~ div.sheet-spell-page6 {
+.charsheet input.sheet-spelltab6:checked ~ div.sheet-spell-page6 
+{
 	max-height: 999999px;
 	visibility: visible;
 	opacity: 1;
 	transition: opacity 0.5s linear 0s;
 }
 
-.charsheet input.sheet-spelltab99:checked ~ div[class^="sheet-spell-page"] { 	
+.charsheet input.sheet-spelltab99:checked ~ div[class^="sheet-spell-page"] 
+{ 	
 	max-height: 999999px;
 	visibility: visible;
 	opacity: 1;
@@ -254,7 +262,8 @@ label div
 	border-radius: 4px;
 }
 
-.charsheet input.sheet-spellpagetab {
+.charsheet input.sheet-spellpagetab 
+{
     width: 70px;
     height: 20px;
     cursor: pointer;
@@ -263,7 +272,8 @@ label div
     z-index: 9999;
 }
 
-.charsheet span.sheet-spellpagetab {
+.charsheet span.sheet-spellpagetab 
+{
     text-align: center;
     display: inline-block;    
     font-size: 13px;
@@ -290,7 +300,8 @@ div[data-groupname^="repeating_items"] .repitem,
 }
 
 div[data-groupname^="repeating_"] .repitem,
-.sheet-zero-row {
+.sheet-zero-row 
+{
     border: 1px solid #000000;
 	border-radius: 12px;
 	margin-left: 1px;
@@ -299,7 +310,8 @@ div[data-groupname^="repeating_"] .repitem,
 }
 
 div[data-groupname^="repeating_spellbook"] .repitem,
-.sheet-zero-row {
+.sheet-zero-row 
+{
     border: 1px solid #000000;
 	border-radius: 12px;
 	margin-left: 1px;
@@ -309,21 +321,24 @@ div[data-groupname^="repeating_spellbook"] .repitem,
 
 /* spell type tab Settings */
 
-.charsheet div[class^="sheet-spell-type"] { 	
+.charsheet div[class^="sheet-spell-type"] 
+{ 	
 	visibility: hidden;
 	opacity: 0;
 	max-height:0;
 	overflow: hidden;
 }
 
-.charsheet input.sheet-spelltypeDescription:checked ~ div.sheet-spell-type-Description {
+.charsheet input.sheet-spelltypeDescription:checked ~ div.sheet-spell-type-Description 
+{
 	max-height: 999999px;
 	visibility: visible;
 	opacity: 1;
 	transition: opacity 0.5s linear 0s;
 }
 
-.charsheet input.sheet-spelltypeDescription:checked ~ span.sheet-spelltypeDescription {
+.charsheet input.sheet-spelltypeDescription:checked ~ span.sheet-spelltypeDescription 
+{
     background: rgb(0,158,115);     
     color: white;
 	border-radius: 4px;
@@ -393,19 +408,6 @@ div[data-groupname^="repeating_spellbook"] .repitem,
 	font-weight: bold;
 }
 
-.charsheet .sheet-small-label {
-	font-size: 75%!important;
-	font-style: italic;
-	font-weight: bold;
-}
-
-.charsheet .sheet-small-labelblue {
-    font-size: 75%!important;
-    font-style: italic;
-    font-weight: bold;
-    color: blue;
-}
-
 .charsheet .sheet-large-label {
 	font-size: 90%!important;
 	font-style: italic;
@@ -424,46 +426,6 @@ div[data-groupname^="repeating_spellbook"] .repitem,
 	text-align: center;
 }
 
-.charsheet .sheet-hd-row {
-	margin-top: 5px;
-	font-size: 14px!important;
-}
-
-.charsheet .sheet-pictos {
-	font-family: "Pictos";
-	font-size: 14px;
-}
-
-.charsheet .sheet-pictos-custom {
-	font-family: "Pictos Custom";
-	font-size: 14px;
-}
-
-.charsheet .sheet-pictos-three {
-	font-family: "Pictos Three";
-	font-size: 14px;
-}
-
-.charsheet .sheet-d6-font {
-	font-family: "dicefontd6";
-	font-size: 14px;
-}
-
-.charsheet .sheet-d8-font {
-	font-family: "dicefontd8";
-	font-size: 14px;
-}
-
-.charsheet .sheet-d10-font {
-	font-family: "dicefontd10";
-	font-size: 14px;
-}
-
-.charsheet .sheet-d20-font {
-	font-family: "dicefontd20";
-	font-size: 14px;
-}
-
 .charsheet .sheet-padl,
 .sheet-rolltemplate-DccTabbed .sheet-padl {
 	padding-left:10px;
@@ -496,26 +458,6 @@ div[data-groupname^="repeating_spellbook"] .repitem,
 	box-sizing: border-box;
 }
 
-.sheet-border-right-dotted,
- .sheet-rolltemplate-DccTabbed .sheet-border-right-dotted {
-    border-right: 1px dotted #000;
-}
-
- .sheet-border-left-dotted,
- .sheet-rolltemplate-DccTabbed .sheet-border-left-dotted {
-    border-left: 1px dotted #000;
-}
-
- .sheet-border-top-dotted,
- .sheet-rolltemplate-DccTabbed .sheet-border-top-dotted {
-    border-top: 1px dotted #000;
-}
-
- .sheet-border-bottom-dotted,
- .sheet-rolltemplate-DccTabbed .sheet-border-bottom-dotted {
-    border-bottom: 1px dotted #000;
-}
-
 .charsheet .sheet-border-right {
 	border-right: 1px solid #000;
 }
@@ -541,15 +483,8 @@ div[data-groupname^="repeating_spellbook"] .repitem,
 	box-shadow: 0px -2px 0px 0px #000000 inset;
 }
 
-.charsheet button.sheet-core-save, .charsheet button.sheet-core-check, .charsheet button.sheet-initiative, .charsheet button.sheet-roll {
-	font-size: 12px!important;
-}
-
-.charsheet button.sheet-initiative {
-	height: 3em;
-}
-
-.charsheet hr {
+.charsheet hr 
+{
     border: 0;
     height: 1px;
     background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,75.75), rgba(0,0,0,0)); 
@@ -559,47 +494,53 @@ div[data-groupname^="repeating_spellbook"] .repitem,
 	margin: 5px 0;
 }
 
-.charsheet span.sheet-spacer {
+.charsheet span.sheet-spacer 
+{
 	display: block;
 	margin-top: 5px;
 }
 
-.charsheet .sheet-heading-row {
+.charsheet .sheet-heading-row 
+{
 	text-align: center;
 	font-weight: bold;
 }
 
-.charsheet .sheet-footer-row {
+.charsheet .sheet-footer-row 
+{
 	text-align: center;
 	font-weight: bold;
 	border-bottom: 1px solid #dddddd;
 	margin-bottom: 5px;
 }
 
-.charsheet .sheet-vert-middle {
+.charsheet .sheet-vert-middle 
+{
 	vertical-align: middle!important;
 }
 
-.charsheet .sheet-vert-bottom {
+.charsheet .sheet-vert-bottom 
+{
 	vertical-align: bottom!important;
 }
 
-.charsheet .sheet-center,
-.sheet-rolltemplate-DccTabbed .sheet-center {
+.charsheet .sheet-center
+{
 	text-align: center;
 }
 
-.charsheet .sheet-left,
-.sheet-rolltemplate-DccTabbed .sheet-left {
+.charsheet .sheet-left
+{
 	text-align: left;
 }
 
-.charsheet .sheet-right,
-.sheet-rolltemplate-DccTabbed .sheet-right {
+.charsheet .sheet-right
+{
 	text-align: right;
 }
 
-.charsheet .sheet-centerselect {
+.charsheet .sheet-centerselect 
+{
     margin-left: auto;
     margin-right: auto;
     display: block!important;
@@ -691,17 +632,20 @@ div[data-groupname^="repeating_spellbook"] .repitem,
 	margin: 0; 
 }
 
-.charsheet .sheet-small-note {
+.charsheet .sheet-small-note 
+{
 	text-align: center;
 	font-family: Arial;
 	font-size: 10px;
 }
 
-.charsheet select {
+.charsheet select 
+{
 	font-size: 90%;
 }
 
-.charsheet .sheet-important-text {
+.charsheet .sheet-important-text 
+{
 	text-decoration: underline;
 	color: #ff0000;
 }
@@ -786,21 +730,21 @@ div[data-groupname^="repeating_spellbook"] .repitem,
 }
 
 /* Custom Pure Grid CSS (24 cols) DO NOT EDIT BELOW THIS LINE OR RISK BREAKING FORMATTING */
-.sheet-row,
-.sheet-rolltemplate-DccTabbed .sheet-row {
+.sheet-row
+{
     letter-spacing: -0.31em;
     *letter-spacing: normal;
     *word-spacing: -0.43em;
     text-rendering: optimizespeed;
 }
 
- .sheet-opera-only :-o-prefocus,  .sheet-row, 
- .sheet-rolltemplate-DccTabbed .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-DccTabbed  .sheet-row {
+ .sheet-opera-only :-o-prefocus,  .sheet-row
+{
     word-spacing: -0.43em;
 }
 
- .sheet-col, 
- .sheet-rolltemplate-DccTabbed .sheet-col {
+ .sheet-col
+ {
     display: inline-block;
     zoom: 1; *display: inline;
     letter-spacing: normal;
@@ -809,22 +753,9 @@ div[data-groupname^="repeating_spellbook"] .repitem,
     text-rendering: auto;
 }
 
-.sheet-rolltemplate-DccTabbed .sheet-col-1,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-2,.sheet-rolltemplate-DccTabbed .sheet-col-1-3,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-4,.sheet-rolltemplate-DccTabbed .sheet-col-1-5,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-6,.sheet-rolltemplate-DccTabbed .sheet-col-1-7,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-8,.sheet-rolltemplate-DccTabbed .sheet-col-1-9,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-10,.sheet-rolltemplate-DccTabbed .sheet-col-1-11,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-12,.sheet-rolltemplate-DccTabbed .sheet-col-1-13,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-14,.sheet-rolltemplate-DccTabbed .sheet-col-1-15,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-16,.sheet-rolltemplate-DccTabbed .sheet-col-1-17,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-19,.sheet-rolltemplate-DccTabbed .sheet-col-1-21,
-.sheet-rolltemplate-DccTabbed .sheet-col-1-22,.sheet-rolltemplate-DccTabbed .sheet-col-1-23,
-.sheet-rolltemplate-DccTabbed .sheet-col-2-23,.sheet-rolltemplate-DccTabbed .sheet-col-1-24,
-.sheet-col-1,.sheet-col-1-2,.sheet-col-1-3,.sheet-col-1-4,.sheet-col-1-5,.sheet-col-1-6,
-.sheet-col-1-7,.sheet-col-1-8,.sheet-col-1-9,.sheet-col-1-10, .sheet-col-1-11,.sheet-col-1-12,
-.sheet-col-1-13,  .sheet-col-1-14, .sheet-col-1-15,.sheet-col-1-16,.sheet-col-1-17,.sheet-col-1-18,
-.sheet-col-1-19,.sheet-col-1-20,.sheet-col-1-21,.sheet-col-1-22,.sheet-col-1-23,.sheet-col-1-24
+.sheet-col-1, .sheet-col-1-2, .sheet-col-1-3,.sheet-col-1-4, .sheet-col-1-5,.sheet-col-1-6, .sheet-col-1-7,
+.sheet-col-1-8, .sheet-col-1-9,.sheet-col-1-10, .sheet-col-1-11, .sheet-col-1-12, .sheet-col-1-13,
+.sheet-col-1-14, .sheet-col-1-15,.sheet-col-1-16, .sheet-col-1-17, .sheet-col-1-19
 {
     display: inline-block;
     zoom: 1; 
@@ -835,251 +766,164 @@ div[data-groupname^="repeating_spellbook"] .repitem,
     text-rendering: auto;
 }
 
- .sheet-col-1, 
- .sheet-rolltemplate-DccTabbed .sheet-col-1 {
+.sheet-col-1 {
     display:block;
 }
- .sheet-col-1-2, 
- .sheet-rolltemplate-DccTabbed .sheet-col-1-2 {
+.sheet-col-1-2 {
     width: 50%;
 }
-
- .sheet-offset-1-2, 
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-2 {
+ .sheet-offset-1-2 {
     margin-left: 50%;
 }
 
- .sheet-col-1-3, 
- .sheet-rolltemplate-DccTabbed .sheet-col-1-3 {
+.sheet-col-1-3 {
     width: 33.33333%;
 }
 
- .sheet-offset-1-3, 
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-3 {
+.sheet-offset-1-3 {
     margin-left: 33.33333%;
 }
 
- .sheet-col-1-4, 
- .sheet-rolltemplate-DccTabbed .sheet-col-1-4 {
+.sheet-col-1-4 {
     width: 25%;
 }
 
- .sheet-offset-1-4, 
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-4 {
+.sheet-offset-1-4 {
     margin-left: 25%;
 }
 
- .sheet-col-1-5, 
- .sheet-rolltemplate-DccTabbed .sheet-col-1-5 {
+.sheet-col-1-5 {
     width: 20%;
 }
 
- .sheet-offset-1-5, 
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-5 {
+.sheet-offset-1-5 {
     margin-left: 20%;
 }
 
- .sheet-col-1-6, 
- .sheet-rolltemplate-DccTabbed .sheet-col-1-6 {
+.sheet-col-1-6 {
     width: 16.66667%;
 }
 
- .sheet-offset-1-6, 
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-6 {
+.sheet-offset-1-6 {
     margin-left: 16.66667%;
 }
 
- .sheet-col-1-7,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-7 {
+.sheet-col-1-7 {
     width: 14.28571%;
 }
 
- .sheet-offset-1-7, 
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-7 {
+.sheet-offset-1-7 {
     margin-left: 14.28571%;
 }
 
- .sheet-col-1-8, 
- .sheet-rolltemplate-DccTabbed .sheet-col-1-8 {
+.sheet-col-1-8 {
     width: 12.5%;
 }
 
- .sheet-offset-1-8, 
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-8 {
+.sheet-offset-1-8 {
     margin-left: 12.5%;
 }
 
- .sheet-col-1-9,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-9 {
+.sheet-col-1-9 {
     width: 11.11111%;
 }
 
- .sheet-offset-1-9,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-9 {
+.sheet-offset-1-9 {
     margin-left: 11.11111%;
 }
 
- .sheet-col-1-10,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-10 {
+.sheet-col-1-10 {
     width: 10%;
 }
 
- .sheet-offset-1-10,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-10 {
+.sheet-offset-1-10 {
     margin-left: 10%;
 }
 
- .sheet-col-1-11,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-11 {
+.sheet-col-1-11 {
     width: 9.09091%;
 }
 
- .sheet-offset-1-11,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-11 {
+.sheet-offset-1-11 {
     margin-left: 9.09091%;
 }
 
- .sheet-col-1-12,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-12 {
+.sheet-col-1-12 {
     width: 8.33333%;
 }
 
- .sheet-offset-1-12,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-12 {
+.sheet-offset-1-12 {
     margin-left: 8.33333%;
 }
 
- .sheet-col-1-13,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-13 {
+ .sheet-col-1-13 {
     width: 7.69231%;
 }
 
- .sheet-offset-1-13,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-13 {
+.sheet-offset-1-13 {
     margin-left: 7.69231%;
 }
 
- .sheet-col-1-14,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-14 {
+.sheet-col-1-14 {
     width: 7.14286%;
 }
 
- .sheet-offset-1-14,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-14 {
+.sheet-offset-1-14 {
     margin-left: 7.14286%;
 }
 
- .sheet-col-1-15,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-15 {
+.sheet-col-1-15 {
     width: 6.66667%;
 }
 
- .sheet-offset-1-15,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-15 {
+.sheet-offset-1-15 {
     margin-left: 6.66667%;
 }
 
- .sheet-col-1-16,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-16 {
+.sheet-col-1-16 {
     width: 6.25%;
 }
 
- .sheet-offset-1-16,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-16 {
+.sheet-offset-1-16 {
     margin-left: 6.25%;
 }
- .sheet-col-1-17,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-17 {
+.sheet-col-1-17 {
     width: 5.88235%;
 }
 
- .sheet-offset-1-17,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-17 {
+.sheet-offset-1-17 {
     margin-left: 5.88235%;
 }
 
- .sheet-col-1-18,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-18 {
+.sheet-col-1-18 {
     width: 5.55556%;
 }
 
- .sheet-offset-1-18,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-18 {
+.sheet-offset-1-18 {
     margin-left: 5.55556%;
 }
 
- .sheet-col-1-19,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-19 {
+.sheet-col-1-19 {
     width: 5.26316%;
 }
 
- .sheet-offset-1-19,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-19 {
+.sheet-offset-1-19 {
     margin-left: 5.26316%;
 }
-
- .sheet-col-1-20,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-20 {
-    width: 5%;
-}
-
- .sheet-offset-1-20,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-20 {
-    margin-left: 5%;
-}
- .sheet-col-1-21,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-21 {
-    width: 4.7619%;
-}
-
- .sheet-offset-1-21,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-21 {
-    margin-left: 4.7619%;
-}
- .sheet-col-1-22,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-22 {
-    width: 4.54545%;
-}
-
- .sheet-offset-1-22,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-22 {
-    margin-left: 4.54545%;
-}
-
- .sheet-col-1-23,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-23 {
-    width: 4.34783%;
-}
-
- .sheet-offset-1-23,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-23 {
-    margin-left: 4.34783%;
-}
-
- .sheet-col-1-24,
- .sheet-rolltemplate-DccTabbed .sheet-col-1-24 {
-    width: 4.16667%;
-}
-
- .sheet-offset-1-24,
- .sheet-rolltemplate-DccTabbed .sheet-offset-1-24 {
-    margin-left: 4.16667%;
-}
         
- .sheet-row-r,
- .sheet-rolltemplate-DccTabbed .sheet-row-r {
+.sheet-row-r {
     letter-spacing: -0.31em; 
     *letter-spacing: normal; 
     word-spacing: -0.43em; 
 }
 
- .sheet-opera-only :-o-prefocus,  .sheet-row-r,
- .sheet-rolltemplate-DccTabbed .sheet-opera-only :-o-prefocus, .sheet-rolltemplate-DccTabbed .sheet-row-r {
+ .sheet-opera-only :-o-prefocus,  .sheet-row-r
+{
     word-spacing: -0.43em;
 }
 
- .sheet-row-r img,
- .sheet-rolltemplate-DccTabbed .sheet-row-r img {
+ .sheet-row-r img
+ img {
     max-width: 100%;
 }
 
diff --git a/Beacon/beacon.html b/Beacon/beacon.html
index 6eb3c70509..c3ffffd735 100644
--- a/Beacon/beacon.html
+++ b/Beacon/beacon.html
@@ -7,11 +7,13 @@
 	<hr/>
 	<!-- switch between play and update mode -->
 	<div class="sheet-col-1-3"><input class="sheet-underlined sheet-center" type="text" placeholder="Player Name" name="attr_playerName"></div>
-	<div class="sheet-col-1-4">&nbsp;</div>
+	<div class="sheet-col-1-6">&nbsp;</div>
 	<input type="radio" name="attr_maintab" class="sheet-maintab sheet-player" value="1" title="Use Play mode for regular play" checked="checked" />
 	<span class="sheet-maintab sheet-player">Play Mode</span>
 	<input type="radio" name="attr_maintab" class="sheet-maintab sheet-update" value="2" title="Use Update Mode to level up, change your base stats, race, hp etc." />
 	<span class="sheet-maintab sheet-update">Update Mode</span>
+	<input type="radio" name="attr_maintab" class="sheet-maintab sheet-monster" value="3" title="Use Monster Mode for important NPC's and monsters." />
+	<span class="sheet-maintab sheet-monster">Monster Mode</span>
 	<!-- BEACON CHARACTER SHEET -->
 	<div class="sheet-maintab-content sheet-player">
 		<input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" checked="checked"/>
@@ -339,7 +341,7 @@
 							<div class="sheet-col-1 sheet-padb"></div>
 							<div class="sheet-row">
 								<div class="sheet-col-1-11 sheet-vert-middle sheet-checkbox-row"><input type="checkbox" name="attr_meleeEquip" checked /></div>
-								<div class="sheet-col-1-14 sheet-padl"><input type="number" name="attr_meleeCount" min="0" value="1"></div>
+								<div class="sheet-col-1-14 sheet-padl"><input type="number" name="attr_meleeCount" min="1" value="1"></div>
 								<div class="sheet-col-1-3 sheet-padl"><input type="text" name="attr_meleeWeaponName"></div>
 								<div class="sheet-col-1-14 sheet-padl"><input class=" sheet-center sheet-highlight" type="number" name="attr_meleeToHit" readonly="readonly"></div>
 								<div class="sheet-col-1-14 sheet-padl"><input class="sheet-center sheet-highlight" type="text" name="attr_meleeDam" readonly="readonly"></div>	
@@ -359,8 +361,10 @@
 										<div class="sheet-col-1-10 sheet-padl" title="The attack bonus will be added to the attack rolls."><input class="sheet-center" type="number" name="attr_meleeAtkMod" value="0"></div>
 										<div class="sheet-col-1-10 sheet-padl" title="The magic bonus will be added to BOTH the attack and damage rolls."><input class="sheet-center" type="number" name="attr_meleeMagic" value="0"></div>
 										<div class="sheet-col-1-10 sheet-padl" title="The damage bonus will be added to damage rolls."><input class="sheet-center" type="number" name="attr_meleeDamMod" value="0"></div>		
-										<div class="sheet-col-1-7 sheet-padl" title="Light Weapons do 3, heavy weapons do 4, Rogues can use DEXbonus to hit, Two-Handed +1 Damage.">
+										<div class="sheet-col-1-7 sheet-padl" title="Small and Light Weapons do 3, heavy weapons do 4, Rogues can use DEXbonus to hit, Two-Handed +1 Damage.">
 										<select name="attr_meleeWeaponsize">
+											<option value="small">Small</option>
+											<option value="small-rogue">Small (Rogues)</option>
 											<option value="light" selected="selected">Light</option>
 											<option value="light-rogue">Light (Rogues)</option>
 											<option value="heavy">Heavy</option>
@@ -433,8 +437,9 @@
 										<option value="thrown">Thrown</option>								
 									</select>
 								</div>		
-								<div class="sheet-col-1-10 sheet-padl" title="Light Weapons do 3, heavy weapons do 4">
+								<div class="sheet-col-1-10 sheet-padl" title="Small/light Weapons do 3, heavy weapons do 4">
 									<select name="attr_rangedWeaponsize">
+										<option value="small">Small</option>
 										<option value="light" selected="selected">Light</option>
 										<option value="heavy">Heavy</option>			
 									</select>
@@ -475,7 +480,7 @@
 						<div class="sheet-row">
 							<div class="sheet-col-1-8 sheet-padl sheet-vert-middle sheet-checkbox-row"><input type="checkbox" name="attr_containerEquip" checked /></div>
 							<div class="sheet-col-1-3 sheet-padl sheet-center"><input type="text" name="attr_containerName"></div>
-							<div class="sheet-col-1-8 sheet-padl sheet-center"><input type="number" value="0" min="0" name="attr_containerWeight"></div>
+							<div class="sheet-col-1-8 sheet-padl sheet-center"><input type="number" value="1" min="1" name="attr_containerWeight"></div>
 							<input type="checkbox" name="attr_containerShowContent" class="sheet-spelltypetab sheet-spelltypeDescription" value="1"/>
 							<span class="sheet-col-1-14 sheet-spelltypetab sheet-spelltypeDescription">Contents</span>
 							<div class="sheet-spell-type-Description">
@@ -577,13 +582,13 @@
 						<div class="sheet-row sheet-sub-header">
 							<div class="sheet-col-1-17 sheet-vert-bottom sheet-padl sheet-center">Dead?</div>
 							<div class="sheet-col-1-6 sheet-vert-bottom sheet-center">Name</div>
-							<div class="sheet-col-1-12 sheet-vert-bottom sheet-center">Morale</div>
 							<div class="sheet-col-1-12 sheet-vert-bottom sheet-center">Max HP</div>
 							<div class="sheet-col-1-12 sheet-vert-bottom sheet-center">Damage</div>
 							<div class="sheet-col-1-16 sheet-vert-bottom sheet-center">AC</div>
 							<div class="sheet-col-1-12 sheet-vert-bottom sheet-center">Attack Bonus</div>
 							<div class="sheet-col-1-12 sheet-vert-bottom sheet-center">Attack Dmg</div>
 							<div class="sheet-col-1-16 sheet-vert-bottom sheet-center">Ammo</div>
+							<div class="sheet-col-1-12 sheet-vert-bottom sheet-center">Morale</div>
 						</div>
 					<!-- BEGIN companion row -->
 					<fieldset class="repeating_companionList">
@@ -591,28 +596,28 @@
 							<div class="sheet-col-1 sheet-padb"></div>
 							<div class="sheet-row">
 								<div class="sheet-col-1-17 sheet-vert-middle sheet-checkbox-row"><input type="checkbox" name="attr_companionDead"/></div>
-								<div class="sheet-col-1-6 sheet-vert-middle"><input type="text" class=" sheet-center" name="attr_companionName"></div>
-								<div class="sheet-col-1-12 sheet-vert-middle"><input type="number" name="attr_companionMorale" value="0" min="-10" max="10"></div>
-								<div class="sheet-col-1-12 sheet-vert-middle"><input type="number" class="sheet-center" name="attr_companionMaxHP" value="0"></div>
+								<div class="sheet-col-1-6 sheet-vert-middle"><input type="text" class="sheet-center" name="attr_companionName"></div>
+								<div class="sheet-col-1-12 sheet-vert-middle sheet-padl"><input type="number" class="sheet-center" name="attr_companionMaxHP" value="0"></div>
 								<div class="sheet-col-1-12 sheet-vert-middle"><input type="number" class="sheet-center" name="attr_companionDamage" value="0"></div>
-								<div class="sheet-col-1-16 sheet-vert-middle"><input type="number" class="sheet-center" name="attr_companionAC" value="10"></div>
-								<div class="sheet-col-1-12 sheet-vert-middle"><input type="number" class="sheet-center" name="attr_companionTohit" value="0"></div>
+								<div class="sheet-col-1-16 sheet-vert-middle sheet-padl"><input type="number" class="sheet-center" name="attr_companionAC" value="10"></div>
+								<div class="sheet-col-1-12 sheet-vert-middle sheet-padl"><input type="number" class="sheet-center" name="attr_companionTohit" value="0"></div>
 								<div class="sheet-col-1-12 sheet-vert-middle"><input type="number" class="sheet-center" name="attr_companionAttackDamage" value="0"></div>
-								<div class="sheet-col-1-16 sheet-vert-middle"><input type="number" class="sheet-center" name="attr_companionAmmo" value="0"></div>
+								<div class="sheet-col-1-16 sheet-vert-middle sheet-padl"><input type="number" class="sheet-center" name="attr_companionAmmo" value="0"></div>
+								<div class="sheet-col-1-12 sheet-vert-middle sheet-padl"><input type="number" class="sheet-center" name="attr_companionMorale" value="0" min="-10" max="10"></div> 
 								<input type="checkbox" name="attr_companionButton" class="sheet-spelltypetab sheet-spelltypeDescription" value="1"/>
 								<span class="sheet-col-1-14 sheet-spelltypetab sheet-spelltypeDescription">Notes</span>
 								<div class="sheet-spell-type-Description">
 									<div class="sheet-row">
 										<div class="sheet-col-1-3 sheet-vert-bottom sheet-center">Companion Notes</div>
-										<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-padl">Companion Inventory</div>
+										<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-padl">Companion Inventory</div>		
 										<div class="sheet-row">
 											<div class="sheet-col-1-3 sheet-center sheet-padl"><textarea class="sheet-medium" name="attr_companionNotes"></textarea></div>
-											<div class="sheet-col-1-3 sheet-center sheet-padl"><textarea class="sheet-medium" name="attr_companionInventory"></textarea></div>
+											<div class="sheet-col-1-3 sheet-center sheet-padl"><textarea class="sheet-medium" name="attr_companionInventory"></textarea></div>	
 											<div class="sheet-col-1-3 sheet-center">
 												<div class="sheet-row">
 													<div class="sheet-col-1-3 sheet-vert-bottom sheet-center">Load</div>
 													<div class="sheet-col-1-3 sheet-vert-bottom sheet-center sheet-padl">Silver Owed</div>
-												</div>
+												</div>	
 												<div class="sheet-row">
 													<div class="sheet-col-1-3 sheet-vert-middle"><input type="number" class="sheet-center" name="attr_companionWeight" value="1"></div>
 													<div class="sheet-col-1-3 sheet-vert-middle sheet-padl"><input type="number" class="sheet-center" name="attr_companionOwed" value="1"></div>
@@ -670,7 +675,7 @@
 		<!-- Caster Spellbooks -->
 			<div class="sheet-Caster">
 				<h3 class="sheet-center">Spell Book</h3>
-				<p class="sheet-small-note"> Magic Attack = (level +MIND bonus) vs. target DC (usually 10).</p>
+				<p class="sheet-small-note">Casting Roll: Primary Skill + [MIND or CHA] bonus vs. spell level + target DC (usually 10).</p>
 				<input type="radio" name="attr_spellpagetab" class="sheet-spellpagetab sheet-spelltab0" value="0" title="Level 0" checked="checked"/>
 				<span class="sheet-spellpagetab sheet-spelltab0">Level 0</span>		
 				<input type="radio" name="attr_spellpagetab" class="sheet-spellpagetab sheet-spelltab1" value="1" title="Level 1"/>
@@ -1108,13 +1113,91 @@
 			</div>
 	</div>
 	<!-- SHEET END Update Mode -->
+	<!-- SHEET Monster Mode -->
+	<div class="sheet-maintab-content sheet-monster">
+		<h3 class="sheet-center">MONSTERS and NPCs</h3>
+		<div class="sheet-row">
+			<div class="sheet-col-1-2 sheet-padr">
+					<div class="sheet-row">
+						<div class="sheet-col-1-2 sheet-center"><input class="sheet-underlined sheet-center" type="text" placeholder="Monster Name" name="attr_monster_name"><br/>Monster Name</div>
+						<div class="sheet-col-1-2 sheet-center"><input class="sheet-center sheet-underlined" type="text" placeholder="Type/Title" name="attr_monsterTitle"><br/>Title</div>
+					</div>
+					<div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+					<div class="sheet-row">
+						<div class="sheet-row sheet-sub-header">
+							<div class="sheet-col-1-6 sheet-center sheet-vert-bottom">HD/Level</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-bottom">HD Type</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-bottom">HP</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-bottom">AC</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-bottom">Atk Mod</div>
+							<div class="sheet-col-1-6 sheet-center sheet-vert-bottom">Dmg Mod</div>
+						</div>
+						<div class="sheet-col-1-6 sheet-padl sheet-center"><input class="sheet-center" type="number" name="attr_MonsterHD" value="1" min="0"></div>
+						<div class="sheet-col-1-6 sheet-padl sheet-center"><select name="attr_monsterHDtype">
+							<option value="4">d4</option>
+							<option value="6">d6</option>
+							<option value="8" selected="selected">d8</option>
+							<option value="10">d10</option>
+							<option value="12">d12</option>
+							<option value="20">d20</option>								
+						</select></div>
+						<div class="sheet-col-1-6 sheet-padl sheet-center"><input class="sheet-center" type="number" name="attr_MonsterHP" value="1"></div>
+						<div class="sheet-col-1-6 sheet-padl sheet-center"><input class="sheet-center" type="number" name="attr_MonsterAC" value="10" min="0"></div>
+						<div class="sheet-col-1-6 sheet-padl sheet-center"><input class="sheet-center" type="number" name="attr_MonsterATKmod" value="0"></div>
+						<div class="sheet-col-1-6 sheet-padl sheet-center"><input class="sheet-center" type="number" name="attr_MonsterDMGmod" value="0"></div>
+					</div>
+					<div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+			</div>
+			<div class="sheet-col-1-2 sheet-padr">
+					<div class="sheet-row">
+						<div class="sheet-col-1-4">
+							<div class="sheet-ACBG">
+								<div class="sheet-col-1-4 sheet-center">&nbsp;</div>
+								<div class="sheet-col-1-3 sheet-center"><input title="Base AC is 10 plus armour, dex and other bonuses/penalties" class="sheet-AC" type="number" name="attr_MAC" value="@{MonsterAC}" disabled="disabled"/><br/>.</div>
+							</div>
+						</div>
+						<div class="sheet-col-1-4">
+							<div class="sheet-HPBG">
+								<div class="sheet-col-1-4 sheet-center">&nbsp;</div>
+								<div class="sheet-col-1-3 sheet-center "><input title="Total HP minus damage and spell fatigue." class="sheet-HP" type="text" name="attr_MonsterCurrentHP" value="(@{MonsterHP})-(@{MonsterUsedHP}+@{Monsterfatigue})" disabled="disabled"/><br/>.</div>
+							</div>
+						</div>
+						<div class="sheet-col-1-5 sheet-padl sheet-center"><input title="HP damage taken." class="sheet-HP2 sheet-center" type="number" name="attr_MonsterUsedHP" value="0"/><span>Damage<span></div>
+						<div class="sheet-col-1-5 sheet-padl sheet-center"><input title="HP used for spell casting." class="sheet-HP2 sheet-center" type="number" name="attr_Monsterfatigue" value="0"/><span>Spell Fatigue<span></div>
+					</div>
+					<div class="sheet-row">
+						<div class="sheet-col-1-4 sheet-center">Armor Class</div>
+						<div class="sheet-col-1-4 sheet-center">Current Hit Points</div>
+					</div>
+					<div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+					<div class="sheet-row sheet-padl">
+						<div class="sheet-col-1-6 sheet-padl sheet-center"><input class="sheet-center" type="number" name="attr_MonsterSuggestedHP" value="(@{monsterHDtype}*@{MonsterHD})" disabled="disabled"><span>Suggested HP</span></div>
+						<div class="sheet-col-1-7 sheet-padl sheet-center" title="Base Attack Bonus"><input class="sheet-center" type="number" name="attr_showATK" value="(@{MonsterHD}+@{MonsterATKmod})" disabled="disabled"><span>Attack Bonus</span></div>
+						<div class="sheet-col-1-7 sheet-padl sheet-center" title="Base Damage"><input class="sheet-center" type="number" name="attr_monsterDAM" value="((@{monsterHDtype}/2)+@{MonsterDMGmod})" disabled="disabled"><span>Base Damage</span></div>
+						<div class="sheet-col-1-7 sheet-padl sheet-center" title="Number of Attacks"><input class="sheet-center" type="number" name="attr_monsterNumATK" value="1"><span># Attacks</span></div>
+						<div class="sheet-col-1-6 sheet-padl sheet-center"><input class="sheet-center" type="number" name="attr_showMonsterSpeed" value="30" min="0" step="5"><span>Speed</span></div>
+						<div class="sheet-col-1-6 sheet-padl sheet-center" title="Morale"><input class="sheet-center" type="number" name="attr_MonsterMorale" value="0" min="-10" max="10"><span>Morale</span></div>
+					</div>
+			</div>		
+		</div>
+			<div class="sheet-col-1-1">							
+				<h4 class="sheet-center">Notes</h4>
+				<div class="sheet-row">
+					<div class="sheet-col-1-3 sheet-padl"><textarea name="attr_MonsterNotes"></textarea></div>
+					<div class="sheet-col-1-3 sheet-padl"><textarea name="attr_MonsterNotes2"></textarea></div>
+					<div class="sheet-col-1-3 sheet-padl"><textarea name="attr_MonsterNotes3"></textarea></div>
+				</div>			
+			</div>	
+	</div>
+	<!-- SHEET END Monster Mode -->
 	<div class="sheet-row">
 		<div class="sheet-col-1-2 sheet-left sheet-margin-bottom"><p class="sheet-last-updated">Rules available at: https://beacond20.blogspot.com/p/get-beacon.html</p></div>
-		<div class="sheet-col-1-2 sheet-right sheet-margin-bottom"><p class="sheet-last-updated">Sheet last updated Sept 2021</p></div>
+		<div class="sheet-col-1-2 sheet-right sheet-margin-bottom"><p class="sheet-last-updated">Sheet last updated January 2022</p></div>
 	</div>
 </div>
 
 <script type="text/worker">
+
 on("sheet:opened change:str change:mind change:dex change:cha change:strMod change:mindMod change:dexMod change:chaMod change:strDam change:mindDam change:dexDam change:chaDam change:dexPenalty change:phys change:subt change:know change:comm change:surv change:craf change:physMod change:subtMod change:knowMod change:commMod change:survMod change:crafMod", function() {
   getAttrs(["str","mind","dex","dexPenalty","cha","strMod","mindMod","dexMod","chaMod","strDam","mindDam","dexDam","chaDam","phys","subt","know","comm","surv","craf","physMod","subtMod","knowMod","commMod","survMod","crafMod", "currentEncumbrance"], function(v) {
   var Str = parseInt(v["str"])||0;
@@ -1162,19 +1245,19 @@ on("sheet:opened change:str change:mind change:dex change:cha change:strMod chan
 			dexPenaltyText : dexpentext,
 			chaCurrent : Cha+CMod-CDam,
 			chaBonus : Math.floor((Cha+CMod-CDam)/2)-5,
-			physBonus : Phys+PhysMod,
-			subtBonus : Subt+SubtMod,
-			knowBonus : Know+KnowMod,
-			commBonus : Comm+CommMod,
-			survBonus : Surv+SurvMod,
-			crafBonus : Craf+CrafMod,
+			physBonus : Math.floor((Phys+PhysMod)/2),
+			subtBonus : Math.floor((Subt+SubtMod)/2),
+			knowBonus : Math.floor((Know+KnowMod)/2),
+			commBonus : Math.floor((Comm+CommMod)/2),
+			survBonus : Math.floor((Surv+SurvMod)/2),
+			crafBonus : Math.floor((Craf+CrafMod)/2),
 			encumbrance : calcEncum
         });
   });
 });
 
 // set race abilities and HD
-on("change:Race sheet:opened", function() {
+on("sheet:opened change:Race", function() {
   getAttrs(["Race"], function(v) {
   var RACE = v.Race;
   var HD = "?";
@@ -1197,35 +1280,43 @@ on("change:Race sheet:opened", function() {
 });
 
 //set base attack and damage bonus for class and level
-on("change:Class change:Level sheet:opened", function() {
-	getAttrs(["Class","Level"], function(v) { 
+on("sheet:opened change:Class change:Level change:physBonus", function() {
+	getAttrs(["Class","Level","physBonus"], function(v) { 
 			
 			var level=parseInt(v.Level)||1;
+			var physb=parseInt(v.physBonus)||0
 			var damage=parseInt(0);
 			var attack=parseInt(0);
 			var numAttacks=parseInt(1);
 			var skills = "";
 			
 			switch (v.Class) {
-			case "Fighter" : attack=level; damage=Math.floor((1+level)/2); numAttacks=Math.floor(level/5)+1; skills1="Fighters start with +3 Physical, +1 to attack and damage, and 1 Bonus HP."; skills2="+1 Physical at levels 3/6/9/12. +1 to attack/level, +1 damage every 2 levels. Additional attacks at levels 5 and 10. +1 Bonus HP every level."; break;
-			case "Cleric" : attack=Math.floor(level/2); numAttacks=Math.floor(level/10)+1; skills1="The Cleric starts with +3 points in Communion.  They cast Divine magic."; skills2="+1 Communion at levels 4/8/12."; break;
-			case "Rogue" : attack=Math.floor(level/2); numAttacks=Math.floor(level/10)+1; skills1="Rogues start with +2 points Subterfuge and +1 in any other skill."; skills2="+1 any skill at levels 2/4/6/8/10/12."; break;
-			case "Hunter" : attack=Math.floor((level)/2)+1; numAttacks=Math.floor(level/8)+1; skills1="The Hunter starts with +2 points in Survival,+1 Physical and +1 to attack."; skills2="+1 Survival at levels 3/6/9/12. +1 attack every 2 levels and an additional attack at level 8."; break;
-			case "Mage" : attack=Math.floor(level/3); skills1="Mages start with +3 Knowledge. They cast Arcane magic."; skills2="+1 Knowledge at levels 4/8/12."; break;
-			case "Druid" : attack=Math.floor(level/2); skills1="The Druid starts with +1 Communion and +2 Survival.  They cast Divine magic."; skills2="+1 Communion or Surival at levels 3/6/9/12."; break;
-			case "Enchanter" : attack=Math.floor(level/3); skills1="Enchanter starts with +2 Communion and +1 Subterfuge.  They cast Arcane magic."; skills2="+1 Communion or Subterfuge at levels 4/8/12."; break;
+			//case "Fighter" : attack=level; damage=Math.floor((1+level)/2); numAttacks=Math.floor(level/5)+1; skills1="Fighters start with +3 Physical, +1 to attack and damage, and 1 Bonus HP."; skills2="+1 Physical at levels 3/6/9/12. +1 to attack/level, +1 damage every 2 levels. Additional attacks at levels 5 and 10. +1 Bonus HP every level."; break;
+			//case "Cleric" : attack=Math.floor(level/2); numAttacks=Math.floor(level/10)+1; skills1="The Cleric starts with +3 points in Communion.  They cast Divine magic."; skills2="+1 Communion at levels 4/8/12."; break;
+			//case "Rogue" : attack=Math.floor(level/2); numAttacks=Math.floor(level/10)+1; skills1="Rogues start with +2 points Subterfuge and +1 in any other skill."; skills2="+1 any skill at levels 2/4/6/8/10/12."; break;
+			//case "Hunter" : attack=Math.floor((level)/2)+1; numAttacks=Math.floor(level/8)+1; skills1="The Hunter starts with +2 points in Survival,+1 Physical and +1 to attack."; skills2="+1 Survival at levels 3/6/9/12. +1 attack every 2 levels and an additional attack at level 8."; break;
+			//case "Mage" : attack=Math.floor(level/3); skills1="Mages start with +3 Knowledge. They cast Arcane magic."; skills2="+1 Knowledge at levels 4/8/12."; break;
+			//case "Druid" : attack=Math.floor(level/2); skills1="The Druid starts with +1 Communion and +2 Survival.  They cast Divine magic."; skills2="+1 Communion or Surival at levels 3/6/9/12."; break;
+			//case "Enchanter" : attack=Math.floor(level/3); skills1="Enchanter starts with +2 Communion and +1 Subterfuge.  They cast Arcane magic."; skills2="+1 Communion or Subterfuge at levels 4/8/12."; break;
+			case "Fighter" : attack=physb+1; damage=physb+1; numAttacks=Math.floor(level/5)+1; skills1="Fighters start with +3 Physical, +1 to attack and damage, and 1 Bonus HP."; skills2="+1 Physical at levels 3/6/9/12. +1 to attack/level, +1 damage every 2 levels. Additional attacks at levels 5 and 10. +1 Bonus HP every level."; break;
+			case "Cleric" : attack=physb; numAttacks=Math.floor(level/10)+1; skills1="The Cleric starts with +3 points in Communion.  They cast Divine magic."; skills2="+1 Communion at levels 3/6/9/12."; break;
+			case "Rogue" : attack=physb; numAttacks=Math.floor(level/10)+1; skills1="Rogues start with +2 points Subterfuge and +1 in any other skill."; skills2="+1 any skill at levels 2/4/6/8/10/12."; break;
+			case "Hunter" : attack=physb+1; numAttacks=Math.floor(level/8)+1; skills1="The Hunter starts with +2 points in Survival,+1 Physical and +1 to attack."; skills2="+1 Survival at levels 3/6/9/12. +1 attack every 2 levels and an additional attack at level 8."; break;
+			case "Mage" : attack=physb; skills1="Mages start with +3 Knowledge. They cast Arcane magic."; skills2="+1 Knowledge at levels 3/6/9/12."; break;
+			case "Druid" : attack=physb; numAttacks=Math.floor(level/10)+1; skills1="The Druid starts with +3 Survival.  They cast Divine magic."; skills2="+1 Surival at levels 3/6/9/12."; break;
+			case "Enchanter" : attack=physb; skills1="Enchanter starts with +1 Knowledge and +2 Subterfuge.  They cast Arcane magic."; skills2="+1 Subterfuge at levels 3/6/9/12."; break;
 			}
 		setAttrs({ATK : attack, DAM : damage, numATK : numAttacks, classStart: skills1, classProg : skills2});
 	})
 });
 
 //calculate encumbrance
-on("sheet:opened change:encumbrance change:containerLoadTotal change:itemcount change:itemcount2 change:itemcount3 change:itemcount4 change:meleeLoadTotal change:rangedLoadTotal change:armorLoadTotal change:CP change:SP change:GP change:PP", function() {
+var recalculateEncumbrance = function recalculateEncumbrance() {
 	getAttrs(["containerLoadTotal","itemcount","itemcount2","itemcount3","itemcount4", "CP", "SP", "GP", "PP", "armorLoadTotal", "rangedLoadTotal", "meleeLoadTotal"], function(v) {
 		
-	var armorLoad = v.armorLoadTotal;
-	var rangedLoad = v.rangedLoadTotal;
-	var meleeLoad = v.meleeLoadTotal;
+	var armorLoad = parseInt(v.armorLoadTotal)||0;
+	var rangedLoad = parseInt(v.rangedLoadTotal)||0;
+	var meleeLoad = parseInt(v.meleeLoadTotal)||0;
 	var totalCombatLoad = (armorLoad + rangedLoad + meleeLoad);
 	
 	var water = parseInt(v.itemcount)||0;
@@ -1251,27 +1342,50 @@ on("sheet:opened change:encumbrance change:containerLoadTotal change:itemcount c
 	
 		});
 	})
-});
-/* ---- BEGIN: TheAaronSheet.js ---- */
-// Github:   https://github.com/shdwjk/TheAaronSheet/blob/master/TheAaronSheet.js
-// By:       The Aaron, Arcane Scriptomancer
-// Contact:  https://app.roll20.net/users/104025/the-aaron
-// Minified with http://jscompress.com/
-var TAS=TAS||function(){"use strict";var a="0.2.4",b=1457098091,c={debug:{key:"debug",title:"DEBUG",color:{bgLabel:"#7732A2",label:"#F2EF40",bgText:"#FFFEB7",text:"#7732A2"}},error:{key:"error",title:"Error",color:{bgLabel:"#C11713",label:"white",bgText:"#C11713",text:"white"}},warn:{key:"warn",title:"Warning",color:{bgLabel:"#F29140",label:"white",bgText:"#FFD8B7",text:"black"}},info:{key:"info",title:"Info",color:{bgLabel:"#413FA9",label:"white",bgText:"#B3B2EB",text:"black"}},notice:{key:"notice",title:"Notice",color:{bgLabel:"#33C133",label:"white",bgText:"#ADF1AD",text:"black"}},log:{key:"log",title:"Log",color:{bgLabel:"#f2f240",label:"black",bgText:"#ffff90",text:"black"}},callstack:{key:"TAS",title:"function",color:{bgLabel:"#413FA9",label:"white",bgText:"#B3B2EB",text:"black"}},callstack_async:{key:"TAS",title:"ASYNC CALL",color:{bgLabel:"#413FA9",label:"white",bgText:"#413FA9",text:"white"}},TAS:{key:"TAS",title:"TAS",color:{bgLabel:"grey",label:"black;background:linear-gradient(#304352,#d7d2cc,#d7d2cc,#d7d2cc,#304352)",bgText:"grey",text:"black;background:linear-gradient(#304352,#d7d2cc,#d7d2cc,#d7d2cc,#304352)"}}},d={debugMode:!1,logging:{log:!0,notice:!0,info:!0,warn:!0,error:!0,debug:!1}},e=[],f={},g=function(a){switch(typeof a){case"string":return"string";case"boolean":return"boolean";case"number":return _.isNaN(a)?"NaN":a.toString().match(/\./)?"decimal":"integer";case"function":return"function: "+(a.name?a.name+"()":"(anonymous)");case"object":return _.isArray(a)?"array":_.isArguments(a)?"arguments":_.isNull(a)?"null":"object";default:return typeof a}},h=function(a,b,c){_.each(c,function(c){var d=g(c);switch(d){case"string":a(c);break;case"undefined":case"null":case"NaN":a("["+d+"]");break;case"number":case"not a number":case"integer":case"decimal":case"boolean":a("["+d+"]: "+c);break;default:a("["+d+"]:========================================="),b(c),a("=========================================================")}})},i=function(a){var b,c=a.key,e=a.title||"TAS",f=a.color&&a.color.bgLabel||"blue",g=a.color&&a.color.label||"white",i=a.color&&a.color.bgText||"blue",j=a.color&&a.color.text||"white";return b=function(a){console.log("%c "+e+": %c "+a+" ","background-color: "+f+";color: "+g+"; font-weight:bold;","background-color: "+i+";color: "+j+";")},function(){("TAS"===c||d.logging[c])&&h(b,function(a){console.log(a)},_.toArray(arguments))}},j=i(c.debug),k=i(c.error),l=i(c.warn),m=i(c.info),n=i(c.notice),o=i(c.log),p=i(c.TAS),q=i(c.callstack),r=i(c.callstack_async),s=function(a,b){var c=_.findIndex(e,function(c){return _.difference(c.stack,a).length===_.difference(a,c.stack).length&&0===_.difference(c.stack,a).length&&c.label===b});return-1===c&&(c=e.length,e.push({stack:a,label:b})),c},t=function(a){var b=_.defaults(a,d);b.logging=_.defaults(a&&a.logging||{},d.logging),d=b},u=function(){d.logging.debug=!0,d.debugMode=!0},v=function(){var a=new Error("dummy"),b=_.map(_.rest(a.stack.replace(/^[^\(]+?[\n$]/gm,"").replace(/^\s+at\s+/gm,"").replace(/^Object.<anonymous>\s*\(/gm,"{anonymous}()@").split("\n")),function(a){return a.replace(/\s+.*$/,"")});return b},w=function(a){var b,c;_.find(a,function(a){return(b=a.match(/TAS_CALLSTACK_(\d+)/))?(c=e[b[1]],r("===================="+(c.label?"> "+c.label+" <":"")+"===================="),w(c.stack),!0):(q(a),!1)})},x=function(){var a;d.debugMode&&(a=v(),a.shift(),p("==============================> CALLSTACK <=============================="),w(a),p("========================================================================="))},y=function(a,b,c){var e;return"function"==typeof a&&(c=b,b=a,a=void 0),d.debugMode?(e=v(),e.shift(),function(a,b,c,d){var e=s(c,d);return new Function("cb","ctx","TASlog","return function TAS_CALLSTACK_"+e+"(){TASlog('Entering: '+(cb.name||'(anonymous function)'));cb.apply(ctx||{},arguments);TASlog('Exiting: '+(cb.name||'(anonymous function)'));};")(a,b,p)}(b,c,e,a)):function(a,b){return function(){a.apply(b||{},arguments)}}(b,c)},z=function(a,b){f[a]=b},A=function(){setAttrs(f),f={}},B=function(a,b){return _.chain(a).reduce(function(b,c){return"string"==typeof c?b.push(c):(_.isArray(a)||_.isArguments(a))&&(b=B(c,b)),b},_.isArray(b)&&b||[]).uniq().value()},C=function(a,b){Object.defineProperty(a,"id",{value:b,writeable:!1,enumerable:!1})},D=function(a,b,c,d){!function(){var e=_.contains(["S","F","I","D"],b)?"_"+b:b,f=d||b,g=c;_.each(["S","I","F"],function(b){_.has(a,b)||Object.defineProperty(a,b,{value:{},enumerable:!1,readonly:!0})}),_.has(a,"D")||Object.defineProperty(a,"D",{value:_.reduce(_.range(10),function(a,b){return Object.defineProperty(a,b,{value:{},enumerable:!0,readonly:!0}),a},{}),enumerable:!1,readonly:!0}),Object.defineProperty(a,e,{enumerable:!0,set:function(a){a!==g&&(g=a,z(f,a))},get:function(){return g}}),Object.defineProperty(a.S,e,{enumerable:!0,set:function(a){var b=a.toString();b!==g&&(g=b,z(f,b))},get:function(){return g.toString()}}),Object.defineProperty(a.I,e,{enumerable:!0,set:function(a){var b=parseInt(a,10)||0;b!==g&&(g=b,z(f,b))},get:function(){return parseInt(g,10)||0}}),Object.defineProperty(a.F,e,{enumerable:!0,set:function(a){var b=parseFloat(a)||0;b!==g&&(g=b,z(f,b))},get:function(){return parseFloat(g)||0}}),_.each(_.range(10),function(b){Object.defineProperty(a.D[b],e,{enumerable:!0,set:function(a){var c=(parseFloat(a)||0).toFixed(b);c!==g&&(g=c,z(f,c))},get:function(){return(parseFloat(g)||0).toFixed(b)}})})}()},E=function(a){return function(a){var b=a,c=[],d=[],e=[],f=[],g=function(){return c=B(arguments,c),this},h=function(){return d=B(arguments,d),this},i=function(b,c,d,f){return e.push({type:"reduce",func:b&&_.isFunction(b)&&b||_.noop,memo:_.isUndefined(c)&&0||c,final:d&&_.isFunction(d)&&d||_.noop,context:f||{}}),this},j=function(b,c,d){return e.push({type:"map",func:b&&_.isFunction(b)&&b||_.noop,final:c&&_.isFunction(c)&&c||_.noop,context:d||{}}),this},k=function(b,c,d){return e.push({type:"each",func:b&&_.isFunction(b)&&b||_.noop,final:c&&_.isFunction(c)&&c||_.noop,context:d||{}}),this},l=function(b,c){return e.push({type:"tap",final:b&&_.isFunction(b)&&b||_.noop,context:c||{}}),this},m=function(b,c){return f.push({callback:b&&_.isFunction(b)&&b||_.noop,context:c||{}}),this},n=function(g,h){var i={},j={},k=[],l=[];m(g,h),getSectionIDs("repeating_"+b,function(a){k=a,l=_.reduce(k,function(a,c){return a.concat(_.map(d,function(a){return"repeating_"+b+"_"+c+"_"+a}))},[]),getAttrs(_.uniq(c.concat(l)),function(a){_.each(c,function(b){a.hasOwnProperty(b)&&D(j,b,a[b])}),i=_.reduce(k,function(c,e){var f={};return C(f,e),_.each(d,function(c){var d="repeating_"+b+"_"+e+"_"+c;D(f,c,a[d],d)}),c[e]=f,c},{}),_.each(e,function(a){var b;switch(a.type){case"tap":_.bind(a.final,a.context,i,j)();break;case"each":_.each(i,function(b){_.bind(a.func,a.context,b,j,b.id,i)()}),_.bind(a.final,a.context,i,j)();break;case"map":b=_.map(i,function(b){return _.bind(a.func,a.context,b,j,b.id,i)()}),_.bind(a.final,a.context,b,i,j)();break;case"reduce":b=a.memo,_.each(i,function(c){b=_.bind(a.func,a.context,b,c,j,c.id,i)()}),_.bind(a.final,a.context,b,i,j)()}}),A(),_.each(f,function(a){_.bind(a.callback,a.context)()})})})};return{attrs:g,attr:g,column:h,columns:h,field:h,fields:h,reduce:i,inject:i,foldl:i,map:j,collect:j,each:k,forEach:k,tap:l,do:l,after:m,last:m,done:m,execute:n,go:n,run:n}}(a)},F=function(a,b,c){E(a).attr(c).field(b).reduce(function(a,c){return a+c.F[b]},0,function(a,b,d){d.S[c]=a}).execute()};return console.log("%c•.¸¸.•*´¨`*•.¸¸.•*´¨`*•.¸  The Aaron Sheet  v"+a+"  ¸.•*´¨`*•.¸¸.•*´¨`*•.¸¸.•","background: linear-gradient(to right,green,white,white,green); color:black;text-shadow: 0 0 8px white;"),console.log("%c•.¸¸.•*´¨`*•.¸¸.•*´¨`*•.¸  Last update: "+new Date(1e3*b)+"  ¸.•*´¨`*•.¸¸.•*´¨`*•.¸¸.•","background: linear-gradient(to right,green,white,white,green); color:black;text-shadow: 0 0 8px white;"),{repeatingSimpleSum:F,repeating:E,config:t,callback:y,callstack:x,debugMode:u,_fn:y,debug:j,error:k,warn:l,info:m,notice:n,log:o}}();
-/* ---- END: TheAaronSheet.js ---- */
+};
+on("sheet:opened change:encumbrance change:containerLoadTotal change:itemcount change:itemcount2 change:itemcount3 change:itemcount4 change:meleeLoadTotal change:rangedLoadTotal change:armorLoadTotal change:CP change:SP change:GP change:PP", recalculateEncumbrance);
 
-on("sheet:opened remove:repeating_armor change:repeating_armor:armorType change:repeating_armor:armorActive change:repeating_armor:armorCarried change:dexPenaltyText change:dexBonus change:raceACbonus", function() {
-
-	getAttrs(["repeating_armor_armorType","repeating_armor_armorActive","repeating_armor_armorCarried"], function(v) {
-		var acBase = parseInt(0);
-		var dpen = parseInt(0);
-		var speed = parseInt(0);
-		var wornArmor = (v.repeating_armor_armorActive == 'on') ? true : false;
-		var carried = v.repeating_armor_armorCarried
-		
-		if (wornArmor == true) {carried = 'on';}
-		
-		switch (v.repeating_armor_armorType) {
+// Calculate Armour
+var recalculateArmorModifiers = function recalculateArmorModifiers() {
+	getSectionIDs(`repeating_armor`, function(idArray) {
+	// create a variable to hold all the needed attribute names
+	var fieldnames = [];
+	// loop throw the rowIDs and build their actual attributes names. adding them to the fieldnames array
+    for(var i = 0; i < idArray.length; i++) {
+        fieldnames.push(
+			"repeating_armor_" + idArray[i] + "_armorAcBase",
+			"repeating_armor_" + idArray[i] + "_armorSpeed",
+			"repeating_armor_" + idArray[i] + "_armorDexPen",
+			"repeating_armor_" + idArray[i] + "_armorEncumbrance",
+			"repeating_armor_" + idArray[i] + "_armorCarried",
+            "repeating_armor_" + idArray[i] + "_armorType",
+            "repeating_armor_" + idArray[i] + "_rangedWeaponType",
+			"repeating_armor_" + idArray[i] + "_armorCarried",
+			"repeating_armor_" + idArray[i] + "_armorActive",
+			"repeating_armor_" + idArray[i] + "_armorMagicBonus"
+        );
+	}
+	fieldnames.push('raceACbonus','dexBonus','dexPenalty');
+	
+	getAttrs(fieldnames, function(values) {
+		const raceBonus = parseInt(values.raceACbonus)||0;
+        const agiAC = parseInt(values.dexBonus)||0;
+		const dexpen = parseInt(values.dexPenalty)||0;
+		var baseAC = parseInt(10);
+		var Encumb = parseInt(0);
+		var totalSpeed = parseInt(0);
+		var totalDexPen = parseInt(0);
+		var totalAC = parseInt(0);
+		//create a container for the output
+		const output ={};
+		//loop the rows
+		for(var i = 0; i < idArray.length; i++) {
+			var enc = parseInt(0);
+			var acBase = parseInt(0);
+			var dpen = parseInt(0);
+			var speed = parseInt(0);
+			//Set up defaults for armor types
+			switch (values["repeating_armor_"+ idArray[i] +"_armorType"]) {
 				case "padded" : acBase=1; speed=0; dpen=0; enc=0; break;
 				case "leather" : acBase=2; speed=0; dpen=0; enc=0; break;
 				case "st_leather" : acBase=3; speed=0; dpen=0; enc=0; break;
@@ -1286,198 +1400,216 @@ on("sheet:opened remove:repeating_armor change:repeating_armor:armorType change:
 				case "s_large" : acBase=2; speed=0; dpen=1; enc=1; break;
 				case "s_tower" : acBase=2; speed=-5; dpen=2; enc=2; break;
 			}
-		setAttrs({  repeating_armor_armorAcBase : acBase,
-					repeating_armor_armorSpeed : speed,
-					repeating_armor_armorDexPen : dpen,
-					repeating_armor_armorEncumbrance : enc,
-					repeating_armor_armorCarried : carried
+			//get bonus
+			const acBonus = parseInt(values["repeating_armor_"+ idArray[i] +"_armorMagicBonus"])||0;
+			//check is carried and worn
+			var wornArmor = (values["repeating_armor_"+ idArray[i] +"_armorActive"] == 'on') ? true : false;
+			var carryArmor = values["repeating_armor_"+ idArray[i] +"_armorCarried"]
+			var iscarried = (carryArmor == 'on') ? true : false;
+			
+			if ((iscarried) == true && (wornArmor) == false) {Encumb += enc+1;}
+			else if ((wornArmor) == true) {
+				baseAC += (acBase + acBonus);
+				totalSpeed += speed;
+				Encumb += enc;
+				totalDexPen += dpen;
+				carryArmor = 'on'; //force worn armor to be carried too
+			}
+			//load up the row level
+			output["repeating_armor_"+ idArray[i] +"_armorAcBase"] = acBase;
+			output["repeating_armor_"+ idArray[i] +"_armorSpeed"] = speed;
+			output["repeating_armor_"+ idArray[i] +"_armorDexPen"] = dpen;
+			output["repeating_armor_"+ idArray[i] +"_armorEncumbrance"] = enc;
+			output["repeating_armor_"+ idArray[i] +"_armorCarried"] = carryArmor;
+		}
+		//calulate dex penalties and stuff
+		if ((dexpen) >= 1 && agiAC > 0) {totalAC = baseAC + raceBonus;}
+		else {totalAC = baseAC + agiAC + raceBonus;}
+		//load up the sheet level 	
+		output["acCalc"]=totalAC;
+		output["dexPenalty"]=totalDexPen;
+		output["armorLoadTotal"]=Encumb;
+		output["armorSpeedTotal"]= totalSpeed;
+		//send it all back to the sheet
+		setAttrs(output);		
 		});
 	});
-
-	getAttrs(["acCalc", "armorSpeedTotal", "armorLoadTotal", "dexPenalty", "dexBonus", "raceACbonus", "Class"], function(values) {
-
-        var baseAc = parseInt(10);
-		var raceBonus = parseInt(values.raceACbonus)||0;
-        var agiAc = parseInt(values.dexBonus)||0;
-		var dexpen = parseInt(values.dexPenalty)||0;
-
-		if ((dexpen) >= 1 && agiAc > 0) {startAc = baseAc + raceBonus;}
-		else {startAc = baseAc + agiAc + raceBonus;}
-			
-        setAttrs({
-            acCalc: startAc,
-			dexPenalty: parseInt(0),
-			armorLoadTotal: parseInt(0),
-            armorSpeedTotal: parseInt(0)
-        });
-    });
-
-    TAS.repeating("armor")
-        .attrs("acCalc", "armorSpeedTotal", "armorLoadTotal", "dexPenalty")
-        .fields("armorAcBase", "armorMagicBonus", "armorSpeed", "armorActive", "armorCarried", "armorDexPen", "armorEncumbrance")
-        .map(function(row, attrSet, id, rowSet) {
-
-            var speed = parseInt(row.armorSpeed)||0;
-            var wornArmor = (row.armorActive == 'on') ? true : false;
-			var carryArmor = (row.armorCarried == 'on') ? true : false;
-            var acBase = parseInt(row.armorAcBase)||0;
-            var acBonus = parseInt(row.armorMagicBonus)||0;
-			var dexPenalty = parseInt(row.armorDexPen)||0;
-			var armorEnc = parseInt(row.armorEncumbrance)||0;
-			
-			if ((carryArmor) == true && (wornArmor) == false) {attrSet.armorLoadTotal += armorEnc+1;}
-			
-			else if ((wornArmor) == true) {
-            	//console.log("1");
-                attrSet.acCalc += acBase + acBonus;
-				attrSet.armorSpeedTotal += speed;
-				attrSet.armorLoadTotal += armorEnc;
-				attrSet.dexPenalty += dexPenalty;
-                //console.log("Current Worn AC="+ attrSet.acCalc);
-            }
-        })
-        .execute();
-});
+};		
+on("sheet:opened remove:repeating_armor change:dexBonus change:raceACbonus change:repeating_armor:armorType change:repeating_armor:armorActive change:repeating_armor:armorCarried", recalculateArmorModifiers);
 
 //calc Container Encumbrance 
-on("sheet:opened remove:repeating_containers change:repeating_containers:containerEquip change:repeating_containers:containerWeight", function() {
-	getAttrs(["repeating_containers_containerWeight", "repeating_containers_containerEquip", "containerLoadTotal"], function(v) {
-			setAttrs({
-            containerLoadTotal: parseInt(0)
-		});	
-	});
-	
-	TAS.repeating("containers")
-        .attrs("containerLoadTotal")
-        .fields("containerEquip", "containerWeight")
-        .map(function(row, attrSet, id, rowSet) {
-
-            var checkContainer = (row.containerEquip == 'on') ? true : false;
-			var contWeight = parseInt(row.containerWeight)||0;
+var recalculateContainerModifiers = function recalculateContainerModifiers() {
+	getSectionIDs(`repeating_containers`, function(idArray) {
+	// create a variable to hold all the needed attribute names
+	var fieldnames = [];
+	// loop throw the rowIDs and build their actual attributes names. adding them to the fieldnames array
+    for(var i = 0; i < idArray.length; i++) {
+		fieldnames.push(
+			"repeating_containers_" + idArray[i] + "_containerEquip",
+			"repeating_containers_" + idArray[i] + "_containerWeight"
+        );
+	}
+	getAttrs(fieldnames, function(values) {
+		var Encumb = parseInt(0);
+		for(var i = 0; i < idArray.length; i++) {
+			var checkContainer = (values["repeating_containers_" + idArray[i] + "_containerEquip"] == 'on') ? true : false;
+			var Enc = parseInt(values["repeating_containers_" + idArray[i] + "_containerWeight"])||0;
 			
-            if ((checkContainer) == true) {
-            	//console.log("1");
-				attrSet.containerLoadTotal += contWeight;
-                //console.log("Container Weight Total="+ attrSet.containerloadTotal);
-            }
-        })
-        .execute();
-});	
- 
-//calc fields on ranged weapons
-on("sheet:opened remove:repeating_rangedweapon change:repeating_rangedweapon:rangedEquip change:repeating_rangedweapon:rangedAtkMod change:repeating_rangedweapon:rangedDamMod change:repeating_rangedweapon:rangedWeaponsize change:repeating_rangedweapon:rangedDistance change:dexBonus change:repeating_rangedweapon:rangedWeaponType change:repeating_rangedweapon:rangedMagic change:strCurrent change:ATK change:DAM change:Class", function() {
-	getAttrs(["repeating_rangedweapon_rangedWeaponsize", "repeating_rangedweapon_rangedWeaponType", "repeating_rangedweapon_rangedAtkMod", "repeating_rangedweapon_rangedDamMod", "repeating_rangedweapon_rangedDistance", "strCurrent", "repeating_rangedweapon_rangedMagic", "strBonus", "dexBonus", "ATK", "DAM", "Class"], function(v) {
-	
-		var Dam = 3;
-		var DamBonus = parseInt(0);
-		var maxrange = parseInt(3);
-		var DEXBonus = parseInt(v.dexBonus)||0;
-		var AttackMod = parseInt(v.repeating_rangedweapon_rangedAtkMod)||0;
-		var DamageMod = parseInt(v.repeating_rangedweapon_rangedDamMod)||0;
-		var magicBonus = parseInt(v.repeating_rangedweapon_rangedMagic)||0;
-		var range = parseInt(v.repeating_rangedweapon_rangedDistance)||0;
-		var Attack = parseInt(v.ATK)||0;
-		var Damage = parseInt(v.DAM)||0;
-		
-		if (v.repeating_rangedweapon_rangedWeaponType == "missile") {maxrange=5*range;}
-		else {maxrange=3*range;}
-		
-		if (v.repeating_rangedweapon_rangedWeaponsize == "heavy") {Dam = 4;}
-		else {Dam = 3;}
-		
-		var calcHitbonus = Attack + DEXBonus + AttackMod + magicBonus; 
-		var calcDambonus = Damage + DamBonus + DamageMod + magicBonus;
-		
-		setAttrs({	repeating_rangedweapon_rangedDam : Dam,
-					repeating_rangedweapon_rangedMax : maxrange,
-					repeating_rangedweapon_rangedToHit : calcHitbonus,
-					repeating_rangedweapon_rangedDamBonus : calcDambonus,
-					
-		});
-	});
-	getAttrs(["rangedLoadTotal"], function(v) {
-			setAttrs({
-            rangedLoadTotal: parseInt(0)
-		});	
-	});
-	TAS.repeating("rangedweapon")
-        .attrs("rangedLoadTotal")
-        .fields("rangedEquip", "rangedAmmo", "rangedWeaponsize", "rangedWeaponType")
-        .map(function(row, attrSet, id, rowSet) {
-
-            var checkEquip = (row.rangedEquip == 'on') ? true : false;
-			var Ammo = parseInt(row.rangedAmmo)||0;
-			var Enc = 0;
-			var Num = 1;
-			
-			if (row.rangedWeaponType == "thrown") {Num = Ammo}
-			
-			if (row.rangedWeaponsize == "heavy") {Enc = 1*Num;}
-			else {Enc = 0.5*Num;}
-			
-            if ((checkEquip) == true) {
-            	//console.log("1");
-				attrSet.rangedLoadTotal += Enc;
-                //console.log("ranged Weight Total="+ attrSet.rangedLoadTotal);
-            }
-        })
-        .execute();
- });
-
-//calc fields on melee weapons
-on("sheet:opened remove:repeating_meleeweapon change:repeating_meleeweapon:meleeEquip change:repeating_meleeweapon:meleeAtkMod change:repeating_meleeweapon:meleeCount change:repeating_meleeweapon:meleeDamMod change:repeating_meleeweapon:meleeWeaponsize change:repeating_meleeweapon:meleeMagic change:dexPenalty change:dexBonus change:strCurrent change:ATK change:DAM change:Class", function() {
-	getAttrs(["repeating_meleeweapon_meleeWeaponsize","repeating_meleeweapon_meleeMagic","repeating_meleeweapon_meleeAtkMod","repeating_meleeweapon_meleeDamMod","strCurrent","strBonus","dexBonus","ATK","DAM","Class"], function(v) {
-	
-		var Dam = 3;
-		//var DamBonus = parseInt(0);
-		var STRBonus = parseInt(v.strBonus)||0;
-		var DEXBonus = parseInt(v.dexBonus)||0;
-		var AttackMod = parseInt(v.repeating_meleeweapon_meleeAtkMod)||0;
-		var DamageMod = parseInt(v.repeating_meleeweapon_meleeDamMod)||0;
-		var magicBonus= parseInt(v.repeating_meleeweapon_meleeMagic)||0;
-		var Attack = parseInt(v.ATK)||0;
-		var Damage = parseInt(v.DAM)||0;
-		
-		if (v.repeating_meleeweapon_meleeWeaponsize == "light-rogue") {calcHitbonus = Attack + AttackMod + DEXBonus + magicBonus;}
-		else {calcHitbonus = Attack + STRBonus + AttackMod + magicBonus;}
-		
-		switch (v.repeating_meleeweapon_meleeWeaponsize) {
-		case "heavy-2hand" : Dam = 5; break;
-		case "heavy" :  Dam = 4; break;
-		default: Dam = 3;
+			if ((checkContainer) == true) {Encumb += Enc;}
 		}
-		var calcDambonus = Damage + STRBonus + DamageMod + magicBonus;
-		
-		setAttrs({	repeating_meleeweapon_meleeDam : Dam,
-					repeating_meleeweapon_meleeToHit : calcHitbonus,
-					repeating_meleeweapon_meleeDamBonus : calcDambonus
+		setAttrs({containerLoadTotal: Encumb});
 		});
 	});
-	getAttrs(["meleeLoadTotal"], function(v) {
-			setAttrs({
-            meleeLoadTotal: parseInt(0)
-		});	
+};	
+on("sheet:opened remove:repeating_containers change:repeating_containers:containerEquip change:repeating_containers:containerWeight", recalculateContainerModifiers);
+
+//calc fields on ranged weapons
+var recalculateRangedModifiers = function recalculateRangedModifiers() {
+	getSectionIDs(`repeating_rangedweapon`, function(idArray) {
+
+	var fieldnames = [];
+	
+	// loop throw the rowIDs and build their actual attributes names. adding them to the fieldnames array
+    for(var i = 0; i < idArray.length; i++) {
+        fieldnames.push(
+            "repeating_rangedweapon_" + idArray[i] + "_rangedWeaponsize",
+            "repeating_rangedweapon_" + idArray[i] + "_rangedWeaponType",
+			"repeating_rangedweapon_" + idArray[i] + "_rangedAtkMod",
+			"repeating_rangedweapon_" + idArray[i] + "_rangedDamMod",
+			"repeating_rangedweapon_" + idArray[i] + "_rangedDistance",
+			"repeating_rangedweapon_" + idArray[i] + "_rangedMagic",
+			"repeating_rangedweapon_" + idArray[i] + "_rangedEquip",
+			"repeating_rangedweapon_" + idArray[i] + "_rangedAmmo"
+        );
+	}
+// if you need any other attributes in your worker, dont forget to include those
+        fieldnames.push('ATK','DAM','dexBonus','rangedLoadTotal');
+
+        // now  use getAttrs to extract those attribute values from the sheet and store them in an object called values.
+        // since fieldnames is already an array, we dont need to use the usual [ ] brackets.
+        getAttrs(fieldnames, function(values) {
+            // get the externals
+			const DEXBonus = parseInt(values.dexBonus)||0;
+			const Attack = parseInt(values.ATK)||0;
+			const Damage = parseInt(values.DAM)||0;
+			var Encumb = parseInt(0);
+			//create a container for the output
+			const output ={};
+			// now loop through the row ids again, and grab their values, adding them to the spent total
+            // the idArray variable created earlier by getSectionIDs still exists so we can use that.
+            for(var i = 0; i < idArray.length; i++) {
+				var Dam = 3;
+				var DamBonus = parseInt(0);
+				var maxrange = parseInt(3);
+				var Enc = parseInt(0);;
+				var Num = parseInt(1);
+				var AttackMod = parseInt(values["repeating_rangedweapon_"+ idArray[i] + "_rangedAtkMod"])||0;
+				var DamageMod = parseInt(values["repeating_rangedweapon_"+ idArray[i] + "_rangedDamMod"])||0;
+				var magicBonus = parseInt(values["repeating_rangedweapon_"+ idArray[i] + "_rangedMagic"])||0;
+				var range = parseInt(values["repeating_rangedweapon_"+ idArray[i] + "_rangedDistance"])||0;
+				var size = values["repeating_rangedweapon_"+ idArray[i] + "_rangedWeaponsize"];
+				var type = values["repeating_rangedweapon_"+ idArray[i] + "_rangedWeaponType"];
+				var checkEquip = (values["repeating_rangedweapon_"+ idArray[i] + "_rangedEquip"] == 'on') ? true : false;
+				var Ammo = parseInt(values["repeating_rangedweapon_"+ idArray[i] + "_rangedAmmo"])||0;
+				
+				if (type == "missile") {maxrange=5*range;}
+				else {maxrange=3*range; Num = Ammo}
+				
+				switch (size) {
+					case "small":  Dam = 3; Enc = 0.2*Num; break;
+					case "heavy" :  Dam = 4; Enc = 1*Num; break;
+					default: Dam = 3; Enc = 0.5*Num;
+					}
+		
+				var calcHitbonus = Attack + DEXBonus + AttackMod + magicBonus; 
+				var calcDambonus = Damage + DamBonus + DamageMod + magicBonus;
+				
+				if ((checkEquip) == true) {Encumb += Enc;}
+				
+				output["repeating_rangedweapon_"+ idArray[i] +"_rangedDam"] = Dam;
+				output["repeating_rangedweapon_"+ idArray[i] +"_rangedMax"] = maxrange;
+				output["repeating_rangedweapon_"+ idArray[i] +"_rangedToHit"] = calcHitbonus;
+				output["repeating_rangedweapon_"+ idArray[i] +"_rangedDamBonus"] = calcDambonus;
+			}
+			output["rangedLoadTotal"] = Encumb
+			//send it back to sheet
+			setAttrs(output);
+		});			
 	});
-	TAS.repeating("meleeweapon")
-        .attrs("meleeLoadTotal")
-        .fields("meleeEquip", "meleeCount", "meleeWeaponsize")
-        .map(function(row, attrSet, id, rowSet) {
-
-            var checkEquip = (row.meleeEquip == 'on') ? true : false;
-			var Num = parseInt(row.meleeCount)||1;
-			var Enc = 0;
-			
-			if (row.meleeWeaponsize == "heavy") {Enc = 1*Num;}
-			else {Enc = 0.5*Num;}
-//				}
-			
-            if ((checkEquip) == true) {
-            	//console.log("1");
-				attrSet.meleeLoadTotal += Enc;
-                //console.log("melee Weight Total="+ attrSet.meleeLoadTotal);
-            }
-        })
-        .execute();
- });
+};	
+on("sheet:opened change:dexBonus change:ATK change:DAM change:Class remove:repeating_rangedweapon change:repeating_rangedweapon:rangedEquip change:repeating_rangedweapon:rangedAtkMod change:repeating_rangedweapon:rangedDamMod change:repeating_rangedweapon:rangedWeaponsize change:repeating_rangedweapon:rangedDistance change:repeating_rangedweapon:rangedWeaponType change:repeating_rangedweapon:rangedMagic change:repeating_rangedweapon:rangedAmmo", recalculateRangedModifiers);
 
+var recalculateMeleeModifiers = function recalculateMeleeModifiers() {
+	getSectionIDs(`repeating_meleeweapon`, function(idArray) {
+	
+	// create a variable to hold all the needed attribute names
+	var fieldnames = [];
+	
+	// loop throw the rowIDs and build their actual attributes names. adding them to the fieldnames array
+    for(var i = 0; i < idArray.length; i++) {
+        fieldnames.push(
+            "repeating_meleeweapon_" + idArray[i] + "_meleeWeaponsize",
+			"repeating_meleeweapon_" + idArray[i] + "_meleeAtkMod",
+			"repeating_meleeweapon_" + idArray[i] + "_meleeDamMod",
+			"repeating_meleeweapon_" + idArray[i] + "_meleeMagic",
+			"repeating_meleeweapon_" + idArray[i] + "_meleeEquip",
+			"repeating_meleeweapon_" + idArray[i] + "_meleeCount"
+        );
+	}
+		// get sheet level items
+        fieldnames.push('Class','ATK','DAM','dexBonus','strBonus','subtBonus','meleeLoadTotal');
+        // now  use getAttrs to extract those attribute values from the sheet and store them in an object called values.
+        // since fieldnames is already an array, we dont need to use the usual [ ] brackets.
+        getAttrs(fieldnames, function(values) {
+            // set the externals
+			const pclass = values.Class;
+			const STRBonus = parseInt(values.strBonus)||0;
+			const DEXBonus = parseInt(values.dexBonus)||0;
+			const subtb = parseInt(values.subtBonus)||0;
+			const Attack = parseInt(values.ATK)||0;
+			const Damage = parseInt(values.DAM)||0;
+			var Encumb = parseInt(0);
+			//create a container for the output
+			const output ={};
+			// now loop through the row ids again, and grab their values, adding them to the spent total
+            // the idArray variable created earlier by getSectionIDs still exists so we can use that.
+            for(var i = 0; i < idArray.length; i++) {
+				var Dam = 3;
+				var DamBonus = parseInt(0);
+				var Enc = parseInt(0);
+				var AttackMod = parseInt(values["repeating_meleeweapon_"+ idArray[i] + "_meleeAtkMod"])||0;
+				var DamageMod = parseInt(values["repeating_meleeweapon_"+ idArray[i] + "_meleeDamMod"])||0;
+				var magicBonus = parseInt(values["repeating_meleeweapon_"+ idArray[i] + "_meleeMagic"])||0;
+				var size = values["repeating_meleeweapon_"+ idArray[i] + "_meleeWeaponsize"];
+				//var type = values["repeating_meleeweapon_"+ idArray[i] + "_meleeWeaponType"];
+				var checkEquip = (values["repeating_meleeweapon_"+ idArray[i] + "_meleeEquip"] == 'on') ? true : false;
+				var Num = parseInt(values["repeating_meleeweapon_"+ idArray[i] + "_meleeCount"])||0;
+				//check if they a rogue
+				if (size == "light-rogue" && pclass != "Rogue") {size="light";}
+				if (size == "small-rogue" && pclass != "Rogue") {size="small";}
+				if (size == "small-rogue" || size == "light-rogue") {var calcHitbonus = Attack + AttackMod + DEXBonus + magicBonus; var calcDambonus = Damage + STRBonus + subtb + DamageMod + magicBonus;}
+					else {var calcHitbonus = Attack + STRBonus + AttackMod + magicBonus; var calcDambonus = Damage + STRBonus + DamageMod + magicBonus;}
+		
+				switch (size) {
+					case "small":  Dam = 3; Enc = 0.2*Num; break;
+					case "heavy-2hand" : Dam = 5; Enc = 1.5*Num; break;
+					case "heavy" :  Dam = 4; Enc = 1*Num; break;
+					default: Dam = 3; Enc = 0.5*Num;
+					}
+				//calculate load
+				if ((checkEquip) == true) {Encumb += Enc;}
+				//load up the row level
+				output["repeating_meleeweapon_"+ idArray[i] + "_meleeDam"] = Dam;
+				output["repeating_meleeweapon_"+ idArray[i] + "_meleeToHit"] = calcHitbonus;
+				output["repeating_meleeweapon_"+ idArray[i] + "_meleeDamBonus"] = calcDambonus;
+				output["repeating_meleeweapon_"+ idArray[i] + "_meleeWeaponsize"] = size;
+			}
+			//load up the sheet level
+			output["meleeLoadTotal"] = Encumb
+			//send it back to sheet
+			setAttrs(output);
+		});			
+	});
+};	
+on("sheet:opened remove:repeating_meleeweapon change:repeating_meleeweapon:meleeEquip change:repeating_meleeweapon:meleeAtkMod change:repeating_meleeweapon:meleeCount change:repeating_meleeweapon:meleeDamMod change:repeating_meleeweapon:meleeWeaponsize change:repeating_meleeweapon:meleeMagic change:dexPenalty change:dexBonus change:physBonus change:strCurrent change:ATK change:DAM change:Class", recalculateMeleeModifiers);
 </script>
\ No newline at end of file