WIP, l10n rewrite + handling