adding buckets support
refactoring...
more refactoring + adding per bucket clients support
some debug log
merging the buckets support