Localization: Initial changes + testing