Q7 almost done
needs subtotals