Move some concurrent logic around