This branch replaces the addSquadPicker branch which became unusable due
to a bug.