Client add almost complete