Finishing up converting to i18n