refactor shifts-day models, date-holder