Begin adding code for localization support