diff --git a/app/components/TaskPanel.tsx b/app/components/TaskPanel.tsx
index e2622aa..e97b83b 100644
--- a/app/components/TaskPanel.tsx
+++ b/app/components/TaskPanel.tsx
@@ -20,6 +20,7 @@ import LoginForm from './LoginForm';
 import AIAssistant from './AIAssistant';
 import ShortcutsDialog from './ShortcutsDialog';
 import { Task, TaskList } from '../types/task';
+import { StorageConfig } from '../types/storage';
 import { Comment } from './CommentSection';
 import { colors } from '../../tailwind.config';
 import TaskStats from './TaskStats';
@@ -61,7 +62,32 @@ const TaskPanel: React.FC = () => {
   const [showCompletedRecurring, setShowCompletedRecurring] = React.useState(true);
   const [showIntegrations, setShowIntegrations] = React.useState(false);
   const [isEditorOpen, setIsEditorOpen] = React.useState(false);
-  const { tasks, addTask, updateTask, deleteTask, reorderTasks, importTasks, lists, addList, updateList, deleteList } = useTasks();
+  const [storageConfig, setStorageConfig] = React.useState<StorageConfig>(() => {
+    const email = localStorage.getItem('email');
+    const userId = email || 'anonymous';
+    return {
+      remoteEnabled: localStorage.getItem('remoteStorageEnabled') === 'true',
+      apiKey: localStorage.getItem('remoteStorageApiKey') || undefined,
+      userId
+    };
+  });
+
+  const { 
+    tasks, 
+    addTask, 
+    updateTask, 
+    deleteTask, 
+    reorderTasks, 
+    importTasks, 
+    lists, 
+    addList, 
+    updateList, 
+    deleteList,
+    sync,
+    isLoading
+  } = useTasks(storageConfig);
+
+  const [isSyncing, setIsSyncing] = React.useState(false);
   const {
     searchTerm,
     setSearchTerm,
@@ -436,6 +462,32 @@ const TaskPanel: React.FC = () => {
                   >
                     🔌
                   </button>
+                  {storageConfig.remoteEnabled && (
+                    <div className="relative group">
+                      <button
+                        onClick={async () => {
+                          try {
+                            setIsSyncing(true);
+                            const userId = storageConfig.userId || 'anonymous';
+                            setStorageConfig(prev => ({ ...prev, userId }));
+                            await sync();
+                          } catch (error) {
+                            console.error('Sync failed:', error);
+                          } finally {
+                            setIsSyncing(false);
+                          }
+                        }}
+                        className="p-2 rounded-lg bg-[#2A2A2A] hover:bg-[#333333] transition-colors"
+                        title="Sync Tasks"
+                        disabled={isSyncing || isLoading}
+                      >
+                        {isSyncing ? '⏳' : '🔄'}
+                      </button>
+                      <span className="absolute hidden group-hover:block bottom-full left-1/2 transform -translate-x-1/2 mb-2 px-2 py-1 text-xs bg-gray-900 text-white rounded whitespace-nowrap">
+                        {isSyncing ? 'Syncing...' : 'Sync Tasks'}
+                      </span>
+                    </div>
+                  )}
                   <button
                     onClick={() => setShowLogin(true)}
                     className="p-2 rounded-lg bg-[#2A2A2A] hover:bg-[#333333] transition-colors"
@@ -525,21 +577,28 @@ const TaskPanel: React.FC = () => {
                         reader.onload = (event) => {
                           const csv = event.target?.result as string;
                           const lines = csv.split('\n');
+                          const userId = storageConfig.userId || 'anonymous';
                           const importedTasks = lines.map(line => {
                             const [title, description, status, priority, dueDate, tags, assignees] = line.split(',');
-                            return {
+                            const task: Task = {
                               id: crypto.randomUUID(),
-                              title,
-                              description,
-                              status: status as Task['status'],
-                              priority: priority as Task['priority'],
+                              title: title || 'Untitled Task',
+                              description: description || '',
+                              status: (status as Task['status']) || 'todo',
+                              priority: (priority as Task['priority']) || 'medium',
                               dueDate: dueDate ? new Date(dueDate) : undefined,
                               tags: tags ? tags.split(', ').filter(t => t) : undefined,
                               assignees: assignees ? assignees.split(', ').filter(a => a) : undefined,
                               createdAt: new Date(),
                               updatedAt: new Date(),
                               listId: currentList,
+                              owner: userId,
+                              collaborators: [],
+                              activityLog: [],
+                              comments: [],
+                              version: 1
                             };
+                            return task;
                           });
                           importTasks(importedTasks, currentList);
                           e.target.value = ''; // Reset file input
@@ -697,7 +756,8 @@ const TaskPanel: React.FC = () => {
                           addList({ id: newListId, name: 'New List' });
                           
                           // Create a default task for the new list
-                          addTask({
+                          const userId = storageConfig.userId || 'anonymous';
+                          const newTask: Task = {
                             id: crypto.randomUUID(),
                             title: 'New Task',
                             description: 'This is a default task for the new list.',
@@ -706,7 +766,13 @@ const TaskPanel: React.FC = () => {
                             listId: newListId,
                             createdAt: new Date(),
                             updatedAt: new Date(),
-                          });
+                            owner: userId,
+                            collaborators: [],
+                            activityLog: [],
+                            comments: [],
+                            version: 1
+                          };
+                          addTask(newTask);
                           
                           setCurrentList(newListId);
                           setShowListActions(false);
diff --git a/app/hooks/useTasks.ts b/app/hooks/useTasks.ts
index f8b5d01..9651f6e 100644
--- a/app/hooks/useTasks.ts
+++ b/app/hooks/useTasks.ts
@@ -4,44 +4,80 @@ import { useState, useEffect } from 'react';
 import { Task, TaskList } from '../types/task';
 import { ActivityLog } from '../types/collaboration';
 import { findChanges, mergeTaskChanges } from '../utils/collaboration';
-import { loadTasksFromLocalStorage, saveTasksToLocalStorage, loadListsFromLocalStorage, saveListsToLocalStorage } from '../utils/storage';
+import { createStorageManager } from '../utils/storage';
+import { StorageConfig } from '../types/storage';
 
-const TASKS_STORAGE_KEY = 'tasks';
-const LISTS_STORAGE_KEY = 'lists';
-
-export const useTasks = () => {
+export const useTasks = (storageConfig: StorageConfig) => {
   const [tasks, setTasks] = useState<Task[]>([]);
   const [lists, setLists] = useState<TaskList[]>([]);
 
-  // Load tasks and lists from localStorage only on client-side after initial render
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<Error | null>(null);
+  const storage = createStorageManager(storageConfig);
+
+  // Load tasks and lists from storage
   useEffect(() => {
-    const storedTasks = loadTasksFromLocalStorage() || [];
-    const storedLists = loadListsFromLocalStorage() || [{ id: 'default', name: 'General Task List' }];
-    
-    if (storedTasks.length === 0 && storedLists.length > 0) {
-      const defaultListId = storedLists[0].id;
-      const defaultTask: Task = {
-        id: 'default-task',
-        title: 'Example Task',
-        listId: defaultListId,
-        description: 'This is an example task.',
-        createdAt: new Date(),
-        updatedAt: new Date(),
-        completedAt: undefined,
-        priority: 'medium',
-        status: 'todo',
-      };
-      setTasks([defaultTask]);
-    } else {
-      setTasks(storedTasks);
-    }
-    setLists(storedLists);
-  }, []);
+    const loadData = async () => {
+      try {
+        setIsLoading(true);
+        const [storedTasks, storedLists] = await Promise.all([
+          storage.getTasks(),
+          storage.getLists()
+        ]);
+
+        const defaultList = { id: 'default', name: 'General Task List' };
+        const initialLists = storedLists.length > 0 ? storedLists : [defaultList];
+        setLists(initialLists);
+
+        if (storedTasks.length === 0 && initialLists.length > 0) {
+          const defaultTask: Task = {
+            id: 'default-task',
+            title: 'Example Task',
+            listId: initialLists[0].id,
+            description: 'This is an example task.',
+            createdAt: new Date(),
+            updatedAt: new Date(),
+            completedAt: undefined,
+            priority: 'medium',
+            status: 'todo',
+            owner: storageConfig.userId || 'anonymous',
+            collaborators: [],
+            activityLog: [],
+            comments: [],
+            version: 1
+          };
+          setTasks([defaultTask]);
+          await storage.saveTasks([defaultTask]);
+        } else {
+          setTasks(storedTasks);
+        }
+      } catch (err) {
+        setError(err instanceof Error ? err : new Error('Failed to load data'));
+      } finally {
+        setIsLoading(false);
+      }
+    };
 
+    loadData();
+  }, [storage]);
+
+  // Sync with storage when tasks or lists change
   useEffect(() => {
-    saveTasksToLocalStorage(tasks);
-    saveListsToLocalStorage(lists);
-  }, [tasks, lists]);
+    const syncData = async () => {
+      try {
+        await Promise.all([
+          storage.saveTasks(tasks),
+          storage.saveLists(lists)
+        ]);
+      } catch (err) {
+        console.error('Error syncing data:', err);
+      }
+    };
+
+    if (!isLoading) {
+      syncData();
+    }
+  }, [tasks, lists, storage, isLoading]);
 
   const addTask = (task: Task) => {
     if (!task.listId) {
@@ -61,7 +97,7 @@ export const useTasks = () => {
     const newActivityLogs: ActivityLog[] = changes.map(change => ({
       id: Date.now().toString(),
       taskId: updatedTask.id,
-      userId: currentUser,
+      userId: storageConfig.userId || 'anonymous',
       action: 'updated',
       timestamp: new Date(),
       details: {
@@ -78,7 +114,7 @@ export const useTasks = () => {
       activityLog: [...(oldTask.activityLog || []), ...newActivityLogs],
       lastViewed: {
         ...(oldTask.lastViewed || {}),
-        [currentUser]: new Date()
+        [storageConfig.userId || 'anonymous']: new Date()
       }
     };
     setTasks(prev => prev.map(t => t.id === updatedTask.id ? updatedTask : t));
@@ -125,5 +161,8 @@ export const useTasks = () => {
     addList,
     updateList,
     deleteList,
+    sync,
+    isLoading,
+    error
   };
 };
diff --git a/app/types/remote-storage.d.ts b/app/types/remote-storage.d.ts
new file mode 100644
index 0000000..22b17c7
--- /dev/null
+++ b/app/types/remote-storage.d.ts
@@ -0,0 +1,13 @@
+declare module '@frigade/remote-storage' {
+  export interface RemoteStorageOptions {
+    apiKey: string;
+    userId: string;
+  }
+
+  export class RemoteStorage {
+    constructor(options: RemoteStorageOptions);
+    get(key: string): Promise<string | null>;
+    set(key: string, value: string): Promise<void>;
+    delete(key: string): Promise<void>;
+  }
+}
diff --git a/app/types/storage.ts b/app/types/storage.ts
new file mode 100644
index 0000000..e833a07
--- /dev/null
+++ b/app/types/storage.ts
@@ -0,0 +1,27 @@
+import { Task, TaskList } from './task';
+
+export interface StorageConfig {
+  remoteEnabled: boolean;
+  apiKey?: string;
+  userId?: string;
+}
+
+export interface StorageProvider {
+  getTasks(): Promise<Task[]>;
+  saveTasks(tasks: Task[]): Promise<void>;
+  getLists(): Promise<TaskList[]>;
+  saveLists(lists: TaskList[]): Promise<void>;
+  sync(): Promise<SyncResult>;
+}
+
+export interface SyncResult {
+  tasks: Task[];
+  lists: TaskList[];
+  lastSynced: Date;
+}
+
+export interface RemoteStorageOptions {
+  apiKey: string;
+  userId: string;
+  namespace?: string;
+}
diff --git a/app/utils/remoteStorage.ts b/app/utils/remoteStorage.ts
new file mode 100644
index 0000000..2a795aa
--- /dev/null
+++ b/app/utils/remoteStorage.ts
@@ -0,0 +1,110 @@
+import { RemoteStorage } from '@frigade/remote-storage';
+import { Task, TaskList } from '../types/task';
+import { RemoteStorageOptions, StorageProvider, SyncResult } from '../types/storage';
+
+const TASKS_KEY = 'tasks';
+const LISTS_KEY = 'lists';
+const LAST_SYNC_KEY = 'lastSync';
+
+export class RemoteStorageProvider implements StorageProvider {
+  private storage: RemoteStorage;
+  private namespace: string;
+
+  constructor(options: RemoteStorageOptions) {
+    this.storage = new RemoteStorage({
+      apiKey: options.apiKey,
+      userId: options.userId
+    });
+    this.namespace = options.namespace || 'midnight-eclipse';
+  }
+
+  private getFullKey(key: string): string {
+    return `${this.namespace}:${key}`;
+  }
+
+  async getTasks(): Promise<Task[]> {
+    try {
+      const tasksJson = await this.storage.get(this.getFullKey(TASKS_KEY));
+      if (!tasksJson) return [];
+      
+      const tasks = JSON.parse(tasksJson);
+      return tasks.map((task: any) => ({
+        ...task,
+        dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
+        scheduledFor: task.scheduledFor ? new Date(task.scheduledFor) : undefined,
+        createdAt: new Date(task.createdAt),
+        updatedAt: new Date(task.updatedAt),
+        completedAt: task.completedAt ? new Date(task.completedAt) : undefined,
+        collaborators: task.collaborators?.map((c: any) => ({
+          ...c,
+          joinedAt: new Date(c.joinedAt)
+        })),
+        activityLog: task.activityLog?.map((log: any) => ({
+          ...log,
+          timestamp: new Date(log.timestamp)
+        })),
+        lastViewed: task.lastViewed ? Object.entries(task.lastViewed).reduce((acc: any, [userId, date]: [string, any]) => ({
+          ...acc,
+          [userId]: new Date(date)
+        }), {}) : undefined,
+      }));
+    } catch (error) {
+      console.error('Error loading tasks from remote storage:', error);
+      return [];
+    }
+  }
+
+  async saveTasks(tasks: Task[]): Promise<void> {
+    try {
+      await this.storage.set(this.getFullKey(TASKS_KEY), JSON.stringify(tasks));
+    } catch (error) {
+      console.error('Error saving tasks to remote storage:', error);
+      throw error;
+    }
+  }
+
+  async getLists(): Promise<TaskList[]> {
+    try {
+      const listsJson = await this.storage.get(this.getFullKey(LISTS_KEY));
+      if (!listsJson) return [];
+      return JSON.parse(listsJson);
+    } catch (error) {
+      console.error('Error loading lists from remote storage:', error);
+      return [];
+    }
+  }
+
+  async saveLists(lists: TaskList[]): Promise<void> {
+    try {
+      await this.storage.set(this.getFullKey(LISTS_KEY), JSON.stringify(lists));
+    } catch (error) {
+      console.error('Error saving lists to remote storage:', error);
+      throw error;
+    }
+  }
+
+async sync(): Promise<SyncResult> {
+    try {
+      const lastSyncJson = await this.storage.get(this.getFullKey(LAST_SYNC_KEY));
+      const lastSync = lastSyncJson ? new Date(JSON.parse(lastSyncJson)) : new Date(0);
+      
+      // Get remote data
+      const [remoteTasks, remoteLists] = await Promise.all([
+        this.getTasks(),
+        this.getLists()
+      ]);
+
+      // Update last sync time
+      await this.storage.set(this.getFullKey(LAST_SYNC_KEY), JSON.stringify(new Date()));
+
+      return {
+        tasks: remoteTasks,
+        lists: remoteLists,
+        lastSynced: new Date()
+      };
+    } catch (error) {
+      console.error('Error during sync:', error);
+      throw error;
+    }
+  }
+}
diff --git a/app/utils/storage.ts b/app/utils/storage.ts
index 8528d0e..4889944 100644
--- a/app/utils/storage.ts
+++ b/app/utils/storage.ts
@@ -1,79 +1,201 @@
 import { Task, TaskList } from '../types/task';
+import { StorageProvider, StorageConfig, SyncResult } from '../types/storage';
+import { RemoteStorageProvider } from './remoteStorage';
 
 const TASKS_STORAGE_KEY = 'midnight-eclipse-tasks';
 const LISTS_STORAGE_KEY = 'midnight-eclipse-lists';
+const LAST_SYNC_KEY = 'midnight-eclipse-last-sync';
 
-export const saveTasksToLocalStorage = (tasks: Task[]): void => {
-  try {
-    localStorage.setItem(TASKS_STORAGE_KEY, JSON.stringify(tasks));
-  } catch (error) {
-    console.error('Error saving tasks to localStorage:', error);
+class StorageManager implements StorageProvider {
+  private remoteStorage?: RemoteStorageProvider;
+  private config: StorageConfig;
+
+  constructor(config: StorageConfig) {
+    this.config = config;
+    if (config.remoteEnabled && config.apiKey && config.userId) {
+      this.remoteStorage = new RemoteStorageProvider({
+        apiKey: config.apiKey,
+        userId: config.userId
+      });
+    }
   }
-};
 
-export const loadTasksFromLocalStorage = (): Task[] => {
-  try {
-    const tasksJson = localStorage.getItem(TASKS_STORAGE_KEY);
-    if (!tasksJson) return [];
+  async getTasks(): Promise<Task[]> {
+    const localTasks = this.loadTasksFromLocalStorage();
+    if (!this.remoteStorage) return localTasks;
     
-    const tasks = JSON.parse(tasksJson);
-    // Convert string dates back to Date objects
-    return tasks.map((task: any) => ({
-      ...task,
-      dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
-      // Convert collaboration dates
-      collaborators: task.collaborators?.map(c => ({
-        ...c,
-        joinedAt: new Date(c.joinedAt)
-      })),
-      activityLog: task.activityLog?.map(log => ({
-        ...log,
-        timestamp: new Date(log.timestamp)
-      })),
-      comments: task.comments?.map(comment => ({
-        ...comment,
-        createdAt: new Date(comment.createdAt),
-        updatedAt: comment.updatedAt ? new Date(comment.updatedAt) : undefined,
-        replies: comment.replies?.map(reply => ({
-          ...reply,
-          createdAt: new Date(reply.createdAt),
-          updatedAt: reply.updatedAt ? new Date(reply.updatedAt) : undefined,
-        }))
-      })),
-      lastViewed: task.lastViewed ? Object.entries(task.lastViewed).reduce((acc, [userId, date]) => ({
-        ...acc,
-        [userId]: new Date(date)
-      }), {}) : undefined,
-    }));
-  } catch (error) {
-    console.error('Error loading tasks from localStorage:', error);
-    return [];
+    try {
+      const remoteTasks = await this.remoteStorage.getTasks();
+      // Merge remote and local tasks, preferring remote versions for conflicts
+      const mergedTasks = this.mergeTasks(localTasks, remoteTasks);
+      this.saveTasksToLocalStorage(mergedTasks);
+      return mergedTasks;
+    } catch (error) {
+      console.error('Error fetching remote tasks:', error);
+      return localTasks;
+    }
   }
-};
 
-export const clearTasksFromLocalStorage = (): void => {
-  try {
-    localStorage.removeItem(TASKS_STORAGE_KEY);
-  } catch (error) {
-    console.error('Error clearing tasks from localStorage:', error);
+  async saveTasks(tasks: Task[]): Promise<void> {
+    this.saveTasksToLocalStorage(tasks);
+    if (this.remoteStorage) {
+      try {
+        await this.remoteStorage.saveTasks(tasks);
+      } catch (error) {
+        console.error('Error saving tasks to remote storage:', error);
+      }
+    }
   }
-};
 
-export const saveListsToLocalStorage = (lists: TaskList[]): void => {
-  try {
-    localStorage.setItem(LISTS_STORAGE_KEY, JSON.stringify(lists));
-  } catch (error) {
-    console.error('Error saving lists to localStorage:', error);
+  async getLists(): Promise<TaskList[]> {
+    const localLists = this.loadListsFromLocalStorage();
+    if (!this.remoteStorage) return localLists;
+    
+    try {
+      const remoteLists = await this.remoteStorage.getLists();
+      // Merge remote and local lists, preferring remote versions
+      const mergedLists = this.mergeLists(localLists, remoteLists);
+      this.saveListsToLocalStorage(mergedLists);
+      return mergedLists;
+    } catch (error) {
+      console.error('Error fetching remote lists:', error);
+      return localLists;
+    }
+  }
+
+  async saveLists(lists: TaskList[]): Promise<void> {
+    this.saveListsToLocalStorage(lists);
+    if (this.remoteStorage) {
+      try {
+        await this.remoteStorage.saveLists(lists);
+      } catch (error) {
+        console.error('Error saving lists to remote storage:', error);
+      }
+    }
+  }
+
+  async sync(): Promise<SyncResult> {
+    if (!this.remoteStorage) {
+      return {
+        tasks: this.loadTasksFromLocalStorage(),
+        lists: this.loadListsFromLocalStorage(),
+        lastSynced: new Date()
+      };
+    }
+
+    try {
+      const syncResult = await this.remoteStorage.sync();
+      this.saveTasksToLocalStorage(syncResult.tasks);
+      this.saveListsToLocalStorage(syncResult.lists);
+      localStorage.setItem(LAST_SYNC_KEY, JSON.stringify(syncResult.lastSynced));
+      return syncResult;
+    } catch (error) {
+      console.error('Error during sync:', error);
+      throw error;
+    }
+  }
+
+  private saveTasksToLocalStorage(tasks: Task[]): void {
+    try {
+      localStorage.setItem(TASKS_STORAGE_KEY, JSON.stringify(tasks));
+    } catch (error) {
+      console.error('Error saving tasks to localStorage:', error);
+    }
+  }
+
+  private loadTasksFromLocalStorage(): Task[] {
+    try {
+      const tasksJson = localStorage.getItem(TASKS_STORAGE_KEY);
+      if (!tasksJson) return [];
+      
+      const tasks = JSON.parse(tasksJson);
+      // Convert string dates back to Date objects
+      return tasks.map((task: any) => ({
+        ...task,
+        dueDate: task.dueDate ? new Date(task.dueDate) : undefined,
+        // Convert collaboration dates
+        collaborators: task.collaborators?.map((c: any) => ({
+          ...c,
+          joinedAt: new Date(c.joinedAt)
+        })),
+        activityLog: task.activityLog?.map((log: any) => ({
+          ...log,
+          timestamp: new Date(log.timestamp)
+        })),
+        comments: task.comments?.map((comment: any) => ({
+          ...comment,
+          createdAt: new Date(comment.createdAt),
+          updatedAt: comment.updatedAt ? new Date(comment.updatedAt) : undefined,
+          replies: comment.replies?.map((reply: any) => ({
+            ...reply,
+            createdAt: new Date(reply.createdAt),
+            updatedAt: reply.updatedAt ? new Date(reply.updatedAt) : undefined,
+          }))
+        })),
+        lastViewed: task.lastViewed ? Object.entries(task.lastViewed).reduce((acc: any, [userId, date]: [string, any]) => ({
+          ...acc,
+          [userId]: new Date(date)
+        }), {}) : undefined,
+      }));
+    } catch (error) {
+      console.error('Error loading tasks from localStorage:', error);
+      return [];
+    }
   }
-};
 
-export const loadListsFromLocalStorage = (): TaskList[] => {
-  try {
-    const listsJson = localStorage.getItem(LISTS_STORAGE_KEY);
-    if (!listsJson) return [];
-    return JSON.parse(listsJson);
-  } catch (error) {
-    console.error('Error loading lists from localStorage:', error);
-    return [];
+  private clearTasksFromLocalStorage(): void {
+    try {
+      localStorage.removeItem(TASKS_STORAGE_KEY);
+    } catch (error) {
+      console.error('Error clearing tasks from localStorage:', error);
+    }
   }
+
+  private saveListsToLocalStorage(lists: TaskList[]): void {
+    try {
+      localStorage.setItem(LISTS_STORAGE_KEY, JSON.stringify(lists));
+    } catch (error) {
+      console.error('Error saving lists to localStorage:', error);
+    }
+  }
+
+  private loadListsFromLocalStorage(): TaskList[] {
+    try {
+      const listsJson = localStorage.getItem(LISTS_STORAGE_KEY);
+      if (!listsJson) return [];
+      return JSON.parse(listsJson);
+    } catch (error) {
+      console.error('Error loading lists from localStorage:', error);
+      return [];
+    }
+  }
+
+  private mergeTasks(localTasks: Task[], remoteTasks: Task[]): Task[] {
+    const taskMap = new Map<string, Task>();
+    
+    // Add all local tasks to the map
+    localTasks.forEach(task => taskMap.set(task.id, task));
+    
+    // Override with remote tasks (they take precedence)
+    remoteTasks.forEach(task => taskMap.set(task.id, task));
+    
+    return Array.from(taskMap.values());
+  }
+
+  private mergeLists(localLists: TaskList[], remoteLists: TaskList[]): TaskList[] {
+    const listMap = new Map<string, TaskList>();
+    
+    // Add all local lists to the map
+    localLists.forEach(list => listMap.set(list.id, list));
+    
+    // Override with remote lists (they take precedence)
+    remoteLists.forEach(list => listMap.set(list.id, list));
+    
+    return Array.from(listMap.values());
+  }
+}
+
+// Export a function to create a new storage manager instance
+export const createStorageManager = (config: StorageConfig): StorageProvider => {
+  return new StorageManager(config);
 };
diff --git a/package-lock.json b/package-lock.json
index 666b479..3e7f750 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,6 +17,7 @@
         "next": "15.0.4",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
+        "remote-storage": "^1.0.7",
         "slate": "^0.112.0",
         "slate-react": "^0.112.0"
       },
@@ -67,6 +68,374 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+      "cpu": [
+        "mips64el"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@hello-pangea/dnd": {
       "version": "17.0.0",
       "resolved": "https://registry.npmjs.org/@hello-pangea/dnd/-/dnd-17.0.0.tgz",
@@ -1098,6 +1467,15 @@
       "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==",
       "license": "MIT"
     },
+    "node_modules/cross-fetch": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+      "license": "MIT",
+      "dependencies": {
+        "node-fetch": "^2.6.12"
+      }
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -1210,6 +1588,44 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/esbuild": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.20.2",
+        "@esbuild/android-arm": "0.20.2",
+        "@esbuild/android-arm64": "0.20.2",
+        "@esbuild/android-x64": "0.20.2",
+        "@esbuild/darwin-arm64": "0.20.2",
+        "@esbuild/darwin-x64": "0.20.2",
+        "@esbuild/freebsd-arm64": "0.20.2",
+        "@esbuild/freebsd-x64": "0.20.2",
+        "@esbuild/linux-arm": "0.20.2",
+        "@esbuild/linux-arm64": "0.20.2",
+        "@esbuild/linux-ia32": "0.20.2",
+        "@esbuild/linux-loong64": "0.20.2",
+        "@esbuild/linux-mips64el": "0.20.2",
+        "@esbuild/linux-ppc64": "0.20.2",
+        "@esbuild/linux-riscv64": "0.20.2",
+        "@esbuild/linux-s390x": "0.20.2",
+        "@esbuild/linux-x64": "0.20.2",
+        "@esbuild/netbsd-x64": "0.20.2",
+        "@esbuild/openbsd-x64": "0.20.2",
+        "@esbuild/sunos-x64": "0.20.2",
+        "@esbuild/win32-arm64": "0.20.2",
+        "@esbuild/win32-ia32": "0.20.2",
+        "@esbuild/win32-x64": "0.20.2"
+      }
+    },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -1767,6 +2183,26 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -2186,6 +2622,16 @@
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
       "license": "MIT"
     },
+    "node_modules/remote-storage": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/remote-storage/-/remote-storage-1.0.7.tgz",
+      "integrity": "sha512-p0j1vjdbZEuCv1HkwKpPDlBIC65xIKgOkOWZjLt5HBh2N8Ru2pNKpmYUQqh1P+dDI+Lv8lr9MLUVk3biFX1efA==",
+      "license": "MIT",
+      "dependencies": {
+        "cross-fetch": "^4.0.0",
+        "esbuild": "^0.20.2"
+      }
+    },
     "node_modules/resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@@ -2692,6 +3138,12 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "license": "MIT"
+    },
     "node_modules/ts-interface-checker": {
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
@@ -2760,6 +3212,22 @@
         "base64-arraybuffer": "^1.0.2"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
diff --git a/package.json b/package.json
index 53c1a13..899c731 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "next": "15.0.4",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
+    "remote-storage": "^1.0.7",
     "slate": "^0.112.0",
     "slate-react": "^0.112.0"
   },