Beginning work on adapting for connectivity changes