pybbm extended to be client aware. All tests passing but more needed for new functionality
Resolving merge conflicts