Veronica major refactor to graph object