changed streams a bit.. might make them into a pipeline
added new files