diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..59d40d4
--- /dev/null
+++ b/.env.development
@@ -0,0 +1 @@
+IS_DEV=1
\ No newline at end of file
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..8956ef4
--- /dev/null
+++ b/.env.production
@@ -0,0 +1 @@
+IS_DEV=0
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index adec0da..7d2ea03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,4 @@ build/
 dist/
 package-lock.json
 .cache/
-.env
 .vscode/
\ No newline at end of file
diff --git a/client/App.jsx b/client/App.jsx
index 191395a..dbedcb0 100644
--- a/client/App.jsx
+++ b/client/App.jsx
@@ -8,7 +8,9 @@ import Header from './Components/Header';
 import QueriesContainer from './Containers/QueriesContainer';
 import { StateProvider, useStateValue } from './Context';
 // using a proxy to get around CORS. WE PROBABLY NEED A SERVER NOW.
-const proxy = 'https://cors-anywhere.herokuapp.com/';
+const proxy = process.env.IS_DEV ? 'https://cors-anywhere.herokuapp.com/' : '';
+console.log('proxy is: ', proxy)
+// const proxy = 'https://cors-anywhere.herokuapp.com/';
 
 
 const App = () => {
diff --git a/client/Components/QueryInput.jsx b/client/Components/QueryInput.jsx
index 9c56a62..078a31e 100644
--- a/client/Components/QueryInput.jsx
+++ b/client/Components/QueryInput.jsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import gql from 'graphql-tag';
 import { Controlled as CodeMirror } from 'react-codemirror2';
+// import NodeFetch from 'node-fetch';
 import { useStateValue } from '../Context';
 import EndpointField from './EndpointField';
 import fetchErrorCheck from '../utils/fetchErrorCheck';
@@ -11,7 +12,9 @@ import '../StyleSheets/external/CodeMirror.css';
 
 
 // using a proxy to get around CORS. WE PROBABLY NEED A SERVER NOW.
-const proxy = 'https://cors-anywhere.herokuapp.com/';
+// const proxy = 'https://cors-anywhere.herokuapp.com/';
+console.log('env is dev: ', process.env.IS_DEV);
+const proxy = process.env.IS_DEV ? 'https://cors-anywhere.herokuapp.com/' : '';
 
 // wrote example query so it can be used as a placeholder in textarea
 const exampleQuery = `# Example query:
@@ -64,7 +67,7 @@ const QueryInput = () => {
     fetch(proxy + urlToSend, {
       // mode: 'no-cors',
       headers: {
-        // 'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Origin': '*',
         'Content-Type': 'application/json',
       },
     })
diff --git a/electron.js b/electron.js
index 082c014..24cbab5 100644
--- a/electron.js
+++ b/electron.js
@@ -19,7 +19,8 @@ app.on('ready', () => {
   // load html into the window
   console.log('Dev environment on: ', isDev);
   mainWindow.loadURL(url.format({
-    pathname: isDev ? '//localhost:8080' : path.join(__dirname, './build/index.html'),
+    // ssiwtched back to 3000 from 8080 because no longer using server
+    pathname: isDev ? '//localhost:3000' : path.join(__dirname, './build/index.html'),
     protocol: isDev ? 'http:' : 'file:',
     slashes: true,
   }));
diff --git a/package-lock.json b/package-lock.json
index 9129165..1058912 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4254,8 +4254,7 @@
     "dotenv": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.0.0.tgz",
-      "integrity": "sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==",
-      "dev": true
+      "integrity": "sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg=="
     },
     "dotenv-expand": {
       "version": "5.1.0",
@@ -7119,6 +7118,11 @@
       "integrity": "sha512-TaiwMuQqmonaIz/dI+a3V2XE67872jC2Z+fOzKuH4piwxGZN48NwVy75hL8shzQL09Nfl/Avk7md7dVcMG0zlA==",
       "dev": true
     },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
     "node-forge": {
       "version": "0.7.6",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz",
diff --git a/package.json b/package.json
index b757045..d70b0cb 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
     "electron-build": "electron-builder",
     "server": "node_modules/nodemon/bin/nodemon.js server/server.js",
     "clean-build": "rm -rf build/ .cache dist/",
-    "react-start": "parcel -p 3000 index.html --out-dir build",
-    "react-build": "parcel build index.html --out-dir build --public-url ./",
+    "react-start": "NODE_ENV=development parcel -p 3000 index.html --out-dir build",
+    "react-build": "NODE_ENV=production parcel build index.html --out-dir build --public-url ./",
     "server-test": "npm run react-start & wait-on http://localhost:3000 && npm run server & wait-on http://localhost:8080 && ELECTRON_IS_DEV=1 npm run start-electron",
     "start": "npm run react-start & wait-on http://localhost:3000 && ELECTRON_IS_DEV=1 npm run start-electron",
     "build": "npm run clean-build && npm run react-build && npm run electron-build && ELECTRON_IS_DEV=0 npm run start-electron",
@@ -38,11 +38,13 @@
     "codemirror": "^5.48.2",
     "cors": "^2.8.5",
     "css-loader": "^3.1.0",
+    "dotenv": "^8.0.0",
     "express": "^4.17.1",
     "grap": "^1.0.0",
     "graphql": "^14.4.2",
     "graphql-anywhere": "^4.2.4",
     "graphql-tag": "^2.10.1",
+    "node-fetch": "^2.6.0",
     "nodemon": "^1.19.1",
     "react": "^16.8.6",
     "react-apollo": "^2.5.8",