Moved clients into a self-contained class.