experimental concurrency refactor