2.3/feature psr streams

Progress