This MR exposes all counts in a new hash exposed
through the total method. It also renames some variables
to simplify our code.