diff --git a/couchpotato/__init__.py b/couchpotato/__init__.py
index 712224a..2a10f83 100644
--- a/couchpotato/__init__.py
+++ b/couchpotato/__init__.py
@@ -24,7 +24,7 @@ def get_session(engine = None):
     return scoped_session(sessionmaker(bind = engine))
 
 def get_engine():
-    return create_engine(Env.get('db_path'), echo = False)
+    return create_engine(Env.get('db_path')+'?check_same_thread=False', echo = False)
 
 def addView(route, func, static = False):
     web.add_url_rule(route + ('' if static else '/'), endpoint = route if route else 'index', view_func = func)
diff --git a/couchpotato/core/downloaders/base.py b/couchpotato/core/downloaders/base.py
index 6aed91a..edd1103 100644
--- a/couchpotato/core/downloaders/base.py
+++ b/couchpotato/core/downloaders/base.py
@@ -1,9 +1,14 @@
 from couchpotato.core.event import addEvent
+from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 
+log = CPLog(__name__)
+
 
 class Downloader(Plugin):
 
+    type = []
+
     def __init__(self):
         addEvent('download', self.download)
 
@@ -15,3 +20,11 @@ class Downloader(Plugin):
 
     def isEnabled(self):
         return self.conf('enabled', True)
+
+    def isCorrectType(self, type):
+        is_correct = type in self.type
+
+        if not is_correct:
+            log.debug("Downloader doesn't support this type")
+
+        return bool
diff --git a/couchpotato/core/downloaders/blackhole/main.py b/couchpotato/core/downloaders/blackhole/main.py
index 55e5f79..fbb6ef3 100644
--- a/couchpotato/core/downloaders/blackhole/main.py
+++ b/couchpotato/core/downloaders/blackhole/main.py
@@ -1,8 +1,10 @@
 from __future__ import with_statement
+from couchpotato.core.downloaders.base import Downloader
 from couchpotato.core.helpers.encoding import toSafeString
 from couchpotato.core.logger import CPLog
-from couchpotato.core.downloaders.base import Downloader
+from inspect import isfunction
 import os
+import traceback
 import urllib
 
 log = CPLog(__name__)
@@ -21,16 +23,28 @@ class Blackhole(Downloader):
         if not directory or not os.path.isdir(directory):
             log.error('No directory set for blackhole %s download.' % data.get('type'))
         else:
-            fullPath = os.path.join(directory, toSafeString(data.get('name')) + '.' + data)
-
-            if not os.path.isfile(fullPath):
-                log.info('Downloading %s to %s.' % (data.get('type'), fullPath))
-                file = urllib.urlopen(data.get('url')).read()
-                with open(fullPath, 'wb') as f:
-                    f.write(file)
-
-                return True
-            else:
-                log.error('File %s already exists.' % fullPath)
+            fullPath = os.path.join(directory, toSafeString(data.get('name')) + '.' + data.get('type'))
+
+            try:
+                if not os.path.isfile(fullPath):
+                    log.info('Downloading %s to %s.' % (data.get('type'), fullPath))
+                    if isfunction(data.get('download')):
+                        file = data.get('download')()
+                        if not file:
+                            log.debug('Failed download file: %s' % data.get('name'))
+                            return False
+                    else:
+                        file = urllib.urlopen(data.get('url')).read()
+
+                    with open(fullPath, 'wb') as f:
+                        f.write(file)
+
+                    return True
+                else:
+                    log.info('File %s already exists.' % fullPath)
+                    return True
+            except:
+                log.error('Failed to download to blackhole %s' % traceback.format_exc())
+                pass
 
         return False
diff --git a/couchpotato/core/event.py b/couchpotato/core/event.py
index 054d5bb..7765bb8 100644
--- a/couchpotato/core/event.py
+++ b/couchpotato/core/event.py
@@ -43,35 +43,41 @@ def fireEvent(name, *args, **kwargs):
         result = e(*args, **kwargs)
 
         if single and not merge:
-            results = result[0][1]
+            results = None
+            if result[0][0] == True and result[0][1]:
+                results = result[0][1]
+            elif result[0][1]:
+                errorHandler(result[0][1])
         else:
             results = []
             for r in result:
-                if r[0] == True:
+                if r[0] == True and r[1]:
                     results.append(r[1])
-                else:
+                elif r[1]:
                     errorHandler(r[1])
 
-            # Merge dict
-            if merge and type(results[0]) == dict:
-                merged = {}
-                for result in results:
-                    merged = mergeDicts(merged, result)
+            # Merge
+            if merge and len(results) > 0:
+                # Dict
+                if type(results[0]) == dict:
+                    merged = {}
+                    for result in results:
+                        merged = mergeDicts(merged, result)
 
-                results = merged
-            # Merg lists
-            elif merge and type(results[0]) == list:
-                merged = []
-                for result in results:
-                    merged += result
+                    results = merged
+                # Lists
+                elif type(results[0]) == list:
+                    merged = []
+                    for result in results:
+                        merged += result
 
-                results = merged
+                    results = merged
 
         return results
-    except KeyError:
+    except KeyError, e:
         pass
-    except Exception, e:
-        log.error('%s: %s' % (name, e))
+    except Exception:
+        log.error('%s: %s' % (name, traceback.format_exc()))
 
 def fireEventAsync(name, *args, **kwargs):
     #log.debug('Async "%s": %s, %s' % (name, args, kwargs))
diff --git a/couchpotato/core/helpers/variable.py b/couchpotato/core/helpers/variable.py
index c19d87a..208709d 100644
--- a/couchpotato/core/helpers/variable.py
+++ b/couchpotato/core/helpers/variable.py
@@ -22,6 +22,12 @@ def mergeDicts(a, b):
                     current_dst[key] = current_src[key]
     return dst
 
+def flattenList(l):
+    if isinstance(l, list):
+        return sum(map(flattenList, l))
+    else:
+        return l
+
 def md5(text):
     return hashlib.md5(text).hexdigest()
 
diff --git a/couchpotato/core/loader.py b/couchpotato/core/loader.py
index e682500..d3532fa 100644
--- a/couchpotato/core/loader.py
+++ b/couchpotato/core/loader.py
@@ -2,6 +2,7 @@ from couchpotato.core.event import fireEvent
 from couchpotato.core.logger import CPLog
 import glob
 import os
+import traceback
 
 log = CPLog(__name__)
 
@@ -49,7 +50,7 @@ class Loader:
 
                     self.loadPlugins(m, plugin.get('name'))
                 except Exception, e:
-                    log.error('Can\'t import %s: %s' % (module_name, e))
+                    log.error('Can\'t import %s: %s' % (module_name, traceback.format_exc()))
 
         if did_save:
             fireEvent('settings.save')
@@ -73,7 +74,7 @@ class Loader:
                 fireEvent('settings.register', section_name = section['name'], options = options, save = save)
             return True
         except Exception, e:
-            log.debug("Failed loading settings for '%s': %s" % (name, e))
+            log.debug("Failed loading settings for '%s': %s" % (name, traceback.format_exc()))
             return False
 
     def loadPlugins(self, module, name):
@@ -81,7 +82,7 @@ class Loader:
             module.start()
             return True
         except Exception, e:
-            log.error("Failed loading plugin '%s': %s" % (name, e))
+            log.error("Failed loading plugin '%s': %s" % (name, traceback.format_exc()))
             return False
 
     def addModule(self, priority, type, module, name):
diff --git a/couchpotato/core/plugins/base.py b/couchpotato/core/plugins/base.py
index 9252e39..cf6dc08 100644
--- a/couchpotato/core/plugins/base.py
+++ b/couchpotato/core/plugins/base.py
@@ -1,4 +1,4 @@
-from couchpotato import addView
+from couchpotato import addView, get_session
 from couchpotato.environment import Env
 from flask.helpers import send_from_directory
 import os.path
@@ -7,8 +7,8 @@ import re
 
 class Plugin():
 
-    def conf(self, attr):
-        return Env.setting(attr, self.getName().lower())
+    def conf(self, attr, default = None):
+        return Env.setting(attr, self.getName().lower(), default = default)
 
     def getName(self):
         return self.__class__.__name__
diff --git a/couchpotato/core/plugins/file/main.py b/couchpotato/core/plugins/file/main.py
index 4f5c3a1..b85861e 100644
--- a/couchpotato/core/plugins/file/main.py
+++ b/couchpotato/core/plugins/file/main.py
@@ -1,6 +1,7 @@
 from couchpotato import get_session
 from couchpotato.api import addApiView
 from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import toUnicode
 from couchpotato.core.helpers.variable import md5, getExt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
@@ -55,23 +56,24 @@ class FileManager(Plugin):
 
         return False
 
-    def add(self, path = '', part = 1, type = (), properties = {}):
-
+    def add(self, path = '', part = 1, type = (), available = 1, properties = {}):
         db = get_session()
 
-        f = db.query(File).filter_by(path = path).first()
+        f = db.query(File).filter_by(path = toUnicode(path)).first()
         if not f:
             f = File()
             db.add(f)
 
         f.path = path
         f.part = part
+        f.available = available
         f.type_id = self.getType(type).id
 
         db.commit()
 
-        db.expunge(f)
-        return f
+        file_dict = f.to_dict()
+
+        return file_dict
 
     def getType(self, type):
 
@@ -100,7 +102,6 @@ class FileManager(Plugin):
 
         types = []
         for type in results:
-            temp = type.to_dict()
-            types.append(temp)
+            types.append(type.to_dict())
 
         return types
diff --git a/couchpotato/core/plugins/file/static/file.js b/couchpotato/core/plugins/file/static/file.js
index 76ef62e..48ef5be 100644
--- a/couchpotato/core/plugins/file/static/file.js
+++ b/couchpotato/core/plugins/file/static/file.js
@@ -36,12 +36,8 @@ var FileSelect = new Class({
 			return file.type_id == File.Type.get(type).id;
 		});
 
-		if(single){
-			results = new File(results.pop());
-		}
-		else {
-
-		}
+		if(single)
+			return new File(results.pop());
 
 		return results;
 
diff --git a/couchpotato/core/plugins/library/main.py b/couchpotato/core/plugins/library/main.py
index cb80c6e..6455972 100644
--- a/couchpotato/core/plugins/library/main.py
+++ b/couchpotato/core/plugins/library/main.py
@@ -2,7 +2,8 @@ from couchpotato import get_session
 from couchpotato.core.event import addEvent, fireEventAsync, fireEvent
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Library, LibraryTitle
+from couchpotato.core.settings.model import Library, LibraryTitle, File
+import traceback
 
 log = CPLog(__name__)
 
@@ -12,17 +13,19 @@ class LibraryPlugin(Plugin):
         addEvent('library.add', self.add)
         addEvent('library.update', self.update)
 
-    def add(self, attrs = {}):
+    def add(self, attrs = {}, update_after = True):
 
         db = get_session()
 
         l = db.query(Library).filter_by(identifier = attrs.get('identifier')).first()
         if not l:
+            status = fireEvent('status.get', 'needs_update', single = True)
             l = Library(
                 year = attrs.get('year'),
                 identifier = attrs.get('identifier'),
                 plot = attrs.get('plot'),
-                tagline = attrs.get('tagline')
+                tagline = attrs.get('tagline'),
+                status_id = status.get('id')
             )
 
             title = LibraryTitle(
@@ -35,26 +38,36 @@ class LibraryPlugin(Plugin):
             db.commit()
 
         # Update library info
-        fireEventAsync('library.update', library = l, default_title = attrs.get('title', ''))
+        if update_after:
+            fireEventAsync('library.update', identifier = l.identifier, default_title = attrs.get('title', ''))
 
-        #db.remove()
-        return l
+        library_dict = l.to_dict()
 
-    def update(self, library, default_title = ''):
+        return library_dict
+
+    def update(self, identifier, default_title = '', force = False):
 
         db = get_session()
-        library = db.query(Library).filter_by(identifier = library.identifier).first()
+        library = db.query(Library).filter_by(identifier = identifier).first()
+        done_status = fireEvent('status.get', 'done', single = True)
+
+        if library.status_id == done_status.get('id') and not force:
+            return
 
-        info = fireEvent('provider.movie.info', merge = True, identifier = library.identifier)
+        info = fireEvent('provider.movie.info', merge = True, identifier = identifier)
+        if not info or len(info) == 0:
+            log.error('Could not update, no movie info to work with: %s' % identifier)
+            return
 
         # Main info
         library.plot = info.get('plot', '')
         library.tagline = info.get('tagline', '')
         library.year = info.get('year', 0)
+        library.status_id = done_status.get('id')
 
         # Titles
         [db.delete(title) for title in library.titles]
-        titles = info.get('titles')
+        titles = info.get('titles', [])
 
         log.debug('Adding titles: %s' % titles)
         for title in titles:
@@ -67,15 +80,17 @@ class LibraryPlugin(Plugin):
         db.commit()
 
         # Files
-        images = info.get('images')
+        images = info.get('images', [])
         for type in images:
             for image in images[type]:
                 file_path = fireEvent('file.download', url = image, single = True)
                 file = fireEvent('file.add', path = file_path, type = ('image', type[:-1]), single = True)
                 try:
+                    file = db.query(File).filter_by(id = file.get('id')).one()
                     library.files.append(file)
                     db.commit()
                 except:
-                    log.debug('File already attached to library')
+                    pass
+                    #log.debug('Failed to attach to library: %s' % traceback.format_exc())
 
         fireEvent('library.update.after')
diff --git a/couchpotato/core/plugins/movie/main.py b/couchpotato/core/plugins/movie/main.py
index 20ccf16..8913abd 100644
--- a/couchpotato/core/plugins/movie/main.py
+++ b/couchpotato/core/plugins/movie/main.py
@@ -101,21 +101,23 @@ class MoviePlugin(Plugin):
         m = db.query(Movie).filter_by(library_id = library.id).first()
         if not m:
             m = Movie(
-                library_id = library.id,
+                library_id = library.get('id'),
                 profile_id = params.get('profile_id')
             )
             db.add(m)
 
-        m.status_id = status.id
+        m.status_id = status.get('id')
         db.commit()
+        
+        movie_dict = m.to_dict(deep = {
+            'releases': {'status': {}, 'quality': {}},
+            'library': {'titles': {}}
+        })
 
         return jsonified({
             'success': True,
             'added': True,
-            'movie': m.to_dict(deep = {
-                'releases': {'status': {}, 'quality': {}},
-                'library': {'titles': {}}
-            })
+            'movie': movie_dict,
         })
 
     def edit(self):
@@ -129,7 +131,7 @@ class MoviePlugin(Plugin):
         status = fireEvent('status.add', 'deleted', single = True)
 
         movie = db.query(Movie).filter_by(id = params.get('id')).first()
-        movie.status_id = status.id
+        movie.status_id = status.get('id')
         db.commit()
 
         return jsonified({
diff --git a/couchpotato/core/plugins/profile/main.py b/couchpotato/core/plugins/profile/main.py
index d088ac3..48fb67a 100644
--- a/couchpotato/core/plugins/profile/main.py
+++ b/couchpotato/core/plugins/profile/main.py
@@ -59,10 +59,12 @@ class ProfilePlugin(Plugin):
             order += 1
 
         db.commit()
+        
+        profile_dict = p.to_dict(deep = {'types': {}})
 
         return jsonified({
             'success': True,
-            'profile': p.to_dict(deep = {'types': {}})
+            'profile': profile_dict
         })
 
     def delete(self):
diff --git a/couchpotato/core/plugins/quality/main.py b/couchpotato/core/plugins/quality/main.py
index 2b0a5b4..e81369e 100644
--- a/couchpotato/core/plugins/quality/main.py
+++ b/couchpotato/core/plugins/quality/main.py
@@ -52,8 +52,9 @@ class QualityPlugin(Plugin):
         db = get_session()
 
         quality = db.query(Quality).filter_by(identifier = identifier).first()
+        quality_dict = dict(self.getQuality(quality.identifier), **quality.to_dict())
 
-        return dict(self.getQuality(quality.identifier), **quality.to_dict())
+        return quality_dict
 
     def getQuality(self, identifier):
 
diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py
index b617d79..30ee786 100644
--- a/couchpotato/core/plugins/renamer/main.py
+++ b/couchpotato/core/plugins/renamer/main.py
@@ -13,7 +13,7 @@ class Renamer(Plugin):
         addEvent('renamer.scan', self.scan)
         addEvent('app.load', self.scan)
 
-        fireEvent('schedule.interval', 'renamer.scan', self.scan, minutes = self.conf('run_every'))
+        #fireEvent('schedule.interval', 'renamer.scan', self.scan, minutes = self.conf('run_every'))
 
     def scan(self):
-        print 'scan'
+        pass
diff --git a/couchpotato/core/plugins/scanner/__init__.py b/couchpotato/core/plugins/scanner/__init__.py
new file mode 100644
index 0000000..3d64046
--- /dev/null
+++ b/couchpotato/core/plugins/scanner/__init__.py
@@ -0,0 +1,6 @@
+from .main import Scanner
+
+def start():
+    return Scanner()
+
+config = []
diff --git a/couchpotato/core/plugins/scanner/main.py b/couchpotato/core/plugins/scanner/main.py
new file mode 100644
index 0000000..2859ab1
--- /dev/null
+++ b/couchpotato/core/plugins/scanner/main.py
@@ -0,0 +1,477 @@
+from couchpotato import get_session
+from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import getExt
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.core.settings.model import File, Library, Release, Movie
+from couchpotato.environment import Env
+from flask.helpers import json
+from themoviedb.tmdb import opensubtitleHashFile
+import os
+import re
+import subprocess
+import traceback
+
+log = CPLog(__name__)
+
+
+class Scanner(Plugin):
+
+    minimal_filesize = {
+        'media': 314572800, # 300MB
+        'trailer': 1048576, # 1MB
+    }
+    ignored_in_path = ['_unpack', '_failed_', '_unknown_', '_exists_', '.appledouble', '.appledb', '.appledesktop', os.path.sep + '._', '.ds_store', 'cp.cpnfo'] #unpacking, smb-crap, hidden files
+    ignore_names = ['extract', 'extracting', 'extracted', 'movie', 'movies', 'film', 'films']
+    extensions = {
+        'movie': ['mkv', 'wmv', 'avi', 'mpg', 'mpeg', 'mp4', 'm2ts', 'iso', 'img'],
+        'dvd': ['vts_*', 'vob'],
+        'nfo': ['nfo', 'txt', 'tag'],
+        'subtitle': ['sub', 'srt', 'ssa', 'ass'],
+        'subtitle_extra': ['idx'],
+        'trailer': ['mov', 'mp4', 'flv']
+    }
+    file_types = {
+        'subtitle': ('subtitle', 'subtitle'),
+        'trailer': ('video', 'trailer'),
+        'nfo': ('nfo', 'nfo'),
+        'movie': ('video', 'movie'),
+        'backdrop': ('image', 'backdrop'),
+    }
+
+    codecs = {
+        'audio': ['dts', 'ac3', 'ac3d', 'mp3'],
+        'video': ['x264', 'divx', 'xvid']
+    }
+
+    source_media = {
+        'bluray': ['bluray', 'blu-ray', 'brrip', 'br-rip'],
+        'hddvd': ['hddvd', 'hd-dvd'],
+        'dvd': ['dvd'],
+        'hdtv': ['hdtv']
+    }
+
+    clean = '(?i)[^\s](ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|cd[1-9]|\[.*\])[^\s]*'
+    multipart_regex = [
+        '[ _\.-]+cd[ _\.-]*([0-9a-d]+)', #*cd1
+        '[ _\.-]+dvd[ _\.-]*([0-9a-d]+)', #*dvd1
+        '[ _\.-]+part[ _\.-]*([0-9a-d]+)', #*part1.mkv
+        '[ _\.-]+dis[ck][ _\.-]*([0-9a-d]+)', #*disk1.mkv
+        '()[ _\.-]+([0-9]*[abcd]+)(\.....?)$',
+        '([a-z])([0-9]+)(\.....?)$',
+        '()([ab])(\.....?)$' #*a.mkv
+    ]
+
+    def __init__(self):
+
+        addEvent('app.load', self.scan)
+
+    def scan(self, folder = '/Volumes/Media/Test/'):
+
+        """
+        Get all files
+
+        For each file larger then 350MB
+            create movie "group", this is where all movie files will be grouped
+            group multipart together
+            check if its DVD (VIDEO_TS)
+
+        # This should work for non-folder based structure
+        for each moviegroup
+
+            for each file smaller then 350MB, allfiles.filter(moviename*)
+
+                # Assuming the beginning of the filename is the same for this structure
+                Movie is masterfile, moviename-cd1.ext -> moviename
+                    Find other files connected to moviename, moviename*.nfo, moviename*.sub, moviename*trailer.ext
+
+                Remove found file from allfiles
+
+            # This should work for folder based structure
+            for each leftover file
+                Loop over leftover files, use dirname as moviename
+
+
+        For each found movie
+
+            determine filetype
+
+            Check if it's already in the db
+
+            Add it to database
+        """
+
+        # Get movie "master" files
+        movie_files = {}
+        leftovers = []
+        for root, dirs, files in os.walk(folder):
+            for filename in files:
+
+                file_path = os.path.join(root, filename)
+
+                # Remove ignored files
+                if not self.keepFile(file_path):
+                    continue
+
+                is_dvd_file = self.isDVDFile(file_path)
+                if os.path.getsize(file_path) > self.minimal_filesize['media'] or is_dvd_file: # Minimal 300MB files or is DVD file
+
+                    identifier = self.createFileIdentifier(file_path, folder, exclude_filename = is_dvd_file)
+
+                    if not movie_files.get(identifier):
+                        movie_files[identifier] = {
+                            'unsorted_files': [],
+                            'identifiers': [],
+                            'is_dvd': is_dvd_file,
+                        }
+
+                    movie_files[identifier]['unsorted_files'].append(file_path)
+                else:
+                    leftovers.append(file_path)
+
+        # Sort reverse, this prevents "Iron man 2" from getting grouped with "Iron man" as the "Iron Man 2"
+        # files will be grouped first.
+        leftovers = set(sorted(leftovers, reverse = True))
+
+        id_handles = [
+            None, # Attach files to group by identifier
+            lambda x: os.path.split(x)[-1], # Attach files via filename of master_file name only
+            os.path.dirname, # Attach files via master_file dirname
+        ]
+
+        # Create identifier based on handle
+        for handler in id_handles:
+            for identifier, group in movie_files.iteritems():
+                identifier = handler(identifier) if handler else identifier
+                if identifier not in group['identifiers'] and len(identifier) > 0: group['identifiers'].append(identifier)
+
+                # Group the files based on the identifier
+                found_files = self.getGroupFiles(identifier, folder, leftovers)
+                group['unsorted_files'].extend(found_files)
+
+                # Remove the found files from the leftover stack
+                leftovers = leftovers - found_files
+
+        # Open up the db
+        db = get_session()
+
+        # Mark all files as "offline" before a adding them to the database (again)
+        files_in_path = db.query(File).filter(File.path.like(toUnicode(folder) + u'%%'))
+        files_in_path.update({'available': 0}, synchronize_session = False)
+        db.commit()
+
+        # Determine file types
+        update_after = []
+        for identifier, group in movie_files.iteritems():
+
+            # Group extra (and easy) files first
+            images = self.getImages(group['unsorted_files'])
+            group['files'] = {
+                'subtitle': self.getSubtitles(group['unsorted_files']),
+                'nfo': self.getNfo(group['unsorted_files']),
+                'trailer': self.getTrailers(group['unsorted_files']),
+                'backdrop': images['backdrop'],
+                'leftover': set(group['unsorted_files']),
+            }
+
+            # Media files
+            if group['is_dvd']:
+                group['files']['movie'] = self.getDVDFiles(group['unsorted_files'])
+            else:
+                group['files']['movie'] = self.getMediaFiles(group['unsorted_files'])
+                group['meta_data'] = self.getMetaData(group['files']['movie'])
+
+            # Leftover "sorted" files
+            for type in group['files']:
+                group['files']['leftover'] -= set(group['files'][type])
+
+            # Delete the unsorted list
+            del group['unsorted_files']
+
+            # Determine movie
+            group['library'] = self.determineMovie(group)
+
+            # Save to DB
+            if group['library']:
+                #library = db.query(Library).filter_by(id = library.get('id')).one()
+
+                # Add release
+                release = self.addRelease(group)
+                return
+
+                # Add identifier for library update
+                update_after.append(group['library'].get('identifier'))
+
+        for identifier in update_after:
+            fireEvent('library.update', identifier = identifier)
+
+        # If cleanup option is enabled, remove offline files from database
+        if self.conf('cleanup_offline'):
+            files_in_path = db.query(File).filter(File.path.like(folder + '%%')).filter_by(available = 0)
+            [db.delete(x) for x in files_in_path]
+            db.commit()
+
+        db.remove()
+
+
+    def addRelease(self, group):
+        db = get_session()
+
+        identifier = '%s.%s.%s' % (group['library']['identifier'], group['meta_data']['audio'], group['meta_data']['quality'])
+
+        # Add movie
+        done_status = fireEvent('status.get', 'done', single = True)
+        movie = db.query(Movie).filter_by(library_id = group['library'].get('id')).first()
+        if not movie:
+            movie = Movie(
+                library_id = group['library'].get('id'),
+                profile_id = 0,
+                status_id = done_status.get('id')
+            )
+            db.add(movie)
+            db.commit()
+
+        # Add release
+        quality = fireEvent('quality.single', group['meta_data']['quality'], single = True)
+        release = db.query(Release).filter_by(identifier = identifier).first()
+        if not release:
+            release = Release(
+                identifier = identifier,
+                movie = movie,
+                quality_id = quality.get('id'),
+                status_id = done_status.get('id')
+            )
+            db.add(release)
+            db.commit()
+
+        # Add each file type
+        for type in group['files']:
+
+            for file in group['files'][type]:
+                added_file = self.saveFile(file, type = type, include_media_info = type is 'movie')
+                try:
+                    added_file = db.query(File).filter_by(id = added_file.get('id')).one()
+                    release.files.append(added_file)
+                    db.commit()
+                except Exception, e:
+                    log.debug('Failed to attach "%s" to release: %s' % (file, e))
+
+        db.remove()
+
+    def getMetaData(self, files):
+
+        return {
+            'audio': 'AC3',
+            'quality': '720p',
+            'quality_type': 'HD',
+            'resolution_width': 1280,
+            'resolution_height': 720
+        }
+
+        for file in files:
+            self.getMeta(file)
+
+    def getMeta(self, filename):
+        lib_dir = os.path.join(Env.get('app_dir'), 'libs')
+        script = os.path.join(lib_dir, 'getmeta.py')
+
+        p = subprocess.Popen(["python", script, filename], stdout = subprocess.PIPE, stderr = subprocess.PIPE, cwd = lib_dir)
+        z = p.communicate()[0]
+
+        try:
+            meta = json.loads(z)
+            log.info('Retrieved metainfo: %s' % meta)
+            return meta
+        except Exception, e:
+            print e
+            log.error('Couldn\'t get metadata from file')
+
+    def determineMovie(self, group):
+        imdb_id = None
+
+        files = group['files']
+        # Check and see if nfo contains the imdb-id
+        try:
+            for nfo_file in files['nfo']:
+                imdb_id = self.getImdb(nfo_file)
+                if imdb_id: break
+        except:
+            pass
+
+        # Check if path is already in db
+        db = get_session()
+        for file in files['movie']:
+            f = db.query(File).filter_by(path = toUnicode(file)).first()
+            try:
+                imdb_id = f.library[0].identifier
+                break
+            except:
+                pass
+        db.remove()
+
+        # Search based on identifiers
+        if not imdb_id:
+            for identifier in group['identifiers']:
+                if len(identifier) > 2:
+                    movie = fireEvent('provider.movie.search', q = identifier, merge = True, limit = 1)
+                    if len(movie) > 0:
+                        imdb_id = movie[0]['imdb']
+                        if imdb_id: break
+                else:
+                    log.debug('Identifier to short to use for search: %s' % identifier)
+
+        if imdb_id:
+            #movie = fireEvent('provider.movie.info', identifier = imdb_id, merge = True)
+            #if movie and movie.get('imdb'):
+            return fireEvent('library.add', attrs = {
+                'identifier': imdb_id
+            }, update_after = False, single = True)
+
+        log.error('No imdb_id found for %s.' % group['identifiers'])
+        return False
+
+    def saveFile(self, file, type = 'unknown', include_media_info = False):
+
+        properties = {}
+
+        # Get media info for files
+        if include_media_info:
+            properties = {}
+
+        # Check database and update/insert if necessary
+        return fireEvent('file.add', path = file, part = self.getPartNumber(file), type = self.file_types[type], properties = properties, single = True)
+
+    def getImdb(self, txt):
+
+        if os.path.isfile(txt):
+            output = open(txt, 'r')
+            txt = output.read()
+            output.close()
+
+        try:
+            m = re.search('(?P<id>tt[0-9{7}]+)', txt)
+            id = m.group('id')
+            if id:  return id
+        except AttributeError:
+            pass
+
+        return False
+
+    def getMediaFiles(self, files):
+
+        def test(s):
+            return self.filesizeBetween(s, 300, 100000) and getExt(s.lower()) in self.extensions['movie']
+
+        return set(filter(test, files))
+
+    def getDVDFiles(self, files):
+
+        def test(s):
+            return self.isDVDFile(s)
+
+        return set(filter(test, files))
+
+    def getSubtitles(self, files):
+        return set(filter(lambda s: getExt(s.lower()) in self.extensions['subtitle'], files))
+
+    def getNfo(self, files):
+        return set(filter(lambda s: getExt(s.lower()) in self.extensions['nfo'], files))
+
+    def getTrailers(self, files):
+
+        def test(s):
+            return re.search('(^|[\W_])trailer\d*[\W_]', s.lower()) and self.filesizeBetween(s, 2, 250)
+
+        return set(filter(test, files))
+
+    def getImages(self, files):
+
+        def test(s):
+            return getExt(s.lower()) in ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'tbn']
+        files = set(filter(test, files))
+
+        images = {}
+
+        # Fanart
+        images['backdrop'] = set(filter(lambda s: re.search('(^|[\W_])fanart|backdrop\d*[\W_]', s.lower()) and self.filesizeBetween(s, 0, 5), files))
+
+        # Rest
+        images['rest'] = files - images['backdrop']
+
+        return images
+
+
+    def isDVDFile(self, file):
+
+        if list(set(file.lower().split(os.path.sep)) & set(['video_ts', 'audio_ts'])):
+            return True
+
+        for needle in ['vts_', 'video_ts', 'audio_ts']:
+            if needle in file.lower():
+                return True
+
+        return False
+
+    def keepFile(self, file):
+
+        # ignoredpaths
+        for i in self.ignored_in_path:
+            if i in file.lower():
+                log.debug('Ignored "%s" contains "%s".' % (file, i))
+                return False
+
+        # Sample file
+        if re.search('(^|[\W_])sample\d*[\W_]', file.lower()):
+            log.debug('Is sample file "%s".' % file)
+            return False
+
+        # Minimal size
+        if self.filesizeBetween(file, self.minimal_filesize['media']):
+            log.debug('File to small: %s' % file)
+            return False
+
+        # All is OK
+        return True
+
+
+    def filesizeBetween(self, file, min = 0, max = 100000):
+        try:
+            return (min * 1048576) < os.path.getsize(file) < (max * 1048576)
+        except:
+            log.error('Couldn\'t get filesize of %s.' % file)
+
+        return False
+
+    def getGroupFiles(self, identifier, folder, file_pile):
+        return set(filter(lambda s:identifier in self.createFileIdentifier(s, folder), file_pile))
+
+    def createFileIdentifier(self, file_path, folder, exclude_filename = False):
+        identifier = file_path.replace(folder, '') # root folder
+        identifier = os.path.splitext(identifier)[0] # ext
+        if exclude_filename:
+            identifier = identifier[:len(identifier) - len(os.path.split(identifier)[-1])]
+        identifier = self.removeMultipart(identifier) # multipart
+
+        return identifier
+
+    def removeMultipart(self, name):
+        for regex in self.multipart_regex:
+            try:
+                found = re.sub(regex, '', name)
+                if found != name:
+                    return found
+            except:
+                pass
+        return name
+
+    def getPartNumber(self, name):
+        for regex in self.multipart_regex:
+            try:
+                found = re.search(regex, name)
+                if found:
+                    return found.group(1)
+                return 1
+            except:
+                pass
+        return name
diff --git a/couchpotato/core/plugins/searcher/main.py b/couchpotato/core/plugins/searcher/main.py
index 24ab70a..fa77161 100644
--- a/couchpotato/core/plugins/searcher/main.py
+++ b/couchpotato/core/plugins/searcher/main.py
@@ -19,6 +19,7 @@ class Searcher(Plugin):
 
         # Schedule cronjob
         fireEvent('schedule.cron', 'searcher.all', self.all, day = self.conf('cron_day'), hour = self.conf('cron_hour'), minute = self.conf('cron_minute'))
+        addEvent('app.load', self.all)
 
     def all(self):
 
@@ -28,22 +29,49 @@ class Searcher(Plugin):
             Movie.status.has(identifier = 'active')
         ).all()
 
+        snatched_status = fireEvent('status.get', 'snatched', single = True)
+
         for movie in movies:
-            self.single(movie.to_dict(deep = {
+            success = self.single(movie.to_dict(deep = {
                 'profile': {'types': {'quality': {}}},
                 'releases': {'status': {}, 'quality': {}},
                 'library': {'titles': {}, 'files':{}},
                 'files': {}
             }))
 
+            # Mark as snatched on success
+            if success:
+                movie.status_id = snatched_status.get('id')
+                db.commit()
+
 
     def single(self, movie):
 
+        successful = False
         for type in movie['profile']['types']:
-            results = fireEvent('provider.yarr.search', movie, type['quality'], merge = True)
-            sorted_results = sorted(results, key = lambda k: k['score'], reverse = True)
-            for nzb in sorted_results:
-                print nzb['name']
+
+            has_better_quality = False
+
+            # See if beter quality is available
+            for release in movie['releases']:
+                if release['quality']['order'] <= type['quality']['order']:
+                    has_better_quality = True
+
+            # Don't search for quality lower then already available.
+            if not has_better_quality:
+
+                log.info('Search for %s in %s' % (movie['library']['titles'][0]['title'], type['quality']['label']))
+                results = fireEvent('provider.yarr.search', movie, type['quality'], merge = True)
+                sorted_results = sorted(results, key = lambda k: k['score'], reverse = True)
+
+                for nzb in sorted_results:
+                    successful = fireEvent('download', data = nzb, single = True)
+
+                    if successful:
+                        log.info('Downloading of %s successful.' % nzb.get('name'))
+                        return True
+
+        return False
 
 
     def correctMovie(self, nzb = {}, movie = {}, quality = {}, **kwargs):
@@ -53,7 +81,7 @@ class Searcher(Plugin):
         retention = Env.setting('retention', section = 'nzb')
 
         if retention < nzb.get('age', 0):
-            log.info('Wrong: Outside retention, age = %s, needs = %s: %s' % (nzb['age'], retention, nzb['name']))
+            log.info('Wrong: Outside retention, age is %s, needs %s or lower: %s' % (nzb['age'], retention, nzb['name']))
             return False
 
         nzb_words = re.split('\W+', simplifyString(nzb['name']))
@@ -66,7 +94,7 @@ class Searcher(Plugin):
         ignored_words = self.conf('ignored_words').split(',')
         blacklisted = list(set(nzb_words) & set(ignored_words))
         if self.conf('ignored_words') and blacklisted:
-            log.info("NZB '%s' contains the following blacklisted words: %s" % (nzb['name'], ", ".join(blacklisted)))
+            log.info("Wrong: '%s' blacklisted words: %s" % (nzb['name'], ", ".join(blacklisted)))
             return False
 
         #qualities = fireEvent('quality.all', single = True)
@@ -154,3 +182,10 @@ class Searcher(Plugin):
                 return True
 
         return False
+
+    def correctName(self, check_name, movie_name):
+
+        check_words = re.split('\W+', simplifyString(check_name))
+        movie_words = re.split('\W+', simplifyString(movie_name))
+
+        return len(list(set(check_words) & set(movie_words))) == len(movie_words)
diff --git a/couchpotato/core/plugins/status/main.py b/couchpotato/core/plugins/status/main.py
index c221a1b..ac9a596 100644
--- a/couchpotato/core/plugins/status/main.py
+++ b/couchpotato/core/plugins/status/main.py
@@ -11,15 +11,18 @@ log = CPLog(__name__)
 class StatusPlugin(Plugin):
 
     statuses = {
+        'needs_update': 'Needs update',
         'active': 'Active',
         'done': 'Done',
         'downloaded': 'Downloaded',
         'wanted': 'Wanted',
+        'snatched': 'Snatched',
         'deleted': 'Deleted',
     }
 
     def __init__(self):
         addEvent('status.add', self.add)
+        addEvent('status.get', self.add) # Alias for .add
         addEvent('status.all', self.all)
         addEvent('app.load', self.fill)
 
@@ -52,8 +55,9 @@ class StatusPlugin(Plugin):
             db.add(s)
             db.commit()
 
-        #db.remove()
-        return s
+        status_dict = s.to_dict()
+
+        return status_dict
 
     def fill(self):
 
@@ -71,3 +75,4 @@ class StatusPlugin(Plugin):
 
             s.label = label
             db.commit()
+
diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py
index b317d00..8a1fe32 100644
--- a/couchpotato/core/providers/base.py
+++ b/couchpotato/core/providers/base.py
@@ -53,6 +53,7 @@ class Provider(Plugin):
         self.wait()
 
         try:
+            log.info('Opening url: %s' % url)
             if username and password:
                 passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
                 passman.add_password(None, url, username, password)
@@ -120,7 +121,7 @@ class YarrProvider(Provider):
         return False
 
     def found(self, new):
-        log.info('Found, score(%(score)s): %(name)s' % new)
+        log.info('Found: score(%(score)s): %(name)s' % new)
 
 
 class NZBProvider(YarrProvider):
diff --git a/couchpotato/core/providers/movie/themoviedb/main.py b/couchpotato/core/providers/movie/themoviedb/main.py
index bd9e0ad..a883797 100644
--- a/couchpotato/core/providers/movie/themoviedb/main.py
+++ b/couchpotato/core/providers/movie/themoviedb/main.py
@@ -27,36 +27,53 @@ class TheMovieDb(MovieProvider):
         if self.isDisabled():
             return False
 
-        log.debug('TheMovieDB - Searching for movie: %s' % q)
-        raw = tmdb.search(simplifyString(q))
+        search_string = simplifyString(q)
+        cache_key = 'tmdb.cache.%s.%s' % (search_string, limit)
+        results = self.getCache(cache_key)
 
-        results = []
-        if raw:
-            try:
-                nr = 0
-                for movie in raw:
+        if not results:
+            log.debug('TheMovieDB - Searching for movie: %s' % q)
+            raw = tmdb.search(search_string)
+
+            results = []
+            if raw:
+                try:
+                    nr = 0
+                    for movie in raw:
 
-                    results.append(self.parseMovie(movie))
+                        results.append(self.parseMovie(movie))
 
-                    nr += 1
-                    if nr == limit:
-                        break
+                        nr += 1
+                        if nr == limit:
+                            break
 
-                log.info('TheMovieDB - Found: %s' % [result['titles'][0] + ' (' + str(result['year']) + ')' for result in results])
-                return results
-            except SyntaxError, e:
-                log.error('Failed to parse XML response: %s' % e)
-                return False
+                    log.info('TheMovieDB - Found: %s' % [result['titles'][0] + ' (' + str(result['year']) + ')' for result in results])
+                    self.setCache(cache_key, results)
+                    return results
+                except SyntaxError, e:
+                    log.error('Failed to parse XML response: %s' % e)
+                    return False
 
         return results
 
     def getInfo(self, identifier = None):
-        result = {}
 
-        movie = tmdb.imdbLookup(id = identifier)[0]
+        cache_key = 'tmdb.cache.%s' % identifier
+        result = self.getCache(cache_key)
 
-        if movie:
-            result = self.parseMovie(movie)
+        if not result:
+            result = {}
+            movie = None
+
+            try:
+                log.debug('Getting info: %s' % cache_key)
+                movie = tmdb.imdbLookup(id = identifier)
+            except:
+                pass
+
+            if movie:
+                result = self.parseMovie(movie[0])
+                self.setCache(cache_key, result)
 
         return result
 
diff --git a/couchpotato/core/providers/nzb/newzbin/main.py b/couchpotato/core/providers/nzb/newzbin/main.py
index ad2150c..3d7750b 100644
--- a/couchpotato/core/providers/nzb/newzbin/main.py
+++ b/couchpotato/core/providers/nzb/newzbin/main.py
@@ -1,18 +1,25 @@
-from couchpotato.core.event import addEvent
+
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.logger import CPLog
 from couchpotato.core.providers.base import NZBProvider
+from couchpotato.environment import Env
 from dateutil.parser import parse
 from urllib import urlencode
 from urllib2 import URLError
+import httplib
 import time
+import traceback
+import urllib
+import xml.etree.ElementTree as XMLTree
 
 log = CPLog(__name__)
 
 
-class Newzbin(NZBProvider):
+class Newzbin(NZBProvider, RSS):
     searchUrl = 'https://www.newzbin.com/search/'
 
-    formatIds = {
+    format_ids = {
         2: ['scr'],
         1: ['cam'],
         4: ['tc'],
@@ -37,40 +44,32 @@ class Newzbin(NZBProvider):
         if self.isDisabled() or not self.isAvailable(self.searchUrl):
             return results
 
-        formatId = self.getFormatId(type)
-        catId = self.getCatId(type)
+        format_id = self.getFormatId(type)
+        cat_id = self.getCatId(type)
 
         arguments = urlencode({
             'searchaction': 'Search',
             'u_url_posts_only': '0',
             'u_show_passworded': '0',
-            'q_url': 'imdb.com/title/' + movie.imdb,
+            'q_url': 'imdb.com/title/' + movie['library']['identifier'],
             'sort': 'ps_totalsize',
             'order': 'asc',
             'u_post_results_amt': '100',
             'feed': 'rss',
             'category': '6',
-            'ps_rb_video_format': str(catId),
-            'ps_rb_source': str(formatId),
+            'ps_rb_video_format': str(cat_id),
+            'ps_rb_source': str(format_id),
         })
 
         url = "%s?%s" % (self.searchUrl, arguments)
-        cacheId = str('%s %s %s' % (movie.imdb, str(formatId), str(catId)))
-        singleCat = True
+        cache_key = str('newzbin.%s.%s.%s' % (movie['library']['identifier'], str(format_id), str(cat_id)))
+        single_cat = True
 
         try:
-            cached = False
-            if(self.cache.get(cacheId)):
-                data = True
-                cached = True
-                log.info('Getting RSS from cache: %s.' % cacheId)
-            else:
-                log.info('Searching: %s' % url)
+            data = self.getCache(cache_key)
+            if not data:
                 data = self.urlopen(url, username = self.conf('username'), password = self.conf('password'))
-                self.cache[cacheId] = {
-                    'time': time.time()
-                }
-
+                self.setCache(cache_key, data)
         except (IOError, URLError):
             log.error('Failed to open %s.' % url)
             return results
@@ -78,46 +77,47 @@ class Newzbin(NZBProvider):
         if data:
             try:
                 try:
-                    if cached:
-                        xml = self.cache[cacheId]['xml']
-                    else:
-                        xml = self.getItems(data)
-                        self.cache[cacheId]['xml'] = xml
-                except:
-                    log.debug('No valid xml or to many requests.. You never know with %s.' % self.name)
+                    data = XMLTree.fromstring(data)
+                    nzbs = self.getElements(data, 'channel/item')
+                except Exception, e:
+                    log.debug('%s, %s' % (self.getName(), e))
                     return results
 
-                for item in xml:
+                for nzb in nzbs:
 
-                    title = self.gettextelement(item, "title")
+                    title = self.getTextElement(nzb, "title")
                     if 'error' in title.lower(): continue
 
                     REPORT_NS = 'http://www.newzbin.com/DTD/2007/feeds/report/';
 
                     # Add attributes to name
-                    for attr in item.find('{%s}attributes' % REPORT_NS):
+                    for attr in nzb.find('{%s}attributes' % REPORT_NS):
                         title += ' ' + attr.text
 
-                    id = int(self.gettextelement(item, '{%s}id' % REPORT_NS))
-                    size = str(int(self.gettextelement(item, '{%s}size' % REPORT_NS)) / 1024 / 1024) + ' mb'
-                    date = str(self.gettextelement(item, '{%s}postdate' % REPORT_NS))
-
-                    new = self.feedItem()
-                    new.id = id
-                    new.type = 'nzb'
-                    new.name = title
-                    new.date = int(time.mktime(parse(date).timetuple()))
-                    new.size = self.parseSize(size)
-                    new.url = str(self.gettextelement(item, '{%s}nzb' % REPORT_NS))
-                    new.detailUrl = str(self.gettextelement(item, 'link'))
-                    new.content = self.gettextelement(item, "description")
-                    new.score = self.calcScore(new, movie)
-                    new.addbyid = True
-                    new.checkNZB = False
-
-                    if new.date > time.time() - (int(self.config.get('NZB', 'retention')) * 24 * 60 * 60) and self.isCorrectMovie(new, movie, type, imdbResults = True, singleCategory = singleCat):
+                    id = int(self.getTextElement(nzb, '{%s}id' % REPORT_NS))
+                    size = str(int(self.getTextElement(nzb, '{%s}size' % REPORT_NS)) / 1024 / 1024) + ' mb'
+                    date = str(self.getTextElement(nzb, '{%s}postdate' % REPORT_NS))
+
+                    new = {
+                        'id': id,
+                        'type': 'nzb',
+                        'name': title,
+                        'age': self.calculateAge(int(time.mktime(parse(date).timetuple()))),
+                        'size': self.parseSize(size),
+                        'url': str(self.getTextElement(nzb, '{%s}nzb' % REPORT_NS)),
+                        'download': lambda: self.download(id),
+                        'detail_url': str(self.getTextElement(nzb, 'link')),
+                        'description': self.getTextElement(nzb, "description"),
+                        'check_nzb': False,
+                    }
+                    new['score'] = fireEvent('score.calculate', new, movie, single = True)
+
+                    is_correct_movie = fireEvent('searcher.correct_movie',
+                                                 nzb = new, movie = movie, quality = quality,
+                                                 imdb_results = True, single_category = single_cat, single = True)
+                    if is_correct_movie:
                         results.append(new)
-                        log.info('Found: %s' % new.name)
+                        self.found(new)
 
                 return results
             except SyntaxError:
@@ -125,13 +125,47 @@ class Newzbin(NZBProvider):
 
         return results
 
+    def download(self, nzb_id):
+
+        try:
+            conn = httplib.HTTPSConnection('www.newzbin.com')
+
+            postdata = { 'username': self.conf('username'), 'password': self.conf('password'), 'reportid': nzb_id }
+            postdata = urllib.urlencode(postdata)
+
+            headers = {
+                'User-agent': 'CouchPotato+/%s' % Env.get('version'),
+                'Content-type': 'application/x-www-form-urlencoded',
+            }
+
+            fetchurl = '/api/dnzb/'
+            conn.request('POST', fetchurl, postdata, headers)
+            response = conn.getresponse()
+
+            # Save debug info if we have to
+            data = response.read()
+
+        except:
+            log.error('Problem with Newzbin server: %s' % traceback.format_exc())
+            return False
+
+        # Is a valid response
+        return_code = response.getheader('X-DNZB-RCode')
+        return_text = response.getheader('X-DNZB-RText')
+
+        if return_code is not '200':
+            log.error('Error getting nzb from Newzbin: %s, %s' % (return_code, return_text))
+            return False
+
+        return data
+
     def getFormatId(self, format):
-        for id, quality in self.formatIds.iteritems():
+        for id, quality in self.format_ids.iteritems():
             for q in quality:
                 if q == format:
                     return id
 
-        return self.catBackupId
+        return self.cat_backup_id
 
     def isEnabled(self):
         return NZBProvider.isEnabled(self) and self.conf('enabled') and self.conf('username') and self.conf('password')
diff --git a/couchpotato/core/providers/nzb/nzbs/main.py b/couchpotato/core/providers/nzb/nzbs/main.py
index 74767c2..09227eb 100644
--- a/couchpotato/core/providers/nzb/nzbs/main.py
+++ b/couchpotato/core/providers/nzb/nzbs/main.py
@@ -1,15 +1,18 @@
-from couchpotato.core.event import addEvent
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import simplifyString
+from couchpotato.core.helpers.rss import RSS
 from couchpotato.core.logger import CPLog
 from couchpotato.core.providers.base import NZBProvider
 from dateutil.parser import parse
 from urllib import urlencode
 from urllib2 import URLError
 import time
+import xml.etree.ElementTree as XMLTree
 
 log = CPLog(__name__)
 
 
-class Nzbs(NZBProvider):
+class Nzbs(NZBProvider, RSS):
 
     urls = {
         'download': 'http://nzbs.org/index.php?action=getnzb&nzbid=%s%s',
@@ -34,88 +37,71 @@ class Nzbs(NZBProvider):
     def search(self, movie, quality):
 
         results = []
-        if self.isDisabled() or not self.isAvailable(self.apiUrl + '?test' + self.getApiExt()):
+        if self.isDisabled() or not self.isAvailable(self.urls['api'] + '?test' + self.getApiExt()):
             return results
 
-        catId = self.getCatId(type)
+        cat_id = self.getCatId(quality.get('identifier'))
         arguments = urlencode({
             'action':'search',
-            'q': self.toSearchString(movie.name),
-            'catid': catId,
+            'q': simplifyString(movie['library']['titles'][0]['title']),
+            'catid': cat_id[0],
             'i': self.conf('id'),
-            'h': self.conf('key'),
-            'age': self.config.get('NZB', 'retention')
+            'h': self.conf('api_key'),
         })
-        url = "%s?%s" % (self.apiUrl, arguments)
-        cacheId = str(movie.imdb) + '-' + str(catId)
-        singleCat = (len(self.catIds.get(catId)) == 1 and catId != self.catBackupId)
+        url = "%s?%s" % (self.urls['api'], arguments)
+
+        cache_key = '%s-%s' % (movie['library'].get('identifier'), str(cat_id))
 
         try:
-            cached = False
-            if(self.cache.get(cacheId)):
-                data = True
-                cached = True
-                log.info('Getting RSS from cache: %s.' % cacheId)
-            else:
-                log.info('Searching: %s' % url)
+            data = self.getCache(cache_key)
+            if not data:
                 data = self.urlopen(url)
-                self.cache[cacheId] = {
-                    'time': time.time()
-                }
+                self.setCache(cache_key, data)
         except (IOError, URLError):
             log.error('Failed to open %s.' % url)
             return results
 
         if data:
-            log.debug('Parsing NZBs.org RSS.')
             try:
                 try:
-                    if cached:
-                        xml = self.cache[cacheId]['xml']
-                    else:
-                        xml = self.getItems(data)
-                        self.cache[cacheId]['xml'] = xml
-                except:
-                    retry = False
-                    if retry == False:
-                        log.error('No valid xml, to many requests? Try again in 15sec.')
-                        time.sleep(15)
-                        return self.find(movie, quality, type, retry = True)
-                    else:
-                        log.error('Failed again.. disable %s for 15min.' % self.name)
-                        self.available = False
-                        return results
-
-                for nzb in xml:
-
-                    id = int(self.gettextelement(nzb, "link").partition('nzbid=')[2])
-
-                    size = self.gettextelement(nzb, "description").split('</a><br />')[1].split('">')[1]
-
-                    new = self.feedItem()
-                    new.id = id
-                    new.type = 'nzb'
-                    new.name = self.gettextelement(nzb, "title")
-                    new.date = int(time.mktime(parse(self.gettextelement(nzb, "pubDate")).timetuple()))
-                    new.size = self.parseSize(size)
-                    new.url = self.downloadLink(id)
-                    new.detailUrl = self.detailLink(id)
-                    new.content = self.gettextelement(nzb, "description")
-                    new.score = self.calcScore(new, movie)
-
-                    if self.isCorrectMovie(new, movie, type, singleCategory = singleCat):
+                    data = XMLTree.fromstring(data)
+                    nzbs = self.getElements(data, 'channel/item')
+                except Exception, e:
+                    log.debug('%s, %s' % (self.getName(), e))
+                    return results
+
+                for nzb in nzbs:
+
+                    new = {
+                        'id': int(self.getTextElement(nzb, "link").partition('nzbid=')[2]),
+                        'type': 'nzb',
+                        'name': self.getTextElement(nzb, "title"),
+                        'age': self.calculateAge(int(time.mktime(parse(self.getTextElement(nzb, "pubDate")).timetuple()))),
+                        'size': self.parseSize(self.getTextElement(nzb, "description").split('</a><br />')[1].split('">')[1]),
+                        'url': self.urls['download'] % (id, self.getApiExt()),
+                        'detail_url': self.urls['detail'] % id,
+                        'description': self.getTextElement(nzb, "description"),
+                        'check_nzb': True,
+                    }
+                    new['score'] = fireEvent('score.calculate', new, movie, single = True)
+
+                    is_correct_movie = fireEvent('searcher.correct_movie',
+                                                 nzb = new, movie = movie, quality = quality,
+                                                 imdb_results = False, single_category = False, single = True)
+
+                    if is_correct_movie:
                         results.append(new)
-                        log.info('Found: %s' % new.name)
+                        self.found(new)
 
                 return results
             except SyntaxError:
-                log.error('Failed to parse XML response from NZBs.org')
-                return False
+                log.error('Failed to parse XML response from NZBMatrix.com')
 
         return results
 
+
     def isEnabled(self):
-        return NZBProvider.isEnabled(self) and self.conf('enabled') and self.conf('id') and self.conf('key')
+        return NZBProvider.isEnabled(self) and self.conf('enabled') and self.conf('id') and self.conf('api_key')
 
     def getApiExt(self):
-        return '&i=%s&h=%s' % (self.conf('id'), self.conf('key'))
+        return '&i=%s&h=%s' % (self.conf('id'), self.conf('api_key'))
diff --git a/couchpotato/core/settings/model.py b/couchpotato/core/settings/model.py
index 6394b97..b3a542e 100644
--- a/couchpotato/core/settings/model.py
+++ b/couchpotato/core/settings/model.py
@@ -43,7 +43,7 @@ class Library(Entity):
 
     status = ManyToOne('Status')
     movie = OneToMany('Movie')
-    titles = OneToMany('LibraryTitle')
+    titles = OneToMany('LibraryTitle', order_by = '-default')
     files = ManyToMany('File')
 
 
@@ -70,11 +70,23 @@ class Release(Entity):
     """Logically groups all files that belong to a certain release, such as
     parts of a movie, subtitles."""
 
+    identifier = Field(String(100))
+
     movie = ManyToOne('Movie')
     status = ManyToOne('Status')
     quality = ManyToOne('Quality')
     files = ManyToMany('File')
     history = OneToMany('History')
+    info = OneToMany('ReleaseInfo')
+
+
+class ReleaseInfo(Entity):
+    """Properties that can be bound to a file for off-line usage"""
+
+    identifier = Field(String(50))
+    value = Field(Unicode(255), nullable = False)
+
+    release = ManyToOne('Release')
 
 
 class Status(Entity):
@@ -132,6 +144,7 @@ class File(Entity):
 
     path = Field(Unicode(255), nullable = False, unique = True)
     part = Field(Integer, default = 1)
+    available = Field(Boolean)
 
     type = ManyToOne('FileType')
     properties = OneToMany('FileProperty')
@@ -178,8 +191,15 @@ class RenameHistory(Entity):
     file = ManyToOne('File')
 
 
+class Folder(Entity):
+    """Renamer destination folders."""
+
+    path = Field(Unicode(255))
+    label = Field(Unicode(255))
+
+
 def setup():
-    """ Setup the database and create the tables that don't exists yet """
+    """Setup the database and create the tables that don't exists yet"""
     from elixir import setup_all, create_all
     from couchpotato import get_engine
 
diff --git a/couchpotato/environment.py b/couchpotato/environment.py
index 6fe033b..067ec4b 100644
--- a/couchpotato/environment.py
+++ b/couchpotato/environment.py
@@ -12,6 +12,7 @@ class Env:
     _args = None
     _quiet = False
     _deamonize = False
+    _version = 0.5
 
     ''' Data paths and directories '''
     _app_dir = ""
diff --git a/couchpotato/templates/_desktop.html b/couchpotato/templates/_desktop.html
index 10557de..d04fc67 100644
--- a/couchpotato/templates/_desktop.html
+++ b/couchpotato/templates/_desktop.html
@@ -56,7 +56,7 @@
 				App.setup({
 					'base_url': '{{ request.path }}'
 				});
-				
+
 				//Wizard.start.delay(100, Wizard);
 			})
 		</script>
diff --git a/libs/axl/axel.py b/libs/axl/axel.py
index 13454c0..f97e745 100644
--- a/libs/axl/axel.py
+++ b/libs/axl/axel.py
@@ -179,7 +179,7 @@ class Event(object):
                     if not self.asynchronous:
                         self.result.append(tuple(r))
 
-                except Exception, e:
+                except Exception:
                     if not self.asynchronous:
                         self.result.append((False, self._error(sys.exc_info()),
                                             handler))
diff --git a/libs/getmeta.py b/libs/getmeta.py
index 4913a11..4a067e7 100644
--- a/libs/getmeta.py
+++ b/libs/getmeta.py
@@ -1,11 +1,10 @@
-from hachoir_parser import createParser
-from hachoir_metadata import extractMetadata
+from flask.helpers import json
 from hachoir_core.cmd_line import unicodeFilename
-
+from hachoir_metadata import extractMetadata
+from hachoir_parser import createParser
 import datetime
-import json
-import sys
 import re
+import sys
 
 
 def getMetadata(filename):