FP - aggregation working
FP - Reset
Merge branch 'master' of https://github.com/jjfiore/DAT6_JJF
cleanup