added the graph picker and what not.