Finally getting the weekStart and weekEnd bits right.