diff --git a/SLA Industries 2ed/sla.css b/SLA Industries 2ed/sla.css
index 416b295c8a..9a132f1d77 100644
--- a/SLA Industries 2ed/sla.css	
+++ b/SLA Industries 2ed/sla.css	
@@ -14,6 +14,30 @@
 	background:#425363;
 	color:#425363;
 	}
+.sheet-currenttitle
+	{
+	vertical-align:middle;
+	border:none;
+	font-size:6.0pt;
+	font-family:Verdana;
+	color: gray;
+	text-align:right;
+	vertical-align:bottom;
+	grid-column: 20;
+	grid-row: 1;
+	}
+.sheet-basetitle
+	{
+	vertical-align:middle;
+	border:none;
+	font-size:6.0pt;
+	font-family:Verdana;
+	color: gray;
+	text-align:center;
+	vertical-align:bottom;
+	grid-column: 19;
+	grid-row: 1;
+	}
 .sheet-space14
 	{
 	grid-column: 1 / span 31;
@@ -244,7 +268,7 @@
 	border-left:.5pt solid white;
 	background:#073763;
 	}
-.sheet-strscore 
+.sheet-strbasescore 
 	{
 	grid-column: 19;
 	grid-row: 2;
@@ -252,15 +276,26 @@
 	border:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-strscore input[type=number]
+.sheet-strbasescore input[type=number]
 	{
 	width: 30px;
 	background:#C9DAF8;
 	text-align:center;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	border-top:none;
+	border:none;
+	font-size:12.0pt;
+	font-weight:700;
+	font-family:Verdana;
+	}
+.sheet-strscore 
+	{
+	grid-column: 20;
+	grid-row: 2;
+	color:red;
+	vertical-align:middle;
+	border:.5pt solid white;
+	background:#C9DAF8;
+	width: 30px;
+	text-align:center;
 	font-size:12.0pt;
 	font-weight:700;
 	font-family:Verdana;
@@ -279,7 +314,7 @@
 	border-left:.5pt solid white;
 	background:#073763;
 	}
-.sheet-dexscore 
+.sheet-dexbasescore 
 	{
 	grid-column: 19;
 	grid-row: 4;
@@ -287,7 +322,7 @@
 	border:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-dexscore input[type=number]
+.sheet-dexbasescore input[type=number]
 	{
 	width: 30px;
 	background:#C9DAF8;
@@ -295,10 +330,21 @@
 	font-size:12.0pt;
 	font-weight:700;
 	font-family:Verdana;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	border-top:none;
+	border:none;
+	}
+.sheet-dexscore 
+	{
+	grid-column: 20;
+	grid-row: 4;
+	color:red;
+	vertical-align:middle;
+	border:.5pt solid white;
+	background:#C9DAF8;
+	width: 30px;
+	text-align:center;
+	font-size:12.0pt;
+	font-weight:700;
+	font-family:Verdana;
 	}
 .sheet-knotitle
 	{
@@ -314,7 +360,7 @@
 	border-left:.5pt solid white;
 	background:#073763;
 	}
-.sheet-knoscore 
+.sheet-knobasescore 
 	{
 	grid-column: 19;
 	grid-row: 6;
@@ -322,7 +368,7 @@
 	border:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-knoscore input[type=number]
+.sheet-knobasescore input[type=number]
 	{
 	width: 30px;
 	background:#C9DAF8;
@@ -330,10 +376,21 @@
 	font-size:12.0pt;
 	font-weight:700;
 	font-family:Verdana;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	border-top:none;
+	border:none;
+	}
+.sheet-knoscore 
+	{
+	grid-column: 20;
+	grid-row: 6;
+	color:red;
+	vertical-align:middle;
+	border:.5pt solid white;
+	background:#C9DAF8;
+	width: 30px;
+	text-align:center;
+	font-size:12.0pt;
+	font-weight:700;
+	font-family:Verdana;
 	}
 .sheet-contitle
 	{
@@ -349,7 +406,7 @@
 	border-left:.5pt solid white;
 	background:#073763;
 	}
-.sheet-conscore 
+.sheet-conbasescore 
 	{
 	grid-column: 19;
 	grid-row: 8;
@@ -357,7 +414,7 @@
 	border:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-conscore input[type=number]
+.sheet-conbasescore input[type=number]
 	{
 	width: 30px;
 	background:#C9DAF8;
@@ -365,10 +422,21 @@
 	font-size:12.0pt;
 	font-weight:700;
 	font-family:Verdana;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	border-top:none;
+	border:none;
+	}
+.sheet-conscore 
+	{
+	grid-column: 20;
+	grid-row: 8;
+	color:red;
+	vertical-align:middle;
+	border:.5pt solid white;
+	background:#C9DAF8;
+	width: 30px;
+	text-align:center;
+	font-size:12.0pt;
+	font-weight:700;
+	font-family:Verdana;
 	}
 .sheet-chatitle
 	{
@@ -384,7 +452,7 @@
 	border-left:.5pt solid white;
 	background:#073763;
 	}
-.sheet-chascore 
+.sheet-chabasescore 
 	{
 	grid-column: 19;
 	grid-row: 10;
@@ -392,7 +460,7 @@
 	border:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-chascore input[type=number]
+.sheet-chabasescore input[type=number]
 	{
 	width: 30px;
 	background:#C9DAF8;
@@ -400,10 +468,21 @@
 	font-size:12.0pt;
 	font-weight:700;
 	font-family:Verdana;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	border-top:none;
+	border:none;
+	}
+.sheet-chascore 
+	{
+	grid-column: 20;
+	grid-row: 10;
+	color:red;
+	vertical-align:middle;
+	border:.5pt solid white;
+	background:#C9DAF8;
+	width: 30px;
+	text-align:center;
+	font-size:12.0pt;
+	font-weight:700;
+	font-family:Verdana;
 	}
 .sheet-cootitle
 	{
@@ -419,7 +498,7 @@
 	border-left:.5pt solid white;
 	background:#073763;
 	}
-.sheet-cooscore 
+.sheet-coobasescore 
 	{
 	grid-column: 19;
 	grid-row: 12;
@@ -427,7 +506,7 @@
 	border:.5pt solid white;
 	background:#C9DAF8;
 	}
-.sheet-cooscore input[type=number]
+.sheet-coobasescore input[type=number]
 	{
 	width: 30px;
 	background:#C9DAF8;
@@ -435,31 +514,42 @@
 	font-weight:700;
 	font-family:Verdana;
 	text-align:center;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	border-top:none;
+	border:none;
+	}
+.sheet-cooscore 
+	{
+	grid-column: 20;
+	grid-row: 12;
+	color:red;
+	vertical-align:middle;
+	border:.5pt solid white;
+	background:#C9DAF8;
+	width: 30px;
+	font-size:12.0pt;
+	font-weight:700;
+	font-family:Verdana;
+	text-align:center;
 	}
 .sheet-bodytitle
 	{
-	grid-column: 21 / span 3;
+	grid-column: 22 / span 2;
 	grid-row: 2;
 	color:white;
 	font-family:Verdana;
 	text-align:center;
 	vertical-align:middle;
 	border-top:.5pt solid white;
-	border-right:none;
-	border-bottom:.5pt solid white;
+	border-right:.5pt solid white;
+	border-bottom: none;
 	border-left:.5pt solid white;
 	background:#073763;
 	}
 .sheet-bodyscore 
 	{
-	grid-column: 21 / span 3;
+	grid-column: 22 / span 2;
 	grid-row: 3/ span 2;
 	border-top:.5pt solid white;
-	border-right:none;
+	border-right:.5pt solid white;
 	border-bottom:none;
 	border-left:.5pt solid white;
 	background:#F2F2F2;
@@ -480,7 +570,7 @@
 	}
 .sheet-brainstitle
 	{
-	grid-column: 21 / span 3;
+	grid-column: 22 / span 2;
 	grid-row: 6;
 	color:white;
 	font-family:Verdana;
@@ -491,7 +581,7 @@
 	}
 .sheet-brainsscore 
 	{
-	grid-column: 21 / span 3;
+	grid-column: 22 / span 2;
 	grid-row: 7/ span 2;
 	vertical-align:middle;
 	border:.5pt solid white;
@@ -512,7 +602,7 @@
 	}
 .sheet-bravadotitle
 	{
-	grid-column: 21 / span 3;
+	grid-column: 22 / span 2;
 	grid-row: 10;
 	color:white;
 	font-family:Verdana;
@@ -523,7 +613,7 @@
 	}
 .sheet-bravadoscore 
 	{
-	grid-column: 21 / span 3;
+	grid-column: 22 / span 2;
 	grid-row: 11/ span 2;
 	vertical-align:middle;
 	border:.5pt solid white;
diff --git a/SLA Industries 2ed/sla.html b/SLA Industries 2ed/sla.html
index 28b170b0a1..f3d8439140 100644
--- a/SLA Industries 2ed/sla.html	
+++ b/SLA Industries 2ed/sla.html	
@@ -273,6 +273,8 @@
 </datalist>
 <div class="sheet-container">
   <div class="sheet-header">&nbsp;</div>
+  <div class="sheet-basetitle">BASE</div>
+  <div class="sheet-currenttitle">CURRENT</div>
   <div class="sheet-soscc">SLA OPERATIVE SECURITY CLEARANCE CARD</div>
   <div class="sheet-nametitle">NAME</div>
   <div class="sheet-namescore"><input name="attr_character_name" type="text"></div>
@@ -284,21 +286,27 @@
   <div class="sheet-squadscore"><input name="attr_squad" type="text"></div>
   <div class="sheet-scltitle">SCL</div>
   <div class="sheet-sclscore"><input name="attr_scl" type="text"></div>
-  <div class="sheet-version">ver: 0.9a</div>
+  <div class="sheet-version">ver: 0.9c</div>
   
-  <div class="sheet-slaimage"><img width=119 height=155 src="sla.png"></div>
+  <div class="sheet-slaimage"><img width=119 height=155 src="slalogo.png"></div>
   <div class="sheet-strtitle">STRENGTH</div>
-  <div class="sheet-strscore"><input name="attr_strength" type="number" min=0><input name="attr_strengthmax" type="hidden"><input name="attr_strengthebb" type="hidden"><input name="attr_strengtharmour" type="hidden"><input name="attr_strengthdrugs" type="hidden"></div>
+  <div class="sheet-strbasescore"><input name="attr_strengthbase" type="number"><input name="attr_strengthmax" type="hidden"><input name="attr_strengthebb" type="hidden"><input name="attr_strengtharmour" type="hidden"><input name="attr_strengthdrugs" type="hidden"></div>
+  <div class="sheet-strscore"><span name="attr_strength"></div>
   <div class="sheet-dextitle">DEXTERITY</div>
-  <div class="sheet-dexscore"><input name="attr_dexterity" type="number" min=0><input name="attr_dexteritymax" type="hidden"><input name="attr_dexterityebb" type="hidden"><input name="attr_dexterityarmour" type="hidden"><input name="attr_dexteritydrugs" type="hidden"></div>
+  <div class="sheet-dexbasescore"><input name="attr_dexteritybase" type="number"><input name="attr_dexteritymax" type="hidden"><input name="attr_dexterityebb" type="hidden"><input name="attr_dexterityarmour" type="hidden"><input name="attr_dexteritydrugs" type="hidden"></div>
+  <div class="sheet-dexscore"><span name="attr_dexterity"></div>
   <div class="sheet-knotitle">KNOWLEDGE</div>
-  <div class="sheet-knoscore"><input name="attr_knowledge" type="number" min=0><input name="attr_knowledgemax" type="hidden"><input name="attr_knowledgemax" type="hidden"><input name="attr_knowledgedrugs" type="hidden"></div>
+  <div class="sheet-knobasescore"><input name="attr_knowledgebase" type="number"><input name="attr_knowledgemax" type="hidden"><input name="attr_knowledgemax" type="hidden"><input name="attr_knowledgedrugs" type="hidden"></div>
+  <div class="sheet-knoscore"><span name="attr_knowledge"></div>
   <div class="sheet-contitle">CONCENTRATION</div>
-  <div class="sheet-conscore"><input name="attr_concentration" type="number" min=0><input name="attr_concentrationmax" type="hidden"><input name="attr_concentrationebb" type="hidden"><input name="attr_concentrationdrugs" type="hidden"></div>
+  <div class="sheet-conbasescore"><input name="attr_concentrationbase" type="number"><input name="attr_concentrationmax" type="hidden"><input name="attr_concentrationebb" type="hidden"><input name="attr_concentrationdrugs" type="hidden"></div>
+  <div class="sheet-conscore"><span name="attr_concentration"></div>
   <div class="sheet-chatitle">CHARISMA</div>
-  <div class="sheet-chascore"><input name="attr_charisma" type="number" min=0><input name="attr_charismamax" type="hidden"><input name="attr_charismaebb" type="hidden"><input name="attr_charismadrugs" type="hidden"></div>
+  <div class="sheet-chabasescore"><input name="attr_charismabase" type="number"><input name="attr_charismamax" type="hidden"><input name="attr_charismaebb" type="hidden"><input name="attr_charismadrugs" type="hidden"></div>
+  <div class="sheet-chascore"><span name="attr_charisma"></div>
   <div class="sheet-cootitle">COOL</div>
-  <div class="sheet-cooscore"><input name="attr_cool" type="number" min=0><input name="attr_coolmax" type="hidden"><input name="attr_cooldrugs" type="hidden"></div>
+  <div class="sheet-coobasescore"><input name="attr_cool" type="number"><input name="attr_coolmax" type="hidden"><input name="attr_cooldrugs" type="hidden"></div>
+  <div class="sheet-cooscore"><span name="attr_cool"></div>
   <div class="sheet-bodytitle">BODY</div>
   <div class="sheet-bodyscore"><input name="attr_body" type="number" min=0></div>
   <div class="sheet-brainstitle">BRAINS</div>
@@ -306,7 +314,7 @@
   <div class="sheet-bravadotitle">BRAVADO</div>
   <div class="sheet-bravadoscore"><input name="attr_bravado" type="number" min=0></div>
   <div class="sheet-inittitle">INITIATIVE BONUS</div>
-  <div class="sheet-initscore"><input name="attr_initiative" type="number"><input name="attr_initiativedrugs" type="hidden"><button type="roll"value="&{template:initiative} {{name=initiative}}{{initiative=[[1d10+@{initiative}&{tracker}]]}}">&nbsp;</button></div>
+  <div class="sheet-initscore"><input name="attr_initiative" type="number"><input name="attr_initiativedrugs" type="hidden"><input name="attr_initiativearmour" type="hidden"><button type="roll"value="&{template:initiative} {{name=initiative}}{{initiative=[[1d10+@{initiative+initiativearmour+initiativedrugs}&{tracker}]]}}">&nbsp;</button></div>
   <div class="sheet-lucktitle"><span name="attr_luckflux"/></div>
   <div class="sheet-luckmaxtitle">MAX</div>
   <div class="sheet-luckcurrtitle">CURRENT</div>
@@ -740,7 +748,7 @@
   <div class="sheet-speciesskillsscore2"><input name="attr_species_ability_2" type="text"></div>
   <div class="sheet-movement">MOVEMENT</div>
   <div class="sheet-moveclosingtitle">CLOSING</div>
-  <div class="sheet-moveclosingscore"><input name="attr_move_closing" type="number"><input name="attr_move_closingebb" type="hidden"></div>
+  <div class="sheet-moveclosingscore"><input name="attr_move_closing" type="number"><input name="attr_move_closingebb" type="hidden"><input name="attr_move_closingarmour" type="hidden"></div>
   <div class="sheet-moverushingtitle">RUSHING</div>
   <div class="sheet-moverushingscore"><input name="attr_move_rushing" type="number"><input name="attr_move_rushingebb" type="hidden"><input name="attr_move_rushingarmour" type="hidden"></div>
   <div class="sheet-armourtottitle">ARMOUR</div>
@@ -797,28 +805,28 @@
   <div class="sheet-drugdose2title">DOSE ACTIVE</div>
   <div class="sheet-drugaddicttitle">ADDICT</div>
   <div class="sheet-drug1score"><input type="text" list="druglist" name="attr_druguse1"></div>
-  <div class="sheet-drug1dosesscore"><input name="attr_drugdosetaken_1" type="number"></div>
-  <div class="sheet-drug1activescore"><input name="attr_drugactive_1" type="checkbox"></div>
+  <div class="sheet-drug1dosesscore"><input name="attr_drugdosetaken1" type="number"></div>
+  <div class="sheet-drug1activescore"><input name="attr_drugactive1" type="checkbox"></div>
   <div class="sheet-drug1addictscore"><input name="attr_addict_1" type="checkbox"></div>
   <div class="sheet-drug2score"><input type="text" list="druglist" name="attr_druguse2"></div>
-  <div class="sheet-drug2dosesscore"><input name="attr_drugdosetaken_2" type="number"></div>
-  <div class="sheet-drug2activescore"><input name="attr_drugactive_2" type="checkbox"></div>
+  <div class="sheet-drug2dosesscore"><input name="attr_drugdosetaken2" type="number"></div>
+  <div class="sheet-drug2activescore"><input name="attr_drugactive2" type="checkbox"></div>
   <div class="sheet-drug2addictscore"><input name="attr_addict_1" type="checkbox"></div>
   <div class="sheet-drug3score"><input type="text" list="druglist" name="attr_druguse3"></div>
-  <div class="sheet-drug3dosesscore"><input name="attr_drugdosetaken_3" type="number"></div>
-  <div class="sheet-drug3activescore"><input name="attr_drugactive_3" type="checkbox"></div>
+  <div class="sheet-drug3dosesscore"><input name="attr_drugdosetaken3" type="number"></div>
+  <div class="sheet-drug3activescore"><input name="attr_drugactive3" type="checkbox"></div>
   <div class="sheet-drug3addictscore"><input name="attr_addict_3" type="checkbox"></div>
   <div class="sheet-drug4score"><input type="text" list="druglist" name="attr_druguse4"></div>
-  <div class="sheet-drug4dosesscore"><input name="attr_drugdosetaken_4" type="number"></div>
-  <div class="sheet-drug4activescore"><input name="attr_drugactive_4" type="checkbox"></div>
+  <div class="sheet-drug4dosesscore"><input name="attr_drugdosetaken4" type="number"></div>
+  <div class="sheet-drug4activescore"><input name="attr_drugactive4" type="checkbox"></div>
   <div class="sheet-drug4addictscore"><input name="attr_addict_4" type="checkbox"></div>
   <div class="sheet-drug5score"><input type="text" list="druglist" name="attr_druguse5"></div>
-  <div class="sheet-drug5dosesscore"><input name="attr_drugdosetaken_5" type="number"></div>
-  <div class="sheet-drug5activescore"><input name="attr_drugactive_5" type="checkbox"></div>
+  <div class="sheet-drug5dosesscore"><input name="attr_drugdosetaken5" type="number"></div>
+  <div class="sheet-drug5activescore"><input name="attr_drugactive5" type="checkbox"></div>
   <div class="sheet-drug5addictscore"><input name="attr_addict_5" type="checkbox"></div>
   <div class="sheet-drug6score"><input type="text" list="druglist" name="attr_druguse6"></div>
-  <div class="sheet-drug6dosesscore"><input name="attr_drugdosetaken_6" type="number"></div>
-  <div class="sheet-drug6activescore"><input name="attr_drugactive_6" type="checkbox"></div>
+  <div class="sheet-drug6dosesscore"><input name="attr_drugdosetaken6" type="number"></div>
+  <div class="sheet-drug6activescore"><input name="attr_drugactive6" type="checkbox"></div>
   <div class="sheet-drug6addictscore"><input name="attr_addict_6" type="checkbox"></div>
 
   <div class="sheet-armourtitle">ARMOUR</div>
@@ -948,18 +956,18 @@
 
 on('change:species', event => {
      const speciesdetails = {
-        "Advanced Carrien":		{strength: '3', strengthmax: '5', dexterity: '1', dexteritymax: '5', knowledge: '0', knowledgemax: '2', concentration: '1', concentrationmax: '4', charisma: '0', charismamax: '3', cool: '3', coolmax: '6', luck: '0', luckmax: '3', athletics: '0', bribery: '0', climbing: '0', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '1', langgristle: '1', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '1', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '1', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'7', hpStarting:'23', species_ability_1:"FAMILIAR BREED", 	species_ability_2:"AGAINST ALL ODDS", 	luckflux:"LUCK"},
-        "ADV": 					{strength: '3', strengthmax: '5', dexterity: '1', dexteritymax: '5', knowledge: '0', knowledgemax: '2', concentration: '1', concentrationmax: '4', charisma: '0', charismamax: '3', cool: '3', coolmax: '6', luck: '0', luckmax: '3', athletics: '0', bribery: '0', climbing: '0', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '1', langgristle: '1', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '1', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '1', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'7', hpStarting:'23', species_ability_1:"FAMILIAR_BREED", 	species_ability_2:"AGAINST ALL ODDS", 	luckflux:"LUCK"},
-        "Brain Waster": 		{strength: '0', strengthmax: '3', dexterity: '1', dexteritymax: '4', knowledge: '1', knowledgemax: '5', concentration: '2', concentrationmax: '6', charisma: '1', charismamax: '5', cool: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
-        "Eban": 				{strength: '0', strengthmax: '3', dexterity: '1', dexteritymax: '4', knowledge: '1', knowledgemax: '5', concentration: '2', concentrationmax: '6', charisma: '1', charismamax: '5', cool: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
-        "Ebon": 				{strength: '0', strengthmax: '3', dexterity: '1', dexteritymax: '4', knowledge: '1', knowledgemax: '5', concentration: '2', concentrationmax: '6', charisma: '1', charismamax: '5', cool: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
-        "Frother": 				{strength: '2', strengthmax: '4', dexterity: '1', dexteritymax: '4', knowledge: '1', knowledgemax: '5', concentration: '1', concentrationmax: '3', charisma: '0', charismamax: '4', cool: '1', coolmax: '5', luck: '1', luckmax: '3', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '1', oratory: '0', persuasion: '0', stealth: '0', streetwise: '1', survival: '0', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'17', species_ability_1:"DRUG ADDICT", 		species_ability_2:"FEEL NO PAIN", 		luckflux:"LUCK"},
-        "Human": 				{strength: '1', strengthmax: '3', dexterity: '1', dexteritymax: '4', knowledge: '2', knowledgemax: '5', concentration: '1', concentrationmax: '5', charisma: '1', charismamax: '5', cool: '1', coolmax: '5', luck: '1', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '1', survival: '0', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'15', species_ability_1:"ADAPTABLE", 			species_ability_2:"SOCIABLE", 			luckflux:"LUCK"},
-        "Neophron": 			{strength: '0', strengthmax: '2', dexterity: '0', dexteritymax: '3', knowledge: '2', knowledgemax: '6', concentration: '2', concentrationmax: '6', charisma: '3', charismamax: '6', cool: '1', coolmax: '5', luck: '0', luckmax: '3', athletics: '0', bribery: '1', climbing: '0', detect: '0', diplomacy: '1', eduacad: '1', edunat: '1', intimidate: '0', langgristle: '0', langneo: '1', langshak: '0', langwraith: '0', leadership: '1', loresector: '0', meleewpn: '0', oratory: '1', persuasion: '1', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'11', species_ability_1:"CHARM OFFENSIVE", 	species_ability_2:"INQUISITIVE MIND",	luckflux:"LUCK"},
-		"Shaktar": 				{strength: '3', strengthmax: '5', dexterity: '2', dexteritymax: '5', knowledge: '1', knowledgemax: '4', concentration: '0', concentrationmax: '3', charisma: '1', charismamax: '3', cool: '1', coolmax: '6', luck: '0', luckmax: '3', athletics: '0', bribery: '0', climbing: '1', detect: '1', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '1', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '1', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'3', move_rushing:'6', hpStarting:'22', species_ability_1:"HONOUR BOUND", 		species_ability_2:"PREHENSILE TAIL", 	luckflux:"LUCK"},
-        "Stormer 313 'Malice'":	{strength: '3', strengthmax: '6', dexterity: '3', dexteritymax: '6', knowledge: '0', knowledgemax: '2', concentration: '0', concentrationmax: '3', charisma: '0', charismamax: '3', cool: '3', coolmax: '6', luck: '0', luckmax: '2', athletics: '1', bribery: '0', climbing: '0', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '1', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '1', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'3', move_rushing:'6', hpStarting:'25', species_ability_1:"REGENERATION (2)", 	species_ability_2:"PHYSICAL FAVOURITE", luckflux:"LUCK"},
-        "Stormer 711 'Xeno'": 	{strength: '2', strengthmax: '5', dexterity: '2', dexteritymax: '5', knowledge: '0', knowledgemax: '3', concentration: '1', concentrationmax: '4', charisma: '0', charismamax: '2', cool: '2', coolmax: '6', luck: '0', luckmax: '2', athletics: '0', bribery: '0', climbing: '1', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '1', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'6', hpStarting:'22', species_ability_1:"REGENERATION (1)", 	species_ability_2:"ADAPTIVE SKIN", 		luckflux:"LUCK"},
-        "Wraithen": 			{strength: '1', strengthmax: '3', dexterity: '3', dexteritymax: '6', knowledge: '1', knowledgemax: '4', concentration: '1', concentrationmax: '4', charisma: '1', charismamax: '4', cool: '0', coolmax: '5', luck: '1', luckmax: '4', athletics: '1', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '1', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '1', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'8', hpStarting:'15', species_ability_1:"SKILLED HUNTER", 	species_ability_2:"ACUTE SENSES", 		luckflux:"LUCK"},
+        "Advanced Carrien":		{strengthbase: '3', strengthmax: '5', dexteritybase: '1', dexteritymax: '5', knowledgebase: '0', knowledgemax: '2', concentrationbase: '1', concentrationmax: '4', charismabase: '0', charismamax: '3', coolbase: '3', coolmax: '6', luck: '0', luckmax: '3', athletics: '0', bribery: '0', climbing: '0', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '1', langgristle: '1', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '1', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '1', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'7', hpStarting:'23', species_ability_1:"FAMILIAR BREED", 	species_ability_2:"AGAINST ALL ODDS", 	luckflux:"LUCK"},
+        "ADV": 					{strengthbase: '3', strengthmax: '5', dexteritybase: '1', dexteritymax: '5', knowledgebase: '0', knowledgemax: '2', concentrationbase: '1', concentrationmax: '4', charismabase: '0', charismamax: '3', coolbase: '3', coolmax: '6', luck: '0', luckmax: '3', athletics: '0', bribery: '0', climbing: '0', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '1', langgristle: '1', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '1', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '1', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'7', hpStarting:'23', species_ability_1:"FAMILIAR_BREED", 	species_ability_2:"AGAINST ALL ODDS", 	luckflux:"LUCK"},
+        "Brain Waster": 		{strengthbase: '0', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '2', concentrationmax: '6', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
+        "Eban": 				{strengthbase: '0', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '2', concentrationmax: '6', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
+        "Ebon": 				{strengthbase: '0', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '2', concentrationmax: '6', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '2', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'14', species_ability_1:"CONTROL OF THE EBB", species_ability_2:'', 					luckflux:"FLUX"},
+        "Frother": 				{strengthbase: '2', strengthmax: '4', dexteritybase: '1', dexteritymax: '4', knowledgebase: '1', knowledgemax: '5', concentrationbase: '1', concentrationmax: '3', charismabase: '0', charismamax: '4', coolbase: '1', coolmax: '5', luck: '1', luckmax: '3', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '1', oratory: '0', persuasion: '0', stealth: '0', streetwise: '1', survival: '0', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'17', species_ability_1:"DRUG ADDICT", 		species_ability_2:"FEEL NO PAIN", 		luckflux:"LUCK"},
+        "Human": 				{strengthbase: '1', strengthmax: '3', dexteritybase: '1', dexteritymax: '4', knowledgebase: '2', knowledgemax: '5', concentrationbase: '1', concentrationmax: '5', charismabase: '1', charismamax: '5', coolbase: '1', coolmax: '5', luck: '1', luckmax: '6', athletics: '0', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '1', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '1', survival: '0', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'15', species_ability_1:"ADAPTABLE", 			species_ability_2:"SOCIABLE", 			luckflux:"LUCK"},
+        "Neophron": 			{strengthbase: '0', strengthmax: '2', dexteritybase: '0', dexteritymax: '3', knowledgebase: '2', knowledgemax: '6', concentrationbase: '2', concentrationmax: '6', charismabase: '3', charismamax: '6', coolbase: '1', coolmax: '5', luck: '0', luckmax: '3', athletics: '0', bribery: '1', climbing: '0', detect: '0', diplomacy: '1', eduacad: '1', edunat: '1', intimidate: '0', langgristle: '0', langneo: '1', langshak: '0', langwraith: '0', leadership: '1', loresector: '0', meleewpn: '0', oratory: '1', persuasion: '1', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '0', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'2', move_rushing:'5', hpStarting:'11', species_ability_1:"CHARM OFFENSIVE", 	species_ability_2:"INQUISITIVE MIND",	luckflux:"LUCK"},
+		"Shaktar": 				{strengthbase: '3', strengthmax: '5', dexteritybase: '2', dexteritymax: '5', knowledgebase: '1', knowledgemax: '4', concentrationbase: '0', concentrationmax: '3', charismabase: '1', charismamax: '3', coolbase: '1', coolmax: '6', luck: '0', luckmax: '3', athletics: '0', bribery: '0', climbing: '1', detect: '1', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '1', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '1', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'3', move_rushing:'6', hpStarting:'22', species_ability_1:"HONOUR BOUND", 		species_ability_2:"PREHENSILE TAIL", 	luckflux:"LUCK"},
+        "Stormer 313 'Malice'":	{strengthbase: '3', strengthmax: '6', dexteritybase: '3', dexteritymax: '6', knowledgebase: '0', knowledgemax: '2', concentrationbase: '0', concentrationmax: '3', charismabase: '0', charismamax: '3', coolbase: '3', coolmax: '6', luck: '0', luckmax: '2', athletics: '1', bribery: '0', climbing: '0', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '1', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '1', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'3', move_rushing:'6', hpStarting:'25', species_ability_1:"REGENERATION (2)", 	species_ability_2:"PHYSICAL FAVOURITE", luckflux:"LUCK"},
+        "Stormer 711 'Xeno'": 	{strengthbase: '2', strengthmax: '5', dexteritybase: '2', dexteritymax: '5', knowledgebase: '0', knowledgemax: '3', concentrationbase: '1', concentrationmax: '4', charismabase: '0', charismamax: '2', coolbase: '2', coolmax: '6', luck: '0', luckmax: '2', athletics: '0', bribery: '0', climbing: '1', detect: '0', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '0', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '1', streetwise: '0', survival: '0', throw: '0', tracking: '0', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'6', hpStarting:'22', species_ability_1:"REGENERATION (1)", 	species_ability_2:"ADAPTIVE SKIN", 		luckflux:"LUCK"},
+        "Wraithen": 			{strengthbase: '1', strengthmax: '3', dexteritybase: '3', dexteritymax: '6', knowledgebase: '1', knowledgemax: '4', concentrationbase: '1', concentrationmax: '4', charismabase: '1', charismamax: '4', coolbase: '0', coolmax: '5', luck: '1', luckmax: '4', athletics: '1', bribery: '0', climbing: '0', detect: '1', diplomacy: '0', eduacad: '0', edunat: '0', intimidate: '0', langgristle: '0', langneo: '0', langshak: '0', langwraith: '1', leadership: '0', loresector: '0', meleewpn: '0', oratory: '0', persuasion: '0', stealth: '0', streetwise: '0', survival: '0', throw: '0', tracking: '1', unarmed: '1', acrobatics:'0', admin:'0', appraisal:0, computer:'0', demolitions:'0', driveciv:'0', drivemil:'0', drivepil:'0', drivemot:'0', forensics:'0', forgery:'0', gambling:'0', haggle:'0', interrogate:'0', langbiya:'0', langsign:'0', lockpickelec:'0', lockpickman:'0', lorecult:'0', loredream:'0', medical:'0', optimise:'0', pistol:'0', polearm:'0', readlips:'0', rifle:'0', seduction:'0', shieldcraft:'0', sleight:'0', supportwpn:'0', survival:'0', swimming:'0', tactics:'0', techelec:'0', techman:'0', techwpn:'0', torture:'0', awareness:'0', blast:'0', communicate:'0', enhance:'0', heal:'0', protect:'0', realityfold:'0', senses:'0', telekinesis:'0', thermal:'0', move_closing:'4', move_rushing:'8', hpStarting:'15', species_ability_1:"SKILLED HUNTER", 	species_ability_2:"ACUTE SENSES", 		luckflux:"LUCK"},
     };
     getAttrs(['species'], values => {
         let name = values.species;
@@ -989,30 +997,35 @@ on('change:species', event => {
  	  "A Wraithen’s heightened senses extend to their strong survival instinct, giving them an uncanny knack at detecting dangerous situations. A Wraithen adds 1 to their Initiative Bonus, making them more likely to act before others in combat."]; 
 */
 
-on("change:dexterity", function() {
-  getAttrs(["dexterity","species","concentration","acrobatics","athletics","drivemot","forgery","pistol","rifle","sleight","stealth"], function(values) {
+on("change:dexteritybase change:dexterityarmour change:dexteritydrugs change:dexterityebb", function() {
+  getAttrs(["dexteritybase","species","concentration","acrobatics","athletics","drivemot","forgery","pistol","rifle","sleight","stealth","dexterityarmour","dexteritydrugs","dexterityebb"], function(values) {
      const speciesdetails = {
-        "Advanced Carrien":		{dexterity: '1', dexteritymax: '5'},
-        "ADV": 					{dexterity: '1', dexteritymax: '5'},
-        "Brain Waster": 		{dexterity: '1', dexteritymax: '4'},
-        "Eban": 				{dexterity: '1', dexteritymax: '4'},
-        "Ebon": 				{dexterity: '1', dexteritymax: '4'},
-        "Frother": 				{dexterity: '1', dexteritymax: '4'},
-        "Human": 				{dexterity: '1', dexteritymax: '4'},
-        "Neophron": 			{dexterity: '0', dexteritymax: '3'},
-		"Shaktar": 				{dexterity: '2', dexteritymax: '5'},
-        "Stormer 313 'Malice'":	{dexterity: '3', dexteritymax: '6'},
-        "Stormer 711 'Xeno'": 	{dexterity: '2', dexteritymax: '5'},
-        "Wraithen": 			{dexterity: '3', dexteritymax: '6'},
+        "Advanced Carrien":		{dexteritybase: '1', dexteritymax: '5'},
+        "ADV": 					{dexteritybase: '1', dexteritymax: '5'},
+        "Brain Waster": 		{dexteritybase: '1', dexteritymax: '4'},
+        "Eban": 				{dexteritybase: '1', dexteritymax: '4'},
+        "Ebon": 				{dexteritybase: '1', dexteritymax: '4'},
+        "Frother": 				{dexteritybase: '1', dexteritymax: '4'},
+        "Human": 				{dexteritybase: '1', dexteritymax: '4'},
+        "Neophron": 			{dexteritybase: '0', dexteritymax: '3'},
+		"Shaktar": 				{dexteritybase: '2', dexteritymax: '5'},
+        "Stormer 313 'Malice'":	{dexteritybase: '3', dexteritymax: '6'},
+        "Stormer 711 'Xeno'": 	{dexteritybase: '2', dexteritymax: '5'},
+        "Wraithen": 			{dexteritybase: '3', dexteritymax: '6'},
     };
-      var dexterity = parseInt(values["dexterity"])||0;
+      var dexteritybase = parseInt(values["dexteritybase"])||0;
+      var dexterityarmour = parseInt(values["dexterityarmour"])||0;
+      var dexteritydrugs = parseInt(values["dexteritydrugs"])||0;
+      var dexterityebb = parseInt(values["dexterityebb"])||0;
 	  var species = values["species"]||"";
 
-      var dexteritymin = speciesdetails[species]["dexterity"]||0;
-      var dexteritymax = speciesdetails[species]["dexteritymax"]||20;
+      var dexteritymin = parseInt(speciesdetails[species]["dexteritybase"])||0;
+      var dexteritymax = parseInt(speciesdetails[species]["dexteritymax"])||20;
 	  
-	  if (dexterity > dexteritymax) { dexterity = dexteritymax;}
-	  if (dexterity < dexteritymin) { dexterity = dexteritymin;}
+	  if (dexteritybase > dexteritymax) { dexteritybase = dexteritymax;}
+	  if (dexteritybase < dexteritymin) { dexteritybase = dexteritymin;}
+	  
+	  var dexterity = dexteritybase + dexterityarmour + dexteritydrugs + dexterityebb;
 
       var concentration = parseInt(values["concentration"])||0;
       var acrobatics = parseInt(values["acrobatics"])||0;
@@ -1034,6 +1047,7 @@ on("change:dexterity", function() {
 	  var initiative = dexterity + concentration;
       setAttrs({
 		"dexterity": dexterity,
+		"dexteritybase": dexteritybase,
         "acrobatics_total": acrobaticstotal,
         "athletics_total": athleticstotal,
         "drivemot_total": drivemottotal,
@@ -1046,30 +1060,35 @@ on("change:dexterity", function() {
       });
   });
 });
-on("change:strength", function() {
-  getAttrs(["species","strength","climbing","meleewpn","polearm","shieldcraft","supportwpn","swimming","throw","unarmed"], function(values) {
+on("change:strengthbase change:strengtharmour change:strengthdrugs change:strengthebb", function() {
+  getAttrs(["species","strengthbase","climbing","meleewpn","polearm","shieldcraft","supportwpn","swimming","throw","unarmed","strengtharmour","strengthdrugs","strengthebb"], function(values) {
      const speciesdetails = {
-        "Advanced Carrien":		{strength: '3', strengthmax: '5', hpbase: '20'},
-        "ADV": 					{strength: '3', strengthmax: '5', hpbase: '20'},
-        "Brain Waster": 		{strength: '0', strengthmax: '3', hpbase: '14'},
-        "Eban": 				{strength: '0', strengthmax: '3', hpbase: '14'},
-        "Ebon": 				{strength: '0', strengthmax: '3', hpbase: '14'},
-        "Frother": 				{strength: '2', strengthmax: '4', hpbase: '15'},
-        "Human": 				{strength: '1', strengthmax: '3', hpbase: '14'},
-        "Neophron": 			{strength: '0', strengthmax: '2', hpbase: '11'},
-		"Shaktar": 				{strength: '3', strengthmax: '5', hpbase: '19'},
-        "Stormer 313 'Malice'":	{strength: '3', strengthmax: '6', hpbase: '22'},
-        "Stormer 711 'Xeno'": 	{strength: '2', strengthmax: '5', hpbase: '20'},
-        "Wraithen": 			{strength: '1', strengthmax: '3', hpbase: '14'},
+        "Advanced Carrien":		{strengthbase: '3', strengthmax: '5', hpbase: '20'},
+        "ADV": 					{strengthbase: '3', strengthmax: '5', hpbase: '20'},
+        "Brain Waster": 		{strengthbase: '0', strengthmax: '3', hpbase: '14'},
+        "Eban": 				{strengthbase: '0', strengthmax: '3', hpbase: '14'},
+        "Ebon": 				{strengthbase: '0', strengthmax: '3', hpbase: '14'},
+        "Frother": 				{strengthbase: '2', strengthmax: '4', hpbase: '15'},
+        "Human": 				{strengthbase: '1', strengthmax: '3', hpbase: '14'},
+        "Neophron": 			{strengthbase: '0', strengthmax: '2', hpbase: '11'},
+		"Shaktar": 				{strengthbase: '3', strengthmax: '5', hpbase: '19'},
+        "Stormer 313 'Malice'":	{strengthbase: '3', strengthmax: '6', hpbase: '22'},
+        "Stormer 711 'Xeno'": 	{strengthbase: '2', strengthmax: '5', hpbase: '20'},
+        "Wraithen": 			{strengthbase: '1', strengthmax: '3', hpbase: '14'},
     };
-      var strength = parseInt(values["strength"])||0;
+      var strengthbase = parseInt(values["strengthbase"])||0;
+      var strengtharmour = parseInt(values["strengtharmour"])||0;
+      var strengthdrugs = parseInt(values["strengthdrugs"])||0;
+      var strengthebb = parseInt(values["strengthebb"])||0;
 	  var species = values["species"]||"";
-      var strengthmin = parseInt(speciesdetails[species]["strength"])||0;
+      var strengthmin = parseInt(speciesdetails[species]["strengthbase"])||0;
       var strengthmax = parseInt(speciesdetails[species]["strengthmax"])||20;
 	  var hpbase = parseInt(speciesdetails[species]["hpbase"])||20;
 
-	  if (strength > strengthmax) { strength = strengthmax;}
-	  if (strength < strengthmin) { strength = strengthmin;}
+	  if (strengthbase > strengthmax) { strengthbase = strengthmax;}
+	  if (strengthbase < strengthmin) { strengthbase = strengthmin;}
+	  
+	 var strength = strengthbase + strengtharmour + strengthdrugs + strengthebb;
 
       var climbing = parseInt(values["climbing"])||0;
       var meleewpn = parseInt(values["meleewpn"])||0;
@@ -1089,6 +1108,7 @@ on("change:strength", function() {
       var unarmedtotal = unarmed + strength;
       setAttrs({ 
 	    "strength": strength,
+	    "strengthbase": strengthbase,
         "climbing_total": climbingtotal,
         "meleewpn_total": meleewpntotal,
         "polearm_total": polearmtotal,
@@ -1101,30 +1121,33 @@ on("change:strength", function() {
       });
   });
 }); 
-on("change:knowledge", function() {
-  getAttrs(["knowledge","species","admin","computer","eduacad","edunat","forensics","langbiya","langgristle","langneo","langshak","langsign","langwraith","lorecult","loredream","loresector","medical","optimise","streetwise"], function(values) {
+on("change:knowledgebase change:knowledgedrugs", function() {
+  getAttrs(["knowledgebase","species","admin","computer","eduacad","edunat","forensics","langbiya","langgristle","langneo","langshak","langsign","langwraith","lorecult","loredream","loresector","medical","optimise","streetwise","knowledgedrugs"], function(values) {
      const speciesdetails = {
-        "Advanced Carrien":		{knowledge: '0', knowledgemax: '2'},
-        "ADV": 					{knowledge: '0', knowledgemax: '2'},
-        "Brain Waster": 		{knowledge: '1', knowledgemax: '5'},
-        "Eban": 				{knowledge: '1', knowledgemax: '5'},
-        "Ebon": 				{knowledge: '1', knowledgemax: '5'},
-        "Frother": 				{knowledge: '1', knowledgemax: '5'},
-        "Human": 				{knowledge: '2', knowledgemax: '5'},
-        "Neophron": 			{knowledge: '0', knowledgemax: '6'},
-		"Shaktar": 				{knowledge: '1', knowledgemax: '4'},
-        "Stormer 313 'Malice'":	{knowledge: '0', knowledgemax: '2'},
-        "Stormer 711 'Xeno'": 	{knowledge: '0', knowledgemax: '3'},
-        "Wraithen": 			{knowledge: '1', knowledgemax: '4'},
+        "Advanced Carrien":		{knowledgebase: '0', knowledgemax: '2'},
+        "ADV": 					{knowledgebase: '0', knowledgemax: '2'},
+        "Brain Waster": 		{knowledgebase: '1', knowledgemax: '5'},
+        "Eban": 				{knowledgebase: '1', knowledgemax: '5'},
+        "Ebon": 				{knowledgebase: '1', knowledgemax: '5'},
+        "Frother": 				{knowledgebase: '1', knowledgemax: '5'},
+        "Human": 				{knowledgebase: '2', knowledgemax: '5'},
+        "Neophron": 			{knowledgebase: '0', knowledgemax: '6'},
+		"Shaktar": 				{knowledgebase: '1', knowledgemax: '4'},
+        "Stormer 313 'Malice'":	{knowledgebase: '0', knowledgemax: '2'},
+        "Stormer 711 'Xeno'": 	{knowledgebase: '0', knowledgemax: '3'},
+        "Wraithen": 			{knowledgebase: '1', knowledgemax: '4'},
     };
-      var knowledge = parseInt(values["knowledge"])||0;
+      var knowledgebase = parseInt(values["knowledgebase"])||0;
+      var knowledgedrugs = parseInt(values["knowledgedrugs"])||0;
 	  var species = values["species"]||"";
 
-      var knowledgemin = speciesdetails[species]["knowledge"]||0;
-      var knowledgemax = speciesdetails[species]["knowledgemax"]||20;
+      var knowledgemin = parseInt(speciesdetails[species]["knowledgebase"])||0;
+      var knowledgemax = parseInt(speciesdetails[species]["knowledgemax"])||20;
 	  
-	  if (knowledge > knowledgemax) { knowledge = knowledgemax;}
-	  if (knowledge < knowledgemin) { knowledge = knowledgemin;}
+	  if (knowledgebase > knowledgemax) { knowledgebase = knowledgemax;}
+	  if (knowledgebase < knowledgemin) { knowledgebase = knowledgemin;}
+	  
+	  var knowledge = knowledgebase + knowledgedrugs;
 
       var admin = parseInt(values["admin"])||0;
       var computer = parseInt(values["computer"])||0;
@@ -1162,6 +1185,7 @@ on("change:knowledge", function() {
       var streetwisetotal = streetwise + knowledge;
       setAttrs({
 			"knowledge": knowledge,
+			"knowledgebase": knowledgebase,
 			"admin_total": admintotal,
 			"computer_total": computertotal,
 			"eduacad_total": eduacadtotal,
@@ -1182,32 +1206,38 @@ on("change:knowledge", function() {
       });
   });
 });
-on("change:concentration", function() {
-  getAttrs(["concentration","dexterity","species","appraisal","demolitions","detect","driveciv","drivemil","drivepil","lockpickman","lockpickelec","readlips","tactics","techelec","techman","techwpn","tracking","awareness","blast","communicate","enhance","heal","protect","realityfold","senses","telekinesis","thermal"], function(values) {
+on("change:concentrationbase change:concentrationdrugs change:concentrationebb change:initiativedrugs change:initiativearmour", function() {
+  getAttrs(["concentrationbase","dexterity","species","appraisal","demolitions","detect","driveciv","drivemil","drivepil","lockpickman","lockpickelec","readlips","tactics","techelec","techman","techwpn","tracking","awareness","blast","communicate","enhance","heal","protect","realityfold","senses","telekinesis","thermal","concentrationdrugs","concentrationebb","initiativedrugs","initiativearmour"], function(values) {
      const speciesdetails = {
-        "Advanced Carrien":		{concentration: '1', concentrationmax: '4'},
-        "ADV": 					{concentration: '1', concentrationmax: '5'},
-        "Brain Waster": 		{concentration: '2', concentrationmax: '6'},
-        "Eban": 				{concentration: '2', concentrationmax: '6'},
-        "Ebon": 				{concentration: '2', concentrationmax: '6'},
-        "Frother": 				{concentration: '1', concentrationmax: '4'},
-        "Human": 				{concentration: '1', concentrationmax: '5'},
-        "Neophron": 			{concentration: '2', concentrationmax: '6'},
-		"Shaktar": 				{concentration: '0', concentrationmax: '3'},
-        "Stormer 313 'Malice'":	{concentration: '0', concentrationmax: '3'},
-        "Stormer 711 'Xeno'": 	{concentration: '1', concentrationmax: '4'},
-        "Wraithen": 			{concentration: '1', concentrationmax: '4'},
+        "Advanced Carrien":		{concentrationbase: '1', concentrationmax: '4'},
+        "ADV": 					{concentrationbase: '1', concentrationmax: '5'},
+        "Brain Waster": 		{concentrationbase: '2', concentrationmax: '6'},
+        "Eban": 				{concentrationbase: '2', concentrationmax: '6'},
+        "Ebon": 				{concentrationbase: '2', concentrationmax: '6'},
+        "Frother": 				{concentrationbase: '1', concentrationmax: '4'},
+        "Human": 				{concentrationbase: '1', concentrationmax: '5'},
+        "Neophron": 			{concentrationbase: '2', concentrationmax: '6'},
+		"Shaktar": 				{concentrationbase: '0', concentrationmax: '3'},
+        "Stormer 313 'Malice'":	{concentrationbase: '0', concentrationmax: '3'},
+        "Stormer 711 'Xeno'": 	{concentrationbase: '1', concentrationmax: '4'},
+        "Wraithen": 			{concentrationbase: '1', concentrationmax: '4'},
     };
 	  var species = values["species"]||"";
-      var concentration = parseInt(values["concentration"])||0;
+      var concentrationbase = parseInt(values["concentrationbase"])||0;
+      var concentrationdrugs = parseInt(values["concentrationdrugs"])||0;
+      var concentrationebb = parseInt(values["concentrationebb"])||0;
+      var initiativedrugs = parseInt(values["initiativedrugs"])||0;
+      var initiativearmour = parseInt(values["initiativearmour"])||0;
       var dexterity = parseInt(values["dexterity"])||0;
 
-      var concentrationmin = speciesdetails[species]["concentration"]||0;
-      var concentrationmax = speciesdetails[species]["concentrationmax"]||20;
+      var concentrationmin = parseInt(speciesdetails[species]["concentration"])||0;
+      var concentrationmax = parseInt(speciesdetails[species]["concentrationmax"])||20;
 	  
-	  if (concentration > concentrationmax) { concentration = concentrationmax;}
-	  if (concentration < concentrationmin) { concentration = concentrationmin;}
+	  if (concentrationbase > concentrationmax) { concentrationbase = concentrationmax;}
+	  if (concentrationbase < concentrationmin) { concentrationbase = concentrationmin;}
 
+	  var concentration = concentrationbase + concentrationdrugs + concentrationebb;
+	  
       var appraisal = parseInt(values["appraisal"])||0;
       var demolitions = parseInt(values["demolitions"])||0;
       var detect = parseInt(values["detect"])||0;
@@ -1256,9 +1286,10 @@ on("change:concentration", function() {
       var sensestotal = senses + concentration;
       var telekinesistotal = telekinesis + concentration;
       var thermaltotal = thermal + concentration;
-	  var initiative = dexterity + concentration;
+	  var initiative = dexterity + concentration + initiativearmour + initiativedrugs;
       setAttrs({
 		"concentration": concentration,
+		"concentrationbase": concentrationbase,
         "appraisal_total": appraisaltotal,
         "demolitions_total": demolitionstotal,
         "detect_total": detecttotal,
@@ -1287,30 +1318,34 @@ on("change:concentration", function() {
       });
   });
 });
-on("change:charisma", function() {
-  getAttrs(["charisma","species","diplomacy","haggle","leadership","oratory","persuasion","seduction"], function(values) {
+on("change:charismabase change:charismadrugs change:charismaebb", function() {
+  getAttrs(["charismabase","species","diplomacy","haggle","leadership","oratory","persuasion","seduction","charismadrugs","charismaebb"], function(values) {
      const speciesdetails = {
-        "Advanced Carrien":		{charisma: '0', charismamax: '3'},
-        "ADV": 					{charisma: '0', charismamax: '3'},
-        "Brain Waster": 		{charisma: '1', charismamax: '5'},
-        "Eban": 				{charisma: '1', charismamax: '5'},
-        "Ebon": 				{charisma: '1', charismamax: '5'},
-        "Frother": 				{charisma: '0', charismamax: '4'},
-        "Human": 				{charisma: '1', charismamax: '5'},
-        "Neophron": 			{charisma: '3', charismamax: '6'},
-		"Shaktar": 				{charisma: '1', charismamax: '3'},
-        "Stormer 313 'Malice'":	{charisma: '0', charismamax: '3'},
-        "Stormer 711 'Xeno'": 	{charisma: '0', charismamax: '2'},
-        "Wraithen": 			{charisma: '1', charismamax: '4'},
+        "Advanced Carrien":		{charismabase: '0', charismamax: '3'},
+        "ADV": 					{charismabase: '0', charismamax: '3'},
+        "Brain Waster": 		{charismabase: '1', charismamax: '5'},
+        "Eban": 				{charismabase: '1', charismamax: '5'},
+        "Ebon": 				{charismabase: '1', charismamax: '5'},
+        "Frother": 				{charismabase: '0', charismamax: '4'},
+        "Human": 				{charismabase: '1', charismamax: '5'},
+        "Neophron": 			{charismabase: '3', charismamax: '6'},
+		"Shaktar": 				{charismabase: '1', charismamax: '3'},
+        "Stormer 313 'Malice'":	{charismabase: '0', charismamax: '3'},
+        "Stormer 711 'Xeno'": 	{charismabase: '0', charismamax: '2'},
+        "Wraithen": 			{charismabase: '1', charismamax: '4'},
     };
-      var charisma = parseInt(values["charisma"])||0;
+      var charismabase = parseInt(values["charismabase"])||0;
+      var charismadrugs = parseInt(values["charismadrugs"])||0;
+      var charismaebb = parseInt(values["charismaebb"])||0;
 	  var species = values["species"]||"";
 
-      var charismamin = speciesdetails[species]["charisma"]||0;
-      var charismamax = speciesdetails[species]["charismamax"]||20;
+      var charismamin = parseInt(speciesdetails[species]["charismabase"])||0;
+      var charismamax = parseInt(speciesdetails[species]["charismamax"])||20;
 	  
-	  if (charisma > charismamax) { charisma = charismamax;}
-	  if (charisma < charismamin) { charisma = charismamin;}
+	  if (charismabase > charismamax) { charismabase = charismamax;}
+	  if (charismabase < charismamin) { charismabase = charismamin;}
+
+	  var charisma = charismabase + charismadrugs + charismaebb;
 
       var diplomacy = parseInt(values["diplomacy"])||0;
       var haggle = parseInt(values["haggle"])||0;
@@ -1326,6 +1361,7 @@ on("change:charisma", function() {
       var seductiontotal = seduction + charisma;
       setAttrs({ 
 		"charisma": charisma,
+		"charismabase": charismabase,
         "diplomacy_total": diplomacytotal,
         "haggle_total": haggletotal,
         "leadership_total": leadershiptotal,
@@ -1335,30 +1371,33 @@ on("change:charisma", function() {
       });
   });
 });
-on("change:cool", function() {
-  getAttrs(["cool","species","bribery","gambling","interrogate","intimidate","survival","torture"], function(values) {
+on("change:coolbase change:cooldrugs", function() {
+  getAttrs(["coolbase","species","bribery","gambling","interrogate","intimidate","survival","torture","cooldrugs"], function(values) {
      const speciesdetails = {
-        "Advanced Carrien":		{cool: '3', coolmax: '6'},
-        "ADV": 					{cool: '3', coolmax: '6'},
-        "Brain Waster": 		{cool: '1', coolmax: '5'},
-        "Eban": 				{cool: '1', coolmax: '5'},
-        "Ebon": 				{cool: '1', coolmax: '5'},
-        "Frother": 				{cool: '1', coolmax: '5'},
-        "Human": 				{cool: '1', coolmax: '5'},
-        "Neophron": 			{cool: '1', coolmax: '5'},
-		"Shaktar": 				{cool: '1', coolmax: '6'},
-        "Stormer 313 'Malice'":	{cool: '3', coolmax: '6'},
-        "Stormer 711 'Xeno'": 	{cool: '2', coolmax: '6'},
-        "Wraithen": 			{cool: '0', coolmax: '5'},
+        "Advanced Carrien":		{coolbase: '3', coolmax: '6'},
+        "ADV": 					{coolbase: '3', coolmax: '6'},
+        "Brain Waster": 		{coolbase: '1', coolmax: '5'},
+        "Eban": 				{coolbase: '1', coolmax: '5'},
+        "Ebon": 				{coolbase: '1', coolmax: '5'},
+        "Frother": 				{coolbase: '1', coolmax: '5'},
+        "Human": 				{coolbase: '1', coolmax: '5'},
+        "Neophron": 			{coolbase: '1', coolmax: '5'},
+		"Shaktar": 				{coolbase: '1', coolmax: '6'},
+        "Stormer 313 'Malice'":	{coolbase: '3', coolmax: '6'},
+        "Stormer 711 'Xeno'": 	{coolbase: '2', coolmax: '6'},
+        "Wraithen": 			{coolbase: '0', coolmax: '5'},
     };
-      var cool = parseInt(values["cool"])||0;
+      var coolbase = parseInt(values["coolbase"])||0;
+      var cooldrugs = parseInt(values["cooldrugs"])||0;
 	  var species = values["species"]||"";
 
-      var coolmin = speciesdetails[species]["cool"]||0;
-      var coolmax = speciesdetails[species]["coolmax"]||20;
+      var coolmin = parseInt(speciesdetails[species]["coolbase"])||0;
+      var coolmax = parseInt(speciesdetails[species]["coolmax"])||20;
 	  
-	  if (cool > coolmax) { cool = coolmax;}
-	  if (cool < coolmin) { cool = coolmin;}
+	  if (coolbase > coolmax) { coolbase = coolmax;}
+	  if (coolbase < coolmin) { coolbase = coolmin;}
+	  
+	  cool = coolbase + cooldrugs;
 
       var bribery = parseInt(values["bribery"])||0;
       var gambling = parseInt(values["gambling"])||0;
@@ -1374,6 +1413,7 @@ on("change:cool", function() {
       var torturetotal = torture + cool;
       setAttrs({ 
 		"cool": cool,
+		"coolbase": coolbase,
         "bribery_total": briberytotal,
         "gambling_total": gamblingtotal,
         "interrogate_total": interrogatetotal,
@@ -1402,8 +1442,8 @@ on("change:luck", function() {
       var luck = parseInt(values["luck"])||0;
 	  var species = values["species"]||"";
 
-      var luckmin = speciesdetails[species]["luck"]||0;
-      var luckmax = speciesdetails[species]["luckmax"]||20;
+      var luckmin = parseInt(speciesdetails[species]["luck"])||0;
+      var luckmax = parseInt(speciesdetails[species]["luckmax"])||20;
 	  
 	  if (luck > luckmax) { luck = luckmax;}
 	  if (luck < luckmin) { luck = luckmin;}
@@ -1414,6 +1454,114 @@ on("change:luck", function() {
   });
 });
 
+on("change:drugactive1 change:drugactive2 change:drugactive3 change:drugactive4 change:drugactive5 change:drugactive6", function() {
+  getAttrs(["drugactive1","drugactive2","drugactive3","drugactive4","drugactive5","drugactive6","druguse1","druguse2","druguse3","druguse4","druguse5","druguse6"], function(values) {
+     const drugdetails = {
+		"Blind side":	{strengthdrugs:'0', dexteritydrugs:'2', knowledgedrugs:'0', concentrationdrugs:'2', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"Charmer":		{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'1'},
+		"Flush":		{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"Honesty":		{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"Kick Starter":	{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"Mind Numb":	{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"Pain Away":	{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"Pineal Sim":	{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"Rush":			{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"Shatter":		{strengthdrugs:'2', dexteritydrugs:'1', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'3', initiativedrugs:'0'},
+		"Streak":		{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'2', concentrationdrugs:'2', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"Trapper":		{strengthdrugs:'1', dexteritydrugs:'1', knowledgedrugs:'1', concentrationdrugs:'1', charismadrugs:'1', cooldrugs:'1', initiativedrugs:'0'},
+		"Uplift":		{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+		"UV":			{strengthdrugs:'1', dexteritydrugs:'1', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'2', initiativedrugs:'0'},
+		"White Noise":	{strengthdrugs:'0', dexteritydrugs:'0', knowledgedrugs:'0', concentrationdrugs:'0', charismadrugs:'0', cooldrugs:'0', initiativedrugs:'0'},
+    };
+      var drugactive1 = values["drugactive1"]||"";
+      var drugactive2 = values["drugactive2"]||"";
+      var drugactive3 = values["drugactive3"]||"";
+      var drugactive4 = values["drugactive4"]||"";
+      var drugactive5 = values["drugactive5"]||"";
+      var drugactive6 = values["drugactive6"]||"";
+      var druguse1 = values["druguse1"]||"";
+      var druguse2 = values["druguse2"]||"";
+      var druguse3 = values["druguse3"]||"";
+      var druguse4 = values["druguse4"]||"";
+      var druguse5 = values["druguse5"]||"";
+      var druguse6 = values["druguse6"]||"";
+	  
+	  var strengthdrugs = 0;
+	  var dexteritydrugs = 0;
+	  var knowledgedrugs = 0;
+	  var concentrationdrugs = 0;
+	  var charismadrugs = 0;
+	  var cooldrugs = 0;
+	  var initiativedrugs = 0;
+	  
+	  if (drugactive1) {
+		strengthdrugs = strengthdrugs + drugsdetails[druguse1]["strengthdrugs"];
+		dexteritydrugs = dexteritydrugs + drugsdetails[druguse1]["dexteritydrugs"];
+		knowledgedrugs = konwledgedrugs + drugsdetails[druguse1]["knowledgedrugs"];
+		concentrationdrugs = concentrationdrugs + drugsdetails[druguse1]["concentrationdrugs"];
+		charismadrugs = charismadrugs + drugsdetails[druguse1]["charismadrugs"];
+		cooldrugs = cooldrugs + drugsdetails[druguse1]["cooldrugs"];
+		initiativedrugs = initiativedrugs + drugsdetails[druguse1]["initiativedrugs"];
+	  }; 
+/*	  if (drugactive2=="on") {
+		strengthdrugs = strengthdrugs + drugsdetails[druguse2]["strengthdrugs"];
+		dexteritydrugs = dexteritydrugs + drugsdetails[druguse2]["dexteritydrugs"];
+		knowledgedrugs = konwledgedrugs + drugsdetails[druguse2]["knowledgedrugs"];
+		concentrationdrugs = concentrationdrugs + drugsdetails[druguse2]["concentrationdrugs"];
+		charismadrugs = charismadrugs + drugsdetails[druguse2]["charismadrugs"];
+		cooldrugs = cooldrugs + drugsdetails[druguse2]["cooldrugs"];
+		initiativedrugs = initiativedrugs + drugsdetails[druguse2]["initiativedrugs"];
+	  }; 
+	  if (drugactive3=="on") {
+		strengthdrugs = strengthdrugs + drugsdetails[druguse3]["strengthdrugs"];
+		dexteritydrugs = dexteritydrugs + drugsdetails[druguse3]["dexteritydrugs"];
+		knowledgedrugs = konwledgedrugs + drugsdetails[druguse3]["knowledgedrugs"];
+		concentrationdrugs = concentrationdrugs + drugsdetails[druguse3]["concentrationdrugs"];
+		charismadrugs = charismadrugs + drugsdetails[druguse3]["charismadrugs"];
+		cooldrugs = cooldrugs + drugsdetails[druguse3]["cooldrugs"];
+		initiativedrugs = initiativedrugs + drugsdetails[druguse3]["initiativedrugs"];
+	  }; 
+	  if (drugactive4=="on") {
+		strengthdrugs = strengthdrugs + drugsdetails[druguse4]["strengthdrugs"];
+		dexteritydrugs = dexteritydrugs + drugsdetails[druguse4]["dexteritydrugs"];
+		knowledgedrugs = konwledgedrugs + drugsdetails[druguse4]["knowledgedrugs"];
+		concentrationdrugs = concentrationdrugs + drugsdetails[druguse4]["concentrationdrugs"];
+		charismadrugs = charismadrugs + drugsdetails[druguse4]["charismadrugs"];
+		cooldrugs = cooldrugs + drugsdetails[druguse4]["cooldrugs"];
+		initiativedrugs = initiativedrugs + drugsdetails[druguse4]["initiativedrugs"];
+	  }; 
+	  if (drugactive5=="on") {
+		strengthdrugs = strengthdrugs + drugsdetails[druguse5]["strengthdrugs"];
+		dexteritydrugs = dexteritydrugs + drugsdetails[druguse5]["dexteritydrugs"];
+		knowledgedrugs = konwledgedrugs + drugsdetails[druguse5]["knowledgedrugs"];
+		concentrationdrugs = concentrationdrugs + drugsdetails[druguse5]["concentrationdrugs"];
+		charismadrugs = charismadrugs + drugsdetails[druguse5]["charismadrugs"];
+		cooldrugs = cooldrugs + drugsdetails[druguse5]["cooldrugs"];
+		initiativedrugs = initiativedrugs + drugsdetails[druguse5]["initiativedrugs"];
+	  }; 
+	  if (drugactive6=="on") {
+		strengthdrugs = strengthdrugs + drugsdetails[druguse6]["strengthdrugs"];
+		dexteritydrugs = dexteritydrugs + drugsdetails[druguse6]["dexteritydrugs"];
+		knowledgedrugs = konwledgedrugs + drugsdetails[druguse6]["knowledgedrugs"];
+		concentrationdrugs = concentrationdrugs + drugsdetails[druguse6]["concentrationdrugs"];
+		charismadrugs = charismadrugs + drugsdetails[druguse6]["charismadrugs"];
+		cooldrugs = cooldrugs + drugsdetails[druguse6]["cooldrugs"];
+		initiativedrugs = initiativedrugs + drugsdetails[druguse6]["initiativedrugs"];
+	  }; 
+*/	  
+      setAttrs({
+	    "negtrait_1_notes": druguse1,
+	    "negtrait_2_notes": drugactive1,
+/*        "strengthdrugs": strengthdrugs,
+        "dexteritydrugs": dexteritydrugs,
+        "knowledgedrugs": knowledgedrugs,
+        "concentrationdrugs": concentrationdrugs,
+        "charismadrugs": charismadrugs,
+        "cooldrugs": cooldrugs,
+        "initiativedrugs": initiativedrugs,
+  */    });
+  });
+});
 on("change:acrobatics", function() {
   getAttrs(["acrobatics","dexterity"], function(values) {
       var acrobatics = parseInt(values["acrobatics"])||0;
@@ -1444,32 +1592,40 @@ on("change:appraisal", function() {
       });
   });
 });
-on("change:athletics", function() {
-  getAttrs(["athletics","dexterity","species","move_rushing"], function(values) {
+on("change:athletics change:move_rushing change:move_closing change:move_rushingarmour change:move_rushingebb change:move_closingarmour change:move_closingebb", function() {
+  getAttrs(["athletics","dexterity","species","move_rushing","move_rushingarmour","move_rushingebb","move_closing","move_closingarmour","move_closingebb"], function(values) {
      const speciesdetails = {
-        "Advanced Carrien":		{move_rushing:'7'},
-        "ADV": 					{move_rushing:'7'},
-        "Brain Waster": 		{move_rushing:'5'},
-        "Eban": 				{move_rushing:'5'},
-        "Ebon": 				{move_rushing:'5'},
-        "Frother": 				{move_rushing:'5'},
-        "Human": 				{move_rushing:'5'},
-        "Neophron": 			{move_rushing:'5'},
-		"Shaktar": 				{move_rushing:'6'},
-        "Stormer 313 'Malice'":	{move_rushing:'6'},
-        "Stormer 711 'Xeno'": 	{move_rushing:'6'},
-        "Wraithen": 			{move_rushing:'8'},
+        "Advanced Carrien":		{move_rushing:'7', move_closing:'4'},
+        "ADV": 					{move_rushing:'7', move_closing:'4'},
+        "Brain Waster": 		{move_rushing:'5', move_closing:'2'},
+        "Eban": 				{move_rushing:'5', move_closing:'2'},
+        "Ebon": 				{move_rushing:'5', move_closing:'2'},
+        "Frother": 				{move_rushing:'5', move_closing:'2'},
+        "Human": 				{move_rushing:'5', move_closing:'2'},
+        "Neophron": 			{move_rushing:'5', move_closing:'2'},
+		"Shaktar": 				{move_rushing:'6', move_closing:'3'},
+        "Stormer 313 'Malice'":	{move_rushing:'6', move_closing:'3'},
+        "Stormer 711 'Xeno'": 	{move_rushing:'6', move_closing:'4'},
+        "Wraithen": 			{move_rushing:'8', move_closing:'4'},
     };
 	  var species = values["species"]||"";
       var move_rushing = parseInt(values["move_rushing"])||0;
+      var move_rushingarmour = parseInt(values["move_rushingarmour"])||0;
+      var move_rushingebb = parseInt(values["move_rushingebb"])||0;
+      var move_closing = parseInt(values["move_closing"])||0;
+      var move_closingarmour = parseInt(values["move_closingarmour"])||0;
+      var move_closingebb = parseInt(values["move_closingebb"])||0;
       var sp_rushing = parseInt(speciesdetails[species]["move_rushing"])||move_rushing;
+      var sp_closing = parseInt(speciesdetails[species]["move_closing"])||move_closing;
       var athletics = parseInt(values["athletics"])||0;
       var dexterity = parseInt(values["dexterity"])||0;
-	  var rushingtotal = sp_rushing + Math.floor(athletics/2);
+	  var rushingtotal = sp_rushing + Math.floor(athletics/2) + move_rushingarmour + move_rushingebb;
+	  var closingtotal = sp_closing + move_closingarmour + move_closingebb;
       var athleticstotal = athletics + dexterity;
 	  setAttrs({
         "athletics_total": athleticstotal,
 		"move_rushing": rushingtotal,
+		"move_closing": closingtotal,
       });
   });
 });
@@ -2125,42 +2281,42 @@ on("change:thermal", function() {
 });
 on('change:armour_1', event => {
      const armourdetails = {
-		"AETHER ARMOUR":					{armour_pv_1:'5',	armour_resistance_1:'16',	armour_enc_1:'4'},
-		"BASTION":							{armour_pv_1:'6',	armour_resistance_1:'16',	armour_enc_1:'0'},
-		"BLITZKRIEG":						{armour_pv_1:'11',	armour_resistance_1:'30',	armour_enc_1:'0'},
-		"CAF PADQUIL":						{armour_pv_1:'2',	armour_resistance_1:'8',	armour_enc_1:'2'},
-		"DEATHSUIT-1":						{armour_pv_1:'5',	armour_resistance_1:'16',	armour_enc_1:'0'},
-		"DEATHSUIT-2":						{armour_pv_1:'8',	armour_resistance_1:'20',	armour_enc_1:'0'},
-		"DEATHSUIT-4":						{armour_pv_1:'10',	armour_resistance_1:'26',	armour_enc_1:'0'},
-		"DN COMMANDANT":					{armour_pv_1:'8',	armour_resistance_1:'20',	armour_enc_1:'0'},
-		"DN GUNNER":						{armour_pv_1:'6',	armour_resistance_1:'20',	armour_enc_1:'3'},
-		"DN SPECIALIST":					{armour_pv_1:'6',	armour_resistance_1:'16',	armour_enc_1:'0'},
-		"EBB TK SHIELD":					{armour_pv_1:'2',	armour_resistance_1:'10',	armour_enc_1:'0'},
-		"EBB TK ADVANCED SHIELD":			{armour_pv_1:'4',	armour_resistance_1:'16',	armour_enc_1:'0'},
-		"KRELL ABLATIVE":					{armour_pv_1:'7',	armour_resistance_1:'24',	armour_enc_1:'0'},
-		"MAL MODULAR":						{armour_pv_1:'7',	armour_resistance_1:'20',	armour_enc_1:'0'},
-		"MODIFIED ROBOCHIH MINING":			{armour_pv_1:'12',	armour_resistance_1:'60',	armour_enc_1:'0'},
-		"PP10 HARD":						{armour_pv_1:'6',	armour_resistance_1:'20',	armour_enc_1:'0'},
-		"PP13 EXO MK2":						{armour_pv_1:'7',	armour_resistance_1:'24',	armour_enc_1:'1'},
-		"PP55 SUPER HARD":					{armour_pv_1:'7',	armour_resistance_1:'26',	armour_enc_1:'0'},
-		"PP70 POWERCELL":					{armour_pv_1:'8',	armour_resistance_1:'24',	armour_enc_1:'0'},
-		"PP100 CRACKSHOT":					{armour_pv_1:'10',	armour_resistance_1:'26',	armour_enc_1:'0'},
-		"PP104 DOGEYBONE":					{armour_pv_1:'12',	armour_resistance_1:'36',	armour_enc_1:'2'},
-		"PP112D SILVERBACK":				{armour_pv_1:'6',	armour_resistance_1:'18',	armour_enc_1:'0'},
-		"PP664.2 BODY BLOCKER":				{armour_pv_1:'4',	armour_resistance_1:'12',	armour_enc_1:'2'},
-		"PP664.2.PP8 BODY BLOCKER":			{armour_pv_1:'5',	armour_resistance_1:'14',	armour_enc_1:'3'},
-		"PP949 BREACHER SHIELD":			{armour_pv_1:'2',	armour_resistance_1:'12',	armour_enc_1:'4'},
-		"SCRAP ARMOUR-1":					{armour_pv_1:'1',	armour_resistance_1:'8',	armour_enc_1:'0'},
-		"SCRAP ARMOUR-2":					{armour_pv_1:'2',	armour_resistance_1:'7',	armour_enc_1:'1'},
-		"SCRAP ARMOUR-3":					{armour_pv_1:'3',	armour_resistance_1:'14',	armour_enc_1:'1'},
-		"SCRAP ARMOUR-4":					{armour_pv_1:'4',	armour_resistance_1:'10',	armour_enc_1:'2'},
-		"SCRAP ARMOUR-6":					{armour_pv_1:'6',	armour_resistance_1:'24',	armour_enc_1:'3'},
-		"SINNER MK.III BATTLE SUIT":		{armour_pv_1:'14',	armour_resistance_1:'40',	armour_enc_1:'2'},
-		"STRIKER MOTORCYCLE PROTECTION":	{armour_pv_1:'1',	armour_resistance_1:'6',	armour_enc_1:'1'},
-		"THREASER ENDEAVER TH.0001":		{armour_pv_1:'6',	armour_resistance_1:'22',	armour_enc_1:'0'},
-		"THREASER SARGE TH.0005":			{armour_pv_1:'16',	armour_resistance_1:'50',	armour_enc_1:'2'},
-		"WIDOWKISS BATTLESUIT":				{armour_pv_1:'14',	armour_resistance_1:'100',	armour_enc_1:'0'},
-		"XENOS SKIN":						{armour_pv_1:'5',	armour_resistance_1:'999',	armour_enc_1:'0'},
+		"AETHER ARMOUR":					{armour_pv_1:'5',	armour_resistance_1:'16',	armour_enc_1:'4', dexterityarmour: '-1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"BASTION":							{armour_pv_1:'6',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"BLITZKRIEG":						{armour_pv_1:'11',	armour_resistance_1:'30',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"CAF PADQUIL":						{armour_pv_1:'2',	armour_resistance_1:'8',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DEATHSUIT-1":						{armour_pv_1:'5',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DEATHSUIT-2":						{armour_pv_1:'8',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DEATHSUIT-4":						{armour_pv_1:'10',	armour_resistance_1:'26',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DN COMMANDANT":					{armour_pv_1:'8',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DN GUNNER":						{armour_pv_1:'6',	armour_resistance_1:'20',	armour_enc_1:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DN SPECIALIST":					{armour_pv_1:'6',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"EBB TK SHIELD":					{armour_pv_1:'2',	armour_resistance_1:'10',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"EBB TK ADVANCED SHIELD":			{armour_pv_1:'4',	armour_resistance_1:'16',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"KRELL ABLATIVE":					{armour_pv_1:'7',	armour_resistance_1:'24',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"MAL MODULAR":						{armour_pv_1:'7',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"MODIFIED ROBOCHIH MINING":			{armour_pv_1:'12',	armour_resistance_1:'60',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP10 HARD":						{armour_pv_1:'6',	armour_resistance_1:'20',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP13 EXO MK2":						{armour_pv_1:'7',	armour_resistance_1:'24',	armour_enc_1:'1', dexterityarmour: '-1', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP55 SUPER HARD":					{armour_pv_1:'7',	armour_resistance_1:'26',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP70 POWERCELL":					{armour_pv_1:'8',	armour_resistance_1:'24',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP100 CRACKSHOT":					{armour_pv_1:'10',	armour_resistance_1:'26',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP104 DOGEYBONE":					{armour_pv_1:'12',	armour_resistance_1:'36',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '2', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP112D SILVERBACK":				{armour_pv_1:'6',	armour_resistance_1:'18',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '0', initiativearmour: '0'},
+		"PP664.2 BODY BLOCKER":				{armour_pv_1:'4',	armour_resistance_1:'12',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP664.2.PP8 BODY BLOCKER":			{armour_pv_1:'5',	armour_resistance_1:'14',	armour_enc_1:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP949 BREACHER SHIELD":			{armour_pv_1:'2',	armour_resistance_1:'12',	armour_enc_1:'4', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-1":					{armour_pv_1:'1',	armour_resistance_1:'8',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-2":					{armour_pv_1:'2',	armour_resistance_1:'7',	armour_enc_1:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-3":					{armour_pv_1:'3',	armour_resistance_1:'14',	armour_enc_1:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-4":					{armour_pv_1:'4',	armour_resistance_1:'10',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-6":					{armour_pv_1:'6',	armour_resistance_1:'24',	armour_enc_1:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SINNER MK.III BATTLE SUIT":		{armour_pv_1:'14',	armour_resistance_1:'40',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '0'},
+		"STRIKER MOTORCYCLE PROTECTION":	{armour_pv_1:'1',	armour_resistance_1:'6',	armour_enc_1:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"THREASER ENDEAVER TH.0001":		{armour_pv_1:'6',	armour_resistance_1:'22',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '2'},
+		"THREASER SARGE TH.0005":			{armour_pv_1:'16',	armour_resistance_1:'50',	armour_enc_1:'2', dexterityarmour: '0', strengtharmour: '4', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '4'},
+		"WIDOWKISS BATTLESUIT":				{armour_pv_1:'14',	armour_resistance_1:'100',	armour_enc_1:'0', dexterityarmour: '2', strengtharmour: '3', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"XENOS SKIN":						{armour_pv_1:'5',	armour_resistance_1:'999',	armour_enc_1:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
 	}
     getAttrs(['armour_1'], values => {
         let name = values.armour_1;
@@ -2170,42 +2326,42 @@ on('change:armour_1', event => {
 });
 on('change:armour_2', event => {
      const armourdetails = {
-		"AETHER ARMOUR":					{armour_pv_2:'5',	armour_resistance_2:'16',	armour_enc_2:'4'},
-		"BASTION":							{armour_pv_2:'6',	armour_resistance_2:'16',	armour_enc_2:'0'},
-		"BLITZKRIEG":						{armour_pv_2:'11',	armour_resistance_2:'30',	armour_enc_2:'0'},
-		"CAF PADQUIL":						{armour_pv_2:'2',	armour_resistance_2:'8',	armour_enc_2:'2'},
-		"DEATHSUIT-1":						{armour_pv_2:'5',	armour_resistance_2:'16',	armour_enc_2:'0'},
-		"DEATHSUIT-2":						{armour_pv_2:'8',	armour_resistance_2:'20',	armour_enc_2:'0'},
-		"DEATHSUIT-4":						{armour_pv_2:'10',	armour_resistance_2:'26',	armour_enc_2:'0'},
-		"DN COMMANDANT":					{armour_pv_2:'8',	armour_resistance_2:'20',	armour_enc_2:'0'},
-		"DN GUNNER":						{armour_pv_2:'6',	armour_resistance_2:'20',	armour_enc_2:'3'},
-		"DN SPECIALIST":					{armour_pv_2:'6',	armour_resistance_2:'16',	armour_enc_2:'0'},
-		"EBB TK SHIELD":					{armour_pv_2:'2',	armour_resistance_2:'10',	armour_enc_2:'0'},
-		"EBB TK ADVANCED SHIELD":			{armour_pv_2:'4',	armour_resistance_2:'16',	armour_enc_2:'0'},
-		"KRELL ABLATIVE":					{armour_pv_2:'7',	armour_resistance_2:'24',	armour_enc_2:'0'},
-		"MAL MODULAR":						{armour_pv_2:'7',	armour_resistance_2:'20',	armour_enc_2:'0'},
-		"MODIFIED ROBOCHIH MINING":			{armour_pv_2:'12',	armour_resistance_2:'60',	armour_enc_2:'0'},
-		"PP10 HARD":						{armour_pv_2:'6',	armour_resistance_2:'20',	armour_enc_2:'0'},
-		"PP13 EXO MK2":						{armour_pv_2:'7',	armour_resistance_2:'24',	armour_enc_2:'1'},
-		"PP55 SUPER HARD":					{armour_pv_2:'7',	armour_resistance_2:'26',	armour_enc_2:'0'},
-		"PP70 POWERCELL":					{armour_pv_2:'8',	armour_resistance_2:'24',	armour_enc_2:'0'},
-		"PP100 CRACKSHOT":					{armour_pv_2:'10',	armour_resistance_2:'26',	armour_enc_2:'0'},
-		"PP104 DOGEYBONE":					{armour_pv_2:'12',	armour_resistance_2:'36',	armour_enc_2:'2'},
-		"PP112D SILVERBACK":				{armour_pv_2:'6',	armour_resistance_2:'18',	armour_enc_2:'0'},
-		"PP664.2 BODY BLOCKER":				{armour_pv_2:'4',	armour_resistance_2:'12',	armour_enc_2:'2'},
-		"PP664.2.PP8 BODY BLOCKER":			{armour_pv_2:'5',	armour_resistance_2:'14',	armour_enc_2:'3'},
-		"PP949 BREACHER SHIELD":			{armour_pv_2:'2',	armour_resistance_2:'12',	armour_enc_2:'4'},
-		"SCRAP ARMOUR-1":					{armour_pv_2:'1',	armour_resistance_2:'8',	armour_enc_2:'0'},
-		"SCRAP ARMOUR-2":					{armour_pv_2:'2',	armour_resistance_2:'7',	armour_enc_2:'1'},
-		"SCRAP ARMOUR-3":					{armour_pv_2:'3',	armour_resistance_2:'14',	armour_enc_2:'1'},
-		"SCRAP ARMOUR-4":					{armour_pv_2:'4',	armour_resistance_2:'10',	armour_enc_2:'2'},
-		"SCRAP ARMOUR-6":					{armour_pv_2:'6',	armour_resistance_2:'24',	armour_enc_2:'3'},
-		"SINNER MK.III BATTLE SUIT":		{armour_pv_2:'14',	armour_resistance_2:'40',	armour_enc_2:'2'},
-		"STRIKER MOTORCYCLE PROTECTION":	{armour_pv_2:'1',	armour_resistance_2:'6',	armour_enc_2:'1'},
-		"THREASER ENDEAVER TH.0001":		{armour_pv_2:'6',	armour_resistance_2:'22',	armour_enc_2:'0'},
-		"THREASER SARGE TH.0005":			{armour_pv_2:'16',	armour_resistance_2:'50',	armour_enc_2:'2'},
-		"WIDOWKISS BATTLESUIT":				{armour_pv_2:'14',	armour_resistance_2:'100',	armour_enc_2:'0'},
-		"XENOS SKIN":						{armour_pv_2:'5',	armour_resistance_2:'999',	armour_enc_2:'0'},
+		"AETHER ARMOUR":					{armour_pv_2:'5',	armour_resistance_2:'16',	armour_enc_2:'4', dexterityarmour: '-1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"BASTION":							{armour_pv_2:'6',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"BLITZKRIEG":						{armour_pv_2:'11',	armour_resistance_2:'30',	armour_enc_2:'0', dexterityarmour: '1', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"CAF PADQUIL":						{armour_pv_2:'2',	armour_resistance_2:'8',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DEATHSUIT-1":						{armour_pv_2:'5',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DEATHSUIT-2":						{armour_pv_2:'8',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DEATHSUIT-4":						{armour_pv_2:'10',	armour_resistance_2:'26',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DN COMMANDANT":					{armour_pv_2:'8',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DN GUNNER":						{armour_pv_2:'6',	armour_resistance_2:'20',	armour_enc_2:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"DN SPECIALIST":					{armour_pv_2:'6',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"EBB TK SHIELD":					{armour_pv_2:'2',	armour_resistance_2:'10',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"EBB TK ADVANCED SHIELD":			{armour_pv_2:'4',	armour_resistance_2:'16',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"KRELL ABLATIVE":					{armour_pv_2:'7',	armour_resistance_2:'24',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"MAL MODULAR":						{armour_pv_2:'7',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"MODIFIED ROBOCHIH MINING":			{armour_pv_2:'12',	armour_resistance_2:'60',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP10 HARD":						{armour_pv_2:'6',	armour_resistance_2:'20',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP13 EXO MK2":						{armour_pv_2:'7',	armour_resistance_2:'24',	armour_enc_2:'1', dexterityarmour: '-1', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP55 SUPER HARD":					{armour_pv_2:'7',	armour_resistance_2:'26',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP70 POWERCELL":					{armour_pv_2:'8',	armour_resistance_2:'24',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP100 CRACKSHOT":					{armour_pv_2:'10',	armour_resistance_2:'26',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP104 DOGEYBONE":					{armour_pv_2:'12',	armour_resistance_2:'36',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '2', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP112D SILVERBACK":				{armour_pv_2:'6',	armour_resistance_2:'18',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '0', initiativearmour: '0'},
+		"PP664.2 BODY BLOCKER":				{armour_pv_2:'4',	armour_resistance_2:'12',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP664.2.PP8 BODY BLOCKER":			{armour_pv_2:'5',	armour_resistance_2:'14',	armour_enc_2:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"PP949 BREACHER SHIELD":			{armour_pv_2:'2',	armour_resistance_2:'12',	armour_enc_2:'4', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-1":					{armour_pv_2:'1',	armour_resistance_2:'8',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-2":					{armour_pv_2:'2',	armour_resistance_2:'7',	armour_enc_2:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-3":					{armour_pv_2:'3',	armour_resistance_2:'14',	armour_enc_2:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-4":					{armour_pv_2:'4',	armour_resistance_2:'10',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SCRAP ARMOUR-6":					{armour_pv_2:'6',	armour_resistance_2:'24',	armour_enc_2:'3', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"SINNER MK.III BATTLE SUIT":		{armour_pv_2:'14',	armour_resistance_2:'40',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '0'},
+		"STRIKER MOTORCYCLE PROTECTION":	{armour_pv_2:'1',	armour_resistance_2:'6',	armour_enc_2:'1', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"THREASER ENDEAVER TH.0001":		{armour_pv_2:'6',	armour_resistance_2:'22',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '1', move_rushing_armour: '1', move_closing_armour: '1', initiativearmour: '2'},
+		"THREASER SARGE TH.0005":			{armour_pv_2:'16',	armour_resistance_2:'50',	armour_enc_2:'2', dexterityarmour: '0', strengtharmour: '4', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '4'},
+		"WIDOWKISS BATTLESUIT":				{armour_pv_2:'14',	armour_resistance_2:'100',	armour_enc_2:'0', dexterityarmour: '2', strengtharmour: '3', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
+		"XENOS SKIN":						{armour_pv_2:'5',	armour_resistance_2:'999',	armour_enc_2:'0', dexterityarmour: '0', strengtharmour: '0', move_rushing_armour: '0', move_closing_armour: '0', initiativearmour: '0'},
 	}
     getAttrs(['armour_2'], values => {
         let name = values.armour_2;
@@ -2214,12 +2370,16 @@ on('change:armour_2', event => {
     });
 });
 on("change:armour_pv_1 change:armour_pv_2", function() {
-  getAttrs(["armour_pv_1","armour_pv_2"], function(values) {
+  getAttrs(["armour_pv_1","armour_pv_2","armour_1","armour_2"], function(values) {
       var armourpv1 = parseInt(values["armour_pv_1"])||0;
       var armourpv2 = parseInt(values["armour_pv_2"])||0;
+	  var armour1 = values["armour_1"];
+	  var armour2 = values["armour_2"];
       var armourpvtotal = armourpv1 + armourpv2;
+	  var armour = armour1 + " " + armour2;
       setAttrs({
         "armour_pv_total": armourpvtotal,
+		"armour": armour,
       });
   });
 });
diff --git a/SLA Industries 2ed/sla.png b/SLA Industries 2ed/sla.png
index 03aabe3b50..cfe25f3128 100644
Binary files a/SLA Industries 2ed/sla.png and b/SLA Industries 2ed/sla.png differ
diff --git a/SLA Industries 2ed/slalogo.png b/SLA Industries 2ed/slalogo.png
new file mode 100644
index 0000000000..03aabe3b50
Binary files /dev/null and b/SLA Industries 2ed/slalogo.png differ