metaprogramming to the rescue.. ugh
heavy refactoring and play
all but bucket dir creation
wow.. awesomeness