WIP: Wire up media streams

Create a PR so I can review
Remove whitespace