do we want a timeout / max wait here?