It definitely fixes some concurrency bugs, and it's probably a good first step toward actually splitting the tasks