Half-way refactoring GNGDataset, #20