Support passing a client in as an argument on setup.
0.0.7