loads of changes to swarmer