A few bug fixes
Adding OO module and starting to configure broker role