implementation of the new localisation handling

Nothing to merge right now, just to track change.