Started Implementing Broadcast
Fixed some issues with last commit