diff --git a/server.js b/server.js
index 5d6f342..e91b8b8 100644
--- a/server.js
+++ b/server.js
@@ -3,7 +3,6 @@ import ICAL from 'ical.js';
 import fs from 'fs';
 import axios from 'axios';
 import path from 'path';
-import icalGenerator from 'ical-generator';
 
 const app = express();
 app.use(express.json());
@@ -26,38 +25,50 @@ const fetchCalendarData = async (calendar) => {
     const isFilePath = !calendar.url.startsWith('http');
     try {
         if (isFilePath) {
+            console.log(`Fetching calendar data from file: ${calendar.url}`);
             return {
                 data: fs.readFileSync(path.resolve(calendar.url), 'utf-8'),
                 ...calendar
             };
         } else {
+            console.log(`Fetching calendar data from URL: ${calendar.url}`);
             const response = await axios.get(calendar.url);
             return { data: response.data, ...calendar };
         }
     } catch (error) {
-        console.error(`Error retrieving calendar from ${calendar.url}:`, error);
+        console.error(`Error retrieving calendar from ${calendar.url}:`, error.message);
         throw error;
     }
 };
 
-// Merge calendar events
-const mergeCalendarEvents = (calendarInstance, results) => {
+// Create a top-level VCALENDAR component
+const createCalendarComponent = (name) => {
+    console.log(`Creating calendar component for: ${name}`);
+    const calendarComponent = new ICAL.Component(['vcalendar', [], []]);
+    calendarComponent.updatePropertyWithValue('prodid', '-//Your Product ID//EN');
+    calendarComponent.updatePropertyWithValue('version', '2.0');
+    calendarComponent.updatePropertyWithValue('name', name); // calendar name
+    return calendarComponent;
+};
+
+// Add events to the calendar component
+const addEventsToCalendar = (calendarComponent, results) => {
+    console.log(`Adding events to calendar component.`);
     results.forEach((result) => {
         const parsed = ICAL.parse(result.data);
         const component = new ICAL.Component(parsed);
+
         component.getAllSubcomponents('vevent').forEach((event) => {
             const vevent = new ICAL.Event(event);
-            const start = vevent.startDate.toJSDate();
-            const end = vevent.endDate.toJSDate();
-            const summary = result.override ? result.prefix : `${result.prefix} ${vevent.summary}`;
+            const newEvent = new ICAL.Component('vevent');
 
-            const eventOptions = {
-                start: start,
-                end: end,
-                summary: summary,
-                allDay: vevent.startDate.isDate
-            };
-            calendarInstance.createEvent(eventOptions);
+            console.log(`Adding event: ${vevent.summary} to calendar.`);
+            newEvent.updatePropertyWithValue('uid', vevent.uid);
+            newEvent.updatePropertyWithValue('summary', result.override ? result.prefix : `${result.prefix} ${vevent.summary}`);
+            newEvent.updatePropertyWithValue('dtstart', vevent.startDate.toICALString());
+            newEvent.updatePropertyWithValue('dtend', vevent.endDate.toICALString());
+
+            calendarComponent.addSubcomponent(newEvent);
         });
     });
 };