#13 improving test
#13 refactoring to an "aggregator" class to do all the, er, aggregating