diff --git a/api/domains.js b/api/domains.js
index fd1f97a..18d7675 100644
--- a/api/domains.js
+++ b/api/domains.js
@@ -3,16 +3,12 @@ const http = require('../http');
 const DOMAINS_API_PATH = `/cms/v3/domains`;
 
 async function fetchDomains(accountId) {
-  try {
-    const result = await http.get(accountId, {
-      uri: DOMAINS_API_PATH,
-      json: true,
-    });
+  const result = await http.get(accountId, {
+    uri: DOMAINS_API_PATH,
+    json: true,
+  });
 
-    return result.results;
-  } catch (err) {
-    throw err;
-  }
+  return result.results;
 }
 
 module.exports = {
diff --git a/api/preview.js b/api/preview.js
index 915a705..cbc3d9b 100644
--- a/api/preview.js
+++ b/api/preview.js
@@ -1,3 +1,5 @@
+const { request } = require('../http');
+
 async function fetchPreviewRender(url, sessionInfo) {
   const { sessionToken } = sessionInfo;
 
@@ -6,7 +8,7 @@ async function fetchPreviewRender(url, sessionInfo) {
   urlObject.searchParams.append('localPreviewToken', sessionToken);
   urlObject.searchParams.append('hsCacheBuster', Date.now());
 
-  return fetch(urlObject.href).then(res => res.text());
+  return request(urlObject.href);
 }
 
 module.exports = {
diff --git a/lang/en.lyaml b/lang/en.lyaml
index 9051199..d1b65eb 100644
--- a/lang/en.lyaml
+++ b/lang/en.lyaml
@@ -52,5 +52,3 @@ en:
           fieldsJsSyntaxError: "There was an error converting JS file \"{{ path }}\""
           fieldsJsNotReturnArray: "There was an error loading JS file \"{{ path }}\". Expected type \"Array\" but received type \"{{ returned }}\" . Make sure that your function returns an array"
           fieldsJsNotFunction:  "There was an error loading JS file \"{{ path }}\". Expected type \"Function\" but received type \"{{ returned }}\". Make sure that your default export is a function."
-
-
diff --git a/lib/config.js b/lib/config.js
index 453127a..852ef62 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -763,7 +763,22 @@ const isConfigFlagEnabled = flag => {
   return config[flag] || false;
 };
 
+
+const getAuthType = accountId => {
+  let authType = 'unknown';
+
+  if (accountId) {
+    const accountConfig = getAccountConfig(accountId);
+    if (accountConfig && accountConfig.authType) {
+      authType = accountConfig.authType;
+    }
+  }
+
+  return authType;
+};
+
 module.exports = {
+  getAuthType,
   getAndLoadConfigIfNeeded,
   getEnv,
   getConfig,
diff --git a/lib/preview.js b/lib/preview.js
index 3017326..f4b264f 100644
--- a/lib/preview.js
+++ b/lib/preview.js
@@ -23,7 +23,7 @@ const {
   isUngatedForPreview,
 } = require('./preview/previewUtils');
 const { markRemoteFsDirty } = require('./preview/routes/meta');
-const { startShadowDevServer } = require('./preview/shadowDevServer');
+const { startSprocketMenuServer } = require('./preview/sprocketMenuServer');
 const {
   createHttpsRedirectingServer,
 } = require('./preview/httpsRedirectingServer');
@@ -108,7 +108,7 @@ const buildDeleteFileFromPreviewBufferCallback = (sessionInfo, type) => {
 };
 
 const buildUploadFileToPreviewBufferCallback = (sessionInfo, notifyMessage) => {
-  const { portalId, src, dest, notify } = sessionInfo;
+  const { accountId, src, dest, notify } = sessionInfo;
 
   return async filePath => {
     if (!isAllowedExtension(filePath)) {
@@ -120,15 +120,17 @@ const buildUploadFileToPreviewBufferCallback = (sessionInfo, notifyMessage) => {
       return;
     }
     const destPath = getDesignManagerPath(src, dest, filePath);
-    const uploadPromise = uploadFile(portalId, filePath, destPath);
+    const uploadPromise = uploadFile(accountId, filePath, destPath);
     triggerNotify(notify, notifyMessage, filePath, uploadPromise);
   };
 };
 
-const initialPreviewBufferUpload = async (sessionInfo, filePaths) => {
-  const { portalId, src, dest } = sessionInfo;
+const initialPreviewBufferUpload = async (sessionInfo, filePaths, uploadOptions) => {
+  const { accountId, src, dest } = sessionInfo;
+  const { onFinishCallback, ...rest } = uploadOptions;
 
-  return uploadFolder(portalId, src, dest, fileMapperArgs, {}, filePaths);
+  const results = await uploadFolder(accountId, src, dest, fileMapperArgs, rest, filePaths);
+  onFinishCallback(results);
 };
 
 const startPreviewWatcher = async sessionInfo => {
@@ -158,11 +160,14 @@ const startPreviewWatcher = async sessionInfo => {
   );
 
   watcher.on('ready', () => {
-    console.log('Local file watching service has started!');
     watcherIsReady = true;
   });
   watcher.on('add', addFileCallback);
   watcher.on('change', changeFileCallback);
+  watcher.on('error', error =>
+    logger.error(`An error occurred while watching files: ${error}`)
+  );
+
   watcher.on('unlink', deleteFileCallback);
   watcher.on('unlinkDir', deleteFolderCallback);
 
@@ -180,7 +185,6 @@ const startPreviewWatcher = async sessionInfo => {
 
 const createLocalHttpServer = async sessionInfo => {
   const expressServer = express();
-  //expressServer.use(bodyParser.json());
   expressServer.use('/', await createPreviewServerRoutes(sessionInfo));
 
   return expressServer;
@@ -190,19 +194,20 @@ const preview = async (
   accountId,
   src,
   dest,
-  { notify, filePaths, skipUpload, noSsl, port }
+  { notify, filePaths, skipUpload, noSsl, port, uploadOptions }
 ) => {
   const accountConfig = getAccountConfig(accountId);
   const domains = await getPortalDomains(accountId);
-  const sessionToken = '96cd331a-189d-41f2-8a4c-a12485402eff';
+  const sessionToken = uuidv4();
   const PORT = port || 3000;
   const protocol = noSsl ? 'http' : 'https';
 
   const sessionInfo = {
     src,
     dest: `@preview/${sessionToken}/${dest}`,
+    fakeDest: dest,
     portalName: accountConfig.name,
-    portalId: accountId,
+    accountId,
     env: accountConfig.env,
     personalAccessKey: accountConfig.personalAccessKey,
     // we find hublet later in the content metadata fetch
@@ -215,7 +220,7 @@ const preview = async (
   };
   const ungated = await isUngatedForPreview(sessionInfo);
   if (!ungated) {
-    console.log(
+    logger.log(
       `Portal ${accountId} is missing a required gate for this feature.`
     );
     process.exit();
@@ -225,7 +230,7 @@ const preview = async (
   }
 
   if (!skipUpload) {
-    await initialPreviewBufferUpload(sessionInfo, filePaths);
+    await initialPreviewBufferUpload(sessionInfo, filePaths, uploadOptions);
   }
   const expressServer = await createLocalHttpServer(sessionInfo);
   const previewWatcher = await startPreviewWatcher(sessionInfo);
@@ -241,9 +246,9 @@ const preview = async (
     const httpServer = http.createServer(expressServer);
     httpServer.listen(PORT);
   }
-  startShadowDevServer(sessionInfo);
-  console.log(
-    `HubSpot preview local dev server hosting at ${protocol}://hslocal.net:${PORT}, portalId=${accountId}`
+  startSprocketMenuServer(sessionInfo);
+  logger.log(
+    `Local dev server started at ${protocol}://hslocal.net:${PORT} for portal ${accountId}`
   );
 };
 
diff --git a/lib/preview/createRoutes.js b/lib/preview/createRoutes.js
index f13b379..ba743c7 100644
--- a/lib/preview/createRoutes.js
+++ b/lib/preview/createRoutes.js
@@ -1,5 +1,6 @@
 const { Router } = require('express');
-const cors = require('cors');
+const { logger } = require('./../../logger');
+
 const { buildIndexRouteHandler } = require('./routes/index.js');
 const { buildModuleRouteHandler } = require('./routes/module.js');
 const { buildTemplateRouteHandler } = require('./routes/template.js');
@@ -15,8 +16,9 @@ const createPreviewServerRoutes = async (sessionInfo) => {
     previewServerRouter.get('/proxy', buildProxyRouteHandler(sessionInfo));
     previewServerRouter.get('/module/:modulePath(*)', buildModuleRouteHandler(sessionInfo));
     previewServerRouter.get('/template/:templatePath(*)', buildTemplateRouteHandler(sessionInfo));
+    // fetches server metadata from the client (used by refresh script to check if fs has been changed)
     previewServerRouter.get('/meta', buildMetaRouteHandler(sessionInfo));
-
+    // handles resources on the proxied page, so a fetch from relative path gets proxied too
     previewServerRouter.get('/*', proxyPathPageResourceRedirect)
     previewServerRouter.get('/*', proxyPageResourceRedirect);
     previewServerRouter.post('/*', proxyPageResourceRedirect);
@@ -25,7 +27,7 @@ const createPreviewServerRoutes = async (sessionInfo) => {
     previewServerRouter.put('/*', proxyPageResourceRedirect);
     previewServerRouter.options('/*', proxyPageResourceRedirect);
     previewServerRouter.get('/*', buildProxyPageRouteHandler(sessionInfo));
-
+    // index route
     previewServerRouter.get('/', buildIndexRouteHandler(sessionInfo));
 
     return previewServerRouter;
diff --git a/lib/preview/httpsRedirectingServer.js b/lib/preview/httpsRedirectingServer.js
index ed21398..604530c 100644
--- a/lib/preview/httpsRedirectingServer.js
+++ b/lib/preview/httpsRedirectingServer.js
@@ -1,6 +1,7 @@
 const http = require('http');
 const https = require('https');
 const net = require('net');
+const os = require('os')
 const { unlinkSync } = require('fs');
 const { silenceConsoleWhile } = require('./previewUtils');
 
@@ -14,11 +15,11 @@ const createCert = async (domainsToProxy) => {
   const hosts = ['localhost', 'hslocal.net', ...additionalMkcertHosts];
   const { createCertificate } = await import('mkcert-cli');
   const { key, cert } = await silenceConsoleWhile(createCertificate, {
-    keyFilePath: `${__dirname}/key.pem`,
-    certFilePath: `${__dirname}/cert.pem`
+    keyFilePath: `${os.tmpdir()}/hstmp/hsLocalSshKey.pem`,
+    certFilePath: `${os.tmpdir()}/hstmp/hsLocalSshCert.pem`
   }, hosts);
-  unlinkSync(`${__dirname}/key.pem`);
-  unlinkSync(`${__dirname}/cert.pem`);
+  unlinkSync(`${os.tmpdir()}/hstmp/hsLocalSshKey.pem`);
+  unlinkSync(`${os.tmpdir()}/hstmp/hsLocalSshCert.pem`);
   return { key, cert };
 }
 
diff --git a/lib/preview/previewUtils.js b/lib/preview/previewUtils.js
index 50b78d6..ccacd1f 100644
--- a/lib/preview/previewUtils.js
+++ b/lib/preview/previewUtils.js
@@ -2,34 +2,29 @@ const { fetchDomains } = require('../../api/domains');
 const { getAccountId, isTrackingAllowed, getAccountConfig } = require('../config');
 const { platform, release } = require('os');
 const { trackUsage } = require('../../api/fileMapper');
-const unAuth = require('../../api/localDevAuth/unauthenticated');
-
+const { enabledFeaturesForPersonalAccessKey } = require('../../personalAccessKey');
+const { stringify } = require('querystring');
+const { logger } = require('./../../logger');
+const { getAuthType } = require('./../../lib/config');
 const VALID_PROXY_DOMAIN_SUFFIXES = ['localhost', 'hslocal.net'];
+
 const HS_PREVIEW_GATE = "cms:localHublPreviews";
 
-const getPortalDomains = async (portalId) => {
+const getPortalDomains = async (accountId) => {
   try {
-    const result = await fetchDomains(portalId);
+    const result = await fetchDomains(accountId);
     return result;
   } catch (error) {
-    console.log("There was a problem fetching domains for your portal. You may be missing a scope necessary for this feature.")
     return [];
   }
 }
 
 const getPreviewUrl = (sessionInfo, queryParams) => {
-  const { portalId, env, hublet } = sessionInfo;
+  const { accountId, env, hublet } = sessionInfo;
 
-  return `http://${portalId}.hubspotpreview${
+  return `http://${accountId}.hubspotpreview${
     env === 'qa' ? 'qa' : ''
-  }-${hublet}.com/_hcms/preview/template/multi?${stringifyQuery(queryParams)}`;
-}
-
-const stringifyQuery = (query) => {
-  return Object.keys(query)
-    .sort()
-    .map(key => `${key}=${query[key]}`)
-    .join('&');
+  }-${hublet}.com/_hcms/preview/template/multi?${stringify(queryParams)}`;
 }
 
 const insertAtEndOfBody = (html, script) => {
@@ -44,6 +39,7 @@ const addRefreshScript = (html) => {
   const refreshScript = `
   <script>
   (() => {
+    const MAX_WAIT = 16000;
     const NORMAL_WAIT_MS = 1000;
     const BACKOFF_RATIO = 2;
     let nextWait = NORMAL_WAIT_MS;
@@ -62,7 +58,9 @@ const addRefreshScript = (html) => {
           nextWait = NORMAL_WAIT_MS;
         })
         .catch(err => {
-          nextWait *= BACKOFF_RATIO;
+          if (nextWait * BACKOFF_RATIO <= MAX_WAIT) {
+            nextWait *= BACKOFF_RATIO;
+          }
           console.log('Disconnected from local server... (retrying in ' + nextWait / 1000 + 's)');
         });
     }, NORMAL_WAIT_MS);
@@ -78,10 +76,8 @@ const getSubDomainFromValidLocalDomain = hostname => {
       return hostname.slice(0, -1 * validProxyDomainSuffix.length - 1);
     }
   }
-  return undefined;
 };
 
-// From(ish) https://git.hubteam.com/HubSpot/cloudflare-workers/blob/master/worker-lib/src/Constants.ts
 const internalRoutes = {
   HCMS: '/_hcms/',
   HS_FS: '/hs-fs/',
@@ -93,7 +89,7 @@ const isInternalCMSRoute = (req) =>
 
 const silenceConsoleWhile = async (act, ...args) => {
   const tmpConsole = console;
-  console = { log: () => {} }
+  console = { log: () => {} } // !
   const result = await act(...args);
   console = tmpConsole;
   return result;
@@ -135,38 +131,30 @@ const trackPreviewEvent = async (action) => {
     accountId
   ).catch(
     (err) => {
-      console.error(`trackUsage failed: ${JSON.stringify(err, null, 2)}`);
+      logger.debug(`trackUsage failed: ${JSON.stringify(err, null, 2)}`);
     }
   );
 }
 
-const getAuthType = (accountId) => {
-  let authType = 'unknown';
-
-  if (accountId) {
-    const accountConfig = getAccountConfig(accountId);
-    authType =
-      accountConfig && accountConfig.authType
-        ? accountConfig.authType
-        : 'apikey';
-  }
-
-  return authType;
-};
-
 const isUngatedForPreview = async (sessionInfo) => {
-  const { portalId, env, personalAccessKey } = sessionInfo;
+  const { accountId } = sessionInfo;
 
-  const { enabledFeatures = {} } = await unAuth.fetchAccessToken(
-    personalAccessKey,
-    env,
-    portalId
-  );
+  const enabledFeatures = await enabledFeaturesForPersonalAccessKey(accountId);
 
   return (Object.keys(enabledFeatures).includes(HS_PREVIEW_GATE)
     && enabledFeatures[HS_PREVIEW_GATE] === true)
 }
 
+const buildHTMLResponse = (content) => {
+  return `
+    <!DOCTYPE html>
+      <head>
+      </head>
+      <body>
+        ${content}
+      </body>
+  `;
+  }
 
 module.exports = {
   isInternalCMSRoute,
@@ -180,4 +168,5 @@ module.exports = {
   hidePreviewInDest,
   trackPreviewEvent,
   isUngatedForPreview,
+  buildHTMLResponse,
 }
diff --git a/lib/preview/proxyPage.js b/lib/preview/proxyPage.js
index 492655e..d2c6c28 100644
--- a/lib/preview/proxyPage.js
+++ b/lib/preview/proxyPage.js
@@ -12,12 +12,11 @@ const proxyPage = async (
     const embeddedHtml = addRefreshScript(pageHtml);
     res.status(200).set({ 'Content-Type': 'text/html' }).end(embeddedHtml);
   } catch (error) {
-    const { portalId } = sessionInfo;
-    // TODO change error.stack to error.message before we publish
+    const { accountId } = sessionInfo;
     res
       .status(500)
       .end(
-        `Failed proxy render of page ${urlToProxy} hub id = ${portalId}\n\n${error.stack}`
+        `Failed proxy render of page ${urlToProxy} hub id = ${accountId}\n\n${error.message}`
       );
     return;
   }
diff --git a/lib/preview/routes/index.js b/lib/preview/routes/index.js
index 0e9f67a..ade92c0 100644
--- a/lib/preview/routes/index.js
+++ b/lib/preview/routes/index.js
@@ -7,6 +7,8 @@ const {
   fetchPreviewModules
 } = require('../../../api/designManager');
 const { parse: pathParse } = require('path');
+const { logger } = require('./../../../logger');
+const { isCodedFile } = require('./../../../templates');
 
 const buildIndexRouteHandler = (sessionInfo) => {
   return async (req, res) => {
@@ -30,16 +32,19 @@ const buildIndexHtml = async (sessionInfo) => {
       <body style="height:100%;display:flex;flex-direction:column;align-items:center;">
         <div>
           <h1>Domains</h1>
-          ${ domains ? getSiteList(domains, PORT) : '<p>No domains found</p>' }
+          ${ domains.length ?
+            getSiteList(domains, PORT) :
+            "<p>No domains found. You either don't have any domains set up in your portal or your personal access key is missing a scope 'cms.domains.read' required for this feature.</p>"
+          }
         </div>
         <div style="width:100%;display:flex;flex-direction:row;justify-content:space-evenly">
           <div>
             <h1>Modules</h1>
-            ${ modulesHtml ? modulesHtml : `<p>No modules found in ${dest}</p>` }
+            ${ modulesHtml ? modulesHtml : `<p>No modules found in ${fakeDest}</p>` }
           </div>
           <div>
             <h1>Templates</h1>
-            ${ templatesHtml ? templatesHtml : `<p>No templates found in ${dest}</p>` }
+            ${ templatesHtml ? templatesHtml : `<p>No templates found in ${fakeDest}</p>` }
           </div>
         </div>
       </body>
@@ -62,9 +67,9 @@ const listify = (objects, hrefBuilder, labelBuilder) => {
 }
 
 const getModulesForDisplayToUser = async (sessionInfo) => {
-  const { portalId, sessionToken } = sessionInfo;
+  const { accountId, sessionToken } = sessionInfo;
   try {
-    const res = await fetchPreviewModules(portalId, sessionToken);
+    const res = await fetchPreviewModules(accountId, sessionToken);
     const modulePaths = res
       .objects
       .map(moduleObj => moduleObj.path);
@@ -72,25 +77,24 @@ const getModulesForDisplayToUser = async (sessionInfo) => {
     const htmlToRender = renderFilesGroupedByFolder(filesGroupedByFolder, 'module')
     return htmlToRender;
   } catch (err) {
-    console.log(`Failed to fetch modules for index page: ${err}`);
+    logger.error(`Failed to fetch modules for index page: ${err}`);
     return undefined;
   }
 }
 
 const getTemplatesForDisplayToUser = async (sessionInfo) => {
-  const { portalId, sessionToken } = sessionInfo;
+  const { accountId, sessionToken } = sessionInfo;
   try {
-    const res = await fetchPreviewTemplates(portalId, sessionToken);
+    const res = await fetchPreviewTemplates(accountId, sessionToken);
     const templatePaths = res
       .objects
-      .filter(templateObj => templateObj.filename.endsWith('html'))
+      .filter(templateObj => isCodedFile(templateObj.filename))
       .map(templateObj => templateObj.path);
     const filesGroupedByFolder = groupByFolder(templatePaths)
     const htmlToRender = renderFilesGroupedByFolder(filesGroupedByFolder, 'template')
     return htmlToRender;
   } catch (err) {
-    console.log(`Failed to fetch templates for index page: ${err}`);
-    return undefined;
+    logger.error(`Failed to fetch templates for index page: ${err}`);
   }
 }
 
@@ -112,13 +116,12 @@ const renderFilesGroupedByFolder = (filesGroupedByFolder, endpoint) => {
     const fakeDest = hidePreviewInDest(folder);
     const folderDisplay = '<b>'
       + fakeDest
-      + '</b><ul>'
-      + filesGroupedByFolder[folder].reduce((acc, cur) => {
-          const newListItem = `<li><a href="/${endpoint}/${fakeDest}/${cur}">${cur}</a></li>`
-          acc += newListItem;
-          return acc;
-        }, '')
-      + '</ul>';
+      + '</b>'
+      + listify(
+          filesGroupedByFolder[folder],
+          x => `/${endpoint}/${fakeDest}/${x}`,
+          x => x
+        );
     outer_acc += folderDisplay;
     return outer_acc;
   }, '');
diff --git a/lib/preview/routes/module.js b/lib/preview/routes/module.js
index 91c580c..8c08ead 100644
--- a/lib/preview/routes/module.js
+++ b/lib/preview/routes/module.js
@@ -4,13 +4,15 @@ const {
   addRefreshScript,
   getPreviewUrl,
   memoize,
-  trackPreviewEvent
+  trackPreviewEvent,
+  buildHTMLResponse
 } = require('../previewUtils');
+const { logger } = require('./../../../logger');
 
 const cachedFetchModulesByPath = memoize(fetchModulesByPath);
 
 const buildModuleRouteHandler = (sessionInfo) => {
-  const { portalId, sessionToken } = sessionInfo;
+  const { accountId, sessionToken } = sessionInfo;
 
   return async (req, res) => {
     trackPreviewEvent('view-module-route');
@@ -25,9 +27,9 @@ const buildModuleRouteHandler = (sessionInfo) => {
     const calculatedPath = `@preview/${sessionToken}/${modulePath}.module`;
     let customWidgetInfo;
     try {
-      customWidgetInfo = await cachedFetchModulesByPath(portalId, calculatedPath);
+      customWidgetInfo = await cachedFetchModulesByPath(accountId, calculatedPath);
     } catch (err) {
-      console.log(`Failed to fetch module preview for ${calculatedPath}`)
+      logger.error(`Failed to fetch module preview for ${calculatedPath}`)
     }
     if (!customWidgetInfo || !('moduleId' in customWidgetInfo && 'previewKey' in customWidgetInfo)) {
       res.status(200).set({ 'Content-Type': 'text/html' }).end(buildErrorIndex());
@@ -40,7 +42,7 @@ const buildModuleRouteHandler = (sessionInfo) => {
       ...req.query
     }
     const previewUrl = new URL(getPreviewUrl(sessionInfo, params))  ;
-    const result = await http.get(portalId, {
+    const result = await http.get(accountId, {
       baseUrl: previewUrl.origin,
       uri: previewUrl.pathname,
       query: params,
@@ -52,33 +54,19 @@ const buildModuleRouteHandler = (sessionInfo) => {
   }
 }
 
-const buildErrorIndex = () => {
-  return `
-    <!DOCTYPE html>
-    <head>
-    </head>
-    <body>
-      <div>
-        <h2>Error</h2>
-        <p>Failed to fetch module data.</p>
-      </div>
-    </body>
-  `;
-}
+const buildErrorIndex = () => buildHTMLResponse(`
+  <div>
+    <h2>Error</h2>
+    <p>Failed to fetch module data.</p>
+  </div>
+`);
 
-const buildModuleIndex = () => {
-  return `
-    <!DOCTYPE html>
-    <head>
-    </head>
-    <body>
-      <div>
-        <h2>Module Index</h2>
-        <p>Incomplete!</p>
-      </div>
-    </body>
-  `;
-}
+const buildModuleIndex = () => buildHTMLResponse(`
+  <div>
+    <h2>Module</h2>
+    <p>Please provide a module path in the request</p>
+  </div>
+`);
 
 module.exports = {
   buildModuleRouteHandler
diff --git a/lib/preview/routes/proxyPageResourceRedirect.js b/lib/preview/routes/proxyPageResourceRedirect.js
index e345e97..143651d 100644
--- a/lib/preview/routes/proxyPageResourceRedirect.js
+++ b/lib/preview/routes/proxyPageResourceRedirect.js
@@ -35,7 +35,7 @@ const proxyPageResourceRedirect = (req, res, next) => {
       !header.startsWith('sec-')
     );
 
-    let body = undefined;
+    let body;
 
     if (req.body) {
       if (isSendingJSON) {
diff --git a/lib/preview/routes/proxyPathPageResourceRedirect.js b/lib/preview/routes/proxyPathPageResourceRedirect.js
index 0fdb560..b1a6d13 100644
--- a/lib/preview/routes/proxyPathPageResourceRedirect.js
+++ b/lib/preview/routes/proxyPathPageResourceRedirect.js
@@ -1,5 +1,5 @@
-const fetch = require('node-fetch-commonjs');
 const { isInternalCMSRoute } = require('../previewUtils');
+const request = require('request');
 
 const proxyPathPageResourceRedirect = (req, res, next) => {
   const isAHtmlRequest = req.accepts().includes('text/html');
@@ -10,7 +10,7 @@ const proxyPathPageResourceRedirect = (req, res, next) => {
   try {
     refererUrl = new URL(req.headers.referer);
     proxyPageUrl = new URL(
-      new URL(req.headers.referer).searchParams.get('page')
+      refererUrl.searchParams.get('page')
     );
   } catch (e) {
     next();
@@ -31,8 +31,8 @@ const proxyPathPageResourceRedirect = (req, res, next) => {
   }
 
   const urlToProxy = `https://${proxyPageUrl.host}${req.url}`;
-  fetch(urlToProxy)
-    .then(response => response.body.pipe(res)) // https://github.com/node-fetch/node-fetch#bodybody
+  request(urlToProxy)
+    .then(response => response.body.pipe(res))
     .catch(err => console.error(err));
 }
 
diff --git a/lib/preview/routes/proxyPathPageRouteHandler.js.js b/lib/preview/routes/proxyPathPageRouteHandler.js.js
index 38149f7..efad899 100644
--- a/lib/preview/routes/proxyPathPageRouteHandler.js.js
+++ b/lib/preview/routes/proxyPathPageRouteHandler.js.js
@@ -1,5 +1,6 @@
 const { proxyPage } = require('../proxyPage');
-const { trackPreviewEvent } = require('../previewUtils');
+const { trackPreviewEvent, buildHTMLResponse } = require('../previewUtils');
+const { logger } = require('./../../../logger');
 
 const buildProxyRouteHandler = (sessionInfo) => {
 
@@ -16,13 +17,13 @@ const buildProxyRouteHandler = (sessionInfo) => {
     } catch (e) {
       const message =
         'Please provide a valid page query parameter, e.g., http://localhost:3000/proxy?page=https://yourdomain.com/path';
-      console.warn(message);
+      logger.warn(message);
       return res.status(400).send(message);
     }
     // validate proxy page URL query params
     if (proxyPageUrl.searchParams.has('hs_preview')) {
       const message = `Can't make a proxy request, you cannot proxy URLs that include internal query params like hs_preview`;
-      console.warn(message);
+      logger.warn(message);
       return res.status(400).send(message);
     }
     trackPreviewEvent('proxy-path-route');
@@ -39,36 +40,23 @@ const buildProxyRouteHandler = (sessionInfo) => {
   }
 }
 
-const buildProxyIndex = () => {
-  // If we want to embed a script or something into the proxy
-  // we can wrap it here or parse the returned HTML into the render
-  // but that's maybe trickier...
-  return `
-    <!DOCTYPE html>
-    <head>
-    </head>
-		<body>
-      <div>
-        <h2>Local Proxy</h2>
-        <form action="/proxy">
-          <label htmlFor="page" style={{ display: 'block' }}>
-            Page URL
-          </label>
-          <input
-            style={{ width: '300px' }}
-            name="page"
-            type="text"
-            placeholder="https://somecmspage.com/path"
-          />
-          <button style={{ display: 'block' }}>Proxy</button>
-        </form>
-      </div>
-		</body>
-  `;
-}
-
-
-
+const buildProxyIndex = () => buildHTMLResponse(`
+  <div>
+    <h2>Local Proxy</h2>
+    <form action="/proxy">
+      <label htmlFor="page" style={{ display: 'block' }}>
+        Page URL
+      </label>
+      <input
+        style={{ width: '300px' }}
+        name="page"
+        type="text"
+        placeholder="https://somecmspage.com/path"
+      />
+      <button style={{ display: 'block' }}>Proxy</button>
+    </form>
+  </div>
+`);
 
 module.exports = {
   buildProxyRouteHandler
diff --git a/lib/preview/routes/template.js b/lib/preview/routes/template.js
index 271160b..65de537 100644
--- a/lib/preview/routes/template.js
+++ b/lib/preview/routes/template.js
@@ -1,11 +1,12 @@
 const http = require('../../../http');
 const { fetchTemplatesByPath } = require('../../../api/designManager');
-const { getPreviewUrl, addRefreshScript, memoize } = require('../previewUtils');
+const { getPreviewUrl, addRefreshScript, memoize, buildHTMLResponse } = require('../previewUtils');
+const { logger } = require('./../../../logger');
 
 const cachedFetchTemplatesByPath = memoize(fetchTemplatesByPath);
 
 const buildTemplateRouteHandler = (sessionInfo) => {
-  const { portalId, sessionToken } = sessionInfo;
+  const { accountId, sessionToken } = sessionInfo;
 
   return async (req, res) => {
     const { templatePath } = req.params;
@@ -18,9 +19,9 @@ const buildTemplateRouteHandler = (sessionInfo) => {
     const calculatedPath = `@preview/${sessionToken}/${templatePath}`;
     let templateInfo;
     try {
-      templateInfo = await cachedFetchTemplatesByPath(portalId, calculatedPath);
+      templateInfo = await cachedFetchTemplatesByPath(accountId, calculatedPath);
     } catch (err) {
-      console.log(`Failed to fetch template info for ${calculatedPath}: ${err}`);
+      logger.error(`Failed to fetch template info for ${calculatedPath}: ${err}`);
     }
     if (!templateInfo || !('previewKey' in templateInfo)) {
       res.status(502).set({ 'Content-Type': 'text/html' }).end(buildErrorIndex());
@@ -32,7 +33,7 @@ const buildTemplateRouteHandler = (sessionInfo) => {
       ...req.query
     }
     const previewUrl = new URL(getPreviewUrl(sessionInfo, params));
-    const result = await http.get(portalId, {
+    const result = await http.get(accountId, {
       baseUrl: previewUrl.origin,
       uri: previewUrl.pathname,
       query: params,
@@ -44,33 +45,19 @@ const buildTemplateRouteHandler = (sessionInfo) => {
   }
 }
 
-const buildErrorIndex = () => {
-  return `
-    <!DOCTYPE html>
-    <head>
-    </head>
-    <body>
-      <div>
-        <h2>Error</h2>
-        <p>Failed to fetch template data.</p>
-      </div>
-    </body>
-  `;
-}
+const buildErrorIndex = () => buildHTMLResponse(`
+  <div>
+    <h2>Error</h2>
+    <p>Failed to fetch template data.</p>
+  </div>
+`)
 
-const buildTemplateIndex = () => {
-  return `
-    <!DOCTYPE html>
-    <head>
-    </head>
-    <body>
-      <div>
-        <h2>Template</h2>
-        <p>Provide a template path in the request</p>
-      </div>
-    </body>
-  `;
-}
+const buildTemplateIndex = () => buildHTMLResponse(`
+  <div>
+    <h2>Template</h2>
+    <p>Please provide a template path in the request</p>
+  </div>
+`)
 
 module.exports = {
   buildTemplateRouteHandler
diff --git a/lib/preview/shadowDevServer.js b/lib/preview/sprocketMenuServer.js
similarity index 50%
rename from lib/preview/shadowDevServer.js
rename to lib/preview/sprocketMenuServer.js
index b72136a..8b4fad3 100644
--- a/lib/preview/shadowDevServer.js
+++ b/lib/preview/sprocketMenuServer.js
@@ -2,18 +2,18 @@ const net = require('net');
 const express = require('express');
 const { Router } = require('express');
 const cors = require("cors");
+const { logger } = require('../../logger');
 
-const SHADOW_PORT = 1442;
+const SPROCKET_MENU_PORT = 1442;
 
-const startShadowDevServer = async (sessionInfo) => {
+const startSprocketMenuServer = async (sessionInfo) => {
   const portIsTaken = await new Promise((res, rej) => {
-    console.log(`Starting proxy link server on port ${SHADOW_PORT}`);
     const testNetServer = net.createServer();
 
     testNetServer.once('error', err => {
       if (err['code'] === 'EADDRINUSE') {
-        console.error(
-          `Port ${SHADOW_PORT} is in use. HubSpot is unable to automatically create proxy links in the Sprocket Menu`
+        logger.error(
+          `Port ${SPROCKET_MENU_PORT} is in use. HubSpot will be unable to automatically create proxy links in the Sprocket Menu`
         );
         res(true);
       } else {
@@ -29,36 +29,36 @@ const startShadowDevServer = async (sessionInfo) => {
       res(false);
     });
 
-    testNetServer.listen(SHADOW_PORT);
+    testNetServer.listen(SPROCKET_MENU_PORT);
   });
 
   if (portIsTaken) {
     return;
   }
 
-  const shadowDevServer = express();
+  const sprocketMenuServer = express();
 
-  shadowDevServer.listen(SHADOW_PORT);
+  sprocketMenuServer.listen(SPROCKET_MENU_PORT);
 
-  shadowDevServer.use(
+  sprocketMenuServer.use(
     '/',
-    await createShadowDevServerRoutes(sessionInfo)
+    await createSprocketMenuServerRoutes(sessionInfo)
   );
 }
 
-const createShadowDevServerRoutes = async (sessionInfo) => {
-  const shadowDevServerRoutes = Router();
+const createSprocketMenuServerRoutes = async (sessionInfo) => {
+  const sprocketMenuServerRoutes = Router();
 
-  shadowDevServerRoutes.get(
+  sprocketMenuServerRoutes.get(
     '/check-if-local-dev-server',
     cors(),
-    shadowDevServerCheckHandler(sessionInfo),
+    sprocketMenuServerCheckHandler(sessionInfo),
   );
 
-  return shadowDevServerRoutes;
+  return sprocketMenuServerRoutes;
 }
 
-const shadowDevServerCheckHandler = (sessionInfo) =>  async (req, res) => {
+const sprocketMenuServerCheckHandler = (sessionInfo) =>  async (req, res) => {
   const { PORT } = sessionInfo;
   const { query } = req;
 
@@ -68,11 +68,8 @@ const shadowDevServerCheckHandler = (sessionInfo) =>  async (req, res) => {
       pathName,
     } = query;
 
-    let hasJSBuildingBlocks;
-    let localProxyUrl;
-
-    hasJSBuildingBlocks = false;
-    localProxyUrl = `http://${hostName}.hslocal.net:${PORT}${pathName}`;
+    let hasJSBuildingBlocks = false;
+    let localProxyUrl = `http://${hostName}.hslocal.net:${PORT}${pathName}`;
 
     res
       .status(200)
@@ -82,5 +79,5 @@ const shadowDevServerCheckHandler = (sessionInfo) =>  async (req, res) => {
 }
 
 module.exports = {
-  startShadowDevServer
+  startSprocketMenuServer
 }
diff --git a/lib/uploadFolder.js b/lib/uploadFolder.js
index ab5d5a9..b607d0d 100644
--- a/lib/uploadFolder.js
+++ b/lib/uploadFolder.js
@@ -107,6 +107,46 @@ async function getFilesByType(
   return [filePathsByType, fieldsJsObjects];
 }
 
+const defaultUploadAttemptCallback = ((file, destPath) =>
+  logger.debug(
+    'Attempting to upload file "%s" to "%s"',
+    file,
+    destPath
+  )
+);
+const defaultUploadSuccessCallback = (file, destPath) => logger.log(
+  'Uploaded file "%s" to "%s"',
+  file,
+  destPath
+);
+const defaultUploadFirstErrorCallback = (file, destPath, error) => {
+  logger.debug(
+    'Uploading file "%s" to "%s" failed so scheduled retry',
+    file,
+    destPath
+  );
+  if (error.response && error.response.body) {
+    logger.debug(error.response.body);
+  } else {
+    logger.debug(error.message);
+  }
+};
+const defaultUploadRetryCallback = (file, destPath) => logger.debug(
+  'Retrying to upload file "%s" to "%s"',
+  file,
+  destPath
+);
+const defaultUploadFinalErrorCallback = (accountId, file, destPath, error) => {
+  logger.error('Uploading file "%s" to "%s" failed', file, destPath);
+  logApiUploadErrorInstance(
+    error,
+    new ApiErrorContext({
+      accountId,
+      request: destPath,
+      payload: file,
+    })
+  );
+};
 /**
  *
  * @param {number} accountId
@@ -122,7 +162,20 @@ async function uploadFolder(
   commandOptions = {},
   filePaths = []
 ) {
-  const { saveOutput, convertFields } = commandOptions;
+  const {
+    saveOutput,
+    convertFields,
+    onAttemptCallback,
+    onSuccessCallback,
+    onFirstErrorCallback,
+    onRetryCallback,
+    onFinalErrorCallback
+  } = commandOptions;
+  const _onAttemptCallback = onAttemptCallback || defaultUploadAttemptCallback;
+  const _onSuccessCallback = onSuccessCallback || defaultUploadSuccessCallback;
+  const _onFirstErrorCallback = onFirstErrorCallback || defaultUploadFirstErrorCallback;
+  const _onRetryCallback = onRetryCallback || defaultUploadRetryCallback;
+  const _onFinalErrorCallback = onFinalErrorCallback || defaultUploadFinalErrorCallback;
   const tmpDir = convertFields
     ? createTmpDirSync('hubspot-temp-fieldsjs-output-')
     : null;
@@ -162,28 +215,15 @@ async function uploadFolder(
     );
     const destPath = convertToUnixPath(path.join(dest, relativePath));
     return async () => {
-      logger.debug(
-        'Attempting to upload file "%s" to "%s"',
-        originalFilePath,
-        destPath
-      );
+      _onAttemptCallback(originalFilePath, destPath);
       try {
         await upload(accountId, file, destPath, apiOptions);
-        logger.log('Uploaded file "%s" to "%s"', originalFilePath, destPath);
+        _onSuccessCallback(originalFilePath, destPath);
       } catch (error) {
         if (isFatalError(error)) {
           throw error;
         }
-        logger.debug(
-          'Uploading file "%s" to "%s" failed so scheduled retry',
-          file,
-          destPath
-        );
-        if (error.response && error.response.body) {
-          logger.debug(error.response.body);
-        } else {
-          logger.debug(error.message);
-        }
+        _onFirstErrorCallback(file, destPath);
         failures.push({
           file,
           destPath,
@@ -202,28 +242,20 @@ async function uploadFolder(
     .addAll(
       failures.map(({ file, destPath }) => {
         return async () => {
-          logger.debug('Retrying to upload file "%s" to "%s"', file, destPath);
+          _onRetryCallback(file, destPath);
           try {
             await upload(accountId, file, destPath, apiOptions);
-            logger.log('Uploaded file "%s" to "%s"', file, destPath);
+            _onSuccessCallback(file, destPath);
             return {
               resultType: FileUploadResultType.SUCCESS,
               error: null,
               file,
             };
           } catch (error) {
-            logger.error('Uploading file "%s" to "%s" failed', file, destPath);
             if (isFatalError(error)) {
               throw error;
             }
-            logApiUploadErrorInstance(
-              error,
-              new ApiErrorContext({
-                accountId,
-                request: destPath,
-                payload: file,
-              })
-            );
+              _onFinalErrorCallback(accountId, file, destPath, error);
             return {
               resultType: FileUploadResultType.FAILURE,
               error,
diff --git a/package.json b/package.json
index 32d1998..f425d67 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
     "js-yaml": "^4.1.0",
     "mkcert-cli": "^1.5.0",
     "moment": "^2.24.0",
-    "node-fetch-commonjs": "^3.3.2",
     "p-queue": "^6.0.2",
     "prettier": "^1.19.1",
     "request": "^2.88.2",
diff --git a/personalAccessKey.js b/personalAccessKey.js
index d93096b..ef981a1 100644
--- a/personalAccessKey.js
+++ b/personalAccessKey.js
@@ -43,6 +43,7 @@ async function getAccessToken(
     accessToken: response.oauthAccessToken,
     expiresAt: moment(response.expiresAtMillis),
     scopeGroups: response.scopeGroups,
+    enabledFeatures: response.enabledFeatures,
     encodedOauthRefreshToken: response.encodedOauthRefreshToken,
   };
 }
@@ -52,11 +53,12 @@ async function refreshAccessToken(
   personalAccessKey,
   env = ENVIRONMENTS.PROD
 ) {
-  const { accessToken, expiresAt } = await getAccessToken(
+  const accessTokenResponse = await getAccessToken(
     personalAccessKey,
     env,
     accountId
   );
+  const { accessToken, expiresAt } = accessTokenResponse
   const config = getAccountConfig(accountId);
 
   updateAccountConfig({
@@ -69,15 +71,15 @@ async function refreshAccessToken(
   });
   writeConfig();
 
-  return accessToken;
+  return accessTokenResponse;
 }
 
-async function getNewAccessToken(accountId, personalAccessKey, expiresAt, env) {
+async function getNewAccessToken(accountId, personalAccessKey, expiresAt, env, fullAPIResponse=false) {
   const key = getRefreshKey(personalAccessKey, expiresAt);
   if (refreshRequests.has(key)) {
     return refreshRequests.get(key);
   }
-  let accessToken;
+  let accessTokenResponse;
   try {
     const refreshAccessPromise = refreshAccessToken(
       accountId,
@@ -87,14 +89,17 @@ async function getNewAccessToken(accountId, personalAccessKey, expiresAt, env) {
     if (key) {
       refreshRequests.set(key, refreshAccessPromise);
     }
-    accessToken = await refreshAccessPromise;
+    accessTokenResponse = await refreshAccessPromise;
   } catch (e) {
     if (key) {
       refreshRequests.delete(key);
     }
     throw e;
   }
-  return accessToken;
+  if (fullAPIResponse) {
+    return accessTokenResponse;
+  }
+  return accessTokenResponse.accessToken;
 }
 
 async function accessTokenForPersonalAccessKey(accountId) {
@@ -118,6 +123,20 @@ async function accessTokenForPersonalAccessKey(accountId) {
 
   return auth.tokenInfo.accessToken;
 }
+async function enabledFeaturesForPersonalAccessKey(accountId) {
+  const { auth, personalAccessKey, env } = getAccountConfig(accountId);
+  const authTokenInfo = auth && auth.tokenInfo;
+
+  const accessTokenResponse = await getNewAccessToken(
+    accountId,
+    personalAccessKey,
+    authTokenInfo && authTokenInfo.expiresAt,
+    env,
+    fullAPIResponse=true
+  )
+  return accessTokenResponse.enabledFeatures;
+}
+
 
 /**
  * Adds a account to the config using authType: personalAccessKey
@@ -179,6 +198,7 @@ const updateConfigWithPersonalAccessKey = async (configData, makeDefault) => {
 
 module.exports = {
   accessTokenForPersonalAccessKey,
+  enabledFeaturesForPersonalAccessKey,
   updateConfigWithPersonalAccessKey,
   getAccessToken,
 };