These things I would like to merge before Christmas. But will use milestone to track anything needed for next run, so setting due date some time January hopefully before bring up days.