flying: Rework client