diff --git a/app.py b/app.py
index 5b00bf9..c5f1062 100644
--- a/app.py
+++ b/app.py
@@ -12,19 +12,17 @@ bcrypt = Bcrypt(app)
 app.config['CORS_HEADERS'] = 'Content-Type'
 
 # ! Environment Variable
-# TODO change to os.getenv('CONFIGURATION')
-# TODO export CONFIGURATION='configuration.config.ProductionConfig'
-app.config.from_object('configuration.config.DevelopmentConfig')
+# TODO export CONFIGURATION_OBJECT='configuration.config.ProductionConfig'
+app.config.from_object(os.getenv('CONFIGURATION_OBJECT'))
 
 # ! Environment Variable
-# TODO change to os.getenv('ALLOWED_ORIGIN')
 # TODO export ALLOWED_ORIGIN= whatever the react server is
-socketio = SocketIO(app, cors_allowed_origins="http://localhost:3000")
+socketio = SocketIO(app, cors_allowed_origins=os.getenv('ALLOWED_ORIGIN'))
 
 def create_app():
     CORS(app, resources={
-        r"/api/*": {"origins": "http://localhost:3000"},
-        r"/auth/*": {"origins": "http://localhost:3000"},
+        r"/api/*": {"origins": os.getenv('ALLOWED_ORIGIN')},
+        r"/auth/*": {"origins": os.getenv('ALLOWED_ORIGIN')},
     })
     db.init_app(app)
     ma.init_app(app)