finish liftStream
Rearrange.  Plus add a test case for lifting.
Some progress. Having problems with one window disappearingg