done with addtotals and add some tests