Some more work on the localization stuff