Add find refactor all of the graph code, add metadata. Part of #19