Work in progress on localization function
Conflict fix