Fix for totals not being shown.
Use structs instead of loose ints.