Fixed grouping comparator, completed driver class