Dynamic instantiation client

PEP8 fixes, dynamic client instantiation. Putting collab edit to sleep for now.
indentation here as well