Movement and swarm sorted

pretty much