Started a more oopish approach, a base aggregation class is in the
making.