Moving over client code