diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 070f455e4..7069737ef 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -7,7 +7,6 @@
 
 #include <components/files/configurationmanager.hpp>
 
-#include <components/esxselector/model/datafilesmodel.hpp>
 #include <components/esxselector/model/pluginsproxymodel.hpp>
 #include <components/esxselector/model/esmfile.hpp>
 
@@ -20,6 +19,7 @@
 #include "settings/launchersettings.hpp"
 
 #include "utils/textinputdialog.hpp"
+#include "components/esxselector/view/contentselector.hpp"
 
 #include <QDebug>
 
@@ -27,8 +27,8 @@ DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, GameSettings &gam
     : mCfgMgr(cfg)
     , mGameSettings(gameSettings)
     , mLauncherSettings(launcherSettings)
-    , ContentSelector(parent)
 {
+    mContentSelector.setParent(parent);
     QMetaObject::connectSlotsByName(this);
 
     projectGroupBox->hide();
@@ -51,24 +51,21 @@ void DataFilesPage::createActions()
 
 void DataFilesPage::setupDataFiles()
 {
-    if (!mDataFilesModel)
-        qDebug() << "data files model undefined";
-
     // Set the encoding to the one found in openmw.cfg or the default
-    mDataFilesModel->setEncoding(mGameSettings.value(QString("encoding"), QString("win1252")));
+    mContentSelector.setEncoding(mGameSettings.value(QString("encoding"), QString("win1252")));
 
     QStringList paths = mGameSettings.getDataDirs();
 
     foreach (const QString &path, paths) {
-        mDataFilesModel->addFiles(path);
+        mContentSelector.addFiles(path);
     }
 
     QString dataLocal = mGameSettings.getDataLocal();
     if (!dataLocal.isEmpty())
-        mDataFilesModel->addFiles(dataLocal);
+        mContentSelector.addFiles(dataLocal);
 
     // Sort by date accessed for now
-    mDataFilesModel->sort(3);
+    //mContentSelector->sort(3);
 
     QStringList profiles = mLauncherSettings.subKeys(QString("Profiles/"));
     QString profile = mLauncherSettings.value(QString("Profiles/currentprofile"));
@@ -107,11 +104,11 @@ void DataFilesPage::loadSettings()
     if (profile.isEmpty())
         return;
 
-    mDataFilesModel->uncheckAll();
+  //  mContentSelector.uncheckAll();
 
     QStringList masters = mLauncherSettings.values(QString("Profiles/") + profile + QString("/master"), Qt::MatchExactly);
     QStringList plugins = mLauncherSettings.values(QString("Profiles/") + profile + QString("/plugin"), Qt::MatchExactly);
-
+/*
     foreach (const QString &master, masters) {
         QModelIndex index = mDataFilesModel->indexFromItem(mDataFilesModel->findItem(master));
         if (index.isValid())
@@ -123,12 +120,13 @@ void DataFilesPage::loadSettings()
         if (index.isValid())
             mDataFilesModel->setCheckState(index, Qt::Checked);
     }
+    */
 }
 
 void DataFilesPage::saveSettings()
 {
-    if (mDataFilesModel->rowCount() < 1)
-        return;
+//    if (mDataFilesModel->rowCount() < 1)
+//        return;
 
     QString profile = mLauncherSettings.value(QString("Profiles/currentprofile"));
 
@@ -143,8 +141,8 @@ void DataFilesPage::saveSettings()
     mGameSettings.remove(QString("master"));
     mGameSettings.remove(QString("plugin"));
 
-    EsxModel::EsmFileList items = mDataFilesModel->checkedItems();
-
+ //   EsxModel::EsmFileList items = mDataFilesModel->checkedItems();
+/*
     foreach(const EsxModel::EsmFile *item, items) {
 
         if (item->masters().size() == 0) {
@@ -156,7 +154,7 @@ void DataFilesPage::saveSettings()
             mGameSettings.setMultiValue(QString("plugin"), item->fileName());
         }
     }
-
+*/
 }
 
 void DataFilesPage::updateOkButton(const QString &text)
@@ -241,7 +239,7 @@ void DataFilesPage::setPluginsCheckstates(Qt::CheckState state)
         if (!sourceIndex.isValid())
             return;
 
-        mDataFilesModel->setCheckState(sourceIndex, state);
+        //mDataFilesModel->setCheckState(sourceIndex, state);
     }
 }
 
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index f3792b1f1..ed92da749 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -52,6 +52,7 @@ private slots:
 private:
 
     QMenu *mContextMenu;
+    ContentSelector mContentSelector;
 
     Files::ConfigurationManager &mCfgMgr;
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 0f7c5017b..b79fa027e 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -72,7 +72,7 @@ find_package(Qt4 COMPONENTS QtCore QtGui)
 
 if(QT_QTGUI_LIBRARY AND QT_QTCORE_LIBRARY)
    add_component_qt_dir (esxselector
-        model/masterproxymodel model/modelitem model/datafilesmodel
+        model/masterproxymodel model/modelitem
         model/pluginsproxymodel model/esmfile model/naturalsort
         model/contentmodel
         view/profilescombobox view/comboboxlineedit
diff --git a/components/esxselector/model/contentmodel.cpp b/components/esxselector/model/contentmodel.cpp
index 673665775..bfbb1bef7 100644
--- a/components/esxselector/model/contentmodel.cpp
+++ b/components/esxselector/model/contentmodel.cpp
@@ -21,26 +21,60 @@ int EsxModel::ContentModel::columnCount(const QModelIndex &parent) const
 
     return 1;
 }
-/*
-QModelIndex EsxModel::ContentModel::parent(const QModelIndex &child) const
+
+int EsxModel::ContentModel::rowCount(const QModelIndex &parent) const
 {
-    if(!child.isValid())
+    if(parent.isValid())
         return 0;
 
-    return child.parent();
+    return mFiles.size();
 }
 
-QModelIndex EsxModel::ContentModel::index(int row, int column, const QModelIndex &parent) const
+EsxModel::EsmFile* EsxModel::ContentModel::item(int row) const
 {
+    if (row >= 0 && row < mFiles.count())
+        return mFiles.at(row);
 
+    return 0;
 }
-*/
-int EsxModel::ContentModel::rowCount(const QModelIndex &parent) const
+
+EsxModel::EsmFile* EsxModel::ContentModel::findItem(const QString &name)
 {
-    if(parent.isValid())
-        return 0;
+    for (int i = 0; i < mFiles.size(); ++i)
+    {
+        if (name == item(i)->fileName())
+            return item(i);
+    }
 
-    return mFiles.size();
+    return 0;
+}
+
+QModelIndex EsxModel::ContentModel::indexFromItem(EsmFile *item) const
+{
+    if (item)
+        return index(mFiles.indexOf(item),0);
+
+    return QModelIndex();
+}
+
+Qt::ItemFlags EsxModel::ContentModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return Qt::NoItemFlags;
+
+    EsmFile *file = item(index.row());
+
+    if (!file)
+        return Qt::NoItemFlags;
+
+    Qt::ItemFlags dragDropFlags = Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+    Qt::ItemFlags checkFlags = Qt::ItemIsUserCheckable;
+    Qt::ItemFlags defaultFlags = Qt::ItemIsDropEnabled | Qt::ItemIsSelectable;
+
+    if (canBeChecked(file))
+        return Qt::ItemIsEnabled | dragDropFlags | checkFlags | defaultFlags;
+    else
+        return defaultFlags;
 }
 
 QVariant EsxModel::ContentModel::data(const QModelIndex &index, int role) const
@@ -70,18 +104,14 @@ QVariant EsxModel::ContentModel::data(const QModelIndex &index, int role) const
         case 1:
             return file->author();
         case 2:
-            return QString("%1 kB").arg(int((file->size() + 1023) / 1024));
-        case 3:
             return file->modified().toString(Qt::ISODate);
-        case 4:
-            return file->accessed().toString(Qt::TextDate);
-        case 5:
+        case 3:
             return file->version();
-        case 6:
+        case 4:
             return file->path();
-        case 7:
+        case 5:
             return file->masters().join(", ");
-        case 8:
+        case 6:
             return file->description();
         }
 
@@ -97,8 +127,6 @@ QVariant EsxModel::ContentModel::data(const QModelIndex &index, int role) const
             return Qt::AlignLeft + Qt::AlignVCenter;
         case 2:
         case 3:
-        case 4:
-        case 5:
             return Qt::AlignRight + Qt::AlignVCenter;
         default:
             return Qt::AlignLeft + Qt::AlignVCenter;
@@ -124,47 +152,88 @@ QVariant EsxModel::ContentModel::data(const QModelIndex &index, int role) const
                         .arg(file->masters().join(", "));
     }
 
+    case Qt::CheckStateRole:
+        if (!file->isMaster())
+            return isChecked(file->fileName());
+        break;
+
     case Qt::UserRole:
     {
-        if (file->masters().size() == 0)
+        if (file->isMaster())
             return "game";
         else
             return "addon";
     }
 
-    default:
-        return QVariant();
+    case Qt::UserRole + 1:
+        return isChecked(file->fileName());
+        break;
     }
+    return QVariant();
 }
 
-Qt::ItemFlags EsxModel::ContentModel::flags(const QModelIndex &index) const
+bool EsxModel::ContentModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-    if (!index.isValid())
-        return Qt::NoItemFlags;
+    if(!index.isValid())
+        return false;
 
     EsmFile *file = item(index.row());
+    QString fileName = file->fileName();
 
-    if (!file)
-        return Qt::NoItemFlags;
+    switch(role)
+    {
+        case Qt::EditRole:
+            {
+                QStringList list = value.toStringList();
 
-    Qt::ItemFlags dragDropFlags = Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
-    Qt::ItemFlags checkFlags = Qt::ItemIsUserCheckable;
-    Qt::ItemFlags defaultFlags = Qt::ItemIsDropEnabled | Qt::ItemIsSelectable;
+                //iterate the string list, assigning values to proeprties
+                //index-enum correspondence 1:1
+                for (int i = 0; i < EsxModel::Property_Master; i++)
+                    file->setProperty(static_cast<EsmFileProperty>(i), list.at(i));
 
-    if (canBeChecked(file))
-        return Qt::ItemIsEnabled | dragDropFlags | checkFlags | defaultFlags;
-    else
-        return defaultFlags;
-}
+                //iterate the remainder of the string list, assifning everything
+                // as
+                for (int i = EsxModel::Property_Master; i < list.size(); i++)
+                    file->setProperty (EsxModel::Property_Master, list.at(i));
 
-bool EsxModel::ContentModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-    if (index.isValid() && role == Qt::EditRole)
-    {
-        QString fname = value.value<QString>();
-        mFiles.replace(index.row(), findItem(fname));
-        emit dataChanged(index, index);
-        return true;
+                //emit data changed for the item itself
+                emit dataChanged(index, index);
+
+                return true;
+            }
+            break;
+
+        case Qt::UserRole+1:
+            {
+                setCheckState(fileName, value.toBool());
+
+                emit dataChanged(index, index);
+
+                for(int i = 0; i < mFiles.size(); i++)
+                {
+
+                    if (mFiles.at(i)->masters().contains(fileName))
+                    {
+                        QModelIndex idx = QAbstractTableModel::index(i, 0);
+                        emit dataChanged(idx, idx);
+                    }
+                }
+
+                return true;
+            }
+            break;
+
+        case Qt::CheckStateRole:
+            {
+                bool checked = ((value.toInt() == Qt::Checked) && !isChecked(fileName));
+
+                setCheckState(fileName, checked);
+
+                emit dataChanged(index, index);
+
+                return true;
+            }
+            break;
     }
 
     return false;
@@ -172,24 +241,31 @@ bool EsxModel::ContentModel::setData(const QModelIndex &index, const QVariant &v
 
 bool EsxModel::ContentModel::insertRows(int position, int rows, const QModelIndex &parent)
 {
+    if (parent.isValid())
+        return false;
+
     beginInsertRows(parent, position, position+rows-1);
+    {
+        for (int row = 0; row < rows; ++row)
+            mFiles.insert(position, new EsmFile);
 
-    for (int row = 0; row < rows; ++row)
-        mFiles.insert(position, new EsmFile);
+    } endInsertRows();
 
-    endInsertRows();
     return true;
 }
 
 bool EsxModel::ContentModel::removeRows(int position, int rows, const QModelIndex &parent)
 {
+    if (parent.isValid())
+        return false;
+
     beginRemoveRows(parent, position, position+rows-1);
+    {
+        for (int row = 0; row < rows; ++row)
+            delete mFiles.takeAt(position);
 
-    for (int row = 0; row < rows; ++row)
-        mFiles.removeAt(position);
+    } endRemoveRows();
 
-    endRemoveRows();
-    emit dataChanged(index(0,0,parent), index(rowCount()-1, 0, parent));
     return true;
 }
 
@@ -201,27 +277,30 @@ Qt::DropActions EsxModel::ContentModel::supportedDropActions() const
 QStringList EsxModel::ContentModel::mimeTypes() const
 {
     QStringList types;
+
     types << "application/omwcontent";
+
     return types;
 }
 
 QMimeData *EsxModel::ContentModel::mimeData(const QModelIndexList &indexes) const
 {
-    QMimeData *mimeData = new QMimeData();
     QByteArray encodedData;
 
-    QDataStream stream(&encodedData, QIODevice::WriteOnly);
-
     foreach (const QModelIndex &index, indexes)
     {
-        if (index.isValid())
-        {
-            QString text = data(index, Qt::DisplayRole).toString();
-            stream << text;
-        }
+        if (!index.isValid())
+            continue;
+
+        QByteArray fileData = item(index.row())->encodedData();
+
+        foreach (const char c, fileData)
+            encodedData.append(c);
     }
 
+    QMimeData *mimeData = new QMimeData();
     mimeData->setData("application/omwcontent", encodedData);
+
     return mimeData;
 }
 
@@ -240,31 +319,66 @@ bool EsxModel::ContentModel::dropMimeData(const QMimeData *data, Qt::DropAction
 
     if (row != -1)
         beginRow = row;
+
     else if (parent.isValid())
         beginRow = parent.row();
+
     else
         beginRow = rowCount();
 
     QByteArray encodedData = data->data("application/omwcontent");
     QDataStream stream(&encodedData, QIODevice::ReadOnly);
-    QStringList newItems;
-    int rows = 0;
 
     while (!stream.atEnd())
     {
-        QString text;
-        stream >> text;
-        newItems << text;
-        ++rows;
+        QStringList values;
+
+        for (int i = 0; i < EsmFile::sPropertyCount; ++i)
+            stream >> values;
+
+        insertRows(beginRow, 1);
+
+        QModelIndex idx = index(beginRow++, 0, QModelIndex());
+        setData(idx, values, Qt::EditRole);
     }
 
-    insertRows(beginRow, rows, QModelIndex());
+    return true;
+}
 
-    foreach (const QString &text, newItems)
+bool EsxModel::ContentModel::canBeChecked(const EsmFile *file) const
+{
+    //element can be checked if all its dependencies are
+    foreach (const QString &master, file->masters())
     {
-        QModelIndex idx = index(beginRow, 0, QModelIndex());
-        setData(idx, text);
-        beginRow++;
+        {// if the master is not found in checkstates
+         // or it is not specifically checked, return false
+            if (!mCheckStates.contains(master))
+                return false;
+
+            if (!isChecked(master))
+                return false;
+        }
+
+        bool found = false;
+
+        //iterate each file, if it is not a master and
+        //does not have a master that is currently checked,
+        //return false.
+        foreach(const EsmFile *file, mFiles)
+        {
+            QString filename = file->fileName();
+
+            found = (filename == master);
+
+            if (found)
+            {
+                if (!isChecked(filename))
+                    return false;
+            }
+        }
+
+        if (!found)
+            return false;
     }
 
     return true;
@@ -272,9 +386,10 @@ bool EsxModel::ContentModel::dropMimeData(const QMimeData *data, Qt::DropAction
 
 void EsxModel::ContentModel::addFile(EsmFile *file)
 {
-    emit beginInsertRows(QModelIndex(), mFiles.count(), mFiles.count());
-    mFiles.append(file);
-    emit endInsertRows();
+    beginInsertRows(QModelIndex(), mFiles.count(), mFiles.count());
+    {
+        mFiles.append(file);
+    } endInsertRows();
 }
 
 void EsxModel::ContentModel::addFiles(const QString &path)
@@ -319,9 +434,9 @@ void EsxModel::ContentModel::addFiles(const QString &path)
             }
 
             file->setAuthor(decoder->toUnicode(fileReader.getAuthor().c_str()));
-            file->setSize(info.size());
-            file->setDates(info.lastModified(), info.lastRead());
-            file->setVersion(fileReader.getFVer());
+            //file->setSize(info.size());
+            file->setDate(info.lastModified());
+            file->setVersion(0.0f);
             file->setPath(info.absoluteFilePath());
             file->setMasters(masters);
             file->setDescription(decoder->toUnicode(fileReader.getDesc().c_str()));
@@ -342,66 +457,22 @@ void EsxModel::ContentModel::addFiles(const QString &path)
     delete decoder;
 }
 
-EsxModel::EsmFile* EsxModel::ContentModel::findItem(const QString &name)
-{
-    for (int i = 0; i < mFiles.size(); ++i)
-    {
-        if (name == item(i)->fileName())
-            return item(i);
-    }
-
-    // Not found
-    return 0;
-}
-
-EsxModel::EsmFile* EsxModel::ContentModel::item(int row) const
-{
-    if (row >= 0 && row < mFiles.count())
-        return mFiles.at(row);
-
-    return 0;
-}
-
-QModelIndex EsxModel::ContentModel::indexFromItem(EsmFile *item) const
+bool EsxModel::ContentModel::isChecked(const QString& name) const
 {
-    if (item)
-        //return createIndex(mFiles.indexOf(item), 0);
-        return index(mFiles.indexOf(item),0);
-
-    return QModelIndex();
+    return (mCheckStates[name] == Qt::Checked);
 }
 
-Qt::CheckState EsxModel::ContentModel::checkState(const QModelIndex &index)
+void EsxModel::ContentModel::setCheckState(const QString &name, bool isChecked)
 {
-    return mCheckStates[item(index.row())->fileName()];
-}
-
-void EsxModel::ContentModel::setCheckState(const QModelIndex &index, Qt::CheckState state)
-{
-    if (!index.isValid())
+    if (name.isEmpty())
         return;
 
-    QString name = item(index.row())->fileName();
-    mCheckStates[name] = state;
-
-    // Force a redraw of the view since unchecking one item can affect another
-    QModelIndex firstIndex = indexFromItem(mFiles.first());
-    QModelIndex lastIndex = indexFromItem(mFiles.last());
+    Qt::CheckState state = Qt::Unchecked;
 
-    emit dataChanged(firstIndex, lastIndex);
-    //emit checkedItemsChanged(checkedItems());
+    if (isChecked)
+        state = Qt::Checked;
 
-}
-
-bool EsxModel::ContentModel::canBeChecked(const EsmFile *file) const
-{
-    //element can be checked if all its dependencies are
-    foreach (const QString &master, file->masters())
-    {
-        if (!mCheckStates.contains(master) || mCheckStates[master] != Qt::Checked)
-            return false;
-    }
-    return true;
+    mCheckStates[name] = state;
 }
 
 EsxModel::ContentFileList EsxModel::ContentModel::checkedItems() const
diff --git a/components/esxselector/model/contentmodel.hpp b/components/esxselector/model/contentmodel.hpp
index a585ab63b..61c823ab3 100644
--- a/components/esxselector/model/contentmodel.hpp
+++ b/components/esxselector/model/contentmodel.hpp
@@ -37,14 +37,11 @@ namespace EsxModel
         QModelIndex indexFromItem(EsmFile *item) const;
         EsxModel::EsmFile *findItem(const QString &name);
 
-        Qt::CheckState checkState(const QModelIndex &index);
-        void setCheckState(const QModelIndex &index, Qt::CheckState state);
+        bool isChecked(const QString &name) const;
+        void setCheckState(const QString &name, bool isChecked);
         ContentFileList checkedItems() const;
         void uncheckAll();
-/*
-        QModelIndex index(int row, int column, const QModelIndex &parent) const;
-        QModelIndex parent(const QModelIndex &child) const;
-*/
+
     private:
 
         void addFile(EsmFile *file);
diff --git a/components/esxselector/model/datafilesmodel.cpp b/components/esxselector/model/datafilesmodel.cpp
index ee940bb27..c98f70b16 100644
--- a/components/esxselector/model/datafilesmodel.cpp
+++ b/components/esxselector/model/datafilesmodel.cpp
@@ -24,56 +24,55 @@ EsxModel::DataFilesModel::~DataFilesModel()
 {
 }
 
-void EsxModel::DataFilesModel::setEncoding(const QString &encoding)
+int EsxModel::DataFilesModel::rowCount(const QModelIndex &parent) const
 {
-    mEncoding = encoding;
+    return parent.isValid() ? 0 : mFiles.count();
 }
 
-void EsxModel::DataFilesModel::setCheckState(const QModelIndex &index, Qt::CheckState state)
+int EsxModel::DataFilesModel::columnCount(const QModelIndex &parent) const
 {
-    if (!index.isValid())
-        return;
-
-    QString name = item(index.row())->fileName();
-    mCheckStates[name] = state;
+    return parent.isValid() ? 0 : 1;
+}
 
-    // Force a redraw of the view since unchecking one item can affect another
-    QModelIndex firstIndex = indexFromItem(mFiles.first());
-    QModelIndex lastIndex = indexFromItem(mFiles.last());
+const EsxModel::EsmFile* EsxModel::DataFilesModel::findItem(const QString &name)
+{
+    for (int i = 0; i < mFiles.size(); ++i)
+    {
+        const EsmFile *file = item(i);
 
-    emit dataChanged(firstIndex, lastIndex);
-    emit checkedItemsChanged(checkedItems());
+        if (name == file->fileName())
+            return file;
+    }
 
+    return 0;
 }
 
-Qt::CheckState EsxModel::DataFilesModel::checkState(const QModelIndex &index)
+const EsxModel::EsmFile* EsxModel::DataFilesModel::item(int row) const
 {
-    return mCheckStates[item(index.row())->fileName()];
-}
+    if (row >= 0 && row < mFiles.count())
+        return mFiles.at(row);
 
-int EsxModel::DataFilesModel::columnCount(const QModelIndex &parent) const
-{
-    return parent.isValid() ? 0 : 1;
+    return 0;
 }
 
-int EsxModel::DataFilesModel::rowCount(const QModelIndex &parent) const
+Qt::ItemFlags EsxModel::DataFilesModel::flags(const QModelIndex &index) const
 {
-    return parent.isValid() ? 0 : mFiles.count();
-}
+    if (!index.isValid())
+        return Qt::NoItemFlags;
 
+    const EsmFile *file = item(index.row());
 
-bool EsxModel::DataFilesModel::moveRow(int oldrow, int row, const QModelIndex &parent)
-{
-    if (oldrow < 0 || row < 0 || oldrow == row)
-        return false;
+    if (!file)
+        return Qt::NoItemFlags;
 
-    emit layoutAboutToBeChanged();
-    //emit beginMoveRows(parent, oldrow, oldrow, parent, row);
-    mFiles.swap(oldrow, row);
-    //emit endInsertRows();
-    emit layoutChanged();
+    Qt::ItemFlags dragDropFlags = Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+    Qt::ItemFlags checkFlags = Qt::ItemIsUserCheckable | Qt::ItemIsEditable;
+    Qt::ItemFlags defaultFlags = Qt::ItemIsDropEnabled | Qt::ItemIsSelectable;
 
-    return true;
+    if (canBeChecked(file))
+        return defaultFlags | dragDropFlags | checkFlags | Qt::ItemIsEnabled;
+    else
+        return defaultFlags;
 }
 
 QVariant EsxModel::DataFilesModel::data(const QModelIndex &index, int role) const
@@ -81,6 +80,9 @@ QVariant EsxModel::DataFilesModel::data(const QModelIndex &index, int role) cons
     if (!index.isValid())
         return QVariant();
 
+    if (index.row() >= mFiles.size())
+        return QVariant();
+
     const EsmFile *file = item(index.row());
 
     if (!file)
@@ -88,46 +90,46 @@ QVariant EsxModel::DataFilesModel::data(const QModelIndex &index, int role) cons
 
     const int column = index.column();
 
-    switch (role) {
+    switch (role)
+    {
     case Qt::EditRole:
-    case Qt::DisplayRole: {
+    case Qt::DisplayRole:
+    {
 
-        switch (column) {
+        switch (column)
+        {
         case 0:
             return file->fileName();
         case 1:
             return file->author();
         case 2:
-            return QString("%1 kB").arg(int((file->size() + 1023) / 1024));
-        case 3:
-            //return file->modified().toString(Qt::TextDate);
             return file->modified().toString(Qt::ISODate);
-        case 4:
-            return file->accessed().toString(Qt::TextDate);
-        case 5:
+        case 3:
             return file->version();
-        case 6:
+        case 4:
             return file->path();
-        case 7:
+        case 5:
             return file->masters().join(", ");
-        case 8:
+        case 6:
             return file->description();
         }
+        break;
     }
 
-    case Qt::TextAlignmentRole: {
-        switch (column) {
+    case Qt::TextAlignmentRole:
+    {
+        switch (column)
+        {
         case 0:
         case 1:
             return Qt::AlignLeft + Qt::AlignVCenter;
         case 2:
         case 3:
-        case 4:
-        case 5:
-            return Qt::AlignRight + Qt::AlignVCenter;
+             return Qt::AlignRight + Qt::AlignVCenter;
         default:
             return Qt::AlignLeft + Qt::AlignVCenter;
         }
+        break;
     }
 
     case Qt::ToolTipRole:
@@ -150,7 +152,7 @@ QVariant EsxModel::DataFilesModel::data(const QModelIndex &index, int role) cons
 
 
         return tooltip;
-
+        break;
     }
 
     case Qt::UserRole:
@@ -159,39 +161,242 @@ QVariant EsxModel::DataFilesModel::data(const QModelIndex &index, int role) cons
             return "game";
         else
             return "addon";
+
+        break;
     }
 
+    case Qt::UserRole + 1:
+        //return check state here
+        break;
+
     default:
         return QVariant();
+        break;
     }
 
 }
 
-Qt::ItemFlags EsxModel::DataFilesModel::flags(const QModelIndex &index) const
+bool EsxModel::DataFilesModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     if (!index.isValid())
-        return Qt::NoItemFlags;
+        return false;
 
-    const EsmFile *file = item(index.row());
+    switch (role)
+    {
+        case Qt::EditRole:
+        {
+            const EsmFile *file = item(index.row());
 
-    Qt::ItemFlags dragDropFlags = Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
-    Qt::ItemFlags checkFlags = Qt::ItemIsUserCheckable | Qt::ItemIsSelectable;
+            // iterate loop to repopulate file pointer with data in string list.
+            QStringList list = value.toStringList();
+            for (int i = 0; i <999; ++i)
+            {
+                file->setProperty(i, value.at(i));
+            }
 
-    if (!file)
-        return Qt::NoItemFlags;
+            //populate master list here (emit data changed for each master and
+            //each item (other than the dropped item) which share each of the masters
+            file->masters().append(masterList);
 
-    if (canBeChecked(file))
+            emit dataChanged(index, index);
+            return true;
+        }
+            break;
+
+        case Qt::UserRole + 1:
+        {
+            EsmFile *file = item(index.row());
+            //set file's checkstate to the passed checkstate
+            emit dataChanged(index, index);
+
+            for (int i = 0; i < mFiles.size(); ++i)
+                if (mFiles.at(i)->getMasters().contains(file->fileName()))
+                    emit dataChanged(QAbstractTableModel::index(i,0), QAbstractTableModel::index(i,0));
+
+            return true;
+        }
+            break;
+
+        case Qt::CheckStateRole:
+        {
+            EsmFile *file = item(index.row());
+
+            if ((value.toInt() == Qt::Checked) && !file->isChecked())
+                file->setChecked(true);
+            else if (value.toInt() == Qt::Checked && file->isChecked())
+                file->setChecked(false);
+            else if (value.toInt() == Qt::UnChecked)
+                file->setChecked(false);
+
+            emit dataChanged(index, index);
+
+            return true;
+        }
+            break;
+    }
+    return false;
+}
+
+bool EsxModel::DataFilesModel::insertRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid())
+        return false;
+
+    beginInsertRows(QModelIndex(),row, row+count-1);
+    {
+        for (int i = 0; i < count; ++i)
+            mFiles.insert(row, new EsmFile());
+    } endInsertRows();
+
+    return true;
+}
+
+bool EsxModel::DataFilesModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (parent.isValid())
+        return false;
+
+    beginRemoveRows(QModelIndex(), row, row+count-1);
+    {
+        for (int i = 0; i < count; ++i)
+            delete mFiles.takeAt(row);
+    } endRemoveRows();
+
+    return true;
+}
+
+Qt::DropActions EsxModel::DataFilesModel::supportedDropActions() const
+{
+    return Qt::CopyAction | Qt::MoveAction;
+}
+
+QStringList EsxModel::DataFilesModel::mimeTypes() const
+{
+    QStringList types;
+    types << "application/omwcontent";
+    return types;
+}
+
+QMimeData *EsxModel::DataFilesModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData();
+    QByteArray encodedData;
+
+    QDataStream stream (&encodedData, QIODevice::WriteOnly);
+
+    foreach (const QModelIndex &index, indexes)
     {
-        if (index.column() == 0)
-            return dragDropFlags | checkFlags | Qt::ItemIsEnabled;
+        if (index.isValid())
+        {
+            EsmFile *file = item (index.row());
+
+            for (int i = 0; i < file->propertyCount(); ++i)
+            stream << data(index, Qt::DisplayRole).toString();
+
+            EsmFile *file = item(index.row());
+            stream << file->getMasters();
+        }
+    }
+
+    mimeData->setData("application/omwcontent", encodedData);
+
+    return mimeData;
+}
+
+bool EsxModel::DataFilesModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
+{
+    if (action == Qt::IgnoreAction)
+        return true;
+
+    if (action != Qt::MoveAction)
+        return false;
+
+    if (!data->hasFormat("application/omwcontent"))
+        return false;
+
+    int dropRow = row;
+
+    if (dropRow == -1)
+    {
+        if (parent.isValid())
+            dropRow = parent.row();
         else
-            return Qt::ItemIsDropEnabled | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+            dropRow = rowCount(QModelIndex());
     }
 
-    if (index.column() == 0)
-        return dragDropFlags | checkFlags;
+        if (parent.isValid())
+                qDebug() << "parent: " << parent.data().toString();
+        qDebug() << "dragged file: " << (qobject_cast<const EsmFile *>(data))->fileName();
+//    qDebug() << "inserting file: " << droppedfile->fileName() << " ahead of " << file->fileName();
+    insertRows (dropRow, 1, QModelIndex());
+
+
+    const EsmFile *draggedFile = qobject_cast<const EsmFile *>(data);
+
+    int dragRow = -1;
 
-    return Qt::ItemIsDropEnabled | Qt::ItemIsSelectable;
+    for (int i = 0; i < mFiles.size(); ++i)
+        if (draggedFile->fileName() == mFiles.at(i)->fileName())
+        {
+            dragRow = i;
+            break;
+        }
+
+    for (int i = 0; i < mFiles.count(); ++i)
+    {
+        qDebug() << "index: " << i << "file: " << item(i)->fileName();
+        qDebug() << mFiles.at(i)->fileName();
+    }
+
+    qDebug() << "drop row: " << dropRow << "; drag row: " << dragRow;
+//    const EsmFile *file = qobject_cast<const EsmFile *>(data);
+  //  int index = mFiles.indexOf(file);
+    //qDebug() << "file name: " << file->fileName() << "; index: " << index;
+    mFiles.swap(dropRow, dragRow);
+    //setData(index(startRow, 0), varFile);
+        emit dataChanged(index(0,0), index(rowCount(),0));
+    return true;
+}
+
+void EsxModel::DataFilesModel::setEncoding(const QString &encoding)
+{
+    mEncoding = encoding;
+}
+
+void EsxModel::DataFilesModel::setCheckState(const QModelIndex &index, Qt::CheckState state)
+{
+    if (!index.isValid())
+        return;
+
+    QString name = item(index.row())->fileName();
+    mCheckStates[name] = state;
+
+    // Force a redraw of the view since unchecking one item can affect another
+    QModelIndex firstIndex = indexFromItem(mFiles.first());
+    QModelIndex lastIndex = indexFromItem(mFiles.last());
+
+    emit dataChanged(firstIndex, lastIndex);
+    emit checkedItemsChanged(checkedItems());
+
+}
+
+Qt::CheckState EsxModel::DataFilesModel::checkState(const QModelIndex &index)
+{
+    return mCheckStates[item(index.row())->fileName()];
+}
+
+bool EsxModel::DataFilesModel::moveRow(int oldrow, int row, const QModelIndex &parent)
+{
+    if (oldrow < 0 || row < 0 || oldrow == row)
+        return false;
+
+    emit layoutAboutToBeChanged();
+    //emit beginMoveRows(parent, oldrow, oldrow, parent, row);
+    mFiles.swap(oldrow, row);
+    //emit endInsertRows();
+    emit layoutChanged();
+
+    return true;
 }
 
 QVariant EsxModel::DataFilesModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -215,22 +420,6 @@ QVariant EsxModel::DataFilesModel::headerData(int section, Qt::Orientation orien
     return QVariant();
 }
 
-bool EsxModel::DataFilesModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-    if (!index.isValid())
-        return false;
-
-    if (role == Qt::EditRole)
-    {
-        qDebug() << "replacing: " << mFiles.at(index.row())->fileName();
-//        mFiles.replace(index.row(), value.value<const EsxModel::EsmFile *>());
-        qDebug() << "with: " << mFiles.at(index.row())->fileName();
-        emit dataChanged(index, index);
-        return true;
-    }
-
-    return false;
-}
 //!!!!!!!!!!!!!!!!!!!!!!!
 bool lessThanEsmFile(const EsxModel::EsmFile *e1, const EsxModel::EsmFile *e2)
 {
@@ -345,32 +534,6 @@ QModelIndex EsxModel::DataFilesModel::indexFromItem(const EsmFile *item) const
     return QModelIndex();
 }
 
-const EsxModel::EsmFile* EsxModel::DataFilesModel::findItem(const QString &name)
-{
-    EsmFileList::ConstIterator it;
-    EsmFileList::ConstIterator itEnd = mFiles.constEnd();
-
-    int i = 0;
-    for (it = mFiles.constBegin(); it != itEnd; ++it) {
-        const EsmFile *file = item(i);
-        ++i;
-
-        if (name == file->fileName())
-            return file;
-    }
-
-    // Not found
-    return 0;
-}
-
-const EsxModel::EsmFile* EsxModel::DataFilesModel::item(int row) const
-{
-    if (row >= 0 && row < mFiles.count())
-        return mFiles.at(row);
-
-    return 0;
-}
-
 EsxModel::EsmFileList EsxModel::DataFilesModel::checkedItems()
 {
     EsmFileList list;
@@ -443,110 +606,3 @@ bool EsxModel::DataFilesModel::canBeChecked(const EsmFile *file) const
     }
     return true;
 }
-
-Qt::DropActions EsxModel::DataFilesModel::supportedDropActions() const
-{
-    return Qt::CopyAction | Qt::MoveAction;
-}
-
-QStringList EsxModel::DataFilesModel::mimeTypes() const
-{
-    QStringList types;
-    types << "application/omwcontent";
-    return types;
-}
-
-QMimeData *EsxModel::DataFilesModel::mimeData(const QModelIndexList &indexes) const
-{
-//    if (indexes.at(0).isValid())
-//        return new EsmFile(*item(indexes.at(0).row()));
-
-    return 0;
-}
-
-bool EsxModel::DataFilesModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
-{
-    if (action == Qt::IgnoreAction)
-        return true;
-
-    if (action != Qt::MoveAction)
-        return false;
-
-    if (!data->hasFormat("application/omwcontent"))
-        return false;
-
-    int dropRow = row;
-
-    if (dropRow == -1)
-    {
-        if (parent.isValid())
-            dropRow = parent.row();
-        else
-            dropRow = rowCount(QModelIndex());
-    }
-
-        if (parent.isValid())
-                qDebug() << "parent: " << parent.data().toString();
-        qDebug() << "dragged file: " << (qobject_cast<const EsmFile *>(data))->fileName();
-//    qDebug() << "inserting file: " << droppedfile->fileName() << " ahead of " << file->fileName();
-    insertRows (dropRow, 1, QModelIndex());
-
-
-    const EsmFile *draggedFile = qobject_cast<const EsmFile *>(data);
-
-    int dragRow = -1;
-
-    for (int i = 0; i < mFiles.size(); ++i)
-        if (draggedFile->fileName() == mFiles.at(i)->fileName())
-        {
-            dragRow = i;
-            break;
-        }
-
-    for (int i = 0; i < mFiles.count(); ++i)
-    {
-        qDebug() << "index: " << i << "file: " << item(i)->fileName();
-        qDebug() << mFiles.at(i)->fileName();
-    }
-
-    qDebug() << "drop row: " << dropRow << "; drag row: " << dragRow;
-//    const EsmFile *file = qobject_cast<const EsmFile *>(data);
-  //  int index = mFiles.indexOf(file);
-    //qDebug() << "file name: " << file->fileName() << "; index: " << index;
-    mFiles.swap(dropRow, dragRow);
-    //setData(index(startRow, 0), varFile);
-        emit dataChanged(index(0,0), index(rowCount(),0));
-    return true;
-}
-
-bool EsxModel::DataFilesModel::insertRows(int row, int count, const QModelIndex &parent)
-{
-    qDebug() << "inserting row: " << row << " count: " << count;
-    beginInsertRows(QModelIndex(),row, row+count-1);
-
-    EsmFile *file = new EsmFile();
-
-    for (int i = 0; i < count; ++i)
-        mFiles.insert(row + i, file);
-
-    endInsertRows();
-    return true;
-}
-
-bool EsxModel::DataFilesModel::removeRows(int row, int count, const QModelIndex &parent)
-{
-    qDebug() << "removing row: " << row << " count: " << count;
-    beginRemoveRows(QModelIndex(), row, row+count-1);
-
-    for (int i = 0; i < count; ++i)
-    {
-        mFiles.removeAt(i);
-    }
-
-    endRemoveRows();
-    qDebug() <<"remove success";
-
-    emit dataChanged(parent, index(rowCount()-1, 0, parent));
-    return true;
-}
-
diff --git a/components/esxselector/model/esmfile.cpp b/components/esxselector/model/esmfile.cpp
index 95cf70312..0e7f18373 100644
--- a/components/esxselector/model/esmfile.cpp
+++ b/components/esxselector/model/esmfile.cpp
@@ -1,7 +1,12 @@
 #include "esmfile.hpp"
 
+#include <QMimeData>
+#include <QDataStream>
+
+int EsxModel::EsmFile::sPropertyCount = 7;
+
 EsxModel::EsmFile::EsmFile(QString fileName, ModelItem *parent)
-    : ModelItem(parent), mFileName(fileName), mSize(0), mVersion(0.0f)
+    : ModelItem(parent), mFileName(fileName), mVersion(0.0f)
 {}
 /*
 EsxModel::EsmFile::EsmFile(const EsmFile &file)
@@ -22,15 +27,9 @@ void EsxModel::EsmFile::setAuthor(const QString &author)
     mAuthor = author;
 }
 
-void EsxModel::EsmFile::setSize(const int size)
-{
-    mSize = size;
-}
-
-void EsxModel::EsmFile::setDates(const QDateTime &modified, const QDateTime &accessed)
+void EsxModel::EsmFile::setDate(const QDateTime &modified)
 {
     mModified = modified;
-    mAccessed = accessed;
 }
 
 void EsxModel::EsmFile::setVersion(float version)
@@ -52,3 +51,52 @@ void EsxModel::EsmFile::setDescription(const QString &description)
 {
     mDescription = description;
 }
+
+QByteArray EsxModel::EsmFile::encodedData() const
+{
+    QByteArray encodedData;
+    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+
+    stream << mFileName << mAuthor << QString::number(mVersion)
+           << mModified.toString() << mPath << mDescription
+           << mMasters;
+
+    return encodedData;
+}
+
+void EsxModel::EsmFile::setProperty (const EsmFileProperty prop, const QString &value)
+{
+    switch (prop)
+    {
+    case Property_FileName:
+        mFileName = value;
+        break;
+
+    case Property_Author:
+        mAuthor = value;
+        break;
+
+    case Property_Version:
+        mVersion = value.toFloat();
+        break;
+
+    case Property_DateModified:
+        mModified = QDateTime::fromString(value);
+        break;
+
+    case Property_Path:
+        mPath = value;
+        break;
+
+    case Property_Description:
+        mDescription = value;
+        break;
+
+    case Property_Master:
+        mMasters << value;
+        break;
+
+    default:
+        break;
+    }
+}
diff --git a/components/esxselector/model/esmfile.hpp b/components/esxselector/model/esmfile.hpp
index 0cda018b3..9a1ea8af1 100644
--- a/components/esxselector/model/esmfile.hpp
+++ b/components/esxselector/model/esmfile.hpp
@@ -6,8 +6,21 @@
 
 #include "modelitem.hpp"
 
+class QMimeData;
+
 namespace EsxModel
 {
+    enum EsmFileProperty
+    {
+        Property_FileName       = 0,
+        Property_Author         = 1,
+        Property_Version        = 2,
+        Property_DateModified   = 3,
+        Property_Path           = 4,
+        Property_Description    = 5,
+        Property_Master         = 6
+    };
+
     class EsmFile : public ModelItem
     {
         Q_OBJECT
@@ -21,10 +34,12 @@ namespace EsxModel
         ~EsmFile()
         {}
 
+        void setProperty (const EsmFileProperty prop, const QString &value);
+
         void setFileName(const QString &fileName);
         void setAuthor(const QString &author);
         void setSize(const int size);
-        void setDates(const QDateTime &modified, const QDateTime &accessed);
+        void setDate(const QDateTime &modified);
         void setVersion(const float version);
         void setPath(const QString &path);
         void setMasters(const QStringList &masters);
@@ -32,22 +47,23 @@ namespace EsxModel
 
         inline QString fileName() const { return mFileName; }
         inline QString author() const { return mAuthor; }
-        inline int size() const { return mSize; }
         inline QDateTime modified() const { return mModified; }
-        inline QDateTime accessed() const { return mAccessed; }
         inline float version() const { return mVersion; }
         inline QString path() const { return mPath; }
         inline QStringList masters() const { return mMasters; }
         inline QString description() const { return mDescription; }
 
-        //inline ModelItem *parent() const { return ModelItem::parent(); this->}
+        inline bool isMaster() const { return (mMasters.size() == 0); }
+        QByteArray encodedData() const;
+
+    public:
+        static int sPropertyCount;
 
     private:
+
         QString mFileName;
         QString mAuthor;
-        int mSize;
         QDateTime mModified;
-        QDateTime mAccessed;
         float mVersion;
         QString mPath;
         QStringList mMasters;
diff --git a/components/esxselector/model/masterproxymodel.cpp b/components/esxselector/model/masterproxymodel.cpp
index 46d68ca51..df74d0356 100644
--- a/components/esxselector/model/masterproxymodel.cpp
+++ b/components/esxselector/model/masterproxymodel.cpp
@@ -10,35 +10,4 @@ EsxModel::MasterProxyModel::MasterProxyModel(QObject *parent, QAbstractTableMode
 
     if (model)
          setSourceModel (model);
-        //connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(slotSourceModelChanged(QModelIndex, QModelIndex)));
-}
-/*
-QVariant EsxModel::MasterProxyModel::data(const QModelIndex &index, int role) const
-{
-    if (index.isValid())
-        return QSortFilterProxyModel::data (index, role);
-
-    return 0;
-}
-*/
-void EsxModel::MasterProxyModel::slotSourceModelChanged(QModelIndex topLeft, QModelIndex botRight)
-{
-    qDebug() << "source data changed.. updating master proxy";
-    emit dataChanged(index(0,0), index(rowCount()-1,0));
-
-    int curRow = -1;
-/*
-    for (int i = 0; i < rowCount() - 1; ++i)
-    {
-         if (index(i,0).data(Qt::CheckState) == Qt::Checked)
-         {
-             curRow = i;
-             break;
-         }
-    }
-
-    reset();
-*/
-    if (curRow != -1);
-     //   index(curRow, 0).setDataQt::CheckState)
 }
diff --git a/components/esxselector/model/pluginsproxymodel.cpp b/components/esxselector/model/pluginsproxymodel.cpp
index 412367b64..c543672b0 100644
--- a/components/esxselector/model/pluginsproxymodel.cpp
+++ b/components/esxselector/model/pluginsproxymodel.cpp
@@ -12,29 +12,3 @@ EsxModel::PluginsProxyModel::PluginsProxyModel(QObject *parent, ContentModel *mo
     if (model)
         setSourceModel (model);
 }
-
-EsxModel::PluginsProxyModel::~PluginsProxyModel()
-{
-}
-
-QVariant EsxModel::PluginsProxyModel::data(const QModelIndex &index, int role) const
-{
-    switch (role)
-    {
-        case Qt::CheckStateRole:
-        {
-            if (index.column() != 0)
-                return QVariant();
-
-            return static_cast<ContentModel *>(sourceModel())->checkState(mapToSource(index));
-        }
-    }
-    return QSortFilterProxyModel::data(index, role);
-}
-
-bool EsxModel::PluginsProxyModel::removeRows(int position, int rows, const QModelIndex &parent)
-{
-    bool success = QSortFilterProxyModel::removeRows(position, rows, parent);
-
-    return success;
-}
diff --git a/components/esxselector/view/contentselector.cpp b/components/esxselector/view/contentselector.cpp
index bc7cc2b8b..1f5e36d65 100644
--- a/components/esxselector/view/contentselector.cpp
+++ b/components/esxselector/view/contentselector.cpp
@@ -1,8 +1,6 @@
 #include "contentselector.hpp"
 
 #include "../model/datafilesmodel.hpp"
-#include "../model/masterproxymodel.hpp"
-#include "../model/pluginsproxymodel.hpp"
 #include "../model/contentmodel.hpp"
 #include "../model/esmfile.hpp"
 
@@ -16,55 +14,73 @@ EsxView::ContentSelector::ContentSelector(QWidget *parent) :
     QDialog(parent)
 {
     setupUi(this);
-   // buildModelsAndViews();
-    buildDragDropModelView();
+
+    buildSourceModel();
+    buildMasterView();
+    buildPluginsView();
+    buildProfilesView();
+
+    updateViews();
+
 }
-void EsxView::ContentSelector::buildDragDropModelView()
+
+void EsxView::ContentSelector::buildSourceModel()
 {
     mContentModel = new EsxModel::ContentModel();
+    connect(mContentModel, SIGNAL(layoutChanged()), this, SLOT(updateViews()));
+}
 
-    //mContentModel->addFiles("/home/joel/Projects/OpenMW/Data_Files");
-    mMasterProxyModel = new EsxModel::MasterProxyModel(this, mContentModel);
-    mPluginsProxyModel = new EsxModel::PluginsProxyModel(this, mContentModel);
-
-    tableView->setModel (mPluginsProxyModel);
+void EsxView::ContentSelector::buildMasterView()
+{
+    mMasterProxyModel = new QSortFilterProxyModel(this);
+    mMasterProxyModel->setFilterRegExp(QString("game"));
+    mMasterProxyModel->setFilterRole (Qt::UserRole);
+    mMasterProxyModel->setSourceModel (mContentModel);
 
     masterView->setPlaceholderText(QString("Select a game file..."));
     masterView->setModel(mMasterProxyModel);
-    pluginView->setModel(mPluginsProxyModel);
-
-    profilesComboBox->setPlaceholderText(QString("Select a profile..."));
 
-    updateViews();
-    connect(pluginView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(slotPluginTableItemClicked(const QModelIndex &)));
     connect(masterView, SIGNAL(currentIndexChanged(int)), this, SLOT(slotCurrentMasterIndexChanged(int)));
-    connect(profilesComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(slotCurrentProfileIndexChanged(int)));
-
 
-    connect(mContentModel, SIGNAL(layoutChanged()), this, SLOT(updateViews()));
-    connect(tableView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(slotPluginTableItemClicked(const QModelIndex &)));
+    masterView->setCurrentIndex(-1);
+    masterView->setCurrentIndex(0);
 }
 
-void EsxView::ContentSelector::buildModelsAndViews()
+void EsxView::ContentSelector::buildPluginsView()
 {
-    // Models
-    mDataFilesModel = new EsxModel::DataFilesModel (this);
-
-   // mMasterProxyModel = new EsxModel::MasterProxyModel (this, mDataFilesModel);
-   // mPluginsProxyModel = new EsxModel::PluginsProxyModel (this, mDataFilesModel);
+    mPluginsProxyModel = new QSortFilterProxyModel(this);
+    mPluginsProxyModel->setFilterRegExp (QString("addon"));
+    mPluginsProxyModel->setFilterRole (Qt::UserRole);
+    mPluginsProxyModel->setDynamicSortFilter (true);
+    mPluginsProxyModel->setSourceModel (mContentModel);
 
-    masterView->setPlaceholderText(QString("Select a game file..."));
-    masterView->setModel(mMasterProxyModel);
+    tableView->setModel (mPluginsProxyModel);
     pluginView->setModel(mPluginsProxyModel);
-    profilesComboBox->setPlaceholderText(QString("Select a profile..."));
 
-    updateViews();
-    connect(mDataFilesModel, SIGNAL(layoutChanged()), this, SLOT(updateViews()));
     connect(pluginView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(slotPluginTableItemClicked(const QModelIndex &)));
-    connect(masterView, SIGNAL(currentIndexChanged(int)), this, SLOT(slotCurrentMasterIndexChanged(int)));
+    connect(tableView, SIGNAL(clicked(const QModelIndex &)), this, SLOT(slotPluginTableItemClicked(const QModelIndex &)));
+}
+
+void EsxView::ContentSelector::buildProfilesView()
+{
+    profilesComboBox->setPlaceholderText(QString("Select a profile..."));
     connect(profilesComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(slotCurrentProfileIndexChanged(int)));
 }
 
+void EsxView::ContentSelector::updateViews()
+{
+    // Ensure the columns are hidden because sort() re-enables them
+    pluginView->setColumnHidden(1, true);
+    pluginView->setColumnHidden(2, true);
+    pluginView->setColumnHidden(3, true);
+    pluginView->setColumnHidden(4, true);
+    pluginView->setColumnHidden(5, true);
+    pluginView->setColumnHidden(6, true);
+    pluginView->setColumnHidden(7, true);
+    pluginView->setColumnHidden(8, true);
+    pluginView->resizeColumnsToContents();
+}
+
 void EsxView::ContentSelector::addFiles(const QString &path)
 {
     mContentModel->addFiles(path);
@@ -78,24 +94,6 @@ void EsxView::ContentSelector::setEncoding(const QString &encoding)
     mContentModel->setEncoding(encoding);
 }
 
-void EsxView::ContentSelector::setCheckState(QModelIndex index, QSortFilterProxyModel *model)
-{
-    if (!index.isValid())
-        return;
-
-    if (!model)
-        return;
-
-    QModelIndex sourceIndex = model->mapToSource(index);
-
-    if (sourceIndex.isValid())
-    {
-        (mContentModel->checkState(sourceIndex) == Qt::Checked)
-                ? mContentModel->setCheckState(sourceIndex, Qt::Unchecked)
-                : mContentModel->setCheckState(sourceIndex, Qt::Checked);
-    }
-}
-
 QStringList EsxView::ContentSelector::checkedItemsPaths()
 {
     QStringList itemPaths;
@@ -106,21 +104,6 @@ QStringList EsxView::ContentSelector::checkedItemsPaths()
     return itemPaths;
 }
 
-void EsxView::ContentSelector::updateViews()
-{
-    // Ensure the columns are hidden because sort() re-enables them
-    pluginView->setColumnHidden(1, true);
-    pluginView->setColumnHidden(2, true);
-    pluginView->setColumnHidden(3, true);
-    pluginView->setColumnHidden(4, true);
-    pluginView->setColumnHidden(5, true);
-    pluginView->setColumnHidden(6, true);
-    pluginView->setColumnHidden(7, true);
-    pluginView->setColumnHidden(8, true);
-    pluginView->resizeColumnsToContents();
-
-}
-
 void EsxView::ContentSelector::slotCurrentProfileIndexChanged(int index)
 {
     emit profileChanged(index);
@@ -128,17 +111,40 @@ void EsxView::ContentSelector::slotCurrentProfileIndexChanged(int index)
 
 void EsxView::ContentSelector::slotCurrentMasterIndexChanged(int index)
 {
-    QObject *object = QObject::sender();
+    static int oldIndex = -1;
+
+    QAbstractItemModel *const model = masterView->model();
+    QSortFilterProxyModel *proxy = dynamic_cast<QSortFilterProxyModel *>(model);
+
+    if (proxy)
+        proxy->setDynamicSortFilter(false);
+
+    if (oldIndex > -1)
+        model->setData(model->index(oldIndex, 0), false, Qt::UserRole + 1);
+
+    oldIndex = index;
 
-    // Not a signal-slot call
-    if (!object)
-        return;
+    model->setData(model->index(index, 0), true, Qt::UserRole + 1);
 
-    setCheckState(mMasterProxyModel->index(index, 0), mMasterProxyModel);
+    if (proxy)
+        proxy->setDynamicSortFilter(true);
 }
 
 void EsxView::ContentSelector::slotPluginTableItemClicked(const QModelIndex &index)
 {
     qDebug() << "setting checkstate in plugin...";
-    setCheckState(index, mPluginsProxyModel);
+
+    QAbstractItemModel *const model = pluginView->model();
+    QSortFilterProxyModel *proxy  = dynamic_cast<QSortFilterProxyModel *>(model);
+
+    if (proxy)
+        proxy->setDynamicSortFilter(false);
+
+    if (model->data(index, Qt::CheckStateRole).toInt() == Qt::Unchecked)
+        model->setData(index, Qt::Checked, Qt::CheckStateRole);
+    else
+        model->setData(index, Qt::Unchecked, Qt::CheckStateRole);
+
+    if (proxy)
+        proxy->setDynamicSortFilter(true);
 }
diff --git a/components/esxselector/view/contentselector.hpp b/components/esxselector/view/contentselector.hpp
index 06cc8f3f0..e074fe688 100644
--- a/components/esxselector/view/contentselector.hpp
+++ b/components/esxselector/view/contentselector.hpp
@@ -9,8 +9,6 @@ namespace EsxModel
 {
     class ContentModel;
     class DataFilesModel;
-    class PluginsProxyModel;
-    class MasterProxyModel;
 }
 
 class QSortFilterProxyModel;
@@ -25,8 +23,8 @@ namespace EsxView
 
         EsxModel::DataFilesModel *mDataFilesModel;
         EsxModel::ContentModel *mContentModel;
-        EsxModel::MasterProxyModel *mMasterProxyModel;
-        EsxModel::PluginsProxyModel *mPluginsProxyModel;
+        QSortFilterProxyModel *mMasterProxyModel;
+        QSortFilterProxyModel *mPluginsProxyModel;
 
     public:
         explicit ContentSelector(QWidget *parent = 0);
@@ -39,7 +37,12 @@ namespace EsxView
         void setCheckState(QModelIndex index, QSortFilterProxyModel *model);
         QStringList checkedItemsPaths();
         void on_checkAction_triggered();
-        void buildDragDropModelView();
+
+   private:
+        void buildSourceModel();
+        void buildMasterView();
+        void buildPluginsView();
+        void buildProfilesView();
 
     signals:
         void profileChanged(int index);