Some work towards supporting async tasks