Preliminary Localization Work

In preparation of localization, at some point.