diff --git a/Pathfinder Playtest/PFPlaytest.html b/Pathfinder Playtest/PFPlaytest.html
index 1df7e1683e..76f3391084 100644
--- a/Pathfinder Playtest/PFPlaytest.html	
+++ b/Pathfinder Playtest/PFPlaytest.html	
@@ -1,4 +1,4 @@
-<!-- Note that currently the sheet's html/javascript is too long to be used by the repo to generate a sheet. I use the following regex on regexr.com
+<!-- Note that currently the sheet's html/javascript is too long to be used by the repo to generate a sheet. I use the following regex on regexr.com
 to easily shrink the line count to what the repo can handle:
 Look for: \n\s*
 Replace with: 
@@ -11,10 +11,10 @@ This pattern can be found at https://regexr.com/3mi9v
     <!-- The above 3 attributes are used for calculations for NPCs-->
     <div class='name-container'>
         <img class='header-image' src='https://s3.amazonaws.com/files.d20.io/images/57857120/YuG910wMT-Kffh7DwNchZw/max.png'>
-    </div>
+    </div><!--
     <input class="tab-button options nav hide-tab" type="checkbox" title='@{tab_select}' name="attr_tab_select" value="options" checked>
     <span class='pictos nav'>y</span>
-    <span class='nav pictos'>x</span>
+    <span class='nav pictos'>x</span>-->
     <input class='page-control' type='hidden' name='attr_sheet_type' value='pc'>
     <!-- Containers -->
     <div class='container settings'>
@@ -1291,10 +1291,10 @@ This pattern can be found at https://regexr.com/3mi9v
                                     <input class="show-options" type="checkbox" title='@{show_options}' name="attr_show_options" checked><span>y</span>
                                     
                                     <div class='display'>
-                                        <input hidden='true' title='@{misc}' name='attr_misc' value=''>
+                                        <input hidden='true' title='@{misc}' name='attr_skill_misc' value=''>
                                         <input class='acp' type='checkbox' title='@{acp}' name='attr_acp' hidden='true' value='1'>
-                                        <button class='acp' type='roll' title='%{roll}' name='roll_roll' value='@{whisper_state}&{template:generic} {{name=@{character_name}}} {{characterid=@{character_id}}} {{title=@{name}}}  {{r1=[[1d20+@{character_level}[Level]+@{proficiency}[Prof]+@{ability}[Ability]@{misc}]]}} {{notes=@{description}}}'><span class='profession-name label' type='text' title='@{name}' name='attr_name' value='Profession'>Lore/Perform</span></button>
-                                        <input class='mod-buff' type='hidden' name='attr_change' value='0'>
+                                        <button class='acp' type='roll' title='%{roll}' name='roll_roll' value='@{whisper_state}&{template:generic} {{name=@{character_name}}} {{characterid=@{character_id}}} {{title=@{name}}}  {{r1=[[1d20+@{character_level}[Level]+@{proficiency}[Prof]+@{ability}[Ability]@{skill_misc}]]}} {{notes=@{description}}}'><span class='profession-name label' type='text' title='@{name}' name='attr_name' value='Profession'>Lore/Perform</span></button>
+                                        <input class='mod-buff' type='hidden' name='attr_skill_change' value='0'>
                                         <span class='mod tot modified-attr' readonly='true' type='text' title='@{skill}' name='attr_skill' value='0'>0</span>
                                         <select class='span-five' name='attr_proficiency'>
                                         	<option value='-2' data-i18n='untrained'>UNTRAINED</option>
@@ -1319,8 +1319,6 @@ This pattern can be found at https://regexr.com/3mi9v
                                                 <option value='@{wisdom_mod}'>WIS</option>
                                                 <option value='@{charisma_mod}'>CHA</option>
                                             </select>
-                                            
-                                            
                                         </div>
                                         <textarea class='skill-description input-field' title='@{description}' name='attr_description'></textarea>
                                         <input readonly=true class='id-label' title='@{id}' name='attr_id'></input>
@@ -4526,7 +4524,7 @@ This pattern can be found at https://regexr.com/3mi9v
         <div class='statblock'>
             <div class='statblock-header'>
                 <input class='scalable-input char-name' type='text' title='@{character_name}' name='attr_character_name'>
-                <select class='scalable-input' title='@{rarity}' name='attr_rarity'>
+                <select class='scalable-input input-field' title='@{rarity}' name='attr_rarity'>
                     <option value='common' data-i18n='common' selected='selected'>COMMON</option>
                     <option value='uncommon' data-i18n='uncommon'>UNCOMMON</option>
                     <option value='rare' data-i18n='rare'>RARE</option>
@@ -4571,76 +4569,62 @@ This pattern can be found at https://regexr.com/3mi9v
                 <textarea name='attr_interactions' placeholder='Interaction Abilities'></textarea>
             </div>
             <div class='statblock-section-header defense-header'>
-                <div class='hp-rp-container'>
-                    <span class='hp' data-i18n='hp'>HP</span>
-                    <input class='hp' type='number' title='@{hp}' name='attr_hp'>
-                    <span class='slash'>/</span>
-                    <input class='hp' type='number' title='@{hp_max}' name='attr_hp_max'>
-                    <span class='rp' data-18n='rp'>RP</span>
-                    <input class='rp' type='number' title='@{rp}' name='attr_rp' value='0'>
-                    <span class='slash'>/</span>
-                    <input class='rp' type='number' title='@{rp_max}' name='attr_rp_max' value='0'>
-                </div>
             </div>
-            <div class='row defense-row'>
-                <span class='npc-ac' data-i18n='eac'>EAC</span>
-                <div class='attr-base-mod-container input-field npc-ac'>
-                    <input class='base-attr' type='number' title='@{tac}' name='attr_tac_base' value='10'>
-                    <input class='mod-buff' type='hidden' name='attr_tac_change' value='0'>
-                    <span class='modified-attr input-field' title='@{tac}' name='attr_tac' value='10'>10</span>
-                </div>
+            <div class='row'>
+                <span class='npc-ac' data-i18n='eac'>AC</span>
+                <input class='bab' type='number' title='@{ac}' name='attr_ac' value='10'>
                 <span class='npc-ac' data-i18n='kac'>KAC</span>
-                <div class='attr-base-mod-container input-field npc-ac'>
-                    <input class='base-attr' type='number' title='@{ac}' name='attr_ac_base' value='10'>
-                    <input class='mod-buff' type='hidden' name='attr_ac_change' value='0'>
-                    <span class='modified-attr input-field' title='@{ac}' name='attr_ac' value='10'>10</span>
-                </div>
-                <span class='npc-ac' data-i18n='cmd'>CMD</span>
-                <div class='attr-base-mod-container input-field npc-ac'>
-                    <input class='base-attr' type='number' title='@{cmd}' name='attr_cmd_base' value='10'>
-                    <input class='mod-buff' type='hidden' name='attr_cmd_change' value='0'>
-                    <span class='modified-attr input-field' title='@{ac}' name='attr_cmd' value='10'>10</span>
-                </div>
-                <input class='npc-ac-notes input-field' type='text' title='@{ac_notes}' name='attr_ac_notes'>
+                <input class='bab' type='number' title='@{ac}' name='attr_ac' value='10'>
+                <input class='scalable-input input-field' type='text' title='@{ac_notes}' name='attr_ac_notes'>
             </div>
-            <div class='row defense-row'>
-                <button class='npc-save' type='roll' title='%{fort}' name='roll_fort' value='@{whisper_state}&{template:generic} {{name=@{character_name}}} {{characterid=@{character_id}}} {{title=Fortitude}} {{r1=[[1d20+@{fort_base}[BASE]+@{fort_ability}[ABILITY]@{fort_misc}]] }} {{notes=@{save_notes}}}' data-i18n='fort' >FORT</button>
-                <div class='attr-base-mod-container input-field npc-save'>
-                    <input class='base-attr' type='number' title='@{fort}' name='attr_fort_base' value='0'>
-                    <input class='mod-buff' type='hidden' name='attr_fort_change' value='0'>
-                    <span class='modified-attr input-field' title='@{fort}' name='attr_fort' value='0'>0</span>
-                </div>
-                <button class='npc-save' type='roll' title='%{ref}' name='roll_ref' value='@{whisper_state}&{template:generic} {{name=@{character_name}}} {{characterid=@{character_id}}} {{title=Ref}} {{r1=[[1d20+@{ref_base}[BASE]+@{ref_ability}[ABILITY]@{ref_misc}]] }} {{notes=@{save_notes}}}' data-i18n='ref' >REF</button>
-                <div class='attr-base-mod-container input-field npc-save'>
-                    <input class='base-attr' type='number' title='@{ref}' name='attr_ref_base' value='0'>
-                    <input class='mod-buff' type='hidden' name='attr_ref_change' value='0'>
-                    <span class='modified-attr input-field' title='@{ref}' name='attr_ref' value='0'>0</span>
-                </div>
-                <button class='npc-save' type='roll' title='%{will}' name='roll_will' value='@{whisper_state}&{template:generic} {{name=@{character_name}}} {{characterid=@{character_id}}} {{title=Will}} {{r1=[[1d20+@{will_base}[BASE]+@{will_ability}[ABILITY]@{will_misc}]] }} {{notes=@{save_notes}}}' data-i18n='will' >WILL</button>
-                <div class='attr-base-mod-container input-field npc-save'>
-                    <input class='base-attr' type='number' title='@{will}' name='attr_will_base' value='0'>
-                    <input class='mod-buff' type='hidden' name='attr_will_change' value='0'>
-                    <span class='modified-attr input-field' title='@{will}' name='attr_will' value='0'>0</span>
-                </div>
+            <div class='row'>
+                <button class='npc-save' type='roll' title='%{fort}' name='roll_npc_fort' value='@{whisper_state}&{template:generic} {{name=@{character_name}}} {{characterid=@{character_id}}} {{title=Fortitude}} {{r1=[[1d20+@{fort}[BONUS]]] }} {{notes=@{save_notes}}}' data-i18n='fort' >FORT</button>
+                <input class='bab' type='number' title='@{fort}' name='attr_fort' value='0'>
+                <button class='npc-save' type='roll' title='%{ref}' name='roll_npc_ref' value='@{whisper_state}&{template:generic} {{name=@{character_name}}} {{characterid=@{character_id}}} {{title=Ref}} {{r1=[[1d20+@{ref}[BONUS]]] }} {{notes=@{save_notes}}}' data-i18n='ref' >REF</button>
+                <input class='bab' type='number' title='@{fort}' name='attr_ref' value='0'>
+                <button class='npc-save' type='roll' title='%{will}' name='roll_npc_will' value='@{whisper_state}&{template:generic} {{name=@{character_name}}} {{characterid=@{character_id}}} {{title=Will}} {{r1=[[1d20+@{will}[BONUS]]] }} {{notes=@{save_notes}}}' data-i18n='will' >WILL</button>
+                <input class='bab' type='number' title='@{fort}' name='attr_will' value='0'>
                 <input class='npc-save-notes input-field' type='text' title='@{save_notes}' name='attr_save_notes'>
             </div>
+            <div class='hp-rp-container'>
+                <span class='hp' data-i18n='hp'>HP</span>
+                <input class='hp' type='number' title='@{hp}' name='attr_hp'>
+                <span class='slash'>/</span>
+                <input class='hp' type='number' title='@{hp_max}' name='attr_hp_max'>
+                <input class='scalable-input' type='text' name='attr_hp_abilities'>
+            </div>
             <div class='row'>
                 <span class='def-abilities' data-i18n='defensive-abilities'>DEFENSIVE ABILITIES</span>
                 <input class='def-abilities scalable-input input-field' type='text' title='@{defensive_abilities}' name='attr_defensive_abilities'>
             </div>
             <div class='row'>
-                <span class='dr' data-i18n='dr'>DR</span>
-                <input class='scalable-input input-field' type='text' title='@{dr}' name='attr_dr'>
-                <span class='immunities' data-i18n='immunities'>IMMUNITIES</span>
-                <input class='immunities scalable-input input-field' type='text' title='@{immunities}' name='attr_immunities'>
-                <span class='sr' data-i18n='sr'>SR</span>
-                <input class='sr' type='number' title='@{sr}' name='attr_sr'>
+                <div class='auto-scale'>
+                    <span class='immunities' data-i18n='immunities'>IMMUNITIES</span>
+                    <div class='auto-scale'>
+                        <span class='auto-scaler' name='attr_immunities'>Immunities</span>
+                        <input class='scalable-input input-field' type='text' title='@{immunities}' name='attr_immunities'>
+                    </div>
+                </div>
+                <div class='auto-scale'>
+                    <span class='dr' data-i18n='resistances'>RESISTANCES</span>
+                    <div class='auto-scale'>
+                        <span class='auto-scaler' name='attr_resistances'>Resistances</span>
+                        <input class='scalable-input input-field' type='text' title='@{resistances}' name='attr_resistances'>
+                    </div>
+                </div>
+                <div class='auto-scale'>
+                    <span class='dr' data-i18n='weaknesses'>WEAKNESSES</span>
+                    <div class='auto-scale'>
+                        <span class='auto-scaler' name='attr_weaknesses'>Weaknesses</span>
+                        <input class='scalable-input input-field' type='text' title='@{weaknesses}' name='attr_weaknesses'>
+                    </div>
+                </div>
             </div>
             <div class='row'>
-                <span class='resistances' data-i18n='resistances'>RESISTANCES</span>
-                <input class='resistances scalable-input input-field' type='text' title='@{resistances}' name='attr_resistances'>
-                <span class='weaknesses' data-i18n='weaknesses'>WEAKNESSES</span>
-                <input class='weaknesses scalable-input input-field' type='text' title='@{weaknesses}' name='attr_weaknesses'>
+                <span class='label' data-i18n='defensive or reactionary abilities'>DEFENSIVE OR REACTIONARY ABILITIES</span>
+            </div><!--
+            <div class='row'>
+                <textarea name='attr_defensive_abilities'></textarea>
             </div>
             <div class='statblock-section-header offense-header'>
                 <span data-i18n='offense'>OFFENSE</span>
@@ -5096,10 +5080,6 @@ This pattern can be found at https://regexr.com/3mi9v
                     </div>
                 </fieldset>
             </div>
-            <div class='statblock-section-header statistics-header'>
-                <span data-i18n='statistics'>STATISTICS</span>
-            </div>
-            
             <div class='row skills-row'>
                 <span data-i18n='skills'>SKILLS</span>
                 <div class='skill-container'>
@@ -5678,10 +5658,6 @@ This pattern can be found at https://regexr.com/3mi9v
                 <span data-i18n='feats'>FEATS</span>
                 <input class='scalable-input input-field' type='text' title='@{feats}' name='attr_feats'>
             </div>
-            <div class='row'>
-                <span data-i18n='languages'>LANGUAGES</span>
-                <input class='scalable-input input-field' type='text' title='@{languages}' name='attr_languages'>
-            </div>
             <div class='row'>
                 <span data-i18n='other-abilities'>OTHER ABILITIES</span>
                 <input class='scalable-input input-field' type='text' title='@{other_abilities}' name='attr_other_abilities'>
@@ -5720,12 +5696,10 @@ This pattern can be found at https://regexr.com/3mi9v
                 <fieldset class='repeating_ability'><input type='hidden' name='attr_dc' value='10'><input hidden='true' type='text' title='@{attack_total}' name='attr_attack_total'><input hidden='true' type='text' title='@{damage_total}' name='attr_damage_total'>
                     <input class='filter' type='checkbox' hidden='true' title='@{filter}' name='attr_filter' value='1' checked='checked'>
                     <div class='filter-container ability'>
-                       <!--Hidden Ability Attributes -->
                        <input type='text' hidden='true' title='@{attack_misc}' name='attr_attack_misc' value=''>
                        <input type='text' hidden='true' title='@{attack_damage_misc}' name='attr_attack_damage_misc' value=''>
                        <input type='text' hidden='true' title='@{effect_misc}' name='attr_effect_misc' value=''>
                        <input type='hidden' name='attr_dc' value='10'>
-                       <!--Shown Ability Attributes -->
                         <input class="show-options" type="checkbox" title='@{show_options}' name="attr_show_options" checked="checked"><span>y</span>
                         <div class='row-options'>
                             <div class='row  span-two'>
@@ -5917,7 +5891,7 @@ This pattern can be found at https://regexr.com/3mi9v
                         </div>
                     </div>
                 </fieldset>
-            </div>
+            </div>-->
         </div>
     </div>
     <span class='disclaimer' data-i18n='disclaimer'>© 2018. Pathfinder Playtest, the Pathfinder Playtest logo, the Paizo golem, all Paizo titles, the Pathfinder Playtest Roleplaying Game rules, and Paizo’s character names and distinctive likenesses are property and copyright of Paizo, Inc. in the United States and other countries.</span>
@@ -8190,7 +8164,7 @@ This pattern can be found at https://regexr.com/3mi9v
                     damage_total:['attack','ability','cantrip','spell1','spell2','spell3','spell4','spell5','spell6','spell7','spell8','spell9','spell10'],
                     dc:['ability','cantrip','spell1','spell2','spell3','spell4','spell5','spell6','spell7','spell8','spell9','spell10'],
                     attack_total:['ability','cantrip','spell1','spell2','spell3','spell4','spell5','spell6','spell7','spell8','spell9','spell10'],
-                    profession:['profession'],
+                    skill:['skill'],
                     attack:['attack','ability','cantrip','spell1','spell2','spell3','spell4','spell5','spell6','spell7','spell8','spell9','spell10'],
                     damage:['attack','ability','cantrip','spell1','spell2','spell3','spell4','spell5','spell6','spell7','spell8','spell9','spell10']
                 },
@@ -8199,7 +8173,7 @@ This pattern can be found at https://regexr.com/3mi9v
                     damage_total:['damage_ability'],
                     dc:['save_ability'],
                     attack_total:['attack_ability'],
-                    profession:['ability'],
+                    skill:['ability'],
                     attack:['ability','attack_ability'],
                     damage:['damage_ability']
                 };