Add a TODO to make the move atomic.