Added some TODO's and initial data-streaming implementation.