Refactor into base swarm and master/minion swarm