diff --git a/index.html b/index.html
index ea78066..b10ff4d 100644
--- a/index.html
+++ b/index.html
@@ -51,6 +51,7 @@
 <script src="lib/iscroll.js"></script>
 <script src="js/app.js"></script>
 <script src="js/services.js"></script>
+<script src="js/directives.js"></script>
 <script src="js/controllers.js"></script>
 
 </body>
diff --git a/js/directives.js b/js/directives.js
new file mode 100644
index 0000000..252f3dc
--- /dev/null
+++ b/js/directives.js
@@ -0,0 +1,78 @@
+angular.module('podcast.directives', [])
+    .directive('pullToRefresh', function() {
+        return function(scope, element, attrs, feedItems) {
+            var myScroll,
+                pullDownEl, pullDownOffset;
+
+            pullDownEl = document.getElementById('pullDown');
+            pullDownOffset = pullDownEl.offsetHeight;
+
+            //TODO: get ID from context somehow?
+            myScroll = new iScroll(element[0], {
+                useTransition: true,
+                topOffset: pullDownOffset,
+                onRefresh: function () {
+                    if (pullDownEl.className.match('loading')) {
+                        pullDownEl.className = '';
+                        pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Pull down to refresh...';
+                    }
+                },
+                onScrollMove: function () {
+                    if (this.y > 5 && !pullDownEl.className.match('flip')) {
+                        pullDownEl.className = 'flip';
+                        pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Release to refresh...';
+                        this.minScrollY = 0;
+                    } else if (this.y < 5 && pullDownEl.className.match('flip')) {
+                        pullDownEl.className = '';
+                        pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Pull down to refresh...';
+                        this.minScrollY = -pullDownOffset;
+                    }
+                },
+                onScrollEnd: function () {
+                    if (pullDownEl.className.match('flip')) {
+                        pullDownEl.className = 'loading';
+                        pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Loading...';
+
+                        scope.downloadItems(function(feedItem, feed) {
+                            if (undefined === feed) {
+                                myScroll.refresh();
+                            } else {
+                                pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Loading ' + feed.title + '...';
+                            }
+                        });
+                    }
+                }
+            });
+
+            scope.$watch(
+                function() { return scope.queue; },
+                function() { myScroll.refresh(); },
+                true
+            );
+        }
+    })
+    .directive('hold', ['$timeout', function($timeout) {
+        return function(scope, element, attrs) {
+            var startTime, moved, holdTimer = false;
+            element.bind('touchstart', function(event) {
+                startTime = new Date().getTime();
+
+                $timeout.cancel(holdTimer);
+                holdTimer = $timeout(function() {
+                    scope.$eval(attrs.hold);
+                }, 500);
+            });
+            element.bind('touchmove', function() {
+                $timeout.cancel(holdTimer);
+            });
+            element.bind('touchend', function(event) {
+                if (new Date().getTime() - startTime > 500) {
+                    event.preventDefault();
+                } else {
+                    $timeout.cancel(holdTimer);
+                    element[0].click();
+                }
+            });
+        }
+    }])
+;
\ No newline at end of file
diff --git a/js/services.js b/js/services.js
index 83c6583..e795164 100644
--- a/js/services.js
+++ b/js/services.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /* Services */
-angular.module('podcasts.services', ['podcasts.database'])
+angular.module('podcasts.services', ['podcasts.database', 'podcast.directives'])
     .service('downloader2', ['$http', '$q', 'xmlParser', function($http, $q, xmlParser) {
         return {
             downloadFile: function(url) {
@@ -142,82 +142,6 @@ angular.module('podcasts.services', ['podcasts.database'])
             var scroll = new iScroll(element[0]);
         };
     })
-    .directive('pullToRefresh', function() {
-        return function(scope, element, attrs, feedItems) {
-            var myScroll,
-                pullDownEl, pullDownOffset;
-
-            pullDownEl = document.getElementById('pullDown');
-            pullDownOffset = pullDownEl.offsetHeight;
-
-            //TODO: get ID from context somehow?
-            myScroll = new iScroll(element[0], {
-                useTransition: true,
-                topOffset: pullDownOffset,
-                onRefresh: function () {
-                    if (pullDownEl.className.match('loading')) {
-                        pullDownEl.className = '';
-                        pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Pull down to refresh...';
-                    }
-                },
-                onScrollMove: function () {
-                    if (this.y > 5 && !pullDownEl.className.match('flip')) {
-                        pullDownEl.className = 'flip';
-                        pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Release to refresh...';
-                        this.minScrollY = 0;
-                    } else if (this.y < 5 && pullDownEl.className.match('flip')) {
-                        pullDownEl.className = '';
-                        pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Pull down to refresh...';
-                        this.minScrollY = -pullDownOffset;
-                    }
-                },
-                onScrollEnd: function () {
-                    if (pullDownEl.className.match('flip')) {
-                        pullDownEl.className = 'loading';
-                        pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Loading...';
-
-                        scope.downloadItems(function(feedItem, feed) {
-                            if (undefined === feed) {
-                                myScroll.refresh();
-                            } else {
-                                pullDownEl.querySelector('.pullDownLabel').innerHTML = 'Loading ' + feed.title + '...';
-                            }
-                        });
-                    }
-                }
-            });
-
-            scope.$watch(
-                function() { return scope.queue; },
-                function() { myScroll.refresh(); },
-                true
-            );
-        }
-    })
-    .directive('hold', function() {
-        return function(scope, element, attrs) {
-            var startTime, moved, holdTimer = false;
-            element.bind('touchstart', function(event) {
-                startTime = new Date().getTime();
-
-                clearTimeout(holdTimer);
-                holdTimer = setTimeout(function() {
-                    scope.$eval(attrs.hold);
-                }, 500);
-            });
-            element.bind('touchmove', function() {
-                clearTimeout(holdTimer);
-            });
-            element.bind('touchend', function(event) {
-                if (new Date().getTime() - startTime > 500) {
-                    event.preventDefault();
-                } else {
-                    clearTimeout(holdTimer);
-                    element[0].click();
-                }
-            });
-        }
-    })
     .service('feeds', ['db', 'downloader2', 'xmlParser', 'feedItems', function(db, downloader2, xmlParser, feedItems) {
         return {
             db: db,
@@ -466,7 +390,7 @@ angular.module('podcasts.services', ['podcasts.database'])
             }
         }
     }])
-    .service('player', ['db', function(db) {
+    .service('player', ['db', '$timeout', function(db, $timeout) {
         return {
             db: db,
             audio: angular.element(document.getElementById('audioPlayer')),
@@ -520,7 +444,7 @@ angular.module('podcasts.services', ['podcasts.database'])
                 this.nowPlaying.title = feedItem.title;
                 var audio = this.audio[0],
                     player = this;
-                setTimeout(function() {
+                $timeout(function() {
                     player.nowPlaying.duration = audio.duration;
                 }, 100);
                 this.nowPlaying.feedItem = feedItem;