Add client code from bcsaller