I think @joefitzgerald is already working on an async approach