New way to handle Streams

- Commit for SIPit
Fix assignment.

-- Fails for Firefox