Implementation of streams WIP