diff --git a/Cargo.lock b/Cargo.lock
index 5a62b679f..4fe344fbf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5655,12 +5655,14 @@ dependencies = [
  "chrono",
  "cocoa 0.25.0",
  "daedalus",
+ "dashmap",
  "dirs",
  "futures",
  "lazy_static",
  "objc",
  "once_cell",
  "os_info",
+ "paste",
  "sentry",
  "sentry-rust-minidump",
  "serde",
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index d7404b1a9..d007db6bb 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, watch } from 'vue'
+import { computed, ref, watch, onMounted } from 'vue'
 import { RouterView, RouterLink, useRouter, useRoute } from 'vue-router'
 import {
   HomeIcon,
@@ -36,12 +36,14 @@ import { saveWindowState, StateFlags } from 'tauri-plugin-window-state-api'
 import { getVersion } from '@tauri-apps/api/app'
 import { window as TauriWindow } from '@tauri-apps/api'
 import { TauriEvent } from '@tauri-apps/api/event'
-import { await_sync, check_safe_loading_bars_complete } from './helpers/state'
-import { confirm } from '@tauri-apps/api/dialog'
 import URLConfirmModal from '@/components/ui/URLConfirmModal.vue'
 import OnboardingScreen from '@/components/ui/tutorial/OnboardingScreen.vue'
 import { install_from_file } from './helpers/pack'
 import { useError } from '@/store/error.js'
+import ModInstallModal from '@/components/ui/install_flow/ModInstallModal.vue'
+import IncompatibilityWarningModal from '@/components/ui/install_flow/IncompatibilityWarningModal.vue'
+import InstallConfirmModal from '@/components/ui/install_flow/InstallConfirmModal.vue'
+import { useInstall } from '@/store/install.js'
 
 const themeStore = useTheming()
 const urlModal = ref(null)
@@ -62,16 +64,16 @@ defineExpose({
     const {
       native_decorations,
       theme,
-      opt_out_analytics,
+      telemetry,
       collapsed_navigation,
       advanced_rendering,
-      fully_onboarded,
+      onboarded,
     } = await get()
     // video should play if the user is not on linux, and has not onboarded
     os.value = await getOS()
     const dev = await isDev()
     const version = await getVersion()
-    showOnboarding.value = !fully_onboarded
+    showOnboarding.value = !onboarded
 
     nativeDecorations.value = native_decorations
     if (os.value !== 'MacOS') appWindow.setDecorations(native_decorations)
@@ -81,10 +83,10 @@ defineExpose({
     themeStore.advancedRendering = advanced_rendering
 
     mixpanel_init('014c7d6a336d0efaefe3aca91063748d', { debug: dev, persistence: 'localStorage' })
-    if (opt_out_analytics) {
+    if (telemetry) {
       mixpanel_opt_out_tracking()
     }
-    mixpanel_track('Launched', { version, dev, fully_onboarded })
+    mixpanel_track('Launched', { version, dev, onboarded })
 
     if (!dev) document.addEventListener('contextmenu', (event) => event.preventDefault())
 
@@ -118,49 +120,10 @@ defineExpose({
   },
 })
 
-const confirmClose = async () => {
-  const confirmed = await confirm(
-    'An action is currently in progress. Are you sure you want to exit?',
-    {
-      title: 'Modrinth',
-      type: 'warning',
-    },
-  )
-  return confirmed
-}
-
 const handleClose = async () => {
-  if (failureText.value != null) {
-    await TauriWindow.getCurrent().close()
-    return
-  }
-  // State should respond immeiately if it's safe to close
-  // If not, code is deadlocked or worse, so wait 2 seconds and then ask the user to confirm closing
-  // (Exception: if the user is changing config directory, which takes control of the state, and it's taking a significant amount of time for some reason)
-  const isSafe = await Promise.race([
-    check_safe_loading_bars_complete(),
-    new Promise((r) => setTimeout(r, 2000)),
-  ])
-  if (!isSafe) {
-    const response = await confirmClose()
-    if (!response) {
-      return
-    }
-  }
-  await await_sync()
   await TauriWindow.getCurrent().close()
 }
 
-const openSupport = async () => {
-  window.__TAURI_INVOKE__('tauri', {
-    __tauriModule: 'Shell',
-    message: {
-      cmd: 'open',
-      path: 'https://discord.gg/modrinth',
-    },
-  })
-}
-
 TauriWindow.getCurrent().listen(TauriEvent.WINDOW_CLOSE_REQUESTED, async () => {
   await handleClose()
 })
@@ -179,15 +142,22 @@ const loading = useLoading()
 const notifications = useNotifications()
 const notificationsWrapper = ref()
 
-watch(notificationsWrapper, () => {
-  notifications.setNotifs(notificationsWrapper.value)
-})
-
 const error = useError()
 const errorModal = ref()
 
-watch(errorModal, () => {
+const install = useInstall()
+const modInstallModal = ref()
+const installConfirmModal = ref()
+const incompatibilityWarningModal = ref()
+
+onMounted(() => {
+  notifications.setNotifs(notificationsWrapper.value)
+
   error.setErrorModal(errorModal.value)
+
+  install.setIncompatibilityWarningModal(incompatibilityWarningModal)
+  install.setInstallConfirmModal(installConfirmModal)
+  install.setModInstallModal(modInstallModal)
 })
 
 document.querySelector('body').addEventListener('click', function (e) {
@@ -284,7 +254,7 @@ command_listener(async (e) => {
         <div class="button-row push-right">
           <Button @click="showLauncherLogsFolder"><FileIcon />Open launcher logs</Button>
 
-          <Button @click="openSupport"><ChatIcon />Get support</Button>
+          <a class="btn" href="https://support.modrinth.com"> <ChatIcon /> Get support </a>
         </div>
       </Card>
     </div>
@@ -385,6 +355,9 @@ command_listener(async (e) => {
   <URLConfirmModal ref="urlModal" />
   <Notifications ref="notificationsWrapper" />
   <ErrorModal ref="errorModal" />
+  <ModInstallModal ref="modInstallModal" />
+  <IncompatibilityWarningModal ref="incompatibilityWarningModal" />
+  <InstallConfirmModal ref="installConfirmModal" />
 </template>
 
 <style lang="scss" scoped>
@@ -584,55 +557,6 @@ command_listener(async (e) => {
   }
 }
 
-.instance-list {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  width: 70%;
-  margin: 0.4rem;
-
-  p:nth-child(1) {
-    font-size: 0.6rem;
-  }
-
-  & > p {
-    color: var(--color-base);
-    margin: 0.8rem 0;
-    font-size: 0.7rem;
-    line-height: 0.8125rem;
-    font-weight: 500;
-    text-transform: uppercase;
-  }
-}
-
-.user-section {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  width: 100%;
-  height: 4.375rem;
-
-  section {
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-start;
-    text-align: left;
-    margin-left: 0.5rem;
-  }
-
-  .username {
-    margin-bottom: 0.3rem;
-    font-weight: 400;
-    line-height: 1.25rem;
-    color: var(--color-contrast);
-  }
-
-  a {
-    font-weight: 400;
-    color: var(--color-secondary);
-  }
-}
-
 .nav-section {
   display: flex;
   flex-direction: column;
@@ -643,14 +567,6 @@ command_listener(async (e) => {
   gap: 1rem;
 }
 
-.video {
-  margin-top: 2.25rem;
-  width: 100vw;
-  height: calc(100vh - 2.25rem);
-  object-fit: cover;
-  border-radius: var(--radius-md);
-}
-
 .button-row {
   display: flex;
   flex-direction: row;
diff --git a/apps/app-frontend/src/components/GridDisplay.vue b/apps/app-frontend/src/components/GridDisplay.vue
index f2f28e933..39eb61a9d 100644
--- a/apps/app-frontend/src/components/GridDisplay.vue
+++ b/apps/app-frontend/src/components/GridDisplay.vue
@@ -127,46 +127,46 @@ const sortBy = ref('Name')
 
 const filteredResults = computed(() => {
   let instances = props.instances.filter((instance) => {
-    return instance.metadata.name.toLowerCase().includes(search.value.toLowerCase())
+    return instance.name.toLowerCase().includes(search.value.toLowerCase())
   })
 
   if (sortBy.value === 'Name') {
     instances.sort((a, b) => {
-      return a.metadata.name.localeCompare(b.metadata.name)
+      return a.name.localeCompare(b.name)
     })
   }
 
   if (sortBy.value === 'Game version') {
     instances.sort((a, b) => {
-      return a.metadata.game_version.localeCompare(b.metadata.game_version)
+      return a.game_version.localeCompare(b.game_version)
     })
   }
 
   if (sortBy.value === 'Last played') {
     instances.sort((a, b) => {
-      return dayjs(b.metadata.last_played ?? 0).diff(dayjs(a.metadata.last_played ?? 0))
+      return dayjs(b.last_played ?? 0).diff(dayjs(a.last_played ?? 0))
     })
   }
 
   if (sortBy.value === 'Date created') {
     instances.sort((a, b) => {
-      return dayjs(b.metadata.date_created).diff(dayjs(a.metadata.date_created))
+      return dayjs(b.date_created).diff(dayjs(a.date_created))
     })
   }
 
   if (sortBy.value === 'Date modified') {
     instances.sort((a, b) => {
-      return dayjs(b.metadata.date_modified).diff(dayjs(a.metadata.date_modified))
+      return dayjs(b.date_modified).diff(dayjs(a.date_modified))
     })
   }
 
   if (filters.value === 'Custom instances') {
     instances = instances.filter((instance) => {
-      return !instance.metadata?.linked_data
+      return !instance.linked_data
     })
   } else if (filters.value === 'Downloaded modpacks') {
     instances = instances.filter((instance) => {
-      return instance.metadata?.linked_data
+      return instance.linked_data
     })
   }
 
@@ -174,7 +174,7 @@ const filteredResults = computed(() => {
 
   if (group.value === 'Loader') {
     instances.forEach((instance) => {
-      const loader = formatCategoryHeader(instance.metadata.loader)
+      const loader = formatCategoryHeader(instance.loader)
       if (!instanceMap.has(loader)) {
         instanceMap.set(loader, [])
       }
@@ -183,19 +183,19 @@ const filteredResults = computed(() => {
     })
   } else if (group.value === 'Game version') {
     instances.forEach((instance) => {
-      if (!instanceMap.has(instance.metadata.game_version)) {
-        instanceMap.set(instance.metadata.game_version, [])
+      if (!instanceMap.has(instance.game_version)) {
+        instanceMap.set(instance.game_version, [])
       }
 
-      instanceMap.get(instance.metadata.game_version).push(instance)
+      instanceMap.get(instance.game_version).push(instance)
     })
   } else if (group.value === 'Category') {
     instances.forEach((instance) => {
-      if (instance.metadata.groups.length === 0) {
-        instance.metadata.groups.push('None')
+      if (instance.groups.length === 0) {
+        instance.groups.push('None')
       }
 
-      for (const category of instance.metadata.groups) {
+      for (const category of instance.groups) {
         if (!instanceMap.has(category)) {
           instanceMap.set(category, [])
         }
diff --git a/apps/app-frontend/src/components/RowDisplay.vue b/apps/app-frontend/src/components/RowDisplay.vue
index ee54ec92c..4984569c8 100644
--- a/apps/app-frontend/src/components/RowDisplay.vue
+++ b/apps/app-frontend/src/components/RowDisplay.vue
@@ -17,8 +17,6 @@ import Instance from '@/components/ui/Instance.vue'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import ProjectCard from '@/components/ui/ProjectCard.vue'
-import InstallConfirmModal from '@/components/ui/InstallConfirmModal.vue'
-import ModInstallModal from '@/components/ui/ModInstallModal.vue'
 import {
   get_all_running_profile_paths,
   get_uuids_by_profile_path,
@@ -28,11 +26,10 @@ import { handleError } from '@/store/notifications.js'
 import { duplicate, remove, run } from '@/helpers/profile.js'
 import { useRouter } from 'vue-router'
 import { showProfileInFolder } from '@/helpers/utils.js'
-import { useFetch } from '@/helpers/fetch.js'
-import { install as pack_install } from '@/helpers/pack.js'
 import { useTheming } from '@/store/state.js'
 import { mixpanel_track } from '@/helpers/mixpanel'
 import { handleSevereError } from '@/store/error.js'
+import { install as installVersion } from '@/store/install.js'
 
 const router = useRouter()
 
@@ -58,9 +55,7 @@ const modsRow = ref(null)
 const instanceOptions = ref(null)
 const instanceComponents = ref(null)
 const rows = ref(null)
-const confirmModal = ref(null)
 const deleteConfirmModal = ref(null)
-const modInstallModal = ref(null)
 
 const themeStore = useTheming()
 const currentDeleteInstance = ref(null)
@@ -132,8 +127,8 @@ const handleOptionsClick = async (args) => {
     case 'play':
       await run(args.item.path).catch(handleSevereError)
       mixpanel_track('InstanceStart', {
-        loader: args.item.metadata.loader,
-        game_version: args.item.metadata.game_version,
+        loader: args.item.loader,
+        game_version: args.item.game_version,
       })
       break
     case 'stop':
@@ -141,13 +136,13 @@ const handleOptionsClick = async (args) => {
         await kill_by_uuid(u).catch(handleError)
       }
       mixpanel_track('InstanceStop', {
-        loader: args.item.metadata.loader,
-        game_version: args.item.metadata.game_version,
+        loader: args.item.loader,
+        game_version: args.item.game_version,
       })
       break
     case 'add_content':
       await router.push({
-        path: `/browse/${args.item.metadata.loader === 'vanilla' ? 'datapack' : 'mod'}`,
+        path: `/browse/${args.item.loader === 'vanilla' ? 'datapack' : 'mod'}`,
         query: { i: args.item.path },
       })
       break
@@ -170,21 +165,8 @@ const handleOptionsClick = async (args) => {
       await navigator.clipboard.writeText(args.item.path)
       break
     case 'install': {
-      const versions = await useFetch(
-        `https://api.modrinth.com/v2/project/${args.item.project_id}/version`,
-        'project versions',
-      )
+      await installVersion(args.item.project_id, null, null, 'ProjectCardContextMenu')
 
-      if (args.item.project_type === 'modpack') {
-        await pack_install(
-          args.item.project_id,
-          versions[0].id,
-          args.item.title,
-          args.item.icon_url,
-        )
-      } else {
-        modInstallModal.value.show(args.item.project_id, versions)
-      }
       break
     }
     case 'open_link':
@@ -243,7 +225,7 @@ onUnmounted(() => {
         <router-link :to="row.route">{{ row.label }}</router-link>
         <ChevronRightIcon />
       </div>
-      <section v-if="row.instances[0].metadata" ref="modsRow" class="instances">
+      <section v-if="row.instance" ref="modsRow" class="instances">
         <Instance
           v-for="instance in row.instances.slice(0, maxInstancesPerRow)"
           :key="(instance?.project_id || instance?.id) + instance.install_stage"
@@ -258,8 +240,6 @@ onUnmounted(() => {
           ref="instanceComponents"
           class="item"
           :project="project"
-          :confirm-modal="confirmModal"
-          :mod-install-modal="modInstallModal"
           @contextmenu.prevent.stop="(event) => handleProjectClick(event, project)"
         />
       </section>
@@ -278,8 +258,6 @@ onUnmounted(() => {
     <template #open_link> <GlobeIcon /> Open in Modrinth <ExternalIcon /> </template>
     <template #copy_link> <ClipboardCopyIcon /> Copy link </template>
   </ContextMenu>
-  <InstallConfirmModal ref="confirmModal" />
-  <ModInstallModal ref="modInstallModal" />
 </template>
 <style lang="scss" scoped>
 .content {
diff --git a/apps/app-frontend/src/components/ui/ContextMenu.vue b/apps/app-frontend/src/components/ui/ContextMenu.vue
index cd4d442cc..a0ca9417e 100644
--- a/apps/app-frontend/src/components/ui/ContextMenu.vue
+++ b/apps/app-frontend/src/components/ui/ContextMenu.vue
@@ -60,9 +60,9 @@ defineExpose({
 })
 
 const isLinkedData = (item) => {
-  if (item.instance != undefined && item.instance.metadata.linked_data) {
+  if (item.instance != undefined && item.instance.linked_data) {
     return true
-  } else if (item.metadata != undefined && item.metadata.linked_data) {
+  } else if (item != undefined && item.linked_data) {
     return true
   }
   return false
diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue
index f94a4c2df..449f25b13 100644
--- a/apps/app-frontend/src/components/ui/ExportModal.vue
+++ b/apps/app-frontend/src/components/ui/ExportModal.vue
@@ -23,7 +23,7 @@ defineExpose({
 })
 
 const exportModal = ref(null)
-const nameInput = ref(props.instance.metadata.name)
+const nameInput = ref(props.instance.name)
 const exportDescription = ref('')
 const versionInput = ref('1.0.0')
 const files = ref([])
diff --git a/apps/app-frontend/src/components/ui/Instance.vue b/apps/app-frontend/src/components/ui/Instance.vue
index 353cb3943..ea9cabd0e 100644
--- a/apps/app-frontend/src/components/ui/Instance.vue
+++ b/apps/app-frontend/src/components/ui/Instance.vue
@@ -1,22 +1,18 @@
 <script setup>
-import { onUnmounted, ref, watch } from 'vue'
+import { onUnmounted, ref, computed } from 'vue'
 import { useRouter } from 'vue-router'
-import { DownloadIcon, StopCircleIcon, PlayIcon } from '@modrinth/assets'
+import { StopCircleIcon, PlayIcon } from '@modrinth/assets'
 import { Card, Avatar, AnimatedLogo } from '@modrinth/ui'
 import { convertFileSrc } from '@tauri-apps/api/tauri'
-import InstallConfirmModal from '@/components/ui/InstallConfirmModal.vue'
-import { install as pack_install } from '@/helpers/pack'
-import { list, run } from '@/helpers/profile'
+import { run } from '@/helpers/profile'
 import {
   get_all_running_profile_paths,
   get_uuids_by_profile_path,
   kill_by_uuid,
 } from '@/helpers/process'
 import { process_listener } from '@/helpers/events'
-import { useFetch } from '@/helpers/fetch.js'
 import { handleError } from '@/store/state.js'
 import { showProfileInFolder } from '@/helpers/utils.js'
-import ModInstallModal from '@/components/ui/ModInstallModal.vue'
 import { mixpanel_track } from '@/helpers/mixpanel'
 import { handleSevereError } from '@/store/error.js'
 
@@ -29,32 +25,15 @@ const props = defineProps({
   },
 })
 
-const confirmModal = ref(null)
-const modInstallModal = ref(null)
 const playing = ref(false)
 
 const uuid = ref(null)
-const modLoading = ref(
-  props.instance.install_stage ? props.instance.install_stage !== 'installed' : false,
-)
-
-watch(
-  () => props.instance,
-  () => {
-    modLoading.value = props.instance.install_stage
-      ? props.instance.install_stage !== 'installed'
-      : false
-  },
-)
+const modLoading = computed(() => props.instance.install_stage !== 'installed')
 
 const router = useRouter()
 
 const seeInstance = async () => {
-  const instancePath = props.instance.metadata
-    ? `/instance/${encodeURIComponent(props.instance.path)}/`
-    : `/project/${encodeURIComponent(props.instance.project_id)}/`
-
-  await router.push(instancePath)
+  await router.push(`/instance/${encodeURIComponent(props.instance.path)}/`)
 }
 
 const checkProcess = async () => {
@@ -69,57 +48,6 @@ const checkProcess = async () => {
   uuid.value = null
 }
 
-const install = async (e) => {
-  e?.stopPropagation()
-  modLoading.value = true
-  const versions = await useFetch(
-    `https://api.modrinth.com/v2/project/${props.instance.project_id}/version`,
-    'project versions',
-  )
-
-  if (props.instance.project_type === 'modpack') {
-    const packs = Object.values(await list(true).catch(handleError))
-
-    if (
-      packs.length === 0 ||
-      !packs
-        .map((value) => value.metadata)
-        .find((pack) => pack.linked_data?.project_id === props.instance.project_id)
-    ) {
-      modLoading.value = true
-      await pack_install(
-        props.instance.project_id,
-        versions[0].id,
-        props.instance.title,
-        props.instance.icon_url,
-      ).catch(handleError)
-      modLoading.value = false
-
-      mixpanel_track('PackInstall', {
-        id: props.instance.project_id,
-        version_id: versions[0].id,
-        title: props.instance.title,
-        source: 'InstanceCard',
-      })
-    } else
-      confirmModal.value.show(
-        props.instance.project_id,
-        versions[0].id,
-        props.instance.title,
-        props.instance.icon_url,
-      )
-  } else {
-    modInstallModal.value.show(
-      props.instance.project_id,
-      versions,
-      props.instance.title,
-      props.instance.project_type,
-    )
-  }
-
-  modLoading.value = false
-}
-
 const play = async (e, context) => {
   e?.stopPropagation()
   modLoading.value = true
@@ -128,8 +56,8 @@ const play = async (e, context) => {
   playing.value = true
 
   mixpanel_track('InstancePlay', {
-    loader: props.instance.metadata.loader,
-    game_version: props.instance.metadata.game_version,
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
     source: context,
   })
 }
@@ -148,8 +76,8 @@ const stop = async (e, context) => {
   } else await kill_by_uuid(uuid.value).catch(handleError) // If we still have the uuid, just kill it
 
   mixpanel_track('InstanceStop', {
-    loader: props.instance.metadata.loader,
-    game_version: props.instance.metadata.game_version,
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
     source: context,
   })
 
@@ -162,13 +90,12 @@ const openFolder = async () => {
 
 const addContent = async () => {
   await router.push({
-    path: `/browse/${props.instance.metadata.loader === 'vanilla' ? 'datapack' : 'mod'}`,
+    path: `/browse/${props.instance.loader === 'vanilla' ? 'datapack' : 'mod'}`,
     query: { i: props.instance.path },
   })
 }
 
 defineExpose({
-  install,
   playing,
   play,
   stop,
@@ -190,46 +117,32 @@ onUnmounted(() => unlisten())
     <Card class="instance-card-item button-base" @click="seeInstance" @mouseenter="checkProcess">
       <Avatar
         size="lg"
-        :src="
-          props.instance.metadata
-            ? !props.instance.metadata.icon ||
-              (props.instance.metadata.icon && props.instance.metadata.icon.startsWith('http'))
-              ? props.instance.metadata.icon
-              : convertFileSrc(props.instance.metadata?.icon)
-            : props.instance.icon_url
-        "
+        :src="props.instance.icon_path ? convertFileSrc(props.instance.icon_path) : null"
         alt="Mod card"
         class="mod-image"
       />
       <div class="project-info">
-        <p class="title">{{ props.instance.metadata?.name || props.instance.title }}</p>
+        <p class="title">{{ props.instance.name }}</p>
         <p class="description">
-          {{ props.instance.metadata?.loader }}
-          {{ props.instance.metadata?.game_version || props.instance.latest_version }}
+          {{ props.instance.loader }}
+          {{ props.instance.game_version }}
         </p>
       </div>
     </Card>
     <div
-      v-if="props.instance.metadata && playing === false && modLoading === false"
-      class="install cta button-base"
-      @click="(e) => play(e, 'InstanceCard')"
-    >
-      <PlayIcon />
-    </div>
-    <div v-else-if="modLoading === true && playing === false" class="cta loading-cta">
-      <AnimatedLogo class="loading-indicator" />
-    </div>
-    <div
-      v-else-if="playing === true"
+      v-if="playing === true"
       class="stop cta button-base"
       @click="(e) => stop(e, 'InstanceCard')"
       @mousehover="checkProcess"
     >
       <StopCircleIcon />
     </div>
-    <div v-else class="install cta button-base" @click="install"><DownloadIcon /></div>
-    <InstallConfirmModal ref="confirmModal" />
-    <ModInstallModal ref="modInstallModal" />
+    <div v-else-if="modLoading === true && playing === false" class="cta loading-cta">
+      <AnimatedLogo class="loading-indicator" />
+    </div>
+    <div v-else class="install cta button-base" @click="(e) => play(e, 'InstanceCard')">
+      <PlayIcon />
+    </div>
   </div>
 </template>
 
diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
index cd8e61296..3efcd5cc2 100644
--- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
+++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue
@@ -213,13 +213,7 @@ import { get_loaders } from '@/helpers/tags'
 import { create } from '@/helpers/profile'
 import { open } from '@tauri-apps/api/dialog'
 import { tauri } from '@tauri-apps/api'
-import {
-  get_game_versions,
-  get_fabric_versions,
-  get_forge_versions,
-  get_quilt_versions,
-  get_neoforge_versions,
-} from '@/helpers/metadata'
+import { get_game_versions, get_loader_versions } from '@/helpers/metadata'
 import { handleError } from '@/store/notifications.js'
 import Multiselect from 'vue-multiselect'
 import { mixpanel_track } from '@/helpers/mixpanel'
@@ -304,10 +298,10 @@ const [
   all_game_versions,
   loaders,
 ] = await Promise.all([
-  get_fabric_versions().then(shallowRef).catch(handleError),
-  get_forge_versions().then(shallowRef).catch(handleError),
-  get_quilt_versions().then(shallowRef).catch(handleError),
-  get_neoforge_versions().then(shallowRef).catch(handleError),
+  get_loader_versions('fabric').then(shallowRef).catch(handleError),
+  get_loader_versions('forge').then(shallowRef).catch(handleError),
+  get_loader_versions('quilt').then(shallowRef).catch(handleError),
+  get_loader_versions('neo').then(shallowRef).catch(handleError),
   get_game_versions().then(shallowRef).catch(handleError),
   get_loaders()
     .then((value) =>
diff --git a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
index dc6ded984..ac68c224d 100644
--- a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
+++ b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
@@ -53,9 +53,6 @@ defineExpose({
   show: async (version, currentSelectedJava) => {
     chosenInstallOptions.value = await find_filtered_jres(version).catch(handleError)
 
-    console.log(chosenInstallOptions.value)
-    console.log(version)
-
     currentSelected.value = currentSelectedJava
     if (!currentSelected.value) {
       currentSelected.value = { path: '', version: '' }
diff --git a/apps/app-frontend/src/components/ui/JavaSelector.vue b/apps/app-frontend/src/components/ui/JavaSelector.vue
index afc3b796e..5c8ac0ca4 100644
--- a/apps/app-frontend/src/components/ui/JavaSelector.vue
+++ b/apps/app-frontend/src/components/ui/JavaSelector.vue
@@ -162,7 +162,6 @@ async function reinstallJava() {
   const path = await auto_install_java(props.version).catch(handleError)
   let result = await get_jre(path)
 
-  console.log('java result ' + result)
   if (!result) {
     result = {
       path: path,
diff --git a/apps/app-frontend/src/components/ui/ModpackVersionModal.vue b/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
index 58a6eb5fe..396af9989 100644
--- a/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
+++ b/apps/app-frontend/src/components/ui/ModpackVersionModal.vue
@@ -29,7 +29,7 @@ const filteredVersions = computed(() => {
 })
 
 const modpackVersionModal = ref(null)
-const installedVersion = computed(() => props.instance?.metadata?.linked_data?.version_id)
+const installedVersion = computed(() => props.instance?.linked_data?.version_id)
 const installing = computed(() => props.instance.install_stage !== 'installed')
 const inProgress = ref(false)
 
@@ -50,7 +50,7 @@ const switchVersion = async (versionId) => {
     :noblur="!themeStore.advancedRendering"
   >
     <div class="modal-body">
-      <Card v-if="instance.metadata.linked_data" class="mod-card">
+      <Card v-if="instance.linked_data" class="mod-card">
         <div class="table">
           <div class="table-row with-columns table-head">
             <div class="table-cell table-text download-cell" />
diff --git a/apps/app-frontend/src/components/ui/ProjectCard.vue b/apps/app-frontend/src/components/ui/ProjectCard.vue
index c886cc979..6f13772bb 100644
--- a/apps/app-frontend/src/components/ui/ProjectCard.vue
+++ b/apps/app-frontend/src/components/ui/ProjectCard.vue
@@ -6,10 +6,8 @@ import { computed, ref } from 'vue'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import { useRouter } from 'vue-router'
-import { useFetch } from '@/helpers/fetch.js'
-import { list } from '@/helpers/profile.js'
-import { handleError } from '@/store/notifications.js'
-import { install as pack_install } from '@/helpers/pack.js'
+import { install as installVersion } from '@/store/install.js'
+
 dayjs.extend(relativeTime)
 
 const router = useRouter()
@@ -22,18 +20,6 @@ const props = defineProps({
       return {}
     },
   },
-  confirmModal: {
-    type: Object,
-    default() {
-      return {}
-    },
-  },
-  modInstallModal: {
-    type: Object,
-    default() {
-      return {}
-    },
-  },
 })
 
 const toColor = computed(() => {
@@ -65,40 +51,9 @@ const toTransparent = computed(() => {
 const install = async (e) => {
   e?.stopPropagation()
   installing.value = true
-  const versions = await useFetch(
-    `https://api.modrinth.com/v2/project/${props.project.project_id}/version`,
-    'project versions',
-  )
-
-  if (props.project.project_type === 'modpack') {
-    const packs = Object.values(await list(true).catch(handleError))
-
-    if (
-      packs.length === 0 ||
-      !packs
-        .map((value) => value.metadata)
-        .find((pack) => pack.linked_data?.project_id === props.project.project_id)
-    ) {
-      installing.value = true
-      await pack_install(
-        props.project.project_id,
-        versions[0].id,
-        props.project.title,
-        props.project.icon_url,
-      ).catch(handleError)
-      installing.value = false
-    } else
-      props.confirmModal.show(
-        props.project.project_id,
-        versions[0].id,
-        props.project.title,
-        props.project.icon_url,
-      )
-  } else {
-    props.modInstallModal.show(props.project.project_id, versions)
-  }
-
-  installing.value = false
+  await installVersion(props.project.project_id, null, props.instance.path, 'ProjectCard', () => {
+    installing.value = false
+  })
 }
 </script>
 
diff --git a/apps/app-frontend/src/components/ui/RunningAppBar.vue b/apps/app-frontend/src/components/ui/RunningAppBar.vue
index 91372bcfd..ef5248373 100644
--- a/apps/app-frontend/src/components/ui/RunningAppBar.vue
+++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue
@@ -23,7 +23,7 @@
       <span class="circle running" />
       <div ref="profileButton" class="running-text">
         <router-link :to="`/instance/${encodeURIComponent(selectedProfile.path)}`">
-          {{ selectedProfile.metadata.name }}
+          {{ selectedProfile.name }}
         </router-link>
         <div
           v-if="currentProcesses.length > 1"
@@ -80,7 +80,7 @@
         class="profile-button"
         @click="selectProfile(profile)"
       >
-        <div class="text"><span class="circle running" /> {{ profile.metadata.name }}</div>
+        <div class="text"><span class="circle running" /> {{ profile.name }}</div>
         <Button
           v-tooltip="'Stop instance'"
           icon-only
@@ -136,13 +136,11 @@ const offline = ref(await isOffline().catch(handleError))
 const refreshInternet = async () => {
   offline.value = await refreshOffline().catch(handleError)
 }
-
-const unlistenProcess = await process_listener(async () => {
-  await refresh()
-})
-
 const unlistenRefresh = await offline_listener(async (b) => {
   offline.value = b
+})
+
+const unlistenProcess = await process_listener(async () => {
   await refresh()
 })
 
@@ -159,8 +157,8 @@ const stop = async (path) => {
     await killProfile(processes[0])
 
     mixpanel_track('InstanceStop', {
-      loader: currentProcesses.value[0].metadata.loader,
-      game_version: currentProcesses.value[0].metadata.game_version,
+      loader: currentProcesses.value[0].loader,
+      game_version: currentProcesses.value[0].game_version,
       source: 'AppBar',
     })
   } catch (e) {
@@ -182,8 +180,8 @@ const refreshInfo = async () => {
       if (x.bar_type.type === 'java_download') {
         x.title = 'Downloading Java ' + x.bar_type.version
       }
-      if (x.bar_type.profile_name) {
-        x.title = x.bar_type.profile_name
+      if (x.bar_type.profile_path) {
+        x.title = x.bar_type.profile_path
       }
       if (x.bar_type.pack_name) {
         x.title = x.bar_type.pack_name
diff --git a/apps/app-frontend/src/components/ui/SearchCard.vue b/apps/app-frontend/src/components/ui/SearchCard.vue
index 6b8e9beeb..4c17ca5c2 100644
--- a/apps/app-frontend/src/components/ui/SearchCard.vue
+++ b/apps/app-frontend/src/components/ui/SearchCard.vue
@@ -69,12 +69,7 @@ import { formatNumber, formatCategory } from '@modrinth/utils'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import { ref } from 'vue'
-import { add_project_from_version as installMod, list } from '@/helpers/profile.js'
-import { install as packInstall } from '@/helpers/pack.js'
-import { installVersionDependencies } from '@/helpers/utils.js'
-import { useFetch } from '@/helpers/fetch.js'
-import { handleError } from '@/store/notifications.js'
-import { mixpanel_track } from '@/helpers/mixpanel'
+import { install as installVersion } from '@/store/install.js'
 dayjs.extend(relativeTime)
 
 const props = defineProps({
@@ -94,18 +89,6 @@ const props = defineProps({
     type: Object,
     default: null,
   },
-  confirmModal: {
-    type: Object,
-    default: null,
-  },
-  modInstallModal: {
-    type: Object,
-    default: null,
-  },
-  incompatibilityWarningModal: {
-    type: Object,
-    default: null,
-  },
   featured: {
     type: Boolean,
     default: false,
@@ -123,93 +106,19 @@ const installed = ref(props.installed)
 
 async function install() {
   installing.value = true
-  const versions = await useFetch(
-    `https://api.modrinth.com/v2/project/${props.project.project_id}/version`,
-    'project versions',
-  )
-  let queuedVersionData
-
-  if (!props.instance) {
-    queuedVersionData = versions[0]
-  } else {
-    queuedVersionData = versions.find(
-      (v) =>
-        v.game_versions.includes(props.instance.metadata.game_version) &&
-        (props.project.project_type !== 'mod' ||
-          v.loaders.includes(props.instance.metadata.loader)),
-    )
-  }
-
-  if (props.project.project_type === 'modpack') {
-    const packs = Object.values(await list().catch(handleError))
-    if (
-      packs.length === 0 ||
-      !packs
-        .map((value) => value.metadata)
-        .find((pack) => pack.linked_data?.project_id === props.project.project_id)
-    ) {
-      await packInstall(
-        props.project.project_id,
-        queuedVersionData.id,
-        props.project.title,
-        props.project.icon_url,
-      ).catch(handleError)
-
-      mixpanel_track('PackInstall', {
-        id: props.project.project_id,
-        version_id: queuedVersionData.id,
-        title: props.project.title,
-        source: 'SearchCard',
-      })
-    } else {
-      props.confirmModal.show(
-        props.project.project_id,
-        queuedVersionData.id,
-        props.project.title,
-        props.project.icon_url,
-      )
-    }
-  } else {
-    if (props.instance) {
-      if (!queuedVersionData) {
-        props.incompatibilityWarningModal.show(
-          props.instance,
-          props.project.title,
-          versions,
-          () => (installed.value = true),
-          props.project.project_id,
-          props.project.project_type,
-        )
-        installing.value = false
-        return
-      } else {
-        await installMod(props.instance.path, queuedVersionData.id).catch(handleError)
-        await installVersionDependencies(props.instance, queuedVersionData)
-
-        mixpanel_track('ProjectInstall', {
-          loader: props.instance.metadata.loader,
-          game_version: props.instance.metadata.game_version,
-          id: props.project.project_id,
-          project_type: props.project.project_type,
-          version_id: queuedVersionData.id,
-          title: props.project.title,
-          source: 'SearchCard',
-        })
-      }
-    } else {
-      props.modInstallModal.show(
-        props.project.project_id,
-        versions,
-        props.project.title,
-        props.project.project_type,
-      )
+  await installVersion(
+    props.project.project_id,
+    null,
+    props.instance ? props.instance.path : null,
+    'SearchCard',
+    (version) => {
       installing.value = false
-      return
-    }
-    if (props.instance) installed.value = true
-  }
 
-  installing.value = false
+      if (props.instance && version) {
+        installed.value = true
+      }
+    },
+  )
 }
 </script>
 
diff --git a/apps/app-frontend/src/components/ui/URLConfirmModal.vue b/apps/app-frontend/src/components/ui/URLConfirmModal.vue
index c3d8fad83..7d47d9d1d 100644
--- a/apps/app-frontend/src/components/ui/URLConfirmModal.vue
+++ b/apps/app-frontend/src/components/ui/URLConfirmModal.vue
@@ -1,77 +1,37 @@
 <script setup>
 import { Modal, Button } from '@modrinth/ui'
 import { ref } from 'vue'
-import { useFetch } from '@/helpers/fetch.js'
 import SearchCard from '@/components/ui/SearchCard.vue'
 import { get_categories } from '@/helpers/tags.js'
 import { handleError } from '@/store/notifications.js'
-import { install as packInstall } from '@/helpers/pack.js'
-import mixpanel from 'mixpanel-browser'
-import ModInstallModal from '@/components/ui/ModInstallModal.vue'
+import { get_version, get_project } from '@/helpers/cache.js'
+import { install as installVersion } from '@/store/install.js'
 
 const confirmModal = ref(null)
 const project = ref(null)
 const version = ref(null)
 const categories = ref(null)
 const installing = ref(false)
-const modInstallModal = ref(null)
 
 defineExpose({
   async show(event) {
     if (event.event === 'InstallVersion') {
-      version.value = await useFetch(
-        `https://api.modrinth.com/v2/version/${encodeURIComponent(event.id)}`,
-        'version',
-      )
-      project.value = await useFetch(
-        `https://api.modrinth.com/v2/project/${encodeURIComponent(version.value.project_id)}`,
-        'project',
-      )
+      version.value = await get_version(event.id).catch(handleError)
+      project.value = await get_project(version.value.project_id).catch(handleError)
     } else {
-      project.value = await useFetch(
-        `https://api.modrinth.com/v2/project/${encodeURIComponent(event.id)}`,
-        'project',
-      )
-      version.value = await useFetch(
-        `https://api.modrinth.com/v2/version/${encodeURIComponent(project.value.versions[0])}`,
-        'version',
-      )
+      project.value = await get_project(event.id).catch(handleError)
+      version.value = await get_version(project.value.versions[0]).catch(handleError)
     }
     categories.value = (await get_categories().catch(handleError)).filter(
       (cat) => project.value.categories.includes(cat.name) && cat.project_type === 'mod',
     )
     confirmModal.value.show()
-    categories.value = (await get_categories().catch(handleError)).filter(
-      (cat) => project.value.categories.includes(cat.name) && cat.project_type === 'mod',
-    )
-    confirmModal.value.show()
   },
 })
 
 async function install() {
   confirmModal.value.hide()
-  if (project.value.project_type === 'modpack') {
-    await packInstall(
-      project.value.id,
-      version.value.id,
-      project.value.title,
-      project.value.icon_url,
-    ).catch(handleError)
-
-    mixpanel.track('PackInstall', {
-      id: project.value.id,
-      version_id: version.value.id,
-      title: project.value.title,
-      source: 'ProjectPage',
-    })
-  } else {
-    modInstallModal.value.show(
-      project.value.id,
-      [version.value],
-      project.value.title,
-      project.value.project_type,
-    )
-  }
+  await installVersion(project.value.id, version.value.id, null, 'URLConfirmModal')
 }
 </script>
 
@@ -96,7 +56,6 @@ async function install() {
       </div>
     </div>
   </Modal>
-  <ModInstallModal ref="modInstallModal" />
 </template>
 
 <style scoped lang="scss">
diff --git a/apps/app-frontend/src/components/ui/IncompatibilityWarningModal.vue b/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue
similarity index 81%
rename from apps/app-frontend/src/components/ui/IncompatibilityWarningModal.vue
rename to apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue
index 8fb0090ae..d78bcae39 100644
--- a/apps/app-frontend/src/components/ui/IncompatibilityWarningModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue
@@ -3,6 +3,7 @@
     ref="incompatibleModal"
     header="Incompatibility warning"
     :noblur="!themeStore.advancedRendering"
+    :on-hide="onInstall"
   >
     <div class="modal-body">
       <p>
@@ -12,13 +13,11 @@
       </p>
       <table>
         <tr class="header">
-          <th>{{ instance?.metadata.name }}</th>
-          <th>{{ projectTitle }}</th>
+          <th>{{ instance?.name }}</th>
+          <th>{{ project.title }}</th>
         </tr>
         <tr class="content">
-          <td class="data">
-            {{ instance?.metadata.loader }} {{ instance?.metadata.game_version }}
-          </td>
+          <td class="data">{{ instance?.loader }} {{ instance?.game_version }}</td>
           <td>
             <DropdownSelect
               v-if="versions?.length > 1"
@@ -68,34 +67,25 @@ const themeStore = useTheming()
 
 const instance = ref(null)
 const project = ref(null)
-const projectType = ref(null)
-const projectTitle = ref(null)
 const versions = ref(null)
 const selectedVersion = ref(null)
 const incompatibleModal = ref(null)
 const installing = ref(false)
 
-let markInstalled = () => {}
+let onInstall = ref(() => {})
 
 defineExpose({
-  show: (
-    instanceVal,
-    projectTitleVal,
-    selectedVersions,
-    extMarkInstalled,
-    projectIdVal,
-    projectTypeVal,
-  ) => {
+  show: (instanceVal, projectVal, projectVersions, callback) => {
     instance.value = instanceVal
-    projectTitle.value = projectTitleVal
-    versions.value = selectedVersions
-    selectedVersion.value = selectedVersions[0]
+    versions.value = projectVersions
+    selectedVersion.value = projectVersions[0]
+
+    project.value = projectVal
 
-    project.value = projectIdVal
-    projectType.value = projectTypeVal
+    onInstall.value = callback
+    installing.value = false
 
     incompatibleModal.value.show()
-    markInstalled = extMarkInstalled
 
     mixpanel_track('ProjectInstallStart', { source: 'ProjectIncompatibilityWarningModal' })
   },
@@ -105,16 +95,16 @@ const install = async () => {
   installing.value = true
   await installMod(instance.value.path, selectedVersion.value.id).catch(handleError)
   installing.value = false
-  markInstalled()
+  onInstall.value(selectedVersion.value.id)
   incompatibleModal.value.hide()
 
   mixpanel_track('ProjectInstall', {
-    loader: instance.value.metadata.loader,
-    game_version: instance.value.metadata.game_version,
+    loader: instance.value.loader,
+    game_version: instance.value.game_version,
     id: project.value,
     version_id: selectedVersion.value.id,
-    project_type: projectType.value,
-    title: projectTitle.value,
+    project_type: project.value.project_type,
+    title: project.value.title,
     source: 'ProjectIncompatibilityWarningModal',
   })
 }
diff --git a/apps/app-frontend/src/components/ui/InstallConfirmModal.vue b/apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue
similarity index 68%
rename from apps/app-frontend/src/components/ui/InstallConfirmModal.vue
rename to apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue
index f68ddbeb8..3d36a9be8 100644
--- a/apps/app-frontend/src/components/ui/InstallConfirmModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue
@@ -9,47 +9,55 @@ import { handleError } from '@/store/state.js'
 
 const themeStore = useTheming()
 
-const version = ref('')
-const title = ref('')
-const projectId = ref('')
-const icon = ref('')
+const versionId = ref()
+const project = ref()
 const confirmModal = ref(null)
 const installing = ref(false)
 
+let onInstall = ref(() => {})
+
 defineExpose({
-  show: (projectIdVal, versionId, projectTitle, projectIcon) => {
-    projectId.value = projectIdVal
-    version.value = versionId
-    title.value = projectTitle
-    icon.value = projectIcon
+  show: (projectVal, versionIdVal, callback) => {
+    project.value = projectVal
+    versionId.value = versionIdVal
     installing.value = false
     confirmModal.value.show()
 
+    onInstall.value = callback
+
     mixpanel_track('PackInstallStart')
   },
 })
 
 async function install() {
   installing.value = true
-  console.log(`Installing ${projectId.value} ${version.value} ${title.value} ${icon.value}`)
   confirmModal.value.hide()
+
   await pack_install(
-    projectId.value,
-    version.value,
-    title.value,
-    icon.value ? icon.value : null,
+    project.value.id,
+    versionId.value,
+    project.value.title,
+    project.value.icon_url,
   ).catch(handleError)
   mixpanel_track('PackInstall', {
-    id: projectId.value,
-    version_id: version.value,
-    title: title.value,
+    id: project.value.id,
+    version_id: versionId.value,
+    title: project.value.title,
     source: 'ConfirmModal',
   })
+
+  onInstall.value(versionId.value)
+  installing.value = false
 }
 </script>
 
 <template>
-  <Modal ref="confirmModal" header="Are you sure?" :noblur="!themeStore.advancedRendering">
+  <Modal
+    ref="confirmModal"
+    header="Are you sure?"
+    :noblur="!themeStore.advancedRendering"
+    :on-hide="onInstall"
+  >
     <div class="modal-body">
       <p>You already have this modpack installed. Are you sure you want to install it again?</p>
       <div class="input-group push-right">
diff --git a/apps/app-frontend/src/components/ui/ModInstallModal.vue b/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue
similarity index 75%
rename from apps/app-frontend/src/components/ui/ModInstallModal.vue
rename to apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue
index ab87b101e..97fb639dd 100644
--- a/apps/app-frontend/src/components/ui/ModInstallModal.vue
+++ b/apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue
@@ -14,10 +14,10 @@ import {
   check_installed,
   get,
   list,
+  create,
 } from '@/helpers/profile'
 import { open } from '@tauri-apps/api/dialog'
-import { create } from '@/helpers/profile'
-import { installVersionDependencies } from '@/helpers/utils'
+import { installVersionDependencies } from '@/store/install.js'
 import { handleError } from '@/store/notifications.js'
 import { mixpanel_track } from '@/helpers/mixpanel'
 import { useTheming } from '@/store/theme.js'
@@ -27,13 +27,12 @@ import { tauri } from '@tauri-apps/api'
 const themeStore = useTheming()
 const router = useRouter()
 
-const versions = ref([])
-const project = ref('')
-const projectTitle = ref('')
-const projectType = ref('')
+const versions = ref()
+const project = ref()
 
-const installModal = ref(null)
+const installModal = ref()
 const searchFilter = ref('')
+
 const showCreation = ref(false)
 const icon = ref(null)
 const name = ref(null)
@@ -42,33 +41,65 @@ const loader = ref(null)
 const gameVersion = ref(null)
 const creatingInstance = ref(false)
 
-defineExpose({
-  show: async (projectId, selectedVersions, title, type) => {
-    project.value = projectId
-    versions.value = selectedVersions
-    projectTitle.value = title
-    projectType.value = type
+const profiles = ref([])
 
-    installModal.value.show()
+const shownProfiles = computed(() =>
+  profiles.value
+    .filter((profile) => {
+      return profile.name.toLowerCase().includes(searchFilter.value.toLowerCase())
+    })
+    .filter((profile) => {
+      let loaders = versions.value.flatMap((v) => v.loaders)
+
+      return (
+        versions.value.flatMap((v) => v.game_versions).includes(profile.game_version) &&
+        (project.value.project_type === 'mod'
+          ? loaders.includes(profile.loader) || loaders.includes('minecraft')
+          : true)
+      )
+    }),
+)
+
+let onInstall = ref(() => {})
+
+defineExpose({
+  show: async (projectVal, versionsVal, callback) => {
+    project.value = projectVal
+    versions.value = versionsVal
     searchFilter.value = ''
 
-    profiles.value = await getData()
+    showCreation.value = false
+    name.value = null
+    icon.value = null
+    display_icon.value = null
+    gameVersion.value = null
+    loader.value = null
+
+    onInstall.value = callback
+
+    const profilesVal = await list(true).then(Object.values).catch(handleError)
+    for (let profile of profilesVal) {
+      profile.installing = false
+      profile.installedMod = await check_installed(profile.path, project.value.id).catch(
+        handleError,
+      )
+    }
+    profiles.value = profilesVal
+
+    installModal.value.show()
 
     mixpanel_track('ProjectInstallStart', { source: 'ProjectInstallModal' })
   },
 })
 
-const profiles = ref([])
-
 async function install(instance) {
   instance.installing = true
   const version = versions.value.find((v) => {
     return (
-      v.game_versions.includes(instance.metadata.game_version) &&
-      (v.loaders.includes(instance.metadata.loader) ||
-        v.loaders.includes('minecraft') ||
-        v.loaders.includes('iris') ||
-        v.loaders.includes('optifine'))
+      v.game_versions.includes(instance.game_version) &&
+      (project.value.project_type === 'mod'
+        ? v.loaders.includes(instance.loader) || v.loaders.includes('minecraft')
+        : true)
     )
   })
 
@@ -85,45 +116,18 @@ async function install(instance) {
   instance.installing = false
 
   mixpanel_track('ProjectInstall', {
-    loader: instance.metadata.loader,
-    game_version: instance.metadata.game_version,
-    id: project.value,
+    loader: instance.loader,
+    game_version: instance.game_version,
+    id: project.value.id,
     version_id: version.id,
-    project_type: projectType.value,
-    title: projectTitle.value,
+    project_type: project.value.project_type,
+    title: project.value.title,
     source: 'ProjectInstallModal',
   })
-}
-
-async function getData() {
-  const projects = await list(true).then(Object.values).catch(handleError)
 
-  const filtered = projects
-    .filter((profile) => {
-      return profile.metadata.name.toLowerCase().includes(searchFilter.value.toLowerCase())
-    })
-    .filter((profile) => {
-      return (
-        versions.value.flatMap((v) => v.game_versions).includes(profile.metadata.game_version) &&
-        versions.value
-          .flatMap((v) => v.loaders)
-          .some(
-            (value) =>
-              value === profile.metadata.loader ||
-              ['minecraft', 'iris', 'optifine'].includes(value),
-          )
-      )
-    })
-
-  for (let profile of filtered) {
-    profile.installing = false
-    profile.installedMod = await check_installed(profile.path, project.value).catch(handleError)
-  }
-
-  return filtered
+  onInstall.value(version.id)
 }
 
-const alreadySentCreation = ref(false)
 const toggleCreation = () => {
   showCreation.value = !showCreation.value
   name.value = null
@@ -132,8 +136,7 @@ const toggleCreation = () => {
   gameVersion.value = null
   loader.value = null
 
-  if (!alreadySentCreation.value) {
-    alreadySentCreation.value = false
+  if (showCreation.value) {
     mixpanel_track('InstanceCreateStart', { source: 'ProjectInstallModal' })
   }
 }
@@ -197,18 +200,16 @@ const createInstance = async () => {
     game_version: versions.value[0].game_versions[0],
     id: project.value,
     version_id: versions.value[0].id,
-    project_type: projectType.value,
-    title: projectTitle.value,
+    project_type: project.value.project_type,
+    title: project.value.title,
     source: 'ProjectInstallModal',
   })
 
+  onInstall.value(versions.value[0].id)
+
   if (installModal.value) installModal.value.hide()
   creatingInstance.value = false
 }
-
-const check_valid = computed(() => {
-  return name.value
-})
 </script>
 
 <template>
@@ -216,6 +217,7 @@ const check_valid = computed(() => {
     ref="installModal"
     header="Install project to instance"
     :noblur="!themeStore.advancedRendering"
+    :on-hide="onInstall"
   >
     <div class="modal-body">
       <input
@@ -226,34 +228,27 @@ const check_valid = computed(() => {
         placeholder="Search for an instance"
       />
       <div class="profiles" :class="{ 'hide-creation': !showCreation }">
-        <div v-for="profile in profiles" :key="profile.metadata.name" class="option">
+        <div v-for="profile in shownProfiles" :key="profile.name" class="option">
           <Button
             color="raised"
             class="profile-button"
             @click="$router.push(`/instance/${encodeURIComponent(profile.path)}`)"
           >
             <Avatar
-              :src="
-                !profile.metadata.icon ||
-                (profile.metadata.icon && profile.metadata.icon.startsWith('http'))
-                  ? profile.metadata.icon
-                  : tauri.convertFileSrc(profile.metadata?.icon)
-              "
+              :src="profile.icon_path ? tauri.convertFileSrc(profile.icon_url) : null"
               class="profile-image"
             />
-            {{ profile.metadata.name }}
+            {{ profile.name }}
           </Button>
           <div
             v-tooltip="
-              profile.metadata.linked_data?.locked && !profile.installedMod
+              profile.linked_data?.locked && !profile.installedMod
                 ? 'Unpair or unlock an instance to add mods.'
                 : ''
             "
           >
             <Button
-              :disabled="
-                profile.installedMod || profile.installing || profile.metadata.linked_data?.locked
-              "
+              :disabled="profile.installedMod || profile.installing || profile.linked_data?.locked"
               @click="install(profile)"
             >
               <DownloadIcon v-if="!profile.installedMod && !profile.installing" />
@@ -263,7 +258,7 @@ const check_valid = computed(() => {
                   ? 'Installing...'
                   : profile.installedMod
                     ? 'Installed'
-                    : profile.metadata.linked_data && profile.metadata.linked_data.locked
+                    : profile.linked_data && profile.linked_data.locked
                       ? 'Paired'
                       : 'Install'
               }}
@@ -294,7 +289,7 @@ const check_valid = computed(() => {
               placeholder="Name"
               class="creation-input"
             />
-            <Button :disabled="creatingInstance === true || !check_valid" @click="createInstance()">
+            <Button :disabled="creatingInstance === true || !name" @click="createInstance()">
               <RightArrowIcon />
               {{ creatingInstance ? 'Creating...' : 'Create' }}
             </Button>
diff --git a/apps/app-frontend/src/components/ui/tutorial/OnboardingScreen.vue b/apps/app-frontend/src/components/ui/tutorial/OnboardingScreen.vue
index ab71c108f..ae694c409 100644
--- a/apps/app-frontend/src/components/ui/tutorial/OnboardingScreen.vue
+++ b/apps/app-frontend/src/components/ui/tutorial/OnboardingScreen.vue
@@ -34,7 +34,7 @@ const prevPage = () => {
 const finishOnboarding = async () => {
   mixpanel.track('OnboardingFinish')
   const settings = await get()
-  settings.fully_onboarded = true
+  settings.onboarded = true
   await set(settings)
   props.finish()
 }
diff --git a/apps/app-frontend/src/helpers/cache.js b/apps/app-frontend/src/helpers/cache.js
new file mode 100644
index 000000000..efe0448ae
--- /dev/null
+++ b/apps/app-frontend/src/helpers/cache.js
@@ -0,0 +1,41 @@
+import { invoke } from '@tauri-apps/api/tauri'
+
+export async function get_project(id) {
+  return await invoke('plugin:cache|get_project', { id })
+}
+
+export async function get_project_many(ids) {
+  return await invoke('plugin:cache|get_project_many', { ids })
+}
+
+export async function get_version(id) {
+  return await invoke('plugin:cache|get_version', { id })
+}
+
+export async function get_version_many(ids) {
+  return await invoke('plugin:cache|get_version_many', { ids })
+}
+
+export async function get_user(id) {
+  return await invoke('plugin:cache|get_user', { id })
+}
+
+export async function get_user_many(ids) {
+  return await invoke('plugin:cache|get_user_many', { ids })
+}
+
+export async function get_team(id) {
+  return await invoke('plugin:cache|get_team', { id })
+}
+
+export async function get_team_many(ids) {
+  return await invoke('plugin:cache|get_team_many', { ids })
+}
+
+export async function get_organization(id) {
+  return await invoke('plugin:cache|get_organization', { id })
+}
+
+export async function get_organization_many(ids) {
+  return await invoke('plugin:cache|get_organization_many', { ids })
+}
diff --git a/apps/app-frontend/src/helpers/metadata.js b/apps/app-frontend/src/helpers/metadata.js
index ae64baa51..6f2c15be1 100644
--- a/apps/app-frontend/src/helpers/metadata.js
+++ b/apps/app-frontend/src/helpers/metadata.js
@@ -6,34 +6,8 @@ export async function get_game_versions() {
   return await invoke('plugin:metadata|metadata_get_game_versions')
 }
 
-// Gets the fabric versions from daedalus
+// Gets the given loader versions from daedalus
 // Returns Manifest
-export async function get_fabric_versions() {
-  const c = await invoke('plugin:metadata|metadata_get_fabric_versions')
-  console.log('Getting fabric versions', c)
-  return c
-}
-
-// Gets the forge versions from daedalus
-// Returns Manifest
-export async function get_forge_versions() {
-  const c = await invoke('plugin:metadata|metadata_get_forge_versions')
-  console.log('Getting forge versions', c)
-  return c
-}
-
-// Gets the quilt versions from daedalus
-// Returns Manifest
-export async function get_quilt_versions() {
-  const c = await invoke('plugin:metadata|metadata_get_quilt_versions')
-  console.log('Getting quilt versions', c)
-  return c
-}
-
-// Gets the neoforge versions from daedalus
-// Returns Manifest
-export async function get_neoforge_versions() {
-  const c = await invoke('plugin:metadata|metadata_get_neoforge_versions')
-  console.log('Getting neoforge versions', c)
-  return c
+export async function get_loader_versions(loader) {
+  return await invoke('plugin:metadata|metadata_get_loader_versions', { loader })
 }
diff --git a/apps/app-frontend/src/helpers/pack.js b/apps/app-frontend/src/helpers/pack.js
index a6f3f06cf..d1ae241d2 100644
--- a/apps/app-frontend/src/helpers/pack.js
+++ b/apps/app-frontend/src/helpers/pack.js
@@ -21,7 +21,8 @@ export async function install(projectId, versionId, packTitle, iconUrl) {
     profile_creator.gameVersion,
     profile_creator.modloader,
     profile_creator.loaderVersion,
-    profile_creator.icon,
+    null,
+    true,
   )
 
   return await invoke('plugin:pack|pack_install', { location, profile })
@@ -39,7 +40,8 @@ export async function install_from_file(path) {
     profile_creator.gameVersion,
     profile_creator.modloader,
     profile_creator.loaderVersion,
-    profile_creator.icon,
+    null,
+    true,
   )
   return await invoke('plugin:pack|pack_install', { location, profile })
 }
diff --git a/apps/app-frontend/src/helpers/profile.js b/apps/app-frontend/src/helpers/profile.js
index b709f2edc..96dd722dd 100644
--- a/apps/app-frontend/src/helpers/profile.js
+++ b/apps/app-frontend/src/helpers/profile.js
@@ -16,7 +16,7 @@ import { invoke } from '@tauri-apps/api/tauri'
     - icon is a path to an image file, which will be copied into the profile directory
 */
 
-export async function create(name, gameVersion, modloader, loaderVersion, icon, noWatch) {
+export async function create(name, gameVersion, modloader, loaderVersion, iconPath, skipInstall) {
   //Trim string name to avoid "Unable to find directory"
   name = name.trim()
   return await invoke('plugin:profile_create|profile_create', {
@@ -24,8 +24,8 @@ export async function create(name, gameVersion, modloader, loaderVersion, icon,
     gameVersion,
     modloader,
     loaderVersion,
-    icon,
-    noWatch,
+    iconPath,
+    skipInstall,
   })
 }
 
@@ -41,8 +41,14 @@ export async function remove(path) {
 
 // Get a profile by path
 // Returns a Profile
-export async function get(path, clearProjects) {
-  return await invoke('plugin:profile|profile_get', { path, clearProjects })
+export async function get(path) {
+  return await invoke('plugin:profile|profile_get', { path })
+}
+
+// Get a profile's projects
+// Returns a map of a path to profile file
+export async function get_projects(path) {
+  return await invoke('plugin:profile|profile_get_projects', { path })
 }
 
 // Get a profile's full fs path
diff --git a/apps/app-frontend/src/helpers/state.js b/apps/app-frontend/src/helpers/state.js
index 9a246f0b4..d28671851 100644
--- a/apps/app-frontend/src/helpers/state.js
+++ b/apps/app-frontend/src/helpers/state.js
@@ -16,11 +16,6 @@ export async function progress_bars_list() {
   return await invoke('plugin:utils|progress_bars_list')
 }
 
-// Check if any safe loading bars are active
-export async function check_safe_loading_bars_complete() {
-  return await invoke('plugin:utils|safety_check_safe_loading_bars')
-}
-
 // Get opening command
 // For example, if a user clicks on an .mrpack to open the app.
 // This should be called once and only when the app is done booting up and ready to receive a command
@@ -28,8 +23,3 @@ export async function check_safe_loading_bars_complete() {
 export async function get_opening_command() {
   return await invoke('plugin:utils|get_opening_command')
 }
-
-// Wait for settings to sync
-export async function await_sync() {
-  return await invoke('plugin:utils|await_sync')
-}
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index 08d63bc0a..49757ee6e 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -49,40 +49,6 @@ export const releaseColor = (releaseType) => {
   }
 }
 
-export const installVersionDependencies = async (profile, version) => {
-  for (const dep of version.dependencies) {
-    if (dep.dependency_type !== 'required') continue
-    // disallow fabric api install on quilt
-    if (dep.project_id === 'P7dR8mSH' && profile.metadata.loader === 'quilt') continue
-    if (dep.version_id) {
-      if (
-        dep.project_id &&
-        (await check_installed(profile.path, dep.project_id).catch(handleError))
-      )
-        continue
-      await installMod(profile.path, dep.version_id)
-    } else {
-      if (
-        dep.project_id &&
-        (await check_installed(profile.path, dep.project_id).catch(handleError))
-      )
-        continue
-      const depVersions = await useFetch(
-        `https://api.modrinth.com/v2/project/${dep.project_id}/version`,
-        'dependency versions',
-      )
-      const latest = depVersions.find(
-        (v) =>
-          v.game_versions.includes(profile.metadata.game_version) &&
-          v.loaders.includes(profile.metadata.loader),
-      )
-      if (latest) {
-        await installMod(profile.path, latest.id).catch(handleError)
-      }
-    }
-  }
-}
-
 export const openLink = (url) => {
   window.__TAURI_INVOKE__('tauri', {
     __tauriModule: 'Shell',
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index 1adad933c..723efbb8a 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -10,6 +10,7 @@ import {
   NavRow,
   Card,
   SearchFilter,
+  Avatar,
 } from '@modrinth/ui'
 import { formatCategoryHeader, formatCategory } from '@modrinth/utils'
 import Multiselect from 'vue-multiselect'
@@ -17,14 +18,15 @@ import { handleError } from '@/store/state'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
 import { get_categories, get_loaders, get_game_versions } from '@/helpers/tags'
 import { useRoute, useRouter } from 'vue-router'
-import { Avatar } from '@modrinth/ui'
 import SearchCard from '@/components/ui/SearchCard.vue'
-import InstallConfirmModal from '@/components/ui/InstallConfirmModal.vue'
-import ModInstallModal from '@/components/ui/ModInstallModal.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
-import IncompatibilityWarningModal from '@/components/ui/IncompatibilityWarningModal.vue'
 import { useFetch } from '@/helpers/fetch.js'
-import { check_installed, get, get as getInstance } from '@/helpers/profile.js'
+import {
+  check_installed,
+  get,
+  get as getInstance,
+  get_projects as getInstanceProjects,
+} from '@/helpers/profile.js'
 import { convertFileSrc } from '@tauri-apps/api/tauri'
 import { isOffline } from '@/helpers/utils'
 import { offline_listener } from '@/helpers/events'
@@ -37,10 +39,6 @@ const unlistenOffline = await offline_listener((b) => {
   offline.value = b
 })
 
-const confirmModal = ref(null)
-const modInstallModal = ref(null)
-const incompatibilityWarningModal = ref(null)
-
 const breadcrumbs = useBreadcrumbs()
 breadcrumbs.setContext({ name: 'Browse', link: route.path, query: route.query })
 
@@ -65,6 +63,7 @@ const maxResults = ref(20)
 const currentPage = ref(1)
 const projectType = ref(route.params.projectType)
 const instanceContext = ref(null)
+const instanceProjects = ref(null)
 const ignoreInstanceLoaders = ref(false)
 const ignoreInstanceGameVersions = ref(false)
 
@@ -88,7 +87,10 @@ if (route.query.il) {
   ignoreInstanceLoaders.value = route.query.il === 'true'
 }
 if (route.query.i) {
-  instanceContext.value = await getInstance(route.query.i, true)
+  ;[instanceContext.value, instanceProjects.value] = await Promise.all([
+    getInstance(route.query.i).catch(handleError),
+    getInstanceProjects(route.query.i).catch(handleError),
+  ])
 }
 if (route.query.q) {
   query.value = route.query.q
@@ -152,10 +154,10 @@ async function refreshSearch() {
   }
   if (instanceContext.value) {
     if (!ignoreInstanceLoaders.value && projectType.value === 'mod') {
-      orFacets.value = [`categories:${encodeURIComponent(instanceContext.value.metadata.loader)}`]
+      orFacets.value = [`categories:${encodeURIComponent(instanceContext.value.loader)}`]
     }
     if (!ignoreInstanceGameVersions.value) {
-      selectedVersions.value = [instanceContext.value.metadata.game_version]
+      selectedVersions.value = [instanceContext.value.game_version]
     }
   }
   if (
@@ -224,11 +226,10 @@ async function refreshSearch() {
     }
 
     if (hideAlreadyInstalled.value) {
-      const installedMods = await get(instanceContext.value.path, false).then((x) =>
-        Object.values(x.projects)
-          .filter((x) => x.metadata.project)
-          .map((x) => x.metadata.project.id),
-      )
+      const installedMods = Object.values(instanceProjects.value)
+        .filter((x) => x.metadata.type === 'modrinth')
+        .map((x) => x.metadata.project_id)
+
       installedMods.map((x) => [`project_id != ${x}`]).forEach((x) => formattedFacets.push(x))
       console.log(`facets=${JSON.stringify(formattedFacets)}`)
     }
@@ -258,8 +259,8 @@ async function refreshSearch() {
   }
   if (instanceContext.value) {
     for (val of rawResults.hits) {
-      val.installed = await check_installed(instanceContext.value.path, val.project_id).then(
-        (x) => (val.installed = x),
+      val.installed = Object.values(instanceProjects.value).some(
+        (x) => x.metadata.type === 'modrinth' && x.metadata.project_id === val.project_id,
       )
     }
   }
@@ -497,13 +498,13 @@ const selectableProjectTypes = computed(() => {
   if (instanceContext.value) {
     if (
       availableGameVersions.value.findIndex(
-        (x) => x.version === instanceContext.value.metadata.game_version,
+        (x) => x.version === instanceContext.value.game_version,
       ) <= availableGameVersions.value.findIndex((x) => x.version === '1.13')
     ) {
       values.unshift({ label: 'Data Packs', href: `/browse/datapack` })
     }
 
-    if (instanceContext.value.metadata.loader !== 'vanilla') {
+    if (instanceContext.value.loader !== 'vanilla') {
       values.unshift({ label: 'Mods', href: '/browse/mod' })
     }
   } else {
@@ -536,27 +537,19 @@ onUnmounted(() => unlistenOffline())
       <Card v-if="instanceContext" class="small-instance">
         <router-link :to="`/instance/${encodeURIComponent(instanceContext.path)}`" class="instance">
           <Avatar
-            :src="
-              !instanceContext.metadata.icon ||
-              (instanceContext.metadata.icon && instanceContext.metadata.icon.startsWith('http'))
-                ? instanceContext.metadata.icon
-                : convertFileSrc(instanceContext.metadata.icon)
-            "
-            :alt="instanceContext.metadata.name"
+            :src="instanceContext.icon_path ? convertFileSrc(instanceContext.icon_path) : null"
+            :alt="instanceContext.name"
             size="sm"
           />
           <div class="small-instance_info">
             <span class="title">{{
-              instanceContext.metadata.name.length > 20
-                ? instanceContext.metadata.name.substring(0, 20) + '...'
-                : instanceContext.metadata.name
+              instanceContext.name.length > 20
+                ? instanceContext.name.substring(0, 20) + '...'
+                : instanceContext.name
             }}</span>
             <span>
-              {{
-                instanceContext.metadata.loader.charAt(0).toUpperCase() +
-                instanceContext.metadata.loader.slice(1)
-              }}
-              {{ instanceContext.metadata.game_version }}
+              {{ instanceContext.loader.charAt(0).toUpperCase() + instanceContext.loader.slice(1) }}
+              {{ instanceContext.game_version }}
             </span>
           </div>
         </router-link>
@@ -758,9 +751,6 @@ onUnmounted(() => unlistenOffline())
                 loader.supported_project_types?.includes(projectType),
             ),
           ]"
-          :confirm-modal="confirmModal"
-          :mod-install-modal="modInstallModal"
-          :incompatibility-warning-modal="incompatibilityWarningModal"
           :installed="result.installed"
         />
       </section>
@@ -774,9 +764,6 @@ onUnmounted(() => unlistenOffline())
       <br />
     </div>
   </div>
-  <InstallConfirmModal ref="confirmModal" />
-  <ModInstallModal ref="modInstallModal" />
-  <IncompatibilityWarningModal ref="incompatibilityWarningModal" />
 </template>
 
 <style src="vue-multiselect/dist/vue-multiselect.css"></style>
diff --git a/apps/app-frontend/src/pages/Index.vue b/apps/app-frontend/src/pages/Index.vue
index 521bcf5a5..4b902cd23 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -26,13 +26,13 @@ const offline = ref(await isOffline())
 const getInstances = async () => {
   const profiles = await list(true).catch(handleError)
   recentInstances.value = Object.values(profiles).sort((a, b) => {
-    return dayjs(b.metadata.last_played ?? 0).diff(dayjs(a.metadata.last_played ?? 0))
+    return dayjs(b.last_played ?? 0).diff(dayjs(a.last_played ?? 0))
   })
 
   let filters = []
   for (const instance of recentInstances.value) {
-    if (instance.metadata.linked_data && instance.metadata.linked_data.project_id) {
-      filters.push(`NOT"project_id"="${instance.metadata.linked_data.project_id}"`)
+    if (instance.linked_data && instance.linked_data.project_id) {
+      filters.push(`NOT"project_id"="${instance.linked_data.project_id}"`)
     }
   }
   filter.value = filters.join(' AND ')
@@ -105,6 +105,7 @@ onUnmounted(() => {
           label: 'Jump back in',
           route: '/library',
           instances: recentInstances,
+          instance: true,
           downloaded: true,
         },
         {
diff --git a/apps/app-frontend/src/pages/Settings.vue b/apps/app-frontend/src/pages/Settings.vue
index f5f226609..8692714fb 100644
--- a/apps/app-frontend/src/pages/Settings.vue
+++ b/apps/app-frontend/src/pages/Settings.vue
@@ -22,8 +22,8 @@ const version = await getVersion()
 const accessSettings = async () => {
   const settings = await get()
 
-  settings.javaArgs = settings.custom_java_args.join(' ')
-  settings.envArgs = settings.custom_env_args.map((x) => x.join('=')).join(' ')
+  settings.launchArgs = settings.extra_launch_args.join(' ')
+  settings.envVars = settings.custom_env_vars.map((x) => x.join('=')).join(' ')
 
   return settings
 }
@@ -31,7 +31,7 @@ const accessSettings = async () => {
 const fetchSettings = await accessSettings().catch(handleError)
 
 const settings = ref(fetchSettings)
-const settingsDir = ref(settings.value.loaded_config_dir)
+// const settingsDir = ref(settings.value.loaded_config_dir)
 const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
 
 watch(
@@ -43,26 +43,26 @@ watch(
 
     const setSettings = JSON.parse(JSON.stringify(newSettings))
 
-    if (setSettings.opt_out_analytics) {
+    if (setSettings.telemetry) {
       mixpanel_opt_out_tracking()
     } else {
       mixpanel_opt_in_tracking()
     }
 
-    for (const [key, value] of Object.entries(setSettings.java_globals)) {
-      if (value?.path === '') {
-        value.path = undefined
-      }
-
-      if (value?.path) {
-        value.path = value.path.replace('java.exe', 'javaw.exe')
-      }
-
-      console.log(`${key}: ${value}`)
-    }
-
-    setSettings.custom_java_args = setSettings.javaArgs.trim().split(/\s+/).filter(Boolean)
-    setSettings.custom_env_args = setSettings.envArgs
+    // for (const [key, value] of Object.entries(setSettings.java_globals)) {
+    //   if (value?.path === '') {
+    //     value.path = undefined
+    //   }
+    //
+    //   if (value?.path) {
+    //     value.path = value.path.replace('java.exe', 'javaw.exe')
+    //   }
+    //
+    //   console.log(`${key}: ${value}`)
+    // }
+
+    setSettings.extra_launch_args = setSettings.launchArgs.trim().split(/\s+/).filter(Boolean)
+    setSettings.custom_env_vars = setSettings.envVars
       .trim()
       .split(/\s+/)
       .filter(Boolean)
@@ -96,31 +96,31 @@ async function signInAfter() {
   credentials.value = await getCreds().catch(handleError)
 }
 
-async function findLauncherDir() {
-  const newDir = await open({
-    multiple: false,
-    directory: true,
-    title: 'Select a new app directory',
-  })
-
-  const writeable = await is_dir_writeable(newDir)
-
-  if (!writeable) {
-    handleError('The selected directory does not have proper permissions for write access.')
-    return
-  }
-
-  if (newDir) {
-    settingsDir.value = newDir
-    await refreshDir()
-  }
-}
-
-async function refreshDir() {
-  await change_config_dir(settingsDir.value).catch(handleError)
-  settings.value = await accessSettings().catch(handleError)
-  settingsDir.value = settings.value.loaded_config_dir
-}
+// async function findLauncherDir() {
+//   const newDir = await open({
+//     multiple: false,
+//     directory: true,
+//     title: 'Select a new app directory',
+//   })
+//
+//   const writeable = await is_dir_writeable(newDir)
+//
+//   if (!writeable) {
+//     handleError('The selected directory does not have proper permissions for write access.')
+//     return
+//   }
+//
+//   if (newDir) {
+//     settingsDir.value = newDir
+//     await refreshDir()
+//   }
+// }
+//
+// async function refreshDir() {
+//   await change_config_dir(settingsDir.value).catch(handleError)
+//   settings.value = await accessSettings().catch(handleError)
+//   settingsDir.value = settings.value.loaded_config_dir
+// }
 </script>
 
 <template>
@@ -161,19 +161,19 @@ async function refreshDir() {
           The directory where the launcher stores all of its files.
         </span>
       </label>
-      <div class="app-directory">
-        <div class="iconified-input">
-          <BoxIcon />
-          <input id="appDir" v-model="settingsDir" type="text" class="input" />
-          <Button @click="findLauncherDir">
-            <FolderSearchIcon />
-          </Button>
-        </div>
-        <Button large @click="refreshDir">
-          <UpdatedIcon />
-          Refresh
-        </Button>
-      </div>
+      <!--      <div class="app-directory">-->
+      <!--        <div class="iconified-input">-->
+      <!--          <BoxIcon />-->
+      <!--          <input id="appDir" v-model="settingsDir" type="text" class="input" />-->
+      <!--          <Button @click="findLauncherDir">-->
+      <!--            <FolderSearchIcon />-->
+      <!--          </Button>-->
+      <!--        </div>-->
+      <!--        <Button large @click="refreshDir">-->
+      <!--          <UpdatedIcon />-->
+      <!--          Refresh-->
+      <!--        </Button>-->
+      <!--      </div>-->
     </Card>
     <Card>
       <div class="label">
@@ -230,11 +230,11 @@ async function refreshDir() {
         </label>
         <Toggle
           id="minimize-launcher"
-          :model-value="settings.hide_on_process"
-          :checked="settings.hide_on_process"
+          :model-value="settings.hide_on_process_start"
+          :checked="settings.hide_on_process_start"
           @update:model-value="
             (e) => {
-              settings.hide_on_process = e
+              settings.hide_on_process_start = e
             }
           "
         />
@@ -285,10 +285,11 @@ async function refreshDir() {
       <div class="adjacent-input">
         <label for="max-downloads">
           <span class="label__title">Maximum concurrent downloads</span>
-          <span class="label__description"
-            >The maximum amount of files the launcher can download at the same time. Set this to a
-            lower value if you have a poor internet connection.</span
-          >
+          <span class="label__description">
+            The maximum amount of files the launcher can download at the same time. Set this to a
+            lower value if you have a poor internet connection. (app restart required to take
+            effect)
+          </span>
         </label>
         <Slider
           id="max-downloads"
@@ -302,10 +303,11 @@ async function refreshDir() {
       <div class="adjacent-input">
         <label for="max-writes">
           <span class="label__title">Maximum concurrent writes</span>
-          <span class="label__description"
-            >The maximum amount of files the launcher can write to the disk at once. Set this to a
-            lower value if you are frequently getting I/O errors.</span
-          >
+          <span class="label__description">
+            The maximum amount of files the launcher can write to the disk at once. Set this to a
+            lower value if you are frequently getting I/O errors. (app restart required to take
+            effect)
+          </span>
         </label>
         <Slider
           id="max-writes"
@@ -324,37 +326,38 @@ async function refreshDir() {
       </div>
       <div class="adjacent-input">
         <label for="opt-out-analytics">
-          <span class="label__title">Disable analytics</span>
+          <span class="label__title">Telemetry</span>
           <span class="label__description">
             Modrinth collects anonymized analytics and usage data to improve our user experience and
-            customize your experience. By enabling this option, you opt out and your data will no
+            customize your experience. By disabling this option, you opt out and your data will no
             longer be collected.
           </span>
         </label>
         <Toggle
           id="opt-out-analytics"
-          :model-value="settings.opt_out_analytics"
-          :checked="settings.opt_out_analytics"
+          :model-value="settings.telemetry"
+          :checked="settings.telemetry"
           @update:model-value="
             (e) => {
-              settings.opt_out_analytics = e
+              settings.telemetry = e
             }
           "
         />
       </div>
       <div class="adjacent-input">
         <label for="disable-discord-rpc">
-          <span class="label__title">Disable Discord RPC</span>
+          <span class="label__title">Discord RPC</span>
           <span class="label__description">
-            Disables the Discord Rich Presence integration. 'Modrinth' will no longer show up as a
-            game or app you are using on your Discord profile. This does not disable any
-            instance-specific Discord Rich Presence integrations, such as those added by mods.
+            Manages the Discord Rich Presence integration. Disabling this will cause 'Modrinth' to
+            no longer show up as a game or app you are using on your Discord profile. This does not
+            disable any instance-specific Discord Rich Presence integrations, such as those added by
+            mods. (app restart required to take effect)
           </span>
         </label>
         <Toggle
           id="disable-discord-rpc"
-          v-model="settings.disable_discord_rpc"
-          :checked="settings.disable_discord_rpc"
+          v-model="settings.discord_rpc"
+          :checked="settings.discord_rpc"
         />
       </div>
     </Card>
@@ -364,25 +367,25 @@ async function refreshDir() {
           <span class="label__title size-card-header">Java settings</span>
         </h3>
       </div>
-      <label for="java-21">
-        <span class="label__title">Java 21 location</span>
-      </label>
-      <JavaSelector id="java-17" v-model="settings.java_globals.JAVA_21" :version="21" />
-      <label for="java-17">
-        <span class="label__title">Java 17 location</span>
-      </label>
-      <JavaSelector id="java-17" v-model="settings.java_globals.JAVA_17" :version="17" />
-      <label for="java-8">
-        <span class="label__title">Java 8 location</span>
-      </label>
-      <JavaSelector id="java-8" v-model="settings.java_globals.JAVA_8" :version="8" />
+      <!--      <label for="java-21">-->
+      <!--        <span class="label__title">Java 21 location</span>-->
+      <!--      </label>-->
+      <!--      <JavaSelector id="java-17" v-model="settings.java_globals.JAVA_21" :version="21" />-->
+      <!--      <label for="java-17">-->
+      <!--        <span class="label__title">Java 17 location</span>-->
+      <!--      </label>-->
+      <!--      <JavaSelector id="java-17" v-model="settings.java_globals.JAVA_17" :version="17" />-->
+      <!--      <label for="java-8">-->
+      <!--        <span class="label__title">Java 8 location</span>-->
+      <!--      </label>-->
+      <!--      <JavaSelector id="java-8" v-model="settings.java_globals.JAVA_8" :version="8" />-->
       <hr class="card-divider" />
       <label for="java-args">
         <span class="label__title">Java arguments</span>
       </label>
       <input
         id="java-args"
-        v-model="settings.javaArgs"
+        v-model="settings.launchArgs"
         autocomplete="off"
         type="text"
         class="installation-input"
@@ -393,7 +396,7 @@ async function refreshDir() {
       </label>
       <input
         id="env-vars"
-        v-model="settings.envArgs"
+        v-model="settings.envVars"
         autocomplete="off"
         type="text"
         class="installation-input"
@@ -526,7 +529,7 @@ async function refreshDir() {
       <div>
         <label>
           <span class="label__title">App version</span>
-          <span class="label__description">Theseus v{{ version }} </span>
+          <span class="label__description">Modrinth App v{{ version }} </span>
         </label>
       </div>
     </Card>
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index 08a03cf5e..35db197aa 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -2,20 +2,10 @@
   <div class="instance-container">
     <div class="side-cards">
       <Card class="instance-card" @contextmenu.prevent.stop="handleRightClick">
-        <Avatar
-          size="lg"
-          :src="
-            !instance.metadata.icon ||
-            (instance.metadata.icon && instance.metadata.icon.startsWith('http'))
-              ? instance.metadata.icon
-              : convertFileSrc(instance.metadata?.icon)
-          "
-        />
+        <Avatar size="lg" :src="instance.icon_path ? convertFileSrc(instance.icon_path) : null" />
         <div class="instance-info">
-          <h2 class="name">{{ instance.metadata.name }}</h2>
-          <span class="metadata">
-            {{ instance.metadata.loader }} {{ instance.metadata.game_version }}
-          </span>
+          <h2 class="name">{{ instance.name }}</h2>
+          <span class="metadata"> {{ instance.loader }} {{ instance.game_version }} </span>
         </div>
         <span class="button-group">
           <Button v-if="instance.install_stage !== 'installed'" disabled class="instance-button">
@@ -161,13 +151,13 @@ const instance = ref(await get(route.params.id).catch(handleError))
 
 breadcrumbs.setName(
   'Instance',
-  instance.value.metadata.name.length > 40
-    ? instance.value.metadata.name.substring(0, 40) + '...'
-    : instance.value.metadata.name,
+  instance.value.name.length > 40
+    ? instance.value.name.substring(0, 40) + '...'
+    : instance.value.name,
 )
 
 breadcrumbs.setContext({
-  name: instance.value.metadata.name,
+  name: instance.value.name,
   link: route.path,
   query: route.query,
 })
@@ -188,8 +178,8 @@ const startInstance = async (context) => {
   playing.value = true
 
   mixpanel_track('InstanceStart', {
-    loader: instance.value.metadata.loader,
-    game_version: instance.value.metadata.game_version,
+    loader: instance.value.loader,
+    game_version: instance.value.game_version,
     source: context,
   })
 }
@@ -207,9 +197,9 @@ const checkProcess = async () => {
 
 // Get information on associated modrinth versions, if any
 const modrinthVersions = ref([])
-if (!(await isOffline()) && instance.value.metadata.linked_data?.project_id) {
+if (!(await isOffline()) && instance.value.linked_data && instance.value.linked_data.project_id) {
   modrinthVersions.value = await useFetch(
-    `https://api.modrinth.com/v2/project/${instance.value.metadata.linked_data.project_id}/version`,
+    `https://api.modrinth.com/v2/project/${instance.value.linked_data.project_id}/version`,
     'project',
   )
 }
@@ -225,8 +215,8 @@ const stopInstance = async (context) => {
   } else await kill_by_uuid(uuid.value).catch(handleError)
 
   mixpanel_track('InstanceStop', {
-    loader: instance.value.metadata.loader,
-    game_version: instance.value.metadata.game_version,
+    loader: instance.value.loader,
+    game_version: instance.value.game_version,
     source: context,
   })
 }
@@ -271,7 +261,7 @@ const handleOptionsClick = async (args) => {
       break
     case 'add_content':
       await router.push({
-        path: `/browse/${instance.value.metadata.loader === 'vanilla' ? 'datapack' : 'mod'}`,
+        path: `/browse/${instance.value.loader === 'vanilla' ? 'datapack' : 'mod'}`,
         query: { i: route.params.id },
       })
       break
diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index 9870fb705..74632d59c 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -315,7 +315,7 @@
       <div class="markdown-body">
         <p>
           Are you sure you want to remove
-          <strong>{{ functionValues.length }} project(s)</strong> from {{ instance.metadata.name }}?
+          <strong>{{ functionValues.length }} project(s)</strong> from {{ instance.name }}?
           <br />
           This action <strong>cannot</strong> be undone.
         </p>
@@ -338,7 +338,7 @@
             >{{ Array.from(projects.values()).filter((x) => x.disabled).length }} disabled
             project(s)</strong
           >
-          from {{ instance.metadata.name }}?
+          from {{ instance.name }}?
           <br />
           This action <strong>cannot</strong> be undone.
         </p>
@@ -359,7 +359,7 @@
   />
   <ExportModal v-if="projects.length > 0" ref="exportModal" :instance="instance" />
   <ModpackVersionModal
-    v-if="instance.metadata.linked_data"
+    v-if="instance.linked_data"
     ref="modpackVersionModal"
     :instance="instance"
     :versions="props.versions"
@@ -399,6 +399,7 @@ import { useRouter } from 'vue-router'
 import {
   add_project_from_path,
   get,
+  get_projects,
   remove_project,
   toggle_disable_project,
   update_all,
@@ -413,6 +414,13 @@ import { highlightModInProfile } from '@/helpers/utils.js'
 import { MenuIcon, ToggleIcon, TextInputIcon, AddProjectImage, PackageIcon } from '@/assets/icons'
 import ExportModal from '@/components/ui/ExportModal.vue'
 import ModpackVersionModal from '@/components/ui/ModpackVersionModal.vue'
+import { $fetch } from 'ofetch'
+import {
+  get_organization_many,
+  get_project_many,
+  get_team_many,
+  get_version_many,
+} from '@/helpers/cache.js'
 
 const router = useRouter()
 
@@ -441,76 +449,176 @@ const props = defineProps({
   },
 })
 
-const projects = ref([])
+const profileProjects = await get_projects(props.instance.path)
+const fetchProjects = []
+const fetchVersions = []
 const selectionMap = ref(new Map())
+
+for (const [key, value] of Object.entries(profileProjects)) {
+  if (value.metadata.type === 'modrinth') {
+    fetchProjects.push(value.metadata.project_id)
+    fetchVersions.push(value.metadata.version_id)
+  }
+}
+
+const [modrinthProjects, modrinthVersions] = await Promise.all([
+  await get_project_many(fetchProjects).catch(handleError),
+  await get_version_many(fetchVersions).catch(handleError),
+])
+
+const [modrinthTeams, modrinthOrganizations] = await Promise.all([
+  await get_team_many(modrinthProjects.map((x) => x.team)).catch(handleError),
+  await get_organization_many(modrinthProjects.map((x) => x.organization).filter((x) => !!x)).catch(
+    handleError,
+  ),
+])
+
+const projects = ref([])
+for (const [path, file] of Object.entries(profileProjects)) {
+  if (file.metadata.type === 'modrinth') {
+    const project = modrinthProjects.find((x) => file.metadata.project_id === x.id)
+    const version = modrinthVersions.find((x) => file.metadata.version_id === x.id)
+    const org = project.organization
+      ? modrinthOrganizations.find((x) => x.id === project.organization)
+      : null
+
+    const team = modrinthTeams.find((x) => x[0].team_id === project.team)
+
+    let owner = org ? org.name : team.find((x) => x.is_owner).user.username
+
+    console.log(path)
+    console.log(file)
+    console.log(project)
+    console.log(version)
+    console.log(org)
+    console.log(team)
+
+    projects.value.push({
+      path,
+      name: project.title,
+      slug: project.slug,
+      author: owner,
+      version: version.version_number,
+      file_name: file.file_name,
+      icon: project.icon_url,
+      disabled: file.file_name.endsWith('.disabled'),
+      updateVersion: file.update_version_id,
+      outdated: !!file.update_version_id,
+      project_type: project.project_type,
+      id: project.id,
+    })
+
+    continue
+  }
+
+  if (file.metadata.type === 'inferred') {
+    projects.value.push({
+      path,
+      name: file.metadata.title ?? file.file_name,
+      author: file.metadata.authors[0],
+      version: file.metadata.version,
+      file_name: file.file_name,
+      icon: file.metadata.icon ? convertFileSrc(file.metadata.icon) : null,
+      disabled: file.disabled,
+      outdated: false,
+      project_type: file.metadata.project_type,
+    })
+  } else {
+    projects.value.push({
+      path,
+      name: file.file_name.replace('.disabled', ''),
+      author: '',
+      version: null,
+      file_name: file.file_name,
+      icon: null,
+      disabled: file.file_name.endsWith('.disabled'),
+      outdated: false,
+      project_type: null,
+    })
+  }
+}
+
+console.log(projects.value)
+
+const newSelectionMap = new Map()
+for (const project of projects.value) {
+  newSelectionMap.set(
+    project.path,
+    selectionMap.value.get(project.path) ??
+      selectionMap.value.get(project.path.slice(0, -9)) ??
+      selectionMap.value.get(project.path + '.disabled') ??
+      false,
+  )
+}
+selectionMap.value = newSelectionMap
+
 const showingOptions = ref(false)
 const isPackLocked = computed(() => {
-  return props.instance.metadata.linked_data && props.instance.metadata.linked_data.locked
+  return props.instance.linked_data && props.instance.linked_data.locked
 })
 const canUpdatePack = computed(() => {
-  if (!props.instance.metadata.linked_data) return false
-  return props.instance.metadata.linked_data.version_id !== props.instance.modrinth_update_version
+  if (!props.instance.linked_data) return false
+  return props.instance.linked_data.version_id !== props.instance.modrinth_update_version
 })
 const exportModal = ref(null)
 
 const initProjects = (initInstance) => {
-  projects.value = []
-  if (!initInstance || !initInstance.projects) return
-  for (const [path, project] of Object.entries(initInstance.projects)) {
-    if (project.metadata.type === 'modrinth' && !props.offline) {
-      let owner = project.metadata.members.find((x) => x.role === 'Owner')
-      projects.value.push({
-        path,
-        name: project.metadata.project.title,
-        slug: project.metadata.project.slug,
-        author: owner ? owner.user.username : null,
-        version: project.metadata.version.version_number,
-        file_name: project.file_name,
-        icon: project.metadata.project.icon_url,
-        disabled: project.disabled,
-        updateVersion: project.metadata.update_version,
-        outdated: !!project.metadata.update_version,
-        project_type: project.metadata.project.project_type,
-        id: project.metadata.project.id,
-      })
-    } else if (project.metadata.type === 'inferred') {
-      projects.value.push({
-        path,
-        name: project.metadata.title ?? project.file_name,
-        author: project.metadata.authors[0],
-        version: project.metadata.version,
-        file_name: project.file_name,
-        icon: project.metadata.icon ? convertFileSrc(project.metadata.icon) : null,
-        disabled: project.disabled,
-        outdated: false,
-        project_type: project.metadata.project_type,
-      })
-    } else {
-      projects.value.push({
-        path,
-        name: project.file_name,
-        author: '',
-        version: null,
-        file_name: project.file_name,
-        icon: null,
-        disabled: project.disabled,
-        outdated: false,
-        project_type: null,
-      })
-    }
-  }
-
-  const newSelectionMap = new Map()
-  for (const project of projects.value) {
-    newSelectionMap.set(
-      project.path,
-      selectionMap.value.get(project.path) ??
-        selectionMap.value.get(project.path.slice(0, -9)) ??
-        selectionMap.value.get(project.path + '.disabled') ??
-        false,
-    )
-  }
-  selectionMap.value = newSelectionMap
+  // projects.value = []
+  // if (!initInstance || !initInstance.projects) return
+  // for (const [path, project] of Object.entries(initInstance.projects)) {
+  //   if (project.metadata.type === 'modrinth' && !props.offline) {
+  //     let owner = project.metadata.members.find((x) => x.role === 'Owner')
+  //     projects.value.push({
+  //       path,
+  //       name: project.metadata.project.title,
+  //       slug: project.metadata.project.slug,
+  //       author: owner ? owner.user.username : null,
+  //       version: project.metadata.version.version_number,
+  //       file_name: project.file_name,
+  //       icon: project.metadata.project.icon_url,
+  //       updateVersion: project.metadata.update_version,
+  //       outdated: !!project.metadata.update_version,
+  //       project_type: project.metadata.project.project_type,
+  //       id: project.metadata.project.id,
+  //     })
+  //   } else if (project.metadata.type === 'inferred') {
+  //     projects.value.push({
+  //       path,
+  //       name: project.metadata.title ?? project.file_name,
+  //       author: project.metadata.authors[0],
+  //       version: project.metadata.version,
+  //       file_name: project.file_name,
+  //       icon: project.metadata.icon ? convertFileSrc(project.metadata.icon) : null,
+  //       disabled: project.disabled,
+  //       outdated: false,
+  //       project_type: project.metadata.project_type,
+  //     })
+  //   } else {
+  //     projects.value.push({
+  //       path,
+  //       name: project.file_name,
+  //       author: '',
+  //       version: null,
+  //       file_name: project.file_name,
+  //       icon: null,
+  //       disabled: project.disabled,
+  //       outdated: false,
+  //       project_type: null,
+  //     })
+  //   }
+  // }
+  //
+  // const newSelectionMap = new Map()
+  // for (const project of projects.value) {
+  //   newSelectionMap.set(
+  //     project.path,
+  //     selectionMap.value.get(project.path) ??
+  //       selectionMap.value.get(project.path.slice(0, -9)) ??
+  //       selectionMap.value.get(project.path + '.disabled') ??
+  //       false,
+  //   )
+  // }
+  // selectionMap.value = newSelectionMap
 }
 
 initProjects(props.instance)
@@ -670,8 +778,8 @@ const updateAll = async () => {
   }
 
   mixpanel_track('InstanceUpdateAll', {
-    loader: props.instance.metadata.loader,
-    game_version: props.instance.metadata.game_version,
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
     count: setProjects.length,
     selected: selected.value.length > 1,
   })
@@ -696,8 +804,8 @@ const updateProject = async (mod) => {
   mod.updateVersion = null
 
   mixpanel_track('InstanceProjectUpdate', {
-    loader: props.instance.metadata.loader,
-    game_version: props.instance.metadata.game_version,
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
     id: mod.id,
     name: mod.name,
     project_type: mod.project_type,
@@ -723,8 +831,8 @@ const toggleDisableMod = async (mod) => {
       mod.path = newPath
       mod.disabled = !mod.disabled
       mixpanel_track('InstanceProjectDisable', {
-        loader: props.instance.metadata.loader,
-        game_version: props.instance.metadata.game_version,
+        loader: props.instance.loader,
+        game_version: props.instance.game_version,
         id: mod.id,
         name: mod.name,
         project_type: mod.project_type,
@@ -744,8 +852,8 @@ const removeMod = async (mod) => {
   projects.value = projects.value.filter((x) => mod.path !== x.path)
 
   mixpanel_track('InstanceProjectRemove', {
-    loader: props.instance.metadata.loader,
-    game_version: props.instance.metadata.game_version,
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
     id: mod.id,
     name: mod.name,
     project_type: mod.project_type,
@@ -849,7 +957,7 @@ const handleRightClick = (event, mod) => {
 const handleContentOptionClick = async (args) => {
   if (args.option === 'search') {
     await router.push({
-      path: `/browse/${props.instance.metadata.loader === 'vanilla' ? 'datapack' : 'mod'}`,
+      path: `/browse/${props.instance.loader === 'vanilla' ? 'datapack' : 'mod'}`,
       query: { i: props.instance.path },
     })
   } else if (args.option === 'from_file') {
diff --git a/apps/app-frontend/src/pages/instance/Options.vue b/apps/app-frontend/src/pages/instance/Options.vue
index 94b38e9c0..71b7e7126 100644
--- a/apps/app-frontend/src/pages/instance/Options.vue
+++ b/apps/app-frontend/src/pages/instance/Options.vue
@@ -147,7 +147,7 @@
       autocomplete="off"
       maxlength="80"
       type="text"
-      :disabled="instance.metadata.linked_data"
+      :disabled="instance.linked_data"
     />
 
     <div class="adjacent-input">
@@ -358,7 +358,7 @@
       />
     </div>
   </Card>
-  <Card v-if="instance.metadata.linked_data">
+  <Card v-if="instance.linked_data">
     <div class="label">
       <h3>
         <span class="label__title size-card-header">Modpack</span>
@@ -366,9 +366,7 @@
     </div>
     <div class="adjacent-input">
       <label for="general-modpack-info">
-        <span class="label__description">
-          <strong>Modpack: </strong> {{ instance.metadata.name }}
-        </span>
+        <span class="label__description"> <strong>Modpack: </strong> {{ instance.name }} </span>
         <span class="label__description">
           <strong>Version: </strong>
           {{
@@ -414,7 +412,7 @@
       </Button>
     </div>
 
-    <div v-if="props.instance.metadata.linked_data.project_id" class="adjacent-input">
+    <div v-if="props.instance.linked_data.project_id" class="adjacent-input">
       <label for="change-modpack-version">
         <span class="label__title">Change modpack version</span>
         <span class="label__description">
@@ -502,7 +500,7 @@
     </div>
   </Card>
   <ModpackVersionModal
-    v-if="instance.metadata.linked_data"
+    v-if="instance.linked_data"
     ref="modpackVersionModal"
     :instance="instance"
     :versions="props.versions"
@@ -553,12 +551,7 @@ import { get } from '@/helpers/settings.js'
 import JavaSelector from '@/components/ui/JavaSelector.vue'
 import { convertFileSrc } from '@tauri-apps/api/tauri'
 import { open } from '@tauri-apps/api/dialog'
-import {
-  get_fabric_versions,
-  get_forge_versions,
-  get_neoforge_versions,
-  get_quilt_versions,
-} from '@/helpers/metadata.js'
+import { get_loader_versions } from '@/helpers/metadata.js'
 import { get_game_versions, get_loaders } from '@/helpers/tags.js'
 import { handleError } from '@/store/notifications.js'
 import { mixpanel_track } from '@/helpers/mixpanel'
@@ -587,9 +580,9 @@ const props = defineProps({
 
 const themeStore = useTheming()
 
-const title = ref(props.instance.metadata.name)
-const icon = ref(props.instance.metadata.icon)
-const groups = ref(props.instance.metadata.groups)
+const title = ref(props.instance.name)
+const icon = ref(props.instance.icon_path)
+const groups = ref(props.instance.groups)
 
 const modpackVersionModal = ref(null)
 
@@ -597,7 +590,7 @@ const instancesList = Object.values(await list(true))
 const availableGroups = ref([
   ...new Set(
     instancesList.reduce((acc, obj) => {
-      return acc.concat(obj.metadata.groups)
+      return acc.concat(obj.groups)
     }, []),
   ),
 ])
@@ -663,7 +656,7 @@ const unlinkModpack = ref(false)
 
 const inProgress = ref(false)
 const installing = computed(() => props.instance.install_stage !== 'installed')
-const installedVersion = computed(() => props.instance?.metadata?.linked_data?.version_id)
+const installedVersion = computed(() => props.instance?.linked_data?.version_id)
 const installedVersionData = computed(() => {
   if (!installedVersion.value) return null
   return props.versions.find((version) => version.id === installedVersion.value)
@@ -709,8 +702,8 @@ const editProfileObject = computed(() => {
     metadata: {
       name: title.value.trim().substring(0, 32) ?? 'Instance',
       groups: groups.value.map((x) => x.trim().substring(0, 32)).filter((x) => x.length > 0),
-      loader_version: props.instance.metadata.loader_version,
-      linked_data: props.instance.metadata.linked_data,
+      loader_version: props.instance.loader_version,
+      linked_data: props.instance.linked_data,
     },
     java: {},
   }
@@ -758,10 +751,10 @@ const editProfileObject = computed(() => {
   }
 
   if (unlinkModpack.value) {
-    editProfile.metadata.linked_data = null
+    editProfile.linked_data = null
   }
 
-  breadcrumbs.setName('Instance', editProfile.metadata.name)
+  breadcrumbs.setName('Instance', editProfile.name)
 
   return editProfile
 })
@@ -771,8 +764,8 @@ const repairing = ref(false)
 async function duplicateProfile() {
   await duplicate(props.instance.path).catch(handleError)
   mixpanel_track('InstanceDuplicate', {
-    loader: props.instance.metadata.loader,
-    game_version: props.instance.metadata.game_version,
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
   })
 }
 
@@ -782,14 +775,14 @@ async function repairProfile(force) {
   repairing.value = false
 
   mixpanel_track('InstanceRepair', {
-    loader: props.instance.metadata.loader,
-    game_version: props.instance.metadata.game_version,
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
   })
 }
 
 async function unpairProfile() {
   const editProfile = props.instance
-  editProfile.metadata.linked_data = null
+  editProfile.linked_data = null
   await edit(props.instance.path, editProfile)
   installedVersion.value = null
   installedVersionData.value = null
@@ -798,13 +791,13 @@ async function unpairProfile() {
 
 async function unlockProfile() {
   const editProfile = props.instance
-  editProfile.metadata.linked_data.locked = false
+  editProfile.linked_data.locked = false
   await edit(props.instance.path, editProfile)
   modalConfirmUnlock.value.hide()
 }
 
 const isPackLocked = computed(() => {
-  return props.instance.metadata.linked_data && props.instance.metadata.linked_data.locked
+  return props.instance.linked_data && props.instance.linked_data.locked
 })
 
 async function repairModpack() {
@@ -813,8 +806,8 @@ async function repairModpack() {
   inProgress.value = false
 
   mixpanel_track('InstanceRepair', {
-    loader: props.instance.metadata.loader,
-    game_version: props.instance.metadata.game_version,
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
   })
 }
 
@@ -825,8 +818,8 @@ async function removeProfile() {
   removing.value = false
 
   mixpanel_track('InstanceRemove', {
-    loader: props.instance.metadata.loader,
-    game_version: props.instance.metadata.game_version,
+    loader: props.instance.loader,
+    game_version: props.instance.game_version,
   })
 
   await router.push({ path: '/' })
@@ -843,10 +836,10 @@ const [
   all_game_versions,
   loaders,
 ] = await Promise.all([
-  get_fabric_versions().then(shallowRef).catch(handleError),
-  get_forge_versions().then(shallowRef).catch(handleError),
-  get_quilt_versions().then(shallowRef).catch(handleError),
-  get_neoforge_versions().then(shallowRef).catch(handleError),
+  get_loader_versions('fabric').then(shallowRef).catch(handleError),
+  get_loader_versions('forge').then(shallowRef).catch(handleError),
+  get_loader_versions('quilt').then(shallowRef).catch(handleError),
+  get_loader_versions('neo').then(shallowRef).catch(handleError),
   get_game_versions().then(shallowRef).catch(handleError),
   get_loaders()
     .then((value) =>
@@ -859,8 +852,8 @@ const [
 ])
 loaders.value.unshift('vanilla')
 
-const loader = ref(props.instance.metadata.loader)
-const gameVersion = ref(props.instance.metadata.game_version)
+const loader = ref(props.instance.loader)
+const gameVersion = ref(props.instance.game_version)
 const selectableGameVersions = computed(() => {
   return all_game_versions.value
     .filter((item) => {
@@ -896,9 +889,7 @@ const selectableLoaderVersions = computed(() => {
   return []
 })
 const loaderVersionIndex = ref(
-  selectableLoaderVersions.value.findIndex(
-    (x) => x.id === props.instance.metadata.loader_version?.id,
-  ),
+  selectableLoaderVersions.value.findIndex((x) => x.id === props.instance.loader_version?.id),
 )
 
 const isValid = computed(() => {
diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue
index ab881420c..8472140f3 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -4,26 +4,17 @@
       <Card v-if="instance" class="small-instance">
         <router-link class="instance" :to="`/instance/${encodeURIComponent(instance.path)}`">
           <Avatar
-            :src="
-              !instance.metadata.icon ||
-              (instance.metadata.icon && instance.metadata.icon.startsWith('http'))
-                ? instance.metadata.icon
-                : convertFileSrc(instance.metadata?.icon)
-            "
-            :alt="instance.metadata.name"
+            :src="instance.icon_path ? convertFileSrc(instance.icon_path) : null"
+            :alt="instance.name"
             size="sm"
           />
           <div class="small-instance_info">
             <span class="title">{{
-              instance.metadata.name.length > 20
-                ? instance.metadata.name.substring(0, 20) + '...'
-                : instance.metadata.name
+              instance.name.length > 20 ? instance.name.substring(0, 20) + '...' : instance.name
             }}</span>
             <span>
-              {{
-                instance.metadata.loader.charAt(0).toUpperCase() + instance.metadata.loader.slice(1)
-              }}
-              {{ instance.metadata.game_version }}
+              {{ instance.loader.charAt(0).toUpperCase() + instance.loader.slice(1) }}
+              {{ instance.game_version }}
             </span>
           </div>
         </router-link>
@@ -218,9 +209,6 @@
       />
     </div>
   </div>
-  <InstallConfirmModal ref="confirmModal" />
-  <ModInstallModal ref="modInstallModal" />
-  <IncompatibilityWarningModal ref="incompatibilityWarning" />
   <ContextMenu ref="options" @option-clicked="handleOptionsClick">
     <template #install> <DownloadIcon /> Install </template>
     <template #open_link> <GlobeIcon /> Open in Modrinth <ExternalIcon /> </template>
@@ -263,36 +251,24 @@ import {
   OpenCollectiveIcon,
 } from '@/assets/external'
 import { get_categories } from '@/helpers/tags'
-import { install as packInstall } from '@/helpers/pack'
-import {
-  list,
-  add_project_from_version as installMod,
-  check_installed,
-  get as getInstance,
-  remove_project,
-} from '@/helpers/profile'
+import { get as getInstance, get_projects as getInstanceProjects } from '@/helpers/profile'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import { useRoute } from 'vue-router'
 import { ref, shallowRef, watch } from 'vue'
-import { installVersionDependencies, isOffline } from '@/helpers/utils'
-import InstallConfirmModal from '@/components/ui/InstallConfirmModal.vue'
-import ModInstallModal from '@/components/ui/ModInstallModal.vue'
+import { isOffline } from '@/helpers/utils'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
-import IncompatibilityWarningModal from '@/components/ui/IncompatibilityWarningModal.vue'
-import { useFetch } from '@/helpers/fetch.js'
 import { handleError } from '@/store/notifications.js'
 import { convertFileSrc } from '@tauri-apps/api/tauri'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
-import { mixpanel_track } from '@/helpers/mixpanel'
+import { install as installVersion } from '@/store/install.js'
+import { get_project, get_project_many, get_team, get_version_many } from '@/helpers/cache.js'
+
+dayjs.extend(relativeTime)
 
 const route = useRoute()
 const breadcrumbs = useBreadcrumbs()
 
-const confirmModal = ref(null)
-const modInstallModal = ref(null)
-const incompatibilityWarning = ref(null)
-
 const options = ref(null)
 const installing = ref(false)
 const data = shallowRef(null)
@@ -301,6 +277,7 @@ const members = shallowRef([])
 const dependencies = shallowRef([])
 const categories = shallowRef([])
 const instance = ref(null)
+const instanceProjects = ref(null)
 
 const installed = ref(false)
 const installedVersion = ref(null)
@@ -308,31 +285,58 @@ const installedVersion = ref(null)
 const offline = ref(await isOffline())
 
 async function fetchProjectData() {
-  ;[
-    data.value,
-    versions.value,
-    members.value,
-    dependencies.value,
-    categories.value,
-    instance.value,
-  ] = await Promise.all([
-    useFetch(`https://api.modrinth.com/v2/project/${route.params.id}`, 'project'),
-    useFetch(`https://api.modrinth.com/v2/project/${route.params.id}/version`, 'project'),
-    useFetch(`https://api.modrinth.com/v2/project/${route.params.id}/members`, 'project'),
-    useFetch(`https://api.modrinth.com/v2/project/${route.params.id}/dependencies`, 'project'),
-    get_categories().catch(handleError),
-    route.query.i ? getInstance(route.query.i, false).catch(handleError) : Promise.resolve(),
-  ])
+  const project = await get_project(route.params.id).catch(handleError)
+
+  data.value = project
+  ;[versions.value, members.value, categories.value, instance.value, instanceProjects.value] =
+    await Promise.all([
+      get_version_many(project.versions).catch(handleError),
+      get_team(project.team),
+      get_categories().catch(handleError),
+      route.query.i ? getInstance(route.query.i).catch(handleError) : Promise.resolve(),
+      route.query.i ? getInstanceProjects(route.query.i).catch(handleError) : Promise.resolve(),
+    ])
+
+  versions.value = versions.value.sort((a, b) => dayjs(b.date_published) - dayjs(a.date_published))
+
+  const projectIds = new Set()
+  const versionIds = new Set()
+
+  for (const version of versions.value) {
+    if (version.dependencies) {
+      for (const dependency of version.dependencies) {
+        if (dependency.project_id) {
+          projectIds.add(dependency.project_id)
+        }
+        if (dependency.version_id) {
+          versionIds.add(dependency.version_id)
+        }
+      }
+    }
+  }
 
-  installed.value =
-    instance.value?.path &&
-    (await check_installed(instance.value.path, data.value.id).catch(handleError))
+  if (projectIds.size > 0 || versionIds.size > 0) {
+    const [projectDeps, versionDeps] = await Promise.all([
+      get_project_many([...projectIds]),
+      get_version_many([...versionIds]),
+    ])
+
+    dependencies.value = {
+      projects: projectDeps,
+      versions: versionDeps,
+    }
+  }
+
+  if (instanceProjects.value) {
+    const installedFile = Object.values(instanceProjects.value).find(
+      (x) => x.metadata.type === 'modrinth' && x.metadata.project_id === data.value.id,
+    )
+    if (installedFile) {
+      installed.value = true
+      installedVersion.value = installedFile.metadata.version_id
+    }
+  }
   breadcrumbs.setName('Project', data.value.title)
-  installedVersion.value = instance.value
-    ? Object.values(instance.value.projects).find(
-        (p) => p?.metadata?.version?.project_id === data.value.id,
-      )?.metadata?.version?.id
-    : null
 }
 
 if (!offline.value) await fetchProjectData()
@@ -346,162 +350,22 @@ watch(
   },
 )
 
-dayjs.extend(relativeTime)
-
-const markInstalled = () => {
-  installed.value = true
-}
-
 async function install(version) {
   installing.value = true
-  let queuedVersionData
-  if (instance.value) {
-    instance.value = await getInstance(instance.value.path, false).catch(handleError)
-  }
-
-  if (installed.value) {
-    const old_project = Object.entries(instance.value.projects)
-      .map(([key, value]) => ({
-        key,
-        value,
-      }))
-      .find((p) => p.value.metadata?.version?.project_id === data.value.id)
-    if (!old_project) {
-      // Switching too fast, old project is not recognized as a Modrinth project yet
+  await installVersion(
+    data.value.id,
+    version,
+    instance.value ? instance.value.path : null,
+    'ProjectPage',
+    (version) => {
       installing.value = false
-      return
-    }
-
-    await remove_project(instance.value.path, old_project.key)
-  }
-
-  if (version) {
-    queuedVersionData = versions.value.find((v) => v.id === version)
-  } else {
-    if (data.value.project_type === 'modpack' || !instance.value) {
-      queuedVersionData = versions.value[0]
-    } else {
-      queuedVersionData = versions.value.find((v) =>
-        v.game_versions.includes(data.value.game_versions[0]),
-      )
-    }
-  }
 
-  if (data.value.project_type === 'modpack') {
-    const packs = Object.values(await list(true).catch(handleError))
-    if (
-      packs.length === 0 ||
-      !packs
-        .map((value) => value.metadata)
-        .find((pack) => pack.linked_data?.project_id === data.value.id)
-    ) {
-      await packInstall(
-        data.value.id,
-        queuedVersionData.id,
-        data.value.title,
-        data.value.icon_url,
-      ).catch(handleError)
-
-      mixpanel_track('PackInstall', {
-        id: data.value.id,
-        version_id: queuedVersionData.id,
-        title: data.value.title,
-        source: 'ProjectPage',
-      })
-    } else {
-      confirmModal.value.show(
-        data.value.id,
-        queuedVersionData.id,
-        data.value.title,
-        data.value.icon_url,
-      )
-    }
-  } else {
-    if (instance.value) {
-      if (!version) {
-        const gameVersion = instance.value.metadata.game_version
-        const loader = instance.value.metadata.loader
-        const selectedVersion = versions.value.find(
-          (v) =>
-            v.game_versions.includes(gameVersion) &&
-            (data.value.project_type === 'mod'
-              ? v.loaders.includes(loader) || v.loaders.includes('minecraft')
-              : true),
-        )
-        if (!selectedVersion) {
-          incompatibilityWarning.value.show(
-            instance.value,
-            data.value.title,
-            versions.value,
-            markInstalled,
-            data.value.id,
-            data.value.project_type,
-          )
-          installing.value = false
-          return
-        } else {
-          queuedVersionData = selectedVersion
-          await installMod(instance.value.path, selectedVersion.id).catch(handleError)
-          await installVersionDependencies(instance.value, queuedVersionData)
-          installedVersion.value = selectedVersion.id
-          mixpanel_track('ProjectInstall', {
-            loader: instance.value.metadata.loader,
-            game_version: instance.value.metadata.game_version,
-            id: data.value.id,
-            project_type: data.value.project_type,
-            version_id: queuedVersionData.id,
-            title: data.value.title,
-            source: 'ProjectPage',
-          })
-        }
-      } else {
-        const gameVersion = instance.value.metadata.game_version
-        const loader = instance.value.metadata.loader
-        const compatible = versions.value.some(
-          (v) =>
-            v.game_versions.includes(gameVersion) &&
-            (data.value.project_type === 'mod'
-              ? v.loaders.includes(loader) || v.loaders.includes('minecraft')
-              : true),
-        )
-        if (compatible) {
-          await installMod(instance.value.path, queuedVersionData.id).catch(handleError)
-          await installVersionDependencies(instance.value, queuedVersionData)
-          installedVersion.value = queuedVersionData.id
-          mixpanel_track('ProjectInstall', {
-            loader: instance.value.metadata.loader,
-            game_version: instance.value.metadata.game_version,
-            id: data.value.id,
-            project_type: data.value.project_type,
-            version_id: queuedVersionData.id,
-            title: data.value.title,
-            source: 'ProjectPage',
-          })
-        } else {
-          incompatibilityWarning.value.show(
-            instance.value,
-            data.value.title,
-            [queuedVersionData],
-            markInstalled,
-            data.value.id,
-            data.value.project_type,
-          )
-          installing.value = false
-          return
-        }
+      if (instance.value && version) {
+        installed.value = true
+        installedVersion.value = version
       }
-      installed.value = true
-    } else {
-      modInstallModal.value.show(
-        data.value.id,
-        version ? [versions.value.find((v) => v.id === queuedVersionData.id)] : versions.value,
-        data.value.title,
-        data.value.project_type,
-      )
-    }
-  }
-
-  installing.value = false
+    },
+  )
 }
 
 const handleRightClick = (e) => {
diff --git a/apps/app-frontend/src/pages/project/Versions.vue b/apps/app-frontend/src/pages/project/Versions.vue
index f02d2f839..25e626681 100644
--- a/apps/app-frontend/src/pages/project/Versions.vue
+++ b/apps/app-frontend/src/pages/project/Versions.vue
@@ -187,8 +187,8 @@ const props = defineProps({
 })
 
 const filterVersions = ref([])
-const filterLoader = ref(props.instance ? [props.instance?.metadata?.loader] : [])
-const filterGameVersions = ref(props.instance ? [props.instance?.metadata?.game_version] : [])
+const filterLoader = ref(props.instance ? [props.instance?.loader] : [])
+const filterGameVersions = ref(props.instance ? [props.instance?.game_version] : [])
 
 const currentPage = ref(1)
 
diff --git a/apps/app-frontend/src/store/install.js b/apps/app-frontend/src/store/install.js
new file mode 100644
index 000000000..668e63752
--- /dev/null
+++ b/apps/app-frontend/src/store/install.js
@@ -0,0 +1,173 @@
+import { defineStore } from 'pinia'
+import {
+  add_project_from_version,
+  check_installed,
+  list,
+  get,
+  get_projects,
+  remove_project,
+} from '@/helpers/profile.js'
+import { handleError } from '@/store/notifications.js'
+import { useFetch } from '@/helpers/fetch.js'
+import { get_project, get_version_many } from '@/helpers/cache.js'
+import { install as packInstall } from '@/helpers/pack.js'
+import { mixpanel_track } from '@/helpers/mixpanel.js'
+
+export const useInstall = defineStore('installStore', {
+  state: () => ({
+    installConfirmModal: null,
+    modInstallModal: null,
+    incompatibilityWarningModal: null,
+  }),
+  actions: {
+    setInstallConfirmModal(ref) {
+      this.installConfirmModal = ref
+    },
+    showInstallConfirmModal(project, version_id, onInstall) {
+      this.installConfirmModal.show(project, version_id, onInstall)
+    },
+    setIncompatibilityWarningModal(ref) {
+      this.incompatibilityWarningModal = ref
+    },
+    showIncompatibilityWarningModal(instance, project, versions, onInstall) {
+      this.incompatibilityWarningModal.show(instance, project, versions, onInstall)
+    },
+    setModInstallModal(ref) {
+      this.modInstallModal = ref
+    },
+    showModInstallModal(project, versions, onInstall) {
+      this.modInstallModal.show(project, versions, onInstall)
+    },
+  },
+})
+
+export const install = async (projectId, versionId, instancePath, source, callback = () => {}) => {
+  const project = await get_project(projectId).catch(handleError)
+
+  if (project.project_type === 'modpack') {
+    const version = versionId ?? project.versions[0]
+    const packs = Object.values(await list(true).catch(handleError))
+
+    if (packs.length === 0 || !packs.find((pack) => pack.linked_data?.project_id === project.id)) {
+      await packInstall(project.id, version, project.title, project.icon_url).catch(handleError)
+
+      mixpanel_track('PackInstall', {
+        id: project.id,
+        version_id: version,
+        title: project.title,
+        source,
+      })
+
+      callback(version)
+    } else {
+      const install = useInstall()
+      install.showInstallConfirmModal(project, version, callback)
+    }
+  } else {
+    if (instancePath) {
+      const [instance, instanceProjects, projectVersions] = await Promise.all([
+        await get(instancePath).catch(handleError),
+        await get_projects(instancePath).catch(handleError),
+        await get_version_many(project.versions),
+      ])
+
+      let version
+      if (versionId) {
+        version = projectVersions.find((x) => x.id === versionId)
+      } else {
+        projectVersions.find(
+          (v) =>
+            v.game_versions.includes(instance.game_version) &&
+            (project.project_type === 'mod'
+              ? v.loaders.includes(instance.loader) || v.loaders.includes('minecraft')
+              : true),
+        )
+      }
+
+      if (!version) {
+        version = projectVersions[0]
+      }
+
+      if (
+        version.game_versions.includes(instance.game_version) &&
+        (project.project_type === 'mod'
+          ? version.loaders.includes(instance.loader) || version.loaders.includes('minecraft')
+          : true)
+      ) {
+        for (const [path, file] of Object.entries(instanceProjects)) {
+          if (file.metadata.type === 'modrinth' && file.metadata.project_id === project.id) {
+            await remove_project(instance.path, path)
+          }
+        }
+
+        await add_project_from_version(instance.path, version.id).catch(handleError)
+        await installVersionDependencies(instance, version)
+
+        mixpanel_track('ProjectInstall', {
+          loader: instance.loader,
+          game_version: instance.game_version,
+          id: project.id,
+          project_type: project.project_type,
+          version_id: version.id,
+          title: project.title,
+          source,
+        })
+
+        callback(version.id)
+      } else {
+        const install = useInstall()
+        install.showIncompatibilityWarningModal(instance, project, projectVersions, callback)
+      }
+    } else {
+      const versions = await get_version_many(project.versions).catch(handleError)
+
+      const install = useInstall()
+      install.showModInstallModal(project, versions, callback)
+    }
+  }
+
+  // If project is modpack:
+  //   - We check all available instances if modpack is already installed
+  //     If true: show confirmation modal
+  //     If false: install it (latest version if passed version is null)
+  // If project is mod:
+  //   - If instance is selected:
+  //        - If project is already installed
+  //          We first uninstall the project
+  //        - If no version is selected, we look check the instance for versions to select based on the versions
+  //            - If there are no versions, we show the incompat modal
+  //        - If a version is selected, and the version is incompatible, we show the incompat modal
+  //   - Version is inarlled, as well as version dependencies
+}
+
+export const installVersionDependencies = async (profile, version) => {
+  for (const dep of version.dependencies) {
+    if (dep.dependency_type !== 'required') continue
+    // disallow fabric api install on quilt
+    if (dep.project_id === 'P7dR8mSH' && profile.loader === 'quilt') continue
+    if (dep.version_id) {
+      if (
+        dep.project_id &&
+        (await check_installed(profile.path, dep.project_id).catch(handleError))
+      )
+        continue
+      await add_project_from_version(profile.path, dep.version_id)
+    } else {
+      if (
+        dep.project_id &&
+        (await check_installed(profile.path, dep.project_id).catch(handleError))
+      )
+        continue
+      const depVersions = await useFetch(
+        `https://api.modrinth.com/v2/project/${dep.project_id}/version`,
+        'dependency versions',
+      )
+      const latest = depVersions.find(
+        (v) => v.game_versions.includes(profile.game_version) && v.loaders.includes(profile.loader),
+      )
+      if (latest) {
+        await add_project_from_version(profile.path, latest.id).catch(handleError)
+      }
+    }
+  }
+}
diff --git a/apps/app-frontend/src/store/state.js b/apps/app-frontend/src/store/state.js
index 229a139ad..dd68a6eec 100644
--- a/apps/app-frontend/src/store/state.js
+++ b/apps/app-frontend/src/store/state.js
@@ -2,5 +2,6 @@ import { useTheming } from './theme'
 import { useBreadcrumbs } from './breadcrumbs'
 import { useLoading } from './loading'
 import { useNotifications, handleError } from './notifications'
+import { useInstall } from './install'
 
-export { useTheming, useBreadcrumbs, useLoading, useNotifications, handleError }
+export { useTheming, useBreadcrumbs, useLoading, useNotifications, handleError, useInstall }
diff --git a/apps/app-playground/src/main.rs b/apps/app-playground/src/main.rs
index b6db9b536..fbb298209 100644
--- a/apps/app-playground/src/main.rs
+++ b/apps/app-playground/src/main.rs
@@ -3,6 +3,8 @@
     windows_subsystem = "windows"
 )]
 
+use theseus::pack::install_from::{get_profile_from_pack, CreatePackLocation};
+use theseus::pack::install_mrpack::install_zipped_mrpack;
 use theseus::prelude::*;
 
 use theseus::profile::create::profile_create;
@@ -69,38 +71,25 @@ async fn main() -> theseus::Result<()> {
     let modloader = ModLoader::Fabric;
     let loader_version = "stable".to_string();
 
+    let pack = CreatePackLocation::FromVersionId {
+        project_id: "1KVo5zza".to_string(),
+        version_id: "lKloE8SA".to_string(),
+        title: "Fabulously Optimized".to_string(),
+        icon_url: Some("https://cdn.modrinth.com/data/1KVo5zza/d8152911f8fd5d7e9a8c499fe89045af81fe816e.png".to_string()),
+    };
+
+    let profile = get_profile_from_pack(pack.clone());
     let profile_path = profile_create(
-        name.clone(),
-        game_version,
-        modloader,
-        Some(loader_version),
-        None,
+        profile.name,
+        profile.game_version,
+        profile.modloader,
+        profile.loader_version,
         None,
         None,
         None,
     )
     .await?;
-
-    profile::add_project_from_version(&profile_path, "oIVA3FbL").await?;
-    profile::add_project_from_version(&profile_path, "RncWhTxD").await?;
-    profile::add_project_from_version(&profile_path, "xhN1IvHi").await?;
-    profile::add_project_from_version(&profile_path, "c6RfHyKW").await?;
-
-    {
-        let iris = profile::add_project_from_version(&profile_path, "kuOV4Ece")
-            .await?;
-        let new_path =
-            profile::toggle_disable_project(&profile_path, &iris).await?;
-        profile::toggle_disable_project(&profile_path, &new_path).await?;
-    }
-
-    let fast_grass =
-        profile::add_project_from_version(&profile_path, "1lpmCieT").await?;
-    profile::remove_project(&profile_path, &fast_grass).await?;
-
-    let lithium =
-        profile::add_project_from_version(&profile_path, "5a3sPIH2").await?;
-    profile::toggle_disable_project(&profile_path, &lithium).await?;
+    install_zipped_mrpack(pack, profile_path.to_string()).await?;
 
     let projects = profile::get_projects(&profile_path).await?;
 
diff --git a/apps/app/Cargo.toml b/apps/app/Cargo.toml
index 572b13ba7..72a184142 100644
--- a/apps/app/Cargo.toml
+++ b/apps/app/Cargo.toml
@@ -46,6 +46,9 @@ sentry-rust-minidump = "0.7.0"
 lazy_static = "1"
 once_cell = "1"
 
+dashmap = "6.0.1"
+paste = "1.0.15"
+
 [target.'cfg(not(target_os = "linux"))'.dependencies]
 window-shadows = "0.2.1"
 
diff --git a/apps/app/Info.plist b/apps/app/Info.plist
index f10c79882..c7d4a53b0 100644
--- a/apps/app/Info.plist
+++ b/apps/app/Info.plist
@@ -7,7 +7,7 @@
             <dict>
                 <key>CFBundleURLName</key>
                 <!-- Obviously needs to be replaced with your app's bundle identifier -->
-                <string>com.modrinth.theseus</string>
+                <string>ModrinthApp</string>
                 <key>CFBundleURLSchemes</key>
                 <array>
                     <!-- register the myapp:// and myscheme:// schemes -->
@@ -27,7 +27,7 @@
     			<string>Owner</string>
     			<key>LSItemContentTypes</key>
     			<array>
-    				<string>com.modrinth.theseus-type</string>
+    				<string>ModrinthApp-type</string>
     			</array>
     			<key>NSDocumentClass</key>
     			<string>NSDocument</string>
@@ -45,7 +45,7 @@
     			<key>UTTypeIcons</key>
     			<dict/>
     			<key>UTTypeIdentifier</key>
-    			<string>com.modrinth.theseus-type</string>
+    			<string>ModrinthApp-type</string>
     			<key>UTTypeTagSpecification</key>
     			<dict>
     				<key>public.filename-extension</key>
diff --git a/apps/app/src/api/cache.rs b/apps/app/src/api/cache.rs
new file mode 100644
index 000000000..40e2f9569
--- /dev/null
+++ b/apps/app/src/api/cache.rs
@@ -0,0 +1,53 @@
+use crate::api::Result;
+use theseus::prelude::*;
+
+macro_rules! impl_cache_methods {
+    ($(($variant:ident, $type:ty)),*) => {
+        $(
+            paste::paste! {
+                #[tauri::command]
+                pub async fn [<get_ $variant:snake>](id: &str) -> Result<Option<$type>>
+                {
+                    Ok(theseus::cache::[<get_ $variant:snake>](id).await?)
+                }
+
+                #[tauri::command]
+                pub async fn [<get_ $variant:snake _many>](
+                    ids: Vec<String>,
+                ) -> Result<Vec<$type>>
+                {
+                    let ids = ids.iter().map(|x| &**x).collect::<Vec<&str>>();
+                    let entries =
+                        theseus::cache::[<get_ $variant:snake _many>](&*ids).await?;
+
+                    Ok(entries)
+                }
+            }
+        )*
+    }
+}
+
+impl_cache_methods!(
+    (Project, Project),
+    (Version, Version),
+    (User, User),
+    (Team, Vec<TeamMember>),
+    (Organization, Organization)
+);
+
+pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
+    tauri::plugin::Builder::new("cache")
+        .invoke_handler(tauri::generate_handler![
+            get_project,
+            get_project_many,
+            get_version,
+            get_version_many,
+            get_user,
+            get_user_many,
+            get_team,
+            get_team_many,
+            get_organization,
+            get_organization_many,
+        ])
+        .build()
+}
diff --git a/apps/app/src/api/import.rs b/apps/app/src/api/import.rs
index de7e075ee..5b3ea727c 100644
--- a/apps/app/src/api/import.rs
+++ b/apps/app/src/api/import.rs
@@ -4,13 +4,12 @@ use crate::api::Result;
 use theseus::pack::import::ImportLauncherType;
 
 use theseus::pack::import;
-use theseus::prelude::ProfilePathId;
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("import")
         .invoke_handler(tauri::generate_handler![
             import_get_importable_instances,
-            import_import_instance,
+            // import_import_instance,
             import_is_valid_importable_instance,
             import_get_default_launcher_path,
         ])
@@ -31,22 +30,22 @@ pub async fn import_get_importable_instances(
 /// Import an instance from a launcher type and base path
 /// profile_path should be a blank profile for this purpose- if the function fails, it will be deleted
 /// eg: import_instance(ImportLauncherType::MultiMC, PathBuf::from("C:/MultiMC"), "Instance 1")
-#[tauri::command]
-pub async fn import_import_instance(
-    profile_path: ProfilePathId,
-    launcher_type: ImportLauncherType,
-    base_path: PathBuf,
-    instance_folder: String,
-) -> Result<()> {
-    import::import_instance(
-        profile_path,
-        launcher_type,
-        base_path,
-        instance_folder,
-    )
-    .await?;
-    Ok(())
-}
+// #[tauri::command]
+// pub async fn import_import_instance(
+//     profile_path: &str,
+//     launcher_type: ImportLauncherType,
+//     base_path: PathBuf,
+//     instance_folder: String,
+// ) -> Result<()> {
+//     import::import_instance(
+//         profile_path,
+//         launcher_type,
+//         base_path,
+//         instance_folder,
+//     )
+//     .await?;
+//     Ok(())
+// }
 
 /// Checks if this instance is valid for importing, given a certain launcher type
 /// eg: is_valid_importable_instance(PathBuf::from("C:/MultiMC/Instance 1"), ImportLauncherType::MultiMC)
diff --git a/apps/app/src/api/logs.rs b/apps/app/src/api/logs.rs
index 213130866..dba977829 100644
--- a/apps/app/src/api/logs.rs
+++ b/apps/app/src/api/logs.rs
@@ -1,9 +1,6 @@
 use crate::api::Result;
 use theseus::logs::LogType;
-use theseus::{
-    logs::{self, CensoredString, LatestLogCursor, Logs},
-    prelude::ProfilePathId,
-};
+use theseus::logs::{self, CensoredString, LatestLogCursor, Logs};
 
 /*
 A log is a struct containing the filename string, stdout, and stderr, as follows:
@@ -31,7 +28,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
 /// Get all Logs for a profile, sorted by filename
 #[tauri::command]
 pub async fn logs_get_logs(
-    profile_path: ProfilePathId,
+    profile_path: &str,
     clear_contents: Option<bool>,
 ) -> Result<Vec<Logs>> {
     let val = logs::get_logs(profile_path, clear_contents).await?;
@@ -42,7 +39,7 @@ pub async fn logs_get_logs(
 /// Get a Log struct for a profile by profile id and filename string
 #[tauri::command]
 pub async fn logs_get_logs_by_filename(
-    profile_path: ProfilePathId,
+    profile_path: &str,
     log_type: LogType,
     filename: String,
 ) -> Result<Logs> {
@@ -52,21 +49,10 @@ pub async fn logs_get_logs_by_filename(
 /// Get the stdout for a profile by profile id and filename string
 #[tauri::command]
 pub async fn logs_get_output_by_filename(
-    profile_path: ProfilePathId,
+    profile_path: &str,
     log_type: LogType,
     filename: String,
 ) -> Result<CensoredString> {
-    let profile_path = if let Some(p) =
-        crate::profile::get(&profile_path, None).await?
-    {
-        p.profile_id()
-    } else {
-        return Err(theseus::Error::from(
-            theseus::ErrorKind::UnmanagedProfileError(profile_path.to_string()),
-        )
-        .into());
-    };
-
     Ok(
         logs::get_output_by_filename(&profile_path, log_type, &filename)
             .await?,
@@ -75,14 +61,14 @@ pub async fn logs_get_output_by_filename(
 
 /// Delete all logs for a profile by profile id
 #[tauri::command]
-pub async fn logs_delete_logs(profile_path: ProfilePathId) -> Result<()> {
+pub async fn logs_delete_logs(profile_path: &str) -> Result<()> {
     Ok(logs::delete_logs(profile_path).await?)
 }
 
 /// Delete a log for a profile by profile id and filename string
 #[tauri::command]
 pub async fn logs_delete_logs_by_filename(
-    profile_path: ProfilePathId,
+    profile_path: &str,
     log_type: LogType,
     filename: String,
 ) -> Result<()> {
@@ -95,7 +81,7 @@ pub async fn logs_delete_logs_by_filename(
 /// Get live log from a cursor
 #[tauri::command]
 pub async fn logs_get_latest_log_cursor(
-    profile_path: ProfilePathId,
+    profile_path: &str,
     cursor: u64, // 0 to start at beginning of file
 ) -> Result<LatestLogCursor> {
     Ok(logs::get_latest_log_cursor(profile_path, cursor).await?)
diff --git a/apps/app/src/api/metadata.rs b/apps/app/src/api/metadata.rs
index 7da659b4a..9364924e5 100644
--- a/apps/app/src/api/metadata.rs
+++ b/apps/app/src/api/metadata.rs
@@ -6,10 +6,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("metadata")
         .invoke_handler(tauri::generate_handler![
             metadata_get_game_versions,
-            metadata_get_fabric_versions,
-            metadata_get_forge_versions,
-            metadata_get_quilt_versions,
-            metadata_get_neoforge_versions,
+            metadata_get_loader_versions,
         ])
         .build()
 }
@@ -22,24 +19,6 @@ pub async fn metadata_get_game_versions() -> Result<VersionManifest> {
 
 /// Gets the fabric versions from daedalus
 #[tauri::command]
-pub async fn metadata_get_fabric_versions() -> Result<Manifest> {
-    Ok(theseus::metadata::get_fabric_versions().await?)
-}
-
-/// Gets the forge versions from daedalus
-#[tauri::command]
-pub async fn metadata_get_forge_versions() -> Result<Manifest> {
-    Ok(theseus::metadata::get_forge_versions().await?)
-}
-
-/// Gets the quilt versions from daedalus
-#[tauri::command]
-pub async fn metadata_get_quilt_versions() -> Result<Manifest> {
-    Ok(theseus::metadata::get_quilt_versions().await?)
-}
-
-/// Gets the quilt versions from daedalus
-#[tauri::command]
-pub async fn metadata_get_neoforge_versions() -> Result<Manifest> {
-    Ok(theseus::metadata::get_neoforge_versions().await?)
+pub async fn metadata_get_loader_versions(loader: &str) -> Result<Manifest> {
+    Ok(theseus::metadata::get_loader_versions(loader).await?)
 }
diff --git a/apps/app/src/api/mod.rs b/apps/app/src/api/mod.rs
index 7602317de..649388453 100644
--- a/apps/app/src/api/mod.rs
+++ b/apps/app/src/api/mod.rs
@@ -16,6 +16,8 @@ pub mod settings;
 pub mod tags;
 pub mod utils;
 
+pub mod cache;
+
 pub type Result<T> = std::result::Result<T, TheseusSerializableError>;
 
 // // Main returnable Theseus GUI error
diff --git a/apps/app/src/api/pack.rs b/apps/app/src/api/pack.rs
index 3d04a1527..a78af16c5 100644
--- a/apps/app/src/api/pack.rs
+++ b/apps/app/src/api/pack.rs
@@ -20,8 +20,8 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
 #[tauri::command]
 pub async fn pack_install(
     location: CreatePackLocation,
-    profile: ProfilePathId,
-) -> Result<ProfilePathId> {
+    profile: String,
+) -> Result<String> {
     Ok(install_zipped_mrpack(location, profile).await?)
 }
 
diff --git a/apps/app/src/api/process.rs b/apps/app/src/api/process.rs
index 08740dcb6..02276276a 100644
--- a/apps/app/src/api/process.rs
+++ b/apps/app/src/api/process.rs
@@ -47,15 +47,14 @@ pub async fn process_get_all_running_uuids() -> Result<Vec<Uuid>> {
 // Gets all process UUIDs by profile path
 #[tauri::command]
 pub async fn process_get_uuids_by_profile_path(
-    profile_path: ProfilePathId,
+    profile_path: &str,
 ) -> Result<Vec<Uuid>> {
     Ok(process::get_uuids_by_profile_path(profile_path).await?)
 }
 
 // Gets the Profile paths of each *running* stored process in the state
 #[tauri::command]
-pub async fn process_get_all_running_profile_paths(
-) -> Result<Vec<ProfilePathId>> {
+pub async fn process_get_all_running_profile_paths() -> Result<Vec<String>> {
     Ok(process::get_all_running_profile_paths().await?)
 }
 
diff --git a/apps/app/src/api/profile.rs b/apps/app/src/api/profile.rs
index fe66a8d49..c1d6cc2d3 100644
--- a/apps/app/src/api/profile.rs
+++ b/apps/app/src/api/profile.rs
@@ -1,9 +1,9 @@
 use crate::api::Result;
-use daedalus::modded::LoaderVersion;
+use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
-use theseus::{prelude::*, InnerProjectPathUnix};
+use theseus::prelude::*;
 use uuid::Uuid;
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
@@ -11,6 +11,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
         .invoke_handler(tauri::generate_handler![
             profile_remove,
             profile_get,
+            profile_get_projects,
             profile_get_optimal_jre_key,
             profile_get_full_path,
             profile_get_mod_full_path,
@@ -40,7 +41,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
 // Remove a profile
 // invoke('plugin:profile|profile_add_path',path)
 #[tauri::command]
-pub async fn profile_remove(path: ProfilePathId) -> Result<()> {
+pub async fn profile_remove(path: &str) -> Result<()> {
     profile::remove(&path).await?;
     Ok(())
 }
@@ -48,18 +49,23 @@ pub async fn profile_remove(path: ProfilePathId) -> Result<()> {
 // Get a profile by path
 // invoke('plugin:profile|profile_add_path',path)
 #[tauri::command]
-pub async fn profile_get(
-    path: ProfilePathId,
-    clear_projects: Option<bool>,
-) -> Result<Option<Profile>> {
-    let res = profile::get(&path, clear_projects).await?;
+pub async fn profile_get(path: &str) -> Result<Option<Profile>> {
+    let res = profile::get(&path).await?;
+    Ok(res)
+}
+
+#[tauri::command]
+pub async fn profile_get_projects(
+    path: &str,
+) -> Result<DashMap<String, ProfileFile>> {
+    let res = profile::get_projects(&path).await?;
     Ok(res)
 }
 
 // Get a profile's full path
 // invoke('plugin:profile|profile_get_full_path',path)
 #[tauri::command]
-pub async fn profile_get_full_path(path: ProfilePathId) -> Result<PathBuf> {
+pub async fn profile_get_full_path(path: &str) -> Result<PathBuf> {
     let res = profile::get_full_path(&path).await?;
     Ok(res)
 }
@@ -68,8 +74,8 @@ pub async fn profile_get_full_path(path: ProfilePathId) -> Result<PathBuf> {
 // invoke('plugin:profile|profile_get_mod_full_path',path)
 #[tauri::command]
 pub async fn profile_get_mod_full_path(
-    path: ProfilePathId,
-    project_path: ProjectPathId,
+    path: &str,
+    project_path: &str,
 ) -> Result<PathBuf> {
     let res = profile::get_mod_full_path(&path, &project_path).await?;
     Ok(res)
@@ -78,7 +84,7 @@ pub async fn profile_get_mod_full_path(
 // Get optimal java version from profile
 #[tauri::command]
 pub async fn profile_get_optimal_jre_key(
-    path: ProfilePathId,
+    path: &str,
 ) -> Result<Option<JavaVersion>> {
     let res = profile::get_optimal_jre_key(&path).await?;
     Ok(res)
@@ -87,24 +93,23 @@ pub async fn profile_get_optimal_jre_key(
 // Get a copy of the profile set
 // invoke('plugin:profile|profile_list')
 #[tauri::command]
-pub async fn profile_list(
-    clear_projects: Option<bool>,
-) -> Result<HashMap<ProfilePathId, Profile>> {
-    let res = profile::list(clear_projects).await?;
+pub async fn profile_list() -> Result<dashmap::DashMap<String, Profile>> {
+    let res = profile::list().await?;
     Ok(res)
 }
 
 #[tauri::command]
 pub async fn profile_check_installed(
-    path: ProfilePathId,
-    project_id: String,
+    path: &str,
+    project_id: &str,
 ) -> Result<bool> {
-    let profile = profile_get(path, None).await?;
-    if let Some(profile) = profile {
-        Ok(profile.projects.into_iter().any(|(_, project)| {
-            if let ProjectMetadata::Modrinth { project, .. } = &project.metadata
+    let check_project_id = project_id;
+
+    if let Ok(projects) = profile::get_projects(path).await {
+        Ok(projects.into_iter().any(|(_, project)| {
+            if let FileMetadata::Modrinth { project_id, .. } = &project.metadata
             {
-                project.id == project_id
+                check_project_id == project_id
             } else {
                 false
             }
@@ -117,7 +122,7 @@ pub async fn profile_check_installed(
 /// Installs/Repairs a profile
 /// invoke('plugin:profile|profile_install')
 #[tauri::command]
-pub async fn profile_install(path: ProfilePathId, force: bool) -> Result<()> {
+pub async fn profile_install(path: &str, force: bool) -> Result<()> {
     profile::install(&path, force).await?;
     Ok(())
 }
@@ -125,9 +130,7 @@ pub async fn profile_install(path: ProfilePathId, force: bool) -> Result<()> {
 /// Updates all of the profile's projects
 /// invoke('plugin:profile|profile_update_all')
 #[tauri::command]
-pub async fn profile_update_all(
-    path: ProfilePathId,
-) -> Result<HashMap<ProjectPathId, ProjectPathId>> {
+pub async fn profile_update_all(path: &str) -> Result<HashMap<String, String>> {
     Ok(profile::update_all_projects(&path).await?)
 }
 
@@ -135,9 +138,9 @@ pub async fn profile_update_all(
 /// invoke('plugin:profile|profile_update_project')
 #[tauri::command]
 pub async fn profile_update_project(
-    path: ProfilePathId,
-    project_path: ProjectPathId,
-) -> Result<ProjectPathId> {
+    path: &str,
+    project_path: &str,
+) -> Result<String> {
     Ok(profile::update_project(&path, &project_path, None).await?)
 }
 
@@ -145,9 +148,9 @@ pub async fn profile_update_project(
 // invoke('plugin:profile|profile_add_project_from_version')
 #[tauri::command]
 pub async fn profile_add_project_from_version(
-    path: ProfilePathId,
-    version_id: String,
-) -> Result<ProjectPathId> {
+    path: &str,
+    version_id: &str,
+) -> Result<String> {
     Ok(profile::add_project_from_version(&path, version_id).await?)
 }
 
@@ -155,10 +158,10 @@ pub async fn profile_add_project_from_version(
 // invoke('plugin:profile|profile_add_project_from_path')
 #[tauri::command]
 pub async fn profile_add_project_from_path(
-    path: ProfilePathId,
+    path: &str,
     project_path: &Path,
-    project_type: Option<String>,
-) -> Result<ProjectPathId> {
+    project_type: Option<ProjectType>,
+) -> Result<String> {
     let res = profile::add_project_from_path(&path, project_path, project_type)
         .await?;
     Ok(res)
@@ -168,9 +171,9 @@ pub async fn profile_add_project_from_path(
 // invoke('plugin:profile|profile_toggle_disable_project')
 #[tauri::command]
 pub async fn profile_toggle_disable_project(
-    path: ProfilePathId,
-    project_path: ProjectPathId,
-) -> Result<ProjectPathId> {
+    path: &str,
+    project_path: &str,
+) -> Result<String> {
     Ok(profile::toggle_disable_project(&path, &project_path).await?)
 }
 
@@ -178,8 +181,8 @@ pub async fn profile_toggle_disable_project(
 // invoke('plugin:profile|profile_remove_project')
 #[tauri::command]
 pub async fn profile_remove_project(
-    path: ProfilePathId,
-    project_path: ProjectPathId,
+    path: &str,
+    project_path: &str,
 ) -> Result<()> {
     profile::remove_project(&path, &project_path).await?;
     Ok(())
@@ -188,7 +191,7 @@ pub async fn profile_remove_project(
 // Updates a managed Modrinth profile to a version of version_id
 #[tauri::command]
 pub async fn profile_update_managed_modrinth_version(
-    path: ProfilePathId,
+    path: String,
     version_id: String,
 ) -> Result<()> {
     Ok(
@@ -199,9 +202,7 @@ pub async fn profile_update_managed_modrinth_version(
 
 // Repairs a managed Modrinth profile by updating it to the current version
 #[tauri::command]
-pub async fn profile_repair_managed_modrinth(
-    path: ProfilePathId,
-) -> Result<()> {
+pub async fn profile_repair_managed_modrinth(path: &str) -> Result<()> {
     Ok(profile::update::repair_managed_modrinth(&path).await?)
 }
 
@@ -209,7 +210,7 @@ pub async fn profile_repair_managed_modrinth(
 // invoke('profile_export_mrpack')
 #[tauri::command]
 pub async fn profile_export_mrpack(
-    path: ProfilePathId,
+    path: &str,
     export_location: PathBuf,
     included_overrides: Vec<String>,
     version_id: Option<String>,
@@ -231,8 +232,8 @@ pub async fn profile_export_mrpack(
 /// See [`profile::get_pack_export_candidates`]
 #[tauri::command]
 pub async fn profile_get_pack_export_candidates(
-    profile_path: ProfilePathId,
-) -> Result<Vec<InnerProjectPathUnix>> {
+    profile_path: &str,
+) -> Result<Vec<String>> {
     let candidates = profile::get_pack_export_candidates(&profile_path).await?;
     Ok(candidates)
 }
@@ -242,7 +243,7 @@ pub async fn profile_get_pack_export_candidates(
 // for the actual Child in the state.
 // invoke('plugin:profile|profile_run', path)
 #[tauri::command]
-pub async fn profile_run(path: ProfilePathId) -> Result<Uuid> {
+pub async fn profile_run(path: &str) -> Result<Uuid> {
     let minecraft_child = profile::run(&path).await?;
     let uuid = minecraft_child.read().await.uuid;
     Ok(uuid)
@@ -251,7 +252,7 @@ pub async fn profile_run(path: ProfilePathId) -> Result<Uuid> {
 // Run Minecraft using a profile using the default credentials, and wait for the result
 // invoke('plugin:profile|profile_run_wait', path)
 #[tauri::command]
-pub async fn profile_run_wait(path: ProfilePathId) -> Result<()> {
+pub async fn profile_run_wait(path: &str) -> Result<()> {
     let proc_lock = profile::run(&path).await?;
     let mut proc = proc_lock.write().await;
     Ok(process::wait_for(&mut proc).await?)
@@ -263,7 +264,7 @@ pub async fn profile_run_wait(path: ProfilePathId) -> Result<()> {
 // invoke('plugin:profile|profile_run_credentials', {path, credentials})')
 #[tauri::command]
 pub async fn profile_run_credentials(
-    path: ProfilePathId,
+    path: &str,
     credentials: Credentials,
 ) -> Result<Uuid> {
     let minecraft_child = profile::run_credentials(&path, &credentials).await?;
@@ -276,7 +277,7 @@ pub async fn profile_run_credentials(
 // invoke('plugin:profile|profile_run_wait', {path, credentials)
 #[tauri::command]
 pub async fn profile_run_wait_credentials(
-    path: ProfilePathId,
+    path: &str,
     credentials: Credentials,
 ) -> Result<()> {
     let proc_lock = profile::run_credentials(&path, &credentials).await?;
@@ -286,62 +287,61 @@ pub async fn profile_run_wait_credentials(
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct EditProfile {
-    pub metadata: Option<EditProfileMetadata>,
-    pub java: Option<JavaSettings>,
-    pub memory: Option<MemorySettings>,
-    pub resolution: Option<WindowSize>,
-    pub hooks: Option<Hooks>,
-    pub fullscreen: Option<bool>,
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct EditProfileMetadata {
     pub name: Option<String>,
+
     pub game_version: Option<String>,
     pub loader: Option<ModLoader>,
-    pub loader_version: Option<LoaderVersion>,
-    pub linked_data: Option<LinkedData>,
+    pub loader_version: Option<String>,
+
     pub groups: Option<Vec<String>>,
+
+    pub linked_data: Option<LinkedData>,
+
+    pub java_path: Option<String>,
+    pub extra_launch_args: Option<Vec<String>>,
+    pub custom_env_vars: Option<Vec<(String, String)>>,
+
+    pub memory: Option<MemorySettings>,
+    pub force_fullscreen: Option<bool>,
+    pub game_resolution: Option<WindowSize>,
+    pub hooks: Option<Hooks>,
 }
 
 // Edits a profile
 // invoke('plugin:profile|profile_edit', {path, editProfile})
 #[tauri::command]
-pub async fn profile_edit(
-    path: ProfilePathId,
-    edit_profile: EditProfile,
-) -> Result<()> {
+pub async fn profile_edit(path: &str, edit_profile: EditProfile) -> Result<()> {
     profile::edit(&path, |prof| {
-        if let Some(metadata) = edit_profile.metadata.clone() {
-            if let Some(name) = metadata.name {
-                prof.metadata.name = name;
-            }
-            if let Some(game_version) = metadata.game_version {
-                prof.metadata.game_version = game_version;
-            }
-            if let Some(loader) = metadata.loader {
-                prof.metadata.loader = loader;
-            }
-            prof.metadata.loader_version = metadata.loader_version;
-            prof.metadata.linked_data = metadata.linked_data;
+        if let Some(name) = edit_profile.name.clone() {
+            prof.name = name;
+        }
+        if let Some(game_version) = edit_profile.game_version.clone() {
+            prof.game_version = game_version;
+        }
+        if let Some(loader) = edit_profile.loader.clone() {
+            prof.loader = loader;
+        }
+        prof.loader_version.clone_from(&edit_profile.loader_version);
+        prof.linked_data.clone_from(&edit_profile.linked_data);
 
-            if let Some(groups) = metadata.groups {
-                prof.metadata.groups = groups;
-            }
+        if let Some(groups) = edit_profile.groups.clone() {
+            prof.groups = groups;
         }
 
-        prof.java.clone_from(&edit_profile.java);
+        prof.java_path.clone_from(&edit_profile.java_path);
         prof.memory = edit_profile.memory;
-        prof.resolution = edit_profile.resolution;
-        prof.fullscreen = edit_profile.fullscreen;
-        prof.hooks.clone_from(&edit_profile.hooks);
+        prof.game_resolution = edit_profile.game_resolution;
+        prof.force_fullscreen = edit_profile.force_fullscreen;
+
+        if let Some(hooks) = edit_profile.hooks.clone() {
+            prof.hooks = hooks;
+        }
 
-        prof.metadata.date_modified = chrono::Utc::now();
+        prof.modified = chrono::Utc::now();
 
         async { Ok(()) }
     })
     .await?;
-    State::sync().await?;
 
     Ok(())
 }
@@ -350,7 +350,7 @@ pub async fn profile_edit(
 // invoke('plugin:profile|profile_edit_icon')
 #[tauri::command]
 pub async fn profile_edit_icon(
-    path: ProfilePathId,
+    path: &str,
     icon_path: Option<&Path>,
 ) -> Result<()> {
     profile::edit_icon(&path, icon_path).await?;
diff --git a/apps/app/src/api/profile_create.rs b/apps/app/src/api/profile_create.rs
index fff7a7e84..26b1e5abb 100644
--- a/apps/app/src/api/profile_create.rs
+++ b/apps/app/src/api/profile_create.rs
@@ -1,5 +1,4 @@
 use crate::api::Result;
-use std::path::PathBuf;
 use theseus::prelude::*;
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
@@ -19,9 +18,9 @@ pub async fn profile_create(
     game_version: String, // the game version of the profile
     modloader: ModLoader, // the modloader to use
     loader_version: Option<String>, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
-    icon: Option<PathBuf>,          // the icon for the profile
-    no_watch: Option<bool>,
-) -> Result<ProfilePathId> {
+    icon: Option<String>,           // the icon for the profile
+    skip_install: Option<bool>,
+) -> Result<String> {
     let res = profile::create::profile_create(
         name,
         game_version,
@@ -29,9 +28,7 @@ pub async fn profile_create(
         loader_version,
         icon,
         None,
-        None,
-        None,
-        no_watch,
+        skip_install,
     )
     .await?;
     Ok(res)
@@ -40,7 +37,7 @@ pub async fn profile_create(
 // Creates a profile from a duplicate
 // invoke('plugin:profile_create|profile_duplicate',profile)
 #[tauri::command]
-pub async fn profile_duplicate(path: ProfilePathId) -> Result<ProfilePathId> {
+pub async fn profile_duplicate(path: &str) -> Result<String> {
     let res = profile::create::profile_create_from_duplicate(path).await?;
     Ok(res)
 }
diff --git a/apps/app/src/api/settings.rs b/apps/app/src/api/settings.rs
index 324761095..cf372fae5 100644
--- a/apps/app/src/api/settings.rs
+++ b/apps/app/src/api/settings.rs
@@ -1,16 +1,9 @@
-use std::path::PathBuf;
-
 use crate::api::Result;
 use theseus::prelude::*;
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("settings")
-        .invoke_handler(tauri::generate_handler![
-            settings_get,
-            settings_set,
-            settings_change_config_dir,
-            settings_is_dir_writeable
-        ])
+        .invoke_handler(tauri::generate_handler![settings_get, settings_set])
         .build()
 }
 
@@ -29,20 +22,3 @@ pub async fn settings_set(settings: Settings) -> Result<()> {
     settings::set(settings).await?;
     Ok(())
 }
-
-// Change config directory
-// Seizes the entire State to do it
-// invoke('plugin:settings|settings_change_config_dir', new_dir)
-#[tauri::command]
-pub async fn settings_change_config_dir(new_config_dir: PathBuf) -> Result<()> {
-    settings::set_config_dir(new_config_dir).await?;
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn settings_is_dir_writeable(
-    new_config_dir: PathBuf,
-) -> Result<bool> {
-    let res = settings::is_dir_writeable(new_config_dir).await?;
-    Ok(res)
-}
diff --git a/apps/app/src/api/tags.rs b/apps/app/src/api/tags.rs
index cecaba24f..b69d221d7 100644
--- a/apps/app/src/api/tags.rs
+++ b/apps/app/src/api/tags.rs
@@ -1,5 +1,5 @@
 use crate::api::Result;
-use theseus::tags::{Category, DonationPlatform, GameVersion, Loader, Tags};
+use theseus::tags::{Category, DonationPlatform, GameVersion, Loader};
 
 pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
     tauri::plugin::Builder::new("tags")
@@ -9,7 +9,6 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             tags_get_loaders,
             tags_get_game_versions,
             tags_get_donation_platforms,
-            tags_get_tag_bundle,
         ])
         .build()
 }
@@ -43,9 +42,3 @@ pub async fn tags_get_game_versions() -> Result<Vec<GameVersion>> {
 pub async fn tags_get_donation_platforms() -> Result<Vec<DonationPlatform>> {
     Ok(theseus::tags::get_donation_platform_tags().await?)
 }
-
-/// Gets cached tag bundle from the database
-#[tauri::command]
-pub async fn tags_get_tag_bundle() -> Result<Tags> {
-    Ok(theseus::tags::get_tag_bundle().await?)
-}
diff --git a/apps/app/src/api/utils.rs b/apps/app/src/api/utils.rs
index ef7cb575a..c84312772 100644
--- a/apps/app/src/api/utils.rs
+++ b/apps/app/src/api/utils.rs
@@ -16,9 +16,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             show_in_folder,
             show_launcher_logs_folder,
             progress_bars_list,
-            safety_check_safe_loading_bars,
             get_opening_command,
-            await_sync,
             is_offline,
             refresh_offline
         ])
@@ -54,12 +52,6 @@ pub async fn progress_bars_list(
     Ok(res)
 }
 
-// Check if there are any safe loading bars running
-#[tauri::command]
-pub async fn safety_check_safe_loading_bars() -> Result<bool> {
-    Ok(theseus::safety::check_safe_loading_bars().await?)
-}
-
 // cfg only on mac os
 // disables mouseover and fixes a random crash error only fixed by recent versions of macos
 #[cfg(target_os = "macos")]
@@ -165,14 +157,6 @@ pub async fn handle_command(command: String) -> Result<()> {
     Ok(theseus::handler::parse_and_emit_command(&command).await?)
 }
 
-// Waits for state to be synced
-#[tauri::command]
-pub async fn await_sync() -> Result<()> {
-    State::sync().await?;
-    tracing::debug!("State synced");
-    Ok(())
-}
-
 /// Check if theseus is currently in offline mode, without a refresh attempt
 #[tauri::command]
 pub async fn is_offline() -> Result<bool> {
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index 73d12d660..26788fc09 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -17,9 +17,10 @@ mod macos;
 #[tauri::command]
 async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
     theseus::EventState::init(app).await?;
-    let s = State::get().await?;
+    State::init().await?;
     State::update();
 
+    let s = State::get().await?;
     s.children.write().await.rescue_cache().await?;
     Ok(())
 }
@@ -50,7 +51,7 @@ struct Payload {
 // if Tauri app is called with arguments, then those arguments will be treated as commands
 // ie: deep links or filepaths for .mrpacks
 fn main() {
-    tauri_plugin_deep_link::prepare("com.modrinth.theseus");
+    tauri_plugin_deep_link::prepare("ModrinthApp");
 
     /*
         tracing is set basd on the environment variable RUST_LOG=xxx, depending on the amount of logs to show
@@ -128,6 +129,7 @@ fn main() {
             }
         })
     }
+
     let builder = builder
         .plugin(api::auth::init())
         .plugin(api::mr_auth::init())
@@ -142,6 +144,7 @@ fn main() {
         .plugin(api::settings::init())
         .plugin(api::tags::init())
         .plugin(api::utils::init())
+        .plugin(api::cache::init())
         .invoke_handler(tauri::generate_handler![
             initialize_state,
             is_dev,
diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json
index 0cb4c834d..970c0a143 100644
--- a/apps/app/tauri.conf.json
+++ b/apps/app/tauri.conf.json
@@ -20,8 +20,8 @@
         "asset": true,
         "assetScope": [
           "$APPDATA/caches/icons/*",
-          "$APPCONFIG/caches/icons/*",
-          "$CONFIG/caches/icons/*"
+          "$APPDATA/caches/icons/*",
+          "$APPDATA/caches/icons/*"
         ]
       },
       "shell": {
@@ -56,7 +56,7 @@
       },
       "externalBin": [],
       "icon": ["icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"],
-      "identifier": "com.modrinth.theseus",
+      "identifier": "ModrinthApp",
       "longDescription": "",
       "macOS": {
         "entitlements": "App.entitlements",
diff --git a/packages/app-lib/src/api/cache.rs b/packages/app-lib/src/api/cache.rs
new file mode 100644
index 000000000..606811d7e
--- /dev/null
+++ b/packages/app-lib/src/api/cache.rs
@@ -0,0 +1,40 @@
+use crate::state::{
+    CachedEntry, Organization, Project, TeamMember, User, Version,
+};
+
+macro_rules! impl_cache_methods {
+    ($(($variant:ident, $type:ty)),*) => {
+        $(
+            paste::paste! {
+                #[tracing::instrument]
+                pub async fn [<get_ $variant:snake>](
+                    id: &str,
+                ) -> crate::Result<Option<$type>>
+                {
+                    let state = crate::State::get().await?;
+                    Ok(CachedEntry::[<get_ $variant:snake _many>](&[id], None, &state.pool, &state.fetch_semaphore).await?.into_iter().next())
+                }
+
+                #[tracing::instrument]
+                pub async fn [<get_ $variant:snake _many>](
+                    ids: &[&str],
+                ) -> crate::Result<Vec<$type>>
+                {
+                    let state = crate::State::get().await?;
+                    let entries =
+                        CachedEntry::[<get_ $variant:snake _many>](ids, None, &state.pool, &state.fetch_semaphore).await?;
+
+                    Ok(entries)
+                }
+            }
+        )*
+    }
+}
+
+impl_cache_methods!(
+    (Project, Project),
+    (Version, Version),
+    (User, User),
+    (Team, Vec<TeamMember>),
+    (Organization, Organization)
+);
diff --git a/packages/app-lib/src/api/mod.rs b/packages/app-lib/src/api/mod.rs
index 1d46f6b7e..0a9fd1bd1 100644
--- a/packages/app-lib/src/api/mod.rs
+++ b/packages/app-lib/src/api/mod.rs
@@ -1,4 +1,5 @@
 //! API for interacting with Theseus
+pub mod cache;
 pub mod handler;
 pub mod jre;
 pub mod logs;
@@ -8,15 +9,16 @@ pub mod mr_auth;
 pub mod pack;
 pub mod process;
 pub mod profile;
-pub mod safety;
 pub mod settings;
 pub mod tags;
 
 pub mod data {
     pub use crate::state::{
-        Credentials, DirectoryInfo, Hooks, LinkedData, MemorySettings,
-        ModLoader, ModrinthCredentials, ModrinthCredentialsResult, Settings,
-        Theme, WindowSize,
+        Credentials, Dependency, DirectoryInfo, FileMetadata, Hooks,
+        JavaVersion, LinkedData, MemorySettings, ModLoader,
+        ModrinthCredentials, ModrinthCredentialsResult, Organization,
+        ProfileFile, Project, ProjectType, Settings, TeamMember, Theme, User,
+        Version, WindowSize,
     };
 }
 
@@ -27,7 +29,6 @@ pub mod prelude {
         jre, metadata, minecraft_auth, pack, process,
         profile::{self, create, Profile},
         settings,
-        state::Dependency,
         util::io::{canonicalize, IOError},
         State,
     };
diff --git a/packages/app-lib/src/api/pack/install_from.rs b/packages/app-lib/src/api/pack/install_from.rs
index b01030f47..9096bd157 100644
--- a/packages/app-lib/src/api/pack/install_from.rs
+++ b/packages/app-lib/src/api/pack/install_from.rs
@@ -84,7 +84,7 @@ pub enum PackDependency {
     Minecraft,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase", tag = "type")]
 pub enum CreatePackLocation {
     // Create a pack from a modrinth version ID (such as a modpack)
diff --git a/packages/app-lib/src/api/profile/create.rs b/packages/app-lib/src/api/profile/create.rs
index 608fc55ec..ce2cbc240 100644
--- a/packages/app-lib/src/api/profile/create.rs
+++ b/packages/app-lib/src/api/profile/create.rs
@@ -26,7 +26,6 @@ pub async fn profile_create(
     icon_path: Option<String>,      // the icon for the profile
     linked_data: Option<LinkedData>, // the linked project ID (mainly for modpacks)- used for updating
     skip_install_profile: Option<bool>,
-    no_watch: Option<bool>,
 ) -> crate::Result<String> {
     trace!("Creating new profile. {}", name);
     let state = State::get().await?;
@@ -161,7 +160,6 @@ pub async fn profile_create_from_duplicate(
         profile.icon_path.clone(),
         profile.linked_data.clone(),
         Some(true),
-        Some(true),
     )
     .await?;
 
diff --git a/packages/app-lib/src/api/safety.rs b/packages/app-lib/src/api/safety.rs
deleted file mode 100644
index fb16312b0..000000000
--- a/packages/app-lib/src/api/safety.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-use crate::state::{ProcessType, SafeProcesses};
-
-pub async fn check_safe_loading_bars() -> crate::Result<bool> {
-    SafeProcesses::is_complete(ProcessType::LoadingBar).await
-}
diff --git a/packages/app-lib/src/event/emit.rs b/packages/app-lib/src/event/emit.rs
index 00ad607f3..70efcd0d0 100644
--- a/packages/app-lib/src/event/emit.rs
+++ b/packages/app-lib/src/event/emit.rs
@@ -1,10 +1,7 @@
 use super::LoadingBarId;
-use crate::{
-    event::{
-        CommandPayload, EventError, LoadingBar, LoadingBarType,
-        ProcessPayloadType, ProfilePayloadType,
-    },
-    state::{ProcessType, SafeProcesses},
+use crate::event::{
+    CommandPayload, EventError, LoadingBar, LoadingBarType, ProcessPayloadType,
+    ProfilePayloadType,
 };
 use futures::prelude::*;
 
@@ -55,7 +52,6 @@ pub async fn init_loading(
     title: &str,
 ) -> crate::Result<LoadingBarId> {
     let key = init_loading_unsafe(bar_type, total, title).await?;
-    SafeProcesses::add_uuid(ProcessType::LoadingBar, key.0).await?;
     Ok(key)
 }
 
@@ -301,7 +297,6 @@ pub async fn emit_profile(
 ) -> crate::Result<()> {
     #[cfg(feature = "tauri")]
     {
-        let path = profile_path_id.get_full_path().await?;
         let event_state = crate::EventState::get().await?;
         event_state
             .app
@@ -309,7 +304,6 @@ pub async fn emit_profile(
                 "profile",
                 ProfilePayload {
                     profile_path_id: profile_path_id.to_string(),
-                    path,
                     event,
                 },
             )
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
index db8f397df..cbd0b1355 100644
--- a/packages/app-lib/src/event/mod.rs
+++ b/packages/app-lib/src/event/mod.rs
@@ -5,8 +5,6 @@ use tokio::sync::OnceCell;
 use tokio::sync::RwLock;
 use uuid::Uuid;
 
-use crate::state::SafeProcesses;
-
 pub mod emit;
 
 // Global event state
@@ -139,15 +137,6 @@ impl Drop for LoadingBarId {
                 #[cfg(not(any(feature = "tauri", feature = "cli")))]
                 bars.remove(&loader_uuid);
             }
-            // complete calls state, and since a  LoadingBarId is created in state initialization, we only complete if its already initializaed
-            // to avoid an infinite loop.
-            if crate::State::initialized() {
-                let _ = SafeProcesses::complete(
-                    crate::state::ProcessType::LoadingBar,
-                    loader_uuid,
-                )
-                .await;
-            }
         });
     }
 }
@@ -248,7 +237,6 @@ pub enum ProcessPayloadType {
 #[derive(Serialize, Clone)]
 pub struct ProfilePayload {
     pub profile_path_id: String,
-    pub path: PathBuf,
     pub event: ProfilePayloadType,
 }
 #[derive(Serialize, Clone)]
diff --git a/packages/app-lib/src/state/cache.rs b/packages/app-lib/src/state/cache.rs
index d1d41a36b..ad9b98b74 100644
--- a/packages/app-lib/src/state/cache.rs
+++ b/packages/app-lib/src/state/cache.rs
@@ -78,7 +78,7 @@ impl CacheValueType {
         match self {
             CacheValueType::File => 60 * 60 * 24 * 30, // 30 days
             CacheValueType::FileHash => 60 * 60 * 24 * 30, // 30 days
-            _ => 60 * 60 * 24,                         // 24 hours
+            _ => 60 * 60 * 30, // 30 minutes
         }
     }
 }
@@ -163,12 +163,18 @@ pub struct Project {
     pub slug: Option<String>,
     pub project_type: String,
     pub team: String,
+    pub organization: Option<String>,
     pub title: String,
     pub description: String,
     pub body: String,
 
     pub published: DateTime<Utc>,
     pub updated: DateTime<Utc>,
+    pub approved: Option<DateTime<Utc>>,
+
+    pub status: String,
+
+    pub license: License,
 
     pub client_side: SideType,
     pub server_side: SideType,
@@ -184,6 +190,38 @@ pub struct Project {
     pub versions: Vec<String>,
 
     pub icon_url: Option<String>,
+
+    pub issues_url: Option<String>,
+    pub source_url: Option<String>,
+    pub wiki_url: Option<String>,
+    pub discord_url: Option<String>,
+    pub donation_urls: Option<Vec<DonationLink>>,
+    pub gallery: Vec<GalleryItem>,
+    pub color: Option<u32>,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct License {
+    pub id: String,
+    pub name: String,
+    pub url: Option<String>,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct GalleryItem {
+    pub url: String,
+    pub featured: bool,
+    pub title: Option<String>,
+    pub description: Option<String>,
+    pub created: DateTime<Utc>,
+    pub ordering: i64,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct DonationLink {
+    pub id: String,
+    pub platform: String,
+    pub url: String,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
@@ -359,6 +397,7 @@ impl CacheValue {
             | CacheValue::Loaders(_)
             | CacheValue::GameVersions(_)
             | CacheValue::DonationPlatforms(_) => DEFAULT_ID.to_string(),
+
             CacheValue::FileHash(hash) => {
                 format!("{}-{}", hash.size, hash.path)
             }
@@ -544,6 +583,15 @@ impl CachedEntry {
     where
         E: sqlx::Acquire<'a, Database = sqlx::Sqlite>,
     {
+        use std::time::Instant;
+        let now = Instant::now();
+
+        println!("start {type_:?} keys: {keys:?}");
+
+        if keys.is_empty() {
+            return Ok(Vec::new());
+        }
+
         let cache_behaviour = cache_behaviour.unwrap_or_default();
 
         let remaining_keys = DashSet::new();
@@ -604,6 +652,11 @@ impl CachedEntry {
             }
         }
 
+        let time = now.elapsed();
+        println!("query {type_:?} keys: {remaining_keys:?}, elapsed: {:.2?}", time);
+        let now = Instant::now();
+
+
         if !remaining_keys.is_empty() {
             let mut values =
                 Self::fetch_many(type_, remaining_keys, fetch_semaphore)
@@ -616,6 +669,9 @@ impl CachedEntry {
             }
         }
 
+        let time = now.elapsed();
+        println!("FETCH {type_:?} DONE, elapsed: {:.2?}", time);
+
         if !expired_keys.is_empty()
             && cache_behaviour == CacheBehaviour::StaleWhileRevalidate
         {
@@ -728,7 +784,7 @@ impl CachedEntry {
             CacheValueType::Team => {
                 fetch_original_values!(
                     Team,
-                    MODRINTH_API_URL,
+                    MODRINTH_API_URL_V3,
                     "teams",
                     CacheValue::Team
                 )
@@ -877,10 +933,10 @@ impl CachedEntry {
 
                 async fn hash_file(
                     profiles_dir: &Path,
-                    path: String,
+                    key: String,
                 ) -> crate::Result<CachedEntry> {
                     let path =
-                        path.split_once('-').map(|x| x.1).unwrap_or_default();
+                        key.split_once('-').map(|x| x.1).unwrap_or_default();
 
                     let full_path = profiles_dir.join(path);
 
@@ -913,7 +969,7 @@ impl CachedEntry {
                     });
 
                     Ok(CachedEntry {
-                        id: path.to_string(),
+                        id: key.clone(),
                         alias: None,
                         type_: CacheValueType::FileHash,
                         data,
diff --git a/packages/app-lib/src/state/db.rs b/packages/app-lib/src/state/db.rs
index 1a84b6b43..248322b5c 100644
--- a/packages/app-lib/src/state/db.rs
+++ b/packages/app-lib/src/state/db.rs
@@ -1,7 +1,7 @@
 use crate::state::DirectoryInfo;
 use sqlx::migrate::MigrateDatabase;
 use sqlx::sqlite::SqlitePoolOptions;
-use sqlx::{Connection, Pool, Sqlite, SqliteConnection};
+use sqlx::{Connection, Pool, Sqlite};
 
 pub(crate) async fn connect() -> crate::Result<Pool<Sqlite>> {
     let uri =
@@ -11,13 +11,12 @@ pub(crate) async fn connect() -> crate::Result<Pool<Sqlite>> {
         Sqlite::create_database(&uri).await?;
     }
 
-    let mut conn: SqliteConnection = SqliteConnection::connect(&uri).await?;
-    sqlx::migrate!().run(&mut conn).await?;
-
     let pool = SqlitePoolOptions::new()
         .max_connections(100)
         .connect(&uri)
         .await?;
 
+    sqlx::migrate!().run(&pool).await?;
+
     Ok(pool)
 }
diff --git a/packages/app-lib/src/state/fs_watcher.rs b/packages/app-lib/src/state/fs_watcher.rs
index 1d33040c9..a40e0416c 100644
--- a/packages/app-lib/src/state/fs_watcher.rs
+++ b/packages/app-lib/src/state/fs_watcher.rs
@@ -46,7 +46,6 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                             }
                         }
 
-                        println!("WATCHER: new_path: {profile_path:?} event path: {:?}", e.path);
                         if let Some(profile_path) = profile_path {
                             if e.path
                                 .components()
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index 5749614e7..3c23f0a04 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -28,9 +28,6 @@ pub use self::children::*;
 mod java_globals;
 pub use self::java_globals::*;
 
-mod safe_processes;
-pub use self::safe_processes::*;
-
 mod discord;
 pub use self::discord::*;
 
@@ -46,11 +43,14 @@ mod mr_auth;
 
 pub use self::mr_auth::*;
 
-// TODO: UI: Change so new settings model works
-// TODO: UI: Change so new java version API works
+// TODO: possible memcache for cache entries to improve perf
+// TODO: cache children too (ex: version file req should cache version too)
+// TODO: Java Version API
+// TODO: UI: Profile Options
+// TODO: UI: Profile Content Fully Integrate (and improve perf)
+// TODO: UI: Settings Java Versions
 // TODO: pass credentials to modrinth cdn
-// TODO: add language requiring restart for discord, concurrent writes/fetches changes
-// TODO: get rid of unneccessary locking + atomics in discord
+// TODO: get rid of unnecessary locking + atomics in discord
 
 // Global state
 // RwLock on state only has concurrent reads, except for config dir change which takes control of the State
@@ -69,8 +69,6 @@ pub struct State {
 
     /// Reference to minecraft process children
     pub children: RwLock<Children>,
-    /// Launcher processes that should be safely exited on shutdown
-    pub(crate) safety_processes: RwLock<SafeProcesses>,
     /// Launcher user account info
     pub(crate) users: RwLock<MinecraftAuthStore>,
     /// Modrinth Credentials Store
@@ -145,8 +143,6 @@ impl State {
             creds_fut,
         }?;
 
-        let safety_processes = SafeProcesses::new();
-
         let discord_rpc = DiscordGuard::init(is_offline).await?;
         if settings.discord_rpc && !is_offline {
             // Add default Idling to discord rich presence
@@ -173,7 +169,6 @@ impl State {
             children: RwLock::new(children),
             credentials: RwLock::new(creds),
             discord_rpc,
-            safety_processes: RwLock::new(safety_processes),
             modrinth_auth_flow: RwLock::new(None),
             pool,
             file_watcher,
diff --git a/packages/app-lib/src/state/profiles.rs b/packages/app-lib/src/state/profiles.rs
index 415adc339..bbdc685b5 100644
--- a/packages/app-lib/src/state/profiles.rs
+++ b/packages/app-lib/src/state/profiles.rs
@@ -616,7 +616,7 @@ impl Profile {
             .collect::<Vec<_>>();
         let file_updates = CachedEntry::get_file_update_many(
             &file_updates.iter().map(|x| &**x).collect::<Vec<_>>(),
-            Some(CacheBehaviour::Bypass),
+            None,
             exec,
             fetch_semaphore,
         )
diff --git a/packages/app-lib/src/state/safe_processes.rs b/packages/app-lib/src/state/safe_processes.rs
deleted file mode 100644
index 4f3e3c579..000000000
--- a/packages/app-lib/src/state/safe_processes.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use uuid::Uuid;
-
-use crate::State;
-
-// We implement a store for safe loading bars such that we can wait for them to complete
-// We create this store separately from the loading bars themselves, because this may be extended as needed
-pub struct SafeProcesses {
-    pub loading_bars: Vec<Uuid>,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum ProcessType {
-    LoadingBar,
-    // Potentially other types of processes (ie: IO operations?)
-}
-
-impl SafeProcesses {
-    // init
-    pub fn new() -> Self {
-        Self {
-            loading_bars: Vec::new(),
-        }
-    }
-
-    // Adds a new running safe process to the list by uuid
-    pub async fn add_uuid(
-        r#type: ProcessType,
-        uuid: Uuid,
-    ) -> crate::Result<Uuid> {
-        let state = State::get().await?;
-        let mut safe_processes = state.safety_processes.write().await;
-        match r#type {
-            ProcessType::LoadingBar => {
-                safe_processes.loading_bars.push(uuid);
-            }
-        }
-        Ok(uuid)
-    }
-
-    // Mark a safe process as finishing
-    pub async fn complete(
-        r#type: ProcessType,
-        uuid: Uuid,
-    ) -> crate::Result<()> {
-        let state = State::get().await?;
-        let mut safe_processes = state.safety_processes.write().await;
-
-        match r#type {
-            ProcessType::LoadingBar => {
-                safe_processes.loading_bars.retain(|x| *x != uuid);
-            }
-        }
-        Ok(())
-    }
-
-    // Check if there are any pending safe processes of a given type
-    pub async fn is_complete(r#type: ProcessType) -> crate::Result<bool> {
-        let state = State::get().await?;
-        let safe_processes = state.safety_processes.read().await;
-        match r#type {
-            ProcessType::LoadingBar => {
-                if safe_processes.loading_bars.is_empty() {
-                    return Ok(true);
-                }
-            }
-        }
-        Ok(false)
-    }
-}
diff --git a/packages/ui/src/components/modal/Modal.vue b/packages/ui/src/components/modal/Modal.vue
index d9ec87a48..6f3bea13a 100644
--- a/packages/ui/src/components/modal/Modal.vue
+++ b/packages/ui/src/components/modal/Modal.vue
@@ -48,6 +48,12 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  onHide: {
+    type: Function,
+    default() {
+      return () => {}
+    },
+  },
 })
 
 const shown = ref(false)
@@ -61,6 +67,7 @@ function show() {
 }
 
 function hide() {
+  props.onHide()
   actuallyShown.value = false
   setTimeout(() => {
     shown.value = false
diff --git a/turbo.json b/turbo.json
index cfb50c859..04b8e640e 100644
--- a/turbo.json
+++ b/turbo.json
@@ -23,6 +23,5 @@
       "persistent": true
     },
     "test": {}
-  },
-  "ui": "tui"
+  }
 }