Refactor stream

Some clean up / refactoring and display a nice progressBar.

![pull](https://f.cloud.github.com/assets/1032519/1642587/7c2246fa-588d-11e3-9c32-cfdf25dfe794.gif)


I should add more tests.