diff --git a/Deathwatch - Codex.cat b/Deathwatch - Codex.cat
index 9e86233e..ec53c10b 100644
--- a/Deathwatch - Codex.cat	
+++ b/Deathwatch - Codex.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ee8b-68c8-02226-2d18" revision="16" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="0" battleScribeVersion="1.15" name="Deathwatch: Codex (2016)" books="Codex: Adeptus Astartes Deathwatch" authorName="https://gitter.im/BSData/wh40k" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="ee8b-68c8-02226-2d18" revision="17" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="0" battleScribeVersion="1.15" name="Deathwatch: Codex (2016)" books="Codex: Adeptus Astartes Deathwatch" authorName="https://gitter.im/BSData/wh40k" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <entries>
     <entry id="2108-98ca-43db-5082" name="Cerastus Knight-Acheron" points="415.0" categoryId="c888f08a-6cea-4a01-8126-d374a9231554" type="model" minSelections="0" maxSelections="-1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
       <entries>
@@ -3805,7 +3805,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
             </link>
           </links>
         </entry>
-        <entry id="677d-e2ce-e248-3cea" name="Master Crafted Power Fist with Auxilliary Meltagun" points="10.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+        <entry id="677d-e2ce-e248-3cea" name="Master Crafted Power Fist with Auxilliary Meltagun" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries/>
           <entryGroups/>
           <modifiers/>
@@ -3887,24 +3887,16 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
             </link>
           </links>
         </entry>
-      </entries>
-      <entryGroups>
-        <entryGroup id="8b13-c5a5-792b-f592" name="Psyker" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
-          <entries>
-            <entry id="b558-e8d4-a077-f4cf" name="Mastery Level 2" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
-              <entries/>
-              <entryGroups/>
-              <modifiers/>
-              <rules/>
-              <profiles/>
-              <links/>
-            </entry>
-          </entries>
+        <entry id="b558-e8d4-a077-f4cf" name="Psyker (Mastery Level 2)" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+          <entries/>
           <entryGroups/>
           <modifiers/>
+          <rules/>
+          <profiles/>
           <links/>
-        </entryGroup>
-      </entryGroups>
+        </entry>
+      </entries>
+      <entryGroups/>
       <modifiers/>
       <rules>
         <rule id="fbdb-564c-570d-1fdd" name="Jensus Natorian generates his powers from Biomancy" hidden="false">
@@ -3931,11 +3923,14 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
         <link id="30e4-61fe-b021-ee36" targetId="a7b704ae-416e-da95-9cf7-478a7e46bfe0" linkType="profile">
           <modifiers/>
         </link>
+        <link id="3f60-a18f-824f-7778" targetId="2c4c-d0a5-4d0b-217c" linkType="profile">
+          <modifiers/>
+        </link>
       </links>
     </entry>
     <entry id="eaf9-2341-5dd5-109f" name="Jetek Suberei" points="40.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
       <entries>
-        <entry id="93e8-374a-c599-6464" name="Deathwatch Teleport Homer" points="10.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+        <entry id="93e8-374a-c599-6464" name="Deathwatch Teleport Homer" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries/>
           <entryGroups/>
           <modifiers/>
@@ -4027,14 +4022,13 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
         </link>
       </links>
     </entry>
-    <entry id="9348-7fc8-a934-281b" name="Kill Team Cassius" points="555.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
-      <entries>
-        <entry id="b8f0-7d77-92e7-b8ba" name="Antor Delassio" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="0" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+    <entry id="9348-7fc8-a934-281b" name="Kill Team Cassius" points="535.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+      <entries/>
+      <entryGroups>
+        <entryGroup id="b8f0-7d77-92e7-b8ba" name="Antor Delassio" defaultEntryId="f299-cd2b-4644-a710" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries/>
           <entryGroups/>
           <modifiers/>
-          <rules/>
-          <profiles/>
           <links>
             <link id="f299-cd2b-4644-a710" targetId="23a6-b20c-e327-6a84" linkType="entry">
               <modifiers>
@@ -4042,24 +4036,14 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                   <conditions/>
                   <conditionGroups/>
                 </modifier>
-                <modifier type="increment" field="minSelections" value="1.0" repeat="false" numRepeats="1" incrementParentId="roster" incrementChildId="no child" incrementField="selections" incrementValue="1.0">
-                  <conditions/>
-                  <conditionGroups/>
-                </modifier>
-                <modifier type="set" field="points" value="0.0" repeat="false" numRepeats="1" incrementParentId="roster" incrementChildId="no child" incrementField="selections" incrementValue="1.0">
-                  <conditions/>
-                  <conditionGroups/>
-                </modifier>
               </modifiers>
             </link>
           </links>
-        </entry>
-        <entry id="63d0-040b-0105-b9b1" name="Edryc Setorax" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+        </entryGroup>
+        <entryGroup id="63d0-040b-0105-b9b1" name="Edryc Setorax" defaultEntryId="8c0e-18d9-b8d8-7be8" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries/>
           <entryGroups/>
           <modifiers/>
-          <rules/>
-          <profiles/>
           <links>
             <link id="8c0e-18d9-b8d8-7be8" targetId="8f6a-3934-4ece-e670" linkType="entry">
               <modifiers>
@@ -4067,20 +4051,14 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                   <conditions/>
                   <conditionGroups/>
                 </modifier>
-                <modifier type="set" field="points" value="0.0" repeat="false" numRepeats="1" incrementParentId="roster" incrementChildId="no child" incrementField="selections" incrementValue="1.0">
-                  <conditions/>
-                  <conditionGroups/>
-                </modifier>
               </modifiers>
             </link>
           </links>
-        </entry>
-        <entry id="4e8c-7a84-8218-3f18" name="Garran Branatar" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+        </entryGroup>
+        <entryGroup id="4e8c-7a84-8218-3f18" name="Garran Branatar" defaultEntryId="aa4c-7665-fdbd-7fff" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries/>
           <entryGroups/>
           <modifiers/>
-          <rules/>
-          <profiles/>
           <links>
             <link id="aa4c-7665-fdbd-7fff" targetId="edd8-8c6f-486b-eb7f" linkType="entry">
               <modifiers>
@@ -4088,20 +4066,14 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                   <conditions/>
                   <conditionGroups/>
                 </modifier>
-                <modifier type="set" field="points" value="0.0" repeat="false" numRepeats="1" incrementParentId="roster" incrementChildId="no child" incrementField="selections" incrementValue="1.0">
-                  <conditions/>
-                  <conditionGroups/>
-                </modifier>
               </modifiers>
             </link>
           </links>
-        </entry>
-        <entry id="e0e3-f2b9-8785-a0c4" name="Jensus Natorian" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+        </entryGroup>
+        <entryGroup id="e0e3-f2b9-8785-a0c4" name="Jensus Natorian" defaultEntryId="9036-954e-c8db-4e45" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries/>
           <entryGroups/>
           <modifiers/>
-          <rules/>
-          <profiles/>
           <links>
             <link id="9036-954e-c8db-4e45" targetId="8d11-1263-3e29-bfc5" linkType="entry">
               <modifiers>
@@ -4109,20 +4081,14 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                   <conditions/>
                   <conditionGroups/>
                 </modifier>
-                <modifier type="set" field="points" value="0.0" repeat="false" numRepeats="1" incrementParentId="roster" incrementChildId="no child" incrementField="selections" incrementValue="1.0">
-                  <conditions/>
-                  <conditionGroups/>
-                </modifier>
               </modifiers>
             </link>
           </links>
-        </entry>
-        <entry id="5dc1-6ef1-f997-120e" name="Jetek Suberei" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+        </entryGroup>
+        <entryGroup id="5dc1-6ef1-f997-120e" name="Jetek Suberei" defaultEntryId="bfa1-b7a3-b1b8-7750" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries/>
           <entryGroups/>
           <modifiers/>
-          <rules/>
-          <profiles/>
           <links>
             <link id="bfa1-b7a3-b1b8-7750" targetId="eaf9-2341-5dd5-109f" linkType="entry">
               <modifiers>
@@ -4130,20 +4096,14 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                   <conditions/>
                   <conditionGroups/>
                 </modifier>
-                <modifier type="set" field="points" value="0.0" repeat="false" numRepeats="1" incrementParentId="roster" incrementChildId="no child" incrementField="selections" incrementValue="1.0">
-                  <conditions/>
-                  <conditionGroups/>
-                </modifier>
               </modifiers>
             </link>
           </links>
-        </entry>
-        <entry id="91ba-f631-21e1-8b4a" name="Ortan Cassius" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+        </entryGroup>
+        <entryGroup id="91ba-f631-21e1-8b4a" name="Ortan Cassius" defaultEntryId="b166-4350-2b0b-060a" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries/>
           <entryGroups/>
           <modifiers/>
-          <rules/>
-          <profiles/>
           <links>
             <link id="b166-4350-2b0b-060a" targetId="885f-af07-675f-8284" linkType="entry">
               <modifiers>
@@ -4151,20 +4111,14 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                   <conditions/>
                   <conditionGroups/>
                 </modifier>
-                <modifier type="set" field="points" value="0.0" repeat="false" numRepeats="1" incrementParentId="roster" incrementChildId="no child" incrementField="selections" incrementValue="1.0">
-                  <conditions/>
-                  <conditionGroups/>
-                </modifier>
               </modifiers>
             </link>
           </links>
-        </entry>
-        <entry id="1923-e5d5-abc8-da79" name="Squad Donatus" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+        </entryGroup>
+        <entryGroup id="1923-e5d5-abc8-da79" name="Squad Donatus" defaultEntryId="853d-be83-71a8-79c1" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
           <entries/>
           <entryGroups/>
           <modifiers/>
-          <rules/>
-          <profiles/>
           <links>
             <link id="853d-be83-71a8-79c1" targetId="408c-4283-15a9-90d3" linkType="entry">
               <modifiers>
@@ -4172,16 +4126,11 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                   <conditions/>
                   <conditionGroups/>
                 </modifier>
-                <modifier type="set" field="points" value="0.0" repeat="false" numRepeats="1" incrementParentId="roster" incrementChildId="no child" incrementField="selections" incrementValue="1.0">
-                  <conditions/>
-                  <conditionGroups/>
-                </modifier>
               </modifiers>
             </link>
           </links>
-        </entry>
-      </entries>
-      <entryGroups/>
+        </entryGroup>
+      </entryGroups>
       <modifiers/>
       <rules/>
       <profiles/>
@@ -5044,6 +4993,9 @@ This is NOT validated through BattleScribe.</description>
         <link id="fdb9-d67a-3e1a-ce75" targetId="c2d0b982-279f-0044-87cb-c119dd53f0ca" linkType="rule">
           <modifiers/>
         </link>
+        <link id="2814-a3ce-9f17-3fd1" targetId="8fa7-448b-c11a-3010" linkType="profile">
+          <modifiers/>
+        </link>
       </links>
     </entry>
     <entry id="1d98-1368-694e-171e" name="Purgatus Kill Team" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="-1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
@@ -14364,6 +14316,21 @@ In addition, units containing one or more models with the Zealot special rule re
       </characteristics>
       <modifiers/>
     </profile>
+    <profile id="2c4c-d0a5-4d0b-217c" profileTypeId="2d6001b0-980e-46d2-bcc2-a9fc60109afd" name="Jensus Natorian" hidden="false">
+      <characteristics>
+        <characteristic characteristicId="c2b4b061-a0fd-499d-8a3d-6ee52587cbd5" name="Unit Type" value="Infantry (Character)"/>
+        <characteristic characteristicId="5ee4ff0b-b244-4670-9d05-91d10f80c32e" name="WS" value="5"/>
+        <characteristic characteristicId="f6f92f00-8bb1-4afa-8ccb-46310b7dd5e5" name="BS" value="4"/>
+        <characteristic characteristicId="da036dbb-32c2-430a-9dd5-aa74e0c4f74b" name="S" value="4"/>
+        <characteristic characteristicId="3f9ed75c-36cd-4169-9cef-48391bb55cfd" name="T" value="4"/>
+        <characteristic characteristicId="17ee558f-3014-4bd2-afc1-b474d8d2b7a8" name="W" value="2"/>
+        <characteristic characteristicId="a558b3ef-04d0-440e-a312-bac3255bf592" name="I" value="4"/>
+        <characteristic characteristicId="5dff3e7c-e024-4030-a71d-03195ec06ea7" name="A" value="2"/>
+        <characteristic characteristicId="4a42059d-12cd-4c1f-a4c7-bb569d13eeea" name="Ld" value="10"/>
+        <characteristic characteristicId="b215fe72-dbce-4ad6-89ec-c4bb3962c39d" name="Save" value="3+"/>
+      </characteristics>
+      <modifiers/>
+    </profile>
     <profile id="dcc3-afff-5fd4-2f51" profileTypeId="2d6001b0-980e-46d2-bcc2-a9fc60109afd" name="Jetek Suberei" hidden="false">
       <characteristics>
         <characteristic characteristicId="c2b4b061-a0fd-499d-8a3d-6ee52587cbd5" name="Unit Type" value="Bike (Character)"/>