diff --git a/Beacon/beacon.css b/Beacon/beacon.css
index 1c325cce2a..691867ab85 100644
--- a/Beacon/beacon.css
+++ b/Beacon/beacon.css
@@ -108,8 +108,8 @@ input.sheet-tab:checked::before {
     color:white;
 }
 
-input.sheet-tab1:checked ~ div.sheet-section-core,
-input.sheet-tab2:checked ~ div.sheet-section-weapons,
+input.sheet-tab1:checked ~ div.sheet-section-roleplay,
+input.sheet-tab2:checked ~ div.sheet-section-combat,
 input.sheet-tab3:checked ~ div.sheet-section-spells
 {
     max-height: 999999px;
@@ -157,4 +157,32 @@ input[type="checkbox"] + span::before
 input[type="checkbox"]:checked + span::before
 {
     content: "[hide]";
+}
+
+.sheet-spellsTable{
+border-collapse:collapse;
+border-spacing:0;
+border-color:#ccc;
+width: 100%;
+}
+.sheet-spellsTable td{
+padding:2px 1px;
+border-style:solid;
+border-width:1px;
+overflow:hidden;
+word-break:normal;
+border-color:#ccc;
+color:#333;
+background-color:#F0F0F0;
+}
+.sheet-spellsTable th{
+	font-weight:normal;
+	padding:2px 1px;
+	border-style:solid;
+	border-width:1px;
+	overflow:hidden;
+	word-break:normal;
+	border-color:#ccc;
+	color:#333;
+	background-color:#D0D0D0;
 }
\ No newline at end of file
diff --git a/Beacon/beacon.html b/Beacon/beacon.html
index 432d822403..4afedfb78b 100644
--- a/Beacon/beacon.html
+++ b/Beacon/beacon.html
@@ -1,5 +1,7 @@
-<input type="radio" class="sheet-tab sheet-tab1" name="attr_tab" value="1" checked="checked" /><span class="sheet-tab sheet-tab1">Main</span> <input type="radio" class="sheet-tab sheet-tab2" name="attr_tab" value="2" /><span class="sheet-tab sheet-tab2">Weapons</span> <input type="radio" class="sheet-tab sheet-tab3" name="attr_tab" value="3" /><span class="sheet-tab sheet-tab3">Spells</span><input type="radio" name="attr_tab" class="sheet-tab sheet-tab99" value="99" title="Show All"/><span class="sheet-tab sheet-tab99">Show All</span><hr>
-<div class="sheet-section sheet-section-core">
+<p style="text-align: center;"><img src=
+			"http://i.imgur.com/T5Rnlox.png" width="900px" style="max-height: 150px;"></p>
+<input type="radio" class="sheet-tab sheet-tab1" name="attr_tab" value="1" checked="checked" /><span class="sheet-tab sheet-tab1">Roleplay</span> <input type="radio" class="sheet-tab sheet-tab2" name="attr_tab" value="2" /><span class="sheet-tab sheet-tab2">Combat</span> <input type="radio" class="sheet-tab sheet-tab3" name="attr_tab" value="3" /><span class="sheet-tab sheet-tab3">Spells</span><input type="radio" name="attr_tab" class="sheet-tab sheet-tab99" value="99" title="Show All"/><span class="sheet-tab sheet-tab99">Show All</span><hr>
+<div class="sheet-section sheet-section-roleplay">
 	<div class="sheet-3colrow">
 		<div class="sheet-col">
 			<table style="width: 100%;">
@@ -43,8 +45,7 @@
 		</div>
 
 		<div class="sheet-col">
-			<p style="text-align: center;"><img src=
-			"http://1.bp.blogspot.com/-3SWHcmHraUg/TWaCMYzvRaI/AAAAAAAAADs/LOtuvHY_C5w/s1600/Beacon_logo.jpg" style="max-height: 100px;"></p>
+			
 			<table style="width:100%">
 				<tr>
 					<td><label>Race</label></td>
@@ -93,11 +94,6 @@
 						</select>
 					</td>
 				</tr>
-			</table>
-		</div>
-
-		<div class="sheet-col">
-			<table style="width: 100%;">
 				<tr>
 					<td><label>Level</label></td>
 					<td>
@@ -105,9 +101,21 @@
 					</td>
 				</tr>
 				<tr>
-					<td><label>Hit Points (HP)</label></td>
+					<td><label title="Experience Points">XP</label></td>
 					<td>
-						<input name="attr_hit_points" value="14" title="(STR + 1d6/level)" type="number">
+						<input name="attr_xp" value="0" type="number">
+					</td>
+				</tr>
+			</table>
+		</div>
+
+		<div class="sheet-col">
+			<table style="width: 100%;">
+				
+				<tr>
+					<td><label>Base Hit Points (HP)</label></td>
+					<td>
+						<input name="attr_base_hit_points" value="14" type="number">
 					</td>
 				</tr>
 				<tr>
@@ -116,386 +124,366 @@
 						<input disabled="true" name="attr_armor_class" title="(10 + DEX Bonus + Armor Bonus + Miscellanous Armor Modifier + Shield Bonus + Miscellaeous Shield Modifier + Halfling Bonus)" type="number" value="10 + @{dexterity_bonus} + @{armor_bonus} + @{armor_mod} + @{shield_bonus} + @{shield_mod} + (floor(@{race}))">
 					</td>
 				</tr>
-				<tr>
-					<td><label>Magic Difficulty Class (DC)</label></td>
-					<td>
-						<input disabled="true" name="attr_caster_dc" title="(10 + Level + Mind Bonus)" 
-						type="number" value="@{level}+@{mind_bonus}+10">
-					</td>
-				</tr>
 				<tr>
 					<td><label>Attack Bonus</label></td>
 					<td>
 						<input disabled="true" type="number" name="attr_attack_bonus"
 						value="(@{class}%2)*(floor(@{level}/2)) + (@{class}%3)*(floor(@{level}/3)) + (floor(@{class}/24))*(@{level})">
 					</td>
+				</tr>
+				<tr>
+					<td><label title="The Difficulty Class that the opposing target has to roll against">Caster DC</label></td>
+					<td>
+						<input disabled="true" name="attr_caster_dc" title="(15 + Level + mod)" 
+						type="number" value="@{level}+15+@{caster_dc_mod}">
+					</td>
+				</tr>
+				<tr>
+					<td><label title="Any Miscellaneous Modifiers to the caster's DC">Caster DC Mod</label></td>
+					<td>
+						<input  name="attr_caster_dc_mod"
+						type="number" value="0">
+					</td>
+				</tr>
+				
 			</table>
 		</div>
 	</div>
 	<hr>
-
 	<div class="sheet-3colrow">
+		<h1 style="text-align: center">Stats/Attributes</h1>
 		<div class="sheet-col">
-			<h3 style="margin-bottom: 10px;text-align: center;">Stats/Attributes</h3>
-
 			<table class="sheet-table">
 				<thead>
-					<tr>
-						<th>Base</th>
-
-						<th>&nbsp;</th>
-						
-						<th title="Miscellaneous Stat Modifier">Mod</th>
-
-						<th>Bonus</th>
-						
-						
-					</tr>
+						<th><label>Stat</label></th>
+						<th><label>Base</label></th>
+						<th title="Miscellaneous Stat Modifier"><label>Mod</label></th>
+						<th><label>Current</label></th>
+						<th><label>Bonus</label></th>
+						<th><label>Roll</label></th>
 				</thead>
-
 				<tbody>
 					<tr>
-						<td><input class="sheet-short" name="attr_strength"
-						value="10" type="number"></td>
-
-						<td>Strength</td>
-						
+						<td><label>Strength</label></td>
+						<td><input class="sheet-short" name="attr_base_strength" value="10" type="number"></td>
 						<td>
-							<input class="sheet-short" name="attr_strength_modifier"
-							title="(Miscellaneous Strength Modifier)"
-							type="number" value="0">
+							<input class="sheet-short" name="attr_strength_modifier" title="(Miscellaneous Strength Modifier)" type="number" value="0">
 						</td>
-
-						<td><input class="sheet-short" disabled="true" name=
-						"attr_strength_bonus" title=
-						"(Strength / 2 - Rounded down + Misc Modifier)" type="number" value=
-						"floor((@{strength} - 10) / 2) + @{strength_modifier}"></td>
-						
-						
-					</tr>
-
-					<tr>
-						<td><input class="sheet-short" name="attr_dexterity"
-						value="10" type="number"></td>
-
-						<td>Dexterity</td>
-						
 						<td>
-							<input class="sheet-short" name="attr_dexterity_modifier"
-							title="(Miscellaneous Dexterity Modifier)"
-							type="number" value="0">
+							<input class="sheet-short" name="attr_strength" disabled="true" value="@{base_strength}+@{strength_modifier}" type="number">
 						</td>
-
-						<td><input class="sheet-short" disabled="true" name=
-						"attr_dexterity_bonus" title=
-						"(Dexterity / 2 - Rounded down + Misc Modifier)" type="number" value=
-						"floor((@{dexterity} - 10) / 2) + @{dexterity_modifier}"></td>
-						
-												
-						
-					</tr>
-
-					<tr>
-						<td><input class="sheet-short" name="attr_mind"
-						value="10" type="number"></td>
-
-						<td>Mind</td>
-						
 						<td>
-							<input class="sheet-short" name="attr_mind_modifier"
-							title="(Miscellaneous Mind Modifier)"
-							type="number" value="0">
+							<input class="sheet-short" disabled="true" name="attr_strength_bonus" title="(Strength / 2 - Rounded down + Misc Modifier)" type="number" value="floor(((@{strength}) - 10) / 2)">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Strength Roll}}{{Roll Result=[[d20+(@{strength_bonus})]]}}" title="d20 + strength bonus">
+							</button>
 						</td>
-
-						<td><input class="sheet-short" disabled="true" name=
-						"attr_mind_bonus" title="(Mind / 2 - Rounded down + Misc Modifier)"
-						type="number" value="floor((@{mind} - 10) / 2) + @{mind_modifier}"></td>
-						
-						
-						
 					</tr>
 					<tr>
-						<td><input class="sheet-short" name="attr_charisma"
-						value="10" type="number"></td>
-
-						<td>Charisma</td>
-						
+						<td><label>Dexterity</label></td>
+						<td><input class="sheet-short" name="attr_base_dexterity" value="10" type="number"></td>
 						<td>
-							<input class="sheet-short" name="attr_charisma_modifier"
-							title="(Miscellaneous Charisma Modifier)"
-							type="number" value="0">
+							<input class="sheet-short" name="attr_dexterity_modifier" title="(Miscellaneous Dexterity Modifier)" type="number" value="0">
+						</td>
+						<td>
+							<input class="sheet-short" name="attr_dexterity" disabled="true" value="@{base_dexterity}+@{dexterity_modifier}" type="number">
+						</td>
+						<td>
+							<input class="sheet-short" disabled="true" name="attr_dexterity_bonus" title="(Dexterity / 2 - Rounded down + Misc Modifier)" type="number" value="floor(((@{dexterity}) - 10) / 2)">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Dexterity Roll}}{{Roll Result=[[d20+(@{dexterity_bonus})]]}}" title="d20 + dexterity bonus">
+							</button>
+						</td>
+					</tr>
+					<tr>
+						<td><label>Mind</label></td>
+						<td><input class="sheet-short" name="attr_base_mind" value="10" type="number"></td>
+						<td>
+							<input class="sheet-short" name="attr_mind_modifier" title="(Miscellaneous Mind Modifier)" type="number" value="0">
+						</td>
+						<td>
+							<input class="sheet-short" name="attr_mind" disabled="true" value="@{base_mind}+@{mind_modifier}" type="number">
+						</td>
+						<td>
+							<input class="sheet-short" disabled="true" name="attr_mind_bonus" title="(Mind / 2 - Rounded down + Misc Modifier)" type="number" value="floor(((@{mind}) - 10) / 2)">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Mind Roll}}{{Roll Result=[[d20+(@{mind_bonus})]]}}" title="d20 + mind bonus">
+							</button>
+						</td>
+					</tr>
+					<tr>
+						<td><label>Charisma</label></td>
+						<td><input class="sheet-short" name="attr_base_charisma" value="10" type="number"></td>
+						<td>
+							<input class="sheet-short" name="attr_charisma_modifier" title="(Miscellaneous Charisma Modifier)" type="number" value="0">
+						</td>
+						<td>
+							<input class="sheet-short" name="attr_charisma" disabled="true" value="@{base_charisma}+@{charisma_modifier}" type="number">
+						</td>
+						<td>
+							<input class="sheet-short" disabled="true" name="attr_charisma_bonus" title="(Charisma / 2 - Rounded down + Misc Modifier)" type="number" value="floor(((@{charisma}) - 10) / 2)">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Charisma Roll}}{{Roll Result=[[d20+(@{charisma_bonus})]]}}" title="d20 + charisma bonus">
+							</button>
 						</td>
-
-						<td><input class="sheet-short" disabled="true" name=
-						"attr_charisma_bonus" title="(Charisma / 2 - Rounded down + Misc Modifier)"
-						type="number" value="floor((@{charisma} - 10) / 2) + @{charisma_modifier}"></td>
-						
-						
-						
 					</tr>
 				</tbody>
 			</table>
-			<hr>
-
-			<h3 style="margin-bottom: 10px; text-align: center;">Skills</h3>
+		</div>
+	</div>
+	<hr>
+	<div class="sheet-3colrow">
+		<h1 style="text-align: center">Skills</h1>
+		<div class="sheet-col">
 			<table class="sheet-table">
 				<thead>
-					<th>Skill</th>
-					<th>Level</th>
-					<th title="Miscellaneous Skill Modifier">Mod</th>
+					<th><label>Skill</label></th>
+					<th><label>Base</label></th>
+					<th title="Miscellaneous Skill Modifier"><label>Mod</label></th>
+					<th><label>Current</label></th>
+					<th><label>Str</label></th>
+					<th><label>Dex</label></th>
+					<th><label>Mnd</label></th>
+					<th><label>Cha</label></th>
 				</thead>
 				<tbody>
 					<tr>
 						<td><label>Physical</label></td>
 						<td>
-							<input class="sheet-short" name="attr_physical" value="1" type="number">
+							<input class="sheet-short" name="attr_base_physical" value="1" type="number">
 						</td>
 						<td>
 							<input type="number" name="attr_physical_mod" class="sheet-short" value="0">
 						</td>
+						<td>
+							<input type="number" disabled="true" name="attr_physical" class="sheet-short" value="@{base_physical}+@{physical_mod}">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Physical+Str}} {{Roll Result=[[d20+@{physical}+@{strength_bonus}+@{physical_mod}]]}}" title="d20 + physical rank + strength bonus + physical modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Physical+Dex}} {{Roll Result=[[d20+@{physical}+@{dexterity_bonus}+@{physical_mod}]]}}" title="d20 + physical rank + dexterity bonus + physical modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Physical+Mind}} {{Roll Result=[[d20+@{physical}+@{mind_bonus}+@{physical_mod}]]}}" title="d20 + physical rank + mind bonus + physical modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Physical+Cha}} {{Roll Result=[[d20+@{physical}+@{charisma_bonus}+@{physical_mod}]]}}" title="d20 + physical rank + charisma bonus + physical modifier">
+							</button>
+						</td>
 					</tr>
 					<tr>
 						<td><label>Subterfuge</label></td>
 						<td>
-							<input class="sheet-short" name="attr_subterfuge" value="1" type="number">
+							<input class="sheet-short" name="attr_base_subterfuge" value="1" type="number">
 						</td>
 						<td>
 							<input type="number" name="attr_subterfuge_mod" class="sheet-short" value="0">
 						</td>
+						<td>
+							<input type="number" disabled="true" name="attr_subterfuge" class="sheet-short" value="@{base_subterfuge}+@{subterfuge_mod}">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Subterfuge+Str}} {{Roll Result=[[d20+@{subterfuge}+@{strength_bonus}+@{subterfuge_mod}]]}}" title="d20 + subterfuge rank + strength bonus + subterfuge modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Subterfuge+Dex}} {{Roll Result=[[d20+@{subterfuge}+@{dexterity_bonus}+@{subterfuge_mod}]]}}" title="d20 + subterfuge rank + dexterity bonus + subterfuge modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Subterfuge+Mind}} {{Roll Result=[[d20+@{subterfuge}+@{mind_bonus}+@{subterfuge_mod}]]}}" title="d20 + subterfuge rank + mind bonus + subterfuge modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Subterfuge+Cha}} {{Roll Result=[[d20+@{subterfuge}+@{charisma_bonus}+@{subterfuge_mod}]]}}" title="d20 + subterfuge rank + charisma bonus + subterfuge modifier">
+							</button>
+						</td>
 					</tr>
 					<tr>
 						<td><label>Knowledge</label></td>
 						<td>
-							<input class="sheet-short" name="attr_knowledge" value="1" type="number">
+							<input class="sheet-short" name="attr_base_knowledge" value="1" type="number">
 						</td>
 						<td>
 							<input type="number" name="attr_knowledge_mod" class="sheet-short" value="0">
 						</td>
+						<td>
+							<input type="number" disabled="true" name="attr_knowledge" class="sheet-short" value="@{base_knowledge}+@{knowledge_mod}">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Knowledge+Str}} {{Roll Result=[[d20+@{knowledge}+@{strength_bonus}+@{knowledge_mod}]]}}" title="d20 + knowledge rank + strength bonus + knowledge modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Knowledge+Dex}} {{Roll Result=[[d20+@{knowledge}+@{dexterity_bonus}+@{knowledge_mod}]]}}" title="d20 + knowledge rank + dexterity bonus + knowledge modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Knowledge+Mind}} {{Roll Result=[[d20+@{knowledge}+@{mind_bonus}+@{knowledge_mod}]]}}" title="d20 + knowledge rank + mind bonus + knowledge modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Knowledge+Cha}} {{Roll Result=[[d20+@{knowledge}+@{charisma_bonus}+@{knowledge_mod}]]}}" title="d20 + knowledge rank + charisma bonus + knowledge modifier">
+							</button>
+						</td>
 					</tr>
 					<tr>
 						<td><label>Communication</label></td>
 						<td>
-							<input class="sheet-short" name="attr_communication" value="1" type="number">
+							<input class="sheet-short" name="attr_base_communication" value="1" type="number">
 						</td>
 						<td>
 							<input type="number" name="attr_communication_mod" class="sheet-short" value="0">
 						</td>
+						<td>
+							<input type="number" disabled="true" name="attr_communication" class="sheet-short" value="@{base_communication}+@{communication_mod}">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Communication+Str}} {{Roll Result=[[d20+@{communication}+@{strength_bonus}+@{communication_mod}]]}}" title="d20 + communication rank + strength bonus + communication modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Communication+Dex}} {{Roll Result=[[d20+@{communication}+@{dexterity_bonus}+@{communication_mod}]]}}" title="d20 + communication rank + dexterity bonus + communication modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Communication+Mind}} {{Roll Result=[[d20+@{communication}+@{mind_bonus}+@{communication_mod}]]}}" title="d20 + communication rank + mind bonus + communication modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Communication+Cha}} {{Roll Result=[[d20+@{communication}+@{charisma_bonus}+@{communication_mod}]]}}" title="d20 + communication rank + charisma bonus + communication modifier">
+							</button>
+						</td>
 					</tr>
 					<tr>
 						<td><label>Survival</label></td>
 						<td>
-							<input class="sheet-short" name="attr_survival" value="0" type="number">
+							<input class="sheet-short" name="attr_base_survival" value="0" type="number">
 						</td>
 						<td>
 							<input type="number" name="attr_survival_mod" class="sheet-short" value="0">
 						</td>
+						<td>
+							<input type="number" disabled="true" name="attr_survival" class="sheet-short" value="@{base_survival}+@{survival_mod}">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Survival+Str}} {{Roll Result=[[d20+@{survival}+@{strength_bonus}+@{survival_mod}]]}}" title="d20 + survival rank + strength bonus + survival modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Survival+Dex}} {{Roll Result=[[d20+@{survival}+@{dexterity_bonus}+@{survival_mod}]]}}" title="d20 + survival rank + dexterity bonus + survival modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Survival+Mind}} {{Roll Result=[[d20+@{survival}+@{mind_bonus}+@{survival_mod}]]}}" title="d20 + survival rank + mind bonus + survival modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Survival+Cha}} {{Roll Result=[[d20+@{survival}+@{charisma_bonus}+@{survival_mod}]]}}" title="d20 + survival rank + charisma bonus + survival modifier">
+							</button>
+						</td>
 					</tr>
 					<tr>
 						<td><label>Fabrication</label></td>
 						<td>
-							<input class="sheet-short" name="attr_fabrication" value="0" type="number">
+							<input class="sheet-short" name="attr_base_fabrication" value="0" type="number">
 						</td>
 						<td>
 							<input type="number" name="attr_fabrication_mod" class="sheet-short" value="0">
 						</td>
+						<td>
+							<input type="number" disabled="true" name="attr_fabrication" class="sheet-short" value="@{base_fabrication}+@{fabrication_mod}">
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Fabrication+Str}} {{Roll Result=[[d20+@{fabrication}+@{strength_bonus}+@{fabrication_mod}]]}}" title="d20 + fabrication rank + strength bonus + fabrication modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Fabrication+Dex}} {{Roll Result=[[d20+@{fabrication}+@{dexterity_bonus}+@{fabrication_mod}]]}}" title="d20 + fabrication rank + dexterity bonus + fabrication modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Fabrication+Mind}} {{Roll Result=[[d20+@{fabrication}+@{mind_bonus}+@{fabrication_mod}]]}}" title="d20 + fabrication rank + mind bonus + fabrication modifier">
+							</button>
+						</td>
+						<td>
+							<button type="roll" value="&{template:default} {{name=Fabrication+Cha}} {{Roll Result=[[d20+@{fabrication}+@{charisma_bonus}+@{fabrication_mod}]]}}" title="d20 + fabrication rank + charisma bonus + fabrication modifier">
+							</button>
+						</td>
 					</tr>
 				</tbody>
 			</table>
 		</div>
-
-		<div class="sheet-col">
-			<h3 style="text-align: center;">Skill Checks</h3>
-
-			<table class="sheet-table">
-				<thead>
-					<tr>
-						<th>Skill</th>
-
-						<th>Str</th>
-
-						<th>Dex</th>
-
-						<th>Mnd</th>
-						
-						<th>Cha</th>
-						
-					</tr>
-				</thead>
-
-				<tbody>
-					<tr>
-						<td>Physical</td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Physical+Str}} {{Roll Result=[[d20+@{physical}+@{strength_bonus}+@{physical_mod}]]}}" title="d20 + physical rank + strength bonus + physical modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Physical+Dex}} {{Roll Result=[[d20+@{physical}+@{dexterity_bonus}+@{physical_mod}]]}}" title="d20 + physical rank + dexterity bonus + physical modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Physical+Mind}} {{Roll Result=[[d20+@{physical}+@{mind_bonus}+@{physical_mod}]]}}" title="d20 + physical rank + mind bonus + physical modifier">
-						</button></td>
-						
-						<td><button type="roll" value=
-						"&{template:default} {{name=Physical+Cha}} {{Roll Result=[[d20+@{physical}+@{charisma_bonus}+@{physical_mod}]]}}" title="d20 + physical rank + charisma bonus + physical modifier">
-						</button></td>
-						
-					</tr>
-
-					<tr>
-						<td>Subterfuge</td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Subterfuge+Str}} {{Roll Result=[[d20+@{subterfuge}+@{strength_bonus}+@{subterfuge_mod}]]}}" title="d20 + subterfuge rank + strength bonus + subterfuge modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Subterfuge+Dex}} {{Roll Result=[[d20+@{subterfuge}+@{dexterity_bonus}+@{subterfuge_mod}]]}}" title="d20 + subterfuge rank + dexterity bonus + subterfuge modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Subterfuge+Mind}} {{Roll Result=[[d20+@{subterfuge}+@{mind_bonus}+@{subterfuge_mod}]]}}" title="d20 + subterfuge rank + mind bonus + subterfuge modifier">
-						</button></td>
-						<td><button type="roll" value=
-						"&{template:default} {{name=Subterfuge+Cha}} {{Roll Result=[[d20+@{subterfuge}+@{charisma_bonus}+@{subterfuge_mod}]]}}" title="d20 + subterfuge rank + charisma bonus + subterfuge modifier">
-						</button></td>
-						
-					</tr>
-
-					<tr>
-						<td>Knowledge</td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Knowledge+Str}} {{Roll Result=[[d20+@{knowledge}+@{strength_bonus}+@{knowledge_mod}]]}}" title="d20 + knowledge rank + strength bonus + knowledge modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Knowledge+Dex}} {{Roll Result=[[d20+@{knowledge}+@{dexterity_bonus}+@{knowledge_mod}]]}}" title="d20 + knowledge rank + dexterity bonus + knowledge modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Knowledge+Mind}} {{Roll Result=[[d20+@{knowledge}+@{mind_bonus}+@{knowledge_mod}]]}}" title="d20 + knowledge rank + mind bonus + knowledge modifier">
-						</button></td>
-						<td><button type="roll" value=
-						"&{template:default} {{name=Knowledge+Cha}} {{Roll Result=[[d20+@{knowledge}+@{charisma_bonus}+@{knowledge_mod}]]}}" title="d20 + knowledge rank + charisma bonus + knowledge modifier">
-						</button></td>
-						
-					</tr>
-
-					<tr>
-						<td>Communication</td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Communication+Str}} {{Roll Result=[[d20+@{communication}+@{strength_bonus}+@{communication_mod}]]}}" title="d20 + communication rank + strength bonus + communication modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Communication+Dex}} {{Roll Result=[[d20+@{communication}+@{dexterity_bonus}+@{communication_mod}]]}}" title="d20 + communication rank + dexterity bonus + communication modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Communication+Mind}} {{Roll Result=[[d20+@{communication}+@{mind_bonus}+@{communication_mod}]]}}" title="d20 + communication rank + mind bonus + communication modifier">
-						</button></td>
-						<td><button type="roll" value=
-						"&{template:default} {{name=Communication+Cha}} {{Roll Result=[[d20+@{communication}+@{charisma_bonus}+@{communication_mod}]]}}" title="d20 + communication rank + charisma bonus + communication modifier">
-						</button></td>
-						
-					</tr>
-					<tr>
-						<td>Survival</td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Survival+Str}} {{Roll Result=[[d20+@{survival}+@{strength_bonus}+@{survival_mod}]]}}" title="d20 + survival rank + strength bonus + survival modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Survival+Dex}} {{Roll Result=[[d20+@{survival}+@{dexterity_bonus}+@{survival_mod}]]}}" title="d20 + survival rank + dexterity bonus + survival modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Survival+Mind}} {{Roll Result=[[d20+@{survival}+@{mind_bonus}+@{survival_mod}]]}}" title="d20 + survival rank + mind bonus + survival modifier">
-						</button></td>
-						<td><button type="roll" value=
-						"&{template:default} {{name=Survival+Cha}} {{Roll Result=[[d20+@{survival}+@{charisma_bonus}+@{survival_mod}]]}}" title="d20 + survival rank + charisma bonus + survival modifier">
-						</button></td>
-						
-					</tr>
-					<tr>
-						<td>Fabrication</td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Fabrication+Str}} {{Roll Result=[[d20+@{fabrication}+@{strength_bonus}+@{fabrication_mod}]]}}" title="d20 + fabrication rank + strength bonus + fabrication modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Fabrication+Dex}} {{Roll Result=[[d20+@{fabrication}+@{dexterity_bonus}+@{fabrication_mod}]]}}" title="d20 + fabrication rank + dexterity bonus + fabrication modifier">
-						</button></td>
-
-						<td><button type="roll" value=
-						"&{template:default} {{name=Fabrication+Mind}} {{Roll Result=[[d20+@{fabrication}+@{mind_bonus}+@{fabrication_mod}]]}}" title="d20 + fabrication rank + mind bonus + fabrication modifier">
-						</button></td>
-						<td><button type="roll" value=
-						"&{template:default} {{name=Fabrication+Cha}} {{Roll Result=[[d20+@{fabrication}+@{charisma_bonus}+@{fabrication_mod}]]}}" title="d20 + fabrication rank + charisma bonus + fabrication modifier">
-						</button></td>
-						
-					</tr>
-				</tbody>
-			</table>
-			<hr>
-			<h3 style="text-align: center;">Stat Rolls</h3>
-			<table class="sheet-table">
-				<thead>
-					<th>Stat</th>
-					<th>Roll</th>
-					
-				</thead>
-				<tbody>
-					<tr>
-						<td>Strength</td>
-						<td><button type="roll" value=
-						"&{template:default} {{name=Strength Roll}}{{Roll Result=[[d20+@{strength_bonus}]]}}" title="d20 + strength bonus">
-						</button></td>
-						
-					</tr>
-					<tr>
-						<td>Dexterity</td>
-						<td><button type="roll" value=
-						"&{template:default} {{name=Dexterity Roll}} {{Roll Result=[[d20+@{dexterity_bonus}]]}}" title="d20 + dexterity bonus">
-						</button></td>
-						
-					</tr>
-					<tr>
-						<td>Mind</td>
-						<td><button type="roll" value=
-						"&{template:default} {{name=Mind Roll}} {{Roll Result=[[d20+@{mind_bonus}]]}}" title="d20 + mind bonus">
-						</button></td>
-						
-					</tr>
-					<tr>
-						<td>Charisma</td>
-						<td><button type="roll" value=
-						"&{template:default} {{name=Charisma Roll}} {{Roll Result=[[d20+@{charisma_bonus}]]}}" title="d20 + charisma bonus">
-						</button></td>
-						
-					</tr>
-					
-			</table>
-			<hr>
-			<table class="sheet-table">
-				<tr>
-					<td><label>Initiative Roll</label></td>
-					<td>
-						<button type="roll" value="&{template:default} {{name=Initiative Roll}} {{Roll Result=[[d6 &{tracker}]]}}" title="Select your token before clicking to get added to the Turn Table"></button>
-					</td>
-				</tr>
-			</table>
-			
-			
-		</div>
 	</div>
 	<hr />
+	<div class="sheet-3colrow">
+		
+
+		<div class="sheet-col">
+			<h3 style="text-align: center;">Wealth</h3>
+
+				<table class="sheet-table">
+					<thead>
+						<tr>
+							<th>Coinage</th>
+
+							<th>Amount</th>
+						</tr>
+					</thead>
+
+					<tbody>
+						<tr>
+							<td>Platinum</td>
+
+							<td><input style="width: 4.0em;" name=
+							"attr_platinum_coins" value="0" type=
+							"number"></td>
+						</tr>
+
+						<tr>
+							<td>Gold</td>
+
+							<td><input style="width: 4.0em;" name=
+							"attr_gold_coins" value="0" type=
+							"number"></td>
+						</tr>
+
+						<tr>
+							<td>Silver</td>
+
+							<td><input style="width: 4.0em;" name=
+							"attr_silver_coins" value="0" type=
+							"number"></td>
+						</tr>
+
+						<tr>
+							<td>Copper</td>
+
+							<td><input style="width: 4.0em;" name=
+							"attr_copper_coins" value="0" type=
+							"number"></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+
+		<div class="sheet-col">
+			<h3 style="text-align: right;">Inventory</h3>
+			<textarea name="attr_equipment" style="height: 400px; width: 500px;"></textarea>
+		</div>
+	</div>
+</div>
+
+
+<div class="sheet-section sheet-section-combat">
 	<div class="sheet-3colrow">
 		<div class="sheet-col">
 			<h3 style="text-align: center;">Armor</h3>
@@ -519,7 +507,9 @@
 					</td>
 				</tr>
 			</table>
-			<hr>
+			
+		</div>
+		<div class="sheet-col">
 			<h3 style="text-align: center;">Shield</h3>
 			<table class="sheet-table">
 				<tr>
@@ -541,67 +531,53 @@
 					</td>
 				</tr>
 			</table>
-
-			
 		</div>
-
 		<div class="sheet-col">
-			<h3 style="text-align: center;">Wealth</h3>
-
-				<table class="sheet-table">
-					<thead>
-						<tr>
-							<th>Coinage</th>
-
-							<th>Amount</th>
-						</tr>
-					</thead>
-
-					<tbody>
-						<tr>
-							<td>Platinum</td>
-
-							<td><input class="sheet-short" name=
-							"attr_platinum_coins" value="0" type=
-							"number"></td>
-						</tr>
-
-						<tr>
-							<td>Gold</td>
-
-							<td><input class="sheet-short" name=
-							"attr_gold_coins" value="0" type=
-							"number"></td>
-						</tr>
-
-						<tr>
-							<td>Silver</td>
-
-							<td><input class="sheet-short" name=
-							"attr_silver_coins" value="0" type=
-							"number"></td>
-						</tr>
-
-						<tr>
-							<td>Copper</td>
-
-							<td><input class="sheet-short" name=
-							"attr_copper_coins" value="0" type=
-							"number"></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-
-		<div class="sheet-col">
-			<h3 style="text-align: center;">Inventory</h3>
-			<textarea name="attr_equipment" style="height: 325px"></textarea>
+			<table style="width:100%">
+				<tr>
+					<td><label>Armor Class (AC)</label></td>
+					<td>
+						<input disabled="true" name="attr_armor_class_copy" title="(10 + DEX Bonus + Armor Bonus + Miscellanous Armor Modifier + Shield Bonus + Miscellaeous Shield Modifier + Halfling Bonus)" type="number" value="@{armor_class}">
+					</td>
+				</tr>
+				<tr>
+					<td><label>Base HP</label></td>
+					<td>
+						<input class="sheet-short" name="attr_base_hp_copy" value="@{base_hit_points}" type="number" disabled="true">
+					</td>
+				</tr>
+				<tr>
+					<td><label>HP Fatigue</label></td>
+					<td>
+						<input name="attr_hp_fatigue" class="sheet-short" value="0" type="number">
+					</td>
+				</tr>
+				<tr>
+					<td><label>Magic Fatigue</label></td>
+					<td>
+						<input name="attr_magic_fatigue" class="sheet-short" value="0" type="number">
+					</td>
+				</tr>
+				<tr>
+					<td><label>Current HP</label></td>
+					<td>
+						<input name="attr_hit_points" class="sheet-short" value="[[@{base_hit_points}-@{hp_fatigue}-@{magic_fatigue}]]" disabled="true" type="number">
+					</td>
+				</tr>
+			</table>
+			<hr>
+			<table class="sheet-table">
+				<tr>
+					<td><label>Initiative Roll</label></td>
+					<td>
+						<button type="roll" value="&{template:default} {{name=Initiative Roll}} {{Roll Result=[[d6 &{tracker}]]}}" title="Select your token before clicking to get added to the Turn Table"></button>
+					</td>
+				</tr>
+			</table>
 		</div>
+		
 	</div>
-</div>
-
-
-<div class="sheet-section sheet-section-weapons">
+	<hr>
 	<h1 style="text-align: center;">Weapons</h1>
 	<fieldset class="repeating_weapons">
 		<div class="sheet-3colrow">
@@ -615,15 +591,9 @@
 						</td>
 					</tr>
 					<tr>
-						<td><label>Damage Dice</label></td>
+						<td><label title="Range in feet">Weapon Range</label></td>
 						<td>
-							<input name="attr_damage_dice" class="sheet-short" title="e.g. 1d6, 2d8, etc." value="" type="text">
-						</td>
-					</tr>
-					<tr>
-						<td><label>Range (feet)</label></td>
-						<td>
-							<input name="attr_weapon_range" value="0" type="number"> 
+							<input type="number" name="attr_weapon_range" value="0">
 						</td>
 					</tr>
 					<tr>
@@ -638,6 +608,15 @@
 							<input type="number" name="attr_damage_mod" value="0">
 						</td>
 					</tr>
+					<tr>
+						<td><label>Weapon Weight</label></td>
+						<td>
+							<select name="attr_damage_dice" style="width: 100px;">
+								<option value="1d6">Light</option>
+								<option value="1d8">Heavy</option>
+							</select>
+						</td>
+					</tr>
 					<tr>
 						<td><label>Weapon Type</label></td>
 						<td>
@@ -657,56 +636,35 @@
 				</table>
 			</div>
 			<div class="sheet-col">
-				<table style="width: 100%">
+				<table class="sheet-table">
 					<thead>
-						<th>Type</th>
-						<th>Single Attack</th>
-						<th title="click for each attack">Dual Wield</th>
+						<th>Melee Roll</th>
+						<th>Missile/Dex Roll</th>
 					</thead>
 					<tbody>
 						<tr>
-							<td><label>STR Attack Roll</label></td>
 							<td>
-								<button type="roll" value="&{template:default} {{name=Melee STR Attack Roll}} {{@{weapon_name}=[[d20+@{strength_bonus} + @{attack_bonus}+@{weapon_mod}]]}}" title="d20 + STR bonus + attack bonus + miscellanous weapon modifier"></button>
+								<button type="roll" value="&{template:default} {{name=Melee Attack Roll}} {{@{weapon_name}=[[d20+@{strength_bonus} + @{attack_bonus}+@{weapon_mod}]]}}" title="d20 + STR bonus + attack bonus + miscellanous weapon modifier"></button>
 							</td>
 							<td>
-								<button type="roll" value=
-								"&{template:default} {{name=Dual Wield Roll}} {{@{weapon_name}=[[d20+@{strength_bonus})) + @{attack_bonus} + @{weapon_mod}-2]]}}" title="d20 + strength bonus + attack bonus + miscellaneous weapon modifier - attack penalty">
-								</button>
+								<button type="roll" value="&{template:default} {{name=Missile/Dex Attack Roll}} {{@{weapon_name}=[[d20+@{dexterity_bonus} + @{attack_bonus}+@{weapon_mod}]]}}" title="d20 + DEX bonus + attack bonus + miscellanous weapon modifier"></button>
 							</td>
 						</tr>
-						<tr>
-							<td><label>DEX Attack Roll</label></td>
-							<td>
-								<button type="roll" value="&{template:default} {{name=Melee DEX Attack Roll}} {{@{weapon_name}=[[d20+@{dexterity_bonus} + @{attack_bonus}+@{weapon_mod}]]}}" title="d20 + DEX bonus + attack bonus + miscellanous weapon modifier"></button>
-							</td>
-							<td>
-								<button type="roll" value=
-								"&{template:default} {{name=Dual Wield Roll}} {{@{weapon_name}=[[d20+{dexterity_bonus} + @{attack_bonus}+@{weapon_mod}-2]]}}" title="d20 + dexterity bonus + attack bonus + miscellaneous weapon modifier - attack penalty">
-								</button>
-							</td>
-						</tr>
-						<tr>
-							<td><label>Ranged Attack Roll</label></td>
-							<td>
-								<button type="roll" value=
-								"&{template:default} {{name=Missile/Ranged Roll}}{{@{weapon_name}=[[d20+@{attack_bonus} + @{dexterity_bonus} + @{weapon_mod}]]}}" title="d20+ attack bonus + miscellaneous weapon modifier">
-								</button>
-							</td>
-							<td>&nbsp;</td>
-						</tr>
-						<tr>
-							<td><label>Damage Roll</label></td>
-							<td>&nbsp;</td>
-							<td>
-								<button class="sheet-button" type="roll" 
-								value="&{template:default} {{name=Damage Roll}} {{@{weapon_name} = [[@{damage_dice} + ((floor(@{class}/24)) * (1+floor(@{level}/3))) + abs(floor((@{strength_bonus})/(@{range_type}))) + @{damage_mod}]]}}" title="damage dice + fighter class bonus + strength bonus + miscellaneous damage modifier">
-								</button>
-							</td>
-							
-						</tr>
 					</tbody>
 				</table>
+				<hr>
+				<table style="width: 100%">
+					<tr>
+						<td><label>Damage Roll</label></td>
+						<td>&nbsp;</td>
+						<td>
+							<button class="sheet-button" type="roll" 
+							value="&{template:default} {{name=Damage Roll}} {{@{weapon_name} = [[@{damage_dice} + ((floor(@{class}/24)) * (1+floor(@{level}/3))) + abs(floor((@{strength_bonus})/(@{range_type}))) + @{damage_mod}]]}}" title="damage dice + fighter class bonus + strength bonus + miscellaneous damage modifier">
+							</button>
+						</td>
+						
+					</tr>
+				</table>
 			</div>
 		</div>
 	<hr>
@@ -716,85 +674,75 @@
 
 <div class="sheet-section sheet-section-spells">
 	<h1 style="text-align: center;">Spells</h1>
-	<fieldset class="repeating_spells">
 		<div class="sheet-3colrow">
 			<div class="sheet-col">
-				<table style="width: 100%">
+				<label>Spell Interface</label>
+				<table class="sheet-table">
 					<tr>
-						<td><label>Spell Name</label></td>
-						<td>
-							<input name="attr_spell_name" value="Spell Name" 
-							style="width:100px" type="text">
-						</td>
+						<td><label title="Spell Difficulty Class Miscellaneous Modifier">Spell DC Mod</label></td>
+						<td><input type="number" class="sheet-short" name="attr_spell_mod" value="0"></td>
 					</tr>
 					<tr>
-						<td><label>Spell Level</label></td>
+						<td><label>Spell Roll</label></td>
 						<td>
-							<input name="attr_spell_level" value="0" 
-							class="sheet-short" type="number">
+							<button type="roll" value="&{template:default} {{name=Casting Roll}} {{Spell Level ?{Spell level}=[[d20+@{mind_bonus} + @{level}]]}} {{VS DC=[[(?{Spell level})-(@{spell_mod})+10]]}} {{Caster DC=[[(@{caster_dc})]]}} {{HP Cost=[[(?{Spell level})+(?{Spell level})+1]]}}" title="d20 + Mind bonus + caster level"></button>
 						</td>
 					</tr>
-					<tr>
-						<td><label title="Damage Dice, if applicable as a damage spell">Dmg. Dice</label></td>
-						<td>
-							<input name="attr_spell_damage_dice" class="sheet-short" title="e.g. 1d6, 2d8, etc." value="" type="text">
-						</td>
-					</tr>
-					<tr>
-						<td><label>Range (feet)</label></td>
-						<td>
-							<input name="attr_spell_range" style="width: 75px" value="" type="text" title="e.g. 10, 100, touch, etc."> 
-						</td>
-					</tr>
-					<tr>
-						<td><label title="Miscellaneous Spell Modifier">Spell Mod</label></td>
-						<td>
-							<input type="number" name="attr_spell_mod" value="0">
-						</td>
-					</tr>
-					<tr>
-						<td><label title="Miscellaneous Spell Damage Modifier">Dmg Mod</label></td>
-						<td>
-							<input type="number" name="attr_spell_damage_mod" value="0">
-						</td>
-					</tr>
-					<tr>
-						<td><label title="Spell Difficulty Class">Spell DC</label></td>
-						<td>
-							<input type="number" name="attr_spell_dc" disabled="true" value="[[10+@{spell_level}]]">
-						</td>
-					</tr>
-					
 				</table>
-			</div>
-			<div class="sheet-col">
-				<label>Spell Description</label>
-				<textarea name="attr_spell_description">Description</textarea>
-			</div>
-			<div class="sheet-col">
-				<table style="width: 100%">
+				<hr>
+				
+				
+				<label>Spell Table</label>
+				<table class="spellsTable">
 					<thead>
-						<th>Type</th>
-						<th>Roll</th>
+						<th>Spell Level</th>
+						<th>HP Cost</th>
+						<th>Cast at Level</th>
 					</thead>
 					<tbody>
 						<tr>
-							<td><label>Casting Roll</label></td>
-							<td>
-								<button type="roll" value="&{template:default} {{name=Casting Roll}} {{@{spell_name}=[[d20+@{mind_bonus} + @{level}+@{spell_mod}]]}} {{VS DC=@{spell_dc}}} {{description=@{spell_description}}}" title="d20 + Mind bonus + caster level + miscellanous spell modifier"></button>
-							</td>
+							<td>0</td>
+							<td>1</td>
+							<td>-</td>
 						</tr>
 						<tr>
-							<td><label>Damage Roll</label></td>
-							<td>
-								<button type="roll" value="&{template:default} {{name=Damage Roll}} {{@{spell_name}=[[@{spell_damage_dice}+@{spell_damage_mod}]]}}" title="damage dice + spell damage miscellaneous modifier"></button>
-							</td>
+							<td>1</td>
+							<td>3</td>
+							<td>1</td>
+						</tr>
+						<tr>
+							<td>2</td>
+							<td>5</td>
+							<td>3</td>
+						</tr>
+						<tr>
+							<td>3</td>
+							<td>7</td>
+							<td>5</td>
+						</tr>
+						<tr>
+							<td>4</td>
+							<td>9</td>
+							<td>7</td>
+						</tr>
+						<tr>
+							<td>5</td>
+							<td>11</td>
+							<td>9</td>
+						</tr>
+						<tr>
+							<td>6</td>
+							<td>13</td>
+							<td>11</td>
 						</tr>
 					</tbody>
 				</table>
 			</div>
+			<div class="sheet-col">
+				<label>Spellbook</label>
+				<textarea name="attr_spellbook" style="height: 400px; width: 500px;"></textarea>
+			</div>
+			
 		</div>
-	<hr>
-	</fieldset>
 	
 </div>
\ No newline at end of file