diff --git a/bot.py b/bot.py
index a5d659d..3981104 100644
--- a/bot.py
+++ b/bot.py
@@ -14,7 +14,7 @@ from cryptography.hazmat.backends import default_backend
 import datetime
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 import chatai
-from timeparser import parse_time
+from timeparser import parse_time, read_reminders, store_reminder, write_reminders
 import asyncio
 
 
@@ -456,18 +456,32 @@ async def ai(ctx, message: str):
     await ctx.response.send_message(chatai.chat(prompt))
 
 @tree.command(name="remindme", description="Remind me")
-async def remindme(ctx, when: str, message: str):
+async def remindme(ctx, when: str, reminder: str):
     
     time_delta = parse_time(when)
 
     if time_delta is not None:
         # Schedule the reminder
-        await ctx.response.send_message("Reminding you in " + when + " to " + message,ephemeral=True)
-        await asyncio.sleep(time_delta.total_seconds())
-        await ctx.user.send("Reminder: " + message)
+        reminder_time = datetime.datetime.now() + time_delta
+        store_reminder(ctx.author.id, reminder_time, reminder)
+        await ctx.response.send_message("I've set a reminder for you in " + when + ".\n" + reminder,ephemeral=True)
     else:
         await ctx.response.send_message("Invalid time format. Please use something like `1d 3h` or `4hr`.",ephemeral=True)
 
+async def check_reminders():
+    now = datetime.datetime.now()
+    reminders = read_reminders()
+    
+    for reminder in reminders[:]:
+        reminder_time = datetime.datetime.strptime(reminder['time'], "%Y-%m-%d %H:%M:%S")
+        if reminder_time <= now:
+            user = await client.fetch_user(int(reminder['user_id']))
+            await user.send("G'day,\nI need to remind you of:\n" + reminder['text'])
+            reminders.remove(reminder)
+
+    write_reminders(reminders)
+
+
 # When the bot is ready
 @client.event
 async def on_ready():
@@ -481,6 +495,7 @@ async def on_ready():
 # Every 12 hours check for SSL expiry
 scheduler = AsyncIOScheduler()
 scheduler.add_job(checkForSSLExpiry, 'interval', hours=12)
+scheduler.add_job(check_reminders, 'interval', seconds=30)
 scheduler.start()
 
 client.run(TOKEN)
\ No newline at end of file
diff --git a/timeparser.py b/timeparser.py
index 52246bd..55271a1 100644
--- a/timeparser.py
+++ b/timeparser.py
@@ -1,6 +1,8 @@
 import datetime
 import re
 
+REMINDERS_FILE_PATH = '/mnt/reminders.txt'
+
 def parse_time(time_str):
     # Parse the time string and return a timedelta
     try:
@@ -19,6 +21,29 @@ def parse_time(time_str):
         return datetime.timedelta(seconds=total_seconds)
     except ValueError:
         return None
+    
+def read_reminders():
+    try:
+        with open(REMINDERS_FILE_PATH, 'r') as file:
+            reminders = [line.strip().split(',') for line in file.readlines()]
+            return [{'user_id': r[0], 'time': r[2], 'text': r[3]} for r in reminders]
+    except FileNotFoundError:
+        return []
+
+def write_reminders(reminders):
+    with open(REMINDERS_FILE_PATH, 'w') as file:
+        for reminder in reminders:
+            file.write(f"{reminder['user_id']},{reminder['time']},{reminder['text']}\n")
+
+def store_reminder(user_id, reminder_time, reminder_text):
+    reminders = read_reminders()
+    reminders.append({
+        'user_id': str(user_id),
+        'time': reminder_time.strftime("%Y-%m-%d %H:%M:%S"),
+        'text': reminder_text
+    })
+    write_reminders(reminders)
+
 
 if __name__ == '__main__':
     print(parse_time('1d 2h 3m 4s'))