Revised connection establishment logic, ready for testing async and contact-list loading & changed.