Add unfoldr
Upgrade to real streams
Resolve merge conflicts