Merged stream code

! Not working yet. Log says it's playing, but no sound.
Whitespace

- Removed some whitespace