removing nsorderedset in favor of nsdictionary