add client feature (w.i.p)