FIXUP - use lazy lookup for locale data