diff --git a/Enforcers.cat b/Enforcers.cat
index 5672977..0a11ba3 100644
--- a/Enforcers.cat
+++ b/Enforcers.cat
@@ -1917,140 +1917,91 @@
       </categoryLinks>
       <selectionEntries/>
       <selectionEntryGroups>
-        <selectionEntryGroup id="73fc-ddec-b344-5124" name="Hardpoint 1" hidden="false" collective="false">
+        <selectionEntryGroup id="a759-beae-809a-d22c" name="Hardpoints" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers>
-            <modifier type="set" field="db6e-ac87-e6d7-2e5b" value="0">
+            <modifier type="set" field="f40e-d166-0b04-002d" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="0f84-6a2f-c0f4-0033" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="6cb3-93c1-23e1-bf2b" type="equalTo"/>
+                <condition field="selections" scope="0f84-6a2f-c0f4-0033" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="f6e8-5a28-d238-5d69" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="db6e-ac87-e6d7-2e5b" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="d2af-8637-6456-538d" name="Assault Flamer" hidden="false" targetId="1e97-05ad-b297-5af5" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="fe72-52c1-31b3-0f90" name="Chainsaw" hidden="false" targetId="5558-4fcb-d140-defa" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="c5ae-0fc0-a3cf-d745" name="Strider Grav-ram Spear" hidden="false" targetId="8534-fc76-04f7-050d" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="f082-31ba-d175-e46e" name="Strider Aggressor Shield" hidden="false" targetId="2966-df41-606b-b695" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="19e7-d9e4-5dc1-d4a1" name="Hardpoint 2" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers>
-            <modifier type="set" field="6211-38f9-e217-34d3" value="0">
+            <modifier type="set" field="f40e-d166-0b04-002d" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="0f84-6a2f-c0f4-0033" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="6cb3-93c1-23e1-bf2b" type="equalTo"/>
+                <condition field="selections" scope="0f84-6a2f-c0f4-0033" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="0a50-cb5f-b7cb-dd43" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6211-38f9-e217-34d3" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f40e-d166-0b04-002d" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks>
-            <entryLink id="37f3-dd71-feb4-88ec" name="Assault Flamer" hidden="false" targetId="1e97-05ad-b297-5af5" type="selectionEntry">
+            <entryLink id="fc28-4062-392b-6cc9" name="Assault Flamer" hidden="false" targetId="1e97-05ad-b297-5af5" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="eca2-c39b-dc61-3bf2" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="23e3-cf0c-2d55-00aa" name="Chainsaw" hidden="false" targetId="5558-4fcb-d140-defa" type="selectionEntry">
+            <entryLink id="80de-fad8-aad7-2f54" name="Chainsaw" hidden="false" targetId="5558-4fcb-d140-defa" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c70a-45fb-4ec6-7f40" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="1c27-dd9b-6671-7e39" name="Strider Grav-ram Spear" hidden="false" targetId="8534-fc76-04f7-050d" type="selectionEntry">
+            <entryLink id="2ace-c10a-689c-5ad3" name="Strider Aggressor Shield" hidden="false" targetId="2966-df41-606b-b695" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d371-4b19-8341-83d8" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="ccdd-9fc0-3531-e9c6" name="Strider Aggressor Shield" hidden="false" targetId="2966-df41-606b-b695" type="selectionEntry">
+            <entryLink id="52bf-ac21-2188-a8e3" name="Strider Grav-ram Spear" hidden="false" targetId="8534-fc76-04f7-050d" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="77fe-68dc-4f0e-cc00" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="6cb3-93c1-23e1-bf2b" name="Double Hardpoint" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="34d1-0068-82be-3148" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="ba66-cce6-49bd-8a95" name="Equalizer (Genling 88) **" hidden="false" targetId="92dc-cad1-e24c-8711" type="selectionEntry">
+            <entryLink id="f6e8-5a28-d238-5d69" name="Equalizer (Genling 88) **" hidden="false" targetId="92dc-cad1-e24c-8711" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d63a-ede8-5e62-0121" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="e411-d425-b282-5e92" name="Heavy Burst Laser **" hidden="false" targetId="7a46-dab5-bf21-6719" type="selectionEntry">
+            <entryLink id="0a50-cb5f-b7cb-dd43" name="Heavy Burst Laser **" hidden="false" targetId="7a46-dab5-bf21-6719" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2729-5d97-8cd6-4117" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
           </entryLinks>
diff --git a/Enforcers_Elite_Long_Range_Observer_N7-117.cat b/Enforcers_Elite_Long_Range_Observer_N7-117.cat
index 301b509..67e1833 100644
--- a/Enforcers_Elite_Long_Range_Observer_N7-117.cat
+++ b/Enforcers_Elite_Long_Range_Observer_N7-117.cat
@@ -445,140 +445,91 @@
       </categoryLinks>
       <selectionEntries/>
       <selectionEntryGroups>
-        <selectionEntryGroup id="a988-d30d-3490-ddda" name="Hardpoint 1" hidden="false" collective="false">
+        <selectionEntryGroup id="dc45-d400-e459-2ad0" name="Hardpoints" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers>
-            <modifier type="set" field="7e14-aef6-2ead-daf1" value="0">
+            <modifier type="set" field="fb84-d5f4-01c4-9eed" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="5fe4-0d09-f2ea-e644" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="cbc9-1d89-761b-c4a2" type="equalTo"/>
+                <condition field="selections" scope="5fe4-0d09-f2ea-e644" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="38ec-1a08-8ea2-4912" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7e14-aef6-2ead-daf1" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="0ea6-1e21-9c78-ebab" name="Chainsaw" hidden="false" targetId="69bd-2c2e-c432-f32b" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="fff4-3916-7934-d24a" name="Assault Flamer" hidden="false" targetId="b183-caf5-35d6-ec82" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="a218-4ae8-a456-0f3e" name="Strider Aggressor Shield" hidden="false" targetId="b93d-6faf-4be1-d606" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="ebbd-e495-fb55-d4c4" name="Strider Grav-ram Spear" hidden="false" targetId="6db8-1444-6df8-4b7f" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="3aa2-9845-7acc-75c3" name="Hardpoint 2" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers>
-            <modifier type="set" field="186d-0999-fc9f-9293" value="0">
+            <modifier type="set" field="fb84-d5f4-01c4-9eed" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="5fe4-0d09-f2ea-e644" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="cbc9-1d89-761b-c4a2" type="equalTo"/>
+                <condition field="selections" scope="5fe4-0d09-f2ea-e644" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="6061-0dfe-0d9d-8f28" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="186d-0999-fc9f-9293" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fb84-d5f4-01c4-9eed" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks>
-            <entryLink id="fff8-b611-4dbe-d868" name="Chainsaw" hidden="false" targetId="69bd-2c2e-c432-f32b" type="selectionEntry">
+            <entryLink id="63fb-d9c8-9040-8c20" name="Assault Flamer" hidden="false" targetId="b183-caf5-35d6-ec82" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cc4c-aaea-a4a6-565d" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="c4f0-5b68-63ee-557c" name="Assault Flamer" hidden="false" targetId="b183-caf5-35d6-ec82" type="selectionEntry">
+            <entryLink id="3a96-c2ab-b0e5-813c" name="Chainsaw" hidden="false" targetId="69bd-2c2e-c432-f32b" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cc30-a5d0-7b1c-7f2c" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="a0b6-8fc1-6727-5acd" name="Strider Grav-ram Spear" hidden="false" targetId="6db8-1444-6df8-4b7f" type="selectionEntry">
+            <entryLink id="79dc-bbc0-d1f7-7f52" name="Strider Aggressor Shield" hidden="false" targetId="b93d-6faf-4be1-d606" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="aa62-0bae-c4fc-dc3d" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="1129-231b-57f7-1ccd" name="Strider Aggressor Shield" hidden="false" targetId="b93d-6faf-4be1-d606" type="selectionEntry">
+            <entryLink id="dd04-1db7-a0db-9a3d" name="Strider Grav-ram Spear" hidden="false" targetId="6db8-1444-6df8-4b7f" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3f2f-e730-0c23-45db" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="cbc9-1d89-761b-c4a2" name="Double Hardpoint" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5116-1e99-d12e-3559" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="841e-fc0c-963c-0591" name="Equalizer (Gerling 88) **" hidden="false" targetId="7b89-9a4d-7b73-c208" type="selectionEntry">
+            <entryLink id="38ec-1a08-8ea2-4912" name="Equalizer (Gerling 88) **" hidden="false" targetId="7b89-9a4d-7b73-c208" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bfaa-6457-7e71-3f18" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="214a-d6d4-eb5d-f710" name="Heavy Burst Laser **" hidden="false" targetId="d3e3-30d3-9d31-3aa4" type="selectionEntry">
+            <entryLink id="6061-0dfe-0d9d-8f28" name="Heavy Burst Laser **" hidden="false" targetId="d3e3-30d3-9d31-3aa4" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3e6a-8d2c-888e-9b32" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
           </entryLinks>
diff --git a/Forge_Fathers.cat b/Forge_Fathers.cat
index b9898b4..523be2a 100644
--- a/Forge_Fathers.cat
+++ b/Forge_Fathers.cat
@@ -1468,94 +1468,56 @@
       </categoryLinks>
       <selectionEntries/>
       <selectionEntryGroups>
-        <selectionEntryGroup id="0008-1e23-0e33-096a" name="Hardpoint 1" hidden="false" collective="false">
+        <selectionEntryGroup id="4af2-d563-b898-8531" name="Hardpoints" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers/>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2d32-c9bf-7486-997f" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="734c-4fcb-179f-a651" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks>
-            <entryLink id="3c2e-5d94-9004-ebf8" name="Twin Magma Cannon" hidden="false" targetId="9915-7b46-887a-c7a6" type="selectionEntry">
+            <entryLink id="ab6d-5843-39ae-f874" name="IA Forge Hammer" hidden="false" targetId="9f14-3d97-4d77-11d9" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="9542-18bf-93f4-751b" name="Power Claw and Flamer" hidden="false" targetId="8146-444d-0531-fabc" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="c22a-1140-0d16-a75e" name="Twin Hailstorm Autocannons" hidden="false" targetId="9a5f-dd73-05ab-873b" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="55c9-4864-7982-2e7c" name="IA Forge Hammer" hidden="false" targetId="9f14-3d97-4d77-11d9" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cd03-472d-bd13-3105" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="8d21-ace4-5b2f-ee2e" name="Hardpoint 2" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ac4b-8fcb-03a9-057e" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="a540-1971-acd1-5de2" name="Twin Magma Cannon" hidden="false" targetId="9915-7b46-887a-c7a6" type="selectionEntry">
+            <entryLink id="2d21-bca9-6539-2d2c" name="Power Claw and Flamer" hidden="false" targetId="8146-444d-0531-fabc" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="681b-cb70-9cba-50e2" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="d1e5-e12b-09a4-f708" name="Power Claw and Flamer" hidden="false" targetId="8146-444d-0531-fabc" type="selectionEntry">
+            <entryLink id="00cb-8e3d-d263-db80" name="Twin Hailstorm Autocannons" hidden="false" targetId="9a5f-dd73-05ab-873b" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="16c7-de36-4976-690c" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="28ce-367e-3895-4733" name="Twin Hailstorm Autocannons" hidden="false" targetId="9a5f-dd73-05ab-873b" type="selectionEntry">
+            <entryLink id="33c5-acde-0fc0-984d" name="Twin Magma Cannon" hidden="false" targetId="9915-7b46-887a-c7a6" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="5277-3349-8516-e4f9" name="IA Forge Hammer" hidden="false" targetId="9f14-3d97-4d77-11d9" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cc45-08b0-1adc-21af" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
           </entryLinks>
diff --git a/Marauders.cat b/Marauders.cat
index 13a4982..4cacfa2 100644
--- a/Marauders.cat
+++ b/Marauders.cat
@@ -1671,116 +1671,46 @@
       </categoryLinks>
       <selectionEntries/>
       <selectionEntryGroups>
-        <selectionEntryGroup id="b50e-fa53-6696-4841" name="Hardpoint 1" hidden="false" collective="false">
+        <selectionEntryGroup id="fb40-ad92-49d7-905e" name="Hardpoints" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers/>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="42c1-7ebb-bd2e-6018" type="max"/>
+            <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d4c4-5fad-12c3-322d" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks>
-            <entryLink id="c18e-03ed-6920-bd99" name="Thermal Cannon" hidden="false" targetId="467b-2fc8-3a98-3e9f" type="selectionEntry">
+            <entryLink id="2c3c-12e8-2c9b-4bb9" name="Auxiliary Flamer" hidden="false" targetId="95d5-31f4-c109-fab4" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="10a4-04d8-1c2d-71c0" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="9e39-580a-db8b-ccac" name="Auxiliary Flamer" hidden="false" targetId="95d5-31f4-c109-fab4" type="selectionEntry">
+            <entryLink id="e5e3-fc42-2d6b-e9d4" name="Buzzsaw" hidden="false" targetId="a0a1-cf8f-b50b-a297" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="b579-b894-9e3e-502c" name="Buzzsaw" hidden="false" targetId="a0a1-cf8f-b50b-a297" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="d551-1955-5743-b764" name="Hardpoint 2" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ec9c-73e3-b54e-7c6e" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="1dbb-8d7a-ec10-9cf0" name="Thermal Cannon" hidden="false" targetId="467b-2fc8-3a98-3e9f" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="7b38-a584-dc17-b798" name="Auxiliary Flamer" hidden="false" targetId="95d5-31f4-c109-fab4" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2525-7e14-2061-feb1" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="2de5-4b57-4f6c-1d23" name="Buzzsaw" hidden="false" targetId="a0a1-cf8f-b50b-a297" type="selectionEntry">
+            <entryLink id="aba0-238d-3f5f-cb8d" name="Thermal Cannon" hidden="false" targetId="467b-2fc8-3a98-3e9f" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="2555-46e3-391a-922c" name="Hardpoint 3" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cbda-d28d-6350-d970" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="5d45-4562-e31a-582f" name="Thermal Cannon" hidden="false" targetId="467b-2fc8-3a98-3e9f" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="b9c5-04fd-b9e5-04a5" name="Auxiliary Flamer" hidden="false" targetId="95d5-31f4-c109-fab4" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="d0b9-5405-116e-591d" name="Buzzsaw" hidden="false" targetId="a0a1-cf8f-b50b-a297" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="97db-1666-1d77-8e0b" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
           </entryLinks>
diff --git a/Rebs.cat b/Rebs.cat
index 8d31435..8de359f 100644
--- a/Rebs.cat
+++ b/Rebs.cat
@@ -2288,108 +2288,71 @@
       </categoryLinks>
       <selectionEntries/>
       <selectionEntryGroups>
-        <selectionEntryGroup id="0881-64b1-4a4f-8bbe" name="Hardpoint 1" hidden="false" collective="false">
+        <selectionEntryGroup id="929a-017f-c4da-004f" name="Hardpoints" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers>
-            <modifier type="set" field="4fc6-3d09-2081-5bdb" value="0.0">
+            <modifier type="set" field="4728-a019-25e6-ef89" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="d3b8-4c34-b2a1-a841" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9f2e-8c9c-e21a-1490" type="equalTo"/>
+                <condition field="selections" scope="d3b8-4c34-b2a1-a841" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="4748-1d22-8d42-3b9f" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4fc6-3d09-2081-5bdb" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="45fc-1376-c203-e506" name="Assault Flamer" hidden="false" targetId="d19e-4522-f8cb-41df" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="670e-305a-8a43-e3b5" name="Chainsaw" hidden="false" targetId="9c72-df29-717f-92f8" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="9281-8631-87cb-103b" name="Hardpoint 2" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers>
-            <modifier type="set" field="25b0-c5c6-adc9-fba5" value="0.0">
+            <modifier type="set" field="4728-a019-25e6-ef89" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="d3b8-4c34-b2a1-a841" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9f2e-8c9c-e21a-1490" type="equalTo"/>
+                <condition field="selections" scope="d3b8-4c34-b2a1-a841" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="35bb-5a90-cf9a-c07d" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="25b0-c5c6-adc9-fba5" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4728-a019-25e6-ef89" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks>
-            <entryLink id="1c04-42df-5646-1485" name="Assault Flamer" hidden="false" targetId="d19e-4522-f8cb-41df" type="selectionEntry">
+            <entryLink id="2f2f-02d0-e804-77b8" name="Assault Flamer" hidden="false" targetId="d19e-4522-f8cb-41df" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="732a-53ac-47e8-36c7" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="74b0-6dd4-6fac-dbf9" name="Chainsaw" hidden="false" targetId="9c72-df29-717f-92f8" type="selectionEntry">
+            <entryLink id="95ad-c333-73d3-f04b" name="Chainsaw" hidden="false" targetId="9c72-df29-717f-92f8" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0236-d792-cd42-bbd1" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="9f2e-8c9c-e21a-1490" name="Double Hardpoint" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f26b-d75e-2640-561e" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="6b00-bc92-6144-48f8" name="Polaris Cannon (Genling 88) **" hidden="false" targetId="5f6d-723b-7064-92a1" type="selectionEntry">
+            <entryLink id="4748-1d22-8d42-3b9f" name="Heavy Burst Laser **" hidden="false" targetId="6a98-9528-0087-ea51" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9d25-9eeb-f570-3956" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="4fab-56a9-da6e-55bf" name="Heavy Burst Laser **" hidden="false" targetId="6a98-9528-0087-ea51" type="selectionEntry">
+            <entryLink id="35bb-5a90-cf9a-c07d" name="Polaris Cannon (Genling 88) **" hidden="false" targetId="5f6d-723b-7064-92a1" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="23af-9dc9-a3a0-dcfe" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
           </entryLinks>
diff --git a/The_Plague.cat b/The_Plague.cat
index 613885b..77ae8a6 100644
--- a/The_Plague.cat
+++ b/The_Plague.cat
@@ -1102,108 +1102,71 @@ Roll a d8: 1-2: Agile. 2-4: Frenzy (+1). 5-6: Increase AP of one RF weapon by +1
       </categoryLinks>
       <selectionEntries/>
       <selectionEntryGroups>
-        <selectionEntryGroup id="0f14-f9e2-fe05-dc47" name="Hardpoint 1" hidden="false" collective="false">
+        <selectionEntryGroup id="7bd9-bac2-d0ee-0bac" name="Hardpoints" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers>
-            <modifier type="decrement" field="3734-dea1-10b3-7f52" value="1">
+            <modifier type="set" field="43e6-61e7-28e1-d8e0" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="af32-b13e-6197-3aa5" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="8c4b-d16d-0e05-8398" type="equalTo"/>
+                <condition field="selections" scope="af32-b13e-6197-3aa5" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="b099-5baa-04e5-8895" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3734-dea1-10b3-7f52" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="27f1-200a-1d0e-3983" name="Chainsaw" hidden="false" targetId="51ff-13fd-2a23-bf06" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="aaf4-c0fc-22c7-d15d" name="Assault Flamer" hidden="false" targetId="d432-0bff-5581-95f2" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="951e-c018-c5f1-cf07" name="Hardpoint 2" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers>
-            <modifier type="decrement" field="fafa-b3b7-4ff5-0b09" value="1">
+            <modifier type="set" field="43e6-61e7-28e1-d8e0" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="af32-b13e-6197-3aa5" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="8c4b-d16d-0e05-8398" type="equalTo"/>
+                <condition field="selections" scope="af32-b13e-6197-3aa5" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="f9c0-2c0a-cc9e-9fe4" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fafa-b3b7-4ff5-0b09" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="43e6-61e7-28e1-d8e0" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks>
-            <entryLink id="9fa9-b476-c780-cd81" name="Assault Flamer" hidden="false" targetId="d432-0bff-5581-95f2" type="selectionEntry">
+            <entryLink id="b099-5baa-04e5-8895" name="Heavy Burst Laser **" hidden="false" targetId="fceb-fc2b-8310-393b" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="277f-6685-a23d-070c" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="5674-2a1d-4ecc-f5e0" name="Chainsaw" hidden="false" targetId="51ff-13fd-2a23-bf06" type="selectionEntry">
+            <entryLink id="f9c0-2c0a-cc9e-9fe4" name="Polaris Cannon (Genling 88) **" hidden="false" targetId="a4b1-2653-95f0-9ebd" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="294f-0477-1d7b-8cb0" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="8c4b-d16d-0e05-8398" name="Double Hardpoint" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4f0b-0f00-d078-0723" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="6e1a-90e6-c544-f6d0" name="Polaris Cannon (Genling 88) **" hidden="false" targetId="a4b1-2653-95f0-9ebd" type="selectionEntry">
+            <entryLink id="02b6-c69e-bb0c-d7ac" name="Assault Flamer" hidden="false" targetId="d432-0bff-5581-95f2" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="968f-341a-5044-3d20" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="6db8-eac9-7b95-4514" name="Heavy Burst Laser **" hidden="false" targetId="fceb-fc2b-8310-393b" type="selectionEntry">
+            <entryLink id="2666-1237-80ec-2040" name="Chainsaw" hidden="false" targetId="51ff-13fd-2a23-bf06" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c6c9-6932-c160-3961" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
           </entryLinks>
diff --git a/The_Plague_Elite_Dr_Simmonds.cat b/The_Plague_Elite_Dr_Simmonds.cat
index a327c8f..6c0438c 100644
--- a/The_Plague_Elite_Dr_Simmonds.cat
+++ b/The_Plague_Elite_Dr_Simmonds.cat
@@ -257,108 +257,71 @@ Grav-Pods: Gain Jump Pack and Glide until the end of the Round</description>
       </categoryLinks>
       <selectionEntries/>
       <selectionEntryGroups>
-        <selectionEntryGroup id="09a8-43ee-9e3a-a914" name="Hardpoint 1" hidden="false" collective="false">
+        <selectionEntryGroup id="7ee2-9245-fc7c-2c37" name="Hardpoints" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers>
-            <modifier type="set" field="50e3-3dcb-5f3c-57ee" value="0">
+            <modifier type="set" field="5478-0e44-a08a-c0da" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="2e6d-6684-78a9-9166" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="8a8e-7103-f4b4-3bb5" type="equalTo"/>
+                <condition field="selections" scope="2e6d-6684-78a9-9166" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="42df-8f78-1e0d-4b7d" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="50e3-3dcb-5f3c-57ee" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="50b5-15ee-6167-94f9" name="Chainsaw" hidden="false" targetId="c61b-009d-17b1-d8c9" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="4b6b-6e2c-9ae5-fe64" name="Assault Flamer" hidden="false" targetId="7735-9fc1-fa51-d63e" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="fd98-fc16-f66a-37b0" name="Hardpoint 2" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers>
-            <modifier type="set" field="720e-bd3d-07c6-c6bf" value="0">
+            <modifier type="set" field="5478-0e44-a08a-c0da" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="2e6d-6684-78a9-9166" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="8a8e-7103-f4b4-3bb5" type="equalTo"/>
+                <condition field="selections" scope="2e6d-6684-78a9-9166" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="dac5-413a-3f2a-1822" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="720e-bd3d-07c6-c6bf" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5478-0e44-a08a-c0da" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks>
-            <entryLink id="8f6e-4b09-cd00-3e53" name="Assault Flamer" hidden="false" targetId="7735-9fc1-fa51-d63e" type="selectionEntry">
+            <entryLink id="f182-faa2-9585-d82d" name="Assault Flamer" hidden="false" targetId="7735-9fc1-fa51-d63e" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fe59-d43a-474e-bdd7" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="975c-5699-e862-5bd1" name="Chainsaw" hidden="false" targetId="c61b-009d-17b1-d8c9" type="selectionEntry">
+            <entryLink id="6f78-4e4c-e3f2-05dc" name="Chainsaw" hidden="false" targetId="c61b-009d-17b1-d8c9" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b448-e801-3041-8850" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="8a8e-7103-f4b4-3bb5" name="Double Hardpoint" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="eb26-7228-c5a2-90c2" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="8908-4546-296f-9b09" name="Polaris Cannon (Genling 88) **" hidden="false" targetId="e413-5b6d-f4b7-a9e2" type="selectionEntry">
+            <entryLink id="42df-8f78-1e0d-4b7d" name="Heavy Burst Laser **" hidden="false" targetId="f172-7edd-3be0-d843" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="730c-2af0-e51f-8d71" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="7111-686a-0002-5c34" name="Heavy Burst Laser **" hidden="false" targetId="f172-7edd-3be0-d843" type="selectionEntry">
+            <entryLink id="dac5-413a-3f2a-1822" name="Polaris Cannon (Genling 88) **" hidden="false" targetId="e413-5b6d-f4b7-a9e2" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="98ea-9d95-46c7-0cbf" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
           </entryLinks>
diff --git a/Veer-Myn_(Beta).cat b/Veer-Myn_(Beta).cat
index b5c726f..34137a6 100644
--- a/Veer-Myn_(Beta).cat
+++ b/Veer-Myn_(Beta).cat
@@ -1512,132 +1512,98 @@
       </categoryLinks>
       <selectionEntries/>
       <selectionEntryGroups>
-        <selectionEntryGroup id="231a-33fe-0b06-4795" name="Hardpoint 1" hidden="false" collective="false">
+        <selectionEntryGroup id="d174-63bb-c9f6-0628" name="Hardpoints" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers>
-            <modifier type="set" field="4de6-1c77-4b37-3159" value="0.0">
+            <modifier type="set" field="56a1-a5b3-eb21-d045" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="34d4-fefd-9bbf-48cf" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f80e-3c37-610d-8340" type="equalTo"/>
+                <condition field="selections" scope="34d4-fefd-9bbf-48cf" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="e533-1a47-6c1b-9d45" type="equalTo"/>
+              </conditions>
+              <conditionGroups/>
+            </modifier>
+            <modifier type="set" field="56a1-a5b3-eb21-d045" value="1">
+              <repeats/>
+              <conditions>
+                <condition field="selections" scope="34d4-fefd-9bbf-48cf" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="1b0e-d8db-dd64-b3d5" type="equalTo"/>
+              </conditions>
+              <conditionGroups/>
+            </modifier>
+            <modifier type="set" field="56a1-a5b3-eb21-d045" value="1">
+              <repeats/>
+              <conditions>
+                <condition field="selections" scope="34d4-fefd-9bbf-48cf" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="9ac1-9d44-c746-252c" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4de6-1c77-4b37-3159" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="56a1-a5b3-eb21-d045" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks>
-            <entryLink id="6e51-edf1-86d3-31a0" name="Ray Gun" hidden="false" targetId="4bde-1f0c-eca1-026c" type="selectionEntry">
+            <entryLink id="0657-3bb6-4ac4-7a8f" name="Big Drill" hidden="false" targetId="8796-6ff8-3f9d-e5ac" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e4f7-5765-778f-d3c8" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="d9a8-bbd9-d935-b9d5" name="Big Drill" hidden="false" targetId="8796-6ff8-3f9d-e5ac" type="selectionEntry">
+            <entryLink id="2ebf-5c6a-7b69-d040" name="Chem Thrower" hidden="false" targetId="e5c1-a3c9-6635-dd56" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="549d-1da4-e067-63d0" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="b5ae-a230-1db3-73ae" name="Chem Thrower" hidden="false" targetId="e5c1-a3c9-6635-dd56" type="selectionEntry">
+            <entryLink id="dd07-d21f-23c6-8469" name="Ray Gun" hidden="false" targetId="4bde-1f0c-eca1-026c" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1431-6f8c-1331-4ffd" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="f80e-3c37-610d-8340" name="Double Hardpoint" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e46f-4e5b-e46b-5914" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="cbc2-3d07-c99a-ec1e" name="Heavy Chem Thrower**" hidden="false" targetId="6ee5-6a82-c433-c2cb" type="selectionEntry">
+            <entryLink id="e533-1a47-6c1b-9d45" name="Heavy Chem Thrower**" hidden="false" targetId="6ee5-6a82-c433-c2cb" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="72e6-3cc9-c9c8-1f86" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="836b-112f-150c-d751" name="Pair of Drills **" hidden="false" targetId="6998-9ac0-10ab-f46b" type="selectionEntry">
+            <entryLink id="1b0e-d8db-dd64-b3d5" name="Pair of Drills **" hidden="false" targetId="6998-9ac0-10ab-f46b" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="adf4-a668-ee2b-aae9" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="3735-ac4c-c585-25f5" name="Two-Handed Drill **" hidden="false" targetId="b024-272d-6f87-b655" type="selectionEntry">
+            <entryLink id="9ac1-9d44-c746-252c" name="Two-Handed Drill **" hidden="false" targetId="b024-272d-6f87-b655" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="f3b1-245c-cfd2-e0a0" name="Hardpoint 2" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers>
-            <modifier type="set" field="1f5a-e60a-d87a-14b8" value="0.0">
-              <repeats/>
-              <conditions>
-                <condition field="selections" scope="34d4-fefd-9bbf-48cf" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f80e-3c37-610d-8340" type="equalTo"/>
-              </conditions>
-              <conditionGroups/>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1f5a-e60a-d87a-14b8" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="93cf-a321-af8d-1a45" name="Ray Gun" hidden="false" targetId="4bde-1f0c-eca1-026c" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="0777-a176-2bfc-e976" name="Big Drill" hidden="false" targetId="8796-6ff8-3f9d-e5ac" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="7990-9300-ccd0-187e" name="Chem Thrower" hidden="false" targetId="e5c1-a3c9-6635-dd56" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1b05-ed36-b05d-3010" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
           </entryLinks>
@@ -2049,7 +2015,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="a008-3c67-5813-0f7e" name="Blaine" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2089,7 +2058,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="1957-3e06-ff87-1ef8" name="Blaine on Jetbike" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2129,7 +2101,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="5dea-578b-43a6-dd45" name="Boomer, Grenadier" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2169,7 +2144,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="6aab-f021-3c96-a766" name="Chief Radgrad" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2209,7 +2187,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="a442-ce6a-703a-fd36" name="Chovar Psychic" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2249,7 +2230,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="9b1f-4d74-5b20-646f" name="Freya" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2289,7 +2273,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="2d25-03aa-b80f-e4ac" name="Hund Rebel Bounty Hunter" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2329,7 +2316,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="f8a4-f0d9-44b2-9e75" name="Nastanza" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2369,7 +2359,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="5392-b69d-32ec-b79e" name="Ogre Terminator" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2409,7 +2402,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="312f-64c9-9fbc-e775" name="Project Oberon" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2449,7 +2445,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="8f89-01a6-49c7-558d" name="The Helfather" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2489,7 +2488,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="2d80-2c1b-5af4-3e29" name="The Piper" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2529,7 +2531,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
     <selectionEntry id="6945-0417-69a1-e78f" name="The Survivor" hidden="false" collective="false" type="upgrade">
       <profiles/>
@@ -2569,7 +2574,10 @@
           <categoryLinks/>
         </entryLink>
       </entryLinks>
-      <costs/>
+      <costs>
+        <cost name="VPs" costTypeId="02a0-6bab-fa73-4a98" value="0.0"/>
+        <cost name="pts" costTypeId="61f9-fd84-cb0b-0306" value="0.0"/>
+      </costs>
     </selectionEntry>
   </selectionEntries>
   <entryLinks/>
diff --git a/Veer-Myn_(Beta)_Elite_The_Piper.cat b/Veer-Myn_(Beta)_Elite_The_Piper.cat
index 74d695f..17131b1 100644
--- a/Veer-Myn_(Beta)_Elite_The_Piper.cat
+++ b/Veer-Myn_(Beta)_Elite_The_Piper.cat
@@ -296,132 +296,98 @@
       </categoryLinks>
       <selectionEntries/>
       <selectionEntryGroups>
-        <selectionEntryGroup id="c6dd-945f-81dd-9d72" name="Hardpoint 1" hidden="false" collective="false">
+        <selectionEntryGroup id="a728-60af-c469-f2ba" name="Hardpoints" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers>
-            <modifier type="set" field="be01-ad1e-0e5b-ba54" value="0.0">
+            <modifier type="set" field="3c10-ee0f-3214-fd52" value="1">
               <repeats/>
               <conditions>
-                <condition field="selections" scope="17ad-1448-7e28-6233" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4485-1933-b1e5-675d" type="equalTo"/>
+                <condition field="selections" scope="17ad-1448-7e28-6233" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="08ac-d3e8-7d15-b18b" type="equalTo"/>
+              </conditions>
+              <conditionGroups/>
+            </modifier>
+            <modifier type="set" field="3c10-ee0f-3214-fd52" value="1">
+              <repeats/>
+              <conditions>
+                <condition field="selections" scope="17ad-1448-7e28-6233" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="b527-376c-c547-69d2" type="equalTo"/>
+              </conditions>
+              <conditionGroups/>
+            </modifier>
+            <modifier type="set" field="3c10-ee0f-3214-fd52" value="1">
+              <repeats/>
+              <conditions>
+                <condition field="selections" scope="17ad-1448-7e28-6233" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="ac1a-a5ed-bb9b-8dbd" type="equalTo"/>
               </conditions>
               <conditionGroups/>
             </modifier>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="be01-ad1e-0e5b-ba54" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3c10-ee0f-3214-fd52" type="max"/>
           </constraints>
           <categoryLinks/>
           <selectionEntries/>
           <selectionEntryGroups/>
           <entryLinks>
-            <entryLink id="60b5-f91f-43f0-f5cb" name="Ray Gun" hidden="false" targetId="4288-de32-8c20-b487" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="96ef-6879-552d-1c90" name="Chem Thrower" hidden="false" targetId="d158-fe2e-b3eb-904b" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-            <entryLink id="824d-f38f-439c-e81b" name="Big Drill" hidden="false" targetId="cc8e-4fc2-519f-7990" type="selectionEntry">
+            <entryLink id="08ac-d3e8-7d15-b18b" name="Heavy Chem Thrower**" hidden="false" targetId="1b4f-9759-fd18-4faa" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
-              <categoryLinks/>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="4485-1933-b1e5-675d" name="Double Hardpoint" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1f41-5499-6de3-20d5" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="ea7a-2348-aff3-7156" name="Heavy Chem Thrower**" hidden="false" targetId="1b4f-9759-fd18-4faa" type="selectionEntry">
-              <profiles/>
-              <rules/>
-              <infoLinks/>
-              <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6239-a6da-eaab-7de8" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="3151-4356-1627-d545" name="Two-Handed Drill **" hidden="false" targetId="eac3-acda-b9d7-cd81" type="selectionEntry">
+            <entryLink id="b527-376c-c547-69d2" name="Pair of Drills **" hidden="false" targetId="8349-d0f4-9fd9-37a7" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="78f5-bf22-e74e-72c8" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="9770-432a-1fa4-347d" name="Pair of Drills **" hidden="false" targetId="8349-d0f4-9fd9-37a7" type="selectionEntry">
+            <entryLink id="ac1a-a5ed-bb9b-8dbd" name="Two-Handed Drill **" hidden="false" targetId="eac3-acda-b9d7-cd81" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c96d-9069-cdcd-5040" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="b99e-bcae-cfce-ab21" name="Hardpoint 2" hidden="false" collective="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers>
-            <modifier type="set" field="7e6d-b7cb-6ed5-a05f" value="0.0">
-              <repeats/>
-              <conditions>
-                <condition field="selections" scope="17ad-1448-7e28-6233" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4485-1933-b1e5-675d" type="equalTo"/>
-              </conditions>
-              <conditionGroups/>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7e6d-b7cb-6ed5-a05f" type="max"/>
-          </constraints>
-          <categoryLinks/>
-          <selectionEntries/>
-          <selectionEntryGroups/>
-          <entryLinks>
-            <entryLink id="a71a-aa36-6f87-c714" name="Chem Thrower" hidden="false" targetId="d158-fe2e-b3eb-904b" type="selectionEntry">
+            <entryLink id="5622-bebb-ebf5-028c" name="Big Drill" hidden="false" targetId="cc8e-4fc2-519f-7990" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f81b-01b6-369a-3213" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="802e-76b6-05aa-282e" name="Ray Gun" hidden="false" targetId="4288-de32-8c20-b487" type="selectionEntry">
+            <entryLink id="38e1-0174-5811-2bcc" name="Chem Thrower" hidden="false" targetId="d158-fe2e-b3eb-904b" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a9f3-7cc9-907a-0070" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
-            <entryLink id="6443-2a7d-2e41-db64" name="Big Drill" hidden="false" targetId="cc8e-4fc2-519f-7990" type="selectionEntry">
+            <entryLink id="9a2c-f3a5-a3ac-3b58" name="Ray Gun" hidden="false" targetId="4288-de32-8c20-b487" type="selectionEntry">
               <profiles/>
               <rules/>
               <infoLinks/>
               <modifiers/>
-              <constraints/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0af4-a966-3a47-978d" type="max"/>
+              </constraints>
               <categoryLinks/>
             </entryLink>
           </entryLinks>