Started implementing Streams
one step further towards streams
update tests ++