Added a little functionality to streamer.  Refactoring next