Feature/another clients connection