Rework of connection window... in progress... part 2