Updated source with working example client/server connections