Added fleshed out aggregation method... works but could be better