Started updating with real connection/messaging copy