Ticket #86: wip untested refactoring to threaded version