diff --git a/app/logic/events.py b/app/logic/events.py
index db921d149..52600cfa6 100644
--- a/app/logic/events.py
+++ b/app/logic/events.py
@@ -129,8 +129,9 @@ def attemptSaveMultipleOfferings(eventData, attachmentFiles = None):
                 'startDate': event['eventDate'],
                 'timeStart': event['startTime'],
                 'timeEnd': event['endTime'],
+                'location': eventData['location'],
                 'seriesId': seriesId,
-                'isRepeating': bool(isRepeating)
+                'isRepeating': bool(isRepeating), 
                 })
             # Try to save each offering
             savedEvents, validationErrorMessage = attemptSaveEvent(eventInfo, attachmentFiles)
@@ -458,7 +459,9 @@ def getRepeatingEventsData(eventData):
     
     return [ {'name': f"{eventData['name']} Week {counter+1}",
               'date': eventData['startDate'] + timedelta(days=7*counter),
-              "week": counter+1}
+              "week": counter+1,
+              'location': eventData['location']
+            }
             for counter in range(0, ((eventData['endDate']-eventData['startDate']).days//7)+1)]
 
 def preprocessEventData(eventData):
diff --git a/app/static/js/createEvents.js b/app/static/js/createEvents.js
index 1a734a73c..a934a8174 100644
--- a/app/static/js/createEvents.js
+++ b/app/static/js/createEvents.js
@@ -21,9 +21,9 @@ function format12to24HourTime(timeStr) {
   let [hours, minutes] = timePart.split(":").map(Number);
 
   if (meridian === "PM" && hours !== 12) {
-      hours += 12;
+    hours += 12;
   } else if (meridian === "AM" && hours === 12) {
-      hours = 0; // midnight
+    hours = 0; // midnight
   }
 
   // format hours and minutes to always be 2 digits
@@ -33,43 +33,54 @@ function format12to24HourTime(timeStr) {
   return `${formattedHours}:${formattedMinutes}`;
 }
 
-function calculateRepeatingEventFrequency(){
-  var eventDatesAndName = {name:$("#repeatingEventsNamePicker").val(),
-                            isRepeating: true,
-                            startDate:$("#repeatingEventsStartDate").val(),
-                            endDate:$("#repeatingEventsEndDate").val()}
+function calculateRepeatingEventFrequency() {
+  var eventDatesAndName = {
+    name: $("#repeatingEventsNamePicker").val(),
+    isRepeating: true,
+    startDate: $("#repeatingEventsStartDate").val(),
+    endDate: $("#repeatingEventsEndDate").val(),
+    location: $("#repeatingEventsLocationPicker").val() || ''
+  }
+  
   $.ajax({
-    type:"POST",
+    type: "POST",
     url: "/makeRepeatingEvents",
     //get the startDate, endDate and name as a dictionary
     data: eventDatesAndName,
-    success: function(jsonData){
+    success: function (jsonData) {
       var generatedEvents = JSON.parse(jsonData)
       $("#generatedEventsTable tbody tr").remove();
-      for(var event of generatedEvents){
+      for (var event of generatedEvents) {
         loadRepeatingOfferingToModal(event)
       }
       $("#generatedEvents").removeClass("d-none");
     },
-    error: function(error){
-      console.log(error)
+    error: function (error) {
+     
       displayNotification("Failed to generate events.");
     }
   });
 }
 
-function setViewForSingleOffering(){
+function setViewForSingleOffering() {
   $(".startDatePicker").prop('required', true);
+  $(".startDatePicker").show();
   $("#multipleOfferingTableDiv").addClass('d-none');
-  $('#eventTime, #eventDate').removeClass('d-none');
-  $('#checkIsSeriesToggleContainer').addClass('col-md-6')
+  $("#eventLocation-main").show();
+  $("#inputEventLocation-main").attr('readonly', false);
+  $("#inputEventLocation-main").prop('required', true);
+  $('#eventTime, #eventDate').show();
   $('#checkIsSeriesToggleContainer').removeClass('col-md-12')
+  $('#checkIsSeriesToggleContainer').addClass('col-md-6')
 }
 
-function setViewForSeries(){
+function setViewForSeries() {
   $(".startDatePicker").prop('required', false);
+  $(".startDatePicker").hide();
   $("#multipleOfferingTableDiv").removeClass('d-none');
-  $('#eventTime, #eventDate').addClass('d-none');
+  $("#eventLocation-main").show();
+  $("#inputEventLocation-main").prop('required', false);
+  $('#eventTime, #eventDate').hide();
   $('#checkIsSeriesToggleContainer').removeClass('col-md-6')
   $('#checkIsSeriesToggleContainer').addClass('col-md-12')
   $("#pastDateWarningText").text("")
@@ -78,13 +89,14 @@ function setViewForSeries(){
 function displayNotification(message) {
   $('#textNotifierPadding').addClass('pt-5');
   $('.invalidFeedback').text(message);
-  $('.invalidFeedback').css('display', 'block');  
-  $('.invalidFeedback').on('animationend', function() {
-    $('.invalidFeedback').css('display', 'none');
-    $('#textNotifierPadding').removeClass('pt-5')
+  $('.invalidFeedback').css('display', 'block');
+  $('.invalidFeedback').on('animationend', function () {
+  $('.invalidFeedback').css('display', 'none');
+  $('#textNotifierPadding').removeClass('pt-5');
   });
 }
 
+
 function isDateInPast(dateString, timeString) {
   const combineDateTime = `${dateString}T${timeString}:00`;
   const setDate = new Date(combineDateTime).getTime();
@@ -102,20 +114,23 @@ function initializeFlatpickr(obj) {
     minTime: "08:00",
     maxTime: "22:00",
     minuteIncrement: 15,
-    allowInput: true 
+    allowInput: true
   });
 }
 
-function createOfferingModalRow({eventName=null, eventDate=null, startTime=null, endTime=null}={}){
-
+function createOfferingModalRow({ eventName = null, eventDate = null, startTime = null, endTime = null, eventLocation = null } = {}) {
   let clonedOffering = $("#multipleOfferingEvent").clone().removeClass('d-none').removeAttr("id");
+  const Name = $('#inputEventName').val();
+  clonedOffering.find('.multipleOfferingNameField').val(Name);
+
 
   // insert values for the newly created row
-  if (eventName) {clonedOffering.find('.multipleOfferingNameField').val(eventName)}
-  if (eventDate) {clonedOffering.find('.multipleOfferingDatePicker').val(eventDate)}
-  if (startTime) {clonedOffering.find('.multipleOfferingStartTime').val(startTime)}
-  if (endTime) {clonedOffering.find('.multipleOfferingEndTime').val(endTime)}
-  
+  if (eventName) { clonedOffering.find('.multipleOfferingNameField').val(eventName) }
+  if (eventDate) { clonedOffering.find('.multipleOfferingDatePicker').val(eventDate) }
+  if (startTime) { clonedOffering.find('.multipleOfferingStartTime').val(startTime) }
+  if (endTime) { clonedOffering.find('.multipleOfferingEndTime').val(endTime) }
+  if (eventLocation) { clonedOffering.find('.multipleOfferingLocationField').val(eventLocation) }
+
   $("#multipleOfferingSlots").append(clonedOffering);
   pendingmultipleEvents.push(clonedOffering);
 
@@ -189,6 +204,7 @@ $('#saveSeries').on('click', function(e) {
   enableLiveCustomValidityClearing([".multipleOfferingNameField"])
   let eventOfferings = $('#multipleOfferingSlots .eventOffering');
   let eventNameInputs = $('#multipleOfferingSlots .multipleOfferingNameField');
+  let eventLocationInputs = $('#multipleOfferingSlots .multipleOfferingLocationField');
   let datePickerInputs = $('#multipleOfferingSlots .multipleOfferingDatePicker');
   let startTimeInputs = $('#multipleOfferingSlots .multipleOfferingStartTime');
   let endTimeInputs = $('#multipleOfferingSlots .multipleOfferingEndTime');
@@ -220,6 +236,7 @@ $('#saveSeries').on('click', function(e) {
     
   } else {
     // Validate individual event offerings for non-repeating events
+
     // Check event name fields
     eventNameInputs.each((index, eventNameInput) => {
       if (eventNameInput.value.trim() === '') {
@@ -229,6 +246,18 @@ $('#saveSeries').on('click', function(e) {
       } else {
         $(eventNameInput)[0].setCustomValidity("");
       }
+      });
+ 
+
+    // Check location fields
+    eventLocationInputs.each((index, eventLocationInput) => {
+      if (eventLocationInput.value.trim() === '') {
+        hasErrors = true;
+        $(eventLocationInput)[0].setCustomValidity("Please enter an event location");
+        $(eventLocationInput)[0].reportValidity();
+      } else {
+        $(eventLocationInput)[0].setCustomValidity("");
+      }
     });
 
     // Check date picker fields
@@ -303,24 +332,11 @@ $('#saveSeries').on('click', function(e) {
 
 // Populate the Event Name field in the main page with the entered repeating events
 function updateEventNameField() {
-  let offerings = JSON.parse($("#seriesData").val())
   let isSeries = $("#checkIsRepeating").is(":checked")
-
-  // Check if the event is weekly
-  if (!isSeries) {
-    // if not weeekly, add them to a set to remove duplicates, then put them in a string to populate the field
-    let names = new Set()
-    offerings.forEach(offering => {
-      names.add(offering.eventName)
-    });
-    let offeringsText = Array.from(names).join(", ")
-    $('#inputEventName').val(offeringsText)
-  }
-  else {
-    // if weekly, take the name of the first item (which is the same for all) and take the word 'week'
+  if (isSeries) {
     let offeringText = $("#repeatingEventsNamePicker").val()
     $('#inputEventName').val(offeringText)
-  } 
+  }
 }
 
 // Save the offerings from the modal to the hidden input field
@@ -329,32 +345,34 @@ function saveOfferingsFromModal() {
   let isRepeatingStatus = $("#checkIsRepeating").is(":checked");
   $("#formIsRepeating").prop("checked", isRepeatingStatus);
   let dataTable = isRepeatingStatus ? "#generatedEventsList" : "#multipleOfferingSlots";
-  $(dataTable).children().each(function(index, element) {
+  $(dataTable).children().each(function (index, element) {
     let rowData;
-    if (isRepeatingStatus){
-      rowData = $.map($(element).find("td"), function(td){
+    if (isRepeatingStatus) {
+      rowData = $.map($(element).find("td"), function (td) {
         let input = $(td).find("input");
-        if (input.length){
+        if (input.length) {
           return input.val();
         } else {
           return $(td).text().trim();
         }
-      })}
+      })
+    }
     else {
       rowData = $.map($(element).find("input"), (el) => $(el).val());
     }
 
-    let startTime = isRepeatingStatus ? $("#repeatingEventsStartTime").val() : rowData[2]
-    let endTime = isRepeatingStatus ? $("#repeatingEventsEndTime").val() : rowData[3]
+    let startTime = isRepeatingStatus ? $("#repeatingEventsStartTime").val() : rowData[3]
+    let endTime = isRepeatingStatus ? $("#repeatingEventsEndTime").val() : rowData[4]
     if (navigator.userAgent.indexOf("Chrome") == -1) {
-        startTime = format12to24HourTime(startTime)
-        endTime = format12to24HourTime(endTime)
+      startTime = format12to24HourTime(startTime)
+      endTime = format12to24HourTime(endTime)
     }
     offerings.push({
-        eventName: rowData[0],
-        eventDate: rowData[1],
-        startTime: startTime,
-        endTime: endTime,
+      eventName: rowData[0],
+      eventLocation: isRepeatingStatus ? rowData[2] : rowData[1],
+      eventDate: isRepeatingStatus ? rowData[1] : rowData[2],
+      startTime: startTime,
+      endTime: endTime,
     })
   });
 
@@ -364,29 +382,37 @@ function saveOfferingsFromModal() {
   $("#seriesData").val(offeringsJson);
 }
 
-function loadOfferingsToModal(){
+function loadOfferingsToModal() {
   let offerings = JSON.parse($("#seriesData").val())
-  if (offerings.length < 1) {return;}
+  if (offerings.length < 1) { return; }
   let isRepeatingStatus = $("#checkIsRepeating").is(":checked");
-  if (isRepeatingStatus) {$("#generatedEvents").removeClass("d-none"); $("#generatedEventsTable tbody tr").remove();};
-  offerings.forEach((offering, i) =>{
-    if (isRepeatingStatus){
+  let mainLocation = $('#inputEventLocation-main').val();
+  if (isRepeatingStatus) { $("#generatedEvents").removeClass("d-none"); $("#generatedEventsTable tbody tr").remove(); };
+  offerings.forEach((offering, i) => {
+    if (isRepeatingStatus) {
       loadRepeatingOfferingToModal(offering);
     } else {
-      let newOfferingModalRow = createOfferingModalRow(offering);
+      let newOfferingModalRow = createOfferingModalRow({
+        ...offering,
+        eventLocation: offering.eventLocation || mainLocation
+      });
       //stripes odd event sections in event modal
-      newOfferingModalRow.css('background-color', i % 2 ?'#f2f2f2':'#fff');
-    }})
+      newOfferingModalRow.css('background-color', i % 2 ? '#f2f2f2' : '#fff');
+    }
+  });
 }
 
 
 function loadRepeatingOfferingToModal(offering){
   var seriesTable = $("#generatedEventsTable");
   var eventDate = new Date(offering.date || offering.eventDate).toLocaleDateString();
+  
+
   seriesTable.append(
     "<tr class='eventOffering'>" +
-    "<td id='offeringName'>" + (offering.name || offering.eventName) + "</td>" + 
+    "<td id='offeringName'>" + (offering.name || offering.eventName) + "</td>" +
     "<td id='offeringDate'>" + eventDate + "</td>" +
+    "<td id='offeringLocation'>" + (offering.eventLocation || offering.location) + "</td>" +
     "<td><div class='deleteGeneratedEvent'><span class='bi bi-trash btn btn-danger'></span></div></td>" +
     "</tr>"
   );
@@ -396,19 +422,24 @@ function loadRepeatingOfferingToModal(offering){
 function updateOfferingsTable() {
   let offerings = JSON.parse($("#seriesData").val())
   var offeringsTable = $("#offeringsTable");
+  
+  // Sorting the offerings by data and time in case user inputs in an unsorted manner
+  offerings.sort((a, b) => new Date(a.eventDate) - new Date(b.eventDate) || a.startTime.localeCompare(b.startTime));
+
   offeringsTable.find("tbody tr").remove(); // Clear existing rows
-  offerings.forEach(function(offering){
+  offerings.forEach(function (offering) {
     //format to 12hr time for display
     var formattedEventDate = formatDate(offering.eventDate);
     var startTime = format24to12HourTime(offering.startTime);
     var endTime = format24to12HourTime(offering.endTime);
     offeringsTable.append(`<tr class="${offering.isDuplicate ? "border-red" : ""}">` +
-                                    "<td>" + offering.eventName + "</td>" +
-                                    "<td>" + formattedEventDate + "</td>" +
-                                    "<td>" + startTime + "</td>" +
-                                    "<td>" + endTime + "</td>" +
-                                  "</tr>"
-                                );
+      "<td>" + offering.eventName + "</td>" +
+      "<td>" + formattedEventDate + "</td>" +
+      "<td>" + startTime + "</td>" +
+      "<td>" + endTime + "</td>" +
+      "<td>" + (offering.eventLocation || offering.location || "") + "</td>" +
+      "</tr>"
+    );
   });
 
   //recalculate the save button
@@ -512,14 +543,21 @@ function checkValidation() {
   }
 }
 
-
-
 /*
  * Run when the webpage is ready for javascript
  */
-$(document).ready(function() {
+$(document).ready(function () {
   var isEditPage = (window.location.pathname == '/event/' + $('#newEventID').val() + '/edit')
+  
 
+  // This is to prevent the server from being overloaded with requests while the user is typing
+  let debounceTimer;
+  $("#repeatingEventsNamePicker, #repeatingEventsLocationPicker").on("input", function () {
+    clearTimeout(debounceTimer);
+    debounceTimer = setTimeout(function () {
+      handleRepeatingEventsChange(); 
+    }, 3000); 
+  });
   //makes sure bonners toggle will stay on between event pages
   if (isEditPage) {
     if ($("#checkBonners")) {
@@ -530,7 +568,7 @@ $(document).ready(function() {
   // don't use a minimum if we are editing an existing event
   var minDate = new Date()
   if (isEditPage) {
-      minDate = null;
+    minDate = null;
   }
 
   handleFileSelection("attachmentObject")
@@ -579,11 +617,12 @@ $("#cancelEvent").on('click', function (event) {
 });
   
   updateOfferingsTable();
-  
-  if ($("#checkIsSeries").is(":checked")){
+
+  if ($("#checkIsSeries").is(":checked")) {
     setViewForSeries();
   }
-  
+
+
   let modalOpenedByEditButton = false;
   //#checkIsRepeating, #checkIsSeries are attributes for the toggle buttons on create event page
   $("#checkIsSeries, #edit_modal").click(function(event) {
@@ -596,15 +635,25 @@ $("#cancelEvent").on('click', function (event) {
     modalOpenedByEditButton = ($(this).attr('id') === 'edit_modal');
 
     if (isSeries) {
+      if ($('#inputEventName').val().trim() == '') {
+        $('#checkIsSeries').prop('checked', false);
+        $('#inputEventName').focus();
+        return;
+      }
+      if ($('#inputEventLocation-main').val().trim() == '') {
+        $('#checkIsSeries').prop('checked', false);
+        $('#inputEventLocation-main').focus();
+        return;
+      }
       setViewForSeries();
       loadOfferingsToModal();
       $('#modalSeries').modal('show');
-
-      // Disable single event name field
-      $('#inputEventName').prop('readonly', true)
-      $('#inputEventName').val('')
+      
+      // Disable single event name and location fields
+      $('#inputEventName').prop('readonly', true);
+      $('#inputEventLocation-main').prop('readonly', true);
     } else {
-      setViewForSingleOffering()
+      setViewForSingleOffering();
       $('#multipleOfferingTableDiv').addClass('d-none');
       // Enable single event name field
       $('#inputEventName').prop('readonly', false)
@@ -613,38 +662,46 @@ $("#cancelEvent").on('click', function (event) {
   });
 
   //untoggles the button when the modal cancel or close button is clicked
-  $("#cancelModalPreview, #multipleOfferingXbutton").click(function(){ 
+  $("#cancelModalPreview, #multipleOfferingXbutton").click(function () {
     if (modalOpenedByEditButton == false) {
       $('#modalSeries').modal('hide');
       $("#checkIsSeries").prop('checked', false);
-      setViewForSingleOffering()
+      setViewForSingleOffering();
     }
-    pendingmultipleEvents.forEach(function(element){
+    pendingmultipleEvents.forEach(function (element) {
       element.remove();
     });
     let isSeries = $("#checkIsSeries").is(":checked")
-    if (!isSeries){
+    if (!isSeries) {
       // Enable single event name field
       $('#inputEventName').prop('readonly', false)
       $('#inputEventName').prop('placeholder', 'Enter event name')
       checkIfDateInPast();
+      $('#inputEventLocation-main').prop('readonly', false)
+      $('#inputEventLocation-main').prop('placeholder', 'Enter event location')
     }
   });
 
-  $("#checkIsRepeating").change(function() {
+  $("#checkIsRepeating").change(function () {
     if ($(this).is(':checked')) {
+      $("#repeatingEventsNamePicker").val($("#inputEventName").val());
+      $("#repeatingEventsLocationPicker").val($("#inputEventLocation-main").val());
       $('.addMultipleOfferingEvent').hide();
       $("#repeatingEventsDiv").removeClass('d-none');
       $("#multipleOfferingSlots").children().remove();
       $("#multipleOfferingSlots").addClass('d-none');
     } else {
-      $('.addMultipleOfferingEvent').show(); 
+      $('.addMultipleOfferingEvent').show();
       $("#repeatingEventsDiv").addClass('d-none');
       $("#multipleOfferingSlots").removeClass('d-none');
     }
   });
   
-  $("#repeatingEventsDiv").change(handleRepeatingEventsChange)
+  $("#repeatingEventsNamePicker, " + "#repeatingEventsLocationPicker").on("input", handleRepeatingEventsChange); 
+  $("#repeatingEventsStartDate, " +
+    "#repeatingEventsEndDate, " +
+    "#repeatingEventsStartTime, " +
+    "#repeatingEventsEndTime").on("change", handleRepeatingEventsChange);
 // this handels start date, end date, last event date, start time, and end time 
   function handleRepeatingEventsChange() {
     if (!verifyRepeatingFields()) {
@@ -661,13 +718,13 @@ $("#cancelEvent").on('click', function (event) {
 
       if (endDate <= startDate) {
         displayNotification("The end date must be after the start date.");
-        table.each(function(){$(this).remove()})
+        table.each(function () { $(this).remove() })
         $("#generatedEvents").addClass('d-none');
         return;
       }
-      if (endTime <= startTime){
+      if (endTime <= startTime) {
         displayNotification("The end time must be after the start time.");
-        table.each(function(){$(this).remove()})
+        table.each(function () { $(this).remove() })
         $("#generatedEvents").addClass('d-none');
         return;
       }
@@ -677,7 +734,7 @@ $("#cancelEvent").on('click', function (event) {
     }
   }
 
-  $(document).on("click", ".deleteGeneratedEvent, .deleteMultipleOffering", function() {
+  $(document).on("click", ".deleteGeneratedEvent, .deleteMultipleOffering", function () {
     let attachedRow = $(this).closest(".eventOffering")
     attachedRow.animate({
       opacity: 0,
@@ -687,70 +744,72 @@ $("#cancelEvent").on('click', function (event) {
         msgToast("Deletion info", "You have successfully deleted a series of events")
     });
   });
-  
+
   /*cloning the div with ID multipleOfferingEvent and cloning, changing the ID of each clone going up by 1. This also changes 
   the ID of the deleteMultipleOffering so that when the trash icon is clicked, that specific row will be deleted*/
-  $(".addMultipleOfferingEvent").click(createOfferingModalRow)
+  $(".addMultipleOfferingEvent").click(function () {
+    // Get the current value from the main location input
+    let mainLocation = $("#inputEventLocation-main").val();
+    createOfferingModalRow({ eventLocation: mainLocation });
+  });
 
-    var minDate = new Date('10/25/1999') 
-    $("#startDatePicker-main").datepicker("option", "minDate", minDate)
+  var minDate = new Date('10/25/1999')
+  $("#startDatePicker-main").datepicker("option", "minDate", minDate)
 
   // This converts the time to 24 hour format in case it is in 12 hour format (like in Firefox)
-function handleTimeFormatting(timeArray){    
-  let time  = timeArray[0]
-  let timeSuffix = timeArray[1]         // looks for AM or PM in time 
-  let [hours , min] = time. split(':')
-
-  if (timeArray.length === 2) {
-    hours  = parseInt(hours, 10)
-    if (timeSuffix === 'PM' && hours !== 12) {
-      hours += 12;
-    } else if (timeSuffix === 'AM' && hours === 12) {
-      hours = 0;
+  function handleTimeFormatting(timeArray) {
+    let time = timeArray[0]
+    let timeSuffix = timeArray[1]         // looks for AM or PM in time 
+    let [hours, min] = time.split(':')
+
+    if (timeArray.length === 2) {
+      hours = parseInt(hours, 10)
+      if (timeSuffix === 'PM' && hours !== 12) {
+        hours += 12;
+      } else if (timeSuffix === 'AM' && hours === 12) {
+        hours = 0;
+      }
+      const hoursStr = hours.toString().padStart(2, '0');
+      return [hoursStr, min]
     }
-    const hoursStr = hours.toString().padStart(2, '0');
-    return [hoursStr, min]
+    return [hours, min]
   }
-  return [hours, min]
-}
 
   function checkIfDateInPast() {
     const [month, day, year] = $("#startDatePicker-main").val().split('/')
-    const startTimeArray =  $("#startTime-main").val().split(' ') 
+    const startTimeArray = $("#startTime-main").val().split(' ')
     const [startHour, startMin] = handleTimeFormatting(startTimeArray)
     const endTimeArray = $('#endTime-main').val().split(' ')
-    const [endHour, endMin] = handleTimeFormatting (endTimeArray)
-    let startDateSelected =new Date(+year, +month - 1, +day, +startHour, +startMin);  
+    const [endHour, endMin] = handleTimeFormatting(endTimeArray)
+    let startDateSelected = new Date(+year, +month - 1, +day, +startHour, +startMin);
     let endDateSelected = new Date(+year, +month - 1, +day, +endHour, +endMin)
     let now = new Date()
-    
+
 
     if (startDateSelected < now && endDateSelected > now) {
       $("#pastDateWarningText").text("This event is currently in progress!")
-    }
-    else if (startDateSelected < now && endDateSelected < now) {
+  } else if (startDateSelected < now && endDateSelected < now) {
       $("#pastDateWarningText").text("This event is in the past!")
-    }
-    else 
+  }else{
       $("#pastDateWarningText").text("")
   }
 
-  $("#startDatePicker-main").on("change", function() {    
+  $("#startDatePicker-main").on("change", function () {
     checkIfDateInPast()
   })
 
-  $("#startTime-main").on("change", function() {    
+  $("#startTime-main").on("change", function () {
     checkIfDateInPast()
   })
-  
-  $("#endTime-main").on("change", function() {    
+
+  $("#endTime-main").on("change", function () {
     checkIfDateInPast()
   })
 
   // everything except Chrome
   if (navigator.userAgent.indexOf("Chrome") == -1) {
     initializeFlatpickr(".flatpickr")
-    
+
     $(".timepicker").prop("type", "text");
     $(".timeIcons").prop("hidden", false);
 
@@ -763,12 +822,13 @@ function handleTimeFormatting(timeArray){
     $(".timepicker").prop("type", "time");
     $(".timeIcons").prop("hidden", true);
   }
+  }
 
   if ($(".datePicker").is("readonly")) {
     $(".datePicker").datepicker("option", "disabled", true);
   }
 
-  $(".readonly").on('keydown paste', function(e) {
+  $(".readonly").on('keydown paste', function (e) {
     if (e.keyCode != 9) // ignore tab
       e.preventDefault();
   });
@@ -817,8 +877,9 @@ function handleTimeFormatting(timeArray){
   });
 
   setCharacterLimit($("#inputCharacters"), "#remainingCharacters"); 
-  
-});
+  });
+
+
 
 
 
diff --git a/app/templates/events/createEvent.html b/app/templates/events/createEvent.html
index c463fcb30..c3fc3f246 100644
--- a/app/templates/events/createEvent.html
+++ b/app/templates/events/createEvent.html
@@ -64,7 +64,7 @@ <h1 id="pageTitle">{{page_title}}</h1>
     {% endblock %}
 
     {% macro locationTimeMacro(eventData, pageLocation) %}
-<div class="form-group mb-4">
+<div class="form-group mb-4" id="eventLocation-{{pageLocation}}">
   <label class="required form-label" for='inputEventLocation-{{pageLocation}}'><strong>Location</strong></label>
   <input class="form-control needsValidation all" id='inputEventLocation-{{pageLocation}}' placeholder="Enter location" name="location"
     value="{{eventData.location}}" required>
@@ -90,7 +90,7 @@ <h1 id="pageTitle">{{page_title}}</h1>
           <label class="custom-control-label" for='checkIsSeries'><strong>This is a series of events.</strong></label>
           <input class="form-check-input" type="checkbox" id="checkIsSeries" name="isSeries"
             {{"checked" if eventData.isSeries}} />
-        </fieldset>
+        </fieldset> 
       </div>
   {% endif %}
     </div>
@@ -177,6 +177,7 @@ <h1 id="pageTitle">{{page_title}}</h1>
               <th>Date</th>
               <th>Start Time</th>
               <th>End Time</th>
+              <th>Location</th>
             </tr>
           </thead>
 
@@ -446,11 +447,9 @@ <h5 class="modal-title">This is an event with multiple time offerings.</h5>
               <label class="ms-2" for="checkIsRepeating"><strong>This series repeats weekly</strong></label>
             </div>
         {% endif %}
-        
         <div class="d-none mb-2" id="repeatingEventsDiv">
           <div class="row col-md-12 my-3">
-
-            <div class="form-group mb-3">
+            <div class="form-group mb-3 col-md-6">
               <label class="required form-label me-2 mb-0" for="repeatingEventsNamePicker"><strong>Event Name</strong></label>
               <div class='input-group date'>
                 <input autocomplete="off" type='text'
@@ -459,6 +458,15 @@ <h5 class="modal-title">This is an event with multiple time offerings.</h5>
                   id='repeatingEventsNamePicker' />
               </div>
             </div>
+            <div class="form-group mb-3 col-md-6">
+              <label class="required form-label me-2 mb-0" for="repeatingEventsLocationPicker"><strong>Location</strong></label>
+              <div class='input-group date'>
+                <input autocomplete="off" type='text'
+                  class="form-control repeatingEventsField"
+                  name="repeatingEventsLocation" placeholder="Enter Location"
+                  id='repeatingEventsLocationPicker' />
+              </div>
+            </div>
 
             <!-- Repeating Event Start Date Picker -->
             <div class="form-group col-md-3">
@@ -522,6 +530,7 @@ <h3 class="mt-1 d-flex justify-content-center"> Generated Events: </h3>
               <tr>
                 <th>Event Name</th>
                 <th>Date</th>
+                <th>Location</th>
                 <th>Action</th>
               </tr>
             </thead>
@@ -532,11 +541,16 @@ <h3 class="mt-1 d-flex justify-content-center"> Generated Events: </h3>
         <!--non repeating series -->
         <div class="eventOffering row mb-2 divStripes pt-3 pb-4 d-none" id="multipleOfferingEvent">
           <br>
-          <div class="form-group mb-3">
+          <div class="form-group mb-3 col-md-6">
             <label class="form-label required" for="eventName"><strong>Event Name</strong></label>
             <input type="text" class="form-control multipleOfferingNameField" id="eventName" name="eventName"
               placeholder="Enter event name" required>
           </div>
+          <div class="form-group mb-3 col-md-6">
+            <label class="form-label required" for="eventName"><strong>Event Location</strong></label>
+            <input type="text" class="form-control multipleOfferingLocationField" name="eventLocation"
+              placeholder="Enter Location" required>
+          </div>
 
           <!--series date datepicker-->
           <div class="form-group col-md-5">
diff --git a/tests/code/test_events.py b/tests/code/test_events.py
index a4fcdd391..6a61b272c 100644
--- a/tests/code/test_events.py
+++ b/tests/code/test_events.py
@@ -299,13 +299,15 @@ def test_calculateRecurringEventFrequency():
 
     eventInfo = {'name': "testEvent",
                  'startDate': parser.parse("02/22/2023"),
-                 'endDate': parser.parse("03/11/2023")}
+                 'endDate': parser.parse("03/11/2023"),
+                 'location': "a big room"}
 
     # test correct response
     returnedEvents = getRepeatingEventsData(eventInfo)
-    assert returnedEvents[0] == {'name': 'testEvent Week 1', 'date': parser.parse('02/22/2023'), 'week': 1}
-    assert returnedEvents[1] == {'name': 'testEvent Week 2', 'date': parser.parse('03/01/2023'), 'week': 2}
-    assert returnedEvents[2] == {'name': 'testEvent Week 3', 'date': parser.parse('03/08/2023'), 'week': 3}
+    assert returnedEvents[0] == {'name': 'testEvent Week 1', 'date': parser.parse('02/22/2023'), 'week': 1, 'location': 'a big room'}
+    assert returnedEvents[1] == {'name': 'testEvent Week 2', 'date': parser.parse('03/01/2023'), 'week': 2, 'location': 'a big room'}
+    assert returnedEvents[2] == {'name': 'testEvent Week 3', 'date': parser.parse('03/08/2023'), 'week': 3, 'location': 'a big room'}
+
 
     # test non-datetime
     eventInfo["startDate"] = '2021/06/07'
diff --git a/tests/code/test_search.py b/tests/code/test_search.py
index bea7c05fb..837a3f9cf 100644
--- a/tests/code/test_search.py
+++ b/tests/code/test_search.py
@@ -35,7 +35,7 @@ def test_searchUsers():
         searchResults = searchUsers('sa')
         assert len(searchResults) == 2
         assert searchResults['lamichhanes2'] == model_to_dict(User.get_by_id('lamichhanes2'))
-        assert searchResults["sawconc"] == model_to_dict(secondUser)
+        assert searchResults["sawconc"] == model_to_dict (User.get_by_id('sawconc'))
         assert '(555)555-5555' in searchResults["lamichhanes2"].values()
 
         transaction.rollback()