Async

I suggest we all switch to this branch and if it seems ok merge it into master