diff --git a/includes/update_event.php b/includes/update_event.php
index 500a83d..add5a89 100644
--- a/includes/update_event.php
+++ b/includes/update_event.php
@@ -1,5 +1,5 @@
 <?php
-        include "db_config.php";
+	include "db_config.php";
 $conn = mysqli_connect($servername, $username, $password, $db);
 
 $event_id = mysqli_real_escape_string($conn, $_POST['event']);
@@ -9,8 +9,16 @@ $end_date_time = mysqli_real_escape_string($conn, $_POST['end_date_time']);
 $user = mysqli_real_escape_string($conn, $_POST['user']);
 
 $description_for_email = nl2br($_POST['description']);
-//Insert event to events table
-$event = "UPDATE events SET description='$description', is_ongoing='$is_ongoing', date_time_end='$end_date_time', user='$user' WHERE event_id='$event_id'";
+
+//Get timestamp
+$timestamp = new DateTime();
+$update_date_time = date_format($timestamp, 'Y/m/d H:i');
+
+//Insert event update into event updates table
+$update = "INSERT INTO event_updates (update_desc, update_date_time, update_is_ongoing, end_date_time, event_id, user) VALUES ('$description', '$update_date_time', '$is_ongoing', '$end_date_time', '$event_id', '$user')";
+
+//Update value of is_ongoing in main events table
+$is_ongoing_endtime_query = "UPDATE events SET is_ongoing='$is_ongoing', date_time_end='$end_date_time' WHERE event_id='$event_id'";
 
 //Set variables for email
 //MySQL queries to get Unit Name and Alert
@@ -29,40 +37,41 @@ $start_date_time_query_run = mysqli_query($conn, $start_date_time_query);
 $start_date_time_array = mysqli_fetch_assoc($start_date_time_query_run);
 $start_date_time = $start_date_time_array['date_time_start'];
 //If successful, redirect back to index.php and send email, else tell user that it failed.
-$result = mysqli_query($conn, $event);
+$event_update = mysqli_query($conn, $is_ongoing_endtime_query);
+$result = mysqli_query($conn, $update);
 if($result){
         echo("Event added, redirecting...");
         sleep (2);
         header('Location: ../index.php');
         //Set Email Info
-        $to = "TO-EMAIL@DOMAIN.COM";
-        $subject = "Updated BMS Alert: ".$unitname." ".$alertname."";
-        $headers = "MIME-Version: 1.0" . "\r\n";
-      	$headers .= "Content-type:text/html;charset=UTF-8" . "\r\n";
-      	$headers .= "From: FROM-EMAIL@DOMAIN.COM";
-        $message = "
-      		<html>
-      		<body>
-      		BMS Unit: ".$unitname."
-      		<br />
-      		Type of Alert: ".$alertname."
-      		<br />
-      		Start Date / Time: ".$start_date_time."
-      		<br />
-      		End Date / Time: ".$end_date_time."
-      		<br />
-      		Description: ".$description_for_email."
-      		<br />
-      		Updated by: ".$user."
-      		<br />
-      		Event Link: https://DOMAIN.com/bms/viewevent.php?eventid=$event_id
-      		<br /><br />
-      		This message generated by https://DOMAIN.com/bms
-      		</body>
-      		</html>";
-        //WordWrap the message
-        $message_wrapped = wordwrap($message, 70, "\n", true);
-        //Send the email
+        $to = "TO.ADDRES@DOMAIN.com";
+        $subject = "TEST Updated BMS Alert: ".$unitname." ".$alertname."";
+	$headers = "MIME-Version: 1.0" . "\r\n";
+	$headers .= "Content-type:text/html;charset=UTF-8" . "\r\n";
+	$headers .= "From: FROM.ADDRESS@DOMAIN.com";
+	$message = "
+		<html>
+		<body>
+		BMS Unit: ".$unitname."
+		<br />
+		Type of Alert: ".$alertname."
+		<br />
+		Start Date / Time: ".$start_date_time."
+		<br />
+		End Date / Time: ".$end_date_time."
+		<br />
+		Description: ".$description_for_email."
+		<br />
+		Updated by: ".$user."
+		<br />
+		Event Link: https://DOMAIN.com/bms/viewevent.php?eventid=$event_id
+		<br /><br />
+		This message generated by https://DOMAIN.com/bms
+		</body>
+		</html>";
+	//WordWrap the message
+	$message_wrapped = wordwrap($message, 70, "\n", true);
+	//Send the email
         mail($to,$subject,$message_wrapped,$headers);
 } else{
         echo('Error! Please <a href="javascript:history.back()">go back</a> and try again');
diff --git a/viewevent.php b/viewevent.php
index 74c5493..c10f335 100644
--- a/viewevent.php
+++ b/viewevent.php
@@ -21,8 +21,8 @@ if( $_SESSION['access'] != 1 ) {
                                 echo "Hello, ";
                                 print_r($_SESSION['uname']);
                         }
-                        echo "<h2>View Event</h2>";
-                include("includes/menu.php"); ?>
+			echo "<h2>View Event</h2>";
+		include("includes/menu.php"); ?>
         </div>
         <div class=content>
 <?php include "includes/db_config.php";
@@ -35,41 +35,66 @@ $eventid=$_GET['eventid'];
                 $result1 = $conn1->query($sql1);
                 if ($result1->num_rows >0){
                         while ($row1 = $result1->fetch_assoc()) {
-                        echo "<br />";
-                        echo "<table align='center'><tr><td>";
-                        echo "Unit: ";
-                        echo "</td><td>";
-                        print_r($row1['unit_name']);
+			echo "<br />";
+			echo "<table align='center'><tr><td>";
+			echo "Unit: ";
+			echo "</td><td>";
+			print_r($row1['unit_name']);
                         echo "</td></tr><tr><td>";
-                        echo "Alert: ";
-                        echo "</td><td>";
-                        print_r($row1['alert_name']);
+			echo "Alert: ";
+			echo "</td><td>";
+			print_r($row1['alert_name']);
+			echo "</td></tr><tr><td>";
+			echo "Description: ";
+			echo "</td><td>";
+			echo nl2br($row1['description']);
+			echo "</td></tr><tr><td>";
+			echo "Start Date and Time: ";
+			echo "</td><td>";
+			print_r($row1['date_time_start']);
                         echo "</td></tr><tr><td>";
-                        echo "Description: ";
-                        echo "</td><td>";
-                        echo nl2br($row1['description']);
+			echo "Currently Ongoing? ";
+			echo "</td><td>";
+				if($row1['is_ongoing'] ==1) {
+					echo "Yes";
+				} else {
+					echo "No";
+				}
                         echo "</td></tr><tr><td>";
-                        echo "Start Date and Time: ";
-                        echo "</td><td>";
-                        print_r($row1['date_time_start']);
-                        echo "</td></tr><tr><td>";
-                        echo "Currently Ongoing? ";
-                        echo "</td><td>";
-                                if($row1['is_ongoing'] ==1) {
-                                        echo "Yes";
-                                } else {
-                                        echo "No";
-                                }
-                        echo "</td></tr><tr><td>";
-                        echo "End Date and Time: ";
-                        echo "</td><td>";
-                        print_r($row1['date_time_end']);
-                        echo "</td></tr>";
-                        echo "<tr><td colspan='2' class='ui-helper-center'>";
-                        echo "<a href=editevent.php?event_id=".$row1['event_id'].">Edit Event</a>";
-                        echo "</td></tr></table>";
-                }
-                } else {
+			echo "End Date and Time: ";
+			echo "</td><td>";
+			print_r($row1['date_time_end']);
+			echo "</td></tr>";
+			echo "<tr><td>";
+			echo "Event Updates";
+			echo "</td><td>";
+				$update_query = "SELECT update_desc, update_date_time, update_user FROM event_updates WHERE event_updates.event_id=".$eventid.";";
+				$update_result = $conn1->query($update_query);
+				if ($update_result->num_rows >0){
+					while ($update_row = $update_result->fetch_assoc()) {
+						echo "<table align='center'><tr><td>";
+						echo "Update Desc: ";
+						echo "</td><td>";
+						echo nl2br($update_row['update_desc']);
+						echo "</td></tr><tr><td>";
+						echo "Update User: ";
+						echo "</td><td>";
+						print_r($update_row['update_user']);
+						echo "</td></tr><tr><td>";
+						echo "Update Date and Time: ";
+						echo "</td><td>";
+						print_r($update_row['update_date_time']);
+						echo "</td></tr></table>";
+					}
+					} else {
+						echo "No updates to this event";
+					}
+			echo "</td></tr>";
+			echo "<tr><td colspan='2' class='ui-helper-center'>";
+			echo "<a href=editevent.php?event_id=".$row1['event_id'].">Edit Event</a>";
+			echo "</td></tr></table>";
+		}
+		} else {
                         echo "<h4>ERROR Event ID Not Found</h4>";
                 }
                 if ($conn1->connect_error) {
