Fixed #53; started basic work for graphs.