Datastreams not nodes

Includes #304 

https://www.pivotaltracker.com/story/show/69790134