WIP - Improve implementation of week/day selection