Added graphing...
More progress?