Refactored graph for modules.  Not working as expected.