Finished implementing client-side async support