diff --git a/modal_runner.py b/modal_runner.py
index c481261..3177e8e 100644
--- a/modal_runner.py
+++ b/modal_runner.py
@@ -1,4 +1,27 @@
-from modal import App, Image 
+from modal import App, Image
+import signal
+from contextlib import contextmanager
+from typing import Optional
+
+class TimeoutException(Exception):
+    pass
+
+@contextmanager
+def timeout(seconds: int):
+    """Context manager that raises TimeoutException after specified seconds"""
+    def timeout_handler(signum, frame):
+        raise TimeoutException(f"Script execution timed out after {seconds} seconds")
+
+    # Set up the signal handler
+    original_handler = signal.signal(signal.SIGALRM, timeout_handler)
+    signal.alarm(seconds)
+    
+    try:
+        yield
+    finally:
+        # Restore the original handler and disable the alarm
+        signal.alarm(0)
+        signal.signal(signal.SIGALRM, original_handler)
 
 # Create a stub for the Modal app
 modal_app = App("discord-bot-runner")
@@ -7,9 +30,16 @@
     gpu="T4",
     image=Image.debian_slim(python_version="3.10").pip_install(["torch"])
 )
-def run_script(script_content: str) -> str:
+def run_script(script_content: str, timeout_seconds: int = 300) -> str:
     """
-    Executes the provided Python script in an isolated environment
+    Executes the provided Python script in an isolated environment with a timeout
+    
+    Args:
+        script_content: The Python script to execute
+        timeout_seconds: Maximum execution time in seconds (default: 300 seconds / 5 minutes)
+    
+    Returns:
+        str: Output of the script or error message
     """
     import sys
     from io import StringIO
@@ -19,11 +49,15 @@ def run_script(script_content: str) -> str:
     sys.stdout = output
     
     try:
-        # Create a new dictionary for local variables to avoid polluting the global namespace
-        local_vars = {}
-        # Execute the script in the isolated namespace
-        exec(script_content, {}, local_vars)
+        with timeout(timeout_seconds):
+            # Create a new dictionary for local variables to avoid polluting the global namespace
+            local_vars = {}
+            # Execute the script in the isolated namespace
+            exec(script_content, {}, local_vars)
         return output.getvalue()
+    
+    except TimeoutException as e:
+        return f"Timeout Error: {str(e)}"
     except Exception as e:
         return f"Error executing script: {str(e)}"
     finally:
@@ -32,5 +66,16 @@ def run_script(script_content: str) -> str:
 # For testing the Modal function directly
 if __name__ == "__main__":
     with modal_app.run():
+        # Test with a script that should complete quickly
         result = run_script.remote("print('Hello from Modal!')")
+        print(result)
+        
+        # Test with a script that should timeout
+        infinite_loop_script = """
+import time
+while True:
+    print('Still running...')
+    time.sleep(1)
+"""
+        result = run_script.remote(infinite_loop_script, timeout_seconds=20)
         print(result)
\ No newline at end of file