starting to add per-user broadcasters
merging previous changes