wip, working 1
Same functionalities as first version/i18n added
Cleaning