Update main with first goodjob work #1293

Closed dgcliff closed 6 days ago