Fix #694 Aggregation with large number of aggregation areas hangs - all code nicely refactored now and has lovely green dots.