Started adding localization