Add Drew's boid stuff as well as some tidying up