Refactored localization stuff in anticipation of additional base classes