Work in progress commit on i18n support