Completed implementation of new Streams, but have not tested - Issue #34