Filtering totals
Merge branch 'caphistory' into testing