Initial rollup coded.
Merge branch 'master' into rollup
Merging in aggregate rollup.