WIP changes for retrieving data from a graph