diff --git a/packages/app/src/cores/index.js b/packages/app/src/cores/index.js
index d1471307..8fd257d4 100755
--- a/packages/app/src/cores/index.js
+++ b/packages/app/src/cores/index.js
@@ -10,6 +10,7 @@ import ShortcutsCore from "./shortcuts"
 import SoundCore from "./sound"
 
 import Player from "./player"
+import RemoteStorage from "./remoteStorage"
 
 // DEFINE LOAD ORDER HERE
 export default [
@@ -21,6 +22,7 @@ export default [
     SoundCore,
     NotificationsCore,
     ShortcutsCore,
+    RemoteStorage,
 
     Player,
     ContextMenuCore,
diff --git a/packages/app/src/cores/remoteStorage/index.js b/packages/app/src/cores/remoteStorage/index.js
index 845da79b..744fa713 100755
--- a/packages/app/src/cores/remoteStorage/index.js
+++ b/packages/app/src/cores/remoteStorage/index.js
@@ -1,19 +1,203 @@
 import Core from "evite/src/core"
-import config from "config"
-import axios from "axios"
 
 export default class RemoteStorage extends Core {
-    static namespace = "RemoteStorage"
-    static public = []
+    static namespace = "remoteStorage"
+    static depends = ["api"]
 
-    connection = null
-
-    async onInitialize() {
+    static maxRunningTasks = 3
 
+    public = {
+        uploadFile: this.uploadFile.bind(this),
+        appendToQueue: this.appendToQueue.bind(this),
     }
 
-    async connect() {
+    runningTasksIds = []
 
+    taskQueue = []
+
+    processTasks() {
+        if (this.runningTasksIds.length >= RemoteStorage.maxRunningTasks) {
+            console.log("We are already running the maximum number of tasks")
+            return false
+        }
+
+        // check if there are new tasks in the queue and move them to the tasks array with the maximum number of tasks can be run
+        if (this.taskQueue.length === 0) {
+            console.log("No tasks in the queue")
+            return false
+        }
+
+        let tasks = this.taskQueue.splice(0, RemoteStorage.maxRunningTasks)
+
+        tasks = tasks.filter((task) => task)
+
+        const promises = tasks.map((task) => {
+            if (typeof task.fn !== "function") {
+                throw new Error("Task must be a function")
+            }
+
+            if (typeof task.index !== "number") {
+                throw new Error("Task index must be a number")
+            }
+
+            // add the task to the running tasks array
+            this.runningTasksIds.push(task.index)
+
+            return task.fn().then((result) => {
+                // delete the task from the running tasks array
+                this.runningTasksIds = this.runningTasksIds.filter((tIndex) => tIndex !== task.index)
+
+                return result
+            }).catch((error) => {
+                // delete the task from the running tasks array
+                this.runningTasksIds = this.runningTasksIds.filter((tIndex) => tIndex !== task.index)
+
+                // propagate the error through an exception
+                throw error
+            })
+        })
+
+        Promise.all(promises)
+            .then((res) => {
+                this.processTasks()
+            })
+            .catch((error) => {
+                console.error(error)
+                this.processTasks()
+            })
     }
 
+    appendToQueue(task) {
+        if (Array.isArray(task)) {
+            throw new Error("Task must be a function")
+        }
+
+        this.taskQueue.unshift({
+            index: this.taskQueue.length,
+            fn: task,
+        })
+
+        this.processTasks()
+    }
+
+    async getFileHash(file) {
+        const buffer = await file.arrayBuffer()
+        const hash = await crypto.subtle.digest("SHA-256", buffer)
+        const hashArray = Array.from(new Uint8Array(hash))
+        const hashHex = hashArray.map(b => b.toString(16).padStart(2, "0")).join("")
+
+        return hashHex
+    }
+
+    async uploadFile(file, callback, options = {}) {
+        const CHUNK_SIZE = 5000000
+
+        const fileHash = await this.getFileHash(file)
+        const fileSize = file.size
+
+        const chunks = Math.ceil(fileSize / CHUNK_SIZE)
+
+        const uploadTasks = []
+
+        for (let i = 0; i < chunks; i++) {
+            const start = i * CHUNK_SIZE
+            const end = Math.min(start + CHUNK_SIZE, fileSize)
+
+            const chunkData = file.slice(start, end)
+
+            const uploadTask = async () => {
+                const formData = new FormData()
+
+                formData.append("file", chunkData, file.name)
+
+                const response = await app.cores.api.customRequest({
+                    ...options,
+                    url: "/files/upload_chunk",
+                    method: "POST",
+                    headers: {
+                        ...options.headers ?? {},
+                        "file-size": fileSize,
+                        "file-hash": fileHash,
+                        "file-chunk-size": end - start,
+                        "file-chunk-number": i,
+                        "file-total-chunks": chunks,
+                        "Content-Range": `bytes ${start}-${end - 1}/${fileSize}`,
+                        "Content-Type": "multipart/form-data",
+                    },
+                    data: formData,
+                })
+
+                console.debug(`[Chunk Upload](${file.name})(${i}) Response >`, response.data)
+
+                return response.data
+            }
+
+            uploadTasks.push(uploadTask)
+        }
+
+        const uploadChunksTask = async () => {
+            try {
+                let lastResponse = null
+
+                for await (const task of uploadTasks) {
+                    lastResponse = await task()
+                }
+
+                if (typeof callback === "function") {
+                    callback(null, lastResponse)
+                }
+
+                return lastResponse
+            } catch (error) {
+                if (typeof callback === "function") {
+                    callback(error, lastResponse)
+                }
+
+                throw error
+            }
+        }
+
+        return new Promise((resolve, reject) => {
+            this.appendToQueue(async () => {
+                try {
+                    console.log(`Starting upload of file ${file.name}`)
+                    console.log("fileHash", fileHash)
+                    console.log("fileSize", fileSize)
+                    console.log("chunks", chunks)
+
+                    const result = await uploadChunksTask()
+
+                    return resolve(result)
+                } catch (error) {
+                    return reject(error)
+                }
+            })
+        })
+    }
+
+    async uploadFiles(files) {
+        const results = []
+
+        const promises = files.map((file) => {
+            return new Promise((resolve, reject) => {
+                const callback = (error, result) => {
+                    if (error) {
+                        reject(error)
+                    } else {
+                        results.push({
+                            name: file.name,
+                            size: file.size,
+                            result: result,
+                        })
+                        resolve()
+                    }
+                }
+                this.appendToQueue(() => this.uploadFile(file, callback))
+            })
+        })
+
+        await Promise.all(promises)
+
+        return results
+    }
 }
\ No newline at end of file