Initial commit from Streams Product, fixes #1