diff --git a/contrib/cards/Empire/EmpireUnits.json b/contrib/cards/Empire/EmpireUnits.json
index d48e6687a..7194d350a 100644
--- a/contrib/cards/Empire/EmpireUnits.json
+++ b/contrib/cards/Empire/EmpireUnits.json
@@ -112,7 +112,7 @@
         },
         {
           "name": "Deploy The Garrison",
-          "image": "http://cloud-3.steamusercontent.com/ugc/1680393865564035541/3076FCDDC51B733A5970AD91FE0698F9A1888084/",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/12892698832465049230/B1371A5A16B4A487680730048ABA1D8AD5711C43/",
           "pip": 2
         },
         {
@@ -122,6 +122,105 @@
         }
       ]
     },
+    {
+      "name": "Grand Admiral Thrawn",
+      "title": "Imperial High Command",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/9436299354256705736/3DCE14B424BBB4F76939DA580884B08F5597866A/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 110,
+      "speed": 2,
+      "upgrades": {
+        "Command": 3,
+        "Training": 1,
+        "Gear": 1
+      },
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16882569187315189060/9CC8F02A05022AC6AE93534E6C95F72197C296C3/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17874999880093691776/296F0B6569A22FA39F40E4A61D207900C1CCE512/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "Architects of Their Own Destruction",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/12184173414394445819/F6446EC3BC802836DC5A6E7C19A5BD77F30B7278/",
+          "pip": 1
+        },
+        {
+          "name": "We Must Wait and Watch",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/13718292354738588716/0DB30394AA3AA3D13D9FA23F2B7DC17CF34116F0/",
+          "pip": 2
+        },
+        {
+          "name": "I Want You to Know Failure",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/15617948462890110491/4C39E34E102D2071D0EEAA0AC7F4F8953E108265/",
+          "pip": 3
+        }
+      ]
+    },
+    {
+      "name": "Grand Moff Tarkin",
+      "title": "Imperial High Command",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/12830085949468452139/30B1D3C7B93F18C834C172A25D605C01DAFD9A31/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 95,
+      "speed": 2,
+      "upgrades": {
+        "Command": 3
+      },
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16733402417968018171/CDE38AF3BCF6C2601F389A7AEB03B7399E440D9B/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/10086133497934154614/77993863423B7453DB85E31D4CA9B7F13DCD4626/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "Moment of Triumph",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/13309803368671609766/C5893E5966D2FE573DD589E9B5E94EBD01E20707/",
+          "pip": 1
+        },
+        {
+          "name": "Fear Will Keep Them in Line",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/10284086872796146114/8FC131D739DFBCA729DC1B5F31DD440B65EEB4C6/",
+          "pip": 3
+        }
+      ]
+    },
+    {
+      "name": "General Tagge",
+      "title": "Imperial High Command",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/18037706666284034311/7683A6889CF63CFFAC109DF58DDD103AA7ADFAF8/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 85,
+      "speed": 2,
+      "upgrades": {
+        "Command": 3,
+        "Training": 1,
+        "Gear": 1
+      },
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/11491712071340896017/8364014C41D2C85817AA0641F36F066504E46226/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/10067944761455784205/EA5A44F1A042F71C0D397173A893E5316CA42463/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "I Have Graphs AND the Command",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/16492485163580443866/035B19E6BD2FC184EDE9E2782054E52EABFE973C/",
+          "pip": 1
+        },
+        {
+          "name": "Canny Adversary",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/15603846312607201943/6B2F2EC17A80B2F190532E33057F16931B8D4F19/",
+          "pip": 3
+        }
+      ]
+    },
     {
       "name": "Iden Versio",
       "title": "Inferno Squad Leader",
@@ -232,10 +331,10 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/BlackSunVigoUnit.json"
+      "content": "contrib/cards/Mercenary/BlackSunVigoUnit.json"
     }
   ],
   "Operative": [
@@ -288,10 +387,10 @@
       "additionalObjects": ["Victory Token"]
     },
     {
-      "content": "contrib/cards/ShadowCollective/BosskUnit.json"
+      "content": "contrib/cards/Mercenary/BosskUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/CadBaneUnit.json"
+      "content": "contrib/cards/Mercenary/CadBaneUnit.json"
     },
     {
       "name": "Darth Vader",
@@ -382,13 +481,13 @@
       "additionalObjects": ["Victory Token"]
     },
     {
-      "content": "contrib/cards/ShadowCollective/DinUnit.json"
+      "content": "contrib/cards/Mercenary/DinUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/IG11Unit.json"
+      "content": "contrib/cards/Mercenary/IG11Unit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/HondoUnit.json"
+      "content": "contrib/cards/Mercenary/HondoUnit.json"
     },
     {
       "name": "Fifth Brother",
@@ -675,7 +774,7 @@
     },
     {
       "name": "DF-90 Mortar Trooper",
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385139662551/E8496B01C9619FBA2E5EEEBEF285ABEEF95ECF00/",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/16783716143455086871/5D15ECEA1884F21248D89506357639418A5FBF3B/",
       "size": "medium",
       "type": "Emplacement Trooper",
       "points": 40,
@@ -691,10 +790,13 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json"
+      "content": "contrib/cards/Mercenary/BlackSunEnforcersUnit.json"
+    },
+    {
+      "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json"
     }
   ],
   "Special Forces": [
@@ -731,30 +833,6 @@
         }
       ]
     },
-    {
-      "name": "Scout Troopers",
-      "title": "Strike Team",
-      "displayName": "Scout Troopers (Strike Team)",
-      "heavyWeaponTeam": true,
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384863628/C90F310AB2FFFFB744B68B2A0D3B0C657FA8ABA4/",
-      "size": "small",
-      "type": "Trooper",
-      "points": 20,
-      "speed": 2,
-      "upgrades": {
-        "Heavy Weapon": 1,
-        "Training": 1,
-        "Comms": 1,
-        "Gear": 1,
-        "Grenades": 1
-      },
-      "minis": [
-        {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541911155/36E8C01A67E5E7A4188FC619261E0BAB0DF438C1/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/950714557093539603/6584D58DCD3135C901F302599C304E2D7044AD4B/"
-        }
-      ]
-    },
     {
       "name": "Imperial Death Troopers",
       "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385139667689/20539A9EAB988308E299A3DE18818D7B9FBA63C9/",
@@ -845,6 +923,21 @@
         }
       ],
       "required": ["Gideon Hask", "Del Meeko"]
+    },
+    {
+      "name": "Imperial Probe Droid",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/17742743731740446795/0CCBB41ECD7F6A3AB0477DD280E75F07DDF26BE1/",
+      "size": "small",
+      "type": "Droid Trooper",
+      "points": 35,
+      "speed": 1,
+      "upgrades": {},
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/14972533488140369423/D390682F502B9999AE930DA6A78817DDE5D97027/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15762532285823663057/2254B8B0FBA723C3F840CDB6DB639404B0DA9DB1/"
+        }
+      ]
     }
   ],
   "Support": [
@@ -910,6 +1003,30 @@
         }
       ]
     },
+    {
+      "name": "Scout Troopers",
+      "title": "Strike Team",
+      "displayName": "Scout Troopers (Strike Team)",
+      "heavyWeaponTeam": true,
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/11473212592953545707/1E52D2488DA72C302214A5A1B55D64D36BFFE757/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 22,
+      "speed": 2,
+      "upgrades": {
+        "Heavy Weapon": 1,
+        "Training": 1,
+        "Comms": 1,
+        "Gear": 1,
+        "Grenades": 1
+      },
+      "minis": [
+        {
+          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541911155/36E8C01A67E5E7A4188FC619261E0BAB0DF438C1/",
+          "diffuse": "http://cloud-3.steamusercontent.com/ugc/950714557093539603/6584D58DCD3135C901F302599C304E2D7044AD4B/"
+        }
+      ]
+    },
     {
       "name": "Range Troopers",
       "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385139672651/467BD8F23216F7AE5274DC84837483AE40571B02/",
@@ -1078,6 +1195,9 @@
           "pip": 3
         }
       ]
+    },
+    {
+      "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json"
     }
   ]
 }
diff --git a/contrib/cards/Mercenary/BlackSunEnforcersUnit.json b/contrib/cards/Mercenary/BlackSunEnforcersUnit.json
new file mode 100644
index 000000000..c5c7e7d9c
--- /dev/null
+++ b/contrib/cards/Mercenary/BlackSunEnforcersUnit.json
@@ -0,0 +1,32 @@
+{
+  "name": "Black Sun Enforcers",
+  "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385139718139/222491782E56EAECE8B93E78E946F308211DC049/",
+  "size": "small",
+  "type": "Trooper",
+  "points": 50,
+  "speed": 2,
+  "upgrades": {
+    "Heavy Weapon": 1,
+    "Personnel": 1,
+    "Gear": 1,
+    "Grenades": 1
+  },
+  "minis": [
+    {
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15119947962689322389/8EC382E90223BC184162C54AFF3EDAE1436DA2AA/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/18136160122757222499/97D7733312EE4677B4694F72C21A61FD8365690E/"
+    },
+    {
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/11857728936195634014/66FB83A411E5A561A9A5927C0FDEB396DAF6AE20/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16452722805588228328/EDA05A0B40EFFA898015BE31588B19E6BB72B4A2/"
+    },
+    {
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13538216675182514309/80D3D2926D6723131723E027151D80E807BA1FF4/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15549057142882936018/8E3A2116FFD18C5122767F9038D43FF549248278/"
+    },
+    {
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16839420302039891942/3031489A090A438C10C4B37690E4E5B507DD4913/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/13883212304201737617/9B792D3CE9B23D2354F80B2B159F4FD13728A98F/"
+    }
+  ]
+}
diff --git a/contrib/cards/ShadowCollective/BlackSunVigoUnit.json b/contrib/cards/Mercenary/BlackSunVigoUnit.json
similarity index 54%
rename from contrib/cards/ShadowCollective/BlackSunVigoUnit.json
rename to contrib/cards/Mercenary/BlackSunVigoUnit.json
index 9ed7b4a88..b817a460a 100644
--- a/contrib/cards/ShadowCollective/BlackSunVigoUnit.json
+++ b/contrib/cards/Mercenary/BlackSunVigoUnit.json
@@ -11,7 +11,8 @@
   },
   "minis": [
     {
-      "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143763/E93BA6716A05CA95AE2EA3B7C0DFD8AF145D5C22/"
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13653552510521459623/B060AC4F7AE0132A573CF92984494FDF2C4640F2/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9553158029415913253/8761E25E4B155BE4124E8B1A5B922C6941A153A3/"
     }
   ]
 }
diff --git a/contrib/cards/ShadowCollective/BosskUnit.json b/contrib/cards/Mercenary/BosskUnit.json
similarity index 100%
rename from contrib/cards/ShadowCollective/BosskUnit.json
rename to contrib/cards/Mercenary/BosskUnit.json
diff --git a/contrib/cards/ShadowCollective/CadBaneUnit.json b/contrib/cards/Mercenary/CadBaneUnit.json
similarity index 100%
rename from contrib/cards/ShadowCollective/CadBaneUnit.json
rename to contrib/cards/Mercenary/CadBaneUnit.json
diff --git a/contrib/cards/ShadowCollective/DinUnit.json b/contrib/cards/Mercenary/DinUnit.json
similarity index 100%
rename from contrib/cards/ShadowCollective/DinUnit.json
rename to contrib/cards/Mercenary/DinUnit.json
diff --git a/contrib/cards/ShadowCollective/HondoUnit.json b/contrib/cards/Mercenary/HondoUnit.json
similarity index 100%
rename from contrib/cards/ShadowCollective/HondoUnit.json
rename to contrib/cards/Mercenary/HondoUnit.json
diff --git a/contrib/cards/ShadowCollective/IG11Unit.json b/contrib/cards/Mercenary/IG11Unit.json
similarity index 100%
rename from contrib/cards/ShadowCollective/IG11Unit.json
rename to contrib/cards/Mercenary/IG11Unit.json
diff --git a/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json b/contrib/cards/Mercenary/MercenaryUnits.json
similarity index 76%
rename from contrib/cards/ShadowCollective/ShadowCollectiveUnits.json
rename to contrib/cards/Mercenary/MercenaryUnits.json
index f0103910c..4a2d32e42 100644
--- a/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json
+++ b/contrib/cards/Mercenary/MercenaryUnits.json
@@ -38,10 +38,10 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/BlackSunVigoUnit.json"
+      "content": "contrib/cards/Mercenary/BlackSunVigoUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json"
     }
   ],
   "Operative": [
@@ -98,18 +98,47 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/CadBaneUnit.json"
+      "name": "Savage Opress",
+      "title": "Maul's Enforcer",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/10520678764152114554/0350C3463ADCAF50D1936AC3893348C12F0A5A62/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 0,
+      "speed": 2,
+      "upgrades": {},
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/11082776058831308047/3A974FCF53960CCBBC537A4134AD12242D4DDF89/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17875535680143582051/1C009264C71FD35359145238DFA2CBD5D1872CD4/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "We Shall Start With Revenge",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/10750064270635517385/492A552BB4056A4CBF9CD01FB5195521104C9F9E/",
+          "pip": 1
+        }
+      ]
+    },
+    {
+      "content": "contrib/cards/Mercenary/CadBaneUnit.json"
+    },
+    {
+      "content": "contrib/cards/Mercenary/BosskUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/BosskUnit.json"
+      "content": "contrib/cards/Mercenary/HondoUnit.json"
     }
   ],
   "Corps": [
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json"
+    },
+    {
+      "content": "contrib/cards/Mercenary/BlackSunEnforcersUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json"
+      "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json"
     }
   ],
   "Special Forces": [
@@ -146,7 +175,7 @@
   ],
   "Support": [
     {
-      "content": "contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json"
+      "content": "contrib/cards/Mercenary/SwoopBikeRidersUnit.json"
     }
   ],
   "Heavy": [
@@ -172,6 +201,9 @@
           "bundle": "http://cloud-3.steamusercontent.com/ugc/1802024425338475527/29D3660FA84E5B9F804B840C18E68F5631EE6462/"
         }
       ]
+    },
+    {
+      "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json"
     }
   ]
 }
diff --git a/contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json b/contrib/cards/Mercenary/PykeSyndicateCapoUnit.json
similarity index 100%
rename from contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json
rename to contrib/cards/Mercenary/PykeSyndicateCapoUnit.json
diff --git a/contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json b/contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json
similarity index 100%
rename from contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json
rename to contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json
diff --git a/contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json b/contrib/cards/Mercenary/SwoopBikeRidersUnit.json
similarity index 100%
rename from contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json
rename to contrib/cards/Mercenary/SwoopBikeRidersUnit.json
diff --git a/contrib/cards/Mercenary/WLO5SpeederTankUnit.json b/contrib/cards/Mercenary/WLO5SpeederTankUnit.json
new file mode 100644
index 000000000..8a4a77f97
--- /dev/null
+++ b/contrib/cards/Mercenary/WLO5SpeederTankUnit.json
@@ -0,0 +1,24 @@
+{
+  "name": "WLO-5 Speeder Tank",
+  "image": "https://steamusercontent-a.akamaihd.net/ugc/12892745162360850606/8F7C7F70F1604DCA9BB39BE0F0EE859149D3A3F8/",
+  "size": "snail",
+  "type": "Repulsor Vehicle",
+  "points": 100,
+  "speed": 1,
+  "upgrades": {
+    "Crew": 1,
+    "Pilot": 1,
+    "Comms": 1
+  },
+  "silhouette": {
+    "height": 2.44,
+    "offset": 0
+  },
+  "minis": [
+    {
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/18162736975687770648/643CAEA98913694A90A7BC6B9ED78668C9F46386/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14670109106110705253/18525D8840EEFDB2DC159B4988BD6A734BC2418E/",
+      "collider": "https://steamusercontent-a.akamaihd.net/ugc/10402477424751392481/9585E316040CEA861ABF6A551F35C2473BEC0C52/"
+    }
+  ]
+}
diff --git a/contrib/cards/Mercenary/WeequayPiratesUnit.json b/contrib/cards/Mercenary/WeequayPiratesUnit.json
new file mode 100644
index 000000000..33b7b28af
--- /dev/null
+++ b/contrib/cards/Mercenary/WeequayPiratesUnit.json
@@ -0,0 +1,33 @@
+{
+  "name": "Weequay Pirates",
+  "image": "https://steamusercontent-a.akamaihd.net/ugc/11819796991863488676/7F77BE629CF0B253A3DCEECAD2FA148D8627995C/",
+  "size": "small",
+  "type": "Trooper",
+  "points": 40,
+  "speed": 2,
+  "upgrades": {
+    "Heavy Weapon": 1,
+    "Personnel": 2,
+    "Training": 1,
+    "Gear": 1,
+    "Grenades": 1
+  },
+  "minis": [
+    {
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16427319945525081840/0BC18D14AA5B5EDE59BB753572CA11BA8DFB093C/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15128098244470197051/122A93D394F779A72D4DFD24D7BEFE3BEF7DBBCB/"
+    },
+    {
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13445091018596770169/04299452D8946357EA16CD9DDE32B787C6DBBEDA/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/12521217169728315650/79F32E9C7B535418920B0C335F8B5FC3F9AE0726/"
+    },
+    {
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16223639926626886253/6DAD82EB229219B62298B7B4C22F6586ED23E9BB/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9341836019986456990/3940A22021782AC05911D4DCD13463623411B60F/"
+    },
+    {
+      "mesh": "https://steamusercontent-a.akamaihd.net/ugc/10420975901939976395/93572C150848711C2D7919BB5E0A66DD51E33DEC/",
+      "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15879012411449849405/6339E5B40A0F222280349C23BCB3E79CC5136B43/"
+    }
+  ]
+}
diff --git a/contrib/cards/Rebel/RebelUnits.json b/contrib/cards/Rebel/RebelUnits.json
index 2d89483ea..4ddc021e6 100644
--- a/contrib/cards/Rebel/RebelUnits.json
+++ b/contrib/cards/Rebel/RebelUnits.json
@@ -53,6 +53,59 @@
         }
       ]
     },
+    {
+      "name": "Luke Skywalker",
+      "title": "Commander Skywalker",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/14055439616909991431/49C4E67617260BEB9BA30A7186B2F0A6E7E1F1B0/",
+      "size": "medium",
+      "type": "Creature Trooper",
+      "points": 110,
+      "speed": 2,
+      "upgrades": {
+        "Command": 1,
+        "Force": 1,
+        "Training": 1,
+        "Comms": 1
+      },
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/17466138295659250864/64486F9383C23FBFA17327847189F8F798E0BFB8/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14381694965898057201/52C1277D712E3B1E4F54C16E4F74CB76639BECB1/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "Son Of Skywalker",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133712958/CF63D0FDA40318CE886E6DA309CEB291857776E4/",
+          "pip": 1
+        },
+        {
+          "name": "On Patrol",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/10927164661502635503/8DB9E1079B4D67CAA8E7C19A6B1BB2EAE4AAB2F9/",
+          "pip": 2
+        },
+        {
+          "name": "My Ally Is The Force",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133711308/CECAE0B5B62858582522F7FBED6463FE5834A64E/",
+          "pip": 2
+        },
+        {
+          "name": "Full Of Surprises",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133709999/FA890B2A2EA1528C8BCF2A80AEB3B97A97BB9E15/",
+          "pip": 2
+        },
+        {
+          "name": "Return Of The Jedi",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133711996/90C4CB28C0554DEC3797882252E6C5D3CCAC65A1/",
+          "pip": 3
+        },
+        {
+          "name": "Not Out of it Yet",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/17986576672810143634/656B6E1AB636857E500DC13A8C94F7FB26C78F84/",
+          "pip": 3
+        }
+      ]
+    },
     {
       "name": "Leia Organa",
       "title": "Fearless And Inventive",
@@ -189,7 +242,7 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json"
     },
     {
       "name": "Rebel Officer",
@@ -227,7 +280,7 @@
       "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133208061/787C79B49789528F2EF54F1668B0BF28EBD6635C/",
       "size": "small",
       "type": "Trooper",
-      "points": 70,
+      "points": 64,
       "speed": 2,
       "upgrades": {
         "Training": 3
@@ -292,7 +345,35 @@
   ],
   "Operative": [
     {
-      "content": "contrib/cards/ShadowCollective/HondoUnit.json"
+      "content": "contrib/cards/Mercenary/HondoUnit.json"
+    },
+    {
+      "name": "Han Solo",
+      "title": "Reluctant Hero",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/15311985354658964881/F8E81D8263D5350BE0AB94FF7A83706B7B5734A8/",
+      "size": "medium",
+      "type": "Creature Trooper",
+      "points": 90,
+      "speed": 2,
+      "upgrades": {
+        "Command": 1,
+        "Training": 1,
+        "Gear": 1,
+        "Comms": 1
+      },
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13940285596618766501/847E2E5B577E5F3AAE1D473FE9A10BCE468A3094/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/11319334885600705090/2ACE36DD1F4FAE8ED21CC59A54D3DB6D780C885D/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "See You in Hell",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/10773409737362779349/F1880C8286BA798323F594FA7DF7ABDB85A0A3DD/",
+          "pip": 1
+        }
+      ]
     },
     {
       "name": "Rebel Agent",
@@ -449,7 +530,8 @@
       },
       "minis": [
         {
-          "bundle": "http://cloud-3.steamusercontent.com/ugc/2174736446809186599/4B154E18EF2C0ADE6C347FC4B15AD856D00546DF/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/14052244614810856390/56285EFFD6CBC4799ADAA95830EB2F10E4120F69/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15565584712668003223/F742EEF3DC4CAE87C9E9D5974891C2A445C48649/"
         }
       ],
       "commands": [
@@ -639,10 +721,10 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/DinUnit.json"
+      "content": "contrib/cards/Mercenary/DinUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/IG11Unit.json"
+      "content": "contrib/cards/Mercenary/IG11Unit.json"
     },
     {
       "name": "Ahsoka Tano",
@@ -826,7 +908,10 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json"
+    },
+    {
+      "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json"
     },
     {
       "name": "Ewok Skirmishers",
@@ -874,7 +959,7 @@
       "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133198280/BA9DB93D2D168B835C95075E8B1C52C79E044286/",
       "size": "small",
       "type": "Trooper",
-      "points": 48,
+      "points": 42,
       "speed": 2,
       "upgrades": {
         "Heavy Weapon": 1,
@@ -885,44 +970,20 @@
       },
       "minis": [
         {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173156/D637683F992DD0C4488252BE266EEEA1F26006B0/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541172655/B10522A40482843AF69A3F321BD091B0ECF52C6B/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/17504878929475056902/7D83CFA0BD23993580F90863A33AD5743E8FC778/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9547146995441004401/223F75C5260F31457426962BDE853215FD2E4696/"
         },
         {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541172497/B3E1593143504101920CC6419BE7C2EAEF52993F/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541188141/6E23E29BB42963B94A0B7DFE01C4C49D776D9657/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/11486357574412562426/7547BC81C08E0B15022770FF6FBF33FA66D1DB43/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9789374328584101623/2B3AABFCECA29D3EBA6B87F1D33C1913A3FB3FAE//"
         },
         {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173253/155BAA01BA51A8EB524DD434A3C512D8C0B3A04B/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541172655/B10522A40482843AF69A3F321BD091B0ECF52C6B/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/17377233370710228946/0A4A965CB67E1E6B4B2A58A0E949D588D41AAD6B/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14988427562404509763/03DF88DCE5809143B7DEA0C3ADD9F756DA86B23E/"
         },
         {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173354/3483C6FB73C66481BC6CCC398BAB8E796F7EC076/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541188141/6E23E29BB42963B94A0B7DFE01C4C49D776D9657/"
-        }
-      ]
-    },
-    {
-      "name": "Rebel Commandos",
-      "displayName": "Rebel Commandos (Strike Team)",
-      "title": "Strike Team",
-      "heavyWeaponTeam": true,
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133197589/A51BFFE52ED2FAE9DACE45BF774C7F5FE12CBC07/",
-      "size": "small",
-      "type": "Trooper",
-      "points": 20,
-      "speed": 2,
-      "upgrades": {
-        "Heavy Weapon": 1,
-        "Training": 1,
-        "Comms": 1,
-        "Gear": 1,
-        "Grenades": 1
-      },
-      "minis": [
-        {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173156/D637683F992DD0C4488252BE266EEEA1F26006B0/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541172655/B10522A40482843AF69A3F321BD091B0ECF52C6B/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16097408999552065934/9F18078D897B967B552FCE7B9D7F198FC50B58E4/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9566804180720822422/B4A75666546AF78CC290D4030754377548983638/"
         }
       ]
     },
@@ -1190,6 +1251,30 @@
         }
       ]
     },
+    {
+      "name": "Rebel Commandos",
+      "displayName": "Rebel Commandos (Strike Team)",
+      "title": "Strike Team",
+      "heavyWeaponTeam": true,
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/15391478724315537430/D37281FE62D2FB944EF610EB01C66232CA9BB8EA/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 20,
+      "speed": 2,
+      "upgrades": {
+        "Heavy Weapon": 1,
+        "Training": 1,
+        "Comms": 1,
+        "Gear": 1,
+        "Grenades": 1
+      },
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16453620303646761666/4D8DBD4999B75F314799A70F47115CAA5BE658E2/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17012966922360507699/78F075440D9D93CD87119353FA24E886EEBBAB3A/"
+        }
+      ]
+    },
     {
       "name": "Tauntaun Riders",
       "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133194939/65297606E28367C04BF4BB4DE3474EAB723F4416/",
@@ -1213,7 +1298,7 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json"
+      "content": "contrib/cards/Mercenary/SwoopBikeRidersUnit.json"
     }
   ],
   "Heavy": [
@@ -1323,6 +1408,9 @@
           "pip": 3
         }
       ]
+    },
+    {
+      "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json"
     }
   ]
 }
diff --git a/contrib/cards/Republic/RepublicUnits.json b/contrib/cards/Republic/RepublicUnits.json
index 0a7d1f25e..c837017fa 100644
--- a/contrib/cards/Republic/RepublicUnits.json
+++ b/contrib/cards/Republic/RepublicUnits.json
@@ -1,5 +1,55 @@
 {
   "Commander": [
+    {
+      "name": "Ki-Adi-Mundi",
+      "title": "Jedi Council",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/11929402197203734988/9CF2A7578A3EB20BA278864950D163A26901C4F5/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 0,
+      "speed": 2,
+      "upgrades": {},
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/12461470789103203864/DACD5524454E91F35C586DDEABAD420ED4E1FF46/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17297173129004280551/384F67D13FCA3EBA539BD8D3818F5A0E5A8F2A0B/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "Force of Will",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/18170241117176866803/0C12349B15161AD068F2BFD1AB13681EB31255FD/",
+          "pip": 3
+        }
+      ]
+    },
+    {
+      "name": "Mace Windu",
+      "title": "Jedi Council",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/12731488793753419264/4F069455F4652D7D87B92F26C1EB7C0888C7D48E/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 165,
+      "speed": 2,
+      "upgrades": {
+        "Command": 1,
+        "Force": 3,
+        "Training": 2
+      },
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/12925628276853873664/6E5E101942F74FC183F7154481D3EB5CFEAAAD65/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/18287494378041429592/02BB80E1E8A06309E2424A0AD83A7A68E9A42FD6/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "This Party's Over",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/11977462417526561880/68CB1C0EABB464F67AF434BE84666B6FF126E6CD/",
+          "pip": 1
+        }
+      ]
+    },
     {
       "name": "Ahsoka Tano",
       "title": "Padawan Commander",
@@ -21,7 +71,7 @@
       "commands": [
         {
           "name": "You Are Beaten",
-          "image": "https://steamusercontent-a.akamaihd.net/ugc/59217531459831475/BAB718B98F827E294BA50680227A363E3256DC7A/",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/14515441792303199216/BAB718B98F827E294BA50680227A363E3256DC7A/",
           "pip": 1
         },
         {
@@ -280,7 +330,7 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json"
     },
     {
       "name": "Clone Commander Cody",
@@ -321,7 +371,53 @@
   ],
   "Operative": [
     {
-      "content": "contrib/cards/ShadowCollective/HondoUnit.json"
+      "content": "contrib/cards/Mercenary/HondoUnit.json"
+    },
+    {
+      "name": "Shaak Ti",
+      "title": "Jedi Council",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/17555033359148455110/D2F1B99C8AB43C8B73071DAED15D378AC38F65C5/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 0,
+      "speed": 2,
+      "upgrades": {},
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/18026057114183857483/0D959FB4A356818AA1FA6D8034166916BB6EA84B/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9607653251760381402/E7F70FBA0C514FFA35DB2213F1F958835192D473/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "Unity Wins Wars",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/17101391156956704931/3299D62F86B634A6850085F40EA1DD60DC3BDEDE/",
+          "pip": 3
+        }
+      ]
+    },
+    {
+      "name": "Plo Koon",
+      "title": "Jedi Council",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/11338358295243396609/72E584709E6C16445AFBDB6820E58449092839EF/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 0,
+      "speed": 2,
+      "upgrades": {},
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/10428072234539757120/3154697B7EB8A5076E1CB4C312068560C7B3DE19/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16082411658181568841/AC55908D9B799DAEE652A7505DD8E06857464614/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "I Don't Believe in Chance",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/15864173543972429126/27FCE434351A715B9DDDC4B033C3DE79B0260000/",
+          "pip": 2
+        }
+      ]
     },
     {
       "name": "Jedi Knight",
@@ -522,7 +618,10 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json"
+    },
+    {
+      "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json"
     }
   ],
   "Special Forces": [
@@ -561,26 +660,36 @@
       ]
     },
     {
-      "name": "Arc Troopers",
-      "title": "Strike Team",
-      "displayName": "Arc Troopers (Strike Team)",
-      "heavyWeaponTeam": true,
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384861099/0BF691267928341734741CDF04AAE59A41E5E20B/",
+      "name": "ARF Troopers",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/59215140638617511/EF41D3B9F89F86EC4E803863C17D1549052C8B55/",
       "size": "small",
       "type": "Clone Trooper",
-      "points": 24,
+      "points": 66,
       "speed": 2,
       "upgrades": {
+        "Squad Leader": 1,
         "Heavy Weapon": 1,
+        "Personel": 1,
         "Training": 1,
         "Comms": 1,
-        "Gear": 2,
         "Grenades": 1
       },
       "minis": [
         {
-          "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457802621/01F605D855048F823A0ECA6C46D2A62B56C04124/",
-          "secondary": "http://cloud-3.steamusercontent.com/ugc/773995200348530664/5E248091F8CC37B1023257338D4947E4ADFE48AB/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16428815149933614/80D6829DB63FAE3328D00AC36F00E5FD71251E69/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16428815149933714/D3FE0C2DEFBE1E78A71A55516DF87199D66DE2AC/"
+        },
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16428815149649053/B24484CFED06020454EE95B663DB3ECE17871D26/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16428815149646949/50B6AA8C2CC5283537DBA2291F9801E7CD5FE77C/"
+        },
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16428815149643329/8D273B40809BF89188238DE6FC5C207756AA22EF/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16428815149643405/9A3D0A513A31513523E59855980DFCE0A8F0F6E0/"
+        },
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16428815149932871/EE8DF333D45ED841E9C31625FB4A9385C16B2F49/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16428815149933386/736E0CCF2ADE31D6A9F6BE172B20AEB5420B815E/"
         }
       ]
     },
@@ -677,6 +786,30 @@
     }
   ],
   "Support": [
+    {
+      "name": "Arc Troopers",
+      "title": "Strike Team",
+      "displayName": "Arc Troopers (Strike Team)",
+      "heavyWeaponTeam": true,
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/11640734367175082150/31600D0C168D48D5E353E7E0A6D60C4935531D62/",
+      "size": "small",
+      "type": "Clone Trooper",
+      "points": 23,
+      "speed": 2,
+      "upgrades": {
+        "Heavy Weapon": 1,
+        "Training": 1,
+        "Comms": 1,
+        "Gear": 2,
+        "Grenades": 1
+      },
+      "minis": [
+        {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457802621/01F605D855048F823A0ECA6C46D2A62B56C04124/",
+          "secondary": "http://cloud-3.steamusercontent.com/ugc/773995200348530664/5E248091F8CC37B1023257338D4947E4ADFE48AB/"
+        }
+      ]
+    },
     {
       "name": "BARC Speeder",
       "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135357592/ED3AA636CBB456AA395C1694D27B84A296DD406B/",
@@ -743,7 +876,7 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json"
+      "content": "contrib/cards/Mercenary/SwoopBikeRidersUnit.json"
     },
     {
       "name": "Raddaugh Gnasp Fluttercraft",
@@ -889,7 +1022,7 @@
     {
       "name": "Infantry Support Platform",
       "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135344629/540E23C816C00B4B7E086B626329F13633403C9E/",
-      "size": "huge",
+      "size": "laat",
       "type": "Repulsor Vehicle",
       "points": 65,
       "speed": 3,
@@ -899,14 +1032,17 @@
         "Comms": 1
       },
       "silhouette": {
-        "height": 1.55,
+        "height": 2.25,
         "offset": 0.0
       },
       "minis": [
         {
-          "bundle": "http://cloud-3.steamusercontent.com/ugc/1619598523372574861/CCF68AF1C35F52A714AB0344FCB170F5BAA1672A/"
+          "bundle": "https://steamusercontent-a.akamaihd.net/ugc/14282592344641491251/15FE05F31AF626C6839758EB55F1CE175915ABB7/"
         }
       ]
+    },
+    {
+      "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json"
     }
   ]
 }
diff --git a/contrib/cards/Separatist/SeparatistUnits.json b/contrib/cards/Separatist/SeparatistUnits.json
index e1679b5d5..cb363bbcf 100644
--- a/contrib/cards/Separatist/SeparatistUnits.json
+++ b/contrib/cards/Separatist/SeparatistUnits.json
@@ -38,12 +38,17 @@
     {
       "name": "General Grievous",
       "title": "Wheel Bike Warlord",
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/14797403978689987926/064DA0169CEEAE3EF0AFA49AE394936BBCDFDCDB/",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/10719584612465428796/38DFBFBDFC11B138DD5FC2DE9F0B6BA67E4450C6/",
       "size": "large",
       "type": "Ground Vehicle",
-      "points": 0,
+      "points": 150,
       "speed": 2,
-      "upgrades": {},
+      "upgrades": {
+        "Command": 1,
+        "Training": 1,
+        "Gear": 1,
+        "Grenades": 1
+      },
       "silhouette": {
         "height": 2.57,
         "offset": 0
@@ -69,6 +74,21 @@
           "name": "Crush Them!",
           "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131524786/7D9A98904E7D5F80F9590AAA5EDF107F2B95623A/",
           "pip": 3
+        },
+        {
+          "name": "I'll Do it Myself!",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/15891905199014084776/E70951C31E286BCF03E7D6BB08ED6DA6C96D9701/",
+          "pip": 1
+        },
+        {
+          "name": "Pincer Attack",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/13331811042949504722/5032E1A16107F4D2C8DA6FE2C3AA707D5EB55EDD/",
+          "pip": 2
+        },
+        {
+          "name": "Full Throttle",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/17267278540148426820/E310561126BE74D0A9CB502C551C8DF2D76E7B1A/",
+          "pip": 3
         }
       ]
     },
@@ -106,6 +126,21 @@
           "name": "Crush Them!",
           "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131524786/7D9A98904E7D5F80F9590AAA5EDF107F2B95623A/",
           "pip": 3
+        },
+        {
+          "name": "I'll Do it Myself!",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/15891905199014084776/E70951C31E286BCF03E7D6BB08ED6DA6C96D9701/",
+          "pip": 1
+        },
+        {
+          "name": "Pincer Attack",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/13331811042949504722/5032E1A16107F4D2C8DA6FE2C3AA707D5EB55EDD/",
+          "pip": 2
+        },
+        {
+          "name": "Full Throttle",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/17267278540148426820/E310561126BE74D0A9CB502C551C8DF2D76E7B1A/",
+          "pip": 3
         }
       ]
     },
@@ -247,10 +282,10 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/BlackSunVigoUnit.json"
+      "content": "contrib/cards/Mercenary/BlackSunVigoUnit.json"
     },
     {
       "name": "Poggle the Lesser",
@@ -290,6 +325,29 @@
     }
   ],
   "Operative": [
+    {
+      "name": "Savage Opress",
+      "title": "Dooku's Apprentice",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/13168414506047365764/A8CEC8BB31ACD5D20F2472F1FE2A1C0BE1179F34/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 0,
+      "speed": 2,
+      "upgrades": {},
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/11082776058831308047/3A974FCF53960CCBBC537A4134AD12242D4DDF89/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17875535680143582051/1C009264C71FD35359145238DFA2CBD5D1872CD4/"
+        }
+      ],
+      "commands": [
+        {
+          "name": "We Shall Start With Revenge",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/10750064270635517385/492A552BB4056A4CBF9CD01FB5195521104C9F9E/",
+          "pip": 1
+        }
+      ]
+    },
     {
       "name": "Super Tactical Command Droid",
       "title": "Auxiliary Command Droid",
@@ -325,13 +383,13 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/HondoUnit.json"
+      "content": "contrib/cards/Mercenary/HondoUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/CadBaneUnit.json"
+      "content": "contrib/cards/Mercenary/CadBaneUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/BosskUnit.json"
+      "content": "contrib/cards/Mercenary/BosskUnit.json"
     },
     {
       "name": "Maul",
@@ -498,10 +556,13 @@
       ]
     },
     {
-      "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json"
+      "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json"
     },
     {
-      "content": "contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json"
+      "content": "contrib/cards/Mercenary/BlackSunEnforcersUnit.json"
+    },
+    {
+      "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json"
     },
     {
       "name": "Geonosian Warriors",
@@ -533,6 +594,34 @@
           "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/"
         }
       ]
+    },
+    {
+      "name": "Geonosian Warriors",
+      "title": "Geonosian Engineers",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/11895799947387687406/705B68582845528AF5FD5EEED97415BB9B36F748/",
+      "size": "small",
+      "type": "Trooper",
+      "points": 45,
+      "speed": 2,
+      "upgrades": {},
+      "minis": [
+        {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/2058763770177202081/37F68E146C49B315AA46E15BE88DDB56AE97646C/",
+          "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/"
+        },
+        {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/2058763770177201554/7AEA5B0A98A298731F6BE51591401BBF095A5797/",
+          "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/"
+        },
+        {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/2058763770177201933/E0DBF0D812FFF4F7F3A77CF1E4EAB84F78B8C49E/",
+          "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/"
+        },
+        {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/2058763770177202012/76CB0371503304D5AAF562E5E2F04961CD206090/",
+          "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/"
+        }
+      ]
     }
   ],
   "Special Forces": [
@@ -569,30 +658,6 @@
         }
       ]
     },
-    {
-      "name": "BX-Series Droid Commandos",
-      "title": "Strike Team",
-      "displayName": "BX-Series Commandos (Strike Team)",
-      "heavyWeaponTeam": true,
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131430807/F260EA4E79ACB29C3C635836A3EF7E7C632E4FB6/",
-      "size": "small",
-      "type": "Droid Trooper",
-      "points": 20,
-      "speed": 2,
-      "upgrades": {
-        "Heavy Weapon": 1,
-        "Training": 1,
-        "Comms": 1,
-        "Armament": 1,
-        "Grenades": 1
-      },
-      "minis": [
-        {
-          "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457847081/F7D4E8D3EC85BAEEB5C1B5B913B7F484CC28FC10/",
-          "secondary": "http://cloud-3.steamusercontent.com/ugc/773995528924546789/8774CBBDC3C4F18B11A444CC96EA5FE7F00DB48F/"
-        }
-      ]
-    },
     {
       "name": "DRK-1 Sith Probe Droids",
       "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131432071/495850F5BE28D1D1551D13D5B86F473D8EB154EC/",
@@ -675,23 +740,71 @@
           "secondary": "http://cloud-3.steamusercontent.com/ugc/1621849538641208262/A0E48F7D9C94617C81BAD4D649717BAC7A8B9B64/"
         }
       ]
+    },
+    {
+      "name": "TSMEU-6 Wheel Bikes",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/15288499232659659250/25E204B8F8CE71424524AEC8158D526F0FCA5347/",
+      "size": "large",
+      "type": "Ground Vehicle",
+      "points": 90,
+      "speed": 2,
+      "upgrades": {
+        "Pilot": 1,
+        "Training": 1,
+        "Comms": 1,
+        "Gear": 1
+      },
+      "silhouette": {
+        "height": 2.91,
+        "offset": 0.0
+      },
+      "minis": [
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/10144700341503599438/88D1E2DC8FFF46535836C0B531A2565289E67BB6/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17563221817980340918/4801D5FAE716911B413B5F0C790F000B63E0104C/"
+        },
+        {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15728085712538195211/C8E5D2D006905324C7541C35765C4FF43D3D06B6/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17607413312287217729/FD59E769888166ADDE570190F4B5866F31E59409/"
+        }
+      ]
     }
   ],
   "Support": [
+    {
+      "name": "BX-Series Droid Commandos",
+      "title": "Strike Team",
+      "displayName": "BX-Series Commandos (Strike Team)",
+      "heavyWeaponTeam": true,
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/9315317574108774179/CDF58FFA2BD16DDB0B5DEFDBC073AF2AE2D91F65/",
+      "size": "small",
+      "type": "Droid Trooper",
+      "points": 20,
+      "speed": 2,
+      "upgrades": {
+        "Heavy Weapon": 1,
+        "Training": 1,
+        "Comms": 1,
+        "Armament": 1,
+        "Grenades": 1
+      },
+      "minis": [
+        {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457847081/F7D4E8D3EC85BAEEB5C1B5B913B7F484CC28FC10/",
+          "secondary": "http://cloud-3.steamusercontent.com/ugc/773995528924546789/8774CBBDC3C4F18B11A444CC96EA5FE7F00DB48F/"
+        }
+      ]
+    },
     {
       "name": "Droidekas",
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131432109/A0B45534B85F46D38A4F372B04041A5193B31426/",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/15998077387230471508/D99F8B4E4B7AF5FE30C23F4528F776797333B602/",
       "size": "medium",
-      "type": "Ground Vehicle",
-      "points": 60,
+      "type": "Emplacement Trooper",
+      "points": 67,
       "speed": 1,
       "upgrades": {
         "Comms": 1
       },
-      "silhouette": {
-        "height": 1.85,
-        "offset": 0.0
-      },
       "minis": [
         {
           "bundle": "http://cloud-3.steamusercontent.com/ugc/1686023445067168845/FBADA8EDE2ED248CA7F50C1DB3BFF46215E0360B/",
@@ -721,13 +834,14 @@
       },
       "minis": [
         {
-          "bundle": "https://steamusercontent-a.akamaihd.net/ugc/16432158164944196/4594ADE002844CEEB6FB9A75E17AA802FCAE89FF/"
+          "bundle": "https://steamusercontent-a.akamaihd.net/ugc/16432158164944196/4594ADE002844CEEB6FB9A75E17AA802FCAE89FF/",
+          "secondary": "https://steamusercontent-a.akamaihd.net/ugc/2491139050708070994/E763691AC8C24925DA2CA117DE90A54BAC836230/"
         }
       ]
     },
     {
       "name": "STAP Riders",
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131433789/32FE5B587A5DD8D208101FCE74CD2BE690483F37/",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/15661631464886192384/E464BADECADC111B8100A6E02301597C467FDD72/",
       "size": "medium",
       "type": "Repulsor Vehicle",
       "points": 80,
@@ -777,7 +891,7 @@
     {
       "name": "AAT Battle Tank",
       "displayName": "AAT Battle Tank",
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131430642/9FCE0FB0F62A9381DF3CE2F786DBC749CB2A8FFF/",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/15356261010346172115/9FCE0FB0F62A9381DF3CE2F786DBC749CB2A8FFF/",
       "size": "epic",
       "type": "Repulsor Vehicle",
       "points": 165,
@@ -847,19 +961,15 @@
     },
     {
       "name": "Aqua Droids",
-      "image": "https://steamusercontent-a.akamaihd.net/ugc/1794100632571587/D3308B09BB6167322BFFB83C1A7E420C431D2396/",
+      "image": "https://steamusercontent-a.akamaihd.net/ugc/15835541998063761576/AFCAE9EC6C8FD26B11D7E2D3391F8242C7D4CFF0/",
       "size": "medium",
-      "type": "Ground Vehicle",
+      "type": "Emplacement Trooper",
       "points": 65,
       "speed": 1,
       "upgrades": {
         "Heavy Weapon": 1,
         "Comms": 1
       },
-      "silhouette": {
-        "height": 1.85,
-        "offset": 0.0
-      },
       "minis": [
         {
           "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16428277771257521/99A8ACEC9864DE29C7CE97006E86248BB2A89554/",
@@ -874,6 +984,9 @@
           "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16428277771241663/4DEF50D36EB484BB1BBD9FD6092708DEF89A28EA/"
         }
       ]
+    },
+    {
+      "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json"
     }
   ]
 }
diff --git a/contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json b/contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json
deleted file mode 100644
index 4a232376a..000000000
--- a/contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "Black Sun Enforcers",
-  "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385139718139/222491782E56EAECE8B93E78E946F308211DC049/",
-  "size": "small",
-  "type": "Trooper",
-  "points": 50,
-  "speed": 2,
-  "upgrades": {
-    "Heavy Weapon": 1,
-    "Personnel": 1,
-    "Gear": 1,
-    "Grenades": 1
-  },
-  "minis": [
-    {
-      "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845475/01738B0D52E2D9C2870D6E33A2D05ECD12201C85/"
-    },
-    {
-      "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143724/48B5A35E10B4977E255D889A8FCAEA8C980A11A9/",
-      "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/"
-    },
-    {
-      "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143724/48B5A35E10B4977E255D889A8FCAEA8C980A11A9/",
-      "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/"
-    },
-    {
-      "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143724/48B5A35E10B4977E255D889A8FCAEA8C980A11A9/",
-      "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/"
-    }
-  ]
-}
diff --git a/contrib/cards/official.json b/contrib/cards/official.json
index 2dccbe02c..2800596fe 100644
--- a/contrib/cards/official.json
+++ b/contrib/cards/official.json
@@ -4,210 +4,204 @@
     "Empire": "Empire/EmpireUnits.json",
     "Republic": "Republic/RepublicUnits.json",
     "Separatist": "Separatist/SeparatistUnits.json",
-    "ShadowCollective": "ShadowCollective/ShadowCollectiveUnits.json"
+    "Mercenary": "Mercenary/MercenaryUnits.json"
   },
 
   "upgrades": {
     "Armament": [
       {
-        "name": "Heavy Arm Cannon",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/9491942057538415219/C158C02B7135405F2EC1E5B21BC2FB09876E21F8/",
-        "points": 20,
-        "restrictions": {
-          "include": {
-            "unit": ["Super Tactical Command Droid"]
-          }
-        }
-      },
-      {
-        "name": "Electrostaff",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/18437389315593431740/A0F53051C57B1167C6C2A631755BD8D4F0AFCB9B/",
-        "points": 10,
+        "name": "A-180 Pistol Config",
+        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137779/795B34FF0E53DA5355EA7952A034C6A4CFD003D0/",
+        "flip": {
+          "name": "A-180 Rifle Config",
+          "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137807/208481F3DC8BE18ED10D2A17F12F35869213235C/"
+        },
+        "points": 0,
         "restrictions": {
           "include": {
-            "unit": ["Super Tactical Command Droid"]
+            "unit": ["Jyn Erso"]
           }
         }
       },
       {
-        "name": "Twin Lightsabers",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10644823733316041135/289BDD492BB3E295276192F60944E251986DAAAF/",
+        "name": "A-300 Long Range Config",
+        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137867/156C35C00A49AC23AE84E5ACCF35ADD6D7CBD820/",
+        "flip": {
+          "name": "A-300 Short Range Config",
+          "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137938/8B2FA2C71505CA93AB086154658132C221BEBE1D/"
+        },
         "points": 0,
         "restrictions": {
           "include": {
-            "unit": ["Jedi Knight Genral", "Jedi Knight"]
+            "unit": ["Rebel Pathfinders"]
           }
         }
       },
       {
-        "name": "Lightsaber",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/9358476422022162198/D59B90B25355B223E8D91DF23E233DFCB591B3F7/",
+        "name": "A280, Pistol Config",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140081077/A5B040BCD34352C6E5375640DE539E526067DBFE/",
+        "flip": {
+          "name": "A280, Rifle Config",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140081159/19C93D73F4F86E9D7531E2CD784F5492772ED28F/"
+        },
         "points": 0,
         "restrictions": {
           "include": {
-            "unit": ["Jedi Knight Genral", "Jedi Knight"]
+            "unit": ["Cassian Andor"]
           }
         }
       },
       {
-        "name": "Double-Bladed Lightsaber",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10386689818644119201/B5A0C4C02D76641FFCF96A105E27DFE48C9DEDA9/",
-        "points": 0,
+        "name": "Beskar Spear",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639488/EDE8AA68D0589BFB956D68E2A08B31715C5F9D61/",
+        "points": 15,
         "restrictions": {
           "include": {
-            "unit": ["Jedi Knight Genral", "Jedi Knight"]
+            "unit": ["Din Djarin"]
           }
         }
       },
       {
-        "name": "Heavy Blaster Pistol (Rebel)",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/16982319690732285379/8FA680F434D4EF30BB0DCDB8835BABFB8C90B16F/",
-        "points": 5,
+        "name": "BX Deflector Shields",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927385/CD3E586656B39D35246C84BAFD6ADB12B665E5E5/",
+        "points": 18,
         "restrictions": {
           "include": {
-            "unit": ["Rebel Officer", "Rebel Agent"]
+            "unit": ["BX-Series Droid Commandos"]
           }
         }
       },
       {
-        "name": "Repeating Blaster",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/13484211657005252288/0AFB1BBC7DA74BA6713EDCA6869C28E2522C7128/",
-        "points": 25,
+        "name": "BX Vibroswords",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927392/0B4491CA615FAA34F7EFEDCE08BAD5A06571BE90/",
+        "points": 6,
         "restrictions": {
           "include": {
-            "unit": ["Rebel Officer", "Rebel Agent"]
+            "unit": ["BX-Series Droid Commandos"]
           }
         }
       },
       {
-        "name": "Vibro Axe",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/12824619755788191989/83D29D8C052D145897BAEF171074D066C4CB143A/",
-        "points": 8,
+        "name": "CR-24 Flame Rifle",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140106922/DC1ED64816ECD4A7AB128F05D70EF97408305AAF/",
+        "points": 10,
         "restrictions": {
           "include": {
-            "unit": ["Rebel Officer", "Rebel Agent"]
+            "unit": ["Dewback Rider"]
           }
         }
       },
       {
-        "name": "Heavy Blaster Pistol (Empire)",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/16148048905111619924/4146F9FBD1CE36B93A82B0403DB3E956510A7271/",
-        "points": 5,
+        "name": "DC-17m ICWS Config",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135385953/007D0426E485963714BCBE0B74B2B8AE5B7F1869/",
+        "flip": {
+          "name": "DC-17m ICWS Config",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135386003/EB0729A53546B70CB9054BAF5306E3F5368FC9DF/"
+        },
+        "points": 0,
         "restrictions": {
           "include": {
-            "unit": ["Imperial Officer", "Imperial Agent"]
+            "unit": ["Clone Commandos", "Clone Commandos Delta Squad"]
           }
         }
       },
       {
-        "name": "Stun Baton",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/11788115204668483271/6494041D37500BD80CE8CB640CC058D4CDB7C5DD/",
-        "points": 8,
+        "name": "Double-Bladed Lightsaber",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10386689818644119201/B5A0C4C02D76641FFCF96A105E27DFE48C9DEDA9/",
+        "points": 0,
         "restrictions": {
           "include": {
-            "unit": ["Imperial Officer", "Imperial Agent"]
+            "unit": ["Jedi Knight Genral", "Jedi Knight"]
           }
         }
       },
       {
-        "name": "Z-6 Riot Baton",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/11921155978538693026/3426025D9984B223902084BA7DA742C27DEC0D63/",
-        "points": 8,
+        "name": "Din's Amban Rifle",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639183/C2D75F184A5F66EA154C4DF44AADA7A9443A9468/",
+        "points": 10,
         "restrictions": {
           "include": {
-            "unit": ["Imperial Officer", "Imperial Agent"]
+            "unit": ["Din Djarin"]
           }
         }
       },
       {
-        "name": "A-180 Rifle Config",
-        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137807/208481F3DC8BE18ED10D2A17F12F35869213235C/",
-        "flip": {
-          "name": "A-180 Pistol Config",
-          "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137779/795B34FF0E53DA5355EA7952A034C6A4CFD003D0/"
-        },
-        "points": 0,
+        "name": "Electro Gauntlets",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639059/89380FD599DD6819950BB21C5F940A9074C34A51/",
+        "points": 10,
         "restrictions": {
           "include": {
-            "unit": ["Jyn Erso"]
+            "unit": ["Cad Bane"]
           }
         }
       },
       {
-        "name": "A-300 Long Range Config",
-        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137867/156C35C00A49AC23AE84E5ACCF35ADD6D7CBD820/",
-        "flip": {
-          "name": "A-300 Short Range Config",
-          "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137938/8B2FA2C71505CA93AB086154658132C221BEBE1D/"
-        },
-        "points": 0,
+        "name": "Electrostaff",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/18437389315593431740/A0F53051C57B1167C6C2A631755BD8D4F0AFCB9B/",
+        "points": 10,
         "restrictions": {
           "include": {
-            "unit": ["Rebel Pathfinders"]
+            "unit": ["Super Tactical Command Droid"]
           }
         }
       },
       {
-        "name": "A280, Rifle Config",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140081159/19C93D73F4F86E9D7531E2CD784F5492772ED28F/",
+        "name": "E-11D Focused Fire Config",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103278/AC9A32D518E9E70AF6ABBA41F7E10DF58DADFF20/",
         "flip": {
-          "name": "A280, Pistol Config",
-          "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140081077/A5B040BCD34352C6E5375640DE539E526067DBFE/"
+          "name": "E-11D Grenade Launcher Config",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103366/FB39C5636706702276566978A5EDD34907C1D8DB/"
         },
         "points": 0,
         "restrictions": {
           "include": {
-            "unit": ["Cassian Andor"]
+            "unit": ["Imperial Death Troopers"]
           }
         }
       },
       {
-        "name": "CR-24 Flame Rifle",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140106922/DC1ED64816ECD4A7AB128F05D70EF97408305AAF/",
-        "points": 10,
+        "name": "Heavy Arm Cannon",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/9491942057538415219/C158C02B7135405F2EC1E5B21BC2FB09876E21F8/",
+        "points": 20,
         "restrictions": {
           "include": {
-            "unit": ["Dewback Rider"]
+            "unit": ["Super Tactical Command Droid"]
           }
         }
       },
       {
-        "name": "BX Deflector Shields",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927385/CD3E586656B39D35246C84BAFD6ADB12B665E5E5/",
-        "points": 18,
+        "name": "Heavy Blaster Pistol (Empire)",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16148048905111619924/4146F9FBD1CE36B93A82B0403DB3E956510A7271/",
+        "points": 5,
         "restrictions": {
           "include": {
-            "unit": ["BX-Series Droid Commandos"]
+            "unit": ["Imperial Officer", "Imperial Agent"]
           }
         }
       },
       {
-        "name": "E-11D Focused Fire Config",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103278/AC9A32D518E9E70AF6ABBA41F7E10DF58DADFF20/",
-        "flip": {
-          "name": "E-11D Grenade Launcher Config",
-          "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103366/FB39C5636706702276566978A5EDD34907C1D8DB/"
-        },
-        "points": 0,
+        "name": "Heavy Blaster Pistol (Rebel)",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16982319690732285379/8FA680F434D4EF30BB0DCDB8835BABFB8C90B16F/",
+        "points": 5,
         "restrictions": {
           "include": {
-            "unit": ["Imperial Death Troopers"]
+            "unit": ["Rebel Officer", "Rebel Agent"]
           }
         }
       },
       {
-        "name": "Electro Gauntlets",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639059/89380FD599DD6819950BB21C5F940A9074C34A51/",
-        "points": 10,
+        "name": "Iden's DLT-20A Rifle",
+        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568142679/5583B4B2E96BA55F3A4D2DE46EBF31B130AAA757/",
+        "points": 15,
         "restrictions": {
           "include": {
-            "unit": ["Cad Bane"]
+            "unit": ["Iden Versio"]
           }
         }
       },
       {
-        "name": "Iden's DLT-20A Rifle",
-        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568142679/5583B4B2E96BA55F3A4D2DE46EBF31B130AAA757/",
+        "name": "Iden's TL-50 Repeater",
+        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568142734/E13169C3DF9153C7196A29DB82578DE1FD659F6D/",
         "points": 15,
         "restrictions": {
           "include": {
@@ -249,6 +243,16 @@
           }
         }
       },
+      {
+        "name": "Lightsaber",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/9358476422022162198/D59B90B25355B223E8D91DF23E233DFCB591B3F7/",
+        "points": 0,
+        "restrictions": {
+          "include": {
+            "unit": ["Jedi Knight Genral", "Jedi Knight"]
+          }
+        }
+      },
       {
         "name": "Looted E-5 Blaster",
         "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568143554/AAE0C21ACF5E130BCCD15B21BDC1027613DC26BA/",
@@ -260,18 +264,18 @@
         }
       },
       {
-        "name": "RT-97C Blaster Rifle",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140107008/1524B081B7155F22B18F85E7789813478AE6EA3C/",
-        "points": 5,
+        "name": "Repeating Blaster",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/13484211657005252288/0AFB1BBC7DA74BA6713EDCA6869C28E2522C7128/",
+        "points": 25,
         "restrictions": {
           "include": {
-            "unit": ["Dewback Rider"]
+            "unit": ["Rebel Officer", "Rebel Agent"]
           }
         }
       },
       {
-        "name": "T-21 Blaster Rifle",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140107073/9B787B4695966A18D0659B28A979EBEFFA1C29BD/",
+        "name": "RT-97C Blaster Rifle",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140107008/1524B081B7155F22B18F85E7789813478AE6EA3C/",
         "points": 5,
         "restrictions": {
           "include": {
@@ -280,126 +284,122 @@
         }
       },
       {
-        "name": "Iden's TL-50 Repeater",
-        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568142734/E13169C3DF9153C7196A29DB82578DE1FD659F6D/",
+        "name": "Saxon's Galar-90 Rifle",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638360/9640DCEEFC8C952C5828F120F9527886B6AD1AEB/",
         "points": 15,
         "restrictions": {
           "include": {
-            "unit": ["Iden Versio"]
+            "unit": ["Gar Saxon"]
           }
         }
       },
       {
-        "name": "The Darksaber",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140090412/816EE4F5B469EC8334D0E84042E5C008FC67B04B/",
-        "points": 15,
+        "name": "Saxon's Jetpack Rockets",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638324/2B2554057A17324B946ADF61B44CFB94081A770D/",
+        "points": 10,
         "restrictions": {
           "include": {
-            "unit": ["Sabine Wren"]
+            "unit": ["Gar Saxon"]
           }
         }
       },
       {
-        "name": "BX Vibroswords",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927392/0B4491CA615FAA34F7EFEDCE08BAD5A06571BE90/",
-        "points": 6,
+        "name": "Saxon's ZX Flame Projector",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638292/3120A41DA39C3D76C2B2584CB20390E4D8FE90D4/",
+        "points": 5,
         "restrictions": {
           "include": {
-            "unit": ["BX-Series Droid Commandos"]
+            "unit": ["Gar Saxon"]
           }
         }
       },
       {
-        "name": "Saxon's Jetpack Rockets",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638324/2B2554057A17324B946ADF61B44CFB94081A770D/",
-        "points": 10,
+        "name": "Stun Baton",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/11788115204668483271/6494041D37500BD80CE8CB640CC058D4CDB7C5DD/",
+        "points": 8,
         "restrictions": {
           "include": {
-            "unit": ["Gar Saxon"]
+            "unit": ["Imperial Officer", "Imperial Agent"]
           }
         }
       },
       {
-        "name": "Saxon's Galar-90 Rifle",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638360/9640DCEEFC8C952C5828F120F9527886B6AD1AEB/",
-        "points": 15,
+        "name": "Super Commando Jetpack Rockets",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638126/810C46F8A1B873A7CFFBDC1DDDEE400DFC3AF388/",
+        "points": 8,
         "restrictions": {
           "include": {
-            "unit": ["Gar Saxon"]
+            "unit": ["Mandalorian Super Commandos"]
           }
         }
       },
       {
-        "name": "Saxon's ZX Flame Projector",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638292/3120A41DA39C3D76C2B2584CB20390E4D8FE90D4/",
+        "name": "T-21 Blaster Rifle",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140107073/9B787B4695966A18D0659B28A979EBEFFA1C29BD/",
         "points": 5,
         "restrictions": {
           "include": {
-            "unit": ["Gar Saxon"]
+            "unit": ["Dewback Rider"]
           }
         }
       },
       {
-        "name": "The Darksaber (Maul)",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148637945/3B49E86E68EBCB65154B12ECD4336463F7400B95/",
-        "points": 10,
+        "name": "The Darksaber",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140090412/816EE4F5B469EC8334D0E84042E5C008FC67B04B/",
+        "points": 15,
         "restrictions": {
           "include": {
-            "unit": ["Maul"]
+            "unit": ["Sabine Wren"]
           }
         }
       },
       {
-        "name": "Super Commando Jetpack Rockets",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638126/810C46F8A1B873A7CFFBDC1DDDEE400DFC3AF388/",
-        "points": 8,
+        "name": "The Darksaber (Gideon)",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16625983135926386325/491ADB4AF793015C774CBB05E327DFBB53A59E7B/",
+        "points": 15,
         "restrictions": {
           "include": {
-            "unit": ["Mandalorian Super Commandos"]
+            "unit": ["Moff Gideon"]
           }
         }
       },
       {
-        "name": "Din's Amban Rifle",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639183/C2D75F184A5F66EA154C4DF44AADA7A9443A9468/",
+        "name": "The Darksaber (Maul)",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148637945/3B49E86E68EBCB65154B12ECD4336463F7400B95/",
         "points": 10,
         "restrictions": {
           "include": {
-            "unit": ["Din Djarin"]
+            "unit": ["Maul"]
           }
         }
       },
       {
-        "name": "Beskar Spear",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639488/EDE8AA68D0589BFB956D68E2A08B31715C5F9D61/",
-        "points": 15,
+        "name": "Twin Lightsabers",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10644823733316041135/289BDD492BB3E295276192F60944E251986DAAAF/",
+        "points": 0,
         "restrictions": {
           "include": {
-            "unit": ["Din Djarin"]
+            "unit": ["Jedi Knight Genral", "Jedi Knight"]
           }
         }
       },
       {
-        "name": "The Darksaber (Gideon)",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/16625983135926386325/491ADB4AF793015C774CBB05E327DFBB53A59E7B/",
-        "points": 15,
+        "name": "Vibro Axe",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/12824619755788191989/83D29D8C052D145897BAEF171074D066C4CB143A/",
+        "points": 8,
         "restrictions": {
           "include": {
-            "unit": ["Moff Gideon"]
+            "unit": ["Rebel Officer", "Rebel Agent"]
           }
         }
       },
       {
-        "name": "DC-17m ICWS Config",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135385953/007D0426E485963714BCBE0B74B2B8AE5B7F1869/",
-        "flip": {
-          "name": "DC-17m ICWS Config",
-          "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135386003/EB0729A53546B70CB9054BAF5306E3F5368FC9DF/"
-        },
-        "points": 0,
+        "name": "Z-6 Riot Baton",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/11921155978538693026/3426025D9984B223902084BA7DA742C27DEC0D63/",
+        "points": 8,
         "restrictions": {
           "include": {
-            "unit": ["Clone Commandos", "Clone Commandos Delta Squad"]
+            "unit": ["Imperial Officer", "Imperial Agent"]
           }
         }
       }
@@ -422,7 +422,7 @@
       },
       {
         "name": "Improvised Orders",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/9869682046426627943/152512DE2EE5592159A7D5A4E9BB7111A0C729B5/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16226117530699489950/0082F67676066542C5BA5DA1D970DD18CFAFCCA1/",
         "points": 5
       },
       {
@@ -437,7 +437,7 @@
       },
       {
         "name": "Trusted Agent",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/17954061666704112600/9401A70D88A98BA9FC5B5D8E56B0FA7F3B95961B/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/13647228434712340827/31340C9F16017CEC33FF34C97256BFBEE7AB7AAF/",
         "points": 5
       },
       {
@@ -674,6 +674,16 @@
           }
         }
       },
+      {
+        "name": "Black Sun Crew",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/13580814712079812423/759CBAED43A1DFA12E7876B92C53EA8CD536F4DE/",
+        "points": 5,
+        "restrictions": {
+          "include": {
+            "unit": ["WLO-5 Speeder Tank"]
+          }
+        }
+      },
       {
         "name": "Door Gunners",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/10380945357802391916/5D21C9620D0382828965E9FA8E1534BF067A4E7A/",
@@ -699,6 +709,16 @@
           }
         }
       },
+      {
+        "name": "Pyke Syndicate Crew",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/13352335398418306228/C01292CB459585462D5A41DD3CE0D743C74C115A/",
+        "points": 5,
+        "restrictions": {
+          "include": {
+            "unit": ["WLO-5 Speeder Tank"]
+          }
+        }
+      },
       {
         "name": "Refurbished \"Gonk\" Droid",
         "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568144996/C187B41FE3AE53493F4A9AA23B0F74B795F9B2C3/",
@@ -738,6 +758,16 @@
             "unit": ["A-A5 Speeder Truck", "X-34 Landspeeder"]
           }
         }
+      },
+      {
+        "name": "Weequay Crew",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/11962013218940355603/44A620E6F9A81692F86F2F331672632D95E0425C/",
+        "points": 0,
+        "restrictions": {
+          "include": {
+            "unit": ["WLO-5 Speeder Tank"]
+          }
+        }
       }
     ],
     "Doctrine": [
@@ -1188,6 +1218,16 @@
         "image": "https://steamusercontent-a.akamaihd.net/ugc/15123875138493055282/186AF8D3483E44991F4BF5405DE6A84C4BF9664B/",
         "points": 5
       },
+      {
+        "name": "Turbo-Charge",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16761979492775816091/37108458441EBB0A6D7090B98BA9B0C3DC2AD80B/",
+        "points": 5,
+        "restrictions": {
+          "include": {
+            "unit": ["General Grievous", "TSMEU-6 Wheel Bikes"]
+          }
+        }
+      },
       {
         "name": "Din's Flame Projector",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/13750229648005754282/BBA7B66BB64E77DD6485518A99475DE0DC684BE8/",
@@ -1505,17 +1545,215 @@
         }
       },
       {
-        "name": "Twin Laser Turret",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/17399295105221231233/E6CA41DE7BAF2D58F8D86953FD25B3D431CFB80E/",
-        "points": 14,
+        "name": "Twin Laser Turret",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17399295105221231233/E6CA41DE7BAF2D58F8D86953FD25B3D431CFB80E/",
+        "points": 14,
+        "restrictions": {
+          "include": {
+            "unit": ["Saber-Class Tank"]
+          }
+        }
+      }
+    ],
+    "Heavy Weapon": [
+      {
+        "name": "Asajj Ventress",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15926262740421549818/7F23F097083233A0C9348C3215BF09DB072C58E6/",
+        "mini": {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/2022718494181455957/4BB3E42AA412A7ED2ED6F26BFDFA25414F127B71/"
+        },
+        "leader": true,
+        "points": 26,
+        "restrictions": {
+          "include": {
+            "unit": ["B1 Battle Droids", "BX-Series Droid Commandos"]
+          }
+        }
+      },
+      {
+        "name": "General Grievous",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/13889602850013621809/37188B84F5B6D6E49F5A9C62942D33562B65CF9E/",
+        "mini": {
+          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234780869167436/AAA2C61A17BB43F2673AF16D30BD0478B9AAAD2A/",
+          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234780869167571/EF86CBDA5F361282AD077D61FA81ABF0FEE061A0/"
+        },
+        "leader": true,
+        "points": 36,
+        "restrictions": {
+          "include": {
+            "unit": ["B1 Battle Droids", "IG-100 MagnaGuard"]
+          }
+        }
+      },
+      {
+        "name": "Luke Skywalker",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10466047961901782395/2898B46094ACFC7D44564F3E1B650BC01D8FA0C9/",
+        "mini": {
+          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540537100371/0B15B2810ABEBE5429E4A24852D96BAC2DC28BF7/",
+          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540537079134/11A17263AD81DC9D4271B7C6BD809B69141DCB61/"
+        },
+        "leader": true,
+        "points": 25,
+        "restrictions": {
+          "include": {
+            "unit": ["Rebel Veterans", "Rebel Troopers"]
+          }
+        }
+      },
+      {
+        "name": "Jyn Erso",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16079811724149638991/B0AED05E50E5EC32550F8970C8F7C6AA412ADB18/",
+        "mini": {
+          "mesh": "http://cloud-3.steamusercontent.com/ugc/951848302305475778/55B558E631655D0430BAF76E71C93899AAECA7A1/",
+          "diffuse": "http://cloud-3.steamusercontent.com/ugc/951848302305475871/06400240648CC39F933BE504C74DA9BEF4D006C4/"
+        },
+        "leader": true,
+        "points": 22,
+        "restrictions": {
+          "include": {
+            "unit": ["Rebel Commandos", "Rebel Troopers", "Guerilla Troopers"]
+          }
+        }
+      },
+      {
+        "name": "Chewbacca",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15050970341342733786/8231EFDD964C904D2B3F2B170525EA2B5AECE9AC/",
+        "mini": {
+          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540540669973/90DD9EA44756CCF9B2473302DC644F3AEEED07B4/",
+          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540540670117/5AA04499FC8CC467864F9F335601E6335C03326D/"
+        },
+        "leader": true,
+        "points": 40,
+        "restrictions": {
+          "include": {
+            "type": ["Wookiee Trooper"]
+          }
+        }
+      },
+      {
+        "name": "Imperial Probe Droid",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/12096037766204385743/C1C46E710472C45972A1CA308269B91EE9E691B0/",
+        "mini": {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/14972533488140369423/D390682F502B9999AE930DA6A78817DDE5D97027/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15762532285823663057/2254B8B0FBA723C3F840CDB6DB639404B0DA9DB1/"
+        },
+        "points": 10,
+        "restrictions": {
+          "include": {
+            "faction": ["Empire"],
+            "rank": ["Corps", "Special Forces", "Support"]
+          }
+        }
+      },
+      {
+        "name": "Seventh Sister",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/12786414084835381664/A059896EB0382A23E79AC5B4A93BB1B80CB47DA8/",
+        "mini": {
+          "bundle": "https://steamusercontent-a.akamaihd.net/ugc/2446090001278329724/E8E229E0E3FB6230D9F5A1823C71032A0FC9F2D0/"
+        },
+        "leader": true,
+        "points": 30,
+        "restrictions": {
+          "include": {
+            "unit": ["Imperial Special Forces"]
+          }
+        }
+      },
+      {
+        "name": "Fifth Brother",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/14099995001149120961/E9E1ACB414FFC071E6B08B9F268040166D5D5C35/",
+        "mini": {
+          "bundle": "https://steamusercontent-a.akamaihd.net/ugc/2456221571853672166/B86F663B609267644D837B4F18C59614C6785229/"
+        },
+        "leader": true,
+        "points": 32,
+        "restrictions": {
+          "include": {
+            "unit": ["Stormtrooper Riot Squad"]
+          }
+        }
+      },
+      {
+        "name": "Long Rifle Pirate",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/12069676993247554413/429E3382BCE4E5FB5A38F8E4E43DAE97DD7C3587/",
+        "mini": {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13407742837548351880/9642E26DE11D4BCC37AF18D7DAFB67E3635A3C65/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15244879389526567538/5FBC4A69F53811F7BB2B1AD495CFEC1F0EB643E0/"
+        },
+        "points": 20,
+        "restrictions": {
+          "include": {
+            "unit": ["Weequay Pirates"]
+          }
+        }
+      },
+      {
+        "name": "Electrostaff Pirate",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10005657645978308453/F2B28DC87052D87780B32EEA43883DF069CDD23A/",
+        "mini": {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16132237456890768608/44919D8C156835F39D911E99F6FE864C08C3E425/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9435972990529503531/027081EFAAAAA333CB323E2267AECA0A668B0C8A/"
+        },
+        "points": 15,
+        "restrictions": {
+          "include": {
+            "unit": ["Weequay Pirates"]
+          }
+        }
+      },
+      {
+        "name": "Agent Kallus",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/11243613263901997875/0DD9BAD82731CF9B82AA13471D5EC164B8583545/",
+        "mini": {
+          "bundle": "https://steamusercontent-a.akamaihd.net/ugc/2446089105227059084/0EB4EE32683338BC754DA5EC1F613ABA71048E90/"
+        },
+        "leader": true,
+        "points": 28,
+        "restrictions": {
+          "include": {
+            "faction": ["Empire"],
+            "rank": ["Corps", "Special Forces"]
+          }
+        }
+      },
+      {
+        "name": "Cassian Andor",
+        "displayName": "Cassian Andor (Sniper Config)",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/9591158490068968132/FEEFE73E35F1BFA0C632F973EA56454D377007FC/",
+        "flip": {
+          "name": "Cassian Andor",
+          "displayName": "Cassian Andor (Black Ops)",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/11525894432535452100/E903693ACFB3CFA2C08225AC65BBF46C06F293F6/"
+        },
+        "mini": {
+          "mesh": "http://cloud-3.steamusercontent.com/ugc/773996263556990389/C38E9CAD7E5BA5496E1A211CA799E9ACBAC51D00/",
+          "diffuse": "http://cloud-3.steamusercontent.com/ugc/770611701143191344/5CAA4F0CE9A3FBE89A81560221ADCDDB5A801CC3/"
+        },
+        "leader": true,
+        "points": 25,
+        "restrictions": {
+          "include": {
+            "faction": ["Rebel"],
+            "rank": ["Corps"]
+          }
+        }
+      },
+      {
+        "name": "Kraken",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15597539132515958482/63F091887EF5669192CD96A978FDAA0A1B9BD50D/",
+        "mini": {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/1619598366706113202/449F19DA94D42DAD0F0B4D0B77A8E9AD45C320E5/",
+          "secondary": "http://cloud-3.steamusercontent.com/ugc/1619598366706441991/04B29BB48A98AF8D79FC1414548496BAD49CCB28/"
+        },
+        "leader": true,
+        "points": 30,
         "restrictions": {
           "include": {
-            "unit": ["Saber-Class Tank"]
+            "faction": ["Separatist"],
+            "rank": ["Corps"]
           }
         }
-      }
-    ],
-    "Heavy Weapon": [
+      },
       {
         "name": "RPS-6 ARF Trooper",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/12717002306739299639/3A8542FCC457C05E120FB9E59AD8BA4D1551DFE6/",
@@ -1621,12 +1859,12 @@
       },
       {
         "name": "BX-Series Droid Sniper",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927410/552314F29830D4A8A63F5B8238699336F17ECD92/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/11012640175296329862/0E3952E994DB7BDA80F0614E3539909EAEC0049D/",
         "mini": {
           "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457847963/0EA6BE014DA494689FF32F9570C6A73CD88F1894/",
           "secondary": "http://cloud-3.steamusercontent.com/ugc/773995528924546789/8774CBBDC3C4F18B11A444CC96EA5FE7F00DB48F/"
         },
-        "points": 40,
+        "points": 20,
         "restrictions": {
           "include": {
             "unit": ["BX-Series Droid Commandos"]
@@ -1637,8 +1875,8 @@
         "name": "MPL-57 Barrage Trooper",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384857286/60AC7BEDA003F95429F6312717EBAB9488C51852/",
         "mini": {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540540670338/28625FDF1F56EF08F0DB236C4ECFF67A54083B2B/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234780862750426/2563904D7561144EE85EBCD3E07D68F48D8DD034/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/785234540540671382/63267B140C2A619525B99FD943DF2421F75B9130/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/785234540540671503/D8BCEE815B07EA7074085CF1F43AF8041DEC8981/"
         },
         "points": 22,
         "restrictions": {
@@ -1717,13 +1955,27 @@
         }
       },
       {
-        "name": "DC-15X ARC Trooper",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/9724672671096889082/B22903B590FA5B6D2AAEC2988AA0F9826C9D1EB2/",
+        "name": "DC-15X ARC Trooper Sniper",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/9340306715371279306/77343FF20A60FEBDE4596D9E73806219B98BFB74/",
+        "mini": {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457800878/34EC84D7ECD99E073417866A9BEC4288E00F5359/",
+          "secondary": "http://cloud-3.steamusercontent.com/ugc/773995200348530664/5E248091F8CC37B1023257338D4947E4ADFE48AB/"
+        },
+        "points": 26,
+        "restrictions": {
+          "include": {
+            "unit": ["ARC Troopers"]
+          }
+        }
+      },
+      {
+        "name": "DC-15X ARC Trooper Gunner",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15700525996033034674/C04F340906CF0532B3825D5C67357C094FA10B29/",
         "mini": {
           "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457800878/34EC84D7ECD99E073417866A9BEC4288E00F5359/",
           "secondary": "http://cloud-3.steamusercontent.com/ugc/773995200348530664/5E248091F8CC37B1023257338D4947E4ADFE48AB/"
         },
-        "points": 37,
+        "points": 26,
         "restrictions": {
           "include": {
             "unit": ["ARC Troopers"]
@@ -1732,12 +1984,12 @@
       },
       {
         "name": "DH-447 Sniper",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140084953/59EB5B5BADDFEACF7BA997C247F16A54080A6E31/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16916821861583515066/6783DCC4833EAE22DCA9EDB9C8F585AE29BA13A3/",
         "mini": {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234780862776611/B8222AA4A3B680E969DC106C8A281D11845994EB/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234780862776974/21649563BC0CB84E12C0B249C720919F528596D3/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16764529609771011077/213762EEF0A83B94E394EC2F3F0C200D5A335C58/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/11792523840308175523/31EE56B2C0FEE8CE25150EADE79C5AA483182889/"
         },
-        "points": 38,
+        "points": 20,
         "restrictions": {
           "include": {
             "unit": ["Rebel Commandos"]
@@ -1774,12 +2026,12 @@
       },
       {
         "name": "DLT-19X Sniper",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103101/607C9BEDEB2C3780F1AE58D72DEE649F941A7CAD/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15525633462179263891/86D8A2EF8EBA4D9BF3DD245487375FB807A7E8B3/",
         "mini": {
           "mesh": "http://cloud-3.steamusercontent.com/ugc/770610077943667377/92306C3BFB675310563691C3C582BF5B9FC9ACD4/",
           "diffuse": "http://cloud-3.steamusercontent.com/ugc/770610077943667167/66F3188269E49FE5DAD649E771D799F2593263FF/"
         },
-        "points": 28,
+        "points": 20,
         "restrictions": {
           "include": {
             "unit": ["Scout Troopers"]
@@ -1850,12 +2102,12 @@
       },
       {
         "name": "Dioxis Mine Saboteur",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927460/BE9022FA696C172E68110895A9DDCDDD635E2AB3/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16211846897932945944/4A7D6789318AB8E685AF487F02231CC291248FAB/",
         "mini": {
           "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457847567/079157D001A1520085C6A30620750817C6C01BFF/",
           "secondary": "http://cloud-3.steamusercontent.com/ugc/773995528924546789/8774CBBDC3C4F18B11A444CC96EA5FE7F00DB48F/"
         },
-        "points": 28,
+        "points": 20,
         "restrictions": {
           "include": {
             "unit": ["BX-Series Droid Commandos"]
@@ -2057,23 +2309,24 @@
         "name": "Mortar Clone Trooper",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384857192/CF4DF5C1BB0C410B79E2F7EE0B658D2C9F4B8DE3/",
         "mini": {
-          "bundle": "http://cloud-3.steamusercontent.com/ugc/2174736446809185328/4A6DA42CDB70EF979D5B8B675CEFA5459FA60D4E/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/17111559006544179444/7D68555838D7B0D758FED0E3791ED418B90A6DD7/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9727272902330348247/0B0C390FEF4295D2877C3FD619D77C165F71537B/"
         },
         "points": 20,
         "restrictions": {
           "include": {
-            "unit": ["Clone Trooper Infantry"]
+            "unit": ["Clone Trooper Infantry", "Clone Trooper Marksmen"]
           }
         }
       },
       {
         "name": "Proton Charge Saboteur",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384857685/BBFA286A722F4FD50AB0DADDBF343A6CBC9EB79F/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/11476891187215628852/91F18B14DEB61395ADFE0900F2CB5C658414C7F6/",
         "mini": {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173465/8193FD1F0862270CD23BA9243679840BE6324DC6/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541173570/3C100E92F0DEDEF117D3A0392D3271951BC90DD0/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/10169115375508355169/2616D215477E25CD2E74B2F11C39CB911461A989/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14732946777135222961/B81F98352131D2B5ED40D18272103E8E127C9964/"
         },
-        "points": 20,
+        "points": 14,
         "restrictions": {
           "include": {
             "unit": ["Rebel Commandos"]
@@ -2098,13 +2351,13 @@
         "name": "RPS-6 Clone Trooper",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384857930/2CEB66226D92B8B803D3654A7F59977A0D0B6BA2/",
         "mini": {
-          "mesh": "http://cloud-3.steamusercontent.com/ugc/767228764785603568/BB31C6873BD81E6B5B6F6D41B907DA95421063F0/",
-          "diffuse": "http://cloud-3.steamusercontent.com/ugc/767228764785565294/2AA6ABC62F52DCD30C56D5DED210C35E7B4FD526/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/10674439379183912978/1891910DC13EACBBDD75B96F220C5826CFF127FA/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/13318126355031753710/BA185DB103CF16D1BFAC9209F348A43498AAFE04/"
         },
         "points": 21,
         "restrictions": {
           "include": {
-            "unit": ["Clone Trooper Infantry"]
+            "unit": ["Clone Trooper Infantry", "Clone Trooper Marksmen"]
           }
         }
       },
@@ -2167,18 +2420,17 @@
 
       {
         "name": "Sonic Charge Saboteur",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103507/922568C5FAACC25FCE80574BE5459CB511022824/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15530089580724049994/20B4C2D6907EBDEC74CEF88C5B10B71ED016F94B/",
         "mini": {
           "mesh": "http://cloud-3.steamusercontent.com/ugc/950714557093539716/6A0D63306F505A074395AFA61EB990280DB8995D/",
           "diffuse": "http://cloud-3.steamusercontent.com/ugc/950714557093539899/FF7A535E91BF79D4C3E0D55E874C1ACEB6FBF434/"
         },
-        "points": 23,
+        "points": 17,
         "restrictions": {
           "include": {
             "unit": ["Scout Troopers"]
           }
-        },
-        "additionalObjects": ["Proton Charge Token"]
+        }
       },
       {
         "name": "T-21 Stormtrooper",
@@ -2379,8 +2631,8 @@
         "name": "Mag-Det Enforcer",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638823/D41C1DD1A9B63A173D667167C2CA1E79D0BA2F1E/",
         "mini": {
-          "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143649/BBBA0D26FB46EAD96421C4B77FE779B5F0F848AA/",
-          "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/12110813277322191269/AD4182EA4619D0E4B9DA7F6F12F70BEAFD8D6D02/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/11212068194581458113/33DF944B89A6B7DBC0DE2141A800CCF5950553E6/"
         },
         "points": 16,
         "restrictions": {
@@ -2393,8 +2645,8 @@
         "name": "Scatter Gun Enforcer",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638229/542B7031B727D74585CE7FA38EEA086252152001/",
         "mini": {
-          "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143685/C75388115AFCF42ACC79E2C16FEF36755C975AA0/",
-          "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13391993677710573883/836E63E52F681D338B1DBCF19D7EB431E0491BCD/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15016334003745601497/65BF4564688C26E8ECC5EE615C195320B0BFA978/"
         },
         "points": 28,
         "restrictions": {
@@ -2603,6 +2855,51 @@
       }
     ],
     "Squad Leader": [
+      {
+        "name": "Obi-Wan Kenobi",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16739187061396312294/0BFA142DE447B3EAFC7447BBDBE40BB10C51A844/",
+        "mini": {
+          "mesh": "http://cloud-3.steamusercontent.com/ugc/785236717873394134/94407058FBA842AD0FDCC0BBB8AB613EA9A739C2/",
+          "diffuse": "http://cloud-3.steamusercontent.com/ugc/785236717873394267/272C1C9A8C15C36DC5C10DD62D5EFCEF9BFF4496/"
+        },
+        "points": 25,
+        "leader": true,
+        "restrictions": {
+          "include": {
+            "unit": ["ARF Troopers"]
+          }
+        }
+      },
+      {
+        "name": "Clone Commander Cody",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16353428824806788196/B2AEE50E55B08A53411690988BCE579A7EBFE4A8/",
+        "mini": {
+          "bundle": "http://cloud-3.steamusercontent.com/ugc/2174736446813135529/6A6C874DBCA77E800A77C20FD36C2F223661CD10/"
+        },
+        "points": 28,
+        "leader": true,
+        "restrictions": {
+          "include": {
+            "unit": ["ARF Troopers", "Clone Trooper Marksmen"]
+          }
+        }
+      },
+      {
+        "name": "Clone Captain Rex",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17837568269244781354/A462DDBE46166711CD3E69DD3F6F6947D25AEF3F/",
+        "mini": {
+          "mesh": "http://cloud-3.steamusercontent.com/ugc/776232727456806720/869654FC3B0590BFFF2E1845C3CFA9169838EBF9/",
+          "diffuse": "http://cloud-3.steamusercontent.com/ugc/776232727456806858/52327997163A5113DF9E11B85F9DA8B6B970012C/"
+        },
+        "points": 38,
+        "leader": true,
+        "restrictions": {
+          "include": {
+            "faction": ["Republic"],
+            "rank": ["Corps"]
+          }
+        }
+      },
       {
         "name": "Jedi Guardian",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/11522429422550427771/2AE47A46390BAC96C6EAE879130F4F01D738E37D/",
@@ -2738,6 +3035,138 @@
       }
     ],
     "Personnel": [
+      {
+        "name": "Pyke Syndicate Foot Soldier Squad",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/14983704573819999353/9B2E64176C2D5134C74D77CBC58E19E05B68481C/",
+        "minis": [
+          {
+            "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845646/BE0DEED782F96BD44C389DEDEA41EBEA0C7A6D04/",
+            "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/"
+          },
+          {
+            "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845697/15B6DCCA8D8D76E1CB78219C58790E40DDD7CE8A/",
+            "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/"
+          },
+          {
+            "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845389/0D7DFE0C5BF5CDD527A619B75A25A2177D417BD0/",
+            "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/"
+          },
+          {
+            "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845389/0D7DFE0C5BF5CDD527A619B75A25A2177D417BD0/",
+            "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/"
+          },
+          {
+            "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845389/0D7DFE0C5BF5CDD527A619B75A25A2177D417BD0/",
+            "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/"
+          }
+        ],
+        "points": 38,
+        "restrictions": {
+          "include": {
+            "unit": ["Pyke Syndicate Foot Soldiers"]
+          }
+        }
+      },
+      {
+        "name": "Shaak Ti",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/12779783962834644042/1D8FF74F712A51FB40C0B25B0EE6DC5183FD8D60/",
+        "mini": {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/18026057114183857483/0D959FB4A356818AA1FA6D8034166916BB6EA84B/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9607653251760381402/E7F70FBA0C514FFA35DB2213F1F958835192D473/"
+        },
+        "points": 22,
+        "restrictions": {
+          "include": {
+            "faction": ["Republic"]
+          }
+        },
+        "leader": true
+      },
+      {
+        "name": "Weequay Pirate Squad",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17099305818157449093/AB25320EE6C23F1CFA10608400AA0881A83EFCB4/",
+        "minis": [
+          {
+            "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13445091018596770169/04299452D8946357EA16CD9DDE32B787C6DBBEDA/",
+            "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/12521217169728315650/79F32E9C7B535418920B0C335F8B5FC3F9AE0726/"
+          },
+          {
+            "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16223639926626886253/6DAD82EB229219B62298B7B4C22F6586ED23E9BB/",
+            "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9341836019986456990/3940A22021782AC05911D4DCD13463623411B60F/"
+          },
+          {
+            "mesh": "https://steamusercontent-a.akamaihd.net/ugc/10420975901939976395/93572C150848711C2D7919BB5E0A66DD51E33DEC/",
+            "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15879012411449849405/6339E5B40A0F222280349C23BCB3E79CC5136B43/"
+          }
+        ],
+        "points": 30,
+        "restrictions": {
+          "include": {
+            "unit": ["Weequay Pirates"]
+          }
+        }
+      },
+      {
+        "name": "Weequay Captain",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/9436415482602380066/C3B7D0EBC2A34FC536B903E13C4958D0F9C699AA/",
+        "mini": {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15406802960249254940/269FFE5E1C0ACBA9B2607E7B3DEDF4B54A9A8904/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9648645391611954855/C5E2F7BAA5F0573B72DEA0FF33C57550394E46DA/"
+        },
+        "points": 18,
+        "leader": true,
+        "restrictions": {
+          "include": {
+            "unit": ["Weequay Pirates"]
+          }
+        }
+      },
+      {
+        "name": "Clone Marksman",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16972794900197879773/6B1534C765EB2036E2D189C0F8F49AA5F3BDF920/",
+        "mini": {
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15225529675747905291/99FAF0DF1F4C90B3BE029846EF98D28ED4AC4DE7/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14173133310269661753/77DC4409C0694CEE7BD5968DBC36B6AD9F582A90/"
+        },
+        "points": 14,
+        "restrictions": {
+          "include": {
+            "unit": ["Clone Trooper Marksmen"]
+          }
+        }
+      },
+      {
+        "name": "Clone Trooper Marksmen Squad",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/18125099481279293755/B6F721DB564585BE62A893E382B128E12CD6592C/",
+        "minis": [
+          {
+            "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15225529675747905291/99FAF0DF1F4C90B3BE029846EF98D28ED4AC4DE7/",
+            "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14173133310269661753/77DC4409C0694CEE7BD5968DBC36B6AD9F582A90/"
+          },
+          {
+            "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15225529675747905291/99FAF0DF1F4C90B3BE029846EF98D28ED4AC4DE7/",
+            "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14173133310269661753/77DC4409C0694CEE7BD5968DBC36B6AD9F582A90/"
+          },
+          {
+            "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15225529675747905291/99FAF0DF1F4C90B3BE029846EF98D28ED4AC4DE7/",
+            "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14173133310269661753/77DC4409C0694CEE7BD5968DBC36B6AD9F582A90/"
+          },
+          {
+            "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15225529675747905291/99FAF0DF1F4C90B3BE029846EF98D28ED4AC4DE7/",
+            "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14173133310269661753/77DC4409C0694CEE7BD5968DBC36B6AD9F582A90/"
+          },
+          {
+            "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15225529675747905291/99FAF0DF1F4C90B3BE029846EF98D28ED4AC4DE7/",
+            "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14173133310269661753/77DC4409C0694CEE7BD5968DBC36B6AD9F582A90/"
+          }
+        ],
+        "points": 53,
+        "restrictions": {
+          "include": {
+            "unit": ["Clone Trooper Marksmen"]
+          }
+        }
+      },
       {
         "name": "Fleet Trooper Squad",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384856618/9DED8502636167A62F6D2AEEE5AE8B004D61F3CF/",
@@ -3560,8 +3989,8 @@
         "name": "Black Sun Enforcer",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639440/31A3527F3D9D8579BDBD433D5F30F1EF973A47C8/",
         "mini": {
-          "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143724/48B5A35E10B4977E255D889A8FCAEA8C980A11A9/",
-          "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13538216675182514309/80D3D2926D6723131723E027151D80E807BA1FF4/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15549057142882936018/8E3A2116FFD18C5122767F9038D43FF549248278/"
         },
         "points": 11,
         "restrictions": {
@@ -3574,7 +4003,8 @@
         "name": "Black Sun Vigo",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639389/E73718337CFAD8FD65CD341B6CF649BA181707AD/",
         "mini": {
-          "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143763/E93BA6716A05CA95AE2EA3B7C0DFD8AF145D5C22/"
+          "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13653552510521459623/B060AC4F7AE0132A573CF92984494FDF2C4640F2/",
+          "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9553158029415913253/8761E25E4B155BE4124E8B1A5B922C6941A153A3/"
         },
         "leader": true,
         "points": 20,
@@ -3752,6 +4182,16 @@
           }
         }
       },
+      {
+        "name": "Gang Boss",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/14505275334722387359/9A721686833EB9E13254ABE90BDBB19E4192853F/",
+        "points": 10,
+        "restrictions": {
+          "include": {
+            "unit": ["WLO-5 Speeder Truck", "AA5 Speeder Truck"]
+          }
+        }
+      },
       {
         "name": "General Weiss",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148691201/0F949459DDCA1EAFC03EC7145C7402A636C9C4BE/",
@@ -3827,6 +4267,16 @@
           }
         }
       },
+      {
+        "name": "IG-100 MagnaGuard Pilot",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/13932498646258125528/C8DBD74A2D1CC4D0A5722DD77352314CB70ED9C3/",
+        "points": 10,
+        "restrictions": {
+          "include": {
+            "unit": ["TSMEU-6 Wheel Bikes"]
+          }
+        }
+      },
       {
         "name": "OOM-Series Droid Pilot",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140015474/EBD6D1C9D3C7DBCB66C1C5976D7F6B2A7303655D/",
@@ -3858,6 +4308,16 @@
           }
         }
       },
+      {
+        "name": "Pirate Captain",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/14002409862158051174/46C30FAB65D4F9F6A8C725359F1D65795575973B/",
+        "points": 5,
+        "restrictions": {
+          "include": {
+            "unit": ["WLO-5 Speeder Tank"]
+          }
+        }
+      },
       {
         "name": "Reckless Driver",
         "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568144930/910352F2AA646B8E97628B4DF56C364805ABD906/",
@@ -3928,7 +4388,7 @@
         "points": 5,
         "restrictions": {
           "include": {
-            "unit": ["A-A5 Speeder Truck"]
+            "unit": ["A-A5 Speeder Truck", "WLO-5 Speeder Tank"]
           }
         }
       },
@@ -3938,7 +4398,7 @@
         "points": 10,
         "restrictions": {
           "include": {
-            "unit": ["A-A5 Speeder Truck"]
+            "unit": ["A-A5 Speeder Truck", "WLO-5 Speeder Tank"]
           }
         }
       }
@@ -4077,6 +4537,26 @@
       }
     ],
     "Training": [
+      {
+        "name": "Security Detail",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/12222061891853555901/CD168A0212E4D0E6D145E0802870606F91B35F68/",
+        "points": 5,
+        "restrictions": {
+          "include": {
+            "unit": ["Imperial Death Troopers"]
+          }
+        }
+      },
+      {
+        "name": "Logistical Prowess",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/11474714211228603788/9066E07B5E314B6AC9B8D46367F9A980AD3257A9/",
+        "points": 0,
+        "restrictions": {
+          "include": {
+            "unit": ["General Tagge"]
+          }
+        }
+      },
       {
         "name": "Jedi Training, Force Adept",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/12390960585643083301/04DD725AE236156E74D8235599206979F3670D57/",
@@ -4284,7 +4764,7 @@
       },
       {
         "name": "Insatiable Curiosity",
-        "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140100414/E3E6C5563CD533DC0560C50590B8A989E382E7BC/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17077726437706151926/A1FAE61CD17F3A228082987AF90699FBEDF7F7E3/",
         "points": 8,
         "restrictions": {
           "include": {
@@ -4309,7 +4789,7 @@
     "Generic": [
       {
         "name": "Ambush",
-        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865564037146/9E4C2F5453A9016854F388BB078666B71AC794B6/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/11854788151162080590/F8156890B5410050033E6A67015DB0E0DCE7FA95/",
         "pip": 1
       },
       {
@@ -4319,7 +4799,7 @@
       },
       {
         "name": "Push",
-        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865564034819/0E3D77E869D24AD638EB438F92577F44368487D3/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17909236182554732778/41F641B354B5819E8B6D231B7D2593E29DF87BE7/",
         "pip": 2
       },
       {
@@ -4329,7 +4809,7 @@
       },
       {
         "name": "Assault",
-        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865564034224/40364C1DDCF973A233C4A8F7AD43734067014C06/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17765277411252241548/FA0AA2F53A229D6F470578728A59AE31FF626C3A/",
         "pip": 3
       },
       {
@@ -4339,7 +4819,7 @@
       },
       {
         "name": "Standing Orders",
-        "image": "http://cloud-3.steamusercontent.com/ugc/1680393865564032760/662157DB1D462926F585301B5D6003D6B8172F14/",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15678505752415930382/55DE6AD796E3FE3FDDE5B2D11CAC8087389D5C71/",
         "pip": 4
       }
     ],
@@ -4359,6 +4839,11 @@
         "image": "https://steamusercontent-a.akamaihd.net/ugc/13986899663843994273/C86535A24E53CB437CF5E6DFB02A6FCF21E1EC63/",
         "pip": 2
       },
+      {
+        "name": "The Empire Does Not Tolerate Failure",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/13148519556397561204/A85B3068F61D78D4E11CF222AA32EF0BEA1B997B/",
+        "pip": 2
+      },
       {
         "name": "Overwhelming Barrage",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384886936/A2D77342B1EE6DD9E4413C3F2344E37694BD7CFB/",
@@ -4458,6 +4943,16 @@
         "image": "https://steamusercontent-a.akamaihd.net/ugc/14615871148955326200/5C4A46932D48C89AC97B650847429D97701993D7/",
         "pip": 1
       },
+      {
+        "name": "Sneak Attack",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17800273845434794252/84425184A9FA3237F85342B84FD168824FBF90C8/",
+        "pip": 1
+      },
+      {
+        "name": "A Disturbance in the Force",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15573825798028976140/1303767C2A7775954093FE0105F0E9B2985AA64B/",
+        "pip": 2
+      },
       {
         "name": "Air Support",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385134030778/90E5CEF9833FED1C5F926FB8878BDBCD5B5099F6/",
@@ -4483,6 +4978,11 @@
         "image": "https://steamusercontent-a.akamaihd.net/ugc/17056187462617014571/3898DDC0BF25F87D73C3F40CDA7AA52DDB6CD765/",
         "pip": 2
       },
+      {
+        "name": "Recon Division",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17814277548406010305/67FBF2832F88C0A2B3923023FA53418900EC7C92/",
+        "pip": 2
+      },
       {
         "name": "Attack Of the Clones",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385134033797/3AA33B36A7B9EAAC8444A6CAC176F2130EE30E6C/",
@@ -4498,6 +4998,11 @@
         "image": "https://steamusercontent-a.akamaihd.net/ugc/12871643868680759199/5CC33092968E7DE16416344B01D7BC76211DB23E/",
         "pip": 3
       },
+      {
+        "name": "Flexible Strategy",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15462092410085872515/FF4DD4B2D64809CF0A86A3288A8D500DD7E30240/",
+        "pip": 3
+      },
       {
         "name": "Leaders of the 501st",
         "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384886698/41DC9E2547F47EEA11B6DEC9AE7AC677CF1FBAAD/",
@@ -4535,6 +5040,23 @@
         "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131527719/02ACE80E8D14CF7DC017156A128F34A09F725CF2/",
         "pip": 3
       }
+    ],
+    "Mercenary": [
+      {
+        "name": "Insolence?! We are Pirates!",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17838958063167701144/B10D335A59FFE4CEB954585E0DB0E42DB67DE339/",
+        "pip": 1
+      },
+      {
+        "name": "Speak Softly and Drive a Big Tank",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/10689439603598113404/87E51EEC4B2D75528FA0277BA78C5F52DAF9886A/",
+        "pip": 2
+      },
+      {
+        "name": "I Smell Profit",
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/11974419819645442132/21863ABAA56F91ACFBEDC358ECC81A9D01D80BAE/",
+        "pip": 3
+      }
     ]
   },
 
@@ -4593,6 +5115,47 @@
           "image": "https://steamusercontent-a.akamaihd.net/ugc/18385343105541227063/7F990BB73C8675734EB02873157F392EA265DC20/",
           "type": "vertical",
           "additionalObjects": ["Objective Token", "Objective Token"]
+        },
+        {
+          "name": "Supply Run",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/9519163714205143198/44DD261B633320C5FE3A406F76B56FD73EDC2E76/",
+          "type": "vertical",
+          "additionalObjects": [
+            "Objective Token",
+            "Objective Token",
+            "Objective Token",
+            "Objective Token"
+          ]
+        },
+        {
+          "name": "Align the Relay",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/14491977904273934664/881FE4169E463AB25699171975636C18E2957251/",
+          "type": "vertical",
+          "additionalObjects": [
+            "Objective Token",
+            "Objective Token",
+            "Objective Token",
+            "Objective Token",
+            "Objective Token"
+          ]
+        },
+        {
+          "name": "Failed Negotiations",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/15810516017228580607/C88C46C8188C2175C572E511FCBF7DA0C3A3C38D/",
+          "type": "vertical",
+          "additionalObjects": ["Objective Token", "Objective Token"]
+        },
+        {
+          "name": "Retrieve the Data",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/12099398395755541092/779E148B5ECFEE495D3C1652FB31A10482C694B7/",
+          "type": "vertical",
+          "additionalObjects": [
+            "Objective Token",
+            "Objective Token",
+            "Objective Token",
+            "Objective Token",
+            "Objective Token"
+          ]
         }
       ],
       "deployment": [
@@ -4635,10 +5198,10 @@
             ["b", "b", "b", "bss", " ", " ", " ", " ", "bs", "b", "b", "b"]
           ],
           "additionalObjects": [
-            "Close the Pocket Map",
             "POI Token",
             "POI Token",
-            "POI Token"
+            "POI Token",
+            "Close the Pocket Map"
           ]
         },
         {
@@ -4680,11 +5243,11 @@
             [" ", " ", "b", "b", "b", "b", "b", "b", "b", "b", " ", " "]
           ],
           "additionalObjects": [
-            "Bunker Assault Map",
             "POI Token",
             "POI Token",
             "POI Token",
-            "POI Token"
+            "POI Token",
+            "Bunker Assault Map"
           ]
         },
         {
@@ -4726,11 +5289,11 @@
             [" ", " ", " ", "b", "b", "b", "b", "b", "b", "b", "b", "b"]
           ],
           "additionalObjects": [
-            "Breakthrough Map",
             "POI Token",
             "POI Token",
             "POI Token",
-            "POI Token"
+            "POI Token",
+            "Breakthrough Map"
           ]
         },
         {
@@ -4772,11 +5335,11 @@
             [" ", " ", "b", "b", "b", "b", "b", "b", "b", "b", " ", " "]
           ],
           "additionalObjects": [
-            "Intercept Signals Map",
             "POI Token",
             "POI Token",
             "POI Token",
-            "POI Token"
+            "POI Token",
+            "Intercept Signals Map"
           ]
         },
         {
@@ -4818,13 +5381,13 @@
             [" ", " ", " ", "b", "b", "b", "b", "b", "b", "b", "b", "b"]
           ],
           "additionalObjects": [
-            "Recover the Research Map",
             "POI Token",
             "POI Token",
             "POI Token",
             "POI Token",
             "POI Token",
-            "POI Token"
+            "POI Token",
+            "Recover the Research Map"
           ]
         },
         {
@@ -4866,12 +5429,146 @@
             [" ", " ", " ", "b", "b", "b", "b", "b", "b", "b", "b", "b"]
           ],
           "additionalObjects": [
-            "Shifting Priorities Map",
             "POI Token",
             "POI Token",
             "POI Token",
             "POI Token",
-            "POI Token"
+            "POI Token",
+            "Shifting Priorities Map"
+          ]
+        },
+        {
+          "name": "Outflank",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/13495770785016686863/572E6718AF1D92854622E20A2C7BBF8E8EAF4793/",
+          "type": "vertical",
+          "zone": [
+            [" ", " ", " ", "r", "r", "r", "r", "r", "r", " ", " ", "r"],
+            [" ", " ", " ", "rh", "rh", "rh", "rh", "rh", "rh", " ", " ", "r"],
+            ["b", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "r"],
+            ["b", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", "r"],
+            ["b", " ", " ", "bh", "bh", "bh", "bh", "bh", "bh", " ", " ", " "],
+            ["b", " ", " ", "b", "b", "b", "b", "b", "b", " ", " ", " "]
+          ],
+          "additionalObjects": [
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "Outflank Map"
+          ]
+        },
+        {
+          "name": "Cauldron",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/15627037991188349167/2271D8A45AA921E7FCB81C124DC41F2C46D247ED/",
+          "type": "vertical",
+          "zone": [
+            ["r", "r", "r", "r", "r", "r", "r", "r", "r", "r", "r", "r"],
+            [
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh"
+            ],
+            [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
+            [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
+            [
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh"
+            ],
+            ["b", "b", "b", "b", "b", "b", "b", "b", "b", "b", "b", "b"]
+          ],
+          "additionalObjects": [
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "Cauldron Map"
+          ]
+        },
+        {
+          "name": "Contact, Contact!",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/12700346236472029468/7D62CD68C323798CA715971917CF33F42E3B118B/",
+          "type": "vertical",
+          "zone": [
+            [" ", " ", " ", " ", " ", " ", "r", "r", "r", "r", "r", "r"],
+            [" ", " ", " ", " ", " ", " ", "rh", "rh", "rh", "r", "r", "rh"],
+            [" ", "b", "b", " ", " ", " ", " ", " ", " ", "r", "r", " "],
+            [" ", "b", "b", " ", " ", " ", " ", " ", " ", "r", "r", " "],
+            ["bh", "b", "b", "bh", "bh", "bh", " ", " ", " ", " ", " ", " "],
+            ["b", "b", "b", "b", "b", "b", " ", " ", " ", " ", " ", " "]
+          ],
+          "additionalObjects": [
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "Contact, Contact! Map"
+          ]
+        },
+        {
+          "name": "Payload",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/16906983444643756097/831C0FCBF977904A6E0D99980AA93894BCC64917/",
+          "type": "vertical",
+          "zone": [
+            ["r", "r", "r", "r", "r", "r", "r", "r", "r", "r", "r", "r"],
+            [
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh",
+              "rh"
+            ],
+            [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
+            [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
+            [
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh",
+              "bh"
+            ],
+            ["b", "b", "b", "b", "b", "b", "b", "b", "b", "b", "b", "b"]
+          ],
+          "additionalObjects": [
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "Payload Map"
           ]
         }
       ],
@@ -4911,6 +5608,46 @@
           "image": "https://steamusercontent-a.akamaihd.net/ugc/16276132125547808705/8A61415CDD0F2E20417F6D8371858B206FA0A775/",
           "type": "vertical",
           "additionalObjects": ["Objective Token"]
+        },
+        {
+          "name": "Black Ops",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/17788491822893443475/FCEB325A1C045662381E47E751482700521D2219/",
+          "type": "vertical"
+        },
+        {
+          "name": "Command Override",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/12943860816298787957/AC216DBF0F8880EC568FCAA34B5AC347187723A8/",
+          "type": "vertical"
+        },
+        {
+          "name": "Coordinated Strike",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/16289701377728989133/61345ED59F6A20461A2BD1526AC38D12E2E4BBB3/",
+          "type": "vertical"
+        },
+        {
+          "name": "No Time to Lose",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/11496058962921126665/041D2E72354726A4E39C6A2CCA2DA6C0E66946B2/",
+          "type": "vertical"
+        },
+        {
+          "name": "Armored Assault",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/10425618194745828599/81AA48C3F07BB313B7A3CA7E76F88F0CC2167E9F/",
+          "type": "vertical"
+        },
+        {
+          "name": "Extreme Discipline",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/9721205986412257000/CC9C2007345D883D9D1287E44D74CAE089114D29/",
+          "type": "vertical"
+        },
+        {
+          "name": "Rapid Deployment",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/14859786331088523291/F2ECDE4D7BB7F3260A049D627C9801BB32093B0B/",
+          "type": "vertical"
+        },
+        {
+          "name": "Scrambled Orders",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/12845531429756028876/8BAA1BF01969CACC268BDC0847D316A2E96DFD48/",
+          "type": "vertical"
         }
       ]
     },
@@ -5177,105 +5914,107 @@
     "skirmish": {
       "objective": [
         {
-          "name": "Breach",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279492/85477A894623DDA23BC182995DAF396671A0C007/",
-          "type": "vertical"
-        },
-        {
-          "name": "Control",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279456/10F29ECE1579A06D7DC564A6480F2BE27CC6EF04/",
-          "type": "vertical",
-          "additionalObjects": ["Objective Token"]
-        },
-        {
-          "name": "Elimination",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279416/6160501F308751CB9266FF991FF62E1409058C4B/",
-          "type": "vertical"
-        },
-        {
-          "name": "Pivotal Positions",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279382/6E006F31C9D5200AAA94392D94C2AE78EE4D73C7/",
+          "name": "Surface Scan",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/16343945853969639984/24ABD9DF34B74E343BD4F79D9461385D76C0CD88/",
           "type": "vertical",
           "additionalObjects": [
+            "Objective Token",
             "Objective Token",
             "Objective Token",
             "Objective Token"
           ]
+        },
+        {
+          "name": "Recon Mission",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/18385343105541227063/7F990BB73C8675734EB02873157F392EA265DC20/",
+          "type": "vertical",
+          "additionalObjects": ["Objective Token", "Objective Token"]
+        },
+        {
+          "name": "Bring Them to Heel",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/16790576095549234351/278EA3877E97AD155ADA4602D42DF023B7CEB78B/",
+          "type": "vertical"
         }
       ],
       "deployment": [
         {
-          "name": "Battle Lines",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279345/8A96884057E13BF488E89177C2B9CCB0ADDDFFE0/",
+          "name": "Close the Pocket",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/17314598212129638590/62EB33594611850FEBF0567D57ABA8CFB8077091/",
           "type": "vertical",
           "zone": [
-            [" ", " ", " ", "r", "r", "r", "r", "r", "r", " ", " ", " "],
+            [" ", " ", " ", "r", "rs", " ", " ", "rss", "r", " ", " ", " "],
+            [" ", " ", " ", "rh", "rc", " ", " ", "rcc", "rh", " ", " ", " "],
             [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
             [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
-            [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
-            [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
-            [" ", " ", " ", "b", "b", "b", "b", "b", "b", " ", " ", " "]
+            [" ", " ", " ", "bh", "bcc", " ", " ", "bc", "bh", " ", " ", " "],
+            [" ", " ", " ", "b", "bss", " ", " ", "bs", "b", " ", " ", " "]
+          ],
+          "additionalObjects": [
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "Close the Pocket Map (Recon)"
           ]
         },
         {
-          "name": "Faceoff",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279307/F41700690107CC7398BD5B95CDED30B041538517/",
-          "type": "vertical",
-          "zone": []
-        },
-        {
-          "name": "Flanking Positions",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279273/0D6B1CF6762E532AA4C0D039C2CC96F0E25A419F/",
+          "name": "Bunker Assault",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/16995954044322736468/0D0086DE04A57350DF77F62FDEC94F5148B7C4D5/",
           "type": "vertical",
           "zone": [
-            [" ", " ", " ", "r", "r", "r", " ", " ", " ", " ", " ", " "],
-            [" ", " ", " ", "r", " ", " ", " ", " ", " ", " ", " ", " "],
-            [" ", " ", " ", "r", " ", " ", " ", " ", " ", " ", " ", " "],
-            [" ", " ", " ", " ", " ", " ", " ", " ", "b", " ", " ", " "],
-            [" ", " ", " ", " ", " ", " ", " ", " ", "b", " ", " ", " "],
-            [" ", " ", " ", " ", " ", " ", "b", "b", "b", " ", " ", " "]
+            [" ", " ", " ", " ", "r", "r", "r", "r", " ", " ", " ", " "],
+            [" ", " ", " ", " ", "rh", "rh", "rh", "rh", " ", " ", " ", " "],
+            [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
+            [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
+            [" ", " ", " ", " ", "bh", "bh", "bh", "bh", " ", " ", " ", " "],
+            [" ", " ", " ", " ", "b", "b", "b", "b", " ", " ", " ", " "]
+          ],
+          "additionalObjects": [
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "Bunker Assault Map (Recon)"
           ]
         },
         {
-          "name": "Meeting Engagement",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279232/4F4C1C54E5DCE9FD1E9C46BB75379AEF60E2DAFC/",
+          "name": "Intercept Signals",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/13661793580985225615/BB706B264CE5C71456271DE54E765EC27EA6F786/",
           "type": "vertical",
           "zone": [
-            [" ", " ", " ", "r", "r", " ", " ", " ", " ", " ", " ", " "],
-            [" ", " ", " ", "r", "r", " ", " ", " ", " ", " ", " ", " "],
+            [" ", " ", " ", " ", "r", "r", "r", "r", " ", " ", " ", " "],
+            [" ", " ", " ", " ", "rh", "rh", "rh", "rh", " ", " ", " ", " "],
             [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
             [" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "],
-            [" ", " ", " ", " ", " ", " ", " ", "b", "b", " ", " ", " "],
-            [" ", " ", " ", " ", " ", " ", " ", "b", "b", " ", " ", " "]
+            [" ", " ", " ", " ", "bh", "bh", "bh", "bh", " ", " ", " ", " "],
+            [" ", " ", " ", " ", "b", "b", "b", "b", " ", " ", " ", " "]
+          ],
+          "additionalObjects": [
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "POI Token",
+            "Intercept Signals Map (Recon)"
           ]
         }
       ],
       "condition": [
         {
-          "name": "War Weary",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279193/052C3637BE4F31FAA691235E186CC73B1CE928F7/",
-          "type": "vertical"
-        },
-        {
-          "name": "Improvised Defenses",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279155/3F72099B06947F23231D8B2228D25C63E01FED92/",
+          "name": "Advanced Intel",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/13272907091260444770/243391B61F192F53AA7CF0360D3F846C7A7A0A97/",
           "type": "vertical",
-          "additionalObjects": [
-            "Barricade",
-            "Barricade",
-            "Barricade",
-            "Barricade"
-          ]
+          "additionalObjects": ["Condition Token"]
         },
         {
-          "name": "Dawn",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279122/1952ADAEF00EAAF039C3D0C160AABF3BD4F7B0E1/",
-          "type": "vertical"
+          "name": "Fortified Position",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/16927846453234643948/97D5A7F0E4C9D3DAB14C3754AC3A484C15CE3567/",
+          "type": "vertical",
+          "additionalObjects": ["Barricade", "Barricade", "Barricade"]
         },
         {
-          "name": "Clear Conditions",
-          "image": "http://cloud-3.steamusercontent.com/ugc/4112341331071279082/F2116A3FBAB46DAD85EE43AB1CBF9497C567B2A8/",
-          "type": "vertical"
+          "name": "Cunning Deployment",
+          "image": "https://steamusercontent-a.akamaihd.net/ugc/14925552919945327142/06659E9120D6246C6048165ECDE9F5F5AEA7A5EB/",
+          "type": "vertical",
+          "additionalObjects": ["Dodge Token", "Dodge Token", "Dodge Token"]
         }
       ]
     },
@@ -5590,37 +6329,79 @@
     "Breakthrough Map": {
       "card": {
         "image": "https://steamusercontent-a.akamaihd.net/ugc/16613435332891317382/334404D722726ECE56866DBBF444836E8AC2F3A3/",
-        "back": "https://steamusercontent-a.akamaihd.net/ugc/2482129948501051192/5A19D255E47E80FF3CCE0EBFA095CB8677C4188D/"
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/16613435332891317382/334404D722726ECE56866DBBF444836E8AC2F3A3/"
       }
     },
     "Bunker Assault Map": {
       "card": {
         "image": "https://steamusercontent-a.akamaihd.net/ugc/12304553798171400164/69AB4EB2BA8A39D91996852580DCA1AB783913C4/",
-        "back": "https://steamusercontent-a.akamaihd.net/ugc/2482129948501051483/82F1D1EAA55C5794FD0301E5FADB5EEA3DAEFE49/"
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/12304553798171400164/69AB4EB2BA8A39D91996852580DCA1AB783913C4/"
       }
     },
     "Close the Pocket Map": {
       "card": {
         "image": "https://steamusercontent-a.akamaihd.net/ugc/14769093936620373412/BC975CBADAEBD9AA231D83443BE9EDB59FF4308A/",
-        "back": "https://steamusercontent-a.akamaihd.net/ugc/2482129948501051694/8B05A05A5B24115F84B0A13F6FD392BB5C00E527/"
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/14769093936620373412/BC975CBADAEBD9AA231D83443BE9EDB59FF4308A/"
       }
     },
-    "Intercept Signals": {
+    "Intercept Signals Map": {
       "card": {
         "image": "https://steamusercontent-a.akamaihd.net/ugc/12020228019721678387/E635199A7837BC89D679A0D848FB4EA7D7677239/",
-        "back": "https://steamusercontent-a.akamaihd.net/ugc/2482129948501052240/E4DFCE250EAB2459C05A7C73ED2C47B78DB5D467/"
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/12020228019721678387/E635199A7837BC89D679A0D848FB4EA7D7677239/"
       }
     },
     "Recover the Research Map": {
       "card": {
         "image": "https://steamusercontent-a.akamaihd.net/ugc/15862931608322641380/4C8D35B94855B94A233EBF9D01FB0D1A0EEE3B32/",
-        "back": "https://steamusercontent-a.akamaihd.net/ugc/2482129948501052886/30E5BFA96EBC5AFA4197AE40882EC3B576420F51/"
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/15862931608322641380/4C8D35B94855B94A233EBF9D01FB0D1A0EEE3B32/"
       }
     },
     "Shifting Priorities Map": {
       "card": {
         "image": "https://steamusercontent-a.akamaihd.net/ugc/12429316638634710380/005746FFEA77696118B237B650C7628F9089B946/",
-        "back": "https://steamusercontent-a.akamaihd.net/ugc/2482129948501052974/0D4D7ECABE727D484B8ECDF44DBA664BBF7E609D/"
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/12429316638634710380/005746FFEA77696118B237B650C7628F9089B946/"
+      }
+    },
+    "Outflank Map": {
+      "card": {
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15283876349976838373/93B3D53B8AB0DCF7FE15F606E81FD962A738B455/",
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/15283876349976838373/93B3D53B8AB0DCF7FE15F606E81FD962A738B455/"
+      }
+    },
+    "Cauldron Map": {
+      "card": {
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/16251599508539301812/3439E5658197D7006038C5BFDB48CE8F7DFC6DAD/",
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/16251599508539301812/3439E5658197D7006038C5BFDB48CE8F7DFC6DAD/"
+      }
+    },
+    "Contact, Contact! Map": {
+      "card": {
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15184660976021577609/475B87420012E83B5AE2865DC1E4620E93ADDECE/",
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/15184660976021577609/475B87420012E83B5AE2865DC1E4620E93ADDECE/"
+      }
+    },
+    "Payload Map": {
+      "card": {
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/12399717920746649417/C9AC372588552230C9F0C00A5ADB0D468672E726/",
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/12399717920746649417/C9AC372588552230C9F0C00A5ADB0D468672E726/"
+      }
+    },
+    "Bunker Assault Map (Recon)": {
+      "card": {
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/15532220751502518416/FA34BE3822D18F2C6D04F8987569B0D4F6A1F9D3/",
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/15532220751502518416/FA34BE3822D18F2C6D04F8987569B0D4F6A1F9D3/"
+      }
+    },
+    "Close the Pocket Map (Recon)": {
+      "card": {
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/17088281433024932061/E9983676D51E1EE76B7152BD13CF83C794F02C81/",
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/17088281433024932061/E9983676D51E1EE76B7152BD13CF83C794F02C81/"
+      }
+    },
+    "Intercept Signals Map (Recon)": {
+      "card": {
+        "image": "https://steamusercontent-a.akamaihd.net/ugc/13979927353592007130/EA574041CFDFF4712CEC9A8E18F5A8DDE7A18216/",
+        "back": "https://steamusercontent-a.akamaihd.net/ugc/13979927353592007130/EA574041CFDFF4712CEC9A8E18F5A8DDE7A18216/"
       }
     }
   }
diff --git a/contrib/maps/competitive.json b/contrib/maps/competitive.json
index d88af8bd1..fe51488c7 100644
--- a/contrib/maps/competitive.json
+++ b/contrib/maps/competitive.json
@@ -1,22 +1 @@
-[
-  {
-    "name": "Bespin Gardens",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1646592601245349867/4E682DF85F3DB485E9826FCCF7E85318DE20E599/"
-  },
-  {
-    "name": "Geonosis: \"Badlands of Ngzi\"",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1646592601245348737/80E59C4755458DD3853136B69E179BF9653DF331/"
-  },
-  {
-    "name": "Jedha City Center",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1646592601245349257/B5BB45EB4995E1429D2EBE24D25F9622C0BF4319/"
-  },
-  {
-    "name": "Tatooine: \"Scum and Villainy\"",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1646592601245347987/AC056D4619E1FD0C94DFDFC7602C5336BB1FCBD3/"
-  },
-  {
-    "name": "Scarif Landing",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1646592601245350323/DD4FEA2C9A15220358F9E78D21E3D5B79D244CF8/"
-  }
-]
+[]
diff --git a/contrib/maps/skirmish.json b/contrib/maps/skirmish.json
index 96726aa28..93d51406d 100644
--- a/contrib/maps/skirmish.json
+++ b/contrib/maps/skirmish.json
@@ -1,22 +1 @@
-[
-  {
-    "name": "Bespin Traffic Stop",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340767532/E7561682A2D59D5A4B2B1BFB991A1814CAF03756/"
-  },
-  {
-    "name": "Desert Crossroads",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340768205/3722DCA70A4EA409752FA48547017EE6DF6E5CE4/"
-  },
-  {
-    "name": "Imperial Checkpoint",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340768629/101233D6B377074CD1ECFC0A77D9AAED275A9737/"
-  },
-  {
-    "name": "Woodland Battle",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340768989/2F91C4693A43C4D4F5940A58FB414C84FC74B8DF/"
-  },
-  {
-    "name": "Woodland Landing Pad",
-    "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340769304/E7C01A86D916B57FF2189D15E864EA085913FBDF/"
-  }
-]
+[{}]
diff --git a/mod/schema/deps/UnitTypes.json b/mod/schema/deps/UnitTypes.json
index aff4f3dbb..3330ac0e0 100644
--- a/mod/schema/deps/UnitTypes.json
+++ b/mod/schema/deps/UnitTypes.json
@@ -11,6 +11,8 @@
     "Creature Trooper",
     "Emplacement Trooper",
     "Ground Vehicle",
+    "Heavy Trooper",
+    "Heavy Droid Trooper",
     "Repulsor Vehicle",
     "Trooper",
     "Wookiee Trooper"
diff --git a/mod/src/StarWarsLegion.lua b/mod/src/StarWarsLegion.lua
index 2ddaa6966..58659bb79 100644
--- a/mod/src/StarWarsLegion.lua
+++ b/mod/src/StarWarsLegion.lua
@@ -152,20 +152,20 @@ function onload(saveData)
     templateInfo.moveTemplate[1].colorTint = {1,1,1}
     templateInfo.moveTemplate[1].shortBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778007615968/4EE8D2332DCB6F4837551255CE5B1F240937BBE5/"
     templateInfo.moveTemplate[1].longBundle = "http://cloud-3.steamusercontent.com/ugc/1848161512056297932/A762E187E43177F01CD89D1348F51B1E3C1C744D/"
-    templateInfo.moveTemplate[1].sharedBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009533333/AD7C02CEE53FB4B2EA823B3DFE570674F8998019/"
+    templateInfo.moveTemplate[1].sharedBundle = "https://steamusercontent-a.akamaihd.net/ugc/14063680635734530221/FCD291B71472CA8636D00D0B82B1BA02671FF414/"
+    templateInfo.moveTemplate[1].sharedBundle = "https://steamusercontent-a.akamaihd.net/ugc/14063680635734530221/FCD291B71472CA8636D00D0B82B1BA02671FF414/"
 
 
     templateInfo.moveTemplate[2] = {}
     templateInfo.moveTemplate[2].colorTint = {0.5,0.5,0.5}
     templateInfo.moveTemplate[2].shortBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009510155/77119B471FE3C51B06443F8ABE1C1B522431DF9B/"
     templateInfo.moveTemplate[2].longBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009510102/15B368A8D753AB35E1D60F7A377AE273EBEC0145/"
-    templateInfo.moveTemplate[2].sharedBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009533401/0FBA682D7D5AA7DA1A7EFC18B33C71EB1C0898E4/"
-
+    templateInfo.moveTemplate[2].sharedBundle = "https://steamusercontent-a.akamaihd.net/ugc/10737538167305927398/637135B07177CA895B71593EB85563FEFD0567D7/"
     templateInfo.moveTemplate[3] = {}
     templateInfo.moveTemplate[3].colorTint = {1,0.2,0.2}
     templateInfo.moveTemplate[3].shortBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009510243/26BA9DD7881AF63E1A19EB6BF9802630D792F836/"
     templateInfo.moveTemplate[3].longBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009510200/6723334F35444B547AA1382AE80F12E3FE9B72B1/"
-    templateInfo.moveTemplate[3].sharedBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009533447/E5D1D5169F0DB6025808BEE8C9647B3E7057BDB9/"
+    templateInfo.moveTemplate[3].sharedBundle = "https://steamusercontent-a.akamaihd.net/ugc/14511655092146905869/6D223BCC7D94DBDD342B6F887F7C777CE47D5585/"
 
     --This is actually diameter... just saying
     templateInfo.baseRadius = {
@@ -435,12 +435,12 @@ function onload(saveData)
     commandTokenData.red.republicSupport = commandTokenData.red.sup
     commandTokenData.red.republicHeavy = commandTokenData.red.heavy
 
-    commandTokenData.red.shadowcollectiveCommander = commandTokenData.red.com
-    commandTokenData.red.shadowcollectiveOperative = commandTokenData.red.op
-    commandTokenData.red.shadowcollectiveCorps = commandTokenData.red.corps
-    commandTokenData.red.shadowcollectiveSpecialforces = commandTokenData.red.sf
-    commandTokenData.red.shadowcollectiveSupport = commandTokenData.red.sup
-    commandTokenData.red.shadowcollectiveHeavy = commandTokenData.red.heavy
+    commandTokenData.red.mercenaryCommander = commandTokenData.red.com
+    commandTokenData.red.mercenaryOperative = commandTokenData.red.op
+    commandTokenData.red.mercenaryCorps = commandTokenData.red.corps
+    commandTokenData.red.mercenarySpecialforces = commandTokenData.red.sf
+    commandTokenData.red.mercenarySupport = commandTokenData.red.sup
+    commandTokenData.red.mercenaryHeavy = commandTokenData.red.heavy
 
     commandTokenData.blue = {}
 
@@ -479,12 +479,12 @@ function onload(saveData)
     commandTokenData.blue.republicSupport = commandTokenData.blue.sup
     commandTokenData.blue.republicHeavy = commandTokenData.blue.heavy
 
-    commandTokenData.blue.shadowcollectiveCommander = commandTokenData.blue.com
-    commandTokenData.blue.shadowcollectiveOperative = commandTokenData.blue.op
-    commandTokenData.blue.shadowcollectiveCorps = commandTokenData.blue.corps
-    commandTokenData.blue.shadowcollectiveSpecialforces = commandTokenData.blue.sf
-    commandTokenData.blue.shadowcollectiveSupport = commandTokenData.blue.sup
-    commandTokenData.blue.shadowcollectiveHeavy = commandTokenData.blue.heavy
+    commandTokenData.blue.mercenaryCommander = commandTokenData.blue.com
+    commandTokenData.blue.mercenaryOperative = commandTokenData.blue.op
+    commandTokenData.blue.mercenaryCorps = commandTokenData.blue.corps
+    commandTokenData.blue.mercenarySpecialforces = commandTokenData.blue.sf
+    commandTokenData.blue.mercenarySupport = commandTokenData.blue.sup
+    commandTokenData.blue.mercenaryHeavy = commandTokenData.blue.heavy
 
     commandTokenTrayData = {}
     commandTokenTrayData.red = {}
@@ -513,12 +513,12 @@ function onload(saveData)
     commandTokenTrayData.red.separatistSpecialforces = "abb909"
     commandTokenTrayData.red.separatistSupport = "ce9be9"
     commandTokenTrayData.red.separatistHeavy = "f68963"
-    commandTokenTrayData.red.shadowcollectiveCommander = "071592"
-    commandTokenTrayData.red.shadowcollectiveOperative = "369fa9"
-    commandTokenTrayData.red.shadowcollectiveCorps = "af4c28"
-    commandTokenTrayData.red.shadowcollectiveSpecialforces = "abb909"
-    commandTokenTrayData.red.shadowcollectiveSupport = "ce9be9"
-    commandTokenTrayData.red.shadowcollectiveHeavy = "f68963"
+    commandTokenTrayData.red.mercenaryCommander = "071592"
+    commandTokenTrayData.red.mercenaryOperative = "369fa9"
+    commandTokenTrayData.red.mercenaryCorps = "af4c28"
+    commandTokenTrayData.red.mercenarySpecialforces = "abb909"
+    commandTokenTrayData.red.mercenarySupport = "ce9be9"
+    commandTokenTrayData.red.mercenaryHeavy = "f68963"
     commandTokenTrayData.red.stack = "e2202d"
 
     commandTokenTrayData.blue = {}
@@ -547,12 +547,12 @@ function onload(saveData)
     commandTokenTrayData.blue.separatistSpecialforces = "3832c6"
     commandTokenTrayData.blue.separatistSupport = "d2c857"
     commandTokenTrayData.blue.separatistHeavy = "6d221d"
-    commandTokenTrayData.blue.shadowcollectiveCommander = "57ab78"
-    commandTokenTrayData.blue.shadowcollectiveOperative = "b30914"
-    commandTokenTrayData.blue.shadowcollectiveCorps = "e5e8df"
-    commandTokenTrayData.blue.shadowcollectiveSpecialforces = "3832c6"
-    commandTokenTrayData.blue.shadowcollectiveSupport = "d2c857"
-    commandTokenTrayData.blue.shadowcollectiveHeavy = "6d221d"
+    commandTokenTrayData.blue.mercenaryCommander = "57ab78"
+    commandTokenTrayData.blue.mercenaryOperative = "b30914"
+    commandTokenTrayData.blue.mercenaryCorps = "e5e8df"
+    commandTokenTrayData.blue.mercenarySpecialforces = "3832c6"
+    commandTokenTrayData.blue.mercenarySupport = "d2c857"
+    commandTokenTrayData.blue.mercenaryHeavy = "6d221d"
     commandTokenTrayData.blue.stack = "c9f9d0"
 
     -- standby tokens
diff --git a/mod/src/StarWarsLegion/TABLE.3a3ed9.json b/mod/src/StarWarsLegion/TABLE.3a3ed9.json
index bb12aecc2..40aef82e6 100644
--- a/mod/src/StarWarsLegion/TABLE.3a3ed9.json
+++ b/mod/src/StarWarsLegion/TABLE.3a3ed9.json
@@ -35,7 +35,7 @@
     "HideWhenFaceDown": false,
     "Hands": false,
     "CustomAssetbundle": {
-      "AssetbundleURL": "http://cloud-3.steamusercontent.com/ugc/2474241114697635226/5F40782A5897A732EE6A75C68352D2FF70CB79C9/",
+      "AssetbundleURL": "https://steamusercontent-a.akamaihd.net/ugc/10056915662299769833/848514DAF6FBC6488078EA9E0A4EB8C4582FCADF/",
       "AssetbundleSecondaryURL": "",
       "MaterialIndex": 0,
       "TypeIndex": 0,
diff --git a/mod/src/StarWarsLegion/Wheel_Mode_Tokens/Wheel_Mode_Token.950f36.json b/mod/src/StarWarsLegion/Wheel_Mode_Tokens/Wheel_Mode_Token.950f36.json
index 188d8d35b..723428e6d 100644
--- a/mod/src/StarWarsLegion/Wheel_Mode_Tokens/Wheel_Mode_Token.950f36.json
+++ b/mod/src/StarWarsLegion/Wheel_Mode_Tokens/Wheel_Mode_Token.950f36.json
@@ -29,7 +29,7 @@
     "MeasureMovement": false,
     "DragSelectable": true,
     "Autoraise": true,
-    "Sticky": true,
+    "Sticky": false,
     "Tooltip": true,
     "GridProjection": false,
     "HideWhenFaceDown": false,
diff --git a/mod/src/includes/Deck.ttslua b/mod/src/includes/Deck.ttslua
index 883ad8719..a51b79db3 100644
--- a/mod/src/includes/Deck.ttslua
+++ b/mod/src/includes/Deck.ttslua
@@ -7,14 +7,14 @@ function Deck:create()
       command     = "http://cloud-3.steamusercontent.com/ugc/923676470468121470/B601C237FC093688B758499B99CC87FDFE2FDD0F/",
       contignency = "http://cloud-3.steamusercontent.com/ugc/1753560235958347056/F845CB170FEF761DC7025AA3EEAE731F018C0E73/",
       horizontal  = {
-        objective   = "http://cloud-3.steamusercontent.com/ugc/786360308354563159/BDB495B60FFED8707BD013502C2F03D3F047B63E/",
-        condition   = "http://cloud-3.steamusercontent.com/ugc/786360308354563381/FF7DF081311A20CC396CAC9391D85EB1FBCA44E1/",
-        deployment  = "http://cloud-3.steamusercontent.com/ugc/786360308354562872/AF68672CC3B5A0A27A37FA0C02FD87F2210FAB86/",
+        objective   = "https://steamusercontent-a.akamaihd.net/ugc/10061127123107977322/847E7AAD563EF0AFD5926BE05266DC82E5FD04FC/",
+        condition   = "https://steamusercontent-a.akamaihd.net/ugc/13818252657402930588/FB0312AED90098252D2E53426F99F2072279EE64/",
+        deployment  = "https://steamusercontent-a.akamaihd.net/ugc/9428670987266773291/C115F2EAE00FD59B7A9D7CEB9906CB91B872DFBE/",
       },
       vertical    = {
-        objective   = "http://cloud-3.steamusercontent.com/ugc/4112341331071278905/7391A9D8F237C6D5361EE068AB9083F51FAEE83E/",
-        condition   = "http://cloud-3.steamusercontent.com/ugc/4112341331071279002/608E86CFE4BAF5BA63E5AAE86ECBA1526E6EB26C/",
-        deployment  = "http://cloud-3.steamusercontent.com/ugc/4112341331071278944/D0E9A51135A2AEEF1CB100554DA46B0704ECCB28/",
+        objective   = "https://steamusercontent-a.akamaihd.net/ugc/10061127123107977322/847E7AAD563EF0AFD5926BE05266DC82E5FD04FC/",
+        condition   = "https://steamusercontent-a.akamaihd.net/ugc/13818252657402930588/FB0312AED90098252D2E53426F99F2072279EE64/",
+        deployment  = "https://steamusercontent-a.akamaihd.net/ugc/9428670987266773291/C115F2EAE00FD59B7A9D7CEB9906CB91B872DFBE/"
       },
     },
     _unknown = {
@@ -484,7 +484,7 @@ function Deck:_isUpgradeValidFor(upgrade, unit)
           if unitAlignment == "LIGHT" then
             return unit.faction:upper() == "REBEL" or unit.faction:upper() == "REPUBLIC"
           elseif unitAlignment == "DARK" then
-            return unit.faction:upper() == "EMPIRE" or unit.faction:upper() == "SEPARATIST" or unit.faction:upper() == "SHADOWCOLLECTIVE"
+            return unit.faction:upper() == "EMPIRE" or unit.faction:upper() == "SEPARATIST" or unit.faction:upper() == "MERCENARY"
           end
         end
       end
diff --git a/mod/src/includes/SpawnList.ttslua b/mod/src/includes/SpawnList.ttslua
index e361cb7be..339025794 100644
--- a/mod/src/includes/SpawnList.ttslua
+++ b/mod/src/includes/SpawnList.ttslua
@@ -317,7 +317,7 @@ local function initListSpawner(params)
       rebel      = 1,
       separatist = 1,
       republic   = 1,
-      shadowcollective = 1,
+      mercenary = 1,
     })[faction:lower()] then
       faction = "Imperial"
     end
diff --git a/mod/src/includes/data/ListBuilderNew.ttslua b/mod/src/includes/data/ListBuilderNew.ttslua
index 411ea83ab..064943a38 100644
--- a/mod/src/includes/data/ListBuilderNew.ttslua
+++ b/mod/src/includes/data/ListBuilderNew.ttslua
@@ -524,7 +524,7 @@ end
 function _loadArmyFromJson(data)
   _clearZone()
   if data.armyFaction == "" then
-    data.armyFaction = "shadowcollective"
+    data.armyFaction = "mercenary"
   end
   _setSelectedScenario(data.battlefieldDeck.scenario)
   local spawn = initListSpawner({
diff --git a/mod/src/includes/ui/Welcome.xml b/mod/src/includes/ui/Welcome.xml
index 6af0b07a2..cef3057d2 100644
--- a/mod/src/includes/ui/Welcome.xml
+++ b/mod/src/includes/ui/Welcome.xml
@@ -37,18 +37,18 @@
       <VerticalLayout padding="5">
         <Text alignment="UpperLeft" color="#ffffff" fontSize="12">
           <!--Welcome to Star Wars: Legion for TTS, <b>v8.0.0</b>.-->
-          Welcome to Star Wars: Legion for TTS, <b>v8.0.13-beta</b>.
+          Welcome to Star Wars: Legion for TTS, <b>v8.0.18-beta</b>.
 
-          This is a <b>beta release</b>, and is <textcolor color="#f03333"><b>not suitable for tournament play</b></textcolor>.
+          This is a <b>beta release</b> <textcolor color="#f03333"><b></b></textcolor>.
 
           To access the stable version of the mod visit <i>https://go.swlegion.dev/mod</i>.
 
           <b>CHANGELOG</b>
           (Since last <i>Beta</i>)
           <!--(Since last <i>Stable</i>)-->
-          - Add: Jedi Knight General and Jedi Knight
-          - Add: Super Tactical Command Droids
-          - Add: Revealed General Grievous, Wheelbike Warlord Card  
+          - Add: Ohnaka Gang including New CCs
+          - Add: Droideka, Stap, Trusted Agent, Insatiable Curiousity Errata
+          - Add: Geonosian Engineers
         </Text>
       </VerticalLayout>
     </VerticalScrollView>