WIP.  Code cleanup.  Added support for method based graphs.