diff --git a/DnD_Moldvay_AmandatheAmazon/D&D_Moldvay_AmandatheAmazon.css b/DnD_Moldvay_AmandatheAmazon/D&D_Moldvay_AmandatheAmazon.css
index 46f433d606..3cdfbf822b 100644
--- a/DnD_Moldvay_AmandatheAmazon/D&D_Moldvay_AmandatheAmazon.css
+++ b/DnD_Moldvay_AmandatheAmazon/D&D_Moldvay_AmandatheAmazon.css
@@ -138,6 +138,15 @@
     font-size: 20px;
 }
 
+.sheet-rolltemplate-odnd .sheet-RollTemp-critfailM,
+.sheet-rolltemplate-odnd .sheet-RollTemp-failM {
+    color: red; 
+    font-family: 'Gloria Hallelujah', cursive; 
+    font-weight: bold; 
+    font-size: 1.7em;
+}
+
+.sheet-rolltemplate-odnd .sheet-RollTemp-critfailSM,
 .sheet-rolltemplate-odnd .sheet-RollTemp-failSM {
     color: red; 
     font-family: 'Gloria Hallelujah', cursive; 
@@ -145,6 +154,14 @@
     font-size: 1.5em;
 }
 
+.sheet-rolltemplate-odnd .sheet-RollTemp-critsuccessM,
+.sheet-rolltemplate-odnd .sheet-RollTemp-successM {
+    color: green; 
+    font-family: 'Gloria Hallelujah', cursive; 
+    font-weight: bold; 
+    font-size: 1.7em;
+}
+
 .sheet-rolltemplate-odnd .sheet-RollTemp-critsuccessSM,
 .sheet-rolltemplate-odnd .sheet-RollTemp-successSM {
     color: green; 
@@ -153,6 +170,14 @@
     font-size: 1.5em;
 }
 
+.sheet-rolltemplate-odnd .sheet-RollTemp-critsuccessEXSM,
+.sheet-rolltemplate-odnd .sheet-RollTemp-successEXSM {
+    color: green; 
+    font-family: 'Gloria Hallelujah', cursive; 
+    font-weight: bold; 
+    font-size: 1.4em;
+}
+
 .sheet-rolltemplate-odnd .sheet-RollTemp-critfail {
     color: red; 
     font-family: 'Gloria Hallelujah', cursive; 
@@ -189,6 +214,41 @@
     margin-right: 20px;
     margin-left: 20px;
 }
+
+.sheet-rolltemplate-odnd .sheet-RollTemp-info {
+    font-size: 1.1em; 
+    text-align: center;
+    font-style: italic;
+    font-weight: bold;
+}
+
+.sheet-rolltemplate-odnd .sheet-RollTemp-infoNB {
+    font-size: 1.1em; 
+    text-align: center;
+    font-style: italic;
+}
+
+.sheet-rolltemplate-odnd .sheet-RollTemp-textSM {
+    font-size: 1.1em; 
+    text-align: center;
+    /*font-weight: bold;*/
+}
+
+.sheet-rolltemplate-odnd .sheet-RollTemp-flarecombat {
+    color: #2C5D28;
+    font-size: 1.2em; 
+    text-align: center;
+    /*font-style: italic;*/
+    font-weight: bold;
+}
+
+.sheet-rolltemplate-odnd .sheet-RollTemp-flareclass {
+    color: #540B7F;
+    font-size: 1.2em; 
+    text-align: center;
+    /*font-style: italic;*/
+    font-weight: bold;
+}
 /*END Templates*/
 
 /* Fonts */
@@ -541,6 +601,24 @@
     color: #454343;
 }
 
+.charsheet .sheet-Monstersavingthrow-num{
+    display: table-cell;
+    padding: 5px;
+    background-color: black;
+    text-align: center;
+}
+.charsheet input.sheet-Monstersavingthrow-num{
+    width: 28px;
+    height: 28px;
+    text-align: center;
+    vertical-align: middle;
+    border: none;
+    border-radius:15px;
+    font-weight: bold;
+    background-color: #E2E1DE;
+    color: #454343;
+}
+
 .charsheet .sheet-savingthrow-lib {
     display: table-cell;
     padding-left: 4px;
@@ -603,6 +681,27 @@
     color: #454343;
 }
 
+.charsheet input.sheet-MonsterHP {
+    margin-top: 7px;
+    padding: 0px;
+    height: 44px;
+    width: 48px;
+    font-size: 21px;
+    line-height: 48px;
+    font-weight: bold;
+    vertical-align: middle;
+    text-align: center;
+    /*border: 0;*/
+    border-width: 1px 1px 3px 1px;
+    border-color: black;
+    border-top-style: solid;
+    border-right-style: solid;
+    border-left-style: solid;
+    border-bottom-style: solid;
+    background-color: transparent;
+    color: #454343;
+}
+
 .charsheet .sheet-ACBG {
     background: url('http://i.imgur.com/geXWj1D.png') no-repeat 20% 0% / 5.2em auto;
 }
diff --git a/DnD_Moldvay_AmandatheAmazon/DnD_Moldvay_AmandatheAmazon.html b/DnD_Moldvay_AmandatheAmazon/DnD_Moldvay_AmandatheAmazon.html
index 2ba00aa964..64b580495f 100644
--- a/DnD_Moldvay_AmandatheAmazon/DnD_Moldvay_AmandatheAmazon.html
+++ b/DnD_Moldvay_AmandatheAmazon/DnD_Moldvay_AmandatheAmazon.html
@@ -1,5 +1,6 @@
 <!-- Basic D&D: Moldvay Character Sheet -->
-<!-- Version 1.16 -->
+
+<!-- Version 1.17 -->
 
 <!-- Sheet Worker Script -->
 
@@ -31,6 +32,8 @@ var updateOpenDoorsChance = function() {
 
 <!-- END Sheet Worker Script -->
 
+
+
 <!-- Overall Sheet Wrapper -->
 <div class="sheet-overall-wrapper">
 
@@ -499,7 +502,7 @@ var updateOpenDoorsChance = function() {
                                 <!-- BEGIN ranged weapon row 1-->
                                 <div class="sheet-row">
                                     <div class="sheet-col-1-24">
-                                        <button type='roll' name="Attack_@{MissileWeaponName1}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName1} (@{RangedDistance1})}} {{attack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit1}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die1}+@{MissileDmg_Bonus1}]]}}"></button>
+                                        <button type='roll' name="Attack_@{MissileWeaponName1}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName1} \n @{RangedDistance1}}} {{rangedattack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit1}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die1}+@{MissileDmg_Bonus1}]]}}"></button>
                                     </div>
                                     <div class="sheet-col-1-16"><input class="inSmallNum_noBorder" type="number" name="attr_MissileAmmo1" value="0"></div>
                                     <div class="sheet-col-1-4"><input class="inMainTxt" style="width: 190px;" type="text" placeholder="Missile weapon" name="attr_MissileWeaponName1"></div>
@@ -528,7 +531,7 @@ var updateOpenDoorsChance = function() {
                                 <!-- BEGIN ranged weapon row 2-->
                                 <div class="sheet-row">
                                     <div class="sheet-col-1-24">
-                                        <button type='roll' name="Attack_@{MissileWeaponName2}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName2} (@{RangedDistance2})}} {{attack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit2}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die2}+@{MissileDmg_Bonus2}]]}}"></button>
+                                        <button type='roll' name="Attack_@{MissileWeaponName2}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName2} \n @{RangedDistance2}}} {{rangedattack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit2}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die2}+@{MissileDmg_Bonus2}]]}}"></button>
                                     </div>
                                     <div class="sheet-col-1-16"><input class="inSmallNum_noBorder" type="number" name="attr_MissileAmmo2" value="0"></div>
                                     <div class="sheet-col-1-4"><input class="inMainTxt" style="width: 190px;" type="text" placeholder="Missile weapon" name="attr_MissileWeaponName2"></div>
@@ -557,7 +560,7 @@ var updateOpenDoorsChance = function() {
                                 <!-- BEGIN ranged weapon row 3-->
                                 <div class="sheet-row">
                                     <div class="sheet-col-1-24">
-                                        <button type='roll' name="Attack_@{MissileWeaponName3}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName3} (@{RangedDistance3})}} {{attack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit3}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die3}+@{MissileDmg_Bonus3}]]}}"></button>
+                                        <button type='roll' name="Attack_@{MissileWeaponName3}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName3} \n @{RangedDistance3}}} {{rangedattack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit3}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die3}+@{MissileDmg_Bonus3}]]}}"></button>
                                     </div>
                                     <div class="sheet-col-1-16"><input class="inSmallNum_noBorder" type="number" name="attr_MissileAmmo3" value="0"></div>
                                     <div class="sheet-col-1-4"><input class="inMainTxt" style="width: 190px;" type="text" placeholder="Missile weapon" name="attr_MissileWeaponName3"></div>
@@ -586,7 +589,7 @@ var updateOpenDoorsChance = function() {
                                 <!-- BEGIN ranged weapon row 4-->
                                 <div class="sheet-row">
                                     <div class="sheet-col-1-24">
-                                        <button type='roll' name="Attack_@{MissileWeaponName4}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName4} (@{RangedDistance4})}} {{attack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit4}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die4}+@{MissileDmg_Bonus4}]]}}"></button>
+                                        <button type='roll' name="Attack_@{MissileWeaponName4}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName4} \n @{RangedDistance4}}} {{rangedattack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit4}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die4}+@{MissileDmg_Bonus4}]]}}"></button>
                                     </div>
                                     <div class="sheet-col-1-16"><input class="inSmallNum_noBorder" type="number" name="attr_MissileAmmo4" value="0"></div>
                                     <div class="sheet-col-1-4"><input class="inMainTxt" style="width: 190px;" type="text" placeholder="Missile weapon" name="attr_MissileWeaponName4"></div>
@@ -615,7 +618,7 @@ var updateOpenDoorsChance = function() {
                                 <!-- BEGIN ranged weapon row 5-->
                                 <div class="sheet-row">
                                     <div class="sheet-col-1-24">
-                                        <button type='roll' name="Attack_@{MissileWeaponName5}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName5} (@{RangedDistance5})}} {{attack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit5}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die5}+@{MissileDmg_Bonus5}]]}}"></button>
+                                        <button type='roll' name="Attack_@{MissileWeaponName5}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName5} \n @{RangedDistance5}}} {{rangedattack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit5}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die5}+@{MissileDmg_Bonus5}]]}}"></button>
                                     </div>
                                     <div class="sheet-col-1-16"><input class="inSmallNum_noBorder" type="number" name="attr_MissileAmmo5" value="0"></div>
                                     <div class="sheet-col-1-4"><input class="inMainTxt" style="width: 190px;" type="text" placeholder="Missile weapon" name="attr_MissileWeaponName5"></div>
@@ -644,7 +647,7 @@ var updateOpenDoorsChance = function() {
                                 <!-- BEGIN ranged weapon row 6-->
                                 <div class="sheet-row">
                                     <div class="sheet-col-1-24">
-                                        <button type='roll' name="Attack_@{MissileWeaponName6}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName6} (@{RangedDistance6})}} {{attack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit6}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die6}+@{MissileDmg_Bonus6}]]}}"></button>
+                                        <button type='roll' name="Attack_@{MissileWeaponName6}" value="&{template:odnd} {{combat=1}} {{name=@{Name}}} {{title=@{MissileWeaponName6} \n @{RangedDistance6}}} {{rangedattack=[[(@{HitAC0}) - (@{toHitRoll}+@{MissileToHit6}+(?{Bonus/Minus|0}))]]}} {{damage=[[@{MissileDmg_Die6}+@{MissileDmg_Bonus6}]]}}"></button>
                                     </div>
                                     <div class="sheet-col-1-16"><input class="inSmallNum_noBorder" type="number" name="attr_MissileAmmo6" value="0"></div>
                                     <div class="sheet-col-1-4"><input class="inMainTxt" style="width: 190px;" type="text" placeholder="Missile weapon" name="attr_MissileWeaponName6"></div>
@@ -724,7 +727,7 @@ var updateOpenDoorsChance = function() {
 
                                         <div class="sheet-col-1-3">
                                             <button type='roll' name="Action: Listen" value="&{template:odnd} {{class=1}} {{name=@{Name}}} {{title=@{Listen-name}}} {{classability=[[@{Listen-die}]]}} {{chance=[[@{Listen-chance}]]}}"></button>
-                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Listen-name" class="sheet-inMainTxt" value="Listen" disabled="disabled"/></div>
+                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Listen-name" class="sheet-inMainTxt" value="Listen at Door" disabled="disabled"/></div>
                                         </div>
 
                                         <div class="sheet-col-1-3">
@@ -845,7 +848,7 @@ var updateOpenDoorsChance = function() {
 
                                         <div class="sheet-col-1-3">
                                             <button type='roll' name="Action: Listen" value="&{template:odnd} {{class=1}} {{name=@{Name}}} {{title=@{Dwarf_Listen-name}}} {{classability=[[@{Listen-die}]]}} {{chance=[[@{ElfDwarfHalfling_Listen-chance}]]}}"></button>
-                                            <div class="sheet-col-1-6"><input style="width:190px;" type="text" name="attr_Dwarf_Listen-name" class="sheet-inMainTxt" value="Dwarven Listen" disabled="disabled"/></div>
+                                            <div class="sheet-col-1-6"><input style="width:190px;" type="text" name="attr_Dwarf_Listen-name" class="sheet-inMainTxt" value="Dwarven Listen at Door" disabled="disabled"/></div>
                                         </div>
 
                                         <div class="sheet-col-1-3">
@@ -903,7 +906,7 @@ var updateOpenDoorsChance = function() {
 
                                         <div class="sheet-col-1-3">
                                             <button type='roll' name="Action: Listen" value="&{template:odnd} {{class=1}} {{name=@{Name}}} {{title=@{Elf_Listen-name}}} {{classability=[[@{Listen-die}]]}} {{chance=[[@{ElfDwarfHalfling_Listen-chance}]]}}"></button>
-                                            <div class="sheet-col-1-6"><input style="width:210px;" type="text" name="attr_Elf_Listen-name" class="sheet-inMainTxt" value="Elven Listen" disabled="disabled"/></div>
+                                            <div class="sheet-col-1-6"><input style="width:210px;" type="text" name="attr_Elf_Listen-name" class="sheet-inMainTxt" value="Elven Listen at Door" disabled="disabled"/></div>
                                         </div>
 
                                         <div class="sheet-col-1-3">
@@ -1023,7 +1026,7 @@ var updateOpenDoorsChance = function() {
 
                                         <div class="sheet-col-1-3">
                                             <button type='roll' name="Action: Listen" value="&{template:odnd} {{class=1}} {{name=@{Name}}} {{title=@{Listen-name}}} {{classability=[[@{Listen-die}]]}} {{chance=[[@{Listen-chance}]]}}"></button>
-                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Listen-name" class="sheet-inMainTxt" value="Listen" disabled="disabled"/></div>
+                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Listen-name" class="sheet-inMainTxt" value="Listen at Door" disabled="disabled"/></div>
                                         </div>
 
                                         <div class="sheet-col-1-3">
@@ -1067,7 +1070,7 @@ var updateOpenDoorsChance = function() {
 
                                         <div class="sheet-col-1-3">
                                             <button type='roll' name="Action: Listen" value="&{template:odnd} {{class=1}} {{name=@{Name}}} {{title=@{Halfling_Listen-name}}} {{classability=[[@{Listen-die}]]}} {{chance=[[@{ElfDwarfHalfling_Listen-chance}]]}}"></button>
-                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Halfling_Listen-name" class="sheet-inMainTxt" value="Halfling Listen" disabled="disabled"/></div>
+                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Halfling_Listen-name" class="sheet-inMainTxt" value="Halfling Listen Door" disabled="disabled"/></div>
                                         </div>
 
                                         <div class="sheet-col-1-3">
@@ -1123,7 +1126,7 @@ var updateOpenDoorsChance = function() {
 
                                         <div class="sheet-col-1-3">
                                             <button type='roll' name="Action: Listen" value="&{template:odnd} {{class=1}} {{name=@{Name}}} {{title=@{Listen-name}}} {{classability=[[@{Listen-die}]]}} {{chance=[[@{Listen-chance}]]}}"></button>
-                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Listen-name" class="sheet-inMainTxt" value="Listen" disabled="disabled"/></div>
+                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Listen-name" class="sheet-inMainTxt" value="Listen at Door" disabled="disabled"/></div>
                                         </div>
 
                                         <div class="sheet-col-1-3">
@@ -1241,7 +1244,7 @@ var updateOpenDoorsChance = function() {
 
                                         <div class="sheet-col-1-3">
                                             <button type='roll' name="Action: Listen" value="&{template:odnd} {{class=1}} {{name=@{Name}}} {{title=@{Listen-name}}} {{classability=[[@{Listen-die}]]}} {{chance=[[@{Listen-chance}]]}}"></button>
-                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Listen-name" class="sheet-inMainTxt" value="Listen" disabled="disabled"/></div>
+                                            <div class="sheet-col-1-6"><input style="width:170px;" type="text" name="attr_Listen-name" class="sheet-inMainTxt" value="Listen at Door" disabled="disabled"/></div>
                                         </div>
 
                                         <div class="sheet-col-1-3">
@@ -2029,14 +2032,18 @@ var updateOpenDoorsChance = function() {
                             <div class="sheet-col-4-17 sheet-ability-text sheet-vert-middle">Random Encounters</div>
                                 <input type="hidden" name="attr_RandomEncounter-die" value="1d6cs1cf6">
                                 <input type="hidden" name="attr_RandomEncounter-chance" value="2">
-                                <div class="sheet-col-1-16 sheet-vert-middle"><button type='roll' name="Random Encounter" value="/w gm &{template:odnd} {{stat=1}} {{title=Random Encounter}} {{randomencounter=[[@{RandomEncounter-die}]]}} {{chance=[[@{RandomEncounter-chance}]]}}" title="Random Encounter"></button></div>
+                                <div class="sheet-col-1-16 sheet-vert-middle">
+                                    <button type='roll' name="Random Encounter" value="/w gm &{template:odnd} {{stat=1}} {{title=Random Encounter}} {{randomencounter=[[@{RandomEncounter-die}]]}} {{chance=[[@{RandomEncounter-chance}]]}}" title="Random Encounter"></button>
+                                </div>
 
                             <div class="sheet-col-1-4 sheet-center">&nbsp;</div>
                             
                                 <input type="hidden" name="attr_RandomDistance-die" value="2d6">
                                 <input type="hidden" name="attr_RandomDistance-multiplier" value="10">
                                 <div class="sheet-col-5-17 sheet-ability-text sheet-vert-middle">Random Encounter Distance</div>
-                                <div class="sheet-col-1-16 sheet-vert-middle"><button type='roll' name="Random Distance" value="/w gm &{template:odnd} {{stat=1}} {{title=Random Encounter Distance}} {{randomdistance=[[@{RandomDistance-die} * [[@{RandomDistance-multiplier}]] ]]}}" name='Distance' title="Distance Check"></button></div>
+                                <div class="sheet-col-1-16 sheet-vert-middle">
+                                    <button type='roll' name="Random Distance" value="/w gm &{template:odnd} {{stat=1}} {{title=Random Encounter Distance}} {{randomdistance=[[@{RandomDistance-die} * [[@{RandomDistance-multiplier}]] ]]}}" name='Distance' title="Distance Check"></button>
+                                </div>
                         </div> <!--END Name, Type -->
                     </div>
 
@@ -2044,8 +2051,6 @@ var updateOpenDoorsChance = function() {
 
                         <hr/>
 
-                        <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
-
                     <div style="display: table; width: 100%; text-align:left;"> <!-- Monster Info -->
                         <div style="display: table-row; width:inherit;">
                             <div style="display: table-cell;width:inherit;">
@@ -2055,51 +2060,131 @@ var updateOpenDoorsChance = function() {
 
                         <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
 
-                        <div class="sheet-row"> <!-- Name, Type -->
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold;" type="text" placeholder="Monster Name" name="attr_MonsterName"><br/>Monster Name</div>  
-                            <div class="sheet-col-1-3 sheet-center">&nbsp;</div>
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Monster Type" name="attr_MonsterType"><br/>Monster Type</div>
-                        </div> <!--END Name, Type -->
+                        <div class="sheet-row"> <!-- Name, Hit Points -->
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 1.5em; font-weight: bold;" type="text" placeholder="Monster Name" name="attr_MonsterName"><br/>Monster Name</div>
+                            </div>
+
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+                            </div>
+
+                            <div class="sheet-col-1-3"> 
+                                <div class="sheet-col-3-7 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold; max-width: 100px" type="text" placeholder="Current" name="attr_MonsterHP"><br/>Hit Points</div>
+                                <b>&nbsp;/&nbsp;</b>
+                                <div class="sheet-col-3-7 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold; max-width: 100px" type="text" placeholder="Max" name="attr_MonsterHP_max"><br/>Max HP</div>
+                            </div>
+
+                            <!--<div class="sheet-col-1-3">
+                                <div class="sheet-col-3-7">   
+                                    <div class="sheet-inMainTxt">
+                                        <div class="sheet-col-1-5 sheet-center">&nbsp;</div>
+                                        <div class="sheet-col-1-2 sheet-center"><input class="sheet-MonsterHP" type="text" name="attr_MonsterHP" value="1" step="1"/>Hit Points</div>
+                                    </div>
+                                 </div>
+
+                                <div class="sheet-col-1-4 sheet-center">      
+                                    <div class="sheet-col-3-6 sheet-center"><input class="inSmallNum" type="number" name="attr_MonsterHP_max" value="1"><br/>Max HP</div>
+                                    <div class="sheet-col-1-7 sheet-center">&nbsp;</div>
+                                </div>
+                            </div>-->
+                        </div> <!--END Name, Hit Points -->
+
+                        <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+
+                        <div class="sheet-row"> <!-- Type, Armor Class -->
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold;" type="text" placeholder="Monster Type" name="attr_MonsterType"><br/>Monster Type</div> 
+                            </div>
+                            <div class="sheet-col-1-3"> 
+                                <div class="sheet-col-1-3 sheet-center">&nbsp;</div>
+                            </div>
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Armor Class" name="attr_MonsterAC"><br/>Armor Class</div>
+                            </div>
+                        </div> <!--END Type, Armor Class -->
 
                         <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
 
 
-                        <div class="sheet-row"> <!-- Armor Class, Hit Dice -->
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Armor Class" name="attr_MonsterAC"><br/>Armor Class</div>  
-                            <div class="sheet-col-1-3 sheet-center">&nbsp;</div>
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Hit Dice" name="attr_MonsterHD"><br/>Hit Dice</div>
-                        </div> <!--END Armor Class, Hit Dice -->
+                        <div class="sheet-row"> <!-- Hit Dice, Movement -->
+                            <div class="sheet-col-1-3"> 
+                                <div class="sheet-col-3-7 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold; max-width: 100px" type="text" value="1" name="attr_MonsterHD"><br/># Hit Dice</div>
+                                <div class="sheet-col-3-7 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold; max-width: 100px" type="text" value="0" name="attr_MonsterHDBonus"><br/>Hit Dice Bonus</div>
+                                    <input type="hidden" name="attr_MonsterHit-die" value="(@{MonsterHD})d8cs8cf1" />
+                                    <div class="sheet-col-1-10 sheet-vert-middle">
+                                        <button type='roll' value="/w gm &{template:odnd} {{name=@{MonsterName}}} {{title=Monster Hit Points}} {{MonsterHD=[[@{MonsterHit-die} + @{MonsterHDBonus}]]}}" name='Monster HP' title="Roll for monster's Hit Points"></button>
+                                    </div>
+                            </div>
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-6-23 sheet-center">&nbsp;</div>
+                            </div>
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Movement" name="attr_MonsterMove"><br/>Movement</div>
+                            </div>
+                        </div> <!--END Hit Dice, Movement -->
 
                         <div class="sheet-col-1-1 sheet-center">&nbsp;</div>                         
 
-                        <div class="sheet-row"> <!-- Move, No. Appearing -->
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Movement" name="attr_MonsterMove"><br/>Movement</div>  
-                            <div class="sheet-col-1-3 sheet-center">&nbsp;</div>
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="No. Appearing" name="attr_MonsterQty"><br/>No. Appearing</div>
-                        </div> <!--END Move, No. Appearing -->
-
-                        <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
-
-                        <div class="sheet-row"> <!-- Save As, Morale -->
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Save As" name="attr_MonsterSave"><br/>Monster Save</div>  
-                            <div class="sheet-col-1-3 sheet-center">&nbsp;</div>
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Morale" name="attr_MonsterMorale"><br/>Monster Morale</div>
-                        </div> <!--END Save As, Morale -->
-
-                        <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
-
-                        <div class="sheet-row"> <!-- Treasure Type, Alignment -->
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Treasure Type" name="attr_MonsterTreasure"><br/>Treasure Type</div>  
-                            <div class="sheet-col-1-3 sheet-center">&nbsp;</div>
-                            <div class="sheet-col-1-7 sheet-left" title="Choose your alignment">
-                                <select name="attr_MonsterAlignment" size="1"  style="text-align: center; width: 90px; font-size: 15px; font-weight: bold">
-                                    <option value="Law">Law</option>
-                                    <option value="Neutral" selected="selected">Neutral</option>
-                                    <option value="Chaos">Chaos</option>
-                                </select>
-                                Alignment
+                        <div class="sheet-row"> <!-- No. Appearing, Morale -->
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-6-7 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="No. Appearing" name="attr_MonsterQty"><br/>No. Appearing</div>
                             </div>
-                        </div> <!--END Treasure Type, Alignment -->
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+                            </div>
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-6-7 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Monster Morale" name="attr_MonsterMorale"><br/>Monster Morale</div>
+                                <input type="hidden" name="attr_MonsterMorale-die" value="2d6cs1cf6" />
+                                <div class="sheet-col-1-8 sheet-vert-middle">
+                                    <button type='roll' name="Monster Morale Check" value="/w gm &{template:odnd} {{stat=1}} {{name=@{MonsterName}}} {{title=Monster Morale Check}} {{moralecheck=[[@{MonsterMorale-die}]]}} {{chance=[[@{MonsterMorale}]]}}" name='Monster Morale' title="Monster Morale Check"></button>
+                                </div>
+                            </div>
+                        </div> <!--END No. Appearing, Morale -->
+
+                        <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+
+                        <div class="sheet-row"> <!-- Surprise, Alignment -->
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-4-7 sheet-ability-text sheet-vert-bottom" style="font-size: 15px; font-weight: bold">Monster Surprise</div>
+                                    <input type="hidden" name="attr_MonsterSurprise-die" value="1d6cs6cf1" />
+                                    <input type="hidden" name="attr_MonsterSurprise-chance" value="2" />
+                                    <div class="sheet-col-1-9 sheet-vert-bottom">
+                                        <button type='roll' name="Action: Surprise" value="/w gm &{template:odnd} {{class=1}} {{name=@{MonsterName}}} {{title=Monster Surprise Check}} {{surprise=[[ @{MonsterSurprise-die} + (?{Bonus/Minus|0}) ]] }} {{chance=[[@{MonsterSurprise-chance}]]}}"></button>
+                                    </div>
+                            </div>
+
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+                            </div>
+
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-7 sheet-left" title="Choose your alignment">
+                                    <select name="attr_MonsterAlignment" size="1"  style="text-align: center; width: 90px; font-size: 15px; font-weight: bold">
+                                        <option value="Law">Law</option>
+                                        <option value="Neutral" selected="selected">Neutral</option>
+                                        <option value="Chaos">Chaos</option>
+                                    </select>
+                                    Alignment
+                                </div>
+                            </div>      
+                        </div> <!--END Surprise, Alignment -->
+
+                        <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+
+                        <div class="sheet-row"> <!-- Treasure Type, XP Value -->
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Treasure Type" name="attr_MonsterTreasure"><br/>Treasure Type</div>
+                            </div>
+
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+                            </div>
+                                
+                            <div class="sheet-col-1-3">
+                                <div class="sheet-col-1-1 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="XP Value" name="attr_MonsterXP"><br/>Monster XP Value</div>
+                            </div>
+                        </div> <!--END Treasure Type, XP Value -->
                     </div>
 
                     <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
@@ -2107,82 +2192,121 @@ var updateOpenDoorsChance = function() {
                     <hr/>
 
 
-                    <!--<div style="display: table; width: 100%; text-align:left;">--> <!-- Saving Throws -->
-                        <!--<div style="display: table-row; width:inherit;">
+                    <div style="display: table; width: 100%; text-align:left;"> <!-- Saving Throws -->
+                        <div style="display: table-row; width:inherit;">
                             <div style="display: table-cell;width:inherit;">
                                 <div  class="sheet-title1">MONSTER SAVING THROWS</div>
                             </div>
-                        </div>-->
+                        </div>
 
-                            <!--<div class="sheet-row">--> <!-- Name, Type -->
-                            <!--<div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold;" type="text" placeholder="Monster Name" name="attr_MonsterName"><br/>Monster Name</div>  
-                            <div class="sheet-col-1-3 sheet-center">&nbsp;</div>
-                            <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Monster Type" name="attr_MonsterType"><br/>Monster Type</div>
-                        </div>--> <!--END Name, Type -->
+                        <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+
+                            <div class="sheet-row"> <!-- Save As -->
+                                <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt sheet-center" style="font-size: 15px; font-weight: bold" type="text" placeholder="Save As" name="attr_MonsterSave"><br/>Monster Save</div>
+                            </div> <!--END Save As -->
+
+                        <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
 
 
-                    <!--<div style="display: table-cell">--> <!-- Saving Throws -->
-                        <!--<div style="display: table; text-align: left;">-->
-
-                            <!--<div style="display: table-row;"> --><!-- Poison ST -->
-                                <!--<div class="sheet-savingthrow-num"><input name="attr_ST_Poison" type="text" class="sheet-savingthrow-num"></div>
-                                <div class="sheet-savingthrow-roll">
-                                    <button type='roll' style="font-family: 'Gloria Hallelujah', cursive; font-weight: bold; font-size: 16px;" value="&{template:odnd} {{save=1}} {{name=@{Name}}} {{title=Poison or Death Ray}} {{savingthrow=[[1d20 + (?{Bonus/Minus|0})]]}} {{savetype=[[@{ST_Poison}]]}}" name='ST_Poison' class="sheet-savingthrow-roll" title="Poison Save"></button>
+                        <!--<div style="display: table-cell">--> <!-- Saving Throws -->
+                            <!--<div style="display: table; text-align: left;">-->
+                        <div class="sheet-row">   
+                            <div class="sheet-col-1-2">
+                                <div style="display: table-cell">
+                                    <div style="display: table; text-align: left;">
+                                        <div style="display: table-row;"> <!-- Monster Poison ST -->
+                                            <div class="sheet-Monstersavingthrow-num"><input name="attr_MonsterST_Poison" type="text" class="sheet-Monstersavingthrow-num"></div>
+                                            <div class="sheet-savingthrow-roll">
+                                                <button type='roll' style="font-family: 'Gloria Hallelujah', cursive; font-weight: bold; font-size: 16px;" value="/w gm &{template:odnd} {{save=1}} {{name=@{MonsterName}}} {{title=Poison or Death Ray}} {{savingthrow=[[1d20 + (?{Bonus/Minus|0})]]}} {{savetype=[[@{MonsterST_Poison}]]}}" name='ST_Poison' class="sheet-savingthrow-roll" title="Poison Save"></button>
+                                            </div>
+                                            <div class="sheet-savingthrow-lib">POISON or DEATH RAY</div>
+                                        </div> <!-- END Monster Poison ST -->
+                                    </div>
                                 </div>
-                                <div class="sheet-savingthrow-lib">POISON or DEATH RAY</div>
-                            </div>--> <!-- END Poison ST -->
+                            </div>
 
-                            <!--<div style="display: table-row;"> --> <!-- Wand ST -->
-                                <!--<div class="sheet-savingthrow-num"><input name="attr_ST_Wand" type="text" class="sheet-savingthrow-num"></div>
-                                <div class="sheet-savingthrow-roll">
-                                    <button type='roll' value="&{template:odnd} {{save=1}} {{name=@{Name}}} {{title=Magic Wand}} {{savingthrow=[[1d20 + @{MOD_WIS} + (?{Bonus/Minus|0})]]}} {{savetype=[[@{ST_Wand}]]}}" name='ST_Wand' class="sheet-savingthrow-roll" title="Wand Save"></button>
+                            <div class="sheet-col-1-2">
+                                <div style="display: table-cell">
+                                    <div style="display: table; text-align: left;">
+                                        <div style="display: table-row;"> <!-- Wand ST -->
+                                            <div class="sheet-Monstersavingthrow-num"><input name="attr_MonsterST_Wand" type="text" class="sheet-Monstersavingthrow-num"></div>
+                                            <div class="sheet-savingthrow-roll">
+                                                <button type='roll' value="/w gm &{template:odnd} {{save=1}} {{name=@{MonsterName}}} {{title=Magic Wand}} {{savingthrow=[[1d20 + (?{Bonus/Minus|0})]]}} {{savetype=[[@{MonsterST_Wand}]]}}" name='ST_Wand' class="sheet-savingthrow-roll" title="Wand Save"></button>
+                                            </div>
+                                            <div class="sheet-savingthrow-lib">MAGIC WAND</div>
+                                        </div> <!-- END Wand ST -->
+                                    </div>
                                 </div>
-                                <div class="sheet-savingthrow-lib">MAGIC WAND &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-                            </div>--> <!-- END Wand ST -->
+                            </div>
+                        </div>
 
-                            <!--<div style="display: table-row;"> --><!-- Stone ST -->
-                                <!--<div class="sheet-savingthrow-num"><input name="attr_ST_Stone" type="text" class="sheet-savingthrow-num"></div>
-                                <div class="sheet-savingthrow-roll">
-                                    <button type='roll' value="&{template:odnd} {{save=1}} {{name=@{Name}}} {{title=Turn to Stone or Paralysis}} {{savingthrow=[[1d20 + (?{Bonus/Minus|0})]]}} {{savetype=[[@{ST_Stone}]]}}" name='ST_Stone' class="sheet-savingthrow-roll" title="Stone Save"></button>
+                        <div class="sheet-row">  
+                            <div class="sheet-col-1-2">
+                                <div style="display: table-cell">
+                                    <div style="display: table; text-align: left;">
+                                        <div style="display: table-row;"> <!-- Stone ST -->
+                                            <div class="sheet-Monstersavingthrow-num"><input name="attr_MonsterST_Stone" type="text" class="sheet-Monstersavingthrow-num"></div>
+                                            <div class="sheet-savingthrow-roll">
+                                                <button type='roll' value="/w gm &{template:odnd} {{save=1}} {{name=@{MonsterName}}} {{title=Turn to Stone or Paralysis}} {{savingthrow=[[1d20 + (?{Bonus/Minus|0})]]}} {{savetype=[[@{MonsterST_Stone}]]}}" name='ST_Stone' class="sheet-savingthrow-roll" title="Stone Save"></button>
+                                            </div>
+                                            <div class="sheet-savingthrow-lib">TURN TO STONE or PARALYSIS</div>
+                                        </div> <!-- END Stone ST --> 
+                                    </div>
                                 </div>
-                                <div class="sheet-savingthrow-lib">TURN TO STONE or PARALYSIS</div>
-                            </div>--> <!-- END Stone ST --> 
+                            </div>
 
-                            <!--<div style="display: table-row;">--> <!-- Breath ST -->
-                                <!--<div class="sheet-savingthrow-num"><input name="attr_ST_Breath" type="text" class="sheet-savingthrow-num"></div>
-                                <div class="sheet-savingthrow-roll">
-                                    <button type='roll' value="&{template:odnd} {{save=1}} {{name=@{Name}}} {{title=Dragon Breath}} {{savingthrow=[[1d20 + (?{Bonus/Minus|0})]]}} {{savetype=[[@{ST_Breath}]]}}" name='ST_Breath' class="sheet-savingthrow-roll" title="Breath Save"></button>
+                            <div class="sheet-col-1-2">
+                                <div style="display: table-cell">
+                                    <div style="display: table; text-align: left;">
+                                        <div style="display: table-row;"> <!-- Breath ST -->
+                                            <div class="sheet-Monstersavingthrow-num"><input name="attr_MonsterST_Breath" type="text" class="sheet-Monstersavingthrow-num"></div>
+                                            <div class="sheet-savingthrow-roll">
+                                                <button type='roll' value="/w gm &{template:odnd} {{save=1}} {{name=@{MonsterName}}} {{title=Dragon Breath}} {{savingthrow=[[1d20 + (?{Bonus/Minus|0})]]}} {{savetype=[[@{MonsterST_Breath}]]}}" name='ST_Breath' class="sheet-savingthrow-roll" title="Breath Save"></button>
+                                            </div>
+                                            <div class="sheet-savingthrow-lib">DRAGON BREATH</div>
+                                        </div> <!-- Breath ST -->
+                                    </div>
                                 </div>
-                                <div class="sheet-savingthrow-lib">DRAGON BREATH &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-                            </div>--> <!-- Breath ST -->
+                            </div>
+                        </div>
 
-                            <!--<div style="display: table-row;">--> <!-- Spells ST -->
-                                <!--<div class="sheet-savingthrow-num"><input name="attr_ST_Spells" type="text" class="sheet-savingthrow-num" /></div>
-                                <div class="sheet-savingthrow-roll">
-                                    <button type='roll' value="&{template:odnd} {{save=1}} {{name=@{Name}}} {{title=Spells or Magic Staff}} {{savingthrow=[[1d20 + @{MOD_WIS} + (?{Bonus/Minus|0})]]}} {{savetype=[[@{ST_Spells}]]}}" name='ST_Spells' class="sheet-savingthrow-roll" title="Spell Save"></button>
+                        <div class="sheet-row">  
+                            <div class="sheet-col-1-2">
+                                <div style="display: table-cell">
+                                    <div style="display: table; text-align: left;">
+                                        <div style="display: table-row;"> <!-- Spells ST -->
+                                            <div class="sheet-Monstersavingthrow-num"><input name="attr_MonsterST_Spells" type="text" class="sheet-Monstersavingthrow-num" /></div>
+                                            <div class="sheet-savingthrow-roll">
+                                                <button type='roll' value="/w gm &{template:odnd} {{save=1}} {{name=@{MonsterName}}} {{title=Spells or Magic Staff}} {{savingthrow=[[1d20 + (?{Bonus/Minus|0})]]}} {{savetype=[[@{MonsterST_Spells}]]}}" name='ST_Spells' class="sheet-savingthrow-roll" title="Spell Save"></button>
+                                            </div>
+                                            <div class="sheet-savingthrow-lib">SPELLS or MAGIC STAFF</div>
+                                        </div> <!-- END Spells ST --> 
+                                    </div>
                                 </div>
-                                <div class="sheet-savingthrow-lib">SPELLS or MAGIC STAFF</div>
-                            </div>--> <!-- END Spells ST -->
+                            </div>
+                        </div>
                             
                         <!--</div>--> <!-- END SAVING THROW -->
-                        <!--<div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+                        <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
 
-                            <div style="display: table-cell; text-align:left;"> --><!-- Saving Throw Bonus' -->
-                                <!--<div style="display: table-row; width:100%;">
-                                        <div style="display:table-cell; width: 30px; text-align: center">+/-</div>
-                                        <div class="sheet-col-1-22 sheet-center">&nbsp;</div>
-                                        <div style="display: table-cell; width: 170px; text-align: center"><b>Against</b></div>
-                                    </div>
+                        <div class="sheet-row">
+                            <div style="display: table-cell; text-align:left;"> <!-- Saving Throw Bonus' -->
+                                <div style="display: table-row; width:100%;">
+                                    <div style="display:table-cell; width: 30px; text-align: center">+/-</div>
+                                    <div class="sheet-col-1-22 sheet-center">&nbsp;</div>
+                                    <div style="display: table-cell; width: 170px; text-align: center"><b>Against</b></div>
+                                </div>
 
                                 <fieldset class="repeating_savingthrowbonus">
-                                    <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt" type="text" name="attr_stBonus" style="width: 40px;" placeholder="+0" title="Saving Throw Bonus"></div>
+                                    <div class="sheet-col-1-4 sheet-left"><input class="sheet-inMainTxt" type="text" name="attr_MonsterstBonus" style="width: 40px;" placeholder="+0" title="Saving Throw Bonus"></div>
                                     <div class="sheet-col-1-22 sheet-center">&nbsp;</div>
-                                    <div class="sheet-col-1-2 sheet-left"><input class="sheet-inMainTxt" type="text" name="attr_stAgainst" style="width: 150px; text-align:center;" placeholder="Against"></div>
+                                    <div class="sheet-col-1-2 sheet-left"><input class="sheet-inMainTxt" type="text" name="attr_MonsterstAgainst" style="width: 150px; text-align:center;" placeholder="Against"></div>
                                 </fieldset>
-                            </div> --> <!-- END Saving Throw Bonuses -->
-                    <!--</div>--> <!-- END Saving Throws -->
+                            </div> <!-- END Saving Throw Bonuses -->
+                        </div>
+                    </div> <!-- END Saving Throws -->
 
-                    <!--<hr/>-->
+                    <hr/>
 
                     <div style="width: 100%;text-align:center;"> <!-- TABLE Monster Target AC -->
                         <div style="display: table; width:100%;">
@@ -2226,12 +2350,21 @@ var updateOpenDoorsChance = function() {
 
                             <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
 
+                            <div class="sheet-row"> <!-- Monster Initiative -->
+                                <div class="sheet-col-4-17 sheet-ability-text sheet-vert-middle" style="font-size: 15px; font-weight: bold">Monster Initiative</div>
+                                    <input type="hidden" name="attr_MonsterInit-die" value="1d6cf1cs6">
+                                    <div class="sheet-col-1-16 sheet-vert-middle"><button type='roll' value="&{template:odnd} {{name=@{MonsterName}}} {{title=Monster Initiative}} {{INIT=[[@{MonsterInit-die} + (?{Initiative Bonus/Minus|0}) &{tracker}]]}}" name='Monster Initiative' title="Monster Initiative"></button></div>
+                            </div> <!--END Monster Initiative -->
+
+
+                            <div class="sheet-col-1-1 sheet-center">&nbsp;</div>  
+
                             <input type="hidden" name="attr_MonstertoHitRoll" value="1d20cs20cf1" />
 
                             <fieldset class="repeating_attacks">
                                 <div style="display: table-row;">
                                     <div style="display: table-cell; text-align: center; width: 45px;">
-                                        <button type='roll' name="MonsterAttack_@{wpnname}" value="&{template:odnd} {{combat=1}} {{name=@{MonsterName}}} {{title=@{Monsterwpnname}}} {{attack=[[ (@{MonsterHitAC0}) - (@{MonstertoHitRoll} [Die Roll] + @{Monsterattack-bonus} + (?{To Hit Bonus/Minus|0})) ]] }} {{damage=[[1d@{Monsterattack-damage-die}+@{Monsterattack-damage-bonus}]]}}"></button>
+                                        <button type='roll' name="MonsterAttack_@{wpnname}" value="&{template:odnd} {{combat=1}} {{name=@{MonsterName}}} {{title=@{Monsterwpnname}}} {{attack=[[ (@{MonsterHitAC0}) [THAC0] - (@{MonstertoHitRoll} [Die Roll] + @{Monsterattack-bonus} [Attack Roll Bonus] + (?{To Hit Bonus/Minus|0}) [ADD'L Bonus]) ]] }} {{damage=[[(@{Monsterattack-number-die})d@{Monsterattack-damage-die}+@{Monsterattack-damage-bonus}]]}}"></button>
                                     </div>
                                     <div style="display: table-cell;width:420px;">
                                         <input type="text" style="font-size: 15px; font-weight: bold" name="attr_Monsterwpnname" class="sheet-inMainTxt" placeholder="Weapon Name / attack" />
@@ -2239,7 +2372,9 @@ var updateOpenDoorsChance = function() {
                                         <input type="number" name="attr_Monsterattack-bonus" class="sheet-inMainNum" style="width: 45px; font-size: 15px; font-weight: bold" title="Attack roll bonus" placeholder="0" value="0" />
                                     </div>
                                     <div style="display: table-cell; text-align: right;">
-                                        <b>Damage&nbsp;d</b>
+                                        <b>Damage:&nbsp;</b>
+                                        <input type="number" name="attr_Monsterattack-number-die" class="sheet-inMainNum" style="width: 45px; font-size: 15px; font-weight: bold" title="Number of Dice" placeholder="1" value="1" />
+                                        <b>D</b>
                                         <input type="number" name="attr_Monsterattack-damage-die" class="sheet-inMainNum" style="width: 45px; font-size: 15px; font-weight: bold" title="Damage Die" placeholder="6" value="6" />
                                         +
                                         <input type="number" name="attr_Monsterattack-damage-bonus" class="sheet-inMainNum"  style="width: 45px; font-size: 15px; font-weight: bold" title="Damage roll bonus" placeholder="0" value="0" />
@@ -2248,6 +2383,35 @@ var updateOpenDoorsChance = function() {
                                 <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
                             </fieldset>
                         </div> <!-- END Attacks -->
+
+                        <hr />
+
+                        <div style="display: table; width: 100%; text-align:left;"> <!-- Abilities -->
+                            <div style="display: table-row; width:inherit;">
+                                <div style="display: table-cell;width:inherit;">
+                                    <div  class="sheet-title1">MONSTER ABILITIES</div>
+                                </div>
+                            </div>
+
+                            <div class="sheet-col-1-1 sheet-center">&nbsp;</div>  
+
+                            <input type="hidden" name="attr_MonstertoHitRoll" value="1d20cs20cf1" />
+
+                            <fieldset class="repeating_abilities">
+                                <div style="display: table-row;">
+                                    <div style="display: table-cell; text-align: center; width: 45px;">
+                                        <button type='roll' name="MonsterAbility" value="&{template:odnd} {{class=1}} {{name=@{MonsterName}}} {{title=@{Monsterabilityname}}} {{Monsterability= @{Monsterability-text} }}"></button>
+                                    </div>
+                                    <div style="display: table-cell;width:420px;">
+                                        <input type="text" style="font-size: 15px; font-weight: bold" name="attr_Monsterabilityname" class="sheet-inMainTxt" placeholder="Ability Name" />
+                                    </div>
+                                    <div style="display: table-cell; text-align: right; border-width: 2px 2px 2px 2px; border-color: black; border-top-style: solid; border-right-style: solid; border-left-style: solid; border-bottom-style: solid;">
+                                        <textarea name="attr_Monsterability-text" class="sheet-inMainTxt" style="width: 420px; height: 75px; font-size: 14px; font-weight: bold" title="Ability Text" placeholder="Insert ability text here"></textarea>
+                                    </div>
+                                </div>
+                                <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
+                            </fieldset>
+                        </div> <!-- END Attacks -->
                         <hr/>
 
                         <div class="sheet-col-1-1"> <!-- Notes -->
@@ -2256,9 +2420,9 @@ var updateOpenDoorsChance = function() {
 
                         <div class="sheet-col-1-1 sheet-center">&nbsp;</div>
 
-                            <div class="sheet-row">
-                                    <div class="sheet-col-1-1" style="border-width: 2px 2px 3px 2px; border-color: black; border-top-style: solid; border-right-style: solid; border-left-style: solid; border-bottom-style: solid;"><textarea name="attr_MonsterNotes" style="font-size: 15px; font-weight: bold"></textarea></div>
-                                </div>
+                        <div class="sheet-row">
+                            <div class="sheet-col-1-1" style="border-width: 2px 2px 3px 2px; border-color: black; border-top-style: solid; border-right-style: solid; border-left-style: solid; border-bottom-style: solid;"><textarea name="attr_MonsterNotes" style="font-size: 15px; font-weight: bold"></textarea></div>
+                        </div>
                         <!-- END Notes -->
 
 
@@ -2281,36 +2445,85 @@ var updateOpenDoorsChance = function() {
 
             <div class="sheet-main-content">
                 
-                <!--Weapon based attacks-->
+                <!--Melee Weapon based attacks-->
                     {{#attack}}
                         <div class="sheet-row">
                             <div class="sheet-col-7-13 sheet-padl sheet-RollTemp-rollname">Hits : &nbsp;&nbsp;AC</div>
                             <div class="sheet-col-6-13 sheet-padr sheet-RollTemp-rollresult">{{attack}}</div>
                         </div>
+
+                        {{#^rollWasFumble() attack}}
+                            {{#damage}}
+                                <div class="sheet-row">
+                                    <div class="sheet-col-7-13 sheet-padl sheet-padr sheet-RollTemp-rollname">Damage :</div>
+                                    <div class="sheet-col-6-13 sheet-padr sheet-RollTemp-rollresult">{{damage}}</div>
+                                </div>
+                            {{/damage}}
+                        {{/^rollWasFumble() attack}}
                     
-                        {{#damage}}
+                        <!--{{#damage}}
                             <div class="sheet-row">
                                 <div class="sheet-col-7-13 sheet-padl sheet-padr sheet-RollTemp-rollname">Damage :</div>
                                 <div class="sheet-col-6-13 sheet-padr sheet-RollTemp-rollresult">{{damage}}</div>
                             </div>
-                        {{/damage}}
+                        {{/damage}}-->
 
                         {{#rollWasCrit() attack}}
                             <div class="sheet-row">
                                 <div class="sheet-col-1-1">&nbsp;</div>
-                                <div class="sheet-col-19-20 sheet-padl sheet-padr sheet-RollTemp-critsuccess">AN AUTOMATIC HIT !</div>
+                                <div class="sheet-col-19-20 sheet-padl sheet-padr sheet-RollTemp-critsuccessEXSM">AN AUTOMATIC HIT !</div>
                             </div>
                         {{/rollWasCrit() attack}}   
                             
-                        {{#rollWasFumble() attack}}
+                        <!--{{#rollWasFumble() attack}}
                             <div class="sheet-row">
                                 <div class="sheet-col-1-1">&nbsp;</div>
                                 <div class="sheet-col-19-20 sheet-padl sheet-RollTemp-critfail">A TERRIBLE MISS !</div>
                             </div>
+                        {{/rollWasFumble() attack}}-->
+
+                        {{#rollWasFumble() attack}}
+                            <div class="sheet-row">
+                                <div class="sheet-col-1-1">&nbsp;</div>
+                                <div class="sheet-col-19-20 sheet-padl sheet-RollTemp-critfailM">A TERRIBLE MISS !</div>
+                            </div>
                         {{/rollWasFumble() attack}}
                         
                     {{/attack}}
 
+                <!--Missile Weapon based attacks-->
+                    {{#rangedattack}}
+                        <div class="sheet-row">
+                            <div class="sheet-col-7-13 sheet-padl sheet-RollTemp-rollname">Hits : &nbsp;&nbsp;AC</div>
+                            <div class="sheet-col-6-13 sheet-padr sheet-RollTemp-rollresult">{{rangedattack}}</div>
+                        </div>
+                    
+
+                        {{#^rollWasFumble() rangedattack}}
+                            {{#damage}}
+                                <div class="sheet-row">
+                                    <div class="sheet-col-7-13 sheet-padl sheet-padr sheet-RollTemp-rollname">Damage :</div>
+                                    <div class="sheet-col-6-13 sheet-padr sheet-RollTemp-rollresult">{{damage}}</div>
+                                </div>
+                            {{/damage}}
+                        {{/^rollWasFumble() rangedattack}}
+
+                        {{#rollWasCrit() rangedattack}}
+                            <div class="sheet-row">
+                                <div class="sheet-col-1-1">&nbsp;</div>
+                                <div class="sheet-col-19-20 sheet-padl sheet-padr sheet-RollTemp-critsuccessEXSM">AN AUTOMATIC HIT !</div>
+                            </div>
+                        {{/rollWasCrit() rangedattack}}   
+                                
+                        {{#rollWasFumble() rangedattack}}
+                            <div class="sheet-row">
+                                <div class="sheet-col-1-1">&nbsp;</div>
+                                <div class="sheet-col-19-20 sheet-padl sheet-RollTemp-critfailM">A TERRIBLE MISS !</div>
+                            </div>
+                        {{/rollWasFumble() rangedattack}}
+
+                    {{/rangedattack}}
+
                 <!-- Initiative -->
                 {{#INIT}}
                     <div class="sheet-row">
@@ -2327,6 +2540,14 @@ var updateOpenDoorsChance = function() {
                     </div>
                 {{/HD}}
 
+                <!-- Monster Hit Die -->
+                {{#MonsterHD}}
+                    <div class="sheet-row">
+                        <div class="sheet-col-13-19 sheet-padl sheet-RollTemp-rollname">Starting HP : </div>
+                        <div class="sheet-col-6-19 sheet-padr sheet-RollTemp-rollresult">{{MonsterHD}}</div>
+                    </div>
+                {{/MonsterHD}}
+
                 <!-- STR Open Doors -->
                 {{#strskill}}
                     <div class="sheet-row">
@@ -2452,7 +2673,7 @@ var updateOpenDoorsChance = function() {
                     {{#rollGreater() surprise chance}}
                         <div class="sheet-row">
                             <div class="sheet-col-1-1">&nbsp;</div>
-                            <div class="sheet-col-19-20 sheet-padl sheet-padr sheet-RollTemp-success">NOT SURPRISED !</div>
+                            <div class="sheet-col-19-20 sheet-padl sheet-padr sheet-RollTemp-successM">NOT SURPRISED !</div>
                         </div>
                     {{/rollGreater() surprise chance}}
                     {{#rollBetween() surprise -100 chance}}
@@ -2511,7 +2732,7 @@ var updateOpenDoorsChance = function() {
                     {{#rollBetween() randomencounter 2 chance}}
                         <div class="sheet-row">
                             <div class="sheet-col-1-1">&nbsp;</div>
-                            <div class="sheet-col-23-24 sheet-padl sheet-padr sheet-RollTemp-successSM">POSSIBLE MONSTER ENCOUNTER (DM Choice)</div>
+                            <div class="sheet-col-23-24 sheet-padl sheet-padr sheet-RollTemp-successEXSM">POSSIBLE MONSTER ENCOUNTER (DM Choice)</div>
                         </div>
                     {{/rollBetween() randomencounter 2 chance}}
                 {{/randomencounter}}
@@ -2524,6 +2745,15 @@ var updateOpenDoorsChance = function() {
                     </div>
                 {{/randomdistance}}
 
+                <!-- Monster Abilities -->
+                {{#Monsterability}}
+                    <div class="sheet-row">
+                        <div class="sheet-col-23-24 sheet-padl sheet-RollTemp-rollname-wide">{{Monsterability}}</div>
+                    </div>
+                {{/Monsterability}}
+
+                
+
             </div>
         </div>
     </rolltemplate>
diff --git a/DnD_Moldvay_AmandatheAmazon/ReadMe.md b/DnD_Moldvay_AmandatheAmazon/ReadMe.md
index df4d50f539..41b9f5fbed 100644
--- a/DnD_Moldvay_AmandatheAmazon/ReadMe.md
+++ b/DnD_Moldvay_AmandatheAmazon/ReadMe.md
@@ -3,10 +3,20 @@
 This is a re-creation of the "green-sheet" for the D&D Basic Moldvay Red box game.  It was created for the Roll20 Moldvay Basic Contest.
 
 ## Current Version
-1.16
+2.0
 
 ### Changelog
 
+#### 2.0
+* Monster Sheet Update
+* Monster Initiative can now be rolled within sheet
+* Monster HP can now be rolled within sheet - result sent to GM
+* Monster Morale checks can now be rolled within sheet - result sent to GM
+* Monster Surprise checks can now be rolled within sheet - result sent to GM
+* Monsters now have saves (Moldvay: Add monster saves #1898)
+* Monsters now can have multiple damage dice per attack (Moldvay: Monster multiple monster attack die #1897)
+* Monsters now have abilities section for non-attack roll abilities (Moldvay: Add monster abilities #1896)
+
 #### 1.16
 * Fixing sheet worker to calculate chance to open door on sheet open and STR mod change
 
diff --git a/DnD_Moldvay_AmandatheAmazon/sheet.json b/DnD_Moldvay_AmandatheAmazon/sheet.json
index 08e9810b1e..bbdc23f01f 100644
--- a/DnD_Moldvay_AmandatheAmazon/sheet.json
+++ b/DnD_Moldvay_AmandatheAmazon/sheet.json
@@ -4,5 +4,5 @@
     "authors": "Amanda the Amazon",
     "roll20userid": "565956",
     "preview": "Moldvay_Basic_Sheet.png",
-    "instructions": "# Moldvay Character Sheet\r This sheet has both a Player sheet and a pared down Monster Sheet for the GM that is switchable via a tab at the top left of the sheet.\r\r## Player Sheet\r\r* All of the automatic roll buttons (shown as a d20 dice) should have roll templates.\r* Attack rolls now show the AC hit (they use the values from the To Hit Roll table) - No more looking up what AC you did hit!\r* All ability bonus' should be included in their automatic rolls.\r* Halflings should check the box marking 'Halfling' under Attacks, Missile in order to get the bonus' to Missile Attacks and Initiative\r* Movement must be calculated by the player using their current encumbrance and armor worn.\r\r## Monster Sheet\r\r* Monster Name and Type\r* Armor Class and Movement\r* Treasure Type and Alignment\r* Hit Die (a gmroll button is in the works for this field)\r* Number Appearing (a roll button is in the works for this field, possibly a roll template and maybe a choice between gmroll or not gmroll\r* Monster Save (roll templates are in the works for this)\r* Monster Morale (roll template is in the work for this\r* Attacks are a repeating field and you can add as many as you want - Roll Template attack button is included :)\r* Monster Notes - Add anything you like here.\r* Monster Initiative roll button is in the works-will be a roll template\r* Random Monster check roll button-this is a gmroll.\r* Random Monster check distance roll button-this is a gmroll.\r* Monster Hit AC table\r\r\r## Current Version: 1.16"
+    "instructions": "# Moldvay Character Sheet\r This sheet has both a Player sheet and a pared down Monster Sheet for the GM that is switchable via a tab at the top left of the sheet.\r\r## Player Sheet\r\r* All of the automatic roll buttons (shown as a d20 dice) should have roll templates.\r* Attack rolls now show the AC hit (they use the values from the To Hit Roll table) - No more looking up what AC you did hit!\r* All ability bonus' should be included in their automatic rolls.\r* Halflings should check the box marking 'Halfling' under Attacks, Missile in order to get the bonus' to Missile Attacks and Initiative\r* Movement must be calculated by the player using their current encumbrance and armor worn.\r\r## Monster Sheet\r\r* Monster Name and Type\r* Armor Class and Movement\r* Treasure Type and Alignment\r* Hit Die (Roll template button - this is a gmroll)\r* Number Appearing\r* Monster Surprise (Roll template button - this is a gmroll)\r* Monster Save (Roll templates buttons)\r* Monster Morale (Roll Template button - this is a gmroll)\r* Monster Initiative (Roll Template button)\r* Attacks are a repeating field and you can add as many as you want - Roll Template attack button is included :)\r* Monster Abilities - a Roll template for non-attacking abilities.  For Example: Ability Name: Stench, Monster Name, Text: A cloud of gas descends upon the party.  Everyone make a poison saving throw.\r* Monster Notes - Add anything you like here.\r* Random Monster check roll button-this is a gmroll.\r* Random Monster check distance roll button-this is a gmroll.\r* Monster Hit AC table - ties into attack rolls showing AC hit\r\r\r## Current Version: 2.0"
 }