I've been spending most of my time rewriting major portions of the code to accommodate weapon systems and their ammunition. Each unit now has weapons that can have multiple ammunition types. Weapons can be a "main" weapon. Although each unit has one or more main weapons, most units only have one.