Changed some names to reflect changes in Client's attributes.
Made some major improvements w/r/t logging, data handling, and wrapping.