Made more asynchy
0.0.12