Wip/day selection

So, we merged to dev into this branch to allow for day select and the conflicts were fixed, but now it says there are more. This is silly, but it works