diff --git a/build.mjs b/build.mjs
index 051b850..c4846f1 100644
--- a/build.mjs
+++ b/build.mjs
@@ -21,13 +21,6 @@ async function spawn(exec, opts) {
   });
 }
 
-const expectedLibs = ["drop-base/package.json"];
-
-for (const lib of expectedLibs) {
-  const path = `./libs/${lib}`;
-  if (!fs.existsSync(path)) throw `Missing "${expectedLibs}". Run "git submodule update --init --recursive"`;
-}
-
 const views = fs.readdirSync(".").filter((view) => {
   const expectedPath = `./${view}/package.json`;
   return fs.existsSync(expectedPath);
diff --git a/main/app.vue b/main/app.vue
index 1594dd6..7d4165f 100644
--- a/main/app.vue
+++ b/main/app.vue
@@ -1,5 +1,5 @@
 <template>
-    <NuxtLoadingIndicator color="#2563eb" />
+  <LoadingIndicator />
   <NuxtLayout class="select-none w-screen h-screen">
     <NuxtPage />
     <ModalStack />
diff --git a/main/components/HeaderUserWidget.vue b/main/components/HeaderUserWidget.vue
index a11f447..518f99c 100644
--- a/main/components/HeaderUserWidget.vue
+++ b/main/components/HeaderUserWidget.vue
@@ -37,7 +37,7 @@
           </NuxtLink>
           <div class="h-0.5 rounded-full w-full bg-zinc-800" />
           <div class="flex flex-col mb-1">
-            <MenuItem v-if="state.user.admin" v-slot="{ active }">
+            <MenuItem v-slot="{ active }">
               <a
                 :href="adminUrl"
                 target="_blank"
diff --git a/main/components/LibrarySearch.vue b/main/components/LibrarySearch.vue
index 1ae44ac..be9129b 100644
--- a/main/components/LibrarySearch.vue
+++ b/main/components/LibrarySearch.vue
@@ -1,118 +1,55 @@
 <template>
   <div class="flex flex-col h-full">
     <div class="mb-3 inline-flex gap-x-2">
-      <div
-        class="relative transition-transform duration-300 hover:scale-105 active:scale-95"
-      >
-        <div
-          class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3"
-        >
-          <MagnifyingGlassIcon
-            class="h-5 w-5 text-zinc-400"
-            aria-hidden="true"
-          />
+      <div class="relative transition-transform duration-300 hover:scale-105 active:scale-95">
+        <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+          <MagnifyingGlassIcon class="h-5 w-5 text-zinc-400" aria-hidden="true" />
         </div>
-        <input
-          type="text"
-          v-model="searchQuery"
+        <input type="text" v-model="searchQuery"
           class="block w-full rounded-lg border-0 bg-zinc-800/50 py-2 pl-10 pr-3 text-zinc-100 placeholder:text-zinc-500 focus:bg-zinc-800 focus:ring-2 focus:ring-inset focus:ring-blue-500 sm:text-sm sm:leading-6"
-          placeholder="Search library..."
-        />
+          placeholder="Search library..." />
       </div>
-      <button
-        @click="() => calculateGames(true, true)"
-        class="p-1 flex items-center justify-center transition-transform duration-300 size-10 hover:scale-110 active:scale-90 rounded-lg bg-zinc-800/50 text-zinc-100"
-      >
+      <button @click="() => calculateGames(true)"
+        class="p-1 flex items-center justify-center transition-transform duration-300 size-10 hover:scale-110 active:scale-90 rounded-lg bg-zinc-800/50 text-zinc-100">
         <ArrowPathIcon class="size-4" />
       </button>
     </div>
 
     <TransitionGroup name="list" tag="ul" class="flex flex-col gap-y-1.5">
-      <Disclosure
-        as="div"
-        v-for="(nav, navIndex) in filteredNavigation"
-        :key="nav.id"
-        class="first:pt-0 last:pb-0"
-        v-slot="{ open }"
-        :default-open="nav.deft"
-      >
-        <dt>
-          <DisclosureButton
-            class="flex w-full items-center justify-between text-left text-gray-900 dark:text-white"
-          >
-            <span class="text-sm font-semibold font-display">{{
-              nav.name
-            }}</span>
-            <span class="ml-6 flex h-7 items-center">
-              <PlusSmallIcon v-if="!open" class="size-6" aria-hidden="true" />
-              <MinusSmallIcon v-else class="size-6" aria-hidden="true" />
-            </span>
-          </DisclosureButton>
-        </dt>
-        <DisclosurePanel as="dd" class="mt-2 flex flex-col gap-y-1.5">
-          <NuxtLink
-            v-for="item in nav.items"
-            :key="nav.id"
-            :class="[
-              'transition-all duration-300 rounded-lg flex items-center px-1 py-1.5 hover:scale-105 active:scale-95 hover:shadow-lg hover:shadow-zinc-950/50',
-              currentNavigation == item.id
-                ? 'bg-zinc-800 text-zinc-100 shadow-md shadow-zinc-950/20'
-                : item.isInstalled.value
-                ? 'text-zinc-300 hover:bg-zinc-800/90 hover:text-zinc-200'
-                : 'text-zinc-500 hover:bg-zinc-800/70 hover:text-zinc-300',
-            ]"
-            :href="item.route"
-          >
-            <div class="flex items-center w-full gap-x-2">
-              <div
-                class="flex-none transition-transform duration-300 hover:-rotate-2"
-              >
-                <img
-                  class="size-6 object-cover bg-zinc-900 rounded transition-all duration-300 shadow-sm"
-                  :src="icons[item.id]"
-                  alt=""
-                />
-              </div>
-              <div class="inline-flex items-center gap-x-2">
-                <p
-                  class="text-sm whitespace-nowrap font-display font-semibold"
-                >
-                  {{ item.label }}
-                </p>
-                <p
-                  class="truncate text-[10px] font-bold uppercase font-display"
-                  :class="[
-                    gameStatusTextStyle[games[item.id].status.value.type],
-                  ]"
-                >
-                  {{ gameStatusText[games[item.id].status.value.type] }}
-                </p>
-              </div>
-            </div>
-          </NuxtLink>
-        </DisclosurePanel>
-      </Disclosure>
+      <NuxtLink v-for="(nav, navIndex) in filteredNavigation" :key="nav.id" :class="[
+        'transition-all duration-300 rounded-lg flex items-center py-2 px-3 hover:scale-105 active:scale-95 hover:shadow-lg hover:shadow-zinc-950/50',
+        navIndex === currentNavigation
+          ? 'bg-zinc-800 text-zinc-100 shadow-md shadow-zinc-950/20'
+          : nav.isInstalled.value
+            ? 'text-zinc-300 hover:bg-zinc-800/90 hover:text-zinc-200'
+            : 'text-zinc-500 hover:bg-zinc-800/70 hover:text-zinc-300',
+      ]" :href="nav.route">
+        <div class="flex items-center w-full gap-x-3">
+          <div class="flex-none transition-transform duration-300 hover:-rotate-2">
+            <img class="size-8 object-cover bg-zinc-900 rounded-lg transition-all duration-300 shadow-sm"
+              :src="icons[nav.id]" alt="" />
+          </div>
+          <div class="flex flex-col flex-1">
+            <p class="truncate text-xs font-display leading-5 flex-1 font-semibold">
+              {{ nav.label }}
+            </p>
+            <p class="text-xs font-medium" :class="[gameStatusTextStyle[games[nav.id].status.value.type]]">
+              {{ gameStatusText[games[nav.id].status.value.type] }}
+            </p>
+          </div>
+        </div>
+      </NuxtLink>
     </TransitionGroup>
-    <div
-      v-if="loading"
-      class="h-full grow flex p-8 justify-center text-zinc-100"
-    >
+    <div v-if="loading" class="h-full grow flex p-8 justify-center text-zinc-100">
       <div role="status">
-        <svg
-          aria-hidden="true"
-          class="w-6 h-6 text-transparent animate-spin fill-zinc-600"
-          viewBox="0 0 100 101"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
+        <svg aria-hidden="true" class="w-6 h-6 text-transparent animate-spin fill-zinc-600" viewBox="0 0 100 101"
+          fill="none" xmlns="http://www.w3.org/2000/svg">
           <path
             d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-            fill="currentColor"
-          />
+            fill="currentColor" />
           <path
             d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-            fill="currentFill"
-          />
+            fill="currentFill" />
         </svg>
         <span class="sr-only">Loading...</span>
       </div>
@@ -121,20 +58,9 @@
 </template>
 
 <script setup lang="ts">
-import { Disclosure, DisclosureButton, DisclosurePanel } from "@headlessui/vue";
-import {
-  ArrowPathIcon,
-  MagnifyingGlassIcon,
-  MinusSmallIcon,
-  PlusSmallIcon,
-} from "@heroicons/vue/20/solid";
+import { ArrowPathIcon, MagnifyingGlassIcon } from "@heroicons/vue/20/solid";
 import { invoke } from "@tauri-apps/api/core";
-import {
-  GameStatusEnum,
-  type Collection as Collection,
-  type Game,
-  type GameStatus,
-} from "~/types";
+import { GameStatusEnum, type Game, type GameStatus } from "~/types";
 import { TransitionGroup } from "vue";
 import { listen } from "@tauri-apps/api/event";
 
@@ -144,7 +70,7 @@ const gameStatusTextStyle: { [key in GameStatusEnum]: string } = {
   [GameStatusEnum.Downloading]: "text-zinc-400",
   [GameStatusEnum.Validating]: "text-blue-300",
   [GameStatusEnum.Running]: "text-green-500",
-  [GameStatusEnum.Remote]: "text-zinc-700",
+  [GameStatusEnum.Remote]: "text-zinc-500",
   [GameStatusEnum.Queued]: "text-zinc-400",
   [GameStatusEnum.Updating]: "text-zinc-400",
   [GameStatusEnum.Uninstalling]: "text-zinc-100",
@@ -174,47 +100,26 @@ const games: {
 } = {};
 const icons: { [key: string]: string } = {};
 
-const collections: Ref<Collection[]> = ref([]);
+const rawGames: Ref<Game[], Game[]> = ref([]);
 
-async function calculateGames(clearAll = false, forceRefresh = false) {
+async function calculateGames(clearAll = false) {
   if (clearAll) {
-    collections.value = [];
+    rawGames.value = [];
     loading.value = true;
   }
   // If we update immediately, the navigation gets re-rendered before we
   // add all the necessary state, and it freaks tf out
-  const newGames = await invoke<Game[]>("fetch_library", {
-    hardRefresh: forceRefresh,
-  });
-  const otherCollections = await invoke<Collection[]>("fetch_collections", {
-    hardRefresh: forceRefresh,
-  });
-  const allGames = [
-    ...newGames,
-    ...otherCollections
-      .map((e) => e.entries)
-      .flat()
-      .map((e) => e.game),
-  ].filter((v, i, a) => a.indexOf(v) === i);
-
-  for (const game of allGames) {
+  const newGames = await invoke<typeof rawGames.value>("fetch_library");
+  for (const game of newGames) {
     if (games[game.id]) continue;
     games[game.id] = await useGame(game.id);
   }
-  for (const game of allGames) {
+  for (const game of newGames) {
     if (icons[game.id]) continue;
     icons[game.id] = await useObject(game.mIconObjectId);
   }
-
-  const libraryCollection = {
-    id: "library",
-    name: "Library",
-    isDefault: true,
-    entries: newGames.map((e) => ({ gameId: e.id, game: e })),
-  } satisfies Collection;
-
   loading.value = false;
-  collections.value = [libraryCollection, ...otherCollections];
+  rawGames.value = newGames;
 }
 
 // Wait up to 300 ms for the library to load, otherwise
@@ -223,43 +128,36 @@ await new Promise<void>((r) => {
   let hasResolved = false;
   const resolveFunc = () => {
     if (!hasResolved) r();
-    hasResolved = true;
-  };
+    hasResolved = true
+
+  }
   calculateGames(true).then(resolveFunc);
   setTimeout(resolveFunc, 300);
-});
+})
 
 const navigation = computed(() =>
-  collections.value.map((collection) => {
-    const items = collection.entries.map(({ game }) => {
-      const status = games[game.id].status;
+  rawGames.value.map((game) => {
+    const status = games[game.id].status;
 
-      const isInstalled = computed(
-        () => status.value.type != GameStatusEnum.Remote
-      );
+    const isInstalled = computed(
+      () =>
+        status.value.type != GameStatusEnum.Remote
+    );
 
-      const item = {
-        label: game.mName,
-        route: `/library/${game.id}`,
-        prefix: `/library/${game.id}`,
-        isInstalled,
-        id: game.id,
-      };
-      return item;
-    });
-
-    return {
-      id: collection.id,
-      name: collection.name,
-      deft: collection.isDefault,
-      items,
+    const item = {
+      label: game.mName,
+      route: `/library/${game.id}`,
+      prefix: `/library/${game.id}`,
+      isInstalled,
+      id: game.id,
     };
+    return item;
   })
 );
 
 const route = useRoute();
 const currentNavigation = computed(() => {
-  return route.path.slice("/library/".length);
+  return navigation.value.findIndex((e) => e.route == route.path)
 });
 
 const filteredNavigation = computed(() => {
@@ -267,18 +165,15 @@ const filteredNavigation = computed(() => {
     return navigation.value.map((e, i) => ({ ...e, index: i }));
   const query = searchQuery.value.toLowerCase();
   return navigation.value
-    .map((c) => ({
-      ...c,
-      items: c.items.filter((nav) => nav.label.toLowerCase().includes(query)),
-    }))
-    .filter((e) => e.items.length > 0);
+    .filter((nav) => nav.label.toLowerCase().includes(query))
+    .map((e, i) => ({ ...e, index: i }));
 });
 
 listen("update_library", async (event) => {
   console.log("Updating library");
-  let oldNavigation = currentNavigation.value;
+  let oldNavigation = navigation.value[currentNavigation.value];
   await calculateGames();
-  if (oldNavigation !== currentNavigation.value) {
+  if (oldNavigation.route !== navigation.value[currentNavigation.value].route) {
     router.push("/library");
   }
 });
diff --git a/main/components/LoadingIndicator.vue b/main/components/LoadingIndicator.vue
new file mode 100644
index 0000000..26b7477
--- /dev/null
+++ b/main/components/LoadingIndicator.vue
@@ -0,0 +1,7 @@
+<template></template>
+
+<script setup lang="ts">
+const loading = useLoadingIndicator();
+
+watch(loading.isLoading, console.log);
+</script>
diff --git a/main/composables/downloads.ts b/main/composables/downloads.ts
index f9ab1cd..d75c46f 100644
--- a/main/composables/downloads.ts
+++ b/main/composables/downloads.ts
@@ -32,5 +32,3 @@ listen("update_stats", (event) => {
   const stats = useStatsState();
   stats.value = event.payload as StatsState;
 });
-
-export const useDownloadHistory = () => useState<Array<number>>('history', () => []);
\ No newline at end of file
diff --git a/main/pages/queue.vue b/main/pages/queue.vue
index 30eb886..8d5c4ef 100644
--- a/main/pages/queue.vue
+++ b/main/pages/queue.vue
@@ -4,18 +4,18 @@
       class="h-16 overflow-hidden relative rounded-xl flex flex-row border border-zinc-900"
     >
       <div
-        class="bg-zinc-900 z-10 w-32 flex flex-col gap-x-2 font-display items-left justify-center pl-2"
+        class="bg-zinc-900 z-10 w-32 flex flex-col gap-x-2 text-blue-400 font-display items-left justify-center pl-2"
       >
-        <span class="font-bold text-zinc-100">{{ formatKilobytes(stats.speed) }}B/s</span>
-        <span v-if="stats.time > 0" class="text-xs text-zinc-400"
+        <span class="font-semibold">{{ formatKilobytes(stats.speed) }}/s</span>
+        <span v-if="stats.time > 0" class="text-sm"
           >{{ formatTime(stats.time) }} left</span
         >
       </div>
-      <div class="absolute inset-0 h-full flex flex-row items-end justify-end space-x-[1px]">
+      <div class="absolute inset-0 h-full flex flex-row items-end justify-end">
         <div
           v-for="bar in speedHistory"
           :style="{ height: `${(bar / speedMax) * 100}%` }"
-          class="w-[3px] bg-blue-600 rounded-t-full"
+          class="w-[8px] bg-blue-600/40"
         />
       </div>
     </div>
@@ -62,9 +62,9 @@
                 class="mt-2 inline-flex items-center gap-x-1 text-zinc-400 text-sm font-display"
                 ><span class="text-zinc-300">{{
                   formatKilobytes(element.current / 1000)
-                }}B</span>
+                }}</span>
                 /
-                <span class="">{{ formatKilobytes(element.max / 1000) }}B</span
+                <span class="">{{ formatKilobytes(element.max / 1000) }}</span
                 ><ServerIcon class="size-5"
               /></span>
             </div>
@@ -91,7 +91,7 @@
 <script setup lang="ts">
 import { ServerIcon, XMarkIcon } from "@heroicons/vue/20/solid";
 import { invoke } from "@tauri-apps/api/core";
-import { type DownloadableMetadata, type Game, type GameStatus } from "~/types";
+import { GameStatusEnum, type DownloadableMetadata, type Game, type GameStatus } from "~/types";
 
 // const actionNames = {
 //   [GameStatusEnum.Downloading]: "downloading",
@@ -105,12 +105,12 @@ window.addEventListener("resize", (event) => {
 
 const queue = useQueueState();
 const stats = useStatsState();
-const speedHistory = useDownloadHistory();
-const speedHistoryMax = computed(() => windowWidth.value / 4);
+const speedHistory = useState<Array<number>>(() => []);
+const speedHistoryMax = computed(() => windowWidth.value / 8);
 const speedMax = computed(
-  () => speedHistory.value.reduce((a, b) => (a > b ? a : b)) * 1.1
+  () => speedHistory.value.reduce((a, b) => (a > b ? a : b)) * 1.3
 );
-const previousGameId = useState<string | undefined>('previous_game');
+const previousGameId = ref<string | undefined>();
 
 const games: Ref<{
   [key: string]: { game: Game; status: Ref<GameStatus>; cover: string };
@@ -122,15 +122,14 @@ function resetHistoryGraph() {
 }
 function checkReset(v: QueueState) {
   const currentGame = v.queue.at(0)?.meta.id;
-    // If we don't have a game
-  if (!currentGame) return;
-
   // If we're finished
   if (!currentGame && previousGameId.value) {
     previousGameId.value = undefined;
     resetHistoryGraph();
     return;
   }
+  // If we don't have a game
+  if (!currentGame) return;
   // If we started a new download
   if (currentGame && !previousGameId.value) {
     previousGameId.value = currentGame;
@@ -150,10 +149,9 @@ watch(queue, (v) => {
 });
 
 watch(stats, (v) => {
-  if(v.speed == 0) return;
   const newLength = speedHistory.value.push(v.speed);
   if (newLength > speedHistoryMax.value) {
-    speedHistory.value.splice(0, newLength - speedHistoryMax.value);
+    speedHistory.value.splice(0, 1);
   }
   checkReset(queue.value);
 });
@@ -185,7 +183,7 @@ async function cancelGame(meta: DownloadableMetadata) {
 }
 
 function formatKilobytes(bytes: number): string {
-  const units = ["K", "M", "G", "T", "P"];
+  const units = ["KB", "MB", "GB", "TB", "PB"];
   let value = bytes;
   let unitIndex = 0;
   const scalar = 1000;
diff --git a/main/types.ts b/main/types.ts
index f63a9c5..2ccd6ff 100644
--- a/main/types.ts
+++ b/main/types.ts
@@ -37,13 +37,6 @@ export type Game = {
   mImageCarouselObjectIds: string[];
 };
 
-export type Collection = {
-  id: string;
-  name: string;
-  isDefault: boolean;
-  entries: Array<{ gameId: string; game: Game }>;
-};
-
 export type GameVersion = {
   launchCommandTemplate: string;
 };
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 0933ad2..a95f43c 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1289,7 +1289,6 @@ dependencies = [
  "atomic-instant-full",
  "bitcode",
  "boxcar",
- "bytes",
  "cacache 13.1.0",
  "chrono",
  "deranged",
@@ -1297,7 +1296,6 @@ dependencies = [
  "droplet-rs",
  "dynfmt",
  "filetime",
- "futures-core",
  "futures-lite",
  "gethostname",
  "hex 0.4.3",
@@ -1341,7 +1339,6 @@ dependencies = [
  "tempfile",
  "throttle_my_fn",
  "tokio",
- "tokio-util",
  "umu-wrapper-lib",
  "url",
  "urlencoding",
@@ -3121,13 +3118,13 @@ dependencies = [
 
 [[package]]
 name = "native_model"
-version = "0.6.4"
-source = "git+https://github.com/Drop-OSS/native_model.git#a91b422cbd53116df1f20b2459fb3d8257458bfd"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7050d759e3da6673361dddda4f4a743492279dd2c6484a21fbee0a8278620df0"
 dependencies = [
  "anyhow",
  "bincode",
  "doc-comment",
- "log",
  "native_model_macro",
  "rmp-serde",
  "serde",
@@ -3137,10 +3134,10 @@ dependencies = [
 
 [[package]]
 name = "native_model_macro"
-version = "0.6.4"
-source = "git+https://github.com/Drop-OSS/native_model.git#a91b422cbd53116df1f20b2459fb3d8257458bfd"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1577a0bebf5ed1754e240baf5d9b1845f51e598b20600aa894f55e11cd20cc6c"
 dependencies = [
- "log",
  "proc-macro2",
  "quote",
  "syn 2.0.101",
@@ -6086,9 +6083,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.16"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 55f017c..f999d73 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -65,7 +65,7 @@ whoami = "1.6.0"
 filetime = "0.2.25"
 walkdir = "2.5.0"
 known-folders = "1.2.0"
-native_model = { version = "0.6.4", features = ["rmp_serde_1_3"], git = "https://github.com/Drop-OSS/native_model.git"}
+native_model = { version = "0.6.1", features = ["rmp_serde_1_3"] }
 tauri-plugin-opener = "2.4.0"
 bitcode = "0.6.6"
 reqwest-websocket = "0.5.0"
@@ -73,9 +73,6 @@ futures-lite = "2.6.0"
 page_size = "0.6.0"
 sysinfo = "0.36.1"
 humansize = "2.1.3"
-tokio-util = { version = "0.7.16", features = ["io"] }
-futures-core = "0.3.31"
-bytes = "1.10.1"
 # tailscale = { path = "./tailscale" }
 
 [dependencies.dynfmt]
@@ -109,15 +106,7 @@ features = ["other_errors"] # You can also use "yaml_enc" or "bin_enc"
 [dependencies.reqwest]
 version = "0.12.22"
 default-features = false
-features = [
-    "json",
-    "http2",
-    "blocking",
-    "rustls-tls",
-    "native-tls-alpn",
-    "rustls-tls-native-roots",
-    "stream",
-]
+features = ["json", "http2", "blocking", "rustls-tls", "native-tls-alpn", "rustls-tls-native-roots"]
 
 [dependencies.serde]
 version = "1"
diff --git a/src-tauri/src/database/db.rs b/src-tauri/src/database/db.rs
index 2a50f3a..bc08f7a 100644
--- a/src-tauri/src/database/db.rs
+++ b/src-tauri/src/database/db.rs
@@ -8,6 +8,7 @@ use std::{
 
 use chrono::Utc;
 use log::{debug, error, info, warn};
+use native_model::{Decode, Encode};
 use rustbreak::{DeSerError, DeSerializer, PathDatabase, RustbreakError};
 use serde::{Serialize, de::DeserializeOwned};
 use url::Url;
@@ -16,13 +17,8 @@ use crate::DB;
 
 use super::models::data::Database;
 
-#[cfg(not(debug_assertions))]
-static DATA_ROOT_PREFIX: &'static str = "drop";
-#[cfg(debug_assertions)]
-static DATA_ROOT_PREFIX: &str = "drop-debug";
-
 pub static DATA_ROOT_DIR: LazyLock<Arc<PathBuf>> =
-    LazyLock::new(|| Arc::new(dirs::data_dir().unwrap().join(DATA_ROOT_PREFIX)));
+    LazyLock::new(|| Arc::new(dirs::data_dir().unwrap().join("drop")));
 
 // Custom JSON serializer to support everything we need
 #[derive(Debug, Default, Clone)]
@@ -32,7 +28,7 @@ impl<T: native_model::Model + Serialize + DeserializeOwned> DeSerializer<T>
     for DropDatabaseSerializer
 {
     fn serialize(&self, val: &T) -> rustbreak::error::DeSerResult<Vec<u8>> {
-        native_model::encode(val)
+        native_model::rmp_serde_1_3::RmpSerde::encode(val)
             .map_err(|e| DeSerError::Internal(e.to_string()))
     }
 
@@ -40,7 +36,7 @@ impl<T: native_model::Model + Serialize + DeserializeOwned> DeSerializer<T>
         let mut buf = Vec::new();
         s.read_to_end(&mut buf)
             .map_err(|e| rustbreak::error::DeSerError::Other(e.into()))?;
-        let (val, _version) = native_model::decode(buf)
+        let val = native_model::rmp_serde_1_3::RmpSerde::decode(buf)
             .map_err(|e| DeSerError::Internal(e.to_string()))?;
         Ok(val)
     }
diff --git a/src-tauri/src/database/models.rs b/src-tauri/src/database/models.rs
index 848169a..a2997b2 100644
--- a/src-tauri/src/database/models.rs
+++ b/src-tauri/src/database/models.rs
@@ -1,12 +1,17 @@
+/**
+ * NEXT BREAKING CHANGE
+ * 
+ * UPDATE DATABASE TO USE RPMSERDENAMED
+ * 
+ * WE CAN'T DELETE ANY FIELDS
+ */
 pub mod data {
-    use std::{hash::Hash, path::PathBuf};
+    use std::path::PathBuf;
 
+    
     use native_model::native_model;
     use serde::{Deserialize, Serialize};
 
-    // NOTE: Within each version, you should NEVER use these types. 
-    // Declare it using the actual version that it is from, i.e. v1::Settings rather than just Settings from here
-
     pub type GameVersion = v1::GameVersion;
     pub type Database = v3::Database;
     pub type Settings = v1::Settings;
@@ -14,29 +19,14 @@ pub mod data {
 
     pub type GameDownloadStatus = v2::GameDownloadStatus;
     pub type ApplicationTransientStatus = v1::ApplicationTransientStatus;
-    /**
-     * Need to be universally accessible by the ID, and the version is just a couple sprinkles on top
-     */
     pub type DownloadableMetadata = v1::DownloadableMetadata;
     pub type DownloadType = v1::DownloadType;
     pub type DatabaseApplications = v2::DatabaseApplications;
-    // pub type DatabaseCompatInfo = v2::DatabaseCompatInfo;
+    pub type DatabaseCompatInfo = v2::DatabaseCompatInfo;
 
     use std::collections::HashMap;
 
-    impl PartialEq for DownloadableMetadata {
-        fn eq(&self, other: &Self) -> bool {
-            self.id == other.id && self.download_type == other.download_type
-        }
-    }
-    impl Hash for DownloadableMetadata {
-        fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-            self.id.hash(state);
-            self.download_type.hash(state);
-        }
-    }
-
-    mod v1 {
+    pub mod v1 {
         use crate::process::process_manager::Platform;
         use serde_with::serde_as;
         use std::{collections::HashMap, path::PathBuf};
@@ -126,7 +116,6 @@ pub mod data {
         // Stuff that shouldn't be synced to disk
         #[derive(Clone, Serialize, Deserialize, Debug)]
         pub enum ApplicationTransientStatus {
-            Queued { version_name: String },
             Downloading { version_name: String },
             Uninstalling {},
             Updating { version_name: String },
@@ -155,7 +144,7 @@ pub mod data {
         }
 
         #[native_model(id = 7, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
-        #[derive(Debug, Eq, PartialOrd, Ord, Serialize, Deserialize, Clone)]
+        #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, Clone)]
         #[serde(rename_all = "camelCase")]
         pub struct DownloadableMetadata {
             pub id: String,
@@ -185,21 +174,22 @@ pub mod data {
         }
     }
 
-    mod v2 {
+    pub mod v2 {
         use std::{collections::HashMap, path::PathBuf};
 
         use serde_with::serde_as;
 
         use super::{
-            Deserialize, Serialize, native_model, v1,
+            ApplicationTransientStatus, DatabaseAuth, Deserialize, DownloadableMetadata,
+            GameVersion, Serialize, Settings, native_model, v1,
         };
 
-        #[native_model(id = 1, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from = v1::Database)]
+        #[native_model(id = 1, version = 2, with = native_model::rmp_serde_1_3::RmpSerde)]
         #[derive(Serialize, Deserialize, Clone, Default)]
         pub struct Database {
             #[serde(default)]
-            pub settings: v1::Settings,
-            pub auth: Option<v1::DatabaseAuth>,
+            pub settings: Settings,
+            pub auth: Option<DatabaseAuth>,
             pub base_url: String,
             pub applications: v1::DatabaseApplications,
             #[serde(skip)]
@@ -208,7 +198,7 @@ pub mod data {
             pub compat_info: Option<DatabaseCompatInfo>,
         }
 
-        #[native_model(id = 9, version = 1, with = native_model::rmp_serde_1_3::RmpSerde)]
+        #[native_model(id = 8, version = 2, with = native_model::rmp_serde_1_3::RmpSerde)]
         #[derive(Serialize, Deserialize, Clone, Default)]
 
         pub struct DatabaseCompatInfo {
@@ -231,7 +221,7 @@ pub mod data {
         // Strings are version names for a particular game
         #[derive(Serialize, Clone, Deserialize, Debug)]
         #[serde(tag = "type")]
-        #[native_model(id = 5, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from = v1::GameDownloadStatus)]
+        #[native_model(id = 5, version = 2, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub enum GameDownloadStatus {
             Remote {},
             SetupRequired {
@@ -271,17 +261,17 @@ pub mod data {
         #[serde_as]
         #[derive(Serialize, Clone, Deserialize, Default)]
         #[serde(rename_all = "camelCase")]
-        #[native_model(id = 3, version = 2, with = native_model::rmp_serde_1_3::RmpSerde, from=v1::DatabaseApplications)]
+        #[native_model(id = 3, version = 2, with = native_model::rmp_serde_1_3::RmpSerde)]
         pub struct DatabaseApplications {
             pub install_dirs: Vec<PathBuf>,
             // Guaranteed to exist if the game also exists in the app state map
             pub game_statuses: HashMap<String, GameDownloadStatus>,
             
-            pub game_versions: HashMap<String, HashMap<String, v1::GameVersion>>,
-            pub installed_game_version: HashMap<String, v1::DownloadableMetadata>,
+            pub game_versions: HashMap<String, HashMap<String, GameVersion>>,
+            pub installed_game_version: HashMap<String, DownloadableMetadata>,
 
             #[serde(skip)]
-            pub transient_statuses: HashMap<v1::DownloadableMetadata, v1::ApplicationTransientStatus>,
+            pub transient_statuses: HashMap<DownloadableMetadata, ApplicationTransientStatus>,
         }
         impl From<v1::DatabaseApplications> for DatabaseApplications {
             fn from(value: v1::DatabaseApplications) -> Self {
@@ -303,21 +293,21 @@ pub mod data {
         use std::path::PathBuf;
 
         use super::{
-            Deserialize, Serialize,
-            native_model, v2, v1,
+            DatabaseApplications, DatabaseAuth, DatabaseCompatInfo, Deserialize, Serialize,
+            Settings, native_model, v2,
         };
-        #[native_model(id = 1, version = 3, with = native_model::rmp_serde_1_3::RmpSerde, from = v2::Database)]
+        #[native_model(id = 1, version = 3, with = native_model::rmp_serde_1_3::RmpSerde)]
         #[derive(Serialize, Deserialize, Clone, Default)]
         pub struct Database {
             #[serde(default)]
-            pub settings: v1::Settings,
-            pub auth: Option<v1::DatabaseAuth>,
+            pub settings: Settings,
+            pub auth: Option<DatabaseAuth>,
             pub base_url: String,
-            pub applications: v2::DatabaseApplications,
+            pub applications: DatabaseApplications,
             #[serde(skip)]
             pub prev_database: Option<PathBuf>,
             pub cache_dir: PathBuf,
-            pub compat_info: Option<v2::DatabaseCompatInfo>,
+            pub compat_info: Option<DatabaseCompatInfo>,
         }
 
         impl From<v2::Database> for Database {
@@ -357,6 +347,5 @@ pub mod data {
                 compat_info: None,
             }
         }
-
     }
 }
diff --git a/src-tauri/src/database/scan.rs b/src-tauri/src/database/scan.rs
index 9e447cf..326aee5 100644
--- a/src-tauri/src/database/scan.rs
+++ b/src-tauri/src/database/scan.rs
@@ -5,10 +5,10 @@ use log::warn;
 use crate::{
     database::{
         db::borrow_db_mut_checked,
-        models::data::{DownloadType, DownloadableMetadata},
+        models::data::v1::{DownloadType, DownloadableMetadata},
     },
     games::{
-        downloads::drop_data::{DropData, DROP_DATA_PATH},
+        downloads::drop_data::{v1::DropData, DROP_DATA_PATH},
         library::set_partially_installed_db,
     },
 };
diff --git a/src-tauri/src/download_manager/download_manager_builder.rs b/src-tauri/src/download_manager/download_manager_builder.rs
index b346120..ecee16c 100644
--- a/src-tauri/src/download_manager/download_manager_builder.rs
+++ b/src-tauri/src/download_manager/download_manager_builder.rs
@@ -12,7 +12,6 @@ use tauri::{AppHandle, Emitter};
 
 use crate::{
     database::models::data::DownloadableMetadata,
-    download_manager::download_manager_frontend::DownloadStatus,
     error::application_download_error::ApplicationDownloadError,
     games::library::{QueueUpdateEvent, QueueUpdateEventQueueData, StatsUpdateEvent},
 };
@@ -76,6 +75,7 @@ pub struct DownloadManagerBuilder {
     status: Arc<Mutex<DownloadManagerStatus>>,
     app_handle: AppHandle,
 
+    current_download_agent: Option<DownloadAgent>, // Should be the only download agent in the map with the "Go" flag
     current_download_thread: Mutex<Option<JoinHandle<()>>>,
     active_control_flag: Option<DownloadThreadControl>,
 }
@@ -95,6 +95,7 @@ impl DownloadManagerBuilder {
             progress: active_progress.clone(),
             app_handle,
 
+            current_download_agent: None,
             current_download_thread: Mutex::new(None),
             active_control_flag: None,
         };
@@ -120,6 +121,7 @@ impl DownloadManagerBuilder {
     fn cleanup_current_download(&mut self) {
         self.active_control_flag = None;
         *self.progress.lock().unwrap() = None;
+        self.current_download_agent = None;
 
         let mut download_thread_lock = self.current_download_thread.lock().unwrap();
 
@@ -195,7 +197,7 @@ impl DownloadManagerBuilder {
             return;
         }
 
-        download_agent.on_queued(&self.app_handle);
+        download_agent.on_initialised(&self.app_handle);
         self.download_queue.append(meta.clone());
         self.download_agent_registry.insert(meta, download_agent);
 
@@ -214,13 +216,19 @@ impl DownloadManagerBuilder {
             return;
         }
 
+        if self.current_download_agent.is_some()
+            && self.download_queue.read().front().unwrap()
+                == &self.current_download_agent.as_ref().unwrap().metadata()
+        {
+            return;
+        }
+
         debug!("current download queue: {:?}", self.download_queue.read());
 
-        let agent_data = if let Some(agent_data) = self.download_queue.read().front() {
-            agent_data.clone()
-        } else {
-            return;
-        };
+        // Should always be Some if the above two statements keep going
+        let agent_data = self.download_queue.read().front().unwrap().clone();
+
+        info!("starting download for {agent_data:?}");
 
         let download_agent = self
             .download_agent_registry
@@ -228,22 +236,8 @@ impl DownloadManagerBuilder {
             .unwrap()
             .clone();
 
-        let status = download_agent.status();
-
-        // This download is already going
-        if status != DownloadStatus::Queued {
-            return;
-        }
-
-        // Ensure all others are marked as queued
-        for agent in self.download_agent_registry.values() {
-            if agent.metadata() != agent_data && agent.status() != DownloadStatus::Queued {
-                agent.on_queued(&self.app_handle);
-            }
-        }
-
-        info!("starting download for {agent_data:?}");
         self.active_control_flag = Some(download_agent.control_flag());
+        self.current_download_agent = Some(download_agent.clone());
 
         let sender = self.sender.clone();
 
@@ -316,8 +310,8 @@ impl DownloadManagerBuilder {
     }
     fn manage_completed_signal(&mut self, meta: DownloadableMetadata) {
         debug!("got signal Completed");
-        if let Some(interface) = self.download_queue.read().front()
-            && interface == &meta
+        if let Some(interface) = &self.current_download_agent
+            && interface.metadata() == meta
         {
             self.remove_and_cleanup_front_download(&meta);
         }
@@ -327,13 +321,11 @@ impl DownloadManagerBuilder {
     }
     fn manage_error_signal(&mut self, error: ApplicationDownloadError) {
         debug!("got signal Error");
-        if let Some(metadata) = self.download_queue.read().front()
-            && let Some(current_agent) = self.download_agent_registry.get(metadata)
-        {
+        if let Some(current_agent) = self.current_download_agent.clone() {
             current_agent.on_error(&self.app_handle, &error);
 
             self.stop_and_wait_current_download();
-            self.remove_and_cleanup_front_download(metadata);
+            self.remove_and_cleanup_front_download(&current_agent.metadata());
         }
         self.push_ui_queue_update();
         self.set_status(DownloadManagerStatus::Error);
@@ -341,23 +333,32 @@ impl DownloadManagerBuilder {
     fn manage_cancel_signal(&mut self, meta: &DownloadableMetadata) {
         debug!("got signal Cancel");
 
-        // If the current download is the one we're tryna cancel
-        if let Some(current_metadata) = self.download_queue.read().front()
-            && current_metadata == meta
-            && let Some(current_download) = self.download_agent_registry.get(current_metadata)
-        {
-            self.set_status(DownloadManagerStatus::Paused);
-            current_download.on_cancelled(&self.app_handle);
-            self.stop_and_wait_current_download();
+        if let Some(current_download) = &self.current_download_agent {
+            if &current_download.metadata() == meta {
+                self.set_status(DownloadManagerStatus::Paused);
+                current_download.on_cancelled(&self.app_handle);
+                self.stop_and_wait_current_download();
 
-            self.download_queue.pop_front();
+                self.download_queue.pop_front();
 
-            self.cleanup_current_download();
-            self.download_agent_registry.remove(meta);
-            debug!("current download queue: {:?}", self.download_queue.read());
-        }
-        // else just cancel it
-        else if let Some(download_agent) = self.download_agent_registry.get(meta) {
+                self.cleanup_current_download();
+                debug!("current download queue: {:?}", self.download_queue.read());
+            }
+            // TODO: Collapse these two into a single if statement somehow
+            else if let Some(download_agent) = self.download_agent_registry.get(meta) {
+                let index = self.download_queue.get_by_meta(meta);
+                if let Some(index) = index {
+                    download_agent.on_cancelled(&self.app_handle);
+                    let _ = self.download_queue.edit().remove(index).unwrap();
+                    let removed = self.download_agent_registry.remove(meta);
+                    debug!(
+                        "removed {:?} from queue {:?}",
+                        removed.map(|x| x.metadata()),
+                        self.download_queue.read()
+                    );
+                }
+            }
+        } else if let Some(download_agent) = self.download_agent_registry.get(meta) {
             let index = self.download_queue.get_by_meta(meta);
             if let Some(index) = index {
                 download_agent.on_cancelled(&self.app_handle);
@@ -370,7 +371,6 @@ impl DownloadManagerBuilder {
                 );
             }
         }
-        self.sender.send(DownloadManagerSignal::Go).unwrap();
         self.push_ui_queue_update();
     }
     fn push_ui_stats_update(&self, kbs: usize, time: usize) {
diff --git a/src-tauri/src/download_manager/download_manager_frontend.rs b/src-tauri/src/download_manager/download_manager_frontend.rs
index 13d20e6..46ee853 100644
--- a/src-tauri/src/download_manager/download_manager_frontend.rs
+++ b/src-tauri/src/download_manager/download_manager_frontend.rs
@@ -62,7 +62,7 @@ impl Serialize for DownloadManagerStatus {
     }
 }
 
-#[derive(Serialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Clone, Debug)]
 pub enum DownloadStatus {
     Queued,
     Downloading,
diff --git a/src-tauri/src/download_manager/downloadable.rs b/src-tauri/src/download_manager/downloadable.rs
index 547daf8..9a74077 100644
--- a/src-tauri/src/download_manager/downloadable.rs
+++ b/src-tauri/src/download_manager/downloadable.rs
@@ -12,12 +12,6 @@ use super::{
     util::{download_thread_control_flag::DownloadThreadControl, progress_object::ProgressObject},
 };
 
-/**
- * Downloadables are responsible for managing their specific object's download state
- * e.g, the GameDownloadAgent is responsible for pushing game updates
- *
- * But the download manager manages the queue state
- */
 pub trait Downloadable: Send + Sync {
     fn download(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError>;
     fn validate(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError>;
@@ -26,7 +20,7 @@ pub trait Downloadable: Send + Sync {
     fn control_flag(&self) -> DownloadThreadControl;
     fn status(&self) -> DownloadStatus;
     fn metadata(&self) -> DownloadableMetadata;
-    fn on_queued(&self, app_handle: &AppHandle);
+    fn on_initialised(&self, app_handle: &AppHandle);
     fn on_error(&self, app_handle: &AppHandle, error: &ApplicationDownloadError);
     fn on_complete(&self, app_handle: &AppHandle);
     fn on_cancelled(&self, app_handle: &AppHandle);
diff --git a/src-tauri/src/download_manager/util/progress_object.rs b/src-tauri/src/download_manager/util/progress_object.rs
index 43c8d76..c2c0c2f 100644
--- a/src-tauri/src/download_manager/util/progress_object.rs
+++ b/src-tauri/src/download_manager/util/progress_object.rs
@@ -23,7 +23,7 @@ pub struct ProgressObject {
     //last_update: Arc<RwLock<Instant>>,
     last_update_time: Arc<AtomicInstant>,
     bytes_last_update: Arc<AtomicUsize>,
-    rolling: RollingProgressWindow<1000>,
+    rolling: RollingProgressWindow<1>,
 }
 
 #[derive(Clone)]
@@ -120,7 +120,7 @@ pub fn calculate_update(progress: &ProgressObject) {
     let last_update_time = progress
         .last_update_time
         .swap(Instant::now(), Ordering::SeqCst);
-    let time_since_last_update = Instant::now().duration_since(last_update_time).as_millis_f64();
+    let time_since_last_update = Instant::now().duration_since(last_update_time).as_millis();
 
     let current_bytes_downloaded = progress.sum();
     let max = progress.get_max();
@@ -128,17 +128,17 @@ pub fn calculate_update(progress: &ProgressObject) {
         .bytes_last_update
         .swap(current_bytes_downloaded, Ordering::Acquire);
 
-    let bytes_since_last_update = current_bytes_downloaded.saturating_sub(bytes_at_last_update) as f64;
+    let bytes_since_last_update = current_bytes_downloaded.saturating_sub(bytes_at_last_update);
 
-    let kilobytes_per_second = bytes_since_last_update / time_since_last_update;
+    let kilobytes_per_second = bytes_since_last_update / (time_since_last_update as usize).max(1);
 
     let bytes_remaining = max.saturating_sub(current_bytes_downloaded); // bytes
 
-    progress.update_window(kilobytes_per_second as usize);
+    progress.update_window(kilobytes_per_second);
     push_update(progress, bytes_remaining);
 }
 
-#[throttle(1, Duration::from_millis(250))]
+#[throttle(1, Duration::from_millis(500))]
 pub fn push_update(progress: &ProgressObject, bytes_remaining: usize) {
     let average_speed = progress.rolling.get_average();
     let time_remaining = (bytes_remaining / 1000) / average_speed.max(1);
diff --git a/src-tauri/src/download_manager/util/rolling_progress_updates.rs b/src-tauri/src/download_manager/util/rolling_progress_updates.rs
index 868b200..fadae99 100644
--- a/src-tauri/src/download_manager/util/rolling_progress_updates.rs
+++ b/src-tauri/src/download_manager/util/rolling_progress_updates.rs
@@ -1,6 +1,6 @@
 use std::sync::{
-    Arc,
     atomic::{AtomicUsize, Ordering},
+    Arc,
 };
 
 #[derive(Clone)]
@@ -22,22 +22,17 @@ impl<const S: usize> RollingProgressWindow<S> {
     }
     pub fn get_average(&self) -> usize {
         let current = self.current.load(Ordering::SeqCst);
-        let valid = self
-            .window
+        self.window
             .iter()
             .enumerate()
             .filter(|(i, _)| i < &current)
             .map(|(_, x)| x.load(Ordering::Acquire))
-            .collect::<Vec<usize>>();
-        let amount = valid.len();
-        let sum = valid.into_iter().sum::<usize>();
-        
-        sum / amount
+            .sum::<usize>()
+            / S
     }
     pub fn reset(&self) {
         self.window
             .iter()
             .for_each(|x| x.store(0, Ordering::Release));
-        self.current.store(0, Ordering::Release);
     }
 }
diff --git a/src-tauri/src/games/collections/collection.rs b/src-tauri/src/games/collections/collection.rs
index ea29474..05fd842 100644
--- a/src-tauri/src/games/collections/collection.rs
+++ b/src-tauri/src/games/collections/collection.rs
@@ -1,11 +1,10 @@
-use bitcode::{Decode, Encode};
 use serde::{Deserialize, Serialize};
 
 use crate::games::library::Game;
 
 pub type Collections = Vec<Collection>;
 
-#[derive(Serialize, Deserialize, Debug, Clone, Default, Encode, Decode)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct Collection {
     id: String,
@@ -15,7 +14,7 @@ pub struct Collection {
     entries: Vec<CollectionObject>,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Default, Encode, Decode)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct CollectionObject {
     collection_id: String,
diff --git a/src-tauri/src/games/collections/commands.rs b/src-tauri/src/games/collections/commands.rs
index 0db6a49..a09d441 100644
--- a/src-tauri/src/games/collections/commands.rs
+++ b/src-tauri/src/games/collections/commands.rs
@@ -4,7 +4,6 @@ use crate::{
     error::remote_access_error::RemoteAccessError,
     remote::{
         auth::generate_authorization_header,
-        cache::{cache_object, get_cached_object},
         requests::{generate_url, make_authenticated_get},
         utils::DROP_CLIENT_ASYNC,
     },
@@ -13,23 +12,11 @@ use crate::{
 use super::collection::{Collection, Collections};
 
 #[tauri::command]
-pub async fn fetch_collections(
-    hard_refresh: Option<bool>,
-) -> Result<Collections, RemoteAccessError> {
-    let do_hard_refresh = hard_refresh.unwrap_or(false);
-    if !do_hard_refresh && let Ok(cached_response) = get_cached_object::<Collections>("collections")
-    {
-        return Ok(cached_response);
-    }
-
+pub async fn fetch_collections() -> Result<Collections, RemoteAccessError> {
     let response =
         make_authenticated_get(generate_url(&["/api/v1/client/collection"], &[])?).await?;
 
-    let collections: Collections = response.json().await?;
-
-    cache_object("collections", &collections)?;
-
-    Ok(collections)
+    Ok(response.json().await?)
 }
 
 #[tauri::command]
@@ -103,8 +90,7 @@ pub async fn delete_game_in_collection(
         .delete(url)
         .header("Authorization", generate_authorization_header())
         .json(&json!({"id": game_id}))
-        .send()
-        .await?;
+        .send().await?;
 
     Ok(())
 }
diff --git a/src-tauri/src/games/commands.rs b/src-tauri/src/games/commands.rs
index e36d934..b99084a 100644
--- a/src-tauri/src/games/commands.rs
+++ b/src-tauri/src/games/commands.rs
@@ -27,14 +27,12 @@ use super::{
 #[tauri::command]
 pub async fn fetch_library(
     state: tauri::State<'_, Mutex<AppState<'_>>>,
-    hard_refresh: Option<bool>,
 ) -> Result<Vec<Game>, RemoteAccessError> {
     offline!(
         state,
         fetch_library_logic,
         fetch_library_logic_offline,
-        state,
-        hard_refresh
+        state
     ).await
 }
 
diff --git a/src-tauri/src/games/downloads/download_agent.rs b/src-tauri/src/games/downloads/download_agent.rs
index e832f3c..14dc8b2 100644
--- a/src-tauri/src/games/downloads/download_agent.rs
+++ b/src-tauri/src/games/downloads/download_agent.rs
@@ -23,7 +23,7 @@ use crate::remote::utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC};
 use log::{debug, error, info, warn};
 use rayon::ThreadPoolBuilder;
 use std::collections::{HashMap, HashSet};
-use std::fs::{OpenOptions, create_dir_all};
+use std::fs::{create_dir_all, OpenOptions};
 use std::path::{Path, PathBuf};
 use std::sync::mpsc::Sender;
 use std::sync::{Arc, Mutex};
@@ -39,7 +39,6 @@ use super::drop_data::DropData;
 static RETRY_COUNT: usize = 3;
 
 const TARGET_BUCKET_SIZE: usize = 63 * 1000 * 1000;
-const MAX_FILES_PER_BUCKET: usize = (1024 / 4) - 1;
 
 pub struct GameDownloadAgent {
     pub id: String,
@@ -84,8 +83,6 @@ impl GameDownloadAgent {
         let stored_manifest =
             DropData::generate(id.clone(), version.clone(), data_base_dir_path.clone());
 
-        let context_lock = stored_manifest.contexts.lock().unwrap().clone();
-
         let result = Self {
             id,
             version,
@@ -108,14 +105,7 @@ impl GameDownloadAgent {
             .as_ref()
             .unwrap()
             .values()
-            .map(|e| {
-                e.lengths
-                    .iter()
-                    .enumerate()
-                    .filter(|(i, _)| *context_lock.get(&e.checksums[*i]).unwrap_or(&false))
-                    .map(|(_, v)| v)
-                    .sum::<usize>()
-            })
+            .map(|e| e.lengths.iter().sum::<usize>())
             .sum::<usize>() as u64;
 
         let available_space = get_disk_available(data_base_dir_path)? as u64;
@@ -308,8 +298,7 @@ impl GameDownloadAgent {
                         drops: vec![],
                     });
 
-                if (*current_bucket_size + length >= TARGET_BUCKET_SIZE
-                    || current_bucket.drops.len() >= MAX_FILES_PER_BUCKET)
+                if *current_bucket_size + length >= TARGET_BUCKET_SIZE
                     && !current_bucket.drops.is_empty()
                 {
                     // Move current bucket into list and make a new one
@@ -378,8 +367,7 @@ impl GameDownloadAgent {
             .iter()
             .map(|e| &e.version)
             .collect::<HashSet<_>>()
-            .into_iter()
-            .cloned()
+            .into_iter().cloned()
             .collect::<Vec<String>>();
 
         info!("downloading across these versions: {versions:?}");
@@ -472,7 +460,6 @@ impl GameDownloadAgent {
                                     ApplicationDownloadError::Communication(_)
                                         | ApplicationDownloadError::Checksum
                                         | ApplicationDownloadError::Lock
-                                        | ApplicationDownloadError::IoError(_)
                                 );
 
                                 if i == RETRY_COUNT - 1 || !retry {
@@ -639,17 +626,8 @@ impl Downloadable for GameDownloadAgent {
         }
     }
 
-    fn on_queued(&self, app_handle: &tauri::AppHandle) {
+    fn on_initialised(&self, _app_handle: &tauri::AppHandle) {
         *self.status.lock().unwrap() = DownloadStatus::Queued;
-        let mut db_lock = borrow_db_mut_checked();
-        let status = ApplicationTransientStatus::Queued {
-            version_name: self.version.clone(),
-        };
-        db_lock
-            .applications
-            .transient_statuses
-            .insert(self.metadata(), status.clone());
-        push_game_update(app_handle, &self.id, None, (None, Some(status)));
     }
 
     fn on_error(&self, app_handle: &tauri::AppHandle, error: &ApplicationDownloadError) {
@@ -658,7 +636,7 @@ impl Downloadable for GameDownloadAgent {
             .emit("download_error", error.to_string())
             .unwrap();
 
-        error!("error while managing download: {error:?}");
+        error!("error while managing download: {error}");
 
         let mut handle = borrow_db_mut_checked();
         handle
@@ -684,8 +662,15 @@ impl Downloadable for GameDownloadAgent {
     }
 
     fn on_cancelled(&self, app_handle: &tauri::AppHandle) {
-        info!("cancelled {}", self.id);
         self.cancel(app_handle);
+        /*
+           on_game_incomplete(
+               &self.metadata(),
+               self.dropdata.base_path.to_string_lossy().to_string(),
+               app_handle,
+           )
+           .unwrap();
+        */
     }
 
     fn status(&self) -> DownloadStatus {
diff --git a/src-tauri/src/games/downloads/download_logic.rs b/src-tauri/src/games/downloads/download_logic.rs
index cd45919..97db2c8 100644
--- a/src-tauri/src/games/downloads/download_logic.rs
+++ b/src-tauri/src/games/downloads/download_logic.rs
@@ -9,7 +9,7 @@ use crate::games::downloads::manifest::{ChunkBody, DownloadBucket, DownloadConte
 use crate::remote::auth::generate_authorization_header;
 use crate::remote::requests::generate_url;
 use crate::remote::utils::DROP_CLIENT_SYNC;
-use log::{debug, info, warn};
+use log::{info, warn};
 use md5::{Context, Digest};
 use reqwest::blocking::Response;
 
@@ -18,7 +18,6 @@ use std::io::Read;
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 use std::sync::Arc;
-use std::time::Instant;
 use std::{
     fs::{File, OpenOptions},
     io::{self, BufWriter, Seek, SeekFrom, Write},
@@ -26,7 +25,6 @@ use std::{
 };
 
 static MAX_PACKET_LENGTH: usize = 4096 * 4;
-static BUMP_SIZE: usize = 4096 * 16;
 
 pub struct DropWriter<W: Write> {
     hasher: Context,
@@ -81,8 +79,6 @@ pub struct DropDownloadPipeline<'a, R: Read, W: Write> {
     pub drops: Vec<DownloadDrop>,
     pub destination: Vec<DropWriter<W>>,
     pub control_flag: &'a DownloadThreadControl,
-    #[allow(dead_code)]
-    progress: ProgressHandle,
 }
 
 impl<'a> DropDownloadPipeline<'a, Response, File> {
@@ -100,7 +96,6 @@ impl<'a> DropDownloadPipeline<'a, Response, File> {
                 .try_collect()?,
             drops,
             control_flag,
-            progress,
         })
     }
 
@@ -116,24 +111,13 @@ impl<'a> DropDownloadPipeline<'a, Response, File> {
             if drop.start != 0 {
                 destination.seek(SeekFrom::Start(drop.start.try_into().unwrap()))?;
             }
-            let mut last_bump = 0;
             loop {
                 let size = MAX_PACKET_LENGTH.min(remaining);
-                let size = self.source.read(&mut copy_buffer[0..size]).inspect_err(|_| {
-                    info!("got error from {}", drop.filename);
-                })?;
+                self.source.read_exact(&mut copy_buffer[0..size])?;
                 remaining -= size;
-                last_bump += size;
 
                 destination.write_all(&copy_buffer[0..size])?;
 
-                if last_bump > BUMP_SIZE {
-                    last_bump -= BUMP_SIZE;
-                    if self.control_flag.get() == DownloadThreadControlFlag::Stop {
-                        return Ok(false);
-                    }
-                }
-
                 if remaining == 0 {
                     break;
                 };
@@ -147,13 +131,6 @@ impl<'a> DropDownloadPipeline<'a, Response, File> {
         Ok(true)
     }
 
-    #[allow(dead_code)]
-    fn debug_skip_checksum(self) {
-        self.destination
-            .into_iter()
-            .for_each(|mut e| e.flush().unwrap());
-    }
-
     fn finish(self) -> Result<Vec<Digest>, io::Error> {
         let checksums = self
             .destination
@@ -176,8 +153,6 @@ pub fn download_game_bucket(
         return Ok(false);
     }
 
-    let start = Instant::now();
-
     let header = generate_authorization_header();
 
     let url = generate_url(&["/api/v2/client/chunk"], &[])
@@ -220,7 +195,9 @@ pub fn download_game_bucket(
     for (i, raw_length) in lengths.split(",").enumerate() {
         let length = raw_length.parse::<usize>().unwrap_or(0);
         let Some(drop) = bucket.drops.get(i) else {
-            warn!("invalid number of Content-Lengths recieved: {i}, {lengths}");
+            warn!(
+                "invalid number of Content-Lengths recieved: {i}, {lengths}"
+            );
             return Err(ApplicationDownloadError::DownloadError);
         };
         if drop.length != length {
@@ -232,10 +209,6 @@ pub fn download_game_bucket(
         }
     }
 
-    let timestep = start.elapsed().as_millis();
-
-    debug!("took {}ms to start downloading", timestep);
-
     let mut pipeline =
         DropDownloadPipeline::new(response, bucket.drops.clone(), control_flag, progress)
             .map_err(|e| ApplicationDownloadError::IoError(Arc::new(e)))?;
diff --git a/src-tauri/src/games/library.rs b/src-tauri/src/games/library.rs
index 2978908..541c4e6 100644
--- a/src-tauri/src/games/library.rs
+++ b/src-tauri/src/games/library.rs
@@ -80,13 +80,7 @@ pub struct StatsUpdateEvent {
 
 pub async fn fetch_library_logic(
     state: tauri::State<'_, Mutex<AppState<'_>>>,
-    hard_fresh: Option<bool>,
 ) -> Result<Vec<Game>, RemoteAccessError> {
-    let do_hard_refresh = hard_fresh.unwrap_or(false);
-    if !do_hard_refresh && let Ok(library) = get_cached_object("library") {
-        return Ok(library);
-    }
-
     let client = DROP_CLIENT_ASYNC.clone();
     let response = generate_url(&["/api/v1/client/user/library"], &[])?;
     let response = client
@@ -148,7 +142,6 @@ pub async fn fetch_library_logic(
 }
 pub async fn fetch_library_logic_offline(
     _state: tauri::State<'_, Mutex<AppState<'_>>>,
-    _hard_refresh: Option<bool>,
 ) -> Result<Vec<Game>, RemoteAccessError> {
     let mut games: Vec<Game> = get_cached_object("library")?;
 
@@ -528,10 +521,9 @@ pub fn push_game_update(
 ) {
     if let Some(GameDownloadStatus::Installed { .. } | GameDownloadStatus::SetupRequired { .. }) =
         &status.0
-        && version.is_none()
-    {
-        panic!("pushed game for installed game that doesn't have version information");
-    }
+        && version.is_none() {
+            panic!("pushed game for installed game that doesn't have version information");
+        }
 
     app_handle
         .emit(
diff --git a/src-tauri/src/games/state.rs b/src-tauri/src/games/state.rs
index 9cffc6d..668eb1b 100644
--- a/src-tauri/src/games/state.rs
+++ b/src-tauri/src/games/state.rs
@@ -1,6 +1,4 @@
-use crate::database::models::data::{
-    ApplicationTransientStatus, Database, DownloadType, DownloadableMetadata, GameDownloadStatus,
-};
+use crate::database::models::data::{ApplicationTransientStatus, Database, GameDownloadStatus};
 
 pub type GameStatusWithTransient = (
     Option<GameDownloadStatus>,
@@ -10,16 +8,10 @@ pub struct GameStatusManager {}
 
 impl GameStatusManager {
     pub fn fetch_state(game_id: &String, database: &Database) -> GameStatusWithTransient {
-        let online_state = database
-            .applications
-            .transient_statuses
-            .get(&DownloadableMetadata {
-                id: game_id.to_string(),
-                download_type: DownloadType::Game,
-                version: None,
-            })
-            .cloned();
-        
+        let online_state = match database.applications.installed_game_version.get(game_id) {
+            Some(meta) => database.applications.transient_statuses.get(meta).cloned(),
+            None => None,
+        };
         let offline_state = database.applications.game_statuses.get(game_id).cloned();
 
         if online_state.is_some() {
diff --git a/src-tauri/src/process/process_manager.rs b/src-tauri/src/process/process_manager.rs
index 33fab1e..901671f 100644
--- a/src-tauri/src/process/process_manager.rs
+++ b/src-tauri/src/process/process_manager.rs
@@ -346,24 +346,19 @@ impl ProcessManager<'_> {
             .to_string();
 
         #[cfg(target_os = "windows")]
-        let mut command = {
-            use std::os::windows::process::CommandExt;
-            let mut command = Command::new("cmd");
-            command.raw_arg(format!("/C \"{}\"", &launch_string));
-            command.creation_flags(0x08000000);
-
-            command
-        };
-        #[cfg(unix)]
-        let mut command = {
-            let mut command: Command = Command::new("sh");
-            command.args(vec!["-c", &launch_string]);
-
-            command
-        };
+        use std::os::windows::process::CommandExt;
+        #[cfg(target_os = "windows")]
+        let mut command = Command::new("cmd");
+        #[cfg(target_os = "windows")]
+        command.raw_arg(format!("/C \"{}\"", &launch_string));
 
         info!("launching (in {install_dir}): {launch_string}",);
 
+        #[cfg(unix)]
+        let mut command: Command = Command::new("sh");
+        #[cfg(unix)]
+        command.args(vec!["-c", &launch_string]);
+
         debug!("final launch string:\n\n{launch_string}\n");
 
         command
diff --git a/src-tauri/src/remote/auth.rs b/src-tauri/src/remote/auth.rs
index 88b7771..58c9936 100644
--- a/src-tauri/src/remote/auth.rs
+++ b/src-tauri/src/remote/auth.rs
@@ -12,7 +12,7 @@ use crate::{
     database::{
         db::{borrow_db_checked, borrow_db_mut_checked},
         models::data::DatabaseAuth,
-    }, error::{drop_server_error::DropServerError, remote_access_error::RemoteAccessError}, remote::{cache::clear_cached_object, requests::make_authenticated_get, utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC}}, AppState, AppStatus, User
+    }, error::{drop_server_error::DropServerError, remote_access_error::RemoteAccessError}, remote::{requests::make_authenticated_get, utils::{DROP_CLIENT_ASYNC, DROP_CLIENT_SYNC}}, AppState, AppStatus, User
 };
 
 use super::{
@@ -159,9 +159,6 @@ pub async fn recieve_handshake(app: AppHandle, path: String) {
     state_lock.status = app_status;
     state_lock.user = user;
 
-    let _ = clear_cached_object("collections");
-    let _ = clear_cached_object("library");
-
     drop(state_lock);
 
     app.emit("auth/finished", ()).unwrap();
diff --git a/src-tauri/src/remote/cache.rs b/src-tauri/src/remote/cache.rs
index d4afd14..c23be49 100644
--- a/src-tauri/src/remote/cache.rs
+++ b/src-tauri/src/remote/cache.rs
@@ -50,12 +50,6 @@ fn read_sync(base: &Path, key: &str) -> io::Result<Vec<u8>> {
     Ok(file)
 }
 
-fn delete_sync(base: &Path, key: &str) -> io::Result<()> {
-    let cache_path = get_cache_path(base, key);
-    std::fs::remove_file(cache_path)?;
-    Ok(())
-}
-
 pub fn cache_object<D: Encode>(key: &str, data: &D) -> Result<(), RemoteAccessError> {
     cache_object_db(key, data, &borrow_db_checked())
 }
@@ -79,17 +73,6 @@ pub fn get_cached_object_db<D: DecodeOwned>(
         bitcode::decode::<D>(&bytes).map_err(|e| RemoteAccessError::Cache(io::Error::other(e)))?;
     Ok(data)
 }
-pub fn clear_cached_object(key: &str) -> Result<(), RemoteAccessError> {
-    clear_cached_object_db(key, &borrow_db_checked())
-}
-pub fn clear_cached_object_db(
-    key: &str,
-    db: &Database,
-) -> Result<(), RemoteAccessError> {
-    delete_sync(&db.cache_dir, key).map_err(RemoteAccessError::Cache)?;
-    Ok(())
-}
-
 #[derive(Encode, Decode)]
 pub struct ObjectCache {
     content_type: String,