Stream2

Hey @maxogden! I added support for streams2, also I added some tests - so I don't think I broke anything.

Also, I tried following your style but please let me know if I missed something.