Wip -- transitioning to multi-squad support