diff --git a/PseudoChannel.py b/PseudoChannel.py
index a515b2c..0333fb3 100644
--- a/PseudoChannel.py
+++ b/PseudoChannel.py
@@ -600,9 +600,9 @@ if __name__ == '__main__':
 
 	#pseudo_channel.update_db()
 
-	#pseudo_channel.update_schedule()
+	pseudo_channel.update_schedule()
 
-	#pseudo_channel.generate_daily_schedule()
+	pseudo_channel.generate_daily_schedule()
 
 	try:
 		print "++++ Running TV Controller"
diff --git a/pseudo_schedule.xml b/pseudo_schedule.xml
index 21331a2..191e17d 100644
--- a/pseudo_schedule.xml
+++ b/pseudo_schedule.xml
@@ -51,12 +51,10 @@
   		<time title="new girl" type="series" strict-time="false" time-shift="5" overlap-max="">7:00 PM</time>
   		<time title="new girl" type="series" strict-time="false" time-shift="5" overlap-max="">7:30 PM</time>
 
-  		<time title="random" type="movie" strict-time="true" time-shift="5" overlap-max="">7:00 PM</time>
+  		<time title="random" type="movie" strict-time="true" time-shift="5" overlap-max="">7:16 PM</time>
   		
 		<time title="the trip" type="series" strict-time="false" time-shift="5" overlap-max="">8:30 PM</time>
   		<time title="the trip" type="series" strict-time="false" time-shift="5" overlap-max="">9:00 PM</time>
   		<time title="the wire" type="series" strict-time="false" time-shift="5" overlap-max="">9:30 PM</time>
-
-  		<time title="Wayne&apos;s World" type="movie" strict-time="true" time-shift="5" overlap-max="">10:00 PM</time>
   	</weekdays>
-</schedule>
\ No newline at end of file
+</schedule>
diff --git a/src/PseudoDailyScheduleController.py b/src/PseudoDailyScheduleController.py
index ea4085c..eb3d922 100644
--- a/src/PseudoDailyScheduleController.py
+++ b/src/PseudoDailyScheduleController.py
@@ -202,22 +202,38 @@ class PseudoDailyScheduleController():
 	'''
 	def play_media(self, mediaType, mediaParentTitle, mediaTitle):
 
-		mediaItems = self.PLEX.library.section(mediaType).get(mediaParentTitle).episodes()
+		if mediaType == "TV Shows":
 
-		for item in mediaItems:
+			mediaItems = self.PLEX.library.section(mediaType).get(mediaParentTitle).episodes()
+
+			for item in mediaItems:
 
 			# print(part.title)
 
-			if item.title == mediaTitle:
+				if item.title == mediaTitle:
 
-				for client in self.PLEX_CLIENTS:
+					for client in self.PLEX_CLIENTS:
+
+						clientItem = self.PLEX.client(client)
+
+						clientItem.playMedia(item)
+						
+				break
+
+		elif mediaType == "Movies":
+
+			movie =  self.PLEX.library.section(mediaType).get(mediaTitle)
+
+			for client in self.PLEX_CLIENTS:
 
 					clientItem = self.PLEX.client(client)
 
-					clientItem.playMedia(item)
-					
-					break
+					clientItem.playMedia(movie)
 
+		else:
+
+			print("Not sure how to play {}".format(mediaType))
+		
 	'''
 	*
 	* If tv_controller() does not find a "startTime" for scheduled media, search for an "endTime" match for now time.
@@ -236,8 +252,13 @@ class PseudoDailyScheduleController():
 		"""
 		for row in datalist:
 
+			try:
+				
+				endTime = datetime.strptime(row[9], '%Y-%m-%d %H:%M:%S.%f')
 
-			endTime = datetime.strptime(row[9], '%Y-%m-%d %H:%M:%S.%f')
+			except ValueError:
+
+				endTime = datetime.strptime(row[9], '%Y-%m-%d %H:%M:%S')
 
 			if currentTime.hour == endTime.hour:
 
@@ -278,14 +299,14 @@ class PseudoDailyScheduleController():
 					print("Starting Epsisode: " + row[3])
 					print(row)
 
-					self.play_media("TV Shows", row[6], row[3])
+					self.play_media(row[11], row[6], row[3])
 
 					self.write_schedule_to_file(
 						self.get_html_from_daily_schedule(
 							timeB, 
 							self.get_show_photo(
 								row[11], 
-								row[6]), 
+								row[3]), 
 								datalist
 							)
 					)