Checked existing functionality, added listening for broadcasts