Add NewClient, part 2

Oops, I forgot to add some files to the previous commit.