Changes To Client and SocketClient

Rhett