implementation of the new localisation handling

Nothing to merge right, just to track change.