(ActivityAggregation) Added telemetry, moved / categorized some code, some logical fixes