--- a/include/common-transit.inc.php
+++ b/include/common-transit.inc.php
@@ -4,10 +4,17 @@
 	'saturday',
 	'weekday'
 );
-function service_period()
+
+function service_period($date = "")
 {
+	
 	if (isset($_SESSION['service_period'])) return $_SESSION['service_period'];
-	switch (date('w')) {
+	$override = getServiceOverride($date);
+	if ($override['service_id']){
+		return $override['service_id'];
+	}
+
+	switch (date('w',($date != "" ? $date : time()))) {
 	case 0:
 		return 'sunday';
 	case 6:
@@ -16,9 +23,12 @@
 		return 'weekday';
 	}
 }
-function midnight_seconds()
+function midnight_seconds($time = "")
 {
 	// from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html
+	if ($time != "") {
+		return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);
+	}
 	if (isset($_SESSION['time'])) {
 		$time = strtotime($_SESSION['time']);
 		return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);
@@ -35,5 +45,5 @@
 		return "";
 	}
 }
+?>
 
-?>