Initial commit client code