refactoring to prepare for [#79785904]
broaden selection of times for DO #1 [#79785904]
clean up edge cases in DO #1 [Finishes #79785904]