Wip/day selection

Reissuing pull request 70