Normal problems fixed, now just need to add additional behaviour to avoid
clumping around the corners and edges.