Use async goodness

Thanks @Netshroud