Updated Server Communication stuff more

Ben - please add