Progress on fixing the async stuff.