By the amount of code that needs to be changed, I can safely tell that the whole streaming thing is not a minor thing...