Added group edges and canonical 2d partitioner