Slowly being to convert/start using async

[BradleyChatha]

I can't remember why I didn't do this from the start of the refactor, but meh, better late than never.