A re-refactor of streams