Add By Day and By Location (0.1.1dev)