Refactoring stream into seperate module
Autocommit Wed Dec 03 10:51:15 EST 2014