Streams 159

Pull request open on apache too.
The helper methods don't match the format we have in the graph.