working on the totals on the right hand side
merging master into branch