Fill in new Graph methods.  Clean up directory handling and test.