Updated client, added bunch of async stuff