Getting closer to the threaded impl