diff --git a/Beastmen.cat b/Beastmen.cat
index b75a377..4334bb8 100644
--- a/Beastmen.cat
+++ b/Beastmen.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="4d5f-a723-f233-6849" name="Beastmen" revision="13" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="4d5f-a723-f233-6849" name="Beastmen" revision="14" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="3c04-36bf-f9ef-7deb" name="Gift of Chaos">
@@ -6787,7 +6787,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
             <profile id="9127-06f6-5fda-48ab" name="Centigor" publicationId="9e23-79cb-pubN71963" page="78" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
               <characteristics>
                 <characteristic name="M" typeId="09ad-18df-607b-1215">8</characteristic>
-                <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</characteristic>
                 <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
                 <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
                 <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
@@ -6917,7 +6917,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
                 <profile id="27d0-2109-bc45-4009" name="Gorehoof" publicationId="9e23-79cb-pubN71963" page="78" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
                   <characteristics>
                     <characteristic name="M" typeId="09ad-18df-607b-1215">8</characteristic>
-                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</characteristic>
                     <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
                     <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
                     <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
diff --git a/Dark_Elves.cat b/Dark_Elves.cat
index 07ba9f6..b985e00 100644
--- a/Dark_Elves.cat
+++ b/Dark_Elves.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="1194-2922-b8ab-2f1d" name="Dark Elves" revision="15" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="1194-2922-b8ab-2f1d" name="Dark Elves" revision="16" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="4d67-b1d7-6891-ce0e" name="Gift of Khaine">
@@ -2109,7 +2109,6 @@
         <infoLink id="498d-f309-ee74-7322" name="Murderous Prowess" hidden="false" targetId="1451-9754-507c-44a8" type="rule"/>
         <infoLink id="ab0b-2085-8e26-69f7" name="Immunity (Psychology)" hidden="false" targetId="b143-056c-658e-ba26" type="rule"/>
         <infoLink id="8169-6727-09f6-6452" name="Stubborn" hidden="false" targetId="d56e-8ec7-dbcd-aeee" type="rule"/>
-        <infoLink id="77da-c5df-139a-3354" name="Warrior Elite" hidden="false" targetId="ca3d-9dfd-3a3c-ac4d" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="efc7-0374-75e5-d833" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
@@ -6119,7 +6118,6 @@ For each unsaved Wound caused by Disciple in close combat, he gains +1 to cast i
             <infoLink id="454d-808b-71dc-9cbe" name="Murderous Prowess" hidden="false" targetId="1451-9754-507c-44a8" type="rule"/>
             <infoLink id="dfa9-76d7-f854-66f9" name="Stubborn" hidden="false" targetId="d56e-8ec7-dbcd-aeee" type="rule"/>
             <infoLink id="e581-b9e7-572a-11a2" name="Immunity (Psychology)" hidden="false" targetId="b143-056c-658e-ba26" type="rule"/>
-            <infoLink id="681e-4c1f-78ee-e7dd" name="Warrior Elite" hidden="false" targetId="ca3d-9dfd-3a3c-ac4d" type="rule"/>
             <infoLink id="0c56-6175-d900-2b4e" name="Black Guard" hidden="false" targetId="daf4-33dc-1f18-cdc9" type="profile"/>
           </infoLinks>
           <selectionEntries>
@@ -8221,9 +8219,6 @@ following Close Combat phase.</characteristic>
     <rule id="268e-aa7e-22af-efff" name="Show no Weakness" publicationId="9e23-79cb-pubN76150" page="124" hidden="false">
       <description>A Fleetmaster must always accept challenges. While fighting challenges, the Fleetmaster may re-roll all failed rolls To Hit, and each unsaved Wound counts as two Wounds when calculating combat resolution.</description>
     </rule>
-    <rule id="ca3d-9dfd-3a3c-ac4d" name="Warrior Elite" publicationId="9e23-79cb-pubN76150" page="126" hidden="false">
-      <description>Models with this special rule may re-roll any failed roll To Hit in combat.</description>
-    </rule>
     <rule id="bf42-eb1e-28b6-1864" name="Bloodshield of Khaine" publicationId="9e23-79cb-pubN76150" page="138" hidden="false">
       <description>The Cauldron of Blood has a Ward save (4+), and models in the same unit have a Ward save (6+).</description>
     </rule>
diff --git a/Dwarfs.cat b/Dwarfs.cat
index ad40645..1d0f224 100644
--- a/Dwarfs.cat
+++ b/Dwarfs.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="b378-d254-8745-ba60" name="Dwarfs" revision="13" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b378-d254-8745-ba60" name="Dwarfs" revision="14" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="2bfd-fe7d-294c-9853" name="Rules of the Runes Table">
@@ -1477,7 +1477,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
                 <infoLink id="2e44-207f-0c20-fd3a" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="50.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
diff --git a/Kislev.cat b/Kislev.cat
index 1d0abd8..dd8fc29 100644
--- a/Kislev.cat
+++ b/Kislev.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="443d-406a-91b3-9788" name="Kislev" revision="12" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="443d-406a-91b3-9788" name="Kislev" revision="13" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="9fbd-5eb3-4c58-bce4" name="Drunken Stupor Table">
@@ -1076,6 +1076,19 @@
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="c5e0-1e7a-945c-9a0b" name="Warhorse" hidden="false" collective="false" import="true" type="model">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1d2c-9c77-ff66-793c" type="max"/>
+          </constraints>
+          <infoLinks>
+            <infoLink id="e1ee-a374-9874-c947" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+            <infoLink id="628f-f29a-558f-b01b" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
+            <infoLink id="99e1-57bd-5347-be52" name="Warhorse" hidden="false" targetId="7806-7f1c-581f-2931" type="profile"/>
+          </infoLinks>
+          <costs>
+            <cost name="pts" typeId="points" value="18.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
         <selectionEntryGroup id="60a9-817e-2c05-eab9" name="Wizard Level" hidden="false" collective="false" import="true" defaultSelectionEntryId="f64b-0c65-c502-f0f6">
@@ -2064,6 +2077,19 @@
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="5d4f-73d5-2f71-226b" name="Warhorse" hidden="false" collective="false" import="true" type="model">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d952-30a5-2a00-2e12" type="max"/>
+          </constraints>
+          <infoLinks>
+            <infoLink id="7346-c202-2ee8-f2b5" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+            <infoLink id="0384-d7d3-c46c-a209" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
+            <infoLink id="2584-33da-88af-9fd6" name="Warhorse" hidden="false" targetId="7806-7f1c-581f-2931" type="profile"/>
+          </infoLinks>
+          <costs>
+            <cost name="pts" typeId="points" value="12.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
         <selectionEntryGroup id="a51f-09d5-711e-b425" name="Wizard Level" hidden="false" collective="false" import="true" defaultSelectionEntryId="26a2-63ad-5814-bccd">
diff --git a/Lizardmen.cat b/Lizardmen.cat
index c62cb12..42a8d48 100644
--- a/Lizardmen.cat
+++ b/Lizardmen.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="199b-5495-f6b6-fe0f" name="Lizardmen" revision="14" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="199b-5495-f6b6-fe0f" name="Lizardmen" revision="15" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="8f38-4096-41a1-bd68" name="Discipline of the Old Ones">
@@ -3143,7 +3143,7 @@
 
 Whenever you are required to work out the mixed unit&apos;s frontage or ranks (and therefore supporting attacks and rank bonus) count as if the footprint of the entire mixed unit was filled with Skinks.
 
-Unless otherwise stated, close combat attacks can only target Kroxigors within a mixed unit if an enemy model is either in base contact with a Kroxigor, or if an enemy model is in base contact with a Skink who is in turn in base contact with a Kroxigor. Stomps and Thunderstomps are always resolved against the Skinks (if all the Skinks are slain, any excess hits are lost). Missile and Impact Hits against a Skink Cohort that contains one or more Kroxigor are randomised by rolling a D6; on a 1-4, the hit is resolved against a Skink, on a 5-6 it is resolved against a Kroxigor. However, if a mixed unit of five or more models is hit by a bolt thrower, the shot always hits the closest non-character model to the bolt thrower. If this hit results in a casualty, resolve a hit against the next model in the bolt&apos;s path each time a casualty is caused.
+Unless otherwise stated, close combat attacks can only target Kroxigors within a mixed unit if an enemy model is either in base contact with a Kroxigor, or if an enemy model is in base contact with a Skink who is in turn in base contact with a Kroxigor. Stomps are always resolved against the Skinks (if all the Skinks are slain, any excess hits are lost). Missile and Impact Hits against a Skink Cohort that contains one or more Kroxigor are randomised by rolling a D6; on a 1-4, the hit is resolved against a Skink, on a 5-6 it is resolved against a Kroxigor. However, if a mixed unit of five or more models is hit by a bolt thrower, the shot always hits the closest non-character model to the bolt thrower. If this hit results in a casualty, resolve a hit against the next model in the bolt&apos;s path each time a casualty is caused.
 
 Casualties are always taken from the rearmost rank of the appropriate model type. Skink models that are in base contact with a friendly Kroxigor model have Fear.</description>
             </rule>
diff --git a/Ogre_Kingdoms.cat b/Ogre_Kingdoms.cat
index 6d8b73e..90e78d2 100644
--- a/Ogre_Kingdoms.cat
+++ b/Ogre_Kingdoms.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="e12f-c1a5-402a-77ae" name="Ogre Kingdoms" revision="14" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="e12f-c1a5-402a-77ae" name="Ogre Kingdoms" revision="15" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="dcfb-308c-d238-54ac" name="Big Name">
@@ -2291,7 +2291,7 @@ and Multiple Wounds (D3).</characteristic>
         <entryLink id="d8a1-b38f-15a5-8676" name="Warrior Familiar" hidden="false" collective="false" import="true" targetId="6ba4-68a0-cd51-88ce" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="145.0"/>
+        <cost name="pts" typeId="points" value="120.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f57a-fc86-677d-448b" name="Firebelly" hidden="false" collective="false" import="true" type="model">
@@ -5837,7 +5837,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
             </profile>
           </profiles>
           <costs>
-            <cost name="pts" typeId="points" value="10.0"/>
+            <cost name="pts" typeId="points" value="5.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="412e-4578-23e0-e17a" name="Brawlerguts" page="" hidden="false" collective="false" import="true" type="upgrade">
diff --git a/Skaven.cat b/Skaven.cat
index e504be6..7e800c6 100644
--- a/Skaven.cat
+++ b/Skaven.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="28da-4dfe-fb43-8a0c" name="Skaven" revision="18" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="28da-4dfe-fb43-8a0c" name="Skaven" revision="19" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="2c06-e87d-1a85-d6a0" name="Ringing the Bell Table">
@@ -3369,9 +3369,9 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
       </rules>
       <infoLinks>
         <infoLink id="8303-e226-9969-effd" name="Strength in Numbers" hidden="false" targetId="337b-11fe-1de2-0cd0" type="rule"/>
-        <infoLink id="5d56-f3e6-9ecd-1619" name="Scurry Away!" hidden="false" targetId="45db-9bbc-8b3b-4865" type="rule"/>
+        <infoLink id="5d56-f3e6-9ecd-1619" name="Mixed Unit" hidden="false" targetId="e00a-3a09-9b67-e994" type="rule"/>
         <infoLink id="3fc3-fb2c-3678-d9d3" name="Verminous Valour" hidden="false" targetId="5c1c-bc13-7613-8134" type="rule"/>
-        <infoLink id="cf76-193c-0b4b-82e3" name="Mixed Unit" hidden="false" targetId="58e9-5716-dad1-961f" type="rule"/>
+        <infoLink id="2658-da0a-1e45-8e64" name="Scurry Away!" hidden="false" targetId="45db-9bbc-8b3b-4865" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="220f-ce4a-7bd8-67ee" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
@@ -5554,10 +5554,10 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
         </rule>
       </rules>
       <infoLinks>
-        <infoLink id="95ed-df2e-50a5-c08a" name="Mixed Unit" hidden="false" targetId="58e9-5716-dad1-961f" type="rule"/>
         <infoLink id="9cb6-c9ed-216d-c881" name="Scurry Away!" hidden="false" targetId="45db-9bbc-8b3b-4865" type="rule"/>
         <infoLink id="deed-2989-2da1-086f" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
         <infoLink id="d827-ff50-bba0-a148" name="Strength in Numbers" hidden="false" targetId="337b-11fe-1de2-0cd0" type="rule"/>
+        <infoLink id="90ba-975c-d476-e942" name="Mixed Unit" hidden="false" targetId="e00a-3a09-9b67-e994" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="25b3-d21f-2b55-5ab1" name="New CategoryLink" hidden="false" targetId="b876-2856-f1c2-c4f0" primary="true"/>
@@ -5591,24 +5591,12 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
           </costs>
         </selectionEntry>
         <selectionEntry id="7c2d-cb84-3a31-d534" name="Packmaster" hidden="false" collective="false" import="true" type="model">
-          <modifiers>
-            <modifier type="increment" field="d9df-a4f1-32b1-ab45" value="1.0">
-              <repeats>
-                <repeat field="selections" scope="2707-f300-47f0-58ec" value="5.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e391-6d8c-b7df-bcd1" repeats="1" roundUp="false"/>
-              </repeats>
-            </modifier>
-            <modifier type="increment" field="e199-b8be-d18f-000e" value="1.0">
-              <repeats>
-                <repeat field="selections" scope="2707-f300-47f0-58ec" value="5.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e391-6d8c-b7df-bcd1" repeats="1" roundUp="false"/>
-              </repeats>
-            </modifier>
-          </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d9df-a4f1-32b1-ab45" type="min"/>
-            <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e199-b8be-d18f-000e" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d9df-a4f1-32b1-ab45" type="min"/>
           </constraints>
           <infoLinks>
             <infoLink id="4042-12bd-228c-72b5" name="Packmaster" hidden="false" targetId="f8eb-0b2e-6bea-166b" type="profile"/>
+            <infoLink id="f7c3-0c25-8a17-36fa" name="Packmaster" hidden="false" targetId="ccd1-cb1f-61e9-0f0c" type="rule"/>
           </infoLinks>
           <selectionEntries>
             <selectionEntry id="3138-2e8a-7b41-0469" name="Hand Weapon" hidden="false" collective="true" import="true" type="upgrade">
@@ -6097,10 +6085,10 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
     </selectionEntry>
     <selectionEntry id="c16c-5072-d189-60f2" name="Rat Ogres" hidden="false" collective="false" import="true" type="unit">
       <infoLinks>
-        <infoLink id="dfd4-78ac-a063-4f4a" name="Mixed Unit" hidden="false" targetId="58e9-5716-dad1-961f" type="rule"/>
         <infoLink id="8639-6698-6779-61ab" name="Scurry Away!" hidden="false" targetId="45db-9bbc-8b3b-4865" type="rule"/>
         <infoLink id="9eb4-be5f-dfe2-5a26" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
         <infoLink id="857d-a1f0-86e9-2e68" name="Strength in Numbers" hidden="false" targetId="337b-11fe-1de2-0cd0" type="rule"/>
+        <infoLink id="7c14-f484-9687-105b" name="Mixed Unit" hidden="false" targetId="e00a-3a09-9b67-e994" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5f52-38e1-8152-bd28" name="New CategoryLink" hidden="false" targetId="fc26-7737-f7cb-8977" primary="true"/>
@@ -6223,22 +6211,14 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
           </costs>
         </selectionEntry>
         <selectionEntry id="263b-a0e0-8a21-a37e" name="Packmaster" hidden="false" collective="false" import="true" type="model">
-          <modifiers>
-            <modifier type="increment" field="9e0f-790a-a2c2-4517" value="1.0">
-              <repeats>
-                <repeat field="selections" scope="c16c-5072-d189-60f2" value="2.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ac20-2e82-04c7-5d21" repeats="1" roundUp="false"/>
-              </repeats>
-            </modifier>
-            <modifier type="increment" field="9187-0975-ec1e-1684" value="1.0">
-              <repeats>
-                <repeat field="selections" scope="c16c-5072-d189-60f2" value="2.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ac20-2e82-04c7-5d21" repeats="1" roundUp="false"/>
-              </repeats>
-            </modifier>
-          </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9187-0975-ec1e-1684" type="min"/>
-            <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9e0f-790a-a2c2-4517" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9187-0975-ec1e-1684" type="min"/>
           </constraints>
+          <rules>
+            <rule id="9598-54a0-e15f-31f5" name="Packmaster" publicationId="4086-1ccd-f433-39a2" page="244" hidden="false">
+              <description>You must add 1 Packmaster for every 2 Rat Ogres in the unit.</description>
+            </rule>
+          </rules>
           <infoLinks>
             <infoLink id="b84a-c43c-2868-d568" name="Packmaster" hidden="false" targetId="f8eb-0b2e-6bea-166b" type="profile"/>
           </infoLinks>
@@ -7758,10 +7738,10 @@ If you roll a misfire result something has gone awry. No more shots are fired th
         </rule>
       </rules>
       <infoLinks>
-        <infoLink id="f9bd-28de-4d9e-e8a7" name="Mixed Unit" hidden="false" targetId="58e9-5716-dad1-961f" type="rule"/>
         <infoLink id="f85f-22cb-3756-278f" name="Scurry Away!" hidden="false" targetId="45db-9bbc-8b3b-4865" type="rule"/>
         <infoLink id="f40b-b349-3fa7-1242" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
         <infoLink id="242a-7d3a-c905-415c" name="Strength in Numbers" hidden="false" targetId="337b-11fe-1de2-0cd0" type="rule"/>
+        <infoLink id="4e7f-64a3-ad5f-47eb" name="Mixed Unit" hidden="false" targetId="e00a-3a09-9b67-e994" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="8d43-a53b-b315-7528" name="New CategoryLink" hidden="false" targetId="b876-2856-f1c2-c4f0" primary="true"/>
@@ -7795,19 +7775,12 @@ If you roll a misfire result something has gone awry. No more shots are fired th
           </costs>
         </selectionEntry>
         <selectionEntry id="7dcd-46c4-ae43-438d" name="Packmaster" hidden="false" collective="false" import="true" type="model">
-          <modifiers>
-            <modifier type="increment" field="0eab-bc4b-7780-b86d" value="1.0">
-              <repeats>
-                <repeat field="selections" scope="8642-b877-b44e-f203" value="5.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f2b7-cb11-c373-19f5" repeats="1" roundUp="false"/>
-              </repeats>
-            </modifier>
-          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cfd3-59d3-7b0f-046a" type="min"/>
-            <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0eab-bc4b-7780-b86d" type="max"/>
           </constraints>
           <infoLinks>
             <infoLink id="5bc6-6ad9-12c2-7fc2" name="Packmaster" hidden="false" targetId="f8eb-0b2e-6bea-166b" type="profile"/>
+            <infoLink id="2c3d-0445-5b49-f9ed" name="Packmaster" hidden="false" targetId="ccd1-cb1f-61e9-0f0c" type="rule"/>
           </infoLinks>
           <selectionEntries>
             <selectionEntry id="948d-0712-138a-256c" name="Hand Weapon" hidden="false" collective="true" import="true" type="upgrade">
@@ -9489,11 +9462,6 @@ If for any reason a Skaven unit loses its rank bonus, it also loses its LD bonus
     <rule id="77ea-023f-0095-0507" name="Sensei" publicationId="4086-1ccd-f433-39a2" page="174" hidden="false">
       <description>An Assassin cannot be your army General (this does not apply to Master Assassins). Only Eshin units can use their LD or Inspiring Presence.</description>
     </rule>
-    <rule id="58e9-5716-dad1-961f" name="Mixed Unit" publicationId="4086-1ccd-f433-39a2" page="114" hidden="false">
-      <description>Packmasters lead units of Giant Rats or Rat Ogres. They follow the rules for Champions, and may be placed in the rear rank of the unit. As long as at least a single Packmaster or Master Moulder is alive, the unit he is leading can use his LD and Strength in Numbers rule.
-
-If a unit of Giant Rats begins a turn without at least one Packmaster, they will move as quickly as possible towards the nearest enemy unit in their line of sight, charging if they can. If they have no visible targets they will reform to face the closest foe. If a unit of Rat Ogres begins a friendly turn without at least one Packmaster they are subject to Stupidity.</description>
-    </rule>
     <rule id="b29b-75ba-9d82-c0e2" name="Beastmaster" publicationId="4086-1ccd-f433-39a2" page="177" hidden="false">
       <description>Master Moulders and Master Mutators may join units of Giant Rats or Rat Ogres and act as their handlers following the Mixed Units rule. All friendly Clan Moulder units within 6&quot; of a Master Moulder or 12&quot; of a Master Mutator roll 3D6 for all
 LD tests and discard the highest dice.</description>
@@ -9574,6 +9542,9 @@ Roll an Artillery Dice to determine number of shots fired. After the first Artil
     <rule id="03e2-1030-42c5-4223" name="War-Litter" publicationId="4086-1ccd-f433-39a2" page="203" hidden="false">
       <description>A War-litter should be placed on a 40x40mm base, and adds +4 to the Unit Strength of any model mounted on them.</description>
     </rule>
+    <rule id="ccd1-cb1f-61e9-0f0c" name="Packmaster" publicationId="4086-1ccd-f433-39a2" page="243" hidden="false">
+      <description>You must add 1 Packmaster for every 5 Giant Rats in the unit.</description>
+    </rule>
   </sharedRules>
   <sharedProfiles>
     <profile id="5a0c-705e-808a-ca99" name="Warpmusket" publicationId="4086-1ccd-f433-39a2" page="189" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
diff --git a/Warhammer_Armies_Project.gst b/Warhammer_Armies_Project.gst
index 057340a..9932dc6 100644
--- a/Warhammer_Armies_Project.gst
+++ b/Warhammer_Armies_Project.gst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="9e23-79cb-afed-cf4c" name="Warhammer Armies Project" revision="16" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
+<gameSystem id="9e23-79cb-afed-cf4c" name="Warhammer Armies Project" revision="17" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <publications>
     <publication id="9e23-79cb-pubN66727" name="Rulebook v.1.9" shortName="RB" publisher="Warhammer - The Game of Fantasy Battles - 9th Edition v.1.81" publicationDate="" publisherUrl="http://warhammerarmiesproject.blogspot.com/"/>
@@ -195,14 +195,14 @@
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="fc26-7737-f7cb-8977" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
-        <modifier type="increment" field="f412-f4d0-9f49-afab" value="3.0">
+        <modifier type="increment" field="f412-f4d0-9f49-afab" value="1.0">
           <repeats>
-            <repeat field="points" scope="force" value="1000.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="any" repeats="1" roundUp="false"/>
+            <repeat field="points" scope="force" value="500.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="any" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="f412-f4d0-9f49-afab" type="min"/>
+        <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="f412-f4d0-9f49-afab" type="min"/>
       </constraints>
     </categoryEntry>
     <categoryEntry id="d38a-73da-883b-bab9" name="Heroes" hidden="false"/>
@@ -214,14 +214,14 @@
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0eb4-f376-7725-b05b" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
-        <modifier type="increment" field="5e3c-b5d6-a059-b5ab" value="3.0">
+        <modifier type="increment" field="5e3c-b5d6-a059-b5ab" value="1.0">
           <repeats>
-            <repeat field="points" scope="force" value="1000.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="any" repeats="1" roundUp="false"/>
+            <repeat field="points" scope="force" value="500.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="any" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="5e3c-b5d6-a059-b5ab" type="min"/>
+        <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="5e3c-b5d6-a059-b5ab" type="min"/>
       </constraints>
     </categoryEntry>
     <categoryEntry id="0eb4-f376-7725-b05b" name="Rare" hidden="false">
@@ -232,14 +232,14 @@
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b876-2856-f1c2-c4f0" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
-        <modifier type="increment" field="e0d7-75ba-de98-e3ff" value="3.0">
+        <modifier type="increment" field="e0d7-75ba-de98-e3ff" value="1.0">
           <repeats>
-            <repeat field="points" scope="force" value="1000.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="any" repeats="1" roundUp="false"/>
+            <repeat field="points" scope="force" value="500.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="any" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="e0d7-75ba-de98-e3ff" type="min"/>
+        <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="e0d7-75ba-de98-e3ff" type="min"/>
       </constraints>
     </categoryEntry>
   </categoryEntries>