added events and working on aggregation.