Refactoring, added local broadcast messaging