Nonunique

Changed internal data structure to array of tuples