Incrementing now increments time based keys
Fix bug where totals weren't going in the same keys.
Refactoring the generate of date time keys
Stubbing out the today_count helper