diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 02ed93dfa..e9a97b788 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -163,22 +163,16 @@ class ScheduleController extends Zend_Controller_Action
     {
         $deltaDay = $this->_getParam('day');
         $deltaMin = $this->_getParam('min');
-        $showInstanceId = $this->_getParam('showInstanceId');
 
-        $userInfo = Zend_Auth::getInstance()->getStorage()->read();
-        $user = new Application_Model_User($userInfo->id);
-
-        if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
-            try {
-                $showInstance = new Application_Model_ShowInstance($showInstanceId);
-            } catch (Exception $e) {
-                $this->view->show_error = true;
-
-                return false;
-            }
-            $error = $showInstance->moveShow($deltaDay, $deltaMin);
+        try {
+            $service_calendar = new Application_Service_CalendarService(
+                $this->_getParam('showInstanceId'));
+        } catch (Exception $e) {
+            $this->view->show_error = true;
+            return false;
         }
 
+        $error = $service_calendar->moveShow($deltaDay, $deltaMin);
         if (isset($error)) {
             $this->view->error = $error;
         }
diff --git a/airtime_mvc/application/services/CalendarService.php b/airtime_mvc/application/services/CalendarService.php
index 876b3566a..1c963fc45 100644
--- a/airtime_mvc/application/services/CalendarService.php
+++ b/airtime_mvc/application/services/CalendarService.php
@@ -4,13 +4,16 @@ class Application_Service_CalendarService
 {
     private $currentUser;
     private $ccShowInstance;
-    private $showId;
+    private $ccShow;
 
     public function __construct($instanceId = null)
     {
         if (!is_null($instanceId)) {
             $this->ccShowInstance = CcShowInstancesQuery::create()->findPk($instanceId);
-            $this->showId = $this->ccShowInstance->getDbShowId();
+            if (is_null($this->ccShowInstance)) {
+                throw new Exception("Instance does not exist");
+            }
+            $this->ccShow = $this->ccShowInstance->getCcShow();
         }
 
         $service_user = new Application_Service_UserService();
@@ -27,7 +30,7 @@ class Application_Service_CalendarService
         $now = time();
         $baseUrl = Application_Common_OsPath::getBaseDir();
         $isAdminOrPM = $this->currentUser->isAdminOrPM();
-        $isHostOfShow = $this->currentUser->isHostOfShow($this->showId);
+        $isHostOfShow = $this->currentUser->isHostOfShow($this->ccShow->getDbId());
 
         //DateTime objects in UTC
         $startDT = $this->ccShowInstance->getDbStarts(null);
@@ -108,7 +111,7 @@ class Application_Service_CalendarService
                 }
             }
 
-            $isRepeating = $this->ccShowInstance->getCcShow()->getFirstCcShowDay()->isRepeating();
+            $isRepeating = $this->ccShow->getFirstCcShowDay()->isRepeating();
             if (!$this->ccShowInstance->isRebroadcast()) {
                 if ($isRepeating) {
                     $menu["edit"] = array(
@@ -164,18 +167,12 @@ class Application_Service_CalendarService
         return $menu;
     }
 
-    /*
-     * @param $dateTime
-     *      php Datetime object to add deltas to
-     *
-     * @param $deltaDay
-     *      php int, delta days show moved
-     *
-     * @param $deltaMin
-     *      php int, delta mins show moved
-     *
-     * @return $newDateTime
-     *      php DateTime, $dateTime with the added time deltas.
+    /**
+     * 
+     * Enter description here ...
+     * @param DateTime $dateTime object to add deltas to
+     * @param int $deltaDay delta days show moved
+     * @param int $deltaMin delta minutes show moved
      */
     public static function addDeltas($dateTime, $deltaDay, $deltaMin)
     {
@@ -202,4 +199,128 @@ class Application_Service_CalendarService
         return $newDateTime;
     }
 
+    private function validateShowMove($deltaDay, $deltaMin)
+    {
+        if (!$this->currentUser->isAdminOrPM()) {
+            throw new Exception(_("Permission denied"));
+        }
+
+        if ($this->ccShow->getFirstCcShowDay()->isRepeating()) {
+            throw new Exception(_("Can't drag and drop repeating shows"));
+        }
+
+        $today_timestamp = time();
+
+        $startsDateTime = new DateTime($this->ccShowInstance->getDbStarts(), new DateTimeZone("UTC"));
+        $endsDateTime = new DateTime($this->ccShowInstance->getDbEnds(), new DateTimeZone("UTC"));
+
+        if ($today_timestamp > $startsDateTime->getTimestamp()) {
+            throw new Exception(_("Can't move a past show"));
+        }
+
+        //the user is moving the show on the calendar from the perspective of local time.
+        //incase a show is moved across a time change border offsets should be added to the localtime
+        //stamp and then converted back to UTC to avoid show time changes!
+        $localTimezone = Application_Model_Preference::GetTimezone();
+        $startsDateTime->setTimezone(new DateTimeZone($localTimezone));
+        $endsDateTime->setTimezone(new DateTimeZone($localTimezone));
+
+        $newStartsDateTime = self::addDeltas($startsDateTime, $deltaDay, $deltaMin);
+        $newEndsDateTime = self::addDeltas($endsDateTime, $deltaDay, $deltaMin);
+
+        //convert our new starts/ends to UTC.
+        $newStartsDateTime->setTimezone(new DateTimeZone("UTC"));
+        $newEndsDateTime->setTimezone(new DateTimeZone("UTC"));
+
+        if ($today_timestamp > $newStartsDateTime->getTimestamp()) {
+            throw new Exception(_("Can't move show into past"));
+        }
+
+        //check if show is overlapping
+        $overlapping = Application_Model_Schedule::checkOverlappingShows(
+            $newStartsDateTime, $newEndsDateTime, true, $this->ccShowInstance->getDbId());
+        if ($overlapping) {
+            throw new Exception(_("Cannot schedule overlapping shows"));
+        }
+
+        if ($this->ccShow->isRecorded()) {
+            //rebroadcasts should start at max 1 hour after a recorded show has ended.
+            $minRebroadcastStart = self::addDeltas($newEndsDateTime, 0, 60);
+            //check if we are moving a recorded show less than 1 hour before any of its own rebroadcasts.
+            $rebroadcasts = CcShowInstancesQuery::create()
+                ->filterByDbOriginalShow($this->_instanceId)
+                ->filterByDbStarts($minRebroadcastStart->format('Y-m-d H:i:s'), Criteria::LESS_THAN)
+                ->find();
+
+            if (count($rebroadcasts) > 0) {
+                throw new Exception(_("Can't move a recorded show less than 1 hour before its rebroadcasts."));
+            }
+        }
+
+        if ($this->ccShow->isRebroadcast()) {
+            $recordedShow = CcShowInstancesQuery::create()->findPk(
+                $this->ccShowInstance->getDbOriginalShow());
+            if (is_null($recordedShow)) {
+                $this->ccShowInstance->delete();
+                throw new Exception(_("Show was deleted because recorded show does not exist!"));
+            }
+
+            $recordEndDateTime = new DateTime($recordedShow->getDbEnds(), new DateTimeZone("UTC"));
+            $newRecordEndDateTime = self::addDeltas($recordEndDateTime, 0, 60);
+
+            if ($newStartsDateTime->getTimestamp() < $newRecordEndDateTime->getTimestamp()) {
+                throw new Exception(_("Must wait 1 hour to rebroadcast."));
+            }
+        }
+        return array($newStartsDateTime, $newEndsDateTime);
+    }
+
+    public function moveShow($deltaDay, $deltaMin)
+    {
+        try {
+            $con = Propel::getConnection();
+            $con->beginTransaction();
+
+            list($newStartsDateTime, $newEndsDateTime) = $this->validateShowMove(
+                $deltaDay, $deltaMin);
+
+            $this->ccShowInstance
+                ->setDbStarts($newStartsDateTime)
+                ->setDbEnds($newEndsDateTime)
+                ->save();
+
+            if (!$this->ccShowInstance->getCcShow()->isRebroadcast()) {
+                //we can get the first show day because we know the show is
+                //not repeating, and therefore will only have one show day entry
+                $ccShowDay = $this->ccShow->getFirstCcShowDay();
+                $ccShowDay
+                    ->setDbFirstShow($newStartsDateTime)
+                    ->setDbLastShow($newEndsDateTime)
+                    ->save();
+            }
+
+            Application_Service_SchedulerService::updateScheduleStartTime(
+                array($this->ccShowInstance->getDbId()), null, $newStartsDateTime);
+
+            $con->commit();
+            Application_Model_RabbitMq::PushSchedule();
+        } catch (Exception $e) {
+            $con->rollback();
+            return $e->getMessage();
+        }
+    }
+
+    public function resizeShow($deltaDay, $deltaMin)
+    {
+        try {
+            $con = Propel::getConnection();
+            $con->beginTransaction();
+
+            $con->commit();
+            Application_Model_RabbitMq::PushSchedule();
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/airtime_mvc/application/services/SchedulerService.php b/airtime_mvc/application/services/SchedulerService.php
index 5b3fa995e..635569f55 100644
--- a/airtime_mvc/application/services/SchedulerService.php
+++ b/airtime_mvc/application/services/SchedulerService.php
@@ -44,27 +44,32 @@ class Application_Service_SchedulerService
      * Enter description here ...
      * @param array $instanceIds
      */
-    public static function updateScheduleStartTime($instanceIds, $diff)
+    public static function updateScheduleStartTime($instanceIds, $diff=null, $newStart=null)
     {
         $con = Propel::getConnection();
-        if (count($instanceIds) > 0 && $diff != 0) {
+        if (count($instanceIds) > 0) {
             $showIdList = implode(",", $instanceIds);
-            /*$sql = <<<SQL
-UPDATE cc_schedule
-SET starts = starts + :diff1::INTERVAL,
-    ends = ends + :diff2::INTERVAL
-WHERE instance_id IN (:showIds)
-SQL;
 
-            Application_Common_Database::prepareAndExecute($sql,
-                array(':diff1' => $diff, ':diff2' => $diff, 
-                    ':showIds' => $showIdList),
-                'execute');*/
-        $sql = "UPDATE cc_schedule "
-                    ."SET starts = starts + INTERVAL '$diff sec', "
-                    ."ends = ends + INTERVAL '$diff sec' "
-                    ."WHERE instance_id IN ($showIdList)";
-            $con->exec($sql);
+            if (is_null($diff)) {
+                $ccSchedule = CcScheduleQuery::create()
+                    ->filterByDbInstanceId($instanceIds, Criteria::IN)
+                    ->orderByDbStarts()
+                    ->limit(1)
+                    ->findOne();
+
+                if (!is_null($ccSchedule)) {
+                    $scheduleStartsEpoch = strtotime($ccSchedule->getDbStarts());
+                    $showStartsEpoch     = strtotime($newStart->format("Y-m-d H:i:s"));
+
+                    $diff = $showStartsEpoch - $scheduleStartsEpoch;
+                }
+
+                $sql = "UPDATE cc_schedule "
+                        ."SET starts = starts + INTERVAL '$diff sec', "
+                        ."ends = ends + INTERVAL '$diff sec' "
+                        ."WHERE instance_id IN ($showIdList)";
+                $con->exec($sql);
+            }
         }
     }
 
diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml
index 2633c2938..49ff7cffa 100644
--- a/airtime_mvc/build/schema.xml
+++ b/airtime_mvc/build/schema.xml
@@ -341,9 +341,9 @@
     <foreign-key foreignTable="cc_webstream" name="cc_show_stream_fkey" onDelete="CASCADE">
       <reference local="stream_id" foreign="id"/>
     </foreign-key>
-    <foreign-key foreignTable="cc_show_stamp" name="cc_schedule_stamp_id_fkey" onDelete="CASCADE">
+    <!-- <foreign-key foreignTable="cc_show_stamp" name="cc_schedule_stamp_id_fkey" onDelete="CASCADE">
       <reference local="stamp_id" foreign="id" />
-    </foreign-key>
+    </foreign-key> -->
     <index name="cc_schedule_instance_id_idx">
       <index-column name="instance_id"/>
     </index>