diff --git a/Star Wars Saga Edition/README.md b/Star Wars Saga Edition/README.md
index e84eafb5a0..61fb9b1f5b 100644
--- a/Star Wars Saga Edition/README.md	
+++ b/Star Wars Saga Edition/README.md	
@@ -12,10 +12,10 @@ TO DO
 * ~~Use repeating function to include weapons and attacks having the user choose which Ability Mod and damage for pre-filled rolls~~
 * Fix Attack Repeating function (overall this won't be working the way I want till a repeating roll function is included)
 * ~~Make it prettier with CSS (~~incorporate logos~~, etc)~~
-* Equipment and credits section
-* Languages
+* ~~Equipment and credits section~~
+* ~~Languages~~
 * Feats, Talents and Force Powers area
-* Experience
+* ~~Experience~~
 
 Suggestions
 ============
diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index a0656cde30..3b337a0dad 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -238,7 +238,7 @@
 						</td>		  
 						<td>&nbsp;+&nbsp;</td>
 						<td><input type="number" name="attr_WeaponAttackMisc" placeholder="Misc" /></td>
-						<td><button type='roll' name='roll_WeaponAttack' value='/roll 1d20 + @{BAB} + @{WeaponAttackMod} + @{WeaponAttackMisc} + @{CT}'> </button></td>
+						<td><button type='roll' name='roll_WeaponCheck' value='@{WeaponName}\n/roll 1d20 + @{BAB} + @{WeaponAttackMod} + @{WeaponAttackMisc} + @{CT}\n/roll 1d20 + @{WeaponDamage|max} + @{WeaponDamageMisc}'> </button></td>
 					</tr>
 					<tr>					
 						<!-- rowspan placholder -->
@@ -256,7 +256,7 @@
 						</td>		  
 						<td>&nbsp;+&nbsp;</td> 
 						<td><input type="number" name="attr_WeaponDamageMisc" placeholder="Misc" /></td>
-						<td><!-- Disabled till implemented --	<button type='roll' name='roll_WeaponDamage' value='/roll 1d20 + @{WeaponDamage|max} + @{WeaponDamageMisc}'></button> --></td>
+						<td></td>
 					</tr>
 					<tr>		
 						<td colspan="8"><textarea type="text" name="attr_WeaponNotes" placeholder="Notes" class="atkNotes" rows="1"></textarea></td>
@@ -515,3 +515,55 @@
 </div>	
 
 <div class="clear"></div>
+<div class="2colrow">
+	<div class="col">
+		<div class="textHead">Equipment</div>
+		<table>	
+			<tr>
+				<th width="220px">Item</th>
+				<th>Location</th>
+				<th>Wt</th>
+			</tr>
+			<tr>	<td colspan="3">			
+			<fieldset class="repeating_equipment">
+				<table>			
+					<tr border="1">	
+						<td width="220px"><input type="text" name="attr_EquipmentItem" placeholder="Item Name" /></td>	
+						<td><input type="text" name="attr_EquipmentLocation" placeholder="Location" style="width:100px" /></td>	
+						<td><input type="number" name="attr_EquipmentWt" value="0" /></td>
+					</tr>
+				</table>
+			</fieldset>
+			</td>	</tr>		
+				<tr>	<td class="col1">Carrying Capacity</td>	<td><input type="number" name="attr_CarryingCapacity" value="(@{Str}/2)*(@{Str}/2)" disabled="true" /></td>		</tr>
+				<tr>	<td class="col1">Total Weight</td>	<td><input type="number" name="attr_EquipmentWt" value="0" /></td>		</tr>
+				<tr>	<td colspan="2"><div class="textHead">Credits</div></td>	<td><input type="number" name="attr_credits" value="0" /></td>		</tr>
+		</table>	
+	</div>
+	<div class="col">
+		<table>
+			<tr>	
+				<td colspan="2"><div class="textHead">Experience</div></td>
+				<td rowspan="3" width="15"> </td>	
+				<td width="225px"><div class="textHead">Languages</div></td>		
+			</tr>
+			<tr>
+				<td><input type="number" name="attr_XP" value="0" /></td>				
+				<td><input type="number" name="attr_XP_max" value="0" /></td>
+				<td><input type="text" name="attr_language" value="Basic" /></td>				
+			</tr>
+			<tr>
+				<td colspan="2"> </td>
+				<td>			
+					<fieldset class="repeating_language">
+						<table>		
+							<tr border="1">	
+								<td><input type="text" name="attr_language" value="" /></td>
+							</tr>
+						</table>
+					</fieldset>
+				</td>	
+			</tr>	
+		</table>
+	</div>
+</div>
\ No newline at end of file
diff --git a/Star Wars Saga Edition/sheet.json b/Star Wars Saga Edition/sheet.json
index b806444ec9..4e616a2691 100644
--- a/Star Wars Saga Edition/sheet.json	
+++ b/Star Wars Saga Edition/sheet.json	
@@ -3,5 +3,5 @@
 	"css": "StarWarsSagaEdition.css",
 	"authors": "Alicia G",
 	"preview": "StarWarsSagaEditionpreview.png",
-	"instructions": "# Character Sheet\r Inspired by the Saga Edition sheet by Mad Irishman Productions. This sheet auto-calculates Defences and Skills using the rules as written. Not all supplement rules may have been taken into account. If this is the case, please contact the authors. \r\r## Useful Attributes\r\r* level @{level}\r * Half Level @{level|max}\r* Hit Points @{hp} and @{hp|max}\r* Reflex @{Reflex}\r* Fortitude @{Fortitude} @{Will}\r* Condition Track Penalty @{CT}\r* Damage Threshold @{DT}\r* Damage Reduction @{DR}\r* Shield Rating @{SR} and @{SR|max}\r* Base Attack bonus @{BAB}\r\r**Ability Scores**\r\r* Strength @{str}\r* Constitution @{con}\r* Dexterity @{dex}\r* Intelligence @{int}\r* Wisdom @{wis}\r* Charisma @{cha}\r * Ability modifiers @{___|max}\r * All Skills ie @{Acrobatics} and @{Knowledge-GalacticLore} \r\r## Useful Rolls\r * Abilities ie. %{'charName'|strCheck}\r * Skills ie. %{'charName'|AcrobaticsCheck} or %{'charName'|Knowledge-GalacticLoreCheck}"
+	"instructions": "# Character Sheet\r Inspired by the Saga Edition sheet by Mad Irishman Productions. This sheet auto-calculates Defences and Skills using the rules as written. Not all supplement rules may have been taken into account. If this is the case, please contact the authors. \r\r## Useful Attributes\r\r* level @{level}\r* Half Level @{level|max}\r* Hit Points @{hp} and @{hp|max}\r* Reflex @{Reflex}\r* Fortitude @{Fortitude}\r* Will @{Will}\r* Condition Track Penalty @{CT}\r* Damage Threshold @{DT}\r* Damage Reduction @{DR}\r* Shield Rating @{SR} and @{SR|max}\r* Base Attack bonus @{BAB}\r\r**Ability Scores**\r\r* Strength @{str}\r* Constitution @{con}\r* Dexterity @{dex}\r* Intelligence @{int}\r* Wisdom @{wis}\r* Charisma @{cha}\r* Ability modifiers @{___|max}\r* All Skills ie @{Acrobatics} and @{Knowledge-GalacticLore} \r\r## Useful Rolls\r* Abilities ie. %{'charName'|strCheck}\r * Skills ie. %{'charName'|AcrobaticsCheck} or %{'charName'|Knowledge-GalacticLoreCheck}"
 }
\ No newline at end of file