WIP: Continue to implement thread pool version