Beginnings of a streaming engine (aggregator)
Merge remote-tracking branch 'origin/master'