diff --git a/packages/vsce/CHANGELOG.md b/packages/vsce/CHANGELOG.md
index 6cb29eba..22069610 100644
--- a/packages/vsce/CHANGELOG.md
+++ b/packages/vsce/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to the "cics-extension-for-zowe" extension will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Initializing new Team Configuration File. [#33](https://github.com/zowe/cics-for-zowe-client/issues/33)
 
 ## `3.1.1`
 
diff --git a/packages/vsce/src/commands/deleteSessionCommand.ts b/packages/vsce/src/commands/deleteSessionCommand.ts
index e4fefe0f..30234912 100644
--- a/packages/vsce/src/commands/deleteSessionCommand.ts
+++ b/packages/vsce/src/commands/deleteSessionCommand.ts
@@ -25,7 +25,7 @@ export function getDeleteSessionCommand(tree: CICSTree, treeview: TreeView<any>)
     }
     try {
       const configInstance = await ProfileManagement.getConfigInstance();
-      if (configInstance.usingTeamConfig) {
+      if (configInstance.getTeamConfig().exists) {
         const currentProfile = await ProfileManagement.getProfilesCache().getProfileFromConfig(allSelectedNodes[allSelectedNodes.length - 1].label);
         if (currentProfile) {
           const filePath = currentProfile.profLoc.osLoc ? currentProfile.profLoc.osLoc[0] : "";
diff --git a/packages/vsce/src/commands/updateSessionCommand.ts b/packages/vsce/src/commands/updateSessionCommand.ts
index d2fa688a..88dcaf40 100644
--- a/packages/vsce/src/commands/updateSessionCommand.ts
+++ b/packages/vsce/src/commands/updateSessionCommand.ts
@@ -24,7 +24,7 @@ export function getUpdateSessionCommand(tree: CICSTree, treeview: TreeView<any>)
       return;
     }
     const configInstance = await ProfileManagement.getConfigInstance();
-    if (configInstance.usingTeamConfig) {
+    if (configInstance.getTeamConfig().exists) {
       try {
         const currentProfile = await ProfileManagement.getProfilesCache().getProfileFromConfig(allSelectedNodes[allSelectedNodes.length - 1].label);
         if (currentProfile) {
diff --git a/packages/vsce/src/trees/CICSTree.ts b/packages/vsce/src/trees/CICSTree.ts
index 58cb5392..28c85721 100644
--- a/packages/vsce/src/trees/CICSTree.ts
+++ b/packages/vsce/src/trees/CICSTree.ts
@@ -24,7 +24,6 @@ import {
 import { PersistentStorage } from "../utils/PersistentStorage";
 import { InfoLoaded, ProfileManagement } from "../utils/profileManagement";
 import { isTheia, openConfigFile } from "../utils/workspaceUtils";
-import { addProfileHtml } from "../utils/webviewHTML";
 import { CICSPlexTree } from "./CICSPlexTree";
 import { CICSRegionTree } from "./CICSRegionTree";
 import { CICSSessionTree } from "./CICSSessionTree";
@@ -85,18 +84,11 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
       const configInstance = await ProfileManagement.getConfigInstance();
       const allCICSProfiles = (await ProfileManagement.getProfilesCache().getProfileInfo()).getAllProfiles("cics");
       // const allCICSProfiles = await ProfileManagement.getProfilesCache().getProfiles('cics');
-      if (!allCICSProfiles) {
-        if (!configInstance.getTeamConfig().exists) {
-          window.showErrorMessage(`Could not find any CICS profiles`);
-          return;
-        }
-        window.showInformationMessage(`Could not find any CICS profiles`);
-      }
       const allCICSProfileNames: string[] = allCICSProfiles ? (allCICSProfiles.map((profile) => profile.profName) as unknown as [string]) : [];
       // No cics profiles needed beforhand for team config method
       if (configInstance.getTeamConfig().exists || allCICSProfileNames.length > 0) {
         const profileNameToLoad = await window.showQuickPick(
-          [{ label: "\uFF0B Create New CICS Profile..." }].concat(
+          [{ label: "\u270F Edit Team Configuration File" }].concat(
             allCICSProfileNames
               .filter((name) => {
                 for (const loadedProfile of this.loadedProfiles) {
@@ -112,24 +104,19 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
           ),
           {
             ignoreFocusOut: true,
-            placeHolder: "Load Profile or Create New Profile",
+            placeHolder: "Edit Team Configuration File",
           }
         );
         if (profileNameToLoad) {
           // If Create New CICS Profile option chosen
-          if (profileNameToLoad.label.includes("\uFF0B")) {
-            if (configInstance.getTeamConfig().exists) {
-              // get all profiles of all types including zosmf
-              const profiles = configInstance.getAllProfiles();
-              if (!profiles.length) {
-                window.showErrorMessage("No profiles found in config file. Create a new config file or add a profile to get started");
-              }
-              const currentProfile = await ProfileManagement.getProfilesCache().getProfileFromConfig(profiles[0].profName);
-              const filePath = currentProfile?.profLoc.osLoc?.[0] ?? "";
-              await openConfigFile(filePath);
-            } else {
-              await this.createNewProfile();
-            }
+          if (profileNameToLoad.label.includes("\u270F")) {
+            // get all profiles of all types including zosmf
+            const profiles = configInstance.getAllProfiles();
+            const currentProfile =
+                profiles.length > 0 ? await ProfileManagement.getProfilesCache().getProfileFromConfig(profiles[0].profName) : null;
+            const teamConfigFilePath = configInstance.getTeamConfig().opts.homeDir + "/zowe.config.json";
+            const filePath = currentProfile === null ? teamConfigFilePath : (currentProfile?.profLoc.osLoc?.[0] ?? teamConfigFilePath);
+            await openConfigFile(filePath);
           } else {
             let profileToLoad;
             // TODO: Just use loadNamedProfile once the method is configured to v2 profiles
@@ -147,7 +134,6 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
           }
         }
       } else {
-        window.showInformationMessage("No Profiles Found... Opening Profile Creation Form");
         //  Create New Profile Form should appear
         this.createNewProfile();
       }
@@ -491,28 +477,14 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
         window.showErrorMessage(error);
       }
     } else {
-      const column = window.activeTextEditor ? window.activeTextEditor.viewColumn : undefined;
-      const panel: WebviewPanel = window.createWebviewPanel("zowe", `Create CICS Profile`, column || 1, { enableScripts: true });
-      panel.webview.html = addProfileHtml();
-      panel.webview.onDidReceiveMessage(async (message) => {
-        try {
-          panel.dispose();
-          const allCICSProfileNames = (await ProfileManagement.getProfilesCache().getProfileInfo())
-            .getAllProfiles("cics")
-            .map((profile) => profile.profName); //await ProfileManagement.getProfilesCache().getNamesForType('cics');
-          if (allCICSProfileNames.includes(message.name)) {
-            window.showErrorMessage(`Profile "${message.name}" already exists`);
-            return;
-          }
-          await ProfileManagement.createNewProfile(message);
-          await ProfileManagement.profilesCacheRefresh();
-          await this.loadProfile(ProfileManagement.getProfilesCache().loadNamedProfile(message.name, "cics"));
-        } catch (error) {
-          console.log(error);
-          // @ts-ignore
-          window.showErrorMessage(error);
-        }
+      //  Initialize new team configuration file
+      const response = await window.showQuickPick([{ label: "\uFF0B Create a New Team Configuration File" }], {
+        ignoreFocusOut: true,
+        placeHolder: "Create a New Team Configuration File",
       });
+      if (response) {
+        commands.executeCommand("zowe.all.config.init");
+      }
     }
   }
 
@@ -583,35 +555,23 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
 
   async updateSession(session: CICSSessionTree) {
     await ProfileManagement.profilesCacheRefresh();
-    const profileToUpdate = await ProfileManagement.getProfilesCache().loadNamedProfile(session.label?.toString()!, "cics");
-
-    const message = {
-      name: profileToUpdate.name,
-      profile: {
-        name: profileToUpdate.name,
-        ...profileToUpdate.profile,
-      },
-    };
-    await this.updateSessionHelper(session, message);
+    const profileCache = await ProfileManagement.getProfilesCache();
+    const profileToUpdate = profileCache.loadNamedProfile(session.label?.toString()!, "cics");
+    const currentProfile = await profileCache.getProfileFromConfig(profileToUpdate.name);
+    await this.updateSessionHelper(currentProfile);
   }
 
-  async updateSessionHelper(session: CICSSessionTree, messageToUpdate?: imperative.IUpdateProfile) {
-    const column = window.activeTextEditor ? window.activeTextEditor.viewColumn : undefined;
-    const panel: WebviewPanel = window.createWebviewPanel("zowe", `Update CICS Profile`, column || 1, { enableScripts: true });
-    panel.webview.html = addProfileHtml(messageToUpdate);
-    await panel.webview.onDidReceiveMessage(async (message) => {
-      try {
-        panel.dispose();
-        const profile = await ProfileManagement.updateProfile(message);
-        const position = this.loadedProfiles.indexOf(session);
-        await ProfileManagement.profilesCacheRefresh();
-        const updatedProfile = await ProfileManagement.getProfilesCache().loadNamedProfile(profile.profile.name, "cics");
-        await this.removeSession(session, updatedProfile, position);
-      } catch (error) {
-        // @ts-ignore
-        window.showErrorMessage(error);
-      }
+  async updateSessionHelper(profile: imperative.IProfAttrs) {
+    const response = await window.showQuickPick([{ label: "\u270F Edit CICS Profile" }], {
+      ignoreFocusOut: true,
+      placeHolder: "Create a New Team Configuration File",
     });
+    if (response) {
+      const configInstance = await ProfileManagement.getConfigInstance();
+      const teamConfigFilePath = configInstance.getTeamConfig().opts.homeDir + "/zowe.config.json";
+      const filePath = profile?.profLoc.osLoc?.[0] ?? teamConfigFilePath;
+      await openConfigFile(filePath);
+    }
   }
 
   getTreeItem(element: CICSSessionTree): TreeItem | Thenable<TreeItem> {
diff --git a/packages/vsce/src/utils/webviewHTML.ts b/packages/vsce/src/utils/webviewHTML.ts
index e4f212c0..ced4311d 100644
--- a/packages/vsce/src/utils/webviewHTML.ts
+++ b/packages/vsce/src/utils/webviewHTML.ts
@@ -9,394 +9,6 @@
  *
  */
 
-import { imperative } from "@zowe/zowe-explorer-api";
-
-/**
- * Used for both Update and Create webviews. 'message' parameter is passed in when
- * an update profile is performed.
- * @param message
- * @returns
- */
-export const addProfileHtml = (message?: imperative.IUpdateProfile): string => {
-  return `<!DOCTYPE html>
-  <html lang="en">
-    <head>
-      <meta charset="UTF-8" />
-      <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-      <title>${message ? "Update" : "Create"} CICS Profile</title>
-
-      <link
-        rel="stylesheet"
-        href="https://unpkg.com/carbon-components/css/carbon-components.min.css"
-      />
-    </head>
-    <style>
-      :root {
-        font-size: 16px;
-      }
-      * {
-        padding: 0;
-        margin: 0;
-        font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
-      }
-      body {
-        width: 100%;
-        height: 100vh;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-
-        background-color: var(--vscode-editor-background);
-      }
-
-      .bx--content {
-        width: 90%;
-        display: flex;
-        flex-direction: column;
-        align-items: left;
-
-        background-color: var(--vscode-editor-background);
-      }
-
-      .two-input-container {
-        display: flex;
-        justify-content: space-between;
-        flex-wrap: wrap;
-        width: 100%;
-        padding: 1rem 0;
-      }
-      .three-input-container {
-        display: flex;
-        justify-content: space-between;
-        flex-wrap: wrap;
-        width: 100%;
-        padding: 1rem 0;
-      }
-      .TLScontainer{
-        padding: 0 0 0 0;
-      }
-      .port-container {
-        max-width: 20%;
-        min-width: 75px;
-      }
-
-      .host-container {
-        max-width: 70%;
-        min-width: 250px;
-      }
-
-      .select-container {
-        max-width: 40%;
-        padding: 1rem 0;
-      }
-
-      .user-input {
-        max-width: 46%;
-      }
-
-      .float-child-left {
-        width: 35%;
-        float: left;
-        text-align: left;
-        width:fit-content;
-        padding: 0% 3% 0% 0%;
-      }
-      .float-child-right {
-        width: 65%;
-        float: left;
-        text-align: left;
-        width:fit-content;
-      }
-
-      h1, h2, h3, h4, p, label {
-        color: var(--vscode-editor-foreground) !important;
-      }
-
-      p {
-        text-align: left;
-      }
-    </style>
-    <body onload="initialize()">
-      <div class="bx--content">
-        <div style="padding:0 0 1rem 0 ">
-
-        </div>
-        <h3 style="text-align:left">Connection Details</h3>
-
-        <div class="three-input-container">
-          <div style="width: 20%; padding: 0% 2% 0% 0%">
-              <div class="bx--select">
-                <label for="protocol-select" class="bx--label">Protocol</label>
-                <div class="bx--select-input__wrapper">
-                  <select id="protocol-select" class="bx--select-input" onload="renderRU()" onchange="renderRU()">
-                    <option class="bx--select-option" value="http" ${message?.profile?.protocol === "http" ? `selected="selected"` : ""}>
-                      HTTP
-                    </option>
-                    <option class="bx--select-option" value="https" ${message?.profile?.protocol === "https" ? `selected="selected"` : ""}>
-                      HTTPS
-                    </option>
-                  </select>
-                  <svg
-                    focusable="false"
-                    preserveAspectRatio="xMidYMid meet"
-                    style="will-change: transform"
-                    xmlns="http://www.w3.org/2000/svg"
-                    class="bx--select__arrow"
-                    width="16"
-                    height="16"
-                    viewBox="0 0 16 16"
-                    aria-hidden="true"
-                  >
-                    <path d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"></path>
-                  </svg>
-                </div>
-              </div>
-          </div>
-
-          <div style="width: 60%; padding: 0% 1% 0% 1%">
-              <label for="host-input" class="bx--label">Host URL</label>
-              <div class="bx--text-input__field-wrapper">
-                <input
-                  id="host-input"
-                  type="text"
-                  class="bx--text-input"
-                  placeholder="example.cics.host.com"
-                  oninput="handleHostInputName()"
-                  ${message?.profile?.host ? `value =${message.profile.host}` : undefined}
-                />
-              </div>
-          </div>
-
-          <div style="width: 20%; padding: 0% 0% 0% 2%">
-            <label for="port-input" class="bx--label">Port</label>
-            <div class="bx--text-input__field-wrapper">
-              <input
-                id="port-input"
-                type="text"
-                class="bx--text-input"
-                placeholder="12345"
-                ${message?.profile?.port ? `value =${message.profile.port}` : undefined}
-              />
-            </div>
-          </div>
-        </div>
-
-
-
-          <div class="TLScontainer" id="ru-selection-container" width:100%">
-
-              <div class="float-child-left">
-                <label style="font-size:16px">Only accept trusted TLS certificates</label>
-              </div>
-              <div class="float-child-right">
-                <div class="bx--radio-button-group ">
-                  <div class="bx--radio-button-wrapper">
-                    <input id="radio-button-true" class="bx--radio-button" type="radio" value="true" name="radio-button" tabindex="0" ${
-  message?.profile?.rejectUnauthorized ? `checked="checked"` : ""
-}>
-                    <label for="radio-button-true" class="bx--radio-button__label">
-                      <span class="bx--radio-button__appearance" style="background-color:white"></span>
-                      <span class="bx--radio-button__label-text">True</span>
-                    </label>
-                  </div>
-
-                  <div class="bx--radio-button-wrapper">
-                    <input id="radio-button-false" class="bx--radio-button" type="radio" value="false" name="radio-button" tabindex="0" ${
-  !message?.profile?.rejectUnauthorized ? `checked="checked""` : ""
-}>
-                    <label for="radio-button-false" class="bx--radio-button__label">
-                      <span class="bx--radio-button__appearance" style="background-color:white"></span>
-                      <span class="bx--radio-button__label-text">False</span>
-                    </label>
-                  </div>
-
-                </div>
-              </div>
-
-
-          </div>
-
-          <div class="two-input-container">
-            <label for="name-input" class="bx--label">Profile Name</label>
-            <div class="bx--text-input__field-wrapper">
-              <input
-                id="name-input"
-                type="text"
-                class="bx--text-input"
-                placeholder="This name is used to identify the profile"
-                onchange=(function(){inputFieldChanged=true;})()
-                ${message?.name ? `value =${message.name}` : undefined}
-                ${message ? `readonly` : ""}
-
-              />
-            </div>
-          </div>
-
-        <h3>User Details</h3>
-
-        <div class="two-input-container">
-          <div style="width:50%; padding: 0 1.5% 0 0">
-            <label for="user-input" class="bx--label">User ID</label>
-            <div class="bx--text-input__field-wrapper">
-              <input
-                id="user-input"
-                type="text"
-                class="bx--text-input"
-                placeholder=""
-                ${message?.profile?.user ? `value =${message.profile.user}` : undefined}
-              />
-            </div>
-          </div>
-
-          <div style="width:50%; padding: 0 0 0 1.5%">
-            <label for="password-input" class="bx--label">Password</label>
-            <div class="bx--text-input__field-wrapper">
-              <input
-                id="password-input"
-                type="password"
-                class="bx--text-input"
-                placeholder=""
-                ${message?.profile?.password ? `value =${message.profile.password}` : undefined}
-              />
-            </div>
-          </div>
-        </div>
-        <h3>CICS Details <span style="font-size:20px"><em>(Optional)</em></span></h3>
-
-        <p>Narrow down the search by specifying a plex, or a plex AND a region/system group for profiles that contain plexes.
-        Otherwise specify a region/system group.</p>
-
-        <div class="two-input-container">
-          <div style="width:50%; padding: 0 1.5% 0 0">
-            <label for="region-input" class="bx--label">Region Name or System Group</label>
-            <div class="bx--text-input__field-wrapper">
-              <input
-                id="region-input"
-                type="text"
-                class="bx--text-input"
-                placeholder=""
-                ${message?.profile?.regionName ? `value =${message.profile.regionName}` : undefined}
-              />
-            </div>
-          </div>
-
-          <div style="width:50%; padding: 0 0 0 1.5%">
-            <label for="plex-input" class="bx--label">Plex Name</label>
-            <div class="bx--text-input__field-wrapper">
-              <input
-                id="plex-input"
-                type="text"
-                class="bx--text-input"
-                placeholder=""
-                ${message?.profile?.cicsPlex ? `value =${message.profile.cicsPlex}` : undefined}
-              />
-            </div>
-          </div>
-        </div>
-        <button
-          onclick="createSession()"
-          class="bx--btn bx--btn--primary"
-          style="width:30%"
-          type="button">${message ? "Update" : "Create"} Profile</button>
-      </div>
-
-      <script>
-
-        let inputFieldChanged = false;
-
-        function createSession() {
-          let data = {
-            profile: {
-              name: document.getElementById("name-input").value.toString().trim(),
-              host: document.getElementById("host-input").value,
-              port: parseInt(document.getElementById("port-input").value),
-              user: document.getElementById("user-input").value,
-              password: document.getElementById("password-input").value,
-              rejectUnauthorized:
-                checkRadioButtons() === "true" ? true : false,
-              protocol: document.getElementById("protocol-select").value,
-              cicsPlex: document.getElementById("plex-input").value.toString().trim().length === 0 ? undefined :
-                document.getElementById("plex-input").value.toString().trim(),
-              regionName: document.getElementById("region-input").value.toString().trim().length === 0 ? undefined :
-                document.getElementById("region-input").value.toString().trim(),
-            },
-            name: document.getElementById("name-input").value.toString().trim(),
-            type: "CICS",
-            overwrite: true,
-          };
-
-          const vscode = acquireVsCodeApi();
-          vscode.postMessage(data);
-        };
-
-        function checkRadioButtons() {
-          const radios = document.getElementsByName("radio-button");
-          for (var i = 0, length = radios.length; i < length; i++) {
-            if (radios[i].checked) {
-              return radios[i].value;
-            }
-          }
-        }
-
-        function onLoadRenderRU() {
-          if (${message?.profile?.protocol === "https"}) {
-            setContentsEnabled("ru-selection-container");
-          } else if (${message?.profile?.protocol === "http"}) {
-            setContentsDisabled("ru-selection-container");
-          }
-        }
-
-        function renderRU() {
-          if (document.getElementById("protocol-select").value === "https") {
-            setContentsEnabled("ru-selection-container");
-          } else if (document.getElementById("protocol-select").value === "http") {
-            setContentsDisabled("ru-selection-container");
-          }
-        }
-
-        function setContentsDisabled(id) {
-          const nodes = document.getElementById(id).getElementsByTagName('*');
-          for(let i = 0; i < nodes.length; i++){
-               nodes[i].disabled = true;
-          }
-        }
-
-        function setContentsEnabled(id) {
-          const nodes = document.getElementById(id).getElementsByTagName('*');
-          for(let i = 0; i < nodes.length; i++){
-               nodes[i].disabled = false;
-          }
-        }
-
-        function setFocusToInputBox(){
-          document.getElementById("host-input").focus();
-        }
-
-        function initialize(){
-          setFocusToInputBox();
-          renderRU();
-        }
-
-        function handleHostInputName(){
-          if (${!message}){
-            if(document.getElementById("name-input").value===""){
-              inputFieldChanged=false;
-            }
-            if(!inputFieldChanged){
-              document.getElementById("name-input").value = document.getElementById("host-input").value.split(".")[0];
-            }
-          }
-        }
-
-      </script>
-    </body>
-  </html>
-
-
-`;
-};
-
 /**
  * show attributes webview
  * @param title