Working on client connectivity