Fixed Thread problem after reverting to non-ThreadClient solution.
Incrementally better.