Hopefully additions not breaking anything this time 

Rewrite of a previous problematic pull request. Adding media streaming related references.