Early prep to support radio, too