Added some streams stuff

It's functional-ish
Merged branch