Defer aggregation calculation.

Closes #18.
Merge pull request #24 from rhattersley/defer

Defer aggregation calculation.