Second pass on asynchronous completions. Now all working!