WIP: Rework streams again