Move async stuff into class