added clients
Merge https://github.com/ccandillo/chapter2