Start adding client
resolved merge conflicts
Start adding client