Bug-squashing with quadtree clustering

Round 1