Finished refactoring and testing individual metrics. Now, I have a
problem with aggregation.