Redoing message structure. Pushing untested and unconnected server portion. Client is next