diff --git a/fitvids.info b/fitvids.info
index fb76309..da0cda0 100644
--- a/fitvids.info
+++ b/fitvids.info
@@ -1,5 +1,6 @@
 name = FitVids
 description = jQuery plugin for fluid width video embeds.
 core = 7.x
-scripts[] = jquery.fitvids.js
 configure = admin/config/media/fitvids
+
+dependencies[] = libraries
diff --git a/fitvids.install b/fitvids.install
index b8532d6..6df1b8d 100644
--- a/fitvids.install
+++ b/fitvids.install
@@ -8,35 +8,15 @@
 define("PLUGIN_URL", 'https://github.com/davatron5000/FitVids.js');
 define("PLUGIN_FILENAME", 'jquery.fitvids.js');
 
-/**
- * If the plugin doesn't exist, show a warning on the status page
- */
-function fitvids_requirements($phase) {
-  $requirements = array();
-  switch ($phase) {
-    case 'runtime':
-      $installed = file_exists(drupal_get_path('module', 'fitvids') . '/' . PLUGIN_FILENAME);
-      $requirements[] = array(
-        'title' => t('Fitvids library'),
-        'value' => $installed ? t('Installed') : t('Missing'),
-        'description' => t('Fitvids Javascript Library. Download it from !fitvids-site, copy it to the module directory, and rename it to !fitvids-filename.', array(
-          '!fitvids-site' => l(t('here'), PLUGIN_URL),
-          '!fitvids-filename' => PLUGIN_FILENAME,
-        )),
-        'severity' => $installed ? REQUIREMENT_OK : REQUIREMENT_ERROR,
-      );
-      break;
-  }
-  return $requirements;
-}
 
 /**
  * Enable the module
  */
+
 function fitvids_enable() {
   $installed = file_exists(drupal_get_path('module', 'fitvids') . '/' . PLUGIN_FILENAME);
   if (!$installed) {
-    $message = t('You need to download the FitVids.js jQuery plugin to use this module. Download it from !fitvids-site, copy it to the module directory, and rename it to !fitvids-filename.', array(
+    $message = t('You need to download the FitVids.js jQuery plugin to use this module. Download it from !fitvids-site, copy it to the /sites/all/libraries/fitvids/!fitvids-filename.', array(
       '!fitvids-site' => l(t('here'), PLUGIN_URL),
       '!fitvids-filename' => PLUGIN_FILENAME,
     ));
@@ -56,4 +36,4 @@ function fitvids_enable() {
 function fitvids_uninstall() {
 	// Delete module variables
 	variable_del('fitvids_selectors');
-}
\ No newline at end of file
+}
diff --git a/fitvids.module b/fitvids.module
index 6171c82..47d8c79 100644
--- a/fitvids.module
+++ b/fitvids.module
@@ -12,9 +12,9 @@ define("DEFAULT_REGIONS", '.region');
  *
  * Displays help and module information.
  *
- * @param path 
+ * @param path
  *   Which path of the site we're using to display help
- * @param arg 
+ * @param arg
  *   Array that holds the current path as returned from arg() function
  */
 function fitvids_help($path, $arg) {
@@ -38,15 +38,15 @@ function fitvids_permission() {
   return array(
     'administer fitvids' => array(
       'title' => t('Administer the FitVids module'),
-    )  
-  );  
+    )
+  );
 }
 
 /**
  * Implements hook_menu().
  */
 function fitvids_menu() {
-  $items = array();  
+  $items = array();
 
   $items['admin/config/media/fitvids'] = array(
     'title' => 'FitVids',
@@ -56,12 +56,12 @@ function fitvids_menu() {
     'access arguments' => array('administer fitvids'),
     'type' => MENU_NORMAL_ITEM,
   );
-  
+
   return $items;
 }
 
 /**
- * Configuraton form, called by drupal_get_form() 
+ * Configuraton form, called by drupal_get_form()
  * in current_posts_menu().
  */
 function fitvids_form($form, &$form_state) {
@@ -78,27 +78,48 @@ function fitvids_form($form, &$form_state) {
 }
 
 /**
+ * Implements hook_library().
+ *
+ * Checks to see if the Library exists, and makes it available
+ * with the settings configured by the admin_settings form
+ *
+ * @return
+ *   Drupal Library definition for History.js
+ */
+function fitvids_js_library() {
+  $libraries = array();
+  $libpath = libraries_get_path('fitvids');
+  $jspath = $libpath . '/jquery.fitvids.js';
+
+  $libraries['fitvids.js'] = array(
+    'title' => "FitVids.js was built by Chris Coyier and Paravel",
+    'website' => 'https://github.com/davatron5000/FitVids.js/',
+    'version' => '09.02.11',
+    'js' => array($jspath => array())
+  );
+
+  return $libraries;
+}
+
+/**
  * Include the FitVids.js script on every page
  */
+
 function fitvids_init() {
-  $installed = file_exists(drupal_get_path('module', 'fitvids') . '/jquery.fitvids.js');
-  if (!$installed) {
-    return;
-  }
-  
-  // TODO User should be able to choose which paths this should/shouldn't run on
-  
+
+  drupal_add_library('fitvids_js', 'fitvids.js', TRUE);
+
   $fitvids_selectors = variable_get('fitvids_selectors', DEFAULT_REGIONS);
   $fitvids_selectors_array = explode(PHP_EOL, $fitvids_selectors);
-  
+
   $inline_code = '// Output by FitVids module' . PHP_EOL;
-  
+
   foreach ($fitvids_selectors_array as $selector) {
     $selector = trim($selector);
     $inline_code .= 'jQuery("' . $selector . '").fitVids();' . PHP_EOL;
   }
-  
+
   drupal_add_js($inline_code,
     array('type' => 'inline', 'scope' => 'footer', 'weight' => 5)
   );
-}
\ No newline at end of file
+}