Steps towards working client