more work on new streams/patterns stuff