Still debugging swarm, but a little better.