Reorg to support adding a 'connect_host' general purpose routine