diff --git a/package.json b/package.json
index 407d72da..9f7eb980 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yattie",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "engines": {
     "npm": ">=8.0.0 <9.0.0",
     "node": ">=16.0.0 <17.0.0"
diff --git a/src/App.vue b/src/App.vue
index 7f61d7ca..128efa9f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,16 +7,44 @@
 </template>
 
 <script>
+import { IPC_HANDLERS, IPC_FUNCTIONS } from "./modules/constants";
+
 const default_layout = "default";
 
 export default {
   name: "App",
-
   computed: {
     layout() {
       return (this.$route.meta.layout || default_layout) + "-layout";
     },
   },
+  beforeCreate() {
+    // Only restore state for the primary window that opens at HomeView
+    if (this.$router.history.current.path === "/") {
+      window.ipc
+        .invoke(IPC_HANDLERS.DATABASE, {
+          func: IPC_FUNCTIONS.GET_STATE,
+        })
+        .then((state) => {
+          if (Object.keys(state).length > 0) {
+            this.$store.commit("restoreState", state);
+            const currentPath = this.$router.history.current.path;
+            if (state.path && currentPath !== state.path) {
+              if (state.path.includes("result")) {
+                window.ipc.invoke(IPC_HANDLERS.WINDOW, {
+                  func: IPC_FUNCTIONS.SET_WINDOW_SIZE,
+                  data: {
+                    width: 1440,
+                    height: 900,
+                  },
+                });
+              }
+              this.$router.push({ path: state.path });
+            }
+          }
+        });
+    }
+  },
 };
 </script>
 <style scoped>
diff --git a/src/components/AudioWrapper.vue b/src/components/AudioWrapper.vue
index a4b84f2c..17c66757 100644
--- a/src/components/AudioWrapper.vue
+++ b/src/components/AudioWrapper.vue
@@ -221,7 +221,7 @@ export default {
         data: { url: uri, isPoster: true },
       });
       if (posterResult.status === STATUSES.ERROR) {
-        // TODO - Bubble to snackbar
+        this.$root.$emit("set-snackbar", posterResult.message);
         console.log(
           "Unable to generate waveform image: " + posterResult.message
         );
@@ -233,7 +233,7 @@ export default {
       });
 
       if (audioResult.status === STATUSES.ERROR) {
-        // TODO - Bubble to snackbar
+        this.$root.$emit("set-snackbar", audioResult.message);
         console.log("Unable to update audio file: " + audioResult.message);
       }
       this.sessionItem = {
@@ -242,7 +242,7 @@ export default {
         ...audioResult.item,
       };
       this.$root.$emit("update-session", this.sessionItem);
-      this.$root.$emit("save-data"); // CTODO remove data on all of these
+      this.$root.$emit("save-data", this.sessionItem);
     },
   },
 };
diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
index bc83cef9..6c09069e 100644
--- a/src/components/ControlPanel.vue
+++ b/src/components/ControlPanel.vue
@@ -1077,7 +1077,7 @@ export default {
         duration: this.duration,
       });
     },
-    startSession(id) {
+    async startSession(id) {
       this.sourceId = id;
       this.sourcePickerDialog = false;
 
@@ -1099,6 +1099,30 @@ export default {
         this.changeSessionStatus(SESSION_STATUSES.START);
       }
 
+      const sessionId = await window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.GET_SESSION_ID,
+      });
+
+      if (sessionId === "") {
+        const data = {
+          title: this.$store.state.title,
+          charter: this.$store.state.charter,
+          precondition: this.$store.state.precondition,
+          duration: this.$store.state.duration,
+          status: this.$store.state.status,
+          timer: this.$store.state.timer,
+          started: this.$store.state.started,
+          ended: this.$store.state.ended,
+          quickTest: this.$store.state.quickTest,
+          path: this.$route.path,
+        };
+
+        window.ipc.invoke(IPC_HANDLERS.FILE_SYSTEM, {
+          func: IPC_FUNCTIONS.CREATE_NEW_SESSION,
+          data: data,
+        });
+      }
+
       if (this.viewMode === "normal") {
         const currentPath = this.$router.history.current.path;
         if (currentPath !== "/main/workspace") {
@@ -1261,7 +1285,7 @@ export default {
           );
 
           if (status === STATUSES.ERROR) {
-            // CTODO - bubble up to snackbar
+            this.$root.$emit("set-snackbar", message);
             console.log(message);
           } else {
             const data = {
@@ -1340,7 +1364,7 @@ export default {
             );
 
             if (status === STATUSES.ERROR) {
-              // CTODO - bubble up to snackbar
+              this.$root.$emit("set-snackbar", message);
               console.log("Unable to generate poster for video: " + message);
             }
             poster = item.filePath;
@@ -1366,7 +1390,7 @@ export default {
           );
 
           if (status === STATUSES.ERROR) {
-            // CTODO - bubble up to snackbar
+            this.$root.$emit("set-snackbar", message);
             console.log(message);
           } else {
             const { id, fileName, filePath } = item;
@@ -1497,7 +1521,7 @@ export default {
           );
 
           if (status === STATUSES.ERROR) {
-            // CTODO - bubble up to snackbar
+            this.$root.$emit("set-snackbar", message);
             console.log(message);
           } else {
             const data = {
@@ -1570,7 +1594,7 @@ export default {
       );
 
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         let newItem = {
@@ -1673,9 +1697,15 @@ export default {
     },
     async saveSession(callback = null) {
       this.newSessionDialog = false;
+      const sessionId = await window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.GET_SESSION_ID,
+      });
+
       const data = {
+        id: sessionId,
         title: this.$store.state.title,
         charter: this.$store.state.charter,
+        mindmap: this.$store.state.mindmap,
         precondition: this.$store.state.precondition,
         duration: this.$store.state.duration,
         status: this.$store.state.status,
@@ -1721,27 +1751,45 @@ export default {
       this.audioErrorDialog = false;
       this.endSessionDialog = false;
 
+      if (!window.ipc) return;
+
+      const data = {
+        title: this.$store.state.title,
+        charter: this.$store.state.charter,
+        precondition: this.$store.state.precondition,
+        duration: this.$store.state.duration,
+        status: this.$store.state.status,
+        timer: this.$store.state.timer,
+        started: this.$store.state.started,
+        ended: this.$store.state.ended,
+        quickTest: this.$store.state.quickTest,
+        path: this.$route.path,
+      };
+
+      await window.ipc.invoke(IPC_HANDLERS.FILE_SYSTEM, {
+        func: IPC_FUNCTIONS.CREATE_NEW_SESSION,
+        data: data,
+      });
+
       this.$store.commit("clearState");
 
-      if (!window.ipc) return;
-      await window.ipc
-        .invoke(IPC_HANDLERS.DATABASE, {
-          func: IPC_FUNCTIONS.RESET_DATA,
-        })
-        .then(() => {
-          window.ipc.invoke(IPC_HANDLERS.WINDOW, {
-            func: IPC_FUNCTIONS.SET_WINDOW_SIZE,
-            data: {
-              width: 800,
-              height: 600,
-            },
-          });
-          this.stopInterval();
-          const currentPath = this.$router.history.current.path;
-          if (currentPath !== "/main") {
-            this.$router.push({ path: "/main" });
-          }
-        });
+      await window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.RESET_DATA,
+      });
+
+      window.ipc.invoke(IPC_HANDLERS.WINDOW, {
+        func: IPC_FUNCTIONS.SET_WINDOW_SIZE,
+        data: {
+          width: 800,
+          height: 600,
+        },
+      });
+
+      this.stopInterval();
+      const currentPath = this.$router.history.current.path;
+      if (currentPath !== "/main") {
+        this.$router.push({ path: "/main" });
+      }
     },
     async resetSession() {
       if (this.resetConfirmDialog) {
diff --git a/src/components/ImageEditor.vue b/src/components/ImageEditor.vue
index 64aa8c2e..86921ec5 100644
--- a/src/components/ImageEditor.vue
+++ b/src/components/ImageEditor.vue
@@ -152,7 +152,7 @@ export default {
       );
 
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         // Force the timeline component to update the image through a fake QS
diff --git a/src/components/ReviewWrapper.vue b/src/components/ReviewWrapper.vue
index b56b0c8e..f1f27618 100644
--- a/src/components/ReviewWrapper.vue
+++ b/src/components/ReviewWrapper.vue
@@ -118,7 +118,7 @@ export default {
         }
       );
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         this.sessionItem.fileName = item.fileName;
diff --git a/src/components/TimelineWrapper.vue b/src/components/TimelineWrapper.vue
index 80365175..967661f3 100644
--- a/src/components/TimelineWrapper.vue
+++ b/src/components/TimelineWrapper.vue
@@ -1053,7 +1053,7 @@ export default {
       );
 
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         const data = {
@@ -1168,7 +1168,7 @@ export default {
         );
 
         if (status === STATUSES.ERROR) {
-          // CTODO - bubble up to snackbar
+          this.$root.$emit("set-snackbar", message);
           console.log(message);
         } else {
           const data = {
diff --git a/src/components/VideoWrapper.vue b/src/components/VideoWrapper.vue
index c0627bee..301abcd6 100644
--- a/src/components/VideoWrapper.vue
+++ b/src/components/VideoWrapper.vue
@@ -151,7 +151,7 @@ export default {
       );
 
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       } else {
         this.sessionItem.filePath = item.filePath;
diff --git a/src/components/dialogs/NewSessionDialog.vue b/src/components/dialogs/NewSessionDialog.vue
index 575378ae..1fe4acb7 100644
--- a/src/components/dialogs/NewSessionDialog.vue
+++ b/src/components/dialogs/NewSessionDialog.vue
@@ -11,6 +11,7 @@
             small
             :color="currentTheme.primary"
             class="text-capitalize btn"
+            :style="{ color: currentTheme.white }"
             @click="$emit('save')"
           >
             {{ $tc("caption.save", 1) }}
@@ -19,6 +20,7 @@
             small
             :color="currentTheme.background"
             class="text-capitalize btn"
+            :style="{ color: currentTheme.secondary }"
             @click="$emit('discard')"
           >
             {{ $tc("caption.discard", 1) }}
diff --git a/src/components/settings/GeneralTab.vue b/src/components/settings/GeneralTab.vue
index e3741fc3..8a7cf5e2 100644
--- a/src/components/settings/GeneralTab.vue
+++ b/src/components/settings/GeneralTab.vue
@@ -209,7 +209,7 @@ export default {
   name: "GeneralTab",
   components: {},
   props: {
-    metaData: {
+    metadata: {
       type: Object,
       default: () => {},
     },
@@ -219,7 +219,7 @@ export default {
     },
   },
   watch: {
-    metaData: function (newValue) {
+    metadata: function (newValue) {
       this.meta = newValue;
     },
     config: function (newValue) {
@@ -259,7 +259,7 @@ export default {
   },
   data() {
     return {
-      meta: this.metaData,
+      meta: this.metadata,
       setting: this.config,
       comment: {
         type: "Comment",
diff --git a/src/components/testrail/TestRailExportSession.vue b/src/components/testrail/TestRailExportSession.vue
index e8445800..5d664d76 100644
--- a/src/components/testrail/TestRailExportSession.vue
+++ b/src/components/testrail/TestRailExportSession.vue
@@ -176,7 +176,7 @@
                         return-object
                       >
                       </v-select>
-                      <div v-for="(item, i) in itemLists" :key="i">
+                      <div v-for="(item, i) in selectedAttachments" :key="i">
                         <div
                           class="image-wrapper"
                           @click="handleItemClick(item.id)"
@@ -372,6 +372,20 @@ export default {
       }
       return temp;
     },
+    selectedAttachments() {
+      let selectedAttachments = [];
+      if (this.selectedIds.length > 0) {
+        this.itemLists.map((item) => {
+          if (
+            item.sessionType !== "Summary" &&
+            this.selectedIds.includes(item.id)
+          ) {
+            selectedAttachments.push(item);
+          }
+        });
+      }
+      return selectedAttachments;
+    },
   },
   mounted() {},
   methods: {
@@ -541,17 +555,9 @@ export default {
       };
       let resultId;
 
-      if (this.selectedIds.length === 0) {
-        this.itemLists.map((item) => {
-          if (item.sessionType !== "Summary") {
-            this.selectedIds.push(item.id);
-          }
-        });
-      }
-
       let attachmentComments = "";
       this.selectedIds.map(async (id, i) => {
-        const item = this.itemLists.find((item) => item.id === id);
+        const item = this.selectedAttachments.find((item) => item.id === id);
         attachmentComments += item.comment.type + ": " + item.comment.text;
         if (i !== this.selectedIds.length - 1) {
           attachmentComments += "\n";
@@ -594,8 +600,7 @@ export default {
         const formData = new FormData();
         this.projectLoading = true;
 
-        this.selectedIds.map(async (id, i) => {
-          const item = this.itemLists.find((item) => item.id === id);
+        this.selectedAttachments.map(async (item, i) => {
           const response = await fetch(`file:${item.filePath}`);
           const file = new File([await response.blob()], item.fileName);
           formData.append("attachment", file);
diff --git a/src/layouts/Default.vue b/src/layouts/Default.vue
index ce5177e7..7ea09429 100644
--- a/src/layouts/Default.vue
+++ b/src/layouts/Default.vue
@@ -88,20 +88,22 @@ export default {
     window.ipc.on("OPEN_SESSION", async () => {
       if (!window.ipc) return;
 
-      const { status, message, metadata } = await window.ipc.invoke(
+      const { status, message, state } = await window.ipc.invoke(
         IPC_HANDLERS.FILE_SYSTEM,
         {
           func: IPC_FUNCTIONS.OPEN_SESSION,
         }
       );
+
       if (status === STATUSES.ERROR) {
+        this.setSnackBar(message);
         console.log(message);
       } else {
-        this.$store.commit("restoreState", metadata);
+        this.$store.commit("restoreState", state);
 
         const currentPath = this.$router.history.current.path;
-        if (currentPath !== metadata.path) {
-          this.$router.push({ path: metadata.path });
+        if (currentPath !== state.path) {
+          this.$router.push({ path: state.path });
         }
       }
     });
diff --git a/src/modules/CaptureUtility.js b/src/modules/CaptureUtility.js
index da21f961..3eddfc56 100644
--- a/src/modules/CaptureUtility.js
+++ b/src/modules/CaptureUtility.js
@@ -20,6 +20,8 @@ ffmpeg.setFfmpegPath(ffmpegPath);
 ffmpeg.setFfprobePath(ffprobePath.path);
 
 const browserUtility = require("./BrowserWindowUtility");
+const databaseUtility = require("./DatabaseUtility");
+
 const { STATUSES } = require("./constants");
 
 const configDir = (app || remote.app).getPath("userData");
@@ -45,7 +47,12 @@ module.exports.getMediaSource = async () => {
 module.exports.createImage = ({ url, isPoster }) => {
   const imageType = isPoster ? "poster" : "image";
   const { id, fileName } = generateIDAndName(imageType);
-  const filePath = path.join(configDir, "sessions", "userMedia", fileName);
+  const filePath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    fileName
+  );
   const base64Data = url.replace(/^data:image\/png;base64,/, "");
   fs.writeFile(filePath, base64Data, "base64", function (err) {
     if (err) {
@@ -75,7 +82,12 @@ module.exports.updateImage = ({ item, url }) => {
     ? { fileName: item.fileName }
     : generateIDAndName("image", item.id);
 
-  const filePath = path.join(configDir, "sessions", "userMedia", fileName);
+  const filePath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    fileName
+  ); 
   const base64Data = url.replace(/^data:image\/png;base64,/, "");
   fs.writeFile(filePath, base64Data, "base64", function (err) {
     if (err) {
@@ -97,7 +109,12 @@ module.exports.updateImage = ({ item, url }) => {
 
 module.exports.createVideo = ({ buffer }) => {
   const { id, fileName } = generateIDAndName("video");
-  const filePath = path.join(configDir, "sessions", "userMedia", fileName);
+  const filePath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    fileName
+  ); 
   fs.writeFileSync(filePath, Buffer.from(buffer), function (err) {
     if (err) {
       console.log(err);
@@ -122,7 +139,12 @@ module.exports.optimizeVideo = ({ filePath }) => {
     "temp-optimizing-video-" +
     dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") +
     ".mp4";
-  const tempPath = path.join(configDir, "sessions", "userMedia", tempName);
+  const tempPath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    tempName
+  );
 
   return new Promise(function (resolve, reject) {
     ffmpeg(filePath)
@@ -162,7 +184,12 @@ module.exports.updateVideo = ({ item, start, end, previousDuration }) => {
     "temp-optimizing-video-" +
     dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") +
     ".mp4";
-  const tempPath = path.join(configDir, "sessions", "userMedia", tempName);
+  const tempPath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    tempName
+  );
   const duration = parseInt(end - start);
 
   return new Promise(function (resolve, reject) {
@@ -187,7 +214,7 @@ module.exports.updateVideo = ({ item, start, end, previousDuration }) => {
           const filePath = path.join(
             configDir,
             "sessions",
-            "userMedia",
+            databaseUtility.getSessionID(),
             fileName
           );
           fs.rename(tempPath, filePath, function (err) {
@@ -212,7 +239,12 @@ module.exports.updateVideo = ({ item, start, end, previousDuration }) => {
       const { fileName } = item.fileName
         ? { fileName: item.fileName }
         : generateIDAndName("video", item.id);
-      const filePath = path.join(configDir, "sessions", "userMedia", fileName);
+      const filePath = path.join(
+        configDir,
+        "sessions",
+        databaseUtility.getSessionID(),
+        fileName
+      ); 
       if (item.filePath && item.filePath !== filePath) {
         fs.rename(item.filePath, filePath, function (err) {
           if (err) {
@@ -234,7 +266,12 @@ module.exports.updateVideo = ({ item, start, end, previousDuration }) => {
 
 module.exports.createAudio = ({ buffer }) => {
   const { id, fileName } = generateIDAndName("audio");
-  const filePath = path.join(configDir, "sessions", "userMedia", fileName);
+  const filePath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    fileName
+  ); 
   fs.writeFileSync(filePath, Buffer.from(buffer), function (err) {
     if (err) {
       console.log(err);
@@ -258,7 +295,12 @@ module.exports.updateAudio = ({ item }) => {
   const { fileName } = item.fileName
     ? { fileName: item.fileName }
     : generateIDAndName("audio", item.id);
-  const filePath = path.join(configDir, "sessions", "userMedia", fileName);
+  const filePath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    fileName
+  ); 
 
   if (item.filePath && item.filePath !== filePath) {
     fs.rename(item.filePath, filePath, function (err) {
@@ -288,7 +330,12 @@ module.exports.deleteFile = ({ filePath }) => {
 
 module.exports.saveNote = (comment) => {
   const { id, fileName } = generateIDAndName("text");
-  const filePath = path.join(configDir, "sessions", "userMedia", fileName);
+  const filePath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    fileName
+  ); 
   fs.writeFile(filePath, comment.text, function (err) {
     if (err) {
       console.log(err);
@@ -323,11 +370,16 @@ module.exports.uploadEvidence = async () => {
   // TODO - Handle multiple files uploaded
   const id = uuidv4();
   const fileName = path.basename(filePaths[0]);
-  const filePath = path.join(configDir, "sessions", "userMedia", fileName);
+  const filePath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    fileName
+  ); 
 
   fs.copyFileSync(filePaths[0], filePath);
 
-  // CTODO - move promise building to shared block with dropUpload
+  // TODO - move promise building to shared block with dropUpload
   return new Promise(function (resolve) {
     detect.fromFile(filePath, function (err, result) {
       if (err) {
@@ -368,7 +420,12 @@ module.exports.uploadEvidence = async () => {
 module.exports.dropFile = async (data) => {
   const id = uuidv4();
   const fileName = data.name;
-  const filePath = path.join(configDir, "sessions", "userMedia", fileName);
+  const filePath = path.join(
+    configDir,
+    "sessions",
+    databaseUtility.getSessionID(),
+    fileName
+  ); 
 
   fs.copyFileSync(data.path, filePath);
 
@@ -409,46 +466,11 @@ module.exports.dropFile = async (data) => {
   });
 };
 
-module.exports.createTempUserMedia = ({ buffer, fileName }) => {
-  const filePath = path.join(configDir, "sessions", "tempUserMedia", fileName);
-  fs.writeFileSync(filePath, Buffer.from(buffer), function (err) {
-    if (err) {
-      console.log(err);
-    }
-  });
-  return filePath;
-};
-
-module.exports.createUserMedia = ({ buffer, fileName }) => {
-  const filePath = path.join(configDir, "sessions", "userMedia", fileName);
-  fs.writeFileSync(filePath, Buffer.from(buffer), function (err) {
-    if (err) {
-      console.log(err);
-    }
-  });
-  return filePath;
-};
-
-module.exports.updateUserMedia = ({ buffer, filePath, fileName }) => {
-  const tempPath = path.join(configDir, "sessions", "tempUserMedia", fileName);
-  console.log(fileName, filePath, tempPath);
-  fs.writeFileSync(filePath, Buffer.from(buffer), function (err) {
-    if (err) {
-      console.log(err);
-    }
-  });
-};
-
 module.exports.setApperance = ({ apperance }) => {
   const browserWindow = browserUtility.getBrowserWindow();
   browserWindow.webContents.send("SET_THEME", { apperance });
 };
 
-module.exports.getImageData = (filePath) => {
-  const data = base64_encode(filePath);
-  return data;
-};
-
 const generateIDAndName = (type, uid = undefined) => {
   let id, idStr, fileName;
   let success = false;
@@ -478,7 +500,12 @@ const generateIDAndName = (type, uid = undefined) => {
     for (let i = 0; i < idStr.length - 5; i++) {
       fileName = `${type}-${idStr.substring(i, 5)}.${suffix}`;
       if (
-        !fs.existsSync(path.join(configDir, "sessions", "userMedia", fileName))
+        !fs.existsSync(path.join(
+          configDir,
+          "sessions",
+          databaseUtility.getSessionID(),
+          fileName
+        ))
       ) {
         success = true;
         break;
diff --git a/src/modules/DatabaseUtility.js b/src/modules/DatabaseUtility.js
index bf1d75bc..c6dfeed5 100644
--- a/src/modules/DatabaseUtility.js
+++ b/src/modules/DatabaseUtility.js
@@ -1,8 +1,9 @@
+const { SESSION_STATUSES } = require("../modules/constants");
+
 const JSONdb = require("simple-json-db");
 const { app, remote } = require("electron");
 const path = require("path");
 const fs = require("fs");
-const uuidv4 = require("uuid");
 const browserUtility = require("./BrowserWindowUtility");
 const { STATUSES } = require("./constants");
 
@@ -16,151 +17,143 @@ const currentVersion = app.getVersion();
 let metaDb, configDb, credentialDb, dataDb, configVersion;
 let browserWindow;
 
-module.exports.initializeSession = () => {
-  const sessionPath = path.join(configDir, "sessions");
-  if (fs.existsSync(sessionPath)) {
-    fs.rmdir(sessionPath, { recursive: true }, (err) => {
-      if (err) {
-        console.log(err);
-      }
-      createSessionDirectory();
-    });
-  } else {
-    createSessionDirectory();
-  }
-
-  const defaultMeta = {
-    configPath: path.join(configDir, "config.json"),
-    credentialsPath: path.join(configDir, "credentials.json"),
-    dataPath: path.join(configDir, "data.json"),
-    version: currentVersion,
-  };
+const defaultMeta = {
+  configPath: path.join(configDir, "config.json"),
+  credentialsPath: path.join(configDir, "credentials.json"),
+  sessionDataPath: "",
+  version: currentVersion,
+};
 
-  const config = {
-    useLocal: true,
-    apperance: "light",
-    showIssue: false,
-    appLabel: false,
-    defaultColor: "#1976D2FF",
-    commentType: "Comment",
-    audioCapture: false,
-    videoQuality: "high",
-    debugMode: false,
-    summary: false,
-    templates: [
-      {
-        type: "Screenshot",
-        precondition: {
-          content: "",
-          text: "",
-        },
-        issue: "",
-        isBug: false,
-      },
-      {
-        type: "Video",
-        precondition: {
-          content: "",
-          text: "",
-        },
-        issue: "",
-        isBug: false,
-      },
-      {
-        type: "Audio",
-        precondition: {
-          content: "",
-          text: "",
-        },
-        issue: "",
-        isBug: false,
+const defaultConfig = {
+  useLocal: true,
+  apperance: "light",
+  showIssue: false,
+  appLabel: false,
+  defaultColor: "#1976D2FF",
+  commentType: "Comment",
+  audioCapture: false,
+  videoQuality: "high",
+  debugMode: false,
+  summary: false,
+  templates: [
+    {
+      type: "Screenshot",
+      precondition: {
+        content: "",
+        text: "",
       },
-      {
-        type: "Note",
-        precondition: {
-          content: "",
-          text: "",
-        },
-        issue: "",
-        isBug: false,
+      issue: "",
+      isBug: false,
+    },
+    {
+      type: "Video",
+      precondition: {
+        content: "",
+        text: "",
       },
-      {
-        type: "File",
-        precondition: {
-          content: "",
-          text: "",
-        },
-        issue: "",
-        isBug: false,
+      issue: "",
+      isBug: false,
+    },
+    {
+      type: "Audio",
+      precondition: {
+        content: "",
+        text: "",
       },
-      {
-        type: "Mindmap",
-        precondition: {
-          content: "",
-          text: "",
-        },
-        issue: "",
-        isBug: false,
+      issue: "",
+      isBug: false,
+    },
+    {
+      type: "Note",
+      precondition: {
+        content: "",
+        text: "",
       },
-    ],
-    checklist: {
-      presession: {
-        tasks: [],
-        status: false,
+      issue: "",
+      isBug: false,
+    },
+    {
+      type: "File",
+      precondition: {
+        content: "",
+        text: "",
       },
-      postsession: {
-        tasks: [],
-        status: false,
+      issue: "",
+      isBug: false,
+    },
+    {
+      type: "Mindmap",
+      precondition: {
+        content: "",
+        text: "",
       },
+      issue: "",
+      isBug: false,
     },
-  };
+  ],
+  checklist: {
+    presession: {
+      tasks: [],
+      status: false,
+    },
+    postsession: {
+      tasks: [],
+      status: false,
+    },
+  },
+};
+
+module.exports.initializeSession = () => {
+  const sessionPath = path.join(configDir, "sessions");
+  if (!fs.existsSync(sessionPath)) {
+    createRootSessionDirectory();
+  }
 
   metaDb = new JSONdb(path.join(configDir, "meta.json"), jsonDbConfig);
-  let metaPath = {
+  let metadata = {
     version: currentVersion,
   };
-  if (metaDb.has("meta")) {
-    metaPath = metaDb.get("meta");
+  if (metaDb) {
+    metadata = this.getMetadata();
   }
 
-  if (!metaPath.configPath) {
-    metaPath.configPath = defaultMeta.configPath;
+  if (!metadata.configPath) {
+    metadata.configPath = defaultMeta.configPath;
   }
-  configDb = new JSONdb(metaPath.configPath, jsonDbConfig);
+  configDb = new JSONdb(metadata.configPath, jsonDbConfig);
 
-  if (!metaPath.credentialsPath) {
-    metaPath.credentialsPath = defaultMeta.credentialsPath;
+  if (!metadata.credentialsPath) {
+    metadata.credentialsPath = defaultMeta.credentialsPath;
   }
-  credentialDb = new JSONdb(metaPath.credentialsPath, jsonDbConfig);
+  credentialDb = new JSONdb(metadata.credentialsPath, jsonDbConfig);
 
-  if (!metaPath.dataPath) {
-    metaPath.dataPath = defaultMeta.dataPath;
+  if (metadata.sessionDataPath) {
+    if (fs.existsSync(metadata.sessionDataPath)) {
+      dataDb = new JSONdb(metadata.sessionDataPath, jsonDbConfig);
+    } else {
+      metaDb.set("sessionDataPath", "");
+    }
   }
-  dataDb = new JSONdb(metaPath.dataPath, jsonDbConfig);
 
-  if (metaPath.version) {
-    configVersion = metaPath.version;
+  if (metadata.version) {
+    configVersion = metadata.version;
   } else {
     configVersion = "";
   }
 
   try {
-    metaDb.set("meta", metaPath);
+    for (const [key, value] of Object.entries(metadata)) {
+      metaDb.set(key, value);
+    }
 
     if (!configDb.has("config") || !configDb.get("config").checklist) {
-      configDb.set("config", config);
+      configDb.set("config", defaultConfig);
     }
 
     if (!credentialDb.has("credentials")) {
       credentialDb.set("credentials", {});
     }
 
-    dataDb.set("id", uuidv4());
-    dataDb.set("items", []);
-    dataDb.set("notes", {
-      content: "",
-      text: "",
-    });
   } catch (error) {
     console.log(error);
   }
@@ -171,14 +164,15 @@ module.exports.initializeSession = () => {
     let newMeta = metaDb.get("meta");
     newMeta.version = currentVersion;
     configVersion = currentVersion;
-    metaDb.set("meta", newMeta);
+    for (const [key, value] of Object.entries(newMeta)) {
+      metaDb.set(key, value);
+    }
   }
 };
 
-const createSessionDirectory = () => {
+const createRootSessionDirectory = () => {
   let sessionPaths = [
-    path.join(configDir, "sessions", "tempUserMedia"),
-    path.join(configDir, "sessions", "userMedia"),
+    path.join(configDir, "sessions"),
   ];
   sessionPaths.forEach((path) => {
     fs.mkdirSync(path, { recursive: true });
@@ -198,18 +192,80 @@ const getItemById = (id) => {
   return item;
 };
 
-module.exports.getItems = () => {
+module.exports.createNewSession = (state) => {
+  if (dataDb) {
+    // TODO - ditching current session, should we save it or do something?
+  }
+  const sessionDataPath =
+    path.join(configDir, "sessions", state.id, "sessionData.json");
+
+  metaDb.set("sessionDataPath", sessionDataPath);
+  dataDb = new JSONdb(sessionDataPath, jsonDbConfig);
+  dataDb.set("id", state.id);
+  delete state.id;
+  dataDb.set("state", state);
+  dataDb.set("items", []);
+  dataDb.set("notes", {
+    content: "",
+    text: "",
+  });
+};
+
+module.exports.getSessionID = () => {
   try {
-    return dataDb.get("items");
+    if (dataDb) {
+      return dataDb.get("id");
+    }
+    return "";
   } catch (error) {
     console.log(error);
-    return [];
+    return "";
+  }
+};
+
+module.exports.getState = () => {
+  try {
+    if (dataDb) {
+      return dataDb.get("state");
+    }
+    return {};
+  } catch (error) {
+    console.log(error);
+    return {};
+  }
+};
+
+module.exports.updateState = (state) => {
+  if (dataDb) {
+    let currentState;
+    try {
+      currentState = dataDb.get("state");
+    } catch (error) {
+      console.log(error);
+      currentState = {};
+    }
+    dataDb.set("state", {
+      ...currentState,
+      ...state,
+    });
+  }
+};
+
+module.exports.getItems = () => {
+  if (dataDb) {
+    try {
+      return dataDb.get("items");
+    } catch (error) {
+      console.log(error);
+      return [];
+    }
   }
+  return [];
 };
 
 module.exports.addItem = (item) => {
   try {
-    let items = dataDb.get("items");
+    let items = dataDb.get("items") || [];
     items.push(item);
     dataDb.set("items", items);
     browserWindow = browserUtility.getBrowserWindow();
@@ -290,20 +346,33 @@ module.exports.updateCredentials = (credentials) => {
   }
 };
 
-module.exports.getMetaData = () => {
+module.exports.getMetadata = () => {
   try {
-    return metaDb.get("meta");
+    let metadata = {};
+    for (const key of Object.keys(defaultMeta)) {
+      metadata[key] = metaDb.get(key);
+    }
+    return metadata;
   } catch (error) {
+    console.log(`Unable to retrieve metadata: ${error}`);
     return {};
   }
 };
 
-module.exports.updateMetaData = (meta) => {
+module.exports.updateMetadata = (meta) => {
   try {
-    metaDb.set("meta", meta);
-    configDb = new JSONdb(meta.configPath, jsonDbConfig);
-    credentialDb = new JSONdb(meta.credentialsPath, jsonDbConfig);
-    dataDb = new JSONdb(meta.dataPath, jsonDbConfig);
+    for (const [key, value] of Object.entries(meta)) {
+      metaDb.set(key, value);
+    }
+    if (meta.configPath) {
+      configDb = new JSONdb(meta.configPath, jsonDbConfig);
+    }
+    if (meta.credentialsPath) {
+      credentialDb = new JSONdb(meta.credentialsPath, jsonDbConfig);
+    }
+    if (meta.sessionDataPath) {
+      dataDb = new JSONdb(meta.sessionDataPath, jsonDbConfig);
+    }
     browserWindow = browserUtility.getBrowserWindow();
     browserWindow.webContents.send("META_CHANGE");
   } catch (error) {
diff --git a/src/modules/FileSystemUtility.js b/src/modules/FileSystemUtility.js
index 5b0bc339..fab77375 100644
--- a/src/modules/FileSystemUtility.js
+++ b/src/modules/FileSystemUtility.js
@@ -4,6 +4,7 @@ const fs = require("fs");
 const AdmZip = require("adm-zip");
 const extract = require("extract-zip");
 const dayjs = require("dayjs");
+const uuidv4 = require("uuid");
 
 const configDir = (app || remote.app).getPath("userData");
 
@@ -12,7 +13,10 @@ const captureUtility = require("./CaptureUtility");
 const { STATUSES } = require("./constants");
 
 module.exports.exportItems = async (ids) => {
-  const fileName = dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") + ".zip";
+  const fileName =
+    "yattie-export-" +
+    dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") +
+    ".zip";
 
   const { filePath } = await dialog.showSaveDialog({
     title: "Save Items",
@@ -30,10 +34,14 @@ module.exports.exportItems = async (ids) => {
       const zip = new AdmZip();
 
       ids.map((id) => {
-        const data = databaseUtility.getItemById(id);
-
-        if (data.filePath) {
-          zip.addLocalFile(data.filePath, data.fileType);
+        const item = databaseUtility.getItemById(id);
+
+        if (item.filePath) {
+          const sanitizedPath =
+            item.filePath.substring(item.filePath.length - 1) !== "?" ? 
+              item.filePath :
+              item.filePath.substring(0, item.filePath.length - 1);
+          zip.addLocalFile(sanitizedPath, item.fileType);
         }
       });
 
@@ -54,50 +62,20 @@ module.exports.exportItems = async (ids) => {
   });
 };
 
-module.exports.exportNotes = async (ids) => {
-  const fileName = dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") + ".zip";
-  const { filePath } = await dialog.showSaveDialog({
-    title: "Save Notes",
-    defaultPath: fileName,
-    filters: [{ name: "Zip archives only", extensions: ["zip"] }],
-    properties: ["createDirectory", "showOverwriteConfirmation"],
-  });
-
-  if (!filePath) {
-    return Promise.resolve({ status: "canceled" });
+module.exports.createNewSession = async (state) => {
+  state.id = uuidv4();
+  const dataFolder = path.join(configDir, "sessions", state.id);
+  if (!fs.existsSync(dataFolder)) {
+    fs.mkdirSync(dataFolder, { recursive: true });
   }
-
-  return new Promise((resolve) => {
-    try {
-      const zip = new AdmZip();
-
-      ids.map((id) => {
-        const data = databaseUtility.getNoteById(id);
-
-        if (data.filePath) {
-          zip.addLocalFile(data.filePath, data.fileType);
-        }
-      });
-
-      zip.writeZip(filePath, (error) => {
-        if (error) {
-          throw error;
-        }
-
-        resolve({
-          status: STATUSES.SUCCESS,
-          message: "Project exported successfully",
-          filePath,
-        });
-      });
-    } catch (error) {
-      resolve({ status: STATUSES.ERROR, message: error.message });
-    }
-  });
+  databaseUtility.createNewSession(state);
 };
 
 module.exports.saveSession = async (data) => {
-  const notesFileName = dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") + "-notes.txt";
+  const notesFileName =
+    "yattie-session-" +
+    dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") +
+    "-notes.txt";
   const notes = databaseUtility.getNotes();
   let notesFilePath = "";
   if (notes.text !== "") {
@@ -143,7 +121,11 @@ module.exports.saveSession = async (data) => {
         fs.unlinkSync(metaPath);
         items.map((item) => {
           if (item.filePath) {
-            zip.addLocalFile(item.filePath);
+            const sanitizedPath =
+              item.filePath.substring(item.filePath.length - 1) !== "?" ? 
+                item.filePath :
+                item.filePath.substring(0, item.filePath.length - 1);
+            zip.addLocalFile(sanitizedPath);
           }
         });
 
@@ -185,24 +167,35 @@ module.exports.openSession = async () => {
   }
 
   const filePath = filePaths[0];
-  const target = path.join(configDir, "sessions", "userMedia");
+  const target = path.join(configDir, "sessions", "temp");
+  if (!fs.existsSync(target)) {
+    fs.mkdirSync(target, { recursive: true });
+  }
   try {
     await extract(filePath, { dir: target });
-    const metaPath = path.join(
-      configDir,
-      "sessions",
-      "userMedia",
-      "metadata.txt"
-    );
+    const metaPath = path.join(target, "metadata.txt");
     const encoded = fs.readFileSync(metaPath, "utf8");
-    const metadata = JSON.parse(Buffer.from(encoded, "hex").toString());
-    databaseUtility.updateItems(metadata.sessions);
-    delete metadata.sessions;
+    const state = JSON.parse(Buffer.from(encoded, "hex").toString());
+
+    const id = state.id || uuidv4();
+    const dataFolder = path.join(configDir, "sessions", id);
+    if (fs.existsSync(dataFolder)) {
+      fs.rmdirSync(dataFolder);
+    }
+    fs.renameSync(target, dataFolder);
+
+    const sessionDataPath = path.join(dataFolder, "sessionData.json");
+    databaseUtility.updateMetadata({ sessionDataPath });
+
+    // TODO - Should we restore state here or in Main and Default?
+
+    databaseUtility.updateItems(state.sessions);
+    delete state.sessions;
 
     return Promise.resolve({
       status: STATUSES.SUCCESS,
       message: "Session extracted successfully",
-      metadata: metadata,
+      state: state,
     });
   } catch (err) {
     return Promise.resolve({
@@ -213,7 +206,10 @@ module.exports.openSession = async () => {
 };
 
 module.exports.exportSession = async (params) => {
-  const notesFileName = dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") + "-notes.txt";
+  debugger;
+  const timestamp = dayjs().format("YYYY-MM-DD_HH-mm-ss-ms");
+  const id = databaseUtility.getSessionID();
+  const notesFileName = "yattie-session-" + timestamp + "-notes.txt";
   const notes = databaseUtility.getNotes();
   let notesFilePath = "";
   if (notes.text !== "") {
@@ -224,7 +220,7 @@ module.exports.exportSession = async (params) => {
   }
 
   // show save dialog
-  const fileName = dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") + ".zip";
+  const fileName = "yattie-session-" + timestamp + ".zip";
   const { filePath } = await dialog.showSaveDialog({
     title: "Save Items",
     defaultPath: fileName,
@@ -261,11 +257,11 @@ module.exports.exportSession = async (params) => {
     pdfWin.webContents
       .printToPDF({})
       .then((data) => {
-        const pdfName = dayjs().format("YYYY-MM-DD_HH-mm-ss-ms") + ".pdf";
+        const pdfName = "yattie-session-" + timestamp + "-report.pdf";
         const pdfPath = path.join(
           configDir,
           "sessions",
-          "tempUserMedia",
+          id,
           pdfName
         );
 
@@ -283,7 +279,11 @@ module.exports.exportSession = async (params) => {
 
             items.map((item) => {
               if (item.filePath) {
-                zip.addLocalFile(item.filePath, item.fileType);
+                const sanitizedPath =
+                  item.filePath.substring(item.filePath.length - 1) !== "?" ?
+                    item.filePath :
+                    item.filePath.substring(0, item.filePath.length - 1);
+                zip.addLocalFile(sanitizedPath, item.fileType);
               }
             });
 
@@ -346,9 +346,9 @@ module.exports.openConfigFile = async () => {
       }
     });
 
-    const metaData = databaseUtility.getMetaData();
-    metaData.configPath = filePath;
-    databaseUtility.updateMetaData(metaData);
+    const metadata = databaseUtility.getMetadata();
+    metadata.configPath = filePath;
+    databaseUtility.updateMetadata(metadata);
     return Promise.resolve({
       status: STATUSES.SUCCESS,
       message: "Config file imported successfully",
@@ -383,9 +383,9 @@ module.exports.openCredentialsFile = async () => {
       }
     });
 
-    const metaData = databaseUtility.getMetaData();
-    metaData.credentialsPath = filePath;
-    databaseUtility.updateMetaData(metaData);
+    const metadata = databaseUtility.getMetadata();
+    metadata.credentialsPath = filePath;
+    databaseUtility.updateMetadata(metadata);
     return Promise.resolve({
       status: STATUSES.SUCCESS,
       message: "Credentials file imported successfully",
diff --git a/src/modules/IpcHandlers.js b/src/modules/IpcHandlers.js
index c4b817b2..ba4ad973 100644
--- a/src/modules/IpcHandlers.js
+++ b/src/modules/IpcHandlers.js
@@ -38,14 +38,8 @@ ipcMain.handle(IPC_HANDLERS.CAPTURE, async (event, args) => {
       return captureUtility.createAudio(args.data);
     case IPC_FUNCTIONS.UPDATE_AUDIO:
       return captureUtility.updateAudio(args.data);
-    case IPC_FUNCTIONS.CREATE_TEMP_USER_MEDIA:
-      return captureUtility.createTempUserMedia(args.data);
-    case IPC_FUNCTIONS.UPDATE_USER_MEDIA:
-      return captureUtility.updateUserMedia(args.data);
     case IPC_FUNCTIONS.DROP_FILE:
       return captureUtility.dropFile(args.data);
-    case IPC_FUNCTIONS.GET_IMAGE_DATA:
-      return captureUtility.getImageData(args.data);
     case IPC_FUNCTIONS.SET_APPERANCE:
       return captureUtility.setApperance(args.data);
     default:
@@ -94,6 +88,12 @@ ipcMain.handle(IPC_HANDLERS.DATABASE, async (event, args) => {
   switch (args.func) {
     case IPC_FUNCTIONS.INITIALIZE_SESSION:
       return databaseUtility.initializeSession();
+    case IPC_FUNCTIONS.GET_SESSION_ID:
+      return databaseUtility.getSessionID();
+    case IPC_FUNCTIONS.GET_STATE:
+      return databaseUtility.getState();
+    case IPC_FUNCTIONS.UPDATE_STATE:
+      return databaseUtility.updateState(args.data);
     case IPC_FUNCTIONS.ADD_ITEM:
       return databaseUtility.addItem(args.data);
     case IPC_FUNCTIONS.GET_ITEMS:
@@ -113,9 +113,9 @@ ipcMain.handle(IPC_HANDLERS.DATABASE, async (event, args) => {
     case IPC_FUNCTIONS.UPDATE_CREDENTIALS:
       return databaseUtility.updateCredentials(args.data);
     case IPC_FUNCTIONS.GET_METADATA:
-      return databaseUtility.getMetaData(args.data);
+      return databaseUtility.getMetadata(args.data);
     case IPC_FUNCTIONS.UPDATE_METADATA:
-      return databaseUtility.updateMetaData(args.data);
+      return databaseUtility.updateMetadata(args.data);
     case IPC_FUNCTIONS.UPDATE_NOTES:
       return databaseUtility.updateNotes(args.data);
     case IPC_FUNCTIONS.GET_NOTES:
@@ -131,8 +131,8 @@ ipcMain.handle(IPC_HANDLERS.FILE_SYSTEM, async (event, args) => {
   switch (args.func) {
     case IPC_FUNCTIONS.EXPORT_ITEMS:
       return fileSystemUtility.exportItems(args.data);
-    case IPC_FUNCTIONS.EXPORT_NOTES:
-      return fileSystemUtility.exportNotes(args.data);
+    case IPC_FUNCTIONS.CREATE_NEW_SESSION:
+      return fileSystemUtility.createNewSession(args.data);
     case IPC_FUNCTIONS.SAVE_SESSION:
       return fileSystemUtility.saveSession(args.data);
     case IPC_FUNCTIONS.OPEN_SESSION:
diff --git a/src/modules/WindowUtility.js b/src/modules/WindowUtility.js
index 0c902243..03b7b151 100644
--- a/src/modules/WindowUtility.js
+++ b/src/modules/WindowUtility.js
@@ -262,6 +262,7 @@ module.exports.closeSettingWindow = () => {
 };
 
 module.exports.setWindowSize = ({ width, height }) => {
+  // TODO - Handle window sizing better without manual resizing and fixed sizes
   const browserWindow = browserUtility.getBrowserWindow();
   browserWindow.setSize(width, height);
   browserWindow.center();
diff --git a/src/modules/constants.js b/src/modules/constants.js
index 79b84789..5c181e7b 100644
--- a/src/modules/constants.js
+++ b/src/modules/constants.js
@@ -20,8 +20,6 @@ export const IPC_FUNCTIONS = {
   UPLOAD_EVIDENCE: "uploadEvidence",
   CREATE_AUDIO: "createAudio",
   UPDATE_AUDIO: "updateAudio",
-  CREATE_TEMP_USER_MEDIA: "createTempUserMedia",
-  UPDATE_USER_MEDIA: "updateUserMedia",
   OPTIMIZE_VIDEO: "optimizeVideo",
   DROP_FILE: "dropFile",
 
@@ -37,13 +35,15 @@ export const IPC_FUNCTIONS = {
   OPEN_MODAL_WINDOW: "openModalWindow",
   CLOSE_MODAL_WINDOW: "closeModalWindow",
   SET_WINDOW_SIZE: "setWindowSize",
-  GET_IMAGE_DATA: "getImageData",
   SET_APPERANCE: "setApperance",
   OPEN_NOTES_WINDOW: "openNotesWindow",
   CLOSE_NOTES_WINDOW: "closeNotesWindow",
   MOVE_WINDOW: "moveWindow",
 
   INITIALIZE_SESSION: "initializeSession",
+  GET_SESSION_ID: "getSessionID",
+  GET_STATE: "getState",
+  UPDATE_STATE: "updateState",
   ADD_ITEM: "addItem",
   GET_ITEMS: "getItems",
   UPDATE_ITEMS: "updateItems",
@@ -53,15 +53,15 @@ export const IPC_FUNCTIONS = {
   UPDATE_CONFIG: "updateConfig",
   GET_CREDENTIALS: "getCredentials",
   UPDATE_CREDENTIALS: "updateCredentials",
-  GET_METADATA: "getMetaData",
-  UPDATE_METADATA: "updateMetaData",
+  GET_METADATA: "getMetadata",
+  UPDATE_METADATA: "updateMetadata",
 
   GET_NOTES: "getNotes",
   UPDATE_NOTES: "updateNotes",
   RESET_DATA: "resetData",
 
   EXPORT_ITEMS: "exportItems",
-  EXPORT_NOTES: "exportNotes",
+  CREATE_NEW_SESSION: "createNewSession",
   SAVE_SESSION: "saveSession",
   OPEN_SESSION: "openSession",
   EXPORT_SESSION: "exportSession",
diff --git a/src/router/index.js b/src/router/index.js
index 9b7f6399..0f4b72f2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -31,6 +31,8 @@ import SummaryEditorView from "../views/SummaryEditorView.vue";
 import EndSessionView from "../views/EndSessionView.vue";
 import ShareOAuthView from "../views/ShareOAuthView.vue";
 
+import store from "@/store";
+
 Vue.use(VueRouter);
 
 const routes = [
@@ -192,4 +194,12 @@ const router = new VueRouter({
   routes,
 });
 
+router.beforeEach((to, from, next) => {
+  // This prevents us from saving store on initial load where name is null
+  if (from.matched.length > 0) {
+    store.commit("setPath", to.path);
+  }
+  next();
+});
+
 export default router;
diff --git a/src/store/index.js b/src/store/index.js
index 15df35ad..bb76eca4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,6 +5,8 @@ import {
   SESSION_STATUSES,
   DEFAULT_CHARTER_MAP_NODES,
   DEFAULT_CHARTER_MAP_CONNECTIONS,
+  IPC_HANDLERS,
+  IPC_FUNCTIONS,
 } from "../modules/constants";
 
 Vue.use(Vuex);
@@ -30,35 +32,75 @@ export default new Vuex.Store({
     started: "",
     ended: "",
     quickTest: false,
+    path: "",
   },
   getters: {},
   mutations: {
     setTitle(state, payload) {
       state.title = payload;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     setCharter(state, payload) {
       state.charter.content = payload.content;
       state.charter.text = payload.text;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     setMindmap(state, payload) {
       state.mindmap.nodes = payload.nodes;
       state.mindmap.connections = payload.connections;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     setPrecondition(state, payload) {
       state.precondition.content = payload.content;
       state.precondition.text = payload.text;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     setDuration(state, payload) {
       state.duration = payload;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     setStarted(state, payload) {
       state.started = payload;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     setEnded(state, payload) {
       state.ended = payload;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     setQuickTest(state, payload) {
       state.quickTest = payload;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
+    },
+    setPath(state, payload) {
+      state.path = payload;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     updateSession(state, payload) {
       if (state.status !== payload.status) {
@@ -70,6 +112,10 @@ export default new Vuex.Store({
       if (state.duration !== payload.duration) {
         state.duration = payload.duration;
       }
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     clearState(state) {
       state.title = "";
@@ -93,6 +139,10 @@ export default new Vuex.Store({
       state.started = "";
       state.ended = "";
       state.quickTest = false;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     resetState(state) {
       state.duration = 0;
@@ -102,18 +152,32 @@ export default new Vuex.Store({
       state.started = "";
       state.ended = "";
       state.quickTest = false;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
     restoreState(state, payload) {
       state.title = payload.title;
-      state.charter.content = payload.charter.content;
-      state.charter.text = payload.charter.text;
-      state.precondition.content = payload.precondition.content;
-      state.precondition.text = payload.precondition.text;
+      state.charter.content = payload?.charter?.content || "";
+      state.charter.text = payload?.charter?.text || "";
+      state.mindmap.nodes =
+        payload?.mindmap?.nodes || DEFAULT_CHARTER_MAP_NODES;
+      state.mindmap.connections =
+        payload?.mindmap?.connections || DEFAULT_CHARTER_MAP_CONNECTIONS;
+      state.precondition.content = payload?.precondition?.content || "";
+      state.precondition.text = payload?.precondition?.text || "";
       state.status = payload.status;
       state.timer = payload.timer;
       state.duration = payload.duration;
       state.started = payload.started;
       state.ended = payload.ended;
+      state.quickTest = payload.quickTest;
+      state.path = payload.path;
+      window.ipc.invoke(IPC_HANDLERS.DATABASE, {
+        func: IPC_FUNCTIONS.UPDATE_STATE,
+        data: state,
+      });
     },
   },
   actions: {},
diff --git a/src/store/store-config.js b/src/store/store-config.js
index 232f38b9..6c5eb847 100644
--- a/src/store/store-config.js
+++ b/src/store/store-config.js
@@ -1,3 +1,4 @@
+// Used for tests - TODO clean up
 import { SESSION_STATUSES } from "../modules/constants";
 
 export default {
diff --git a/src/views/AddEvidence.vue b/src/views/AddEvidence.vue
index 7df7d7a6..55c2b68f 100644
--- a/src/views/AddEvidence.vue
+++ b/src/views/AddEvidence.vue
@@ -319,7 +319,7 @@ export default {
       );
 
       if (status === STATUSES.ERROR) {
-        // CTODO - bubble up to snackbar
+        this.$root.$emit("set-snackbar", message);
         console.log(message);
       }
       this.processing = false;
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 33bdfb1d..2ae7c4eb 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -239,16 +239,23 @@ export default {
     async openSession() {
       if (!window.ipc) return;
 
-      const { status, metadata } = await window.ipc.invoke(
+      const { status, message, state } = await window.ipc.invoke(
         IPC_HANDLERS.FILE_SYSTEM,
         {
           func: IPC_FUNCTIONS.OPEN_SESSION,
         }
       );
-      if (status !== STATUSES.ERROR) {
-        // restore vuex state
-        this.$store.commit("restoreState", metadata);
-        this.$router.push({ path: metadata.path });
+
+      if (status === STATUSES.ERROR) {
+        this.$root.$emit("set-snackbar", message);
+        console.log(message);
+      } else {
+        this.$store.commit("restoreState", state);
+
+        const currentPath = this.$router.history.current.path;
+        if (currentPath !== state.path) {
+          this.$router.push({ path: state.path });
+        }
       }
     },
     quickTest() {
diff --git a/src/views/SettingView.vue b/src/views/SettingView.vue
index ad8b0465..4c88a2dd 100644
--- a/src/views/SettingView.vue
+++ b/src/views/SettingView.vue
@@ -88,13 +88,13 @@ export default {
     };
   },
   created() {
-    this.getMetaData();
+    this.getMetadata();
     this.getConfig();
     this.getCredentials();
   },
   mounted() {
     this.$root.$on("change-meta", () => {
-      this.getMetaData();
+      this.getMetadata();
       this.getConfig().then(() => this.updateConfig(this.config));
       this.getCredentials().then(() =>
         this.updateCredentials(this.credentials)
@@ -102,7 +102,7 @@ export default {
     });
   },
   methods: {
-    async getMetaData() {
+    async getMetadata() {
       if (!window.ipc) return;
 
       window.ipc