Commit prior to major rework of concurrency. (to be done on another
branch)