#18 adding a few more time windows. Haven't tested yet