Started making the aggregation more generic and added some TODO notes.