Consider: moving to async/await model.