Added messaging and connect things