Tweaked implementation for average stats calculation
This passes specs now, although need to add some more specs for this functionality