Add ability to group by different time spans - default = month