Started adding ConnectionHandling.