Do it async

I don't think this works :-(