Lots of changes
Adds i18n support