diff --git a/deno.lock b/deno.lock
index f1dd6a5..746e906 100644
--- a/deno.lock
+++ b/deno.lock
@@ -21,8 +21,8 @@
     ],
     "packageJson": {
       "dependencies": [
-        "npm:98.css@~0.1.21",
-        "npm:@atcute/cid@^2.2.2",
+        "npm:@jsr/bradenmacdonald__s3-lite-client@0.9",
+        "npm:@jsr/std__media-types@^1.1.0",
         "npm:@picocss/pico@^2.1.1",
         "npm:@types/throttle-debounce@^5.0.2",
         "npm:astro-purgecss@^5.2.2",
@@ -32,6 +32,7 @@
         "npm:idb-keyval@^6.2.1",
         "npm:music-metadata@^11.2.3",
         "npm:native-file-system-adapter@^3.0.1",
+        "npm:node-s3-url-encode@^0.0.4",
         "npm:purgecss@^7.0.2",
         "npm:query-string@^9.1.2",
         "npm:sass@^1.87.0",
diff --git a/package-lock.json b/package-lock.json
index dd5f11a..1f16ad4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,15 +5,15 @@
   "packages": {
     "": {
       "dependencies": {
-        "@atcute/cid": "^2.2.2",
         "@bradenmacdonald/s3-lite-client": "npm:@jsr/bradenmacdonald__s3-lite-client@^0.9.0",
         "@picocss/pico": "^2.1.1",
+        "@std/media-types": "npm:@jsr/std__media-types@^1.1.0",
         "@web-applets/sdk": "https://gitpkg.vercel.app/unternet-co/web-applets/sdk?tokono.ma/experiment&scripts.postinstall=npm%20i%20%40types%2Fnode%20%26%26%20npx%20tsc",
-        "98.css": "^0.1.21",
         "iconoir": "^7.11.0",
         "idb-keyval": "^6.2.1",
         "music-metadata": "^11.2.3",
         "native-file-system-adapter": "^3.0.1",
+        "node-s3-url-encode": "^0.0.4",
         "query-string": "^9.1.2",
         "spellcaster": "^6.0.0",
         "throttle-debounce": "^5.0.2",
@@ -107,28 +107,6 @@
         "node": "^18.17.1 || ^20.3.0 || >=22.0.0"
       }
     },
-    "node_modules/@atcute/cid": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@atcute/cid/-/cid-2.2.2.tgz",
-      "integrity": "sha512-deAGMqLAyplt7eIukhkjlsGubvrcMrtXkDKlUYZDo4WUdL7hSjBywtPXf6SbMK+Mjvst7l2+83OqTcY5AuuxtA==",
-      "dependencies": {
-        "@atcute/multibase": "^1.1.3",
-        "@atcute/uint8array": "^1.0.1"
-      }
-    },
-    "node_modules/@atcute/multibase": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@atcute/multibase/-/multibase-1.1.3.tgz",
-      "integrity": "sha512-vQQO0tDuQPguBvHdgV3ryn7R8U6beQ50KA/juYm+dCeT/3hOK2stMbX+IaW8JEuwkT5lJsU8wDIOicQT4mB7Ag==",
-      "dependencies": {
-        "@atcute/uint8array": "^1.0.1"
-      }
-    },
-    "node_modules/@atcute/uint8array": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@atcute/uint8array/-/uint8array-1.0.1.tgz",
-      "integrity": "sha512-AAnlFKyfDRgb9GNZJbhQ6OuMhbmNPirQyapb8KnmcEhxQZ3+tt+4NcwqekEegY4MpNqSTYeeTdyxq0wGZv1JHg=="
-    },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
@@ -1710,6 +1688,12 @@
       "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
       "dev": true
     },
+    "node_modules/@std/media-types": {
+      "name": "@jsr/std__media-types",
+      "version": "1.1.0",
+      "resolved": "https://npm.jsr.io/~/11/@jsr/std__media-types/1.1.0.tgz",
+      "integrity": "sha512-dHvaxHL7ENWnltgL653uo3KnKFse3ZbopZop2gqsT7yrscx7irZEClu5Cba7gMPPRk4Lg1FbriNcaBViM2RSBw=="
+    },
     "node_modules/@swc/helpers": {
       "version": "0.5.17",
       "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
@@ -1848,12 +1832,6 @@
       "hasInstallScript": true,
       "license": "MIT"
     },
-    "node_modules/98.css": {
-      "version": "0.1.21",
-      "resolved": "https://registry.npmjs.org/98.css/-/98.css-0.1.21.tgz",
-      "integrity": "sha512-ddk5qtUWyapM0Bzd5jwGExoE5fdSEGrP+F5VbYjyZLf2c9UVmn6w2NPTvCsoD4BWdGsjdLjlkQGhWwWTJcYQJQ==",
-      "license": "MIT"
-    },
     "node_modules/acorn": {
       "version": "8.14.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
@@ -5039,6 +5017,12 @@
       "integrity": "sha512-0uGYQ1WQL1M5kKvGRXWQ3uZCHtLTO8hln3oBjIusM75WoesZ909uQJs/Hb946i2SS+Gsrhkaa6iAO17jRIv6DQ==",
       "dev": true
     },
+    "node_modules/node-s3-url-encode": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/node-s3-url-encode/-/node-s3-url-encode-0.0.4.tgz",
+      "integrity": "sha512-l0IizfnxE1hb9dadzYBpA27syfL9LFkPzCKH6YWrssv2sPLjVuCent67A8GPe4isdj4bEsbgdPWLTcV4gxEg9w==",
+      "license": "MIT"
+    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
diff --git a/package.json b/package.json
index d2827b6..2f5bf39 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "dependencies": {
     "@bradenmacdonald/s3-lite-client": "npm:@jsr/bradenmacdonald__s3-lite-client@^0.9.0",
     "@picocss/pico": "^2.1.1",
+    "@std/media-types": "npm:@jsr/std__media-types@^1.1.0",
     "@web-applets/sdk": "https://gitpkg.vercel.app/unternet-co/web-applets/sdk?tokono.ma/experiment&scripts.postinstall=npm%20i%20%40types%2Fnode%20%26%26%20npx%20tsc",
     "iconoir": "^7.11.0",
     "idb-keyval": "^6.2.1",
diff --git a/src/pages/configurator/input/_applet.astro b/src/pages/configurator/input/_applet.astro
index 9a7e582..b62283e 100644
--- a/src/pages/configurator/input/_applet.astro
+++ b/src/pages/configurator/input/_applet.astro
@@ -33,7 +33,7 @@
   import { applets } from "@web-applets/sdk";
 
   import type { Track } from "@applets/core/types.d.ts";
-  import { applet, waitUntilAppletIsReady } from "@scripts/theme";
+  import { applet } from "@scripts/theme";
 
   ////////////////////////////////////////////
   // SETUP
@@ -51,6 +51,7 @@
   // Applet connections
   const input = {
     nativeFs: await applet("../../input/native-fs", { container }),
+    s3: await applet("../../input/s3", { container }),
   };
 
   ////////////////////////////////////////////
@@ -65,6 +66,7 @@
       },
       {
         [input.nativeFs.manifest.input_properties.scheme]: [],
+        [input.s3.manifest.input_properties.scheme]: [],
       },
     );
 
@@ -76,6 +78,11 @@
               timeoutDuration: 60000 * 60 * 24,
             });
 
+          case input.s3.manifest.input_properties.scheme:
+            return await input.s3.sendAction("list", cachedTracksGroup, {
+              timeoutDuration: 60000 * 60 * 24,
+            });
+
           default:
             return cachedTracks;
         }
@@ -88,12 +95,15 @@
     return tracks;
   };
 
-  const resolve = async (fileUri: string) => {
-    const scheme = fileUri.split(":", 1)[0];
+  const resolve = async (args: { method: string; uri: string }) => {
+    const scheme = args.uri.split(":", 1)[0];
 
     switch (scheme) {
       case input.nativeFs.manifest.input_properties.scheme:
-        return await input.nativeFs.sendAction("resolve", fileUri);
+        return await input.nativeFs.sendAction("resolve", args);
+
+      case input.s3.manifest.input_properties.scheme:
+        return await input.s3.sendAction("resolve", args);
 
       default:
         return undefined;
diff --git a/src/pages/configurator/input/_manifest.json b/src/pages/configurator/input/_manifest.json
index e9e1e4a..ce72dae 100644
--- a/src/pages/configurator/input/_manifest.json
+++ b/src/pages/configurator/input/_manifest.json
@@ -18,8 +18,15 @@
       "title": "Resolve",
       "description": "Potentially translates a track uri with a matching scheme into a URL pointing at the audio bytes. If it can be resolved that is, otherwise you'll get `undefined`.",
       "params_schema": {
-        "type": "string",
-        "description": "The uri to resolve"
+        "type": "object",
+        "properties": {
+          "method": {
+            "type": "string",
+            "description": "The HTTP method that is going to be used on the resolved URI."
+          },
+          "uri": { "type": "string", "description": "The URI to resolve." }
+        },
+        "required": ["method", "uri"]
       }
     }
   }
diff --git a/src/pages/index.astro b/src/pages/index.astro
index ee1ab54..3060418 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -48,6 +48,8 @@ const orchestrators = [
 const output = [
   { url: "output/indexed-db/", title: "IndexedDB" },
   { url: "output/native-fs/", title: "Native File System" },
+  { url: "output/todo/", title: "(TODO) Keyhive/Beelay" },
+  { url: "output/todo/", title: "(TODO) Some local-first sync engine" },
 ];
 
 const processors = [
diff --git a/src/pages/input/native-fs/_applet.astro b/src/pages/input/native-fs/_applet.astro
index 12a6ab0..053e884 100644
--- a/src/pages/input/native-fs/_applet.astro
+++ b/src/pages/input/native-fs/_applet.astro
@@ -16,12 +16,11 @@
 </main>
 
 <script>
-  import * as IDB from "idb-keyval";
-
   import { applets } from "@web-applets/sdk";
   import { computed, effect, Signal, signal } from "spellcaster";
   import { repeat, tags, text } from "spellcaster/hyperscript.js";
   import { type FileSystemDirectoryHandle, showDirectoryPicker } from "native-file-system-adapter";
+  import * as IDB from "idb-keyval";
   import * as URI from "uri-js";
   import QS from "query-string";
 
@@ -163,7 +162,9 @@
     return data;
   };
 
-  const resolve = async (fileUri: string) => {
+  const resolve = async (args: { uri: string }) => {
+    const fileUri = args.uri;
+
     if (!isSupported()) {
       return undefined;
     }
diff --git a/src/pages/input/native-fs/_manifest.json b/src/pages/input/native-fs/_manifest.json
index 5138f98..e4209b1 100644
--- a/src/pages/input/native-fs/_manifest.json
+++ b/src/pages/input/native-fs/_manifest.json
@@ -29,8 +29,15 @@
       "title": "Resolve",
       "description": "Potentially translates a track uri with a matching scheme into a URL pointing at the audio bytes. If it can be resolved that is, otherwise you'll get `undefined`. Use the `consult` action to get a more detailed answer.",
       "params_schema": {
-        "type": "string",
-        "description": "The uri to resolve"
+        "type": "object",
+        "properties": {
+          "method": {
+            "type": "string",
+            "description": "The HTTP method that is going to be used on the resolved URI."
+          },
+          "uri": { "type": "string", "description": "The URI to resolve." }
+        },
+        "required": ["method", "uri"]
       }
     },
     "mount": {
diff --git a/src/pages/input/s3/_applet.astro b/src/pages/input/s3/_applet.astro
new file mode 100644
index 0000000..caa264c
--- /dev/null
+++ b/src/pages/input/s3/_applet.astro
@@ -0,0 +1,362 @@
+<main class="container">
+  <h1>S3-compatible input</h1>
+
+  <h4>Mounted buckets</h4>
+
+  <div id="buckets">
+    <p>
+      <span class="with-icon">
+        <i class="iconoir-bonfire"></i>
+        <small>Just a moment, loading mounted buckets.</small>
+      </span>
+    </p>
+  </div>
+
+  <h4>Add a new S3 bucket</h4>
+
+  <form id="form"></form>
+
+  <!-- Warning about hostnames/regions/buckets -->
+  <!-- <p>
+    <small>
+      <span class="with-icon">
+        <i class="iconoir-warning-triangle"></i>
+        <span
+          >The bucket name and region are not automatically prefixed/inserted into the hostname, you
+          must add them yourself to either the host or the path <strong>if needed</strong>.</span
+        >
+      </span>
+    </small>
+  </p> -->
+</main>
+
+<style is:global>
+  iframe {
+    display: none;
+  }
+</style>
+
+<script>
+  import { S3Client } from "@bradenmacdonald/s3-lite-client";
+  import { type AppletEvent, applets } from "@web-applets/sdk";
+  import { computed, effect, Signal, signal } from "spellcaster";
+  import { type Props, repeat, tags, text } from "spellcaster/hyperscript.js";
+  import * as IDB from "idb-keyval";
+  import * as URI from "uri-js";
+  import QS from "query-string";
+
+  // @ts-ignore
+  import { encodeS3URI } from "node-s3-url-encode";
+
+  import type { Output, Track } from "@applets/core/types.d.ts";
+  import { applet } from "@scripts/theme";
+
+  import manifest from "./_manifest.json";
+  import { isAudioFile } from "@scripts/inputs/common";
+
+  type Bucket = {
+    accessKey: string;
+    bucketName: string;
+    host: string;
+    path: string;
+    region: string;
+    secretKey: string;
+  };
+
+  const ENCODINGS = {
+    "\+": "%2B",
+    "\!": "%21",
+    '\"': "%22",
+    "\#": "%23",
+    "\$": "%24",
+    "\&": "%26",
+    "'": "%27",
+    "\(": "%28",
+    "\)": "%29",
+    "\*": "%2A",
+    "\,": "%2C",
+    "\:": "%3A",
+    "\;": "%3B",
+    "\=": "%3D",
+    "\?": "%3F",
+    "\@": "%40",
+  };
+
+  ////////////////////////////////////////////
+  // SETUP
+  ////////////////////////////////////////////
+  const IDB_PREFIX = "@applets/input/s3";
+  const IDB_BUCKETS = `${IDB_PREFIX}/buckets`;
+  const SCHEME = manifest.input_properties.scheme;
+
+  // Register applet
+  const context = applets.register();
+
+  // Applet connections
+  const orchestrator = {
+    output: await applet<Output>("../../orchestrator/output-management", {
+      context: self.top || self.parent,
+    }),
+  };
+
+  // Watch for data changes
+  orchestrator.output.addEventListener("data", async (event: AppletEvent) => {
+    await loadBuckets();
+  });
+
+  ////////////////////////////////////////////
+  // UI
+  ////////////////////////////////////////////
+  const [buckets, setBuckets] = signal<Record<string, Bucket>>(await loadBuckets());
+  const [form, setForm] = signal<{
+    access_key?: string;
+    bucket_name?: string;
+    host?: string;
+    path?: string;
+    region?: string;
+    secret_key?: string;
+  }>({});
+
+  const bucketsMap = computed(() => {
+    return new Map(Object.entries(buckets()));
+  });
+
+  effect(() => {
+    saveBuckets(buckets());
+  });
+
+  ////////////////////////////////////////////
+  // UI ~ BUCKETS
+  ////////////////////////////////////////////
+  const Bucket = (bucket: Signal<Bucket>) => {
+    const onclick = () => {
+      const b = bucket();
+      const id = bucketId(b);
+
+      const col = { ...buckets() };
+      delete col[id];
+
+      setBuckets(col);
+    };
+
+    return tags.li({ onclick, style: "cursor: pointer" }, text(bucket().host));
+  };
+
+  const BucketList = computed(() => {
+    if (bucketsMap().size === 0) {
+      return tags.p({ id: "buckets" }, [tags.small({}, text("Nothing added so far."))]);
+    }
+
+    return tags.ul({ id: "buckets" }, repeat(bucketsMap, Bucket));
+  });
+
+  effect(() => {
+    document.querySelector("#buckets")?.replaceWith(BucketList());
+  });
+
+  ////////////////////////////////////////////
+  // UI ~ FORM
+  ////////////////////////////////////////////
+  function addBucket(event: Event) {
+    event.preventDefault();
+
+    const f = form();
+
+    const bucket: Bucket = {
+      accessKey: f.access_key || "",
+      bucketName: f.bucket_name || "",
+      host: f.host || "s3.amazonaws.com",
+      path: f.path || "/",
+      region: f.region || "us-east-1",
+      secretKey: f.secret_key || "",
+    };
+
+    setBuckets({
+      ...buckets(),
+      [bucketId(bucket)]: bucket,
+    });
+  }
+
+  function Form() {
+    return tags.form({ onsubmit: addBucket }, [
+      tags.fieldset({ className: "grid" }, [
+        Input("access_key", "Access key", "r31w7m9c", { required: true }),
+        Input("secret_key", "Secret key", "v02g2l29", { required: true }),
+      ]),
+      tags.fieldset({ className: "grid" }, [
+        Input("bucket_name", "Bucket name", "bucket", { required: true }),
+        Input("region", "Region", "us-east-1", { required: true }),
+      ]),
+      tags.fieldset({ className: "grid" }, [
+        Input("host", "Host", "s3.amazonaws.com", { required: true }),
+        Input("path", "Path", "/"),
+      ]),
+      tags.fieldset({ className: "grid" }, [tags.input({ type: "submit", value: "Connect" }, [])]),
+    ]);
+  }
+
+  function Input(name: string, label: string, placeholder: string, opts: Props = {}) {
+    return tags.label({}, [
+      tags.span({}, [
+        tags.span({}, text(label)),
+        tags.small({}, text("required" in opts ? "" : " (optional)")),
+      ]),
+      tags.input({
+        ...opts,
+        name,
+        placeholder,
+        oninput: (event: InputEvent) => formInput(name, (event.target as HTMLInputElement).value),
+      }),
+    ]);
+  }
+
+  function formInput(name: string, value: string) {
+    setForm({ ...form(), [name]: value });
+  }
+
+  // 🚀
+  document.querySelector("#form")?.replaceWith(Form());
+
+  ////////////////////////////////////////////
+  // ACTIONS
+  ////////////////////////////////////////////
+  const consult = async (fileUriOrScheme: string) => {
+    if (!navigator.onLine) return false;
+
+    // TODO: Check if bucket is avail*able + CORS works?
+    return true;
+  };
+
+  const list = async (_cachedTracks: Track[] = []) => {
+    // TODO: Do we need to do something with the old tracks here?
+
+    const promises = Object.values(buckets()).map(async (bucket) => {
+      const client = createClient(bucket);
+
+      const list = await Array.fromAsync(
+        client.listObjects({
+          prefix: bucket.path.replace(/^\//, ""),
+        }),
+      );
+
+      return list
+        .filter((l) => isAudioFile(l.key))
+        .map((l) => {
+          const track: Track = {
+            id: crypto.randomUUID(),
+            uri: buildURI(bucket, l.key),
+          };
+
+          return track;
+        });
+    });
+
+    return (await Promise.all(promises)).flat(1);
+  };
+
+  const resolve = async ({ method, uri }: { method: string; uri: string }) => {
+    const bucket = parseURI(uri);
+    if (!bucket) return undefined;
+
+    const client = createClient(bucket);
+    const parsedURI = URI.parse(uri);
+    const path = (
+      bucket.path.replace(/\/$/, "") + URI.unescapeComponent(parsedURI.path || "")
+    ).replace(/^\//, "");
+
+    const url = await client.getPresignedUrl(method.toUpperCase() as any, path);
+    return url;
+  };
+
+  const mount = async () => {};
+
+  const unmount = async () => {};
+
+  context.setActionHandler("consult", consult);
+  context.setActionHandler("list", list);
+  context.setActionHandler("resolve", resolve);
+  context.setActionHandler("mount", mount);
+  context.setActionHandler("unmount", unmount);
+
+  ////////////////////////////////////////////
+  // 🛠️
+  ////////////////////////////////////////////
+  function bucketsFromTracks(tracks: Track[]) {
+    return tracks.reduce((acc: Record<string, Bucket>, track: Track) => {
+      const bucket = parseURI(track.uri);
+      if (!bucket) return acc;
+
+      const id = bucketId(bucket);
+      if (acc[id]) return acc;
+
+      return { ...acc, [id]: bucket };
+    }, {});
+  }
+
+  function bucketId(bucket: Bucket) {
+    return `${bucket.accessKey}:${bucket.secretKey}@${bucket.host}`;
+  }
+
+  function buildURI(bucket: Bucket, path: string) {
+    return URI.serialize({
+      scheme: SCHEME,
+      userinfo: `${bucket.accessKey}:${bucket.secretKey}`,
+      host: bucket.host,
+      path: path,
+      query: QS.stringify({
+        bucketName: bucket.bucketName,
+        bucketPath: bucket.path,
+        region: bucket.region,
+      }),
+    });
+  }
+
+  function createClient(bucket: Bucket) {
+    return new S3Client({
+      bucket: bucket.bucketName,
+      endPoint: bucket.host.includes("://") ? bucket.host : `https://${bucket.host}`,
+      region: bucket.region,
+      pathStyle: false,
+      accessKey: bucket.accessKey,
+      secretKey: bucket.secretKey,
+    });
+  }
+
+  function encodeAwsUriComponent(a: string) {
+    return encodeURIComponent(a).replace(
+      /(\+|!|"|#|\$|&|'|\(|\)|\*|\+|,|:|;|=|\?|@)/gim,
+      (match) => (ENCODINGS as any)[match] ?? match,
+    );
+  }
+
+  async function loadBuckets() {
+    const i = await IDB.get(IDB_BUCKETS);
+    const t = bucketsFromTracks(orchestrator.output.data.tracks);
+
+    return { ...i, ...t };
+  }
+
+  function parseURI(uriString: string): Bucket | undefined {
+    const uri = URI.parse(uriString);
+    if (uri.scheme !== SCHEME) return undefined;
+    if (!uri.host) return undefined;
+
+    const [accessKey, secretKey] = uri.userinfo?.split(":") ?? [];
+    if (!accessKey || !secretKey) return undefined;
+
+    const qs = QS.parse(uri.query || "");
+
+    return {
+      accessKey,
+      bucketName: typeof qs.bucketName === "string" ? qs.bucketName : "",
+      host: uri.host,
+      path: qs.bucketPath === "string" ? qs.bucketPath : "/",
+      region: typeof qs.region === "string" ? qs.region : "",
+      secretKey,
+    };
+  }
+
+  async function saveBuckets(items: Record<string, Bucket>) {
+    await IDB.set(IDB_BUCKETS, items);
+  }
+</script>
diff --git a/src/pages/input/s3/_manifest.json b/src/pages/input/s3/_manifest.json
new file mode 100644
index 0000000..d3af312
--- /dev/null
+++ b/src/pages/input/s3/_manifest.json
@@ -0,0 +1,55 @@
+{
+  "name": "diffuse/input/s3",
+  "title": "Diffuse Input | S3",
+  "entrypoint": "index.html",
+  "input_properties": {
+    "scheme": "s3"
+  },
+  "actions": {
+    "consult": {
+      "title": "Consult",
+      "params_schema": {
+        "type": "string",
+        "description": "The uri to check the availability of."
+      }
+    },
+    "list": {
+      "title": "List",
+      "description": "List tracks.",
+      "params_schema": {
+        "type": "array",
+        "description": "A list of (cached) tracks with an uri matching the scheme",
+        "items": {
+          "type": "object"
+        }
+      }
+    },
+    "resolve": {
+      "title": "Resolve",
+      "description": "Potentially translates a track uri with a matching scheme into a URL pointing at the audio bytes. If it can be resolved that is, otherwise you'll get `undefined`. Use the `consult` action to get a more detailed answer.",
+      "params_schema": {
+        "type": "object",
+        "properties": {
+          "method": {
+            "type": "string",
+            "description": "The HTTP method that is going to be used on the resolved URI."
+          },
+          "uri": { "type": "string", "description": "The URI to resolve." }
+        },
+        "required": ["method", "uri"]
+      }
+    },
+    "mount": {
+      "title": "Mount",
+      "description": "Prepare for usage."
+    },
+    "unmount": {
+      "title": "Unmount",
+      "description": "Callback after usage.",
+      "params_schema": {
+        "type": "string",
+        "description": "The handle id to unmount"
+      }
+    }
+  }
+}
diff --git a/src/pages/input/s3/index.astro b/src/pages/input/s3/index.astro
new file mode 100644
index 0000000..f6d0270
--- /dev/null
+++ b/src/pages/input/s3/index.astro
@@ -0,0 +1,9 @@
+---
+import Layout from "@layouts/applet-pico-ui.astro";
+import Applet from "./_applet.astro";
+import { title } from "./_manifest.json";
+---
+
+<Layout title={title}>
+  <Applet />
+</Layout>
diff --git a/src/pages/orchestrator/input-cache/_applet.astro b/src/pages/orchestrator/input-cache/_applet.astro
index 7d4dcc5..535c6ab 100644
--- a/src/pages/orchestrator/input-cache/_applet.astro
+++ b/src/pages/orchestrator/input-cache/_applet.astro
@@ -16,7 +16,7 @@
 
   // Applet connections
   const configurator = {
-    input: await applet("../../configurator/input", { context: self.parent }),
+    input: await applet("../../configurator/input", { context: self.top || self.parent }),
   };
 
   const orchestrator = {
@@ -52,13 +52,18 @@
 
         if (track.tags) return [...acc, track];
 
-        const url = await configurator.input.sendAction<string | undefined>("resolve", track.uri, {
-          timeoutDuration: 60000,
-        });
+        const getURL = await configurator.input.sendAction<string | undefined>(
+          "resolve",
+          { method: "GET", uri: track.uri },
+          {
+            timeoutDuration: 60000,
+          },
+        );
 
-        if (!url) return acc;
+        if (!getURL) return acc;
 
-        const meta = await processor.metadataFetcher.sendAction("extract", url, {
+        // TODO: Do we need to pass the HEAD URL too?
+        const meta = await processor.metadataFetcher.sendAction("extract", getURL, {
           timeoutDuration: 60000,
         });
 
diff --git a/src/pages/orchestrator/output-management/_applet.astro b/src/pages/orchestrator/output-management/_applet.astro
index 0c1bd91..27091ee 100644
--- a/src/pages/orchestrator/output-management/_applet.astro
+++ b/src/pages/orchestrator/output-management/_applet.astro
@@ -20,7 +20,7 @@
 
   // Applet connections
   const configurator = {
-    output: await applet("../../configurator/output", { context: self.parent }),
+    output: await applet("../../configurator/output", { context: self.top || self.parent }),
   };
 
   // Load tracks
diff --git a/src/pages/orchestrator/single-queue/_applet.astro b/src/pages/orchestrator/single-queue/_applet.astro
index 4519ace..97cd4e9 100644
--- a/src/pages/orchestrator/single-queue/_applet.astro
+++ b/src/pages/orchestrator/single-queue/_applet.astro
@@ -15,8 +15,12 @@
 
   // Applet connections
   const engine = {
-    audio: await applet<AudioEngine.State>("../../engine/audio", { context: self.parent }),
-    queue: await applet<QueueEngine.State>("../../engine/queue", { context: self.parent }),
+    audio: await applet<AudioEngine.State>("../../engine/audio", {
+      context: self.top || self.parent,
+    }),
+    queue: await applet<QueueEngine.State>("../../engine/queue", {
+      context: self.top || self.parent,
+    }),
   };
 
   const orchestrator = {
diff --git a/src/pages/processor/metadata-fetcher/_applet.astro b/src/pages/processor/metadata-fetcher/_applet.astro
index 68b9268..259999c 100644
--- a/src/pages/processor/metadata-fetcher/_applet.astro
+++ b/src/pages/processor/metadata-fetcher/_applet.astro
@@ -1,6 +1,8 @@
 <script>
   import { applets } from "@web-applets/sdk";
   import { parseWebStream } from "music-metadata";
+  import { contentType } from "@std/media-types";
+  import * as URI from "uri-js";
 
   ////////////////////////////////////////////
   // SETUP
@@ -13,9 +15,14 @@
   context.setActionHandler("extract", extract);
 
   async function extract(url: string) {
+    const uri = URI.parse(url);
+    const pathParts = uri.path?.split("/");
+    const mimeType = pathParts?.[pathParts.length - 1]?.includes(".")
+      ? contentType(pathParts[pathParts.length - 1].split(".").reverse()[0])
+      : undefined;
     const resp = await fetch(url);
     const stream = resp.body;
-    const metadata = await parseWebStream(stream);
+    const metadata = await parseWebStream(stream, { mimeType });
 
     return metadata;
   }
diff --git a/src/scripts/theme.ts b/src/scripts/theme.ts
index ecb7c98..692706d 100644
--- a/src/scripts/theme.ts
+++ b/src/scripts/theme.ts
@@ -50,9 +50,14 @@ export async function applet<D>(
     throw new Error("iframe does not have a contentWindow");
   }
 
-  const applet = await applets.connect<D>(frame.contentWindow, {
-    context: opts.context,
-  });
+  const applet = await applets
+    .connect<D>(frame.contentWindow, {
+      context: opts.context,
+    })
+    .catch((err) => {
+      console.error("Error connecting to " + src, err);
+      throw err;
+    });
 
   if (opts.setHeight) {
     applet.onresize = () => {
diff --git a/src/scripts/themes/webamp/index.ts b/src/scripts/themes/webamp/index.ts
index 4924188..2ea0ed4 100644
--- a/src/scripts/themes/webamp/index.ts
+++ b/src/scripts/themes/webamp/index.ts
@@ -54,9 +54,13 @@ async function loadTracks(): Promise<URLTrack[]> {
       // TODO: Ideally the URL should only be resolved when needed,
       //       but webamp doesn't allow for that.
       //       Maybe you could work around it with a service worker.
-      const url = await configurator.input.sendAction<string | undefined>("resolve", track.uri, {
-        timeoutDuration: 60000,
-      });
+      const url = await configurator.input.sendAction<string | undefined>(
+        "resolve",
+        { method: "GET", uri: track.uri },
+        {
+          timeoutDuration: 60000,
+        },
+      );
 
       if (!url) return acc;