Graph added to condorcet2, rearanged stuff