diff --git a/BadmintonBooker.csproj b/BadmintonBooker.csproj
index 86b7829..0ba45b0 100644
--- a/BadmintonBooker.csproj
+++ b/BadmintonBooker.csproj
@@ -7,6 +7,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Scheduler/**" />
+    <Content Remove="Scheduler/**" />
+    <EmbeddedResource Remove="Scheduler/**" />
+    <None Remove="Scheduler/**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Playwright" Version="1.59.0" />
     <PackageReference Include="Soenneker.Playwrights.Extensions.Stealth" Version="4.0.62" />
diff --git a/Program.cs b/Program.cs
index d2d1821..cb78bdf 100644
--- a/Program.cs
+++ b/Program.cs
@@ -28,25 +28,35 @@ if (argsLength == 2)
 using var playwright = await Playwright.CreateAsync();
 var context = await BrowserManager.GetContextAsync(playwright);
 var page = context.Pages.Count > 0 ? context.Pages[0] : await context.NewPageAsync();
+
 await page.GotoAsync("https://my.hdc.mv/");
-await page.GetByRole(AriaRole.Link, new() { Name = "Login" }).ClickAsync();
-await page.GetByRole(AriaRole.Button, new() { Name = "eFaas" }).ClickAsync();
-await page.GetByRole(AriaRole.Tab, new() { Name = "Password Login" }).ClickAsync(new () { Delay = 1000 });
-await page.GetByPlaceholder("Username").FillAsync("A384347");
-var password = File.ReadAllText("password.txt");
-await page.GetByPlaceholder("Password").FillAsync(password);
-await page.GetByRole(AriaRole.Button, new() { Name = "LOGIN" }).ClickAsync();
-await page.GetByRole(AriaRole.Button, new() { Name = "CONTINUE" }).ClickAsync(new () { Delay = 1000 });
-await Task.Delay(5000);
+try
+{
+    await page.GetByRole(AriaRole.Link, new() { Name = "Login" }).ClickAsync();
+    await page.GetByRole(AriaRole.Button, new() { Name = "eFaas" }).ClickAsync();
+    await page.GetByRole(AriaRole.Tab, new() { Name = "Password Login" }).ClickAsync(new () { Delay = 1000 });
+    await page.GetByPlaceholder("Username").FillAsync("A384347");
+    var password = File.ReadAllText("password.txt");
+    await page.GetByPlaceholder("Password").FillAsync(password);
+    await page.GetByRole(AriaRole.Button, new() { Name = "LOGIN" }).ClickAsync();
+    await page.GetByRole(AriaRole.Button, new() { Name = "CONTINUE" }).ClickAsync(new () { Delay = 1000 });
+    await Task.Delay(5000);
 
-var egovOtp = await GoogleMessages.GetEgovOTP(context, page);
-if (egovOtp is not null)
-    Console.WriteLine($"Extracted eGov OTP: {egovOtp}");
-else
+    var egovOtp = await GoogleMessages.GetEgovOTP(context, page);
+    if (egovOtp is not null)
+        Console.WriteLine($"Extracted eGov OTP: {egovOtp}");
+    else
+        return;
+
+    await page.GetByPlaceholder("OTP").FillAsync(egovOtp);
+    await page.GetByRole(AriaRole.Button, new() { Name = "CONTINUE" }).ClickAsync();
+}
+catch (Exception ex)
+{
+    Console.WriteLine($"Error during login: {ex.Message}\nAssuming already logged in, proceeding with booking...");
     return;
+}
 
-await page.GetByPlaceholder("OTP").FillAsync(egovOtp);
-await page.GetByRole(AriaRole.Button, new() { Name = "CONTINUE" }).ClickAsync();
 await page.GetByText("Make a booking").ClickAsync();
 await page.GetByText("Fahiveni").ClickAsync();
 await page.GetByText("Sports and Leisure").ClickAsync();
@@ -58,11 +68,13 @@ var upperBound = new DateTime(currentDateTime.Year, currentDateTime.Month, curre
     hour: 8, minute: 15, second: 0);
 
 var lowerBound = new DateTime(currentDateTime.Year, currentDateTime.Month, currentDateTime.Day, 
-    hour: 7, minute: 59, second: 59, millisecond: 800);
+    hour: 8, minute: 0, second: 0, millisecond: 0);
 
 var lastReloadTime = DateTime.Now;
 while (!debug && (currentDateTime < lowerBound || currentDateTime >= upperBound))
 {
+    //Don't reload if 10 sec away from 8AM
+    //Reload every 2 minutes to avoid logout
     if(lowerBound - currentDateTime > TimeSpan.FromSeconds(10) &&
        lastReloadTime - currentDateTime > TimeSpan.FromMinutes(2))
     {
@@ -74,8 +86,19 @@ while (!debug && (currentDateTime < lowerBound || currentDateTime >= upperBound)
     currentDateTime = DateTime.Now;
 }
 
+// Click the next button to load tomorrow's time slots
 await page.Locator("div.flex.items-center.justify-end > div > div:nth-child(2) > svg").ClickAsync();
-await page.Locator("div.grid.bg-gray-100.rounded-lg.anim").Filter(new () { HasText = endTime }).ClickAsync();
+try
+{
+    await page.Locator("div.grid.bg-gray-100.rounded-lg.anim").Filter(new () { HasText = endTime }).ClickAsync( new() { Timeout = 1000 });
+}
+catch (PlaywrightException)
+{
+    await page.ScreenshotAsync(new PageScreenshotOptions { Path = "ErrorScreenshot.png" });
+    Console.WriteLine($"Could not find the specified end time slot: {endTime}");
+    return;
+}
+
 await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();
 await page.GetByRole(AriaRole.Link, new() { Name = "Proceed to payment" }).ClickAsync();
 await page.GetByRole(AriaRole.Button, new() { Name = "Pay Now" }).ClickAsync(new () { Delay = 3500 });
diff --git a/Scheduler/AppSettings.txt b/Scheduler/AppSettings.txt
new file mode 100644
index 0000000..2912f4e
--- /dev/null
+++ b/Scheduler/AppSettings.txt
@@ -0,0 +1 @@
+C:\Users\Shaamil\Desktop\BadmintonBooker\Scheduler
\ No newline at end of file
diff --git a/Scheduler/Program.cs b/Scheduler/Program.cs
new file mode 100644
index 0000000..4ccd3b0
--- /dev/null
+++ b/Scheduler/Program.cs
@@ -0,0 +1,59 @@
+using System.Reflection;
+using System.Text;
+using Microsoft.Win32.TaskScheduler;
+
+if(args.Length != 1)
+{
+    Console.WriteLine("Usage: Scheduler <timeslot>");
+    return;
+}
+
+var timeslot = args[0];
+if (!TimeSpan.TryParse(timeslot, out var _))
+{
+    Console.WriteLine("Invalid timeslot format. Use HH:mm");
+    return;
+}
+
+var dir = new DirectoryInfo(File.ReadAllText("AppSettings.txt"))!;
+var builder = new StringBuilder();
+builder.AppendLine($"cd {dir.Parent!.FullName}");
+builder.AppendLine($"dotnet run -- {timeslot}");
+File.WriteAllText("run.bat", builder.ToString());
+
+using (TaskService taskService = new TaskService())
+{
+    try
+    {
+        var existingTask = taskService.GetTask("BadmintonBooker");
+        if (existingTask != null)
+        {
+            taskService.RootFolder.DeleteTask("BadmintonBooker", false);
+        }
+    }
+    catch (Exception ex)
+    {
+        Console.WriteLine($"Error deleting existing task: {ex.Message}");
+    }
+
+    TaskDefinition taskDef = taskService.NewTask();
+    taskDef.RegistrationInfo.Description = "Scheduled Task with Credentials";
+    taskDef.Principal.RunLevel = TaskRunLevel.Highest;
+
+    taskDef.Triggers.Add(new TimeTrigger
+    {
+        StartBoundary = DateTime.Today.AddDays(1) + TimeSpan.Parse("07:40")
+    });
+    
+    taskDef.Actions.Add(new ExecAction("cmd", $"/c \"{Path.Combine(dir.FullName, "run.bat")}\" > C:\\Output.log 2>&1"));
+
+    var pass = File.ReadAllText("Password.txt");
+    taskService.RootFolder.RegisterTaskDefinition(
+        "BadmintonBooker",
+        taskDef,
+        TaskCreation.CreateOrUpdate,
+        "Shaamil",
+        pass,
+        TaskLogonType.Password
+    );
+}
\ No newline at end of file
diff --git a/Scheduler/Scheduler.csproj b/Scheduler/Scheduler.csproj
new file mode 100644
index 0000000..1fd8eb0
--- /dev/null
+++ b/Scheduler/Scheduler.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="AppSettings.txt" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="TaskScheduler" Version="2.12.0" />
+  </ItemGroup>
+</Project>