Implemented aggregation
Ag with FX
Sync ag branch