First pass at new stream package