[FIX] Porting gustaf to new stream module.

Work not complete, some app tests still fail.
Here's the bug ;)