diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..abcc013
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.idea
+.DS_Store
+composer.lock
+/vendor
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5a7a400
--- /dev/null
+++ b/README.md
@@ -0,0 +1,71 @@
+# Inky
+
+A PHP Implementation of ZURB's Foundation for Email parser ([Inky](https://github.com/zurb/inky)).
+
+## Installation
+
+You can install this bundle using composer
+
+    composer require hampe/inky
+    
+or add the package to your `composer.json` file directly.
+
+## Usage and Examples
+
+### Basic Usage.
+
+```php
+<?php
+use Hampe\Inky\Inky;
+
+$gridColumns = 12; //optional, default is 12
+$additionalComponentFactories = []; //optional
+$inky = new Inky($gridColumns, $additionalComponentFactories);
+
+$inky->releaseTheKraken('html...');
+```  
+    
+### Add Tag-Alias
+   
+```php
+<?php
+use Hampe\Inky\Inky;
+
+$inky = new Inky();
+$inky->addAlias('test', 'callout')
+
+$inky->releaseTheKraken('<test>123</test>'); //equal to "<callout>123</callout>"
+``` 
+    
+### Add your own Custom Component Factory
+   
+Add your own Custom Component Factory, to convert HTML-Tags.   
+   
+```
+<?php
+
+use Hampe\Inky\Component\ComponentFactoryInterface;
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class TestComponentFactory implements ComponentFactoryInterface 
+{
+    public function getName()
+    {
+        return 'test' // name of the html tag.
+    }
+    
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        // ...
+    }
+}
+
+$inky = new Inky();
+$inky->addComponentFactory(new TestComponentFactory());
+$inky->releaseTheKraken('<test></test>');
+```    
+    
+## License
+See the [LICENSE](LICENSE) file for license info (it's the MIT license).
+        
\ No newline at end of file
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..db99e20
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,23 @@
+{
+    "name": "hampe/inky-parse",
+    "description": "PHP Implementation of ZURB's Foundation for Email parser (Inky)",
+    "version":     "1.2.3.0",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Thomas Hampe",
+            "email": "github@hampe.co"
+        }
+    ],
+    "require-dev": {
+      "phpunit/phpunit": "4.8.*"
+    },
+    "autoload": {
+        "psr-4": {
+          "Hampe\\Inky\\": "src/"
+        }
+    },
+    "require": {
+        "paquettg/php-html-parser": "^1.6"
+    }
+}
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..826993b
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<phpunit bootstrap="vendor/autoload.php">
+    <testsuites>
+        <testsuite name="inky">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
\ No newline at end of file
diff --git a/src/Component/AbstractComponentFactory.php b/src/Component/AbstractComponentFactory.php
new file mode 100644
index 0000000..caccb6c
--- /dev/null
+++ b/src/Component/AbstractComponentFactory.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ *  AbstractComponent.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   AbstractComponent.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       10.01.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+
+use PHPHtmlParser\Dom\HtmlNode;
+
+abstract class AbstractComponentFactory implements ComponentFactoryInterface
+{
+
+    protected function copyChildren(HtmlNode $fromElement, HtmlNode $toElement)
+    {
+        $newNodeChildren = $fromElement->getChildren();
+        foreach($newNodeChildren as $child) {
+            $toElement->addChild($child);
+        }
+        return $newNodeChildren;
+    }
+
+    protected function node($tag, $attributes = array())
+    {
+        $node = new HtmlNode($tag);
+        foreach($attributes as $key => $attribute) {
+            $node->setAttribute($key, $attribute);
+        }
+        return $node;
+    }
+
+    protected function table($attributes = array())
+    {
+        return $this->node('table', $attributes);
+    }
+
+    protected function tbody($attributes = array())
+    {
+        return $this->node('tbody', $attributes);
+    }
+
+    protected function tr($attributes = array())
+    {
+        return $this->node('tr', $attributes);
+    }
+
+    protected function td($attributes = array())
+    {
+        return $this->node('td', $attributes);
+    }
+
+    protected function th($attributes = array())
+    {
+        return $this->node('th', $attributes);
+    }
+
+    protected function img($attributes = array())
+    {
+        $node = $this->node('img', $attributes);
+        $node->getTag()->selfClosing();
+        return $node;
+    }
+
+    protected function elementHasCssClass(HtmlNode $element, $cssClass)
+    {
+        $class = $element->getAttribute('class');
+        return is_string($class) && strpos($class, $cssClass) !== false;
+    }
+
+    protected function addCssClass($cssClass, HtmlNode $element)
+    {
+        $element->setAttribute('class', trim($cssClass . ' ' . $element->getAttribute('class')));
+    }
+}
\ No newline at end of file
diff --git a/src/Component/BlockGridFactory.php b/src/Component/BlockGridFactory.php
new file mode 100644
index 0000000..b2f6f5f
--- /dev/null
+++ b/src/Component/BlockGridFactory.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ *  BlockGridFactory.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   BlockGridFactory.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       27.02.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class BlockGridFactory extends AbstractComponentFactory
+{
+    const NAME = 'block-grid';
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * <block-grid up="{up}">{inner}</block-grid>
+     * ------------------------------------------
+     * <table class="block-grid up-{up}">
+     *  <tr>{inner}</tr>
+     * </table>
+     *
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $upAttribute = (string) $element->getAttribute('up');
+        $table = $this->table(array('class' => trim(sprintf(
+            'block-grid up-%s %s',
+            $upAttribute,
+            (string) $element->getAttribute('class')
+        ))));
+        $tr = $this->tr();
+        $this->copyChildren($element, $tr);
+        $table->addChild($tr);
+
+        return $table;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Component/ButtonFactory.php b/src/Component/ButtonFactory.php
new file mode 100644
index 0000000..75989f7
--- /dev/null
+++ b/src/Component/ButtonFactory.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ *  Button.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   Button.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       10.01.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class ButtonFactory extends AbstractComponentFactory
+{
+    const NAME = 'button';
+
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+
+    /**
+     * <button href="" class="{class}">{inner}</button>
+     * -----------------------------------------------
+     * <table class="button {class}">
+     *  <tr>
+     *      <td>
+     *          <table>
+     *              <tr>
+     *                  <td>{inner}</td>
+     *              </tr>
+     *          </table>
+     *      </td>
+     *  </tr>
+     * </table>
+     *
+     * - OR -
+     *
+     * <button href="" class="expand {class}">{inner}</inner>
+     * -----------------------------------------------
+     * <table class="button {class}">
+     *  <tr>
+     *      <td>
+     *          <table>
+     *              <tr>
+     *                  <center>
+     *                      <td>{inner}</td>
+     *                  </center>
+     *              </tr>
+     *          </table>
+     *      </td>
+     *  </tr>
+     * </table>
+     *
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $attributes = $element->getAttributes();
+        if(isset($attributes['href'])) {
+            $href= $attributes['href'];
+            unset($attributes['href']);
+        } else {
+            $href = null;
+        }
+
+        $table = $this->table($attributes);
+        $this->addCssClass('button', $table);
+        $tr = $this->tr();
+        $td = $this->td();
+        $childTable = $this->table();
+        $childTr = $this->tr();
+        $childTd = $this->td();
+
+        $lastChild = $childTd;
+        //wrap in center if element has class expand
+        if($this->elementHasCssClass($element, 'expand')) {
+            $center = $this->node('center');
+            $lastChild->addChild($center);
+            $lastChild = $center;
+        }
+        //wrap in <a /> if element has href
+        if($href !== null) {
+            $a = $this->node('a', array('href' => (string) $href));
+            $lastChild->addChild($a);
+            $lastChild = $a;
+        }
+
+        $this->copyChildren($element, $lastChild);
+
+        $childTr->addChild($childTd);
+        $childTable->addChild($childTr);
+        $td->addChild($childTable);
+        $tr->addChild($td);
+        $table->addChild($tr);
+
+        return $table;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Component/CalloutFactory.php b/src/Component/CalloutFactory.php
new file mode 100644
index 0000000..b3d51b8
--- /dev/null
+++ b/src/Component/CalloutFactory.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ *  CalloutFactory.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   CalloutFactory.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       13.03.16
+ */
+
+
+namespace Hampe\Inky\Component;
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class CalloutFactory extends AbstractComponentFactory
+{
+
+    const NAME = 'callout';
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * <callout>{inner}</callout>
+     * ----------------------------------
+     * <table>
+     *      <tr>
+     *          <th class="callout {class}">{inner}</th>
+     *      </tr>
+     * </table>
+     *
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $table = $this->table();
+        $tr = $this->tr();
+
+        $th = $this->th($element->getAttributes());
+        $this->addCssClass('callout', $th);
+        $this->copyChildren($element, $th);
+
+        $tr->addChild($th);
+        $table->addChild($tr);
+        return $table;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Component/CenterFactory.php b/src/Component/CenterFactory.php
new file mode 100644
index 0000000..e137a52
--- /dev/null
+++ b/src/Component/CenterFactory.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ *  CenterFactory.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   CenterFactory.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       13.03.16
+ */
+
+
+namespace Hampe\Inky\Component;
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class CenterFactory extends AbstractComponentFactory
+{
+    const NAME = 'center';
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $isParsed = true;
+        foreach($element->getChildren() as $childElement) {
+            if($childElement instanceof HtmlNode) {
+                if($childElement->getAttribute('align') !== 'center'
+                    || !$this->elementHasCssClass($childElement, 'text-center')) {
+                    $isParsed = false;
+                }
+            }
+        }
+        if($isParsed) {
+            return $element;
+        }
+
+        $center = $this->node('center', $element->getAttributes());
+        foreach($element->getChildren() as $childElement) {
+            if($childElement instanceof HtmlNode) {
+                $childElement->setAttribute('align', 'center');
+                $this->addCssClass('text-center', $childElement);
+            }
+            $center->addChild($childElement);
+        }
+        return $center;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Component/ColumnsFactory.php b/src/Component/ColumnsFactory.php
new file mode 100644
index 0000000..7fa4938
--- /dev/null
+++ b/src/Component/ColumnsFactory.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ *  ColumnFactory.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   ColumnFactory.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       23.01.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class ColumnsFactory extends AbstractComponentFactory
+{
+    const NAME = 'columns';
+
+    protected $gridColumns;
+
+    /**
+     * @return int
+     */
+    public function getGridColumns()
+    {
+        return (int) $this->gridColumns;
+    }
+
+    /**
+     * @param int $gridColumns
+     */
+    public function setGridColumns($gridColumns)
+    {
+        $this->gridColumns = (int) $gridColumns;
+    }
+
+
+
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * <columns small="{small}" large="{large}">{inner}</columns>
+     * --------------------------------------------------------
+     * <th class="small-{small} large-{large} columns">
+     *      <table>
+     *          <tr>
+     *              <th>
+     *                  {inner}
+     *              </th>
+     *              <th class="expander"></th>
+     *          </tr>
+     *      </table>
+     * </th>
+     *
+     *
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $this->setGridColumns($inkyInstance->getGridColumns());
+        $th = $this->th();
+        $cssClass = $this->prepareCssClass($element);
+        $th->setAttribute('class' ,$cssClass);
+        $table = $this->table();
+        $tr = $this->tr();
+        $childTh = $this->th();
+        $hasRowChildren = $this->hasRowChild($element, $inkyInstance); // must be called before children are moved
+        $this->copyChildren($element, $childTh);
+        $tr->addChild($childTh);
+        //if element contains as <row />
+        if($hasRowChildren) {
+            $expander = $this->th(array('class' => 'expander'));
+            $tr->addChild($expander);
+        }
+        $table->addChild($tr);
+        $th->addChild($table);
+
+        return $th;
+    }
+
+    protected function getColumnCount(HtmlNode $element)
+    {
+        $count = 0;
+        foreach($element->getParent()->getChildren() as $sibling) {
+            /**  */
+            if($sibling instanceof HtmlNode) {
+                $count++;
+            }
+        }
+        return $count;
+    }
+
+    protected function isLastColumn(HtmlNode $element)
+    {
+        $isLast = false;
+        foreach($element->getParent()->getChildren() as $column) {
+            if($column instanceof HtmlNode) {
+                $isLast = $element->id() === $column->id();
+            }
+        }
+        return $isLast;
+    }
+
+    protected function isFirstColumn(HtmlNode $element)
+    {
+        $isFirst = false;
+        foreach(array_reverse($element->getParent()->getChildren()) as $column) {
+            if($column instanceof HtmlNode) {
+                $isFirst = $element->id() === $column->id();
+            }
+        }
+        return $isFirst;
+    }
+
+    /**
+     * @param HtmlNode $element
+     * @return string
+     */
+    protected function prepareCssClass(HtmlNode $element)
+    {
+        // Prepare CSS Class
+        $cssClasses = array($this->getName());
+        if($element->getAttribute('class')) {
+            $cssClasses[] = $element->getAttribute('class');
+        }
+        // small
+        $smallCount = (int) $element->getAttribute('small');
+        if($smallCount === 0) {
+            $smallCount = $this->getGridColumns();
+        }
+        $cssClasses[] = sprintf('small-%s', $smallCount);
+        // large
+        $largeCount = (int) $element->getAttribute('large');
+        if($largeCount === 0) {
+            $columnCount = $this->getColumnCount($element);
+            $largeCount = floor($this->getGridColumns()/$columnCount);
+        }
+        $cssClasses[] =  sprintf('large-%s', $largeCount);
+        //last
+        if($this->isLastColumn($element)) {
+            $cssClasses[] = 'last';
+        }
+        //first
+        if($this->isFirstColumn($element)) {
+            $cssClasses[] = 'first';
+        }
+
+        return implode(' ', $cssClasses);
+    }
+
+    protected function copyChildren(HtmlNode $fromElement, HtmlNode $toElement)
+    {
+
+        $newNodeChildren = $fromElement->getChildren();
+        foreach($newNodeChildren as $child) {
+            $toElement->addChild($child);
+        }
+        return $newNodeChildren;
+
+    }
+
+    protected function hasRowChild(HtmlNode $element, Inky $inkyInstance)
+    {
+        $rowTags = $inkyInstance->getAllAliasForTagName('row');
+        //check if element is a row
+        if($this->elementHasCssClass($element, 'row') || in_array($element->getTag()->name(), $rowTags)) {
+            return true;
+        }
+        foreach($element->getChildren() as $child) {
+            if($child instanceof HtmlNode && $this->hasRowChild($child, $inkyInstance)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Component/ComponentFactoryInterface.php b/src/Component/ComponentFactoryInterface.php
new file mode 100644
index 0000000..8d745a8
--- /dev/null
+++ b/src/Component/ComponentFactoryInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ *  ComponentFactoryInterface.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   ComponentFactoryInterface.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       10.01.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+interface ComponentFactoryInterface
+{
+
+    /**
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance);
+
+}
\ No newline at end of file
diff --git a/src/Component/ContainerFactory.php b/src/Component/ContainerFactory.php
new file mode 100644
index 0000000..e2f0f2d
--- /dev/null
+++ b/src/Component/ContainerFactory.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ *  ContainerFactory.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   ContainerFactory.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       10.01.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class ContainerFactory extends AbstractComponentFactory
+{
+
+    const NAME = 'container';
+
+    public function getName()
+    {
+        return self::NAME;
+    }
+    /**
+     * <container>{inner}</container>
+     * ----------------------------------
+     * <table class="container {class}">
+     *  <tbody>
+     *      <tr>
+     *          <td>{inner}</td>
+     *      </tr>
+     *  </tbody>
+     * </table>
+     *
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $table = $this->table($element->getAttributes());
+        $this->addCssClass('container', $table);
+
+        $tbody = $this->tbody();
+        $tr = $this->tr();
+        $td = $this->td();
+        $this->copyChildren($element, $td);
+
+        $tr->addChild($td);
+        $tbody->addChild($tr);
+        $table->addChild($tbody);
+        return $table;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Component/InkyFactory.php b/src/Component/InkyFactory.php
new file mode 100644
index 0000000..3b44841
--- /dev/null
+++ b/src/Component/InkyFactory.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ *  InkyFactory.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   InkyFactory.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       27.02.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class InkyFactory extends AbstractComponentFactory
+{
+
+    protected $inkySrc = 'https://raw.githubusercontent.com/arvida/emoji-cheat-sheet.com/master/public/graphics/emojis/octopus.png';
+
+    const NAME = 'inky';
+
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * <inky />
+     * ----------------------------
+     * <tr>
+     *  <td>
+     *      <img src="{inkySrc}" />
+     *  </td>
+     * </tr>
+     *
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $tr = $this->tr();
+        $td = $this->td();
+        $img = $this->img(array('src' => $this->inkySrc));
+        $td->addChild($img);
+        $tr->addChild($td);
+
+        return $tr;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Component/MenuFactory.php b/src/Component/MenuFactory.php
new file mode 100644
index 0000000..7f74686
--- /dev/null
+++ b/src/Component/MenuFactory.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ *  MenuFactory.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuFactory.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       27.02.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class MenuFactory extends AbstractComponentFactory
+{
+
+    const NAME = 'menu';
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * <menu>{inner}</menu>
+     * ----------------------------
+     * <table class="menu {class}">
+     *  <tr>{inner}</tr>
+     * </table>
+     *
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $table = $this->table($element->getAttributes());
+        $this->addCssClass('menu', $table);
+        $tr = $this->tr();
+
+        if($this->elementHasCssClass($element, 'vertical')) {
+            $th = $this->th();
+            foreach($element->getChildren() as $childElement) {
+                if($childElement instanceof HtmlNode) {
+                    $childTable = $this->table(array('class' => 'menu-item'));
+                    $childTr = $this->tr();
+
+                    $childTr->addChild($childElement);
+                    $childTable->addChild($childTr);
+                    $th->addChild($childTable);
+                }else {
+                    $th->addChild($childElement);
+                }
+            }
+            $tr->addChild($th);
+        }else {
+            $this->copyChildren($element, $tr);
+        }
+        $table->addChild($tr);
+
+        return $table;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Component/MenuItemFactory.php b/src/Component/MenuItemFactory.php
new file mode 100644
index 0000000..95d9ff8
--- /dev/null
+++ b/src/Component/MenuItemFactory.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ *  MenuItemFactory.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuItemFactory.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       27.02.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class MenuItemFactory extends AbstractComponentFactory
+{
+
+    const NAME = 'item';
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * <item href="{href}">{inner}</item>
+     * ------------------------------
+     * <th>
+     *  <a href="{href}">{inner}</a>
+     * </th>
+     *
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $attributes = $element->getAttributes();
+        if(isset($attributes['href'])) {
+            $href = $attributes['href'];
+            unset($attributes['href']);
+        } else {
+            $href = null;
+        }
+        $th = $this->th($attributes);
+        $a = $this->node('a');
+        if($href !== null) {
+            $a->setAttribute('href', $href);
+        }
+        $this->copyChildren($element, $a);
+        $th->addChild($a);
+
+        return $th;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Component/RowFactory.php b/src/Component/RowFactory.php
new file mode 100644
index 0000000..240dbd2
--- /dev/null
+++ b/src/Component/RowFactory.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ *  Row.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   Row.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       10.01.16
+ */ 
+
+
+namespace Hampe\Inky\Component;
+
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom\HtmlNode;
+
+class RowFactory extends AbstractComponentFactory
+{
+
+    const NAME = 'row';
+
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * <row>{inner}</row>
+     * ---------------------------
+     * <table class="row {class}">
+     *  <tbody>
+     *      <tr>{inner}</tr>
+     *  </tbody>
+     * </table>
+     *
+     * @param HtmlNode $element
+     * @param Inky $inkyInstance
+     *
+     * @return HtmlNode
+     */
+    public function parse(HtmlNode $element, Inky $inkyInstance)
+    {
+        $table = $this->table($element->getAttributes());
+        $this->addCssClass('row', $table);
+        $body = $this->tbody();
+        $tr = $this->tr();
+        $body->addChild($tr);
+        $table->addChild($body);
+        $this->copyChildren($element, $tr);
+        return $table;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/Inky.php b/src/Inky.php
new file mode 100644
index 0000000..f2f1134
--- /dev/null
+++ b/src/Inky.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ *  Inky.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   Inky.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       10.01.16
+ */ 
+
+
+namespace Hampe\Inky;
+
+
+use Hampe\Inky\Component\CalloutFactory;
+use Hampe\Inky\Component\BlockGridFactory;
+use Hampe\Inky\Component\ButtonFactory;
+use Hampe\Inky\Component\CenterFactory;
+use Hampe\Inky\Component\ColumnsFactory;
+use Hampe\Inky\Component\ComponentFactoryInterface;
+use Hampe\Inky\Component\ContainerFactory;
+use Hampe\Inky\Component\InkyFactory;
+use Hampe\Inky\Component\MenuFactory;
+use Hampe\Inky\Component\MenuItemFactory;
+use Hampe\Inky\Component\RowFactory;
+use PHPHtmlParser\Dom;
+use PHPHtmlParser\Dom\HtmlNode;
+use PHPHtmlParser\Exceptions\CircularException;
+
+class Inky
+{
+
+    protected $alias = array();
+
+    protected $componentFactory = array();
+
+    /**
+     * @var int
+     */
+    protected $gridColumns;
+
+    public function __construct($gridColumns = 12, $componentFactories = array())
+    {
+        $this->setGridColumns($gridColumns);
+        $this->addComponentFactory(new RowFactory());
+        $this->addComponentFactory(new ContainerFactory());
+        $this->addComponentFactory(new ButtonFactory());
+        $this->addComponentFactory(new InkyFactory());
+        $this->addComponentFactory(new BlockGridFactory());
+        $this->addComponentFactory(new MenuFactory());
+        $this->addComponentFactory(new MenuItemFactory());
+        $this->addComponentFactory(new ColumnsFactory());
+        $this->addComponentFactory(new CalloutFactory());
+        $this->addComponentFactory(new CenterFactory());
+
+        foreach($componentFactories as $componentFactory) {
+            if($componentFactory instanceof ComponentFactoryInterface) {
+                $this->addComponentFactory($componentFactory);
+            }
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function getGridColumns()
+    {
+        return $this->gridColumns;
+    }
+
+    /**
+     * @param int $gridColumns
+     */
+    public function setGridColumns($gridColumns)
+    {
+        $this->gridColumns = (int) $gridColumns;
+    }
+
+    /**
+     * Adds an alisa for a component
+     *
+     * @param $alias
+     * @param $tagName
+     * @return $this
+     */
+    public function addAlias($alias, $tagName)
+    {
+        if($this->getComponentFactory($tagName)) {
+            $this->alias[(string) $alias] = (string) $tagName;
+        }
+        return $this;
+    }
+
+    /**
+     * removes an alias
+     *
+     * @param $alias string
+     * @return $this
+     */
+    public function removeAlias($alias)
+    {
+        unset($this->alias[$alias]);
+        return $this;
+    }
+
+    public function getAllAliasForTagName($tagName)
+    {
+        $allAlisa = array($tagName);
+        foreach($this->alias as $alias => $tag) {
+            if($tag == $tagName) {
+                $allAlisa[] = $alias;
+            }
+        }
+        return $allAlisa;
+    }
+
+    /**
+     * returns a Component Factory for a given tag or alias
+     *
+     * @param $tagName
+     * @return null|ComponentFactoryInterface
+     */
+    public function getComponentFactory($tagName)
+    {
+        //check for alias first
+        if(isset($this->alias[$tagName])) {
+            $tagName = $this->alias[$tagName];
+        }
+
+        if(
+            isset($this->componentFactory[$tagName])
+            && $this->componentFactory[$tagName] instanceof ComponentFactoryInterface
+        ) {
+            return $this->componentFactory[$tagName];
+        }
+
+        return null;
+    }
+
+    /**
+     * add a Component Factory
+     *
+     * @param ComponentFactoryInterface $componentFactory
+     * @return $this
+     */
+    public function addComponentFactory(ComponentFactoryInterface $componentFactory)
+    {
+        $this->componentFactory[$componentFactory->getName()] = $componentFactory;
+        return $this;
+    }
+
+    /**
+     * @return ComponentFactoryInterface[]
+     */
+    protected function getAllComponentFactories()
+    {
+        $factories = $this->componentFactory;
+        foreach($this->alias as $alias => $name) {
+            if($factory = $this->getComponentFactory($name)) {
+                $factories[$alias] = $factory;
+            }
+        }
+        return $factories;
+    }
+
+    /**
+     * @param $html
+     * @return string
+     * @throws CircularException
+     */
+    public function releaseTheKraken($html)
+    {
+        $dom = new Dom();
+        $dom->load((string) $html);
+
+        $parseCounter = 0;
+        while($this->parse($dom)) {
+            $parseCounter++;
+            if($parseCounter >= 100) {
+                throw new CircularException('Inky reached max parsing runs of '.$parseCounter);
+            }
+        };
+        return $dom->root->outerhtml;
+    }
+
+    protected function parse(Dom $dom)
+    {
+        $parseInComplete = false;
+        foreach($this->getAllComponentFactories() as $tag => $factory) {
+            $elements = $dom->getElementsByTag($tag);
+            foreach($elements as $element) {
+                /** @var HtmlNode $element */
+                $newElement = $factory->parse($element, $this);
+                if(!$newElement instanceof HtmlNode) {
+                    continue;
+                }
+                // replace element
+                if($newElement->id() !== $element->id()) {
+                    $parseInComplete = true;
+                    //replace element with new element
+                    $parent = $element->getParent();
+                    $siblings = $element->getParent()->getChildren();
+                    foreach($siblings as $sibling) {
+                        /** @var $sibling HtmlNode*/
+                        $parent->removeChild($sibling->id());
+                        if($sibling->id() === $element->id()) {
+                            $parent->addChild($newElement);
+                        }else {
+                            $parent->addChild($sibling);
+                        }
+                    }
+                }
+            }
+        }
+        return $parseInComplete;
+    }
+
+}
\ No newline at end of file
diff --git a/tests/Component/AbstractComponentFactoryTest.php b/tests/Component/AbstractComponentFactoryTest.php
new file mode 100644
index 0000000..3ffc145
--- /dev/null
+++ b/tests/Component/AbstractComponentFactoryTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ *  AbstractComponentFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   AbstractComponentFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       28.02.16
+ */ 
+
+
+namespace Component;
+
+
+use Hampe\Inky\Inky;
+use PHPHtmlParser\Dom;
+
+class AbstractComponentFactoryTest extends \PHPUnit_Framework_TestCase {
+
+    protected $inky = null;
+
+    protected $testCases = array(
+        'Case 1' => array(
+            'from' => '',
+            'to' => ''
+        )
+    );
+
+    protected function getInkyInstance()
+    {
+        if(!$this->inky) {
+            $this->inky = new Inky();
+        }
+        return $this->inky;
+    }
+
+    public function testParse()
+    {
+        $inky = $this->getInkyInstance();
+        foreach($this->testCases as $caseName => $testCase) {
+            $fromHtml = trim(preg_replace('~>\s+<~', '><', $testCase['from']));
+            $dom = new Dom();
+            $dom->load((string)  trim(preg_replace('~>\s+<~', '><', $testCase['to'])));
+            $toHtml = $dom->root->outerHtml();
+            $result = $inky->releaseTheKraken($fromHtml);
+            $this->assertEquals($toHtml, $result, sprintf('Case failed: %s', $caseName));
+        }
+    }
+
+}
diff --git a/tests/Component/BlockGridFactoryTest.php b/tests/Component/BlockGridFactoryTest.php
new file mode 100644
index 0000000..2762010
--- /dev/null
+++ b/tests/Component/BlockGridFactoryTest.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ *  MenuFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       28.02.16
+ */
+
+namespace Component;
+
+class BlockFactoryTest extends AbstractComponentFactoryTest
+{
+
+    protected $testCases = array(
+        'Case 1' => array(
+            'from' => '<block-grid up="12">Html</block-grid>',
+            'to' => '<table class="block-grid up-12"><tr>Html</tr></table>'
+        )
+    );
+
+}
diff --git a/tests/Component/ButtonFactoryTest.php b/tests/Component/ButtonFactoryTest.php
new file mode 100644
index 0000000..586fa40
--- /dev/null
+++ b/tests/Component/ButtonFactoryTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ *  MenuFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       28.02.16
+ */
+
+namespace Component;
+
+class ButtonFactoryTest extends AbstractComponentFactoryTest
+{
+
+    protected $testCases = array(
+        'creates a simple button' => array(
+            'from'  =>  '<button href="http://zurb.com">Button</button>',
+            'to'    =>  '
+                        <table class="button">
+                            <tr>
+                              <td>
+                                <table>
+                                  <tr>
+                                    <td><a href="http://zurb.com">Button</a></td>
+                                  </tr>
+                                </table>
+                              </td>
+                            </tr>
+                        </table>
+                        '
+        ),
+        'creates a button with classes' => array(
+            'from'  => '<button class="small alert" href="http://zurb.com">Button</button>',
+            'to'    => '
+                        <table class="button small alert">
+                            <tr>
+                              <td>
+                                <table>
+                                  <tr>
+                                    <td><a href="http://zurb.com">Button</a></td>
+                                  </tr>
+                                </table>
+                              </td>
+                            </tr>
+                        </table>
+            ',
+        ),
+        'creates a correct expanded button' => array(
+            'from'  => '<button class="expand" href="http://zurb.com">Button</button>',
+            'to'    => '
+                        <table class="button expand">
+                            <tr>
+                              <td>
+                                <table>
+                                  <tr>
+                                    <td>
+                                      <center><a href="http://zurb.com" align="center" class="text-center">Button</a></center>
+                                    </td>
+                                  </tr>
+                                </table>
+                              </td>
+                            </tr>
+                        </table>
+            ',
+        ),
+        'Case 1' => array(
+            'from' => '<button class="test">Html</button>',
+            'to' => '<table class="button test"><tr><td><table><tr><td>Html</td></tr></table></td></tr></table>'
+        ),
+        'Case 2' => array(
+            'from' => '<button href="http://example.com/123" class="test">Html</button>',
+            'to' => '<table class="button test"><tr><td><table><tr><td><a href="http://example.com/123">Html</a></td></tr></table></td></tr></table>'
+        ),
+        'Case 4' => array(
+            'from' => '<button class="test expand"><p>Html</p></button>',
+            'to' => '<table class="button test expand"><tr><td><table><tr><td><center><p align="center" class="text-center">Html</p></center></td></tr></table></td></tr></table>'
+        ),
+        'Case 5' => array(
+            'from' => '<button href="http://example.com/123" class="test expand">Html</button>',
+            'to' => '<table class="button test expand"><tr><td><table><tr><td><center><a href="http://example.com/123" align="center" class="text-center">Html</a></center></td></tr></table></td></tr></table>'
+        )
+    );
+
+}
diff --git a/tests/Component/CalloutFactoryTest.php b/tests/Component/CalloutFactoryTest.php
new file mode 100644
index 0000000..f33c0ac
--- /dev/null
+++ b/tests/Component/CalloutFactoryTest.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ *  Test.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   Test.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       13.03.16
+ */ 
+
+
+namespace Component;
+
+
+class Test extends AbstractComponentFactoryTest {
+    protected $testCases = array(
+        'creates a callout with correct syntax' => array(
+            'from'  =>  '<callout></callout>',
+            'to'    =>  '
+                        <table>
+                            <tr>
+                              <th class="callout"></th>
+                            </tr>
+                        </table>
+                        '
+        ),
+        'copies classes to the final HTML' => array(
+            'from'  =>  '<callout class="primary"></callout>',
+            'to'    =>  '
+                        <table>
+                            <tr>
+                              <th class="callout primary"></th>
+                            </tr>
+                        </table>
+                        '
+        ),
+        'Case 1' => array(
+            'from' => '<callout class="test">Html</callout>',
+            'to' => '<table><tr><th class="callout test">Html</th></tr></table>'
+        )
+    );
+}
diff --git a/tests/Component/CenterFactoryTest.php b/tests/Component/CenterFactoryTest.php
new file mode 100644
index 0000000..4955dd9
--- /dev/null
+++ b/tests/Component/CenterFactoryTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ *  CenterFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   CenterFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       13.03.16
+ */ 
+
+
+namespace Component;
+
+
+class CenterFactoryTest extends AbstractComponentFactoryTest
+{
+    protected $testCases = array(
+        'Applies a text-center class and center alignment attribute to the first child' => array(
+            'from' =>   '
+                        <center>
+                            <div>Html</div>
+                        </center>
+                        ',
+            'to' =>     '
+                        <center>
+                            <div align="center" class="text-center">Html</div>
+                        </center>
+                        '
+        ),
+        'Does not choke if center tags are nested' => array(
+            'from' =>   '
+                        <center>
+                            <center></center>
+                        </center>
+                        ',
+            'to' =>     '
+                        <center>
+                            <center align="center" class="text-center"></center>
+                        </center>
+                        '
+        )
+    );
+}
diff --git a/tests/Component/ColumnsFactoryTest.php b/tests/Component/ColumnsFactoryTest.php
new file mode 100644
index 0000000..c67ed6c
--- /dev/null
+++ b/tests/Component/ColumnsFactoryTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ *  MenuFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       28.02.16
+ */
+
+namespace Component;
+
+class ColumnsFactoryTest extends AbstractComponentFactoryTest
+{
+
+    protected $testCases = array(
+        'Case 1' => array(
+            'from' => '<columns small="3" large="5" class="test t123">Html</columns>',
+            'to' => '<th class="columns test t123 small-3 large-5 last first"><table><tr><th>Html</th></tr></table></th>'
+        ),
+        'Case 2 (no small attribute)' => array(
+            'from' => '<columns large="12">Html</columns>',
+            'to' => '<th class="columns small-12 large-12 last first"><table><tr><th>Html</th></tr></table></th>'
+        ),
+        'Case 3 (no large attribute)' => array(
+            'from' => '<div><columns>Html</columns><columns>Html</columns></div>',
+            'to' => '<div><th class="columns small-12 large-6 first"><table><tr><th>Html</th></tr></table></th><th class="columns small-12 large-6 last"><table><tr><th>Html</th></tr></table></th></div>'
+        ),
+        'Case 4 (inside row)' => array(
+            'from' => '<columns small="3" large="5"><row>Html</row></columns>',
+            'to' => '<th class="columns small-3 large-5 last first"><table><tr><th><table class="row"><tbody><tr>Html</tr></tbody></table></th><th class="expander"></th></tr></table></th>'
+        ),
+    );
+
+}
diff --git a/tests/Component/ContainerFactoryTest.php b/tests/Component/ContainerFactoryTest.php
new file mode 100644
index 0000000..d9c37c0
--- /dev/null
+++ b/tests/Component/ContainerFactoryTest.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ *  MenuFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       28.02.16
+ */
+
+namespace Component;
+
+class ContainerFactoryTest extends AbstractComponentFactoryTest
+{
+
+    protected $testCases = array(
+        'Case 1' => array(
+            'from' => '<container class="class2 class-test">Html</container>',
+            'to' => '<table class="container class2 class-test"><tbody><tr><td>Html</td></tr></tbody></table>'
+        )
+    );
+
+}
diff --git a/tests/Component/InkyFactoryTest.php b/tests/Component/InkyFactoryTest.php
new file mode 100644
index 0000000..b90874c
--- /dev/null
+++ b/tests/Component/InkyFactoryTest.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ *  MenuFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       28.02.16
+ */
+
+namespace Component;
+
+class InkyFactoryTest extends AbstractComponentFactoryTest {
+
+    protected $testCases = array(
+        'Case 1' => array(
+            'from' => '<inky />',
+            'to' => '<tr><td><img src="https://raw.githubusercontent.com/arvida/emoji-cheat-sheet.com/master/public/graphics/emojis/octopus.png" /></td></tr>'
+        ),
+        'Case 2' => array(
+            'from' => '<inky></inky>',
+            'to' => '<tr><td><img src="https://raw.githubusercontent.com/arvida/emoji-cheat-sheet.com/master/public/graphics/emojis/octopus.png" /></td></tr>'
+        )
+    );
+
+}
diff --git a/tests/Component/MenuFactoryTest.php b/tests/Component/MenuFactoryTest.php
new file mode 100644
index 0000000..936c3ac
--- /dev/null
+++ b/tests/Component/MenuFactoryTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ *  MenuFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       28.02.16
+ */
+
+namespace Component;
+
+class MenuFactoryTest extends AbstractComponentFactoryTest {
+
+    protected $testCases = array(
+        'creates a menu with item tags inside' => array(
+            'from'  =>  '
+                        <menu>
+                            <item href="http://zurb.com">Item</item>
+                        </menu>
+                        ',
+            'to'    =>  '
+                        <table class="menu">
+                            <tr>
+                              <th><a href="http://zurb.com">Item</a></th>
+                            </tr>
+                        </table>
+                        '
+        ),
+        'creates a menu with classes' => array(
+            'from'  =>  '<menu class="awesome"></menu>',
+            'to'    =>  '
+                        <table class="menu awesome">
+                            <tr>
+                            </tr>
+                        </table>
+                        '
+        ),
+        'treats vertical menus differently' => array(
+            'from'  =>  '
+                        <menu class="vertical">
+                            <item href="#abc">ABC</item>
+                        </menu>
+                        ',
+            'to'    =>  '
+                        <table class="menu vertical">
+                            <tr>
+                              <th>
+                                <table class="menu-item">
+                                  <tr>
+                                    <th><a href="#abc">ABC</a></th>
+                                  </tr>
+                                </table>
+                              </th>
+                            </tr>
+                        </table>
+                        '
+        ),
+        'works without using an item tag' => array(
+            'from'  =>  '
+                        <menu>
+                            <td><a href="http://zurb.com">Item 1</a></td>
+                            <td><a href="http://zurb.com">Item 2</a></td>
+                        </menu>
+                        ',
+            'to'    =>  '
+                        <table class="menu">
+                            <tr>
+                              <td><a href="http://zurb.com">Item 1</a></td>
+                              <td><a href="http://zurb.com">Item 2</a></td>
+                            </tr>
+                        </table>
+                        '
+        ),
+
+        'Case 1' => array(
+            'from' => '<menu class="test">Html</menu>',
+            'to' => '<table class="menu test"><tr>Html</tr></table>'
+        ),
+        'Case 3' => array(
+            'from'  =>  '
+                        <menu class="vertical">
+                            <item href="#abc">ABC</item>
+                            Test
+                        </menu>
+                        ',
+            'to'    =>  '
+                        <table class="menu vertical">
+                            <tr>
+                              <th>
+                                <table class="menu-item">
+                                  <tr>
+                                    <th><a href="#abc">ABC</a></th>
+                                  </tr>
+                                </table>
+                                Test
+                              </th>
+                            </tr>
+                        </table>
+                        '
+        ),
+    );
+
+}
diff --git a/tests/Component/MenuItemFactoryTest.php b/tests/Component/MenuItemFactoryTest.php
new file mode 100644
index 0000000..383f205
--- /dev/null
+++ b/tests/Component/MenuItemFactoryTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ *  MenuFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       28.02.16
+ */
+
+namespace Component;
+
+class MenuItemFactoryTest extends AbstractComponentFactoryTest {
+
+    protected $testCases = array(
+        'Case 1' => array(
+            'from' => '<item class="test" href="http://example.com/123">Html</item>',
+            'to' => '<th class="test"><a href="http://example.com/123">Html</a></th>'
+        ),
+        'Case 2' => array(
+            'from' => '<menu><item class="test" href="http://example.com/123">Html</item></menu>',
+            'to' => '<table class="menu"><tr><th class="test"><a href="http://example.com/123">Html</a></th></tr></table>'
+        ),
+        'Case 3' => array(
+            'from' => '<menu><item class="test" href="http://example.com/123">Html</item><item class="test" href="http://example.com/123">Html</item><item class="test" href="http://example.com/123">Html</item></menu>',
+            'to' => '<table class="menu"><tr><th class="test"><a href="http://example.com/123">Html</a></th><th class="test"><a href="http://example.com/123">Html</a></th><th class="test"><a href="http://example.com/123">Html</a></th></tr></table>'
+        ),
+        'Case 4' => array(
+            'from' => '<item class="test">Html</item>',
+            'to' => '<th class="test"><a>Html</a></th>'
+        ),
+    );
+
+}
diff --git a/tests/Component/RowFactoryTest.php b/tests/Component/RowFactoryTest.php
new file mode 100644
index 0000000..90d5b1d
--- /dev/null
+++ b/tests/Component/RowFactoryTest.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ *  MenuFactoryTest.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   MenuFactoryTest.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       28.02.16
+ */
+
+namespace Component;
+
+class RowFactoryTest extends AbstractComponentFactoryTest {
+
+    protected $testCases = array(
+        'Case 1' => array(
+            'from' => '<row class="class1 class2">Html</row>',
+            'to' => '<table class="row class1 class2"><tbody><tr>Html</tr></tbody></table>'
+        )
+    );
+
+}
diff --git a/tests/InkyTest.php b/tests/InkyTest.php
new file mode 100644
index 0000000..252bda0
--- /dev/null
+++ b/tests/InkyTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ *  Test.php
+ *
+ *
+ *  @license    see LICENSE File
+ *  @filename   Test.php
+ *  @package    inky-parse
+ *  @author     Thomas Hampe <github@hampe.co>
+ *  @copyright  2013-2016 Thomas Hampe
+ *  @date       13.03.16
+ */ 
+
+
+class InkyTest extends PHPUnit_Framework_TestCase {
+
+    public function testGridColumns()
+    {
+        $inky = new \Hampe\Inky\Inky(10);
+        $this->assertEquals(10, $inky->getGridColumns(), 'Inky Grid Coulmns');
+
+        $inky->setGridColumns(23);
+        $this->assertEquals(23, $inky->getGridColumns(), 'Inky Grid Columns');
+    }
+
+    public function testAlias()
+    {
+        $inky = new \Hampe\Inky\Inky();
+
+        $inky->addAlias('test', 'callout');
+        $this->assertContains('test', $inky->getAllAliasForTagName('callout'), 'Inky Alias for Tag');
+        $this->assertEquals($inky->getComponentFactory('callout'), $inky->getComponentFactory('test'));
+        $this->assertEquals('<table><tr><th class="callout">Test</th></tr></table>', $inky->releaseTheKraken('<test>Test</test>'));
+
+
+        $inky->removeAlias('test');
+        $this->assertNotContains('test', $inky->getAllAliasForTagName('callout'));
+        $this->assertEquals(null, $inky->getComponentFactory('test'));
+        $this->assertEquals('<test>Test</test>', $inky->releaseTheKraken('<test>Test</test>'));
+
+    }
+
+}