Aggregation engine for areas
Aggregation engine working; merged and fixed upstream changes