diff --git a/mojotrollz/api/database/autoload.inc b/mojotrollz/api/database/autoload.inc
index 224b534..a5c4d98 100644
--- a/mojotrollz/api/database/autoload.inc
+++ b/mojotrollz/api/database/autoload.inc
@@ -4,4 +4,6 @@
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/creature');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/creature/qq','DBD');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest/qq','DBD');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/quest/qq','DBD');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tags');
+\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tags/qq','DBD');
\ No newline at end of file
diff --git a/mojotrollz/api/database/tags/qq/TAGS_COMMENT.php b/mojotrollz/api/database/tags/qq/TAGS_COMMENT.php
new file mode 100644
index 0000000..9b93157
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_COMMENT.php
@@ -0,0 +1,9 @@
+<?php
+namespace DBD;
+
+class TAGS_COMMENT extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'INSERT INTO mojotrollz_tags (table, id, type, comment) VALUES(?,?,?,?) ON DUPLICATE KEY UPDATE comment=VALUES(comment);'
+);}}
+
diff --git a/mojotrollz/api/database/tags/qq/TAGS_GET.php b/mojotrollz/api/database/tags/qq/TAGS_GET.php
new file mode 100644
index 0000000..d2753bb
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_GET.php
@@ -0,0 +1,12 @@
+<?php
+namespace DBD;
+
+class TAGS_GET extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'SELECT * FROM mojotrollz_tags 
+ LEFT JOIN mojotrollz_tags_type ON mojotrollz_tags.type=mojotrollz_tags_type.id
+ LEFT JOIN mojotrollz_tags_value ON mojotrollz_tags.type=mojotrollz_tags_value.type, mojotrollz_tags.value=mojotrollz_tags_value.id
+ WHERE table = ? and id = ?;'
+);}}
+
diff --git a/mojotrollz/api/database/tags/qq/TAGS_GET_TYPE.php b/mojotrollz/api/database/tags/qq/TAGS_GET_TYPE.php
new file mode 100644
index 0000000..0baa3b9
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_GET_TYPE.php
@@ -0,0 +1,12 @@
+<?php
+namespace DBD;
+
+class TAGS_GET_TYPE extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'SELECT * FROM mojotrollz_tags 
+ LEFT JOIN mojotrollz_tags_type ON mojotrollz_tags.type=mojotrollz_tags_type.id
+ LEFT JOIN mojotrollz_tags_value ON mojotrollz_tags.type=mojotrollz_tags_value.type, mojotrollz_tags.value=mojotrollz_tags_value.id
+ WHERE table = ? and id = ? and type = ?;'
+);}}
+
diff --git a/mojotrollz/api/database/tags/qq/TAGS_SET.php b/mojotrollz/api/database/tags/qq/TAGS_SET.php
new file mode 100644
index 0000000..3f97ea9
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_SET.php
@@ -0,0 +1,9 @@
+<?php
+namespace DBD;
+
+class TAGS_SET extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'INSERT INTO mojotrollz_tags (table, id, type, value) VALUES(?,?,?,?) ON DUPLICATE KEY UPDATE value=VALUES(value);'
+);}}
+
diff --git a/mojotrollz/api/database/tags/qq/TAGS_SET_COMMENT.php b/mojotrollz/api/database/tags/qq/TAGS_SET_COMMENT.php
new file mode 100644
index 0000000..4de5a66
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_SET_COMMENT.php
@@ -0,0 +1,9 @@
+<?php
+namespace DBD;
+
+class TAGS_SET_COMMENT extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'INSERT INTO mojotrollz_tags (table, id, type, value, comment) VALUES(?,?,?,?,?) ON DUPLICATE KEY UPDATE value=VALUES(value), comment=VALUES(comment);'
+);}}
+
diff --git a/mojotrollz/api/database/tags/qq/TAGS_SET_TYPE.php b/mojotrollz/api/database/tags/qq/TAGS_SET_TYPE.php
new file mode 100644
index 0000000..aeed0f0
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_SET_TYPE.php
@@ -0,0 +1,9 @@
+<?php
+namespace DBD;
+
+class TAGS_SET_TYPE extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'INSERT INTO mojotrollz_tags_type (id, table, name) VALUES(?,?,?) ON DUPLICATE KEY UPDATE name=VALUES(name);'
+);}}
+
diff --git a/mojotrollz/api/database/tags/qq/TAGS_SET_TYPE_DESCRIPTION.php b/mojotrollz/api/database/tags/qq/TAGS_SET_TYPE_DESCRIPTION.php
new file mode 100644
index 0000000..fc35f2d
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_SET_TYPE_DESCRIPTION.php
@@ -0,0 +1,9 @@
+<?php
+namespace DBD;
+
+class TAGS_SET_TYPE_DESCRIPTION extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'INSERT INTO mojotrollz_tags_type (id, table, name, description) VALUES(?,?,?,?) ON DUPLICATE KEY UPDATE name=VALUES(name), description=VALUES(description);'
+);}}
+
diff --git a/mojotrollz/api/database/tags/qq/TAGS_SET_VALUE.php b/mojotrollz/api/database/tags/qq/TAGS_SET_VALUE.php
new file mode 100644
index 0000000..9ebe660
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_SET_VALUE.php
@@ -0,0 +1,9 @@
+<?php
+namespace DBD;
+
+class TAGS_SET_VALUE extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'INSERT INTO mojotrollz_tags_value (type, id, value) VALUES(?,?,?) ON DUPLICATE KEY UPDATE value=VALUES(value);'
+);}}
+
diff --git a/mojotrollz/api/database/tags/qq/TAGS_SET_VALUE_DESCRIPTION.php b/mojotrollz/api/database/tags/qq/TAGS_SET_VALUE_DESCRIPTION.php
new file mode 100644
index 0000000..40be450
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_SET_VALUE_DESCRIPTION.php
@@ -0,0 +1,9 @@
+<?php
+namespace DBD;
+
+class TAGS_SET_VALUE_DESCRIPTION extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'INSERT INTO mojotrollz_tags_value (type, id, value, description) VALUES(?,?,?,?) ON DUPLICATE KEY UPDATE value=VALUES(value), description=VALUES(description);'
+);}}
+
diff --git a/mojotrollz/api/database/tags/tags.php b/mojotrollz/api/database/tags/tags.php
new file mode 100644
index 0000000..17a0b84
--- /dev/null
+++ b/mojotrollz/api/database/tags/tags.php
@@ -0,0 +1,26 @@
+<?php
+class tags {
+    public static function get($table, $id, $type = null){
+        if($type){
+            return \DBD\TAGS_GET_TYPE::Q1(array($table, $id, $type));}
+        new TODO("This might be problematic");
+        return \DBD\TAGS_GET::QQ(array($table, $id));}
+        
+    public static function set($table, $id, $type, $value, $comment = null){
+        if($comment){
+            return \DBD\TAGS_SET_COMMENT::QI(array($table, $id, $type, $value, $comment));}
+        return \DBD\TAGS_SET::QI(array($table, $id, $type, $value));}
+        
+    public static function comment($table, $id, $type, $comment){
+        return \DBD\TAGS_COMMENT::QI(array($table, $id, $type, $comment));}
+        
+    public static function set_type($id,$table,$name,$description=null){
+        if($description){
+            return \DBD\TAGS_SET_TYPE_DESCRIPTION::QI(array($id,$table,$name,$description));}
+        return \DBD\TAGS_SET_TYPE::QI(array($id,$table,$name));}
+    
+    public static function set_value($type,$id,$value,$description=null){
+        if($description){
+            return \DBD\TAGS_SET_VALUE_DESCRIPTION::QI($type,$id,$value,$description);}
+        return \DBD\TAGS_SET_VALUE::QI($type,$id,$value);}
+}
\ No newline at end of file
diff --git a/mojotrollz/sai/register_modules.php b/mojotrollz/sai/register_modules.php
index a7db174..a5caa9f 100644
--- a/mojotrollz/sai/register_modules.php
+++ b/mojotrollz/sai/register_modules.php
@@ -15,5 +15,5 @@ require_once dirname(__FILE__).'/saimod_mojotrollz_visuals/autoload.inc.php';
 \SYSTEM\SAI\sai::register('saimod_mojotrollz_db_reputation');
 \SYSTEM\SAI\sai::register('saimod_mojotrollz_db_script');
 \SYSTEM\SAI\sai::register('saimod_mojotrollz_db_spell');
-\SYSTEM\SAI\sai::register('saimod_mojotrollz_db_tags');
+require_once dirname(__FILE__).'/saimod_mojotrollz_db_tags/autoload.inc';
 require_once dirname(__FILE__).'/saimod_mojotrollz_import/autoload.inc.php';
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_db_tags/autoload.inc
new file mode 100644
index 0000000..0513b4d
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/autoload.inc
@@ -0,0 +1,4 @@
+<?php
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','DBD');
+\SYSTEM\SAI\sai::register('saimod_mojotrollz_db_tags');
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/db_tags.sql b/mojotrollz/sai/saimod_mojotrollz_db_tags/db_tags.sql
new file mode 100644
index 0000000..142bb11
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/db_tags.sql
@@ -0,0 +1,2 @@
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1300, 42, 0, 0, 'saimod_mojotrollz_db_tags', 'action', NULL);
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1310, 42, 2, 1300, 'list', 'table', 'INT');
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/js/saimod_mojotrollz_db_tags.js b/mojotrollz/sai/saimod_mojotrollz_db_tags/js/saimod_mojotrollz_db_tags.js
new file mode 100644
index 0000000..5a33003
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/js/saimod_mojotrollz_db_tags.js
@@ -0,0 +1,14 @@
+function init_saimod_mojotrollz_db_tags(){
+    $('#tabs_tags a').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        load_tags_tab($(this).attr('table'));        
+    });
+
+    load_tags_tab(1); 
+}
+
+function load_tags_tab(table){
+    $('#tab_content').load(SAI_ENDPOINT+'sai_mod=saimod_mojotrollz_db_tags&action=list&table='+table, function(){
+        $('img#loader').hide();});
+}
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/qq/DB_TAGS_TYPE_LIST.php b/mojotrollz/sai/saimod_mojotrollz_db_tags/qq/DB_TAGS_TYPE_LIST.php
new file mode 100644
index 0000000..b677ee2
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/qq/DB_TAGS_TYPE_LIST.php
@@ -0,0 +1,10 @@
+<?php
+namespace DBD;
+
+class DB_TAGS_TYPE_LIST extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'',
+'SELECT * FROM mojotrollz_tags_type WHERE `table` = ?;'
+);}}
+
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.js b/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.js
deleted file mode 100644
index e9fcf34..0000000
--- a/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function init_saimod_mojotrollz_db_tags(){
-    
-}
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.php b/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.php
index 3c61303..4d8aa0a 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.php
@@ -1,15 +1,20 @@
 <?php
 class saimod_mojotrollz_db_tags extends \SYSTEM\SAI\SaiModule {
     
-    public static function sai_mod_saimod_mojotrollz_db_tags(){
-        return SYSTEM\SAI\replace::replaceFile(SYSTEM\SERVERPATH(new SYSTEM\PSAI(),'saimod_mojotrollz_db_tags/tpl/content.tpl'));
-        
-    }
+    public static function sai_mod_saimod_mojotrollz_db_tags_action_list($table){
+        $elements = '';
+        $res = \DBD\DB_TAGS_TYPE_LIST::QQ(array($table));
+        while($row = $res->next()){
+            $elements .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_tags/tpl/type_list_element.tpl'),$row);}
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_tags/tpl/type_list.tpl'),array('table' => $table, 'elements' => $elements));}
     
+    public static function sai_mod_saimod_mojotrollz_db_tags(){
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_tags/tpl/saimod_mojotrollz_db_tags.tpl'),array());}
+        
     public static function html_li_menu(){return '<li><a href="#" saimenu="saimod_mojotrollz_db_tags">DB:tags</a></li><li class="divider"></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
     public static function sai_mod_saimod_mojotrollz_db_tags_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array(
-                            \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.js')));}        
+                            \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_db_tags/js/saimod_mojotrollz_db_tags.js')));}        
     public static function sai_mod_saimod_mojotrollz_db_tags_flag_css(){}
 }
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/content.tpl b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/content.tpl
deleted file mode 100644
index 30d74d2..0000000
--- a/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/content.tpl
+++ /dev/null
@@ -1 +0,0 @@
-test
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/saimod_mojotrollz_db_tags.tpl b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/saimod_mojotrollz_db_tags.tpl
new file mode 100644
index 0000000..fb786a2
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/saimod_mojotrollz_db_tags.tpl
@@ -0,0 +1,15 @@
+<h4>Tags</h4>
+<hr>
+<div class="tabbable">
+    <ul class="nav nav-tabs" id="tabs_tags">
+        <li class="active"><a href="#tab_content" table="1">Creatures</a></li>
+        <li><a href="#tab_content" table="2">Objects</a></li>
+        <li><a href="#tab_content" table="3">Items</a></li>
+        <li><a href="#tab_content" table="4">Quests</a></li>
+        <li><a href="#tab_content" table="5">Spells</a></li>
+        <img id="loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none;  float: left"/>
+    </ul>
+    <div class="tab-content">        
+        <div class="tab-pane active" id="tab_content"></div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list.tpl b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list.tpl
new file mode 100644
index 0000000..51d4428
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list.tpl
@@ -0,0 +1,18 @@
+<table class="sai_table">
+    <tr>
+        <th>id</th>
+        <th>table</th>
+        <th>name</th>
+        <th>description</th>
+        <th>action</th>
+    </tr>
+    <tr>
+        <td><input id="input_id" type="number"/></td>
+        <td>${table}</td>
+        <td><input id="input_name" type="text"/></td>
+        <td><input id="input_description" type="text"/></td>
+        <td><button class="btn btn-danger" id="btn_edit">Add/Edit</button></td>
+    </tr>
+    <hr>
+    ${elements}
+</table>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list_element.tpl b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list_element.tpl
new file mode 100644
index 0000000..dc770dc
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list_element.tpl
@@ -0,0 +1,11 @@
+<tr>
+    <td>${id}</td>
+    <td>${table}</td>
+    <td>${name}</td>
+    <td>${description}</td>
+    <td>
+        <button class="btn btn-success" id="btn_edit">Edit</button>
+        <button class="btn btn-danger" id="btn_del">Del</button>
+        <button class="btn" id="btn_values">Values</button>
+    </td>
+</tr>
\ No newline at end of file