bunch of stuff, added broadcaster etc
merge conflict
git ignore reapplied