diff --git a/.zfproject.xml b/.zfproject.xml
index 66290e350..9aa1d3fdd 100644
--- a/.zfproject.xml
+++ b/.zfproject.xml
@@ -69,6 +69,7 @@
           <actionMethod actionName="showList"/>
           <actionMethod actionName="getShowData"/>
           <actionMethod actionName="showContentDialog"/>
+          <actionMethod actionName="editShow"/>
         </controllerFile>
         <controllerFile controllerName="Api">
           <actionMethod actionName="index"/>
@@ -291,6 +292,9 @@
           <viewControllerScriptsDirectory forControllerName="Playlist">
             <viewScriptFile forActionName="setPlaylistFades"/>
           </viewControllerScriptsDirectory>
+          <viewControllerScriptsDirectory forControllerName="Schedule">
+            <viewScriptFile forActionName="editShow"/>
+          </viewControllerScriptsDirectory>
         </viewScriptsDirectory>
         <viewHelpersDirectory/>
         <viewFiltersDirectory enabled="false"/>
diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php
index a59c00fad..9dfa22f63 100644
--- a/application/controllers/ScheduleController.php
+++ b/application/controllers/ScheduleController.php
@@ -2,16 +2,12 @@
 
 class ScheduleController extends Zend_Controller_Action
 {
+
     protected $sched_sess = null;
 
     public function init()
     {
-        if(!Zend_Auth::getInstance()->hasIdentity())
-        {
-            $this->_redirect('login/index');
-		}
-
-		$ajaxContext = $this->_helper->getHelper('AjaxContext');
+        $ajaxContext = $this->_helper->getHelper('AjaxContext');
         $ajaxContext->addActionContext('event-feed', 'json')
                     ->addActionContext('make-context-menu', 'json')
 					->addActionContext('add-show-dialog', 'json')
@@ -26,6 +22,7 @@ class ScheduleController extends Zend_Controller_Action
                     ->addActionContext('get-current-playlist', 'json')	
 					->addActionContext('find-playlists', 'json')
 					->addActionContext('remove-group', 'json')	
+                    ->addActionContext('edit-show', 'json')
                     ->initContext();
 
 		$this->sched_sess = new Zend_Session_Namespace("schedule");
@@ -112,14 +109,8 @@ class ScheduleController extends Zend_Controller_Action
 				$userInfo = Zend_Auth::getInstance()->getStorage()->read();
 
 				$show = new Show(new User($userInfo->id, $userInfo->type));
-				$overlap = $show->addShow($data);
-
-				if(isset($overlap)) {
-					$this->view->overlap = $overlap;
-				}
-				else {
-					$this->_redirect('Schedule');
-				}
+				$show->addShow($data);
+			    $this->_redirect('Schedule');
 			}  
         }
 
@@ -169,7 +160,7 @@ class ScheduleController extends Zend_Controller_Action
     public function deleteShowAction()
     {
         $showInstanceId = $this->_getParam('id');
-		                                       
+        		                                       
 		$userInfo = Zend_Auth::getInstance()->getStorage()->read();
 		$user = new User($userInfo->id, $userInfo->type);
 
@@ -214,7 +205,7 @@ class ScheduleController extends Zend_Controller_Action
 
     public function scheduleShowAction()
     {
-		$showInstanceId = $this->sched_sess->showInstanceId;
+        $showInstanceId = $this->sched_sess->showInstanceId;
 		$search = $this->_getParam('search', null);
 		$plId = $this->_getParam('plId');
 
@@ -245,9 +236,8 @@ class ScheduleController extends Zend_Controller_Action
         $user = new User($userInfo->id, $userInfo->type);
         $show = new ShowInstance($showInstanceId);
 
-        if($user->isHost($show->getShowId())) {
+        if($user->isHost($show->getShowId()))
             $show->clearShow();
-        }
     }
 
     public function getCurrentPlaylistAction()
@@ -257,8 +247,8 @@ class ScheduleController extends Zend_Controller_Action
 
     public function findPlaylistsAction()
     {
-		$post = $this->getRequest()->getPost();
-
+        $post = $this->getRequest()->getPost();
+        
 		$show = new ShowInstance($this->sched_sess->showInstanceId);
 		$playlists = $show->searchPlaylistsForShow($post);
 
@@ -289,7 +279,7 @@ class ScheduleController extends Zend_Controller_Action
 
     public function scheduleShowDialogAction()
     {
-		$showInstanceId = $this->_getParam('id');
+        $showInstanceId = $this->_getParam('id');
         $this->sched_sess->showInstanceId = $showInstanceId;
         
         $show = new ShowInstance($showInstanceId);
@@ -331,13 +321,39 @@ class ScheduleController extends Zend_Controller_Action
 
     public function showContentDialogAction()
     {
-		$showInstanceId = $this->_getParam('id');
+        $showInstanceId = $this->_getParam('id');
 		$show = new ShowInstance($showInstanceId);
 
 		$this->view->showContent = $show->getShowListContent();
         $this->view->dialog = $this->view->render('schedule/show-content-dialog.phtml');
         unset($this->view->showContent);
     }
+
+    public function editShowAction()
+    {
+        $formWhat = new Application_Form_AddShowWhat();
+		$formWhat->removeDecorator('DtDdWrapper');
+		$formWho = new Application_Form_AddShowWho();
+		$formWho->removeDecorator('DtDdWrapper');
+		$formWhen = new Application_Form_AddShowWhen();
+		$formWhen->removeDecorator('DtDdWrapper');
+		$formRepeats = new Application_Form_AddShowRepeats();
+		$formRepeats->removeDecorator('DtDdWrapper');
+		$formStyle = new Application_Form_AddShowStyle();
+		$formStyle->removeDecorator('DtDdWrapper');
+
+        $this->view->what = $formWhat;
+		//$this->view->when = $formWhen;
+		//$this->view->repeats = $formRepeats;
+		$this->view->who = $formWho;
+		$this->view->style = $formStyle;
+
+        $this->view->dialog = $this->view->render('schedule/edit-show.phtml');
+    }
+
+
 }
 
 
+
+
diff --git a/application/views/scripts/schedule/add-show-dialog.phtml b/application/views/scripts/schedule/add-show-dialog.phtml
index 4550f6756..dc152e89e 100644
--- a/application/views/scripts/schedule/add-show-dialog.phtml
+++ b/application/views/scripts/schedule/add-show-dialog.phtml
@@ -11,13 +11,6 @@
           	    <button id="add-show-submit" class="right-floated">Add this show</button></div>
             <div class="clear"></div>
 
-            <?php if(isset($this->overlap)) : ?>
-	        <div id="schedule-add-show-overlap" style="display:block;">    
-	            <div>Overlap</div>
-	            <?php echo $this->partialLoop('schedule/show-overlap.phtml', $this->overlap); ?>   
-            </div>
-            <?php endif;?>
-
 			<div id="schedule-show-what">
 				<?php echo $this->what ?>
 			</div>
diff --git a/application/views/scripts/schedule/show-overlap.phtml b/application/views/scripts/schedule/show-overlap.phtml
deleted file mode 100644
index 8b365fff8..000000000
--- a/application/views/scripts/schedule/show-overlap.phtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-	<span><?php echo $this->name ?></span>
-	<span><?php echo $this->start_time ?></span>-<span><?php echo $this->end_time ?></span>
-</div>
diff --git a/public/js/airtime/schedule/schedule.js b/public/js/airtime/schedule/schedule.js
index 40b9865a9..99e5fadf1 100644
--- a/public/js/airtime/schedule/schedule.js
+++ b/public/js/airtime/schedule/schedule.js
@@ -191,6 +191,10 @@ function buildScheduleDialog(json){
 	dialog.dialog('open');
 }
 
+function buildEditDialog(json){
+
+}
+
 function scheduleRefetchEvents() {
     $("#schedule_calendar").fullCalendar( 'refetchEvents' );
 }