diff --git a/Makefile b/Makefile
index b9d9ac25..a8332737 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 export TRANSIFEX_RESOURCE = frontend-app-authn
 transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA,it_IT,pt_PT,de_DE"
 
+intl_imports = ./node_modules/.bin/intl-imports.js
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
@@ -42,9 +43,22 @@ push_translations:
 	# Pushing comments to Transifex...
 	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
 
+ifeq ($(OPENEDX_ATLAS_PULL),)
 # Pulls translations from Transifex.
 pull_translations:
 	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
+else
+# Experimental: OEP-58 Pulls translations using atlas
+pull_translations:
+	rm -rf src/i18n/messages
+	mkdir src/i18n/messages
+	cd src/i18n/messages \
+	  && atlas pull --filter=$(transifex_langs) \
+	           translations/paragon/src/i18n/messages:paragon \
+	           translations/frontend-app-authn/src/i18n/messages:frontend-app-authn
+
+	$(intl_imports) paragon frontend-app-authn
+endif
 
 # This target is used by Travis.
 validate-no-uncommitted-package-lock-changes:
diff --git a/src/i18n/index.jsx b/src/i18n/index.jsx
index 3f8208da..c6abccca 100644
--- a/src/i18n/index.jsx
+++ b/src/i18n/index.jsx
@@ -1,3 +1,5 @@
+import { messages as paragonMessages } from '@edx/paragon';
+
 import arMessages from './messages/ar.json';
 import deMessages from './messages/de.json';
 import dedeCAMessages from './messages/de_DE.json';
@@ -14,7 +16,7 @@ import ukMessages from './messages/uk.json';
 import zhcnMessages from './messages/zh_CN.json';
 // no need to import en messages-- they are in the defaultMessage field
 
-const messages = {
+const appMessages = {
   ar: arMessages,
   'es-419': es419Messages,
   fr: frMessages,
@@ -31,4 +33,7 @@ const messages = {
   'pt-pt': ptptCAMessages,
 };
 
-export default messages;
+export default [
+  paragonMessages,
+  appMessages,
+];
diff --git a/src/index.jsx b/src/index.jsx
index b65466b5..b1131794 100755
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -8,10 +8,9 @@ import {
   APP_INIT_ERROR, APP_READY, initialize, mergeConfig, subscribe,
 } from '@edx/frontend-platform';
 import { ErrorPage } from '@edx/frontend-platform/react';
-import { messages as paragonMessages } from '@edx/paragon';
 
 import configuration from './config';
-import appMessages from './i18n';
+import messages from './i18n';
 import MainApp from './MainApp';
 
 subscribe(APP_READY, () => {
@@ -31,8 +30,5 @@ initialize({
       mergeConfig(configuration);
     },
   },
-  messages: [
-    appMessages,
-    paragonMessages,
-  ],
+  messages,
 });