Start of the work to include day calculations in the scheduler