Started client rewrite