diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index 4d63196fa..5874aa8e2 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -25,7 +25,7 @@ $pages = array(
 	array(
 		'label'      => 'Library',
 		'module'     => 'default',
-		'controller' => 'Playlist',
+		'controller' => 'Library',
 		'action'     => 'index',
 		'resource'	=>	'playlist'
 	),
diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index 79f95ba4f..3ba5738bd 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -27,6 +27,65 @@ class LibraryController extends Zend_Controller_Action
         $this->search_sess = new Zend_Session_Namespace("search");
     }
 
+    public function indexAction()
+    {
+        global $CC_CONFIG;
+
+        $request = $this->getRequest();
+        $baseUrl = $request->getBaseUrl();
+
+        $this->view->headScript()->appendFile($baseUrl.'/js/blockui/jquery.blockUI.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jquery.contextMenu.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_playlistbuilder.js'), 'text/javascript');
+
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/media_library.css?'.$CC_CONFIG['airtime_version']);
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']);
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColVis.css?'.$CC_CONFIG['airtime_version']);
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColReorder.css?'.$CC_CONFIG['airtime_version']);
+
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'/js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
+
+        try {
+            if (isset($this->obj_sess->id)) {
+                $objInfo = Application_Model_Playlist::getObjInfo($this->obj_sess->type);
+                $obj = new $objInfo['className']($this->obj_sess->id);
+                $userInfo = Zend_Auth::getInstance()->getStorage()->read();
+                $user = new Application_Model_User($userInfo->id);
+                $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
+                
+                if ($isAdminOrPM || $obj->getCreatorId() == $userInfo->id) {
+                    $this->view->obj = $obj;
+                    if ($this->obj_sess->type == "block") {
+                        $form = new Application_Form_SmartBlockCriteria();
+                        $form->startForm($this->obj_sess->id);
+                        $this->view->form = $form;
+                    }
+                }
+                
+                $formatter = new LengthFormatter($obj->getLength());
+                $this->view->length = $formatter->format();
+                $this->view->type = $this->obj_sess->type;
+            }
+        } catch (PlaylistNotFoundException $e) {
+            $this->playlistNotFound($this->obj_sess->type);
+        } catch (Exception $e) {
+            $this->playlistUnknownError($e);
+        }
+    }
+
+
     public function contextMenuAction()
     {
         $id = $this->_getParam('id');
@@ -270,7 +329,7 @@ class LibraryController extends Zend_Controller_Action
                 Logging::log($data['MDATA_KEY_FILEPATH']);
                 Application_Model_RabbitMq::SendMessageToMediaMonitor("md_update", $data);
 
-                $this->_redirect('Playlist');
+                $this->_redirect('Library');
             }
         }
 
diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index b60bcdaaf..28ea6b5f6 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -39,7 +39,7 @@ class PlaylistController extends Zend_Controller_Action
     {
         $obj = null;
         
-        $objInfo = $this->getObjInfo($p_type);
+        $objInfo = Application_Model_Playlist::getObjInfo($p_type);
 
         if (isset($this->obj_sess->id)) {
             $obj = new $objInfo['className']($this->obj_sess->id);
@@ -195,7 +195,7 @@ class PlaylistController extends Zend_Controller_Action
 
         try {
             if (isset($this->obj_sess->id)) {
-                $objInfo = $this->getObjInfo($this->obj_sess->type);
+                $objInfo = Application_Model_Playlist::getObjInfo($this->obj_sess->type);
                 $obj = new $objInfo['className']($this->obj_sess->id);
                 $userInfo = Zend_Auth::getInstance()->getStorage()->read();
                 $user = new Application_Model_User($userInfo->id);
@@ -227,7 +227,7 @@ class PlaylistController extends Zend_Controller_Action
         $userInfo = Zend_Auth::getInstance()->getStorage()->read();
         $type = $this->_getParam('type');
         
-        $objInfo = $this->getObjInfo($type);
+        $objInfo = Application_Model_Playlist::getObjInfo($type);
         
         $name = 'Untitled Playlist';
         if ($type == 'block') {
@@ -246,7 +246,7 @@ class PlaylistController extends Zend_Controller_Action
     {
         $id = $this->_getParam('id', null);
         $type = $this->_getParam('type');
-        $objInfo = $this->getObjInfo($type);
+        $objInfo = Application_Model_Playlist::getObjInfo($type);
         Logging::log("editing {$type} {$id}");
 
         if (!is_null($id)) {
@@ -271,7 +271,7 @@ class PlaylistController extends Zend_Controller_Action
         
         $obj = null;
      
-        $objInfo = $this->getObjInfo($type);
+        $objInfo = Application_Model_Playlist::getObjInfo($type);
         
         $userInfo = Zend_Auth::getInstance()->getStorage()->read();
         $user = new Application_Model_User($userInfo->id);
@@ -588,19 +588,6 @@ class PlaylistController extends Zend_Controller_Action
         }
     }
     
-    public function getObjInfo($p_type)
-    {
-        $info = array();
-        
-        if (strcmp($p_type, 'playlist')==0) {
-            $info['className'] = 'Application_Model_Playlist';
-        } else {
-            $info['className'] = 'Application_Model_Block';
-        }
-        
-        return $info;
-    }
-    
     public function getBlockInfoAction()
     {
         $request = $this->getRequest();
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 19023fc8d..29dcd03f8 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -899,6 +899,19 @@ SQL;
         CcPlaylistcontentsQuery::create()->findByDbPlaylistId($this->id)->delete();
     }
 
+    public static function getObjInfo($p_type)
+    {
+        $info = array();
+        
+        if (strcmp($p_type, 'playlist')==0) {
+            $info['className'] = 'Application_Model_Playlist';
+        } else {
+            $info['className'] = 'Application_Model_Block';
+        }
+        
+        return $info;
+    }
+
 } // class Playlist
 
 class PlaylistNotFoundException extends Exception {}
diff --git a/airtime_mvc/application/views/scripts/playlist/index.phtml b/airtime_mvc/application/views/scripts/library/index.phtml
similarity index 100%
rename from airtime_mvc/application/views/scripts/playlist/index.phtml
rename to airtime_mvc/application/views/scripts/library/index.phtml