Merged in the work on splitting operational from simple graph implementation.