diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 61580461f..dfd987345 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -9,7 +9,7 @@ set (OPENCS_SRC
 
     view/doc/viewmanager.cpp view/doc/view.cpp view/doc/operations.cpp view/doc/operation.cpp
 
-    view/world/subview.cpp view/world/globals.cpp
+    view/world/subview.cpp view/world/table.cpp view/world/globals.cpp
     )
 
 set (OPENCS_HDR
@@ -23,7 +23,7 @@ set (OPENCS_HDR
     view/doc/viewmanager.hpp view/doc/view.hpp view/doc/operations.hpp view/doc/operation.hpp
     model/world/commands.hpp
 
-    view/world/subview.hpp view/world/globals.hpp
+    view/world/subview.hpp view/world/table.hpp view/world/globals.hpp
     )
 
 set (OPENCS_US
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index c81ba2ba1..0c336376b 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -46,12 +46,6 @@ void CSVDoc::View::setupEditMenu()
     mRedo= mDocument->getUndoStack().createRedoAction (this, tr("&Redo"));
     mRedo->setShortcuts (QKeySequence::Redo);
     edit->addAction (mRedo);
-
-    // test
-    QAction *test = new QAction (tr ("&Test Command"), this);
-    connect (test, SIGNAL (triggered()), this, SLOT (test()));
-    edit->addAction (test);
-    mEditingActions.push_back (test);
 }
 
 void CSVDoc::View::setupViewMenu()
@@ -203,11 +197,6 @@ void CSVDoc::View::newView()
     mViewManager.addView (mDocument);
 }
 
-void CSVDoc::View::test()
-{
-    mDocument->getUndoStack().push (new QUndoCommand());
-}
-
 void CSVDoc::View::save()
 {
     mDocument->save();
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index 8e2b27293..c86c3b362 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -93,8 +93,6 @@ namespace CSVDoc
 
             void newView();
 
-            void test();
-
             void save();
 
             void verify();
diff --git a/apps/opencs/view/world/globals.cpp b/apps/opencs/view/world/globals.cpp
index 459b8c357..a8b6497db 100644
--- a/apps/opencs/view/world/globals.cpp
+++ b/apps/opencs/view/world/globals.cpp
@@ -1,83 +1,12 @@
 
 #include "globals.hpp"
 
-#include <QTableView>
-#include <QHeaderView>
-#include <QSortFilterProxyModel>
-#include <QUndoStack>
-
-#include "../../model/world/data.hpp"
-
-#include "../../model/world/commands.hpp"
-
-CSVWorld::NastyTableModelHack::NastyTableModelHack (QAbstractItemModel& model)
-: mModel (model)
-{}
-
-int CSVWorld::NastyTableModelHack::rowCount (const QModelIndex & parent) const
-{
-    return mModel.rowCount (parent);
-}
-
-int CSVWorld::NastyTableModelHack::columnCount (const QModelIndex & parent) const
-{
-    return mModel.columnCount (parent);
-}
-
-QVariant CSVWorld::NastyTableModelHack::data  (const QModelIndex & index, int role) const
-{
-    return mModel.data (index, role);
-}
-
-bool CSVWorld::NastyTableModelHack::setData ( const QModelIndex &index, const QVariant &value, int role)
-{
-    mData = value;
-    return true;
-}
-
-QVariant CSVWorld::NastyTableModelHack::getData() const
-{
-    return mData;
-}
-
-CSVWorld::CommandDelegate::CommandDelegate (QUndoStack& undoStack, QObject *parent)
-: QStyledItemDelegate (parent), mUndoStack (undoStack)
-{}
-
-void CSVWorld::CommandDelegate::setModelData (QWidget *editor, QAbstractItemModel *model,
-        const QModelIndex& index) const
-{
-    NastyTableModelHack hack (*model);
-    QStyledItemDelegate::setModelData (editor, &hack, index);
-    mUndoStack.push (new CSMWorld::ModifyCommand (*model, index, hack.getData()));
-}
+#include "table.hpp"
 
 CSVWorld::Globals::Globals (const CSMWorld::UniversalId& id, CSMWorld::Data& data, QUndoStack& undoStack)
 : SubView (id)
 {
-    QTableView *table = new QTableView();
+    QTableView *table = new Table (id, data, undoStack);
 
     setWidget (table);
-
-    QAbstractTableModel *model = data.getTableModel (id);
-
-    int columns = model->columnCount();
-
-    for (int i=0; i<columns; ++i)
-    {
-        CommandDelegate *delegate = new CommandDelegate (undoStack, table);
-        table->setItemDelegateForColumn (i, delegate);
-    }
-
-    QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel (this);
-    proxyModel->setSourceModel (model);
-
-    table->setModel (proxyModel);
-    table->horizontalHeader()->setResizeMode (QHeaderView::Interactive);
-    table->verticalHeader()->hide();
-    table->setSortingEnabled (true);
-    table->setSelectionBehavior (QAbstractItemView::SelectRows);
-    table->setSelectionMode (QAbstractItemView::ExtendedSelection);
-
-    /// \todo make initial layout fill the whole width of the table
 }
\ No newline at end of file
diff --git a/apps/opencs/view/world/globals.hpp b/apps/opencs/view/world/globals.hpp
index 11ab7b6aa..c4a9fd402 100644
--- a/apps/opencs/view/world/globals.hpp
+++ b/apps/opencs/view/world/globals.hpp
@@ -3,47 +3,10 @@
 
 #include "subview.hpp"
 
-#include <QStyledItemDelegate>
-
 class QUndoStack;
 
 namespace CSVWorld
 {
-    ///< \brief Getting the data out of an editor widget
-    ///
-    /// Really, Qt? Really?
-    class NastyTableModelHack : public QAbstractTableModel
-    {
-            QAbstractItemModel& mModel;
-            QVariant mData;
-
-        public:
-
-            NastyTableModelHack (QAbstractItemModel& model);
-
-            int rowCount (const QModelIndex & parent = QModelIndex()) const;
-
-            int columnCount (const QModelIndex & parent = QModelIndex()) const;
-
-            QVariant data  (const QModelIndex & index, int role = Qt::DisplayRole) const;
-
-            bool setData (const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
-
-            QVariant getData() const;
-    };
-
-    ///< \brief Use commands instead of manipulating the model directly
-    class CommandDelegate : public QStyledItemDelegate
-    {
-            QUndoStack& mUndoStack;
-
-        public:
-
-            CommandDelegate (QUndoStack& undoStack, QObject *parent);
-
-            void setModelData (QWidget *editor, QAbstractItemModel *model, const QModelIndex& index) const;
-    };
-
     class Globals : public SubView
     {
         public:
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
new file mode 100644
index 000000000..2c9aa431f
--- /dev/null
+++ b/apps/opencs/view/world/table.cpp
@@ -0,0 +1,118 @@
+
+#include "table.hpp"
+
+#include <QStyledItemDelegate>
+#include <QHeaderView>
+#include <QSortFilterProxyModel>
+#include <QUndoStack>
+
+#include "../../model/world/data.hpp"
+
+#include "../../model/world/commands.hpp"
+
+namespace CSVWorld
+{
+    ///< \brief Getting the data out of an editor widget
+    ///
+    /// Really, Qt? Really?
+    class NastyTableModelHack : public QAbstractTableModel
+    {
+            QAbstractItemModel& mModel;
+            QVariant mData;
+
+        public:
+
+            NastyTableModelHack (QAbstractItemModel& model);
+
+            int rowCount (const QModelIndex & parent = QModelIndex()) const;
+
+            int columnCount (const QModelIndex & parent = QModelIndex()) const;
+
+            QVariant data  (const QModelIndex & index, int role = Qt::DisplayRole) const;
+
+            bool setData (const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+
+            QVariant getData() const;
+    };
+
+    ///< \brief Use commands instead of manipulating the model directly
+    class CommandDelegate : public QStyledItemDelegate
+    {
+            QUndoStack& mUndoStack;
+
+        public:
+
+            CommandDelegate (QUndoStack& undoStack, QObject *parent);
+
+            void setModelData (QWidget *editor, QAbstractItemModel *model, const QModelIndex& index) const;
+    };
+
+}
+
+CSVWorld::NastyTableModelHack::NastyTableModelHack (QAbstractItemModel& model)
+: mModel (model)
+{}
+
+int CSVWorld::NastyTableModelHack::rowCount (const QModelIndex & parent) const
+{
+    return mModel.rowCount (parent);
+}
+
+int CSVWorld::NastyTableModelHack::columnCount (const QModelIndex & parent) const
+{
+    return mModel.columnCount (parent);
+}
+
+QVariant CSVWorld::NastyTableModelHack::data  (const QModelIndex & index, int role) const
+{
+    return mModel.data (index, role);
+}
+
+bool CSVWorld::NastyTableModelHack::setData ( const QModelIndex &index, const QVariant &value, int role)
+{
+    mData = value;
+    return true;
+}
+
+QVariant CSVWorld::NastyTableModelHack::getData() const
+{
+    return mData;
+}
+
+CSVWorld::CommandDelegate::CommandDelegate (QUndoStack& undoStack, QObject *parent)
+: QStyledItemDelegate (parent), mUndoStack (undoStack)
+{}
+
+void CSVWorld::CommandDelegate::setModelData (QWidget *editor, QAbstractItemModel *model,
+        const QModelIndex& index) const
+{
+    NastyTableModelHack hack (*model);
+    QStyledItemDelegate::setModelData (editor, &hack, index);
+    mUndoStack.push (new CSMWorld::ModifyCommand (*model, index, hack.getData()));
+}
+
+
+CSVWorld::Table::Table (const CSMWorld::UniversalId& id, CSMWorld::Data& data, QUndoStack& undoStack)
+{
+    QAbstractTableModel *model = data.getTableModel (id);
+
+    int columns = model->columnCount();
+
+    for (int i=0; i<columns; ++i)
+    {
+        CommandDelegate *delegate = new CommandDelegate (undoStack, this);
+        setItemDelegateForColumn (i, delegate);
+    }
+
+    QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel (this);
+    proxyModel->setSourceModel (model);
+
+    setModel (proxyModel);
+    horizontalHeader()->setResizeMode (QHeaderView::Interactive);
+    verticalHeader()->hide();
+    setSortingEnabled (true);
+    setSelectionBehavior (QAbstractItemView::SelectRows);
+    setSelectionMode (QAbstractItemView::ExtendedSelection);
+
+    /// \todo make initial layout fill the whole width of the table
+}
\ No newline at end of file
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
new file mode 100644
index 000000000..dbb3c3443
--- /dev/null
+++ b/apps/opencs/view/world/table.hpp
@@ -0,0 +1,25 @@
+#ifndef CSV_WORLD_TABLE_H
+#define CSV_WORLD_TABLE_H
+
+#include <QTableView>
+
+class QUndoStack;
+
+namespace CSMWorld
+{
+    class Data;
+    class UniversalId;
+}
+
+namespace CSVWorld
+{
+    ///< Table widget
+    class Table : public QTableView
+    {
+        public:
+
+            Table (const CSMWorld::UniversalId& id, CSMWorld::Data& data, QUndoStack& undoStack);
+    };
+}
+
+#endif