[Mere_Mortal]

That's exactly what I did

Here's some example code...

Replace [Faction] with the relevant name for each of your 6 Factions.

In PlayerTemplate, for each Faction...

  StartingUnit1 = [Faction]StartingObject

In its own INI file under the Object directory...

Object [Faction]StartingObject

  KindOf            = INERT
  EditorSorting     = SYSTEM

  Body = InactiveBody Body
  End

  Behavior = LifetimeUpdate Lifetime
    MinLifetime     = 1
    MaxLifetime     = 1
  End

  Behavior = GrantUpgradeCreate Upgrade
    UpgradeToGrant = [Faction]StartingObject
  End

End

In the Object that requires the CommandSet switch...

  Behavior = CommandSetUpgrade [Faction]
    CommandSet      = [CommandSet]
    TriggeredBy     = [Faction]StartingObject
  End

Finally, the Upgrades...

Upgrade [Faction]StartingObject
  Type               = PLAYER
End

HTH,
M_M