Initial client work to support server