Dual faction, upgrades, can sort 'Extras'