diff --git a/application/admin/component/links/controller/link.php b/application/admin/component/links/controller/link.php
new file mode 100644
index 00000000..db6fd795
--- /dev/null
+++ b/application/admin/component/links/controller/link.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Belgian Police Web Platform - Police Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+use Nooku\Library;
+
+class LinksControllerLink extends Library\ControllerModel
+{
+
+}
\ No newline at end of file
diff --git a/application/admin/component/links/controller/permission/link.php b/application/admin/component/links/controller/permission/link.php
new file mode 100644
index 00000000..2f4f4e2c
--- /dev/null
+++ b/application/admin/component/links/controller/permission/link.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+use Nooku\Library;
+
+class LinksControllerPermissionLink extends ApplicationControllerPermissionAbstract
+{
+
+}
\ No newline at end of file
diff --git a/application/admin/component/links/view/link/html.php b/application/admin/component/links/view/link/html.php
new file mode 100644
index 00000000..5b296f6f
--- /dev/null
+++ b/application/admin/component/links/view/link/html.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+use Nooku\Library;
+
+/**
+ * Articles HTML View
+ *
+ * @author  Tom Janssens <http://nooku.assembla.com/profile/tomjanssens>
+ * @package Component\Articles
+ */
+class LinksViewLinkHtml extends Library\ViewHtml
+{
+    public function render()
+    {
+        $model = $this->getModel();
+        $link  = $model->getRow();
+
+        $this->childs = $this->getObject('com:links.model.relations')->links_link_id($link->id)->getRowset();
+
+        return parent::render();
+    }
+}
\ No newline at end of file
diff --git a/application/admin/component/links/view/link/templates/default.html.php b/application/admin/component/links/view/link/templates/default.html.php
new file mode 100644
index 00000000..7bca730e
--- /dev/null
+++ b/application/admin/component/links/view/link/templates/default.html.php
@@ -0,0 +1,50 @@
+<?
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+?>
+
+<script src="assets://js/koowa.js" />
+
+<ktml:module position="actionbar">
+    <ktml:toolbar type="actionbar">
+</ktml:module>
+
+<form action="" method="post" id="link-form" class="-koowa-form">
+    <div class="main">
+        <div class="title">
+            <input disabled class="required" type="text" name="title" maxlength="255" value="<?= escape($link->title) ?>" placeholder="<?= translate('Title') ?>" />
+            <div class="slug">
+                <span class="add-on">URL</span>
+                <input disabled type="text" name="slug" maxlength="255" value="<?= escape($link->url) ?>" />
+            </div>
+        </div>
+
+        <div class="scrollable">
+            <fieldset>
+                <legend><?= translate('Mentioned on') ?></legend>
+                <table class="table table--striped">
+                    <thead>
+                    <tr>
+                        <th><?= translate('Title') ?></th>
+                        <th><?= translate('Status') ?></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <? foreach($childs AS $child) : ?>
+                        <tr>
+                            <td><?= $child->child_title ?><br />
+                                <small><a target="_blank" href="<?= $child->child_url ?>"><?= $child->child_url ?></a></small></td>
+                            <td><?= $child->child_status ?></td>
+                        </tr>
+                    <? endforeach ?>
+                    </tbody>
+                </table>
+            </fieldset>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/application/admin/component/links/view/links/metadata.xml b/application/admin/component/links/view/links/metadata.xml
new file mode 100644
index 00000000..47117e07
--- /dev/null
+++ b/application/admin/component/links/view/links/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <view title="Links">
+        <message><![CDATA[]]></message>
+    </view>
+</metadata>
\ No newline at end of file
diff --git a/application/admin/component/links/view/links/templates/default.html.php b/application/admin/component/links/view/links/templates/default.html.php
new file mode 100644
index 00000000..387977ba
--- /dev/null
+++ b/application/admin/component/links/view/links/templates/default.html.php
@@ -0,0 +1,66 @@
+<?
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+?>
+
+<script src="assets://js/koowa.js" />
+<style src="assets://css/koowa.css" />
+
+<form action="" method="get" class="-koowa-grid">
+    <table>
+        <thead>
+        <tr>
+            <th width="100%">
+                <?= helper('grid.sort', array('column' => 'url', 'title' => 'Link')) ?>
+            </th>
+            <th>
+                <?= helper('grid.sort', array('column' => 'links')) ?>
+            </th>
+            <th>
+                <?= helper('grid.sort', array('column' => 'status')) ?>
+            </th>
+            <th>
+                <?= helper('grid.sort', array('column' => 'last_crawled_on', 'title' => 'Last crawled on')) ?>
+            </th>
+            <th>
+                <?= helper('grid.sort', array('column' => 'last_checked_on', 'title' => 'Last checked on')) ?>
+            </th>
+        </tr>
+        </thead>
+        <tfoot>
+        <tr>
+            <td colspan="7">
+                <?= helper('com:application.paginator.pagination', array('total' => $total)) ?>
+            </td>
+        </tr>
+        </tfoot>
+        <tbody>
+        <? foreach ($links as $link) : ?>
+            <tr>
+                <td class="ellipsis" style="padding: 8px 10px">
+                    <a href="<?= route('view=link&id='.$link->id); ?>"><?= $link->title ?><br /><small><?= $link->url ?></small></a>
+                </td>
+                <td>
+                    <?= $link->links ?>
+                </td>
+                <td>
+                    <?= $link->status ?>
+                </td>
+                <td>
+                    <?= helper('date.format', array('date'=> $link->last_crawled_on ? $link->last_crawled_on : $link->created_on, 'format' => translate('D d.m.Y - G:i'))) ?>
+                </td>
+                <td>
+                    <? if($link->last_checked_on) : ?>
+                        <?= helper('date.format', array('date'=> $link->last_checked_on, 'format' => translate('D d.m.Y - G:i'))) ?>
+                    <? endif ?>
+                </td>
+            </tr>
+        <? endforeach; ?>
+        </tbody>
+    </table>
+</form>
diff --git a/application/admin/component/links/view/links/templates/default.xml b/application/admin/component/links/view/links/templates/default.xml
new file mode 100644
index 00000000..aee18ce6
--- /dev/null
+++ b/application/admin/component/links/view/links/templates/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="Default layout">
+        <message>
+            <![CDATA[]]>
+        </message>
+    </layout>
+</metadata>
\ No newline at end of file
diff --git a/application/manager/component/links/controller/Crawler.php b/application/manager/component/links/controller/Crawler.php
new file mode 100644
index 00000000..b868b3a1
--- /dev/null
+++ b/application/manager/component/links/controller/Crawler.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * @author Oscar Casajuana a.k.a. elboletaire <elboletaire {at} underave {dot} net>
+ */
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+class Crawler
+{
+	private $depth = 2;
+	private $url;
+	private $results = array();
+	private $same_host = false;
+	private $host;
+
+	public function setDepth($depth) { $this->depth = $depth; }
+	public function setHost($host) { $this->host = $host; }
+	public function getResults() { return $this->results; }
+	public function setSameHost($same_host) { $this->same_host = $same_host; }
+
+	public function setUrl($url)
+	{
+		$this->url = $url;
+		$this->setHost($this->getHostFromUrl($url));
+	}
+
+	public function __construct($url = null, $depth = null, $same_host = false)
+	{
+		if (!empty($url)) {
+			$this->setUrl($url);
+		}
+		if (isset($depth) && !is_null($depth)) {
+			$this->setDepth($depth);
+		}
+		$this->setSameHost($same_host);
+	}
+
+	public function crawl()
+	{
+		if (empty($this->url)) {
+			throw new Exception('URL must be set');
+		}
+		$this->_crawl($this->url, $this->depth);
+		return $this->results;
+	}
+
+	private function _crawl($url, $depth)
+	{
+		static $seen = array();
+
+		if (empty($url)) return;
+
+		if (!$url = $this->buildUrl($this->url, $url)) {
+			return;
+		}
+
+		if ($depth === 0 || isset($seen[$url])) {
+			return;
+		}
+
+		$seen[$url] = true;
+
+		$dom = new DOMDocument('1.0');
+        libxml_use_internal_errors(true);
+		@$dom->loadHTMLFile($url);
+
+		$this->results[] = array(
+			'url' => $url,
+			// 'content' => $dom->saveHTML()
+		);
+
+		$anchors = $dom->getElementsByTagName('a');
+		foreach ($anchors as $element)
+		{
+			if (!$href = $this->buildUrl($url, $element->getAttribute('href'))) {
+				continue;
+			}
+			$this->_crawl($href, $depth - 1);
+		}
+
+		return $url;
+	}
+
+	private function buildUrl($url, $href)
+	{
+		if (0 !== strpos($href, 'http'))
+		{
+			if (0 === strpos($href, 'javascript:') || 0 === strpos($href, '#'))
+			{
+				return false;
+			}
+			$path = '/' . ltrim($href, '/');
+			if (extension_loaded('http'))
+			{
+				$new_href = http_build_url($url, array('path' => $path), HTTP_URL_REPLACE, $parts);
+			}
+			else
+			{
+				$parts = parse_url($url);
+				$new_href = $this->buildUrlFromParts($parts);
+				$new_href .= $path;
+			}
+			// Relative urls... (like ./viewforum.php)
+			if (0 === strpos($href, './') && !empty($parts['path']))
+			{
+				// If the path isn't really a path (doesn't end with slash)...
+				if (!preg_match('@/$@', $parts['path'])) {
+					$path_parts = explode('/', $parts['path']);
+					array_pop($path_parts);
+					$parts['path'] = implode('/', $path_parts) . '/';
+				}
+
+				$new_href = $this->buildUrlFromParts($parts) . $parts['path'] . ltrim($href, './');
+			}
+			$href = $new_href;
+		}
+		$href = rtrim($href, '/');
+		if ($this->same_host && $this->host != $this->getHostFromUrl($href)) {
+			return false;
+		}
+		return $href;
+	}
+
+	private function buildUrlFromParts($parts)
+	{
+		$new_href = $parts['scheme'] . '://';
+		if (isset($parts['user']) && isset($parts['pass'])) {
+			$new_href .= $parts['user'] . ':' . $parts['pass'] . '@';
+		}
+		$new_href .= $parts['host'];
+		if (isset($parts['port'])) {
+			$new_href .= ':' . $parts['port'];
+		}
+		return $new_href;
+	}
+
+	private function getHostFromUrl($url)
+	{
+		$parts = parse_url($url);
+		preg_match("@([^/.]+)\.([^.]{2,6}(?:\.[^.]{2,3})?)$@", $parts['host'], $host);
+		return array_shift($host);
+	}
+}
diff --git a/application/manager/component/links/controller/link.php b/application/manager/component/links/controller/link.php
new file mode 100644
index 00000000..650bcb98
--- /dev/null
+++ b/application/manager/component/links/controller/link.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Belgian Police Web Platform - Police Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+use Nooku\Library;
+
+class LinksControllerLink extends Library\ControllerModel
+{
+    protected function _actionBootup(Library\CommandContext $context)
+    {
+        $host = $this->getObject('request')->getUrl()->getHost();
+        $site = $this->getObject('application')->getSite();
+
+        $zones = $this->getObject('com:police.model.zones')
+            ->platform('2')
+            ->getRowset();
+
+        foreach($zones as $zone)
+        {
+            $url = 'http://'.$host.'/'.$zone->id;
+
+            $link           = $this->getObject('com:links.database.row.link');
+            $link->id       = md5($url);
+            $link->status   = $this->getStatus($url);
+            $link->last_checked_on  = gmdate('Y-m-d H:i:s');
+            $link->url              = $url;
+            $link->title            = $this->getTitle($link->url);
+            $link->police_zone_id   = $this->getZone($link->url);
+            $link->save();
+        }
+    }
+
+    protected function _actionCrawl(Library\CommandContext $context)
+    {
+        // Server, give us some time, please
+        ini_set('max_execution_time', 0);
+
+        $links = $this->getObject('com:links.model.links')
+            ->crawled('0')
+            ->status('200')
+            ->limit('1')
+            ->getRowset();
+
+        foreach($links as $link)
+        {
+            $urls = $this->crawler($link->url, '2', false);
+
+            foreach($urls as $url)
+            {
+                $row        = $this->getObject('com:links.database.row.link');
+                $row->id    = md5($url['url']);
+
+                if(!$row->load()) {
+                    $row->url               = $url['url'];
+                    $row->police_zone_id    = $this->getZone($url['url']);
+                }
+
+                $row->status            = $this->getStatus($url['url']);
+                $row->title             = $this->getTitle($url['url']);
+                $row->last_checked_on   = gmdate('Y-m-d H:i:s');
+                $row->save();
+
+                // Save the links on each page as relations
+                $relation = $this->getObject('com:links.database.row.relation');
+                $relation->links_link_id    = md5($url['url']);
+                $relation->linked_on     = $link->id;
+
+                if(!$relation->load() && ($relation->links_link_id !== $relation->linked_on)) {
+                    $relation->save();
+                }
+            }
+
+            $link->last_crawled_on = gmdate('Y-m-d H:i:s');
+            $link->crawled = true;
+            $link->save();
+        }
+    }
+
+    public function crawler($url, $depth, $same_host)
+    {
+        require_once('Crawler.php'); // or wherever autoload.php is located
+
+        try
+        {
+            $crawler = new Crawler($url, $depth, $same_host);
+            return $crawler->crawl();
+        }
+        catch (Exception $e)
+        {
+            die($e->getMessage());
+        }
+    }
+
+    public function getStatus($url)
+    {
+        $handle = curl_init($url);
+        curl_setopt($handle,  CURLOPT_RETURNTRANSFER, TRUE);
+
+        /* Get the HTML or whatever is linked in $url. */
+        $response = curl_exec($handle);
+
+        /* Check for 404 (file not found). */
+        $httpCode = curl_getinfo($handle, CURLINFO_HTTP_CODE);
+        curl_close($handle);
+
+        return $httpCode;
+    }
+
+    public function getTitle($url)
+    {
+        $handle = curl_init($url);
+        curl_setopt($handle,  CURLOPT_RETURNTRANSFER, TRUE);
+
+        /* Get the HTML or whatever is linked in $url. */
+        $response = curl_exec($handle);
+        curl_close($handle);
+
+        preg_match("/\<title.*\>(.*)\<\/title\>/isU", $response, $matches);
+
+        if(isset($matches[1]))
+        {
+            return $matches[1];
+        }
+
+        return false;
+    }
+
+    public function getZone($url)
+    {
+        preg_match('/\/(5[0-9]{3}|fed)\/?/', $url, $matches);
+
+        if(isset($matches[1]))
+        {
+            return $matches[1];
+        }
+
+        return false;
+    }
+
+    public function getTags($url, $tag)
+    {
+        $tags = get_meta_tags($url);
+
+        return $tags[$tag];
+    }
+}
\ No newline at end of file
diff --git a/application/manager/component/links/controller/permission/link.php b/application/manager/component/links/controller/permission/link.php
new file mode 100644
index 00000000..2f4f4e2c
--- /dev/null
+++ b/application/manager/component/links/controller/permission/link.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+use Nooku\Library;
+
+class LinksControllerPermissionLink extends ApplicationControllerPermissionAbstract
+{
+
+}
\ No newline at end of file
diff --git a/application/manager/component/links/controller/toolbar/link.php b/application/manager/component/links/controller/toolbar/link.php
new file mode 100644
index 00000000..2e0b0eff
--- /dev/null
+++ b/application/manager/component/links/controller/toolbar/link.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Belgian Police Web Platform - Police Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+namespace Nooku\Component\Links;
+
+use Nooku\Library;
+
+class ControllerToolbarLink extends Library\ControllerToolbarActionbar
+{
+    protected function _afterControllerBrowse(Library\CommandContext $context)
+    {
+        $this->addBootup();
+        $this->addCrawl();
+    }
+
+    protected function _commandBootup(Library\ControllerToolbarCommand $command)
+    {
+        $command->append(array(
+            'attribs' => array(
+                'data-novalidate' => 'novalidate',
+                'data-action'     => 'bootup'
+            )
+        ));
+    }
+
+    protected function _commandCrawl(Library\ControllerToolbarCommand $command)
+    {
+        $command->append(array(
+            'attribs' => array(
+                'data-novalidate' => 'novalidate',
+                'data-action'     => 'crawl'
+            )
+        ));
+    }
+}
\ No newline at end of file
diff --git a/application/manager/component/links/view/link/html.php b/application/manager/component/links/view/link/html.php
new file mode 100644
index 00000000..5b296f6f
--- /dev/null
+++ b/application/manager/component/links/view/link/html.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+use Nooku\Library;
+
+/**
+ * Articles HTML View
+ *
+ * @author  Tom Janssens <http://nooku.assembla.com/profile/tomjanssens>
+ * @package Component\Articles
+ */
+class LinksViewLinkHtml extends Library\ViewHtml
+{
+    public function render()
+    {
+        $model = $this->getModel();
+        $link  = $model->getRow();
+
+        $this->childs = $this->getObject('com:links.model.relations')->links_link_id($link->id)->getRowset();
+
+        return parent::render();
+    }
+}
\ No newline at end of file
diff --git a/application/manager/component/links/view/link/templates/default.html.php b/application/manager/component/links/view/link/templates/default.html.php
new file mode 100644
index 00000000..7bca730e
--- /dev/null
+++ b/application/manager/component/links/view/link/templates/default.html.php
@@ -0,0 +1,50 @@
+<?
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+?>
+
+<script src="assets://js/koowa.js" />
+
+<ktml:module position="actionbar">
+    <ktml:toolbar type="actionbar">
+</ktml:module>
+
+<form action="" method="post" id="link-form" class="-koowa-form">
+    <div class="main">
+        <div class="title">
+            <input disabled class="required" type="text" name="title" maxlength="255" value="<?= escape($link->title) ?>" placeholder="<?= translate('Title') ?>" />
+            <div class="slug">
+                <span class="add-on">URL</span>
+                <input disabled type="text" name="slug" maxlength="255" value="<?= escape($link->url) ?>" />
+            </div>
+        </div>
+
+        <div class="scrollable">
+            <fieldset>
+                <legend><?= translate('Mentioned on') ?></legend>
+                <table class="table table--striped">
+                    <thead>
+                    <tr>
+                        <th><?= translate('Title') ?></th>
+                        <th><?= translate('Status') ?></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <? foreach($childs AS $child) : ?>
+                        <tr>
+                            <td><?= $child->child_title ?><br />
+                                <small><a target="_blank" href="<?= $child->child_url ?>"><?= $child->child_url ?></a></small></td>
+                            <td><?= $child->child_status ?></td>
+                        </tr>
+                    <? endforeach ?>
+                    </tbody>
+                </table>
+            </fieldset>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/application/manager/component/links/view/links/metadata.xml b/application/manager/component/links/view/links/metadata.xml
new file mode 100644
index 00000000..47117e07
--- /dev/null
+++ b/application/manager/component/links/view/links/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <view title="Links">
+        <message><![CDATA[]]></message>
+    </view>
+</metadata>
\ No newline at end of file
diff --git a/application/manager/component/links/view/links/templates/default.html.php b/application/manager/component/links/view/links/templates/default.html.php
new file mode 100644
index 00000000..53370023
--- /dev/null
+++ b/application/manager/component/links/view/links/templates/default.html.php
@@ -0,0 +1,72 @@
+<?
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+?>
+
+<script src="assets://js/koowa.js" />
+<style src="assets://css/koowa.css" />
+
+<ktml:module position="actionbar">
+    <ktml:toolbar type="actionbar">
+</ktml:module>
+
+<form action="" method="get" class="-koowa-grid">
+    <table>
+        <thead>
+        <tr>
+            <th width="100%">
+                <?= helper('grid.sort', array('column' => 'url', 'title' => 'Link')) ?>
+            </th>
+            <th>
+                <?= helper('grid.sort', array('column' => 'links')) ?>
+            </th>
+            <th>
+                <?= helper('grid.sort', array('column' => 'status')) ?>
+            </th>
+            <th>
+                <?= helper('grid.sort', array('column' => 'last_crawled_on', 'title' => 'Last crawled on')) ?>
+            </th>
+            <th>
+                <?= helper('grid.sort', array('column' => 'last_checked_on', 'title' => 'Last checked on')) ?>
+            </th>
+        </tr>
+        </thead>
+        <tfoot>
+        <tr>
+            <td colspan="7">
+                <?= helper('com:application.paginator.pagination', array('total' => $total)) ?>
+            </td>
+        </tr>
+        </tfoot>
+        <tbody>
+        <? foreach ($links as $link) : ?>
+            <tr>
+                <td class="ellipsis" style="padding: 8px 10px">
+                    <a href="<?= route('view=link&id='.$link->id); ?>"><?= $link->title ?><br /><small><?= $link->url ?></small></a>
+                </td>
+                <td>
+                    <?= $link->links ?>
+                </td>
+                <td>
+                    <?= $link->status ?>
+                </td>
+                <td>
+                    <? if($link->last_crawled_on) : ?>
+                    <?= helper('date.format', array('date'=> $link->last_crawled_on, 'format' => translate('D d.m.Y - G:i'))) ?>
+                    <? endif ?>
+                </td>
+                <td>
+                    <? if($link->last_checked_on) : ?>
+                        <?= helper('date.format', array('date'=> $link->last_checked_on, 'format' => translate('D d.m.Y - G:i'))) ?>
+                    <? endif ?>
+                </td>
+            </tr>
+        <? endforeach; ?>
+        </tbody>
+    </table>
+</form>
diff --git a/application/manager/component/links/view/links/templates/default.xml b/application/manager/component/links/view/links/templates/default.xml
new file mode 100644
index 00000000..aee18ce6
--- /dev/null
+++ b/application/manager/component/links/view/links/templates/default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+    <layout title="Default layout">
+        <message>
+            <![CDATA[]]>
+        </message>
+    </layout>
+</metadata>
\ No newline at end of file
diff --git a/component/links/database/table/links.php b/component/links/database/table/links.php
new file mode 100644
index 00000000..ce3efa09
--- /dev/null
+++ b/component/links/database/table/links.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+namespace Nooku\Component\Links;
+use Nooku\Library;
+
+class DatabaseTableLinks extends Library\DatabaseTableAbstract
+{
+    public function  _initialize(Library\ObjectConfig $config)
+    {
+        $config->append(array(
+            'name'         => 'data.links',
+            'behaviors'    =>  array(
+                'creatable'
+            ),
+        ));
+
+        parent::_initialize($config);
+    }
+}
\ No newline at end of file
diff --git a/component/links/database/table/relations.php b/component/links/database/table/relations.php
new file mode 100644
index 00000000..db5efd66
--- /dev/null
+++ b/component/links/database/table/relations.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Belgian Police Web Platform - Links Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+namespace Nooku\Component\Links;
+use Nooku\Library;
+
+class DatabaseTableRelations extends Library\DatabaseTableAbstract
+{
+    public function  _initialize(Library\ObjectConfig $config)
+    {
+        $config->append(array(
+            'name'         => 'data.links_relations'
+        ));
+
+        parent::_initialize($config);
+    }
+}
\ No newline at end of file
diff --git a/component/links/model/links.php b/component/links/model/links.php
new file mode 100644
index 00000000..6911bfa5
--- /dev/null
+++ b/component/links/model/links.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Belgian Police Web Platform - About Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+namespace Nooku\Component\Links;
+use Nooku\Library;
+
+class ModelLinks extends Library\ModelTable
+{
+    public function __construct(Library\ObjectConfig $config)
+    {
+        parent::__construct($config);
+
+        $this->getState()
+            ->insert('crawled', 'int')
+            ->insert('zone',    'string')
+            ->insert('status',  'int');
+    }
+
+    protected function _buildQueryJoins(Library\DatabaseQuerySelect $query)
+    {
+        parent::_buildQueryJoins($query);
+
+
+        //Exclude joins if counting records
+        if(!$query->isCountQuery())
+        {
+            $query->columns(array('links'));
+
+            $subquery = $this->getObject('lib:database.query.select')
+                ->columns(array('links_link_id', 'links' => 'COUNT(linked_on)'))
+                ->table('data.links_relations')
+                ->group('links_link_id');
+
+            $query->join(array('content' => $subquery), 'content.links_link_id = tbl.links_link_id');
+
+        }
+    }
+
+    protected function _buildQueryWhere(Library\DatabaseQuerySelect $query)
+    {
+        parent::_buildQueryWhere($query);
+        $state = $this->getState();
+
+        $site = $this->getObject('application')->getSite();
+
+        if(is_numeric($state->crawled)) {
+            $query->where('tbl.crawled = :crawled')->bind(array('crawled' => $state->crawled));
+        }
+
+        if(is_numeric($state->status)) {
+            $query->where('tbl.status = :status')->bind(array('status' => $state->status));
+        }
+
+        if(!in_array($site, array('default'))) {
+            $query->where('tbl.police_zone_id = :zone')->bind(array('zone' => $site));
+        }
+    }
+}
\ No newline at end of file
diff --git a/component/links/model/relations.php b/component/links/model/relations.php
new file mode 100644
index 00000000..5331ef62
--- /dev/null
+++ b/component/links/model/relations.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Belgian Police Web Platform - About Component
+ *
+ * @copyright	Copyright (C) 2012 - 2013 Timble CVBA. (http://www.timble.net)
+ * @license		GNU GPLv3 <http://www.gnu.org/licenses/gpl.html>
+ * @link		https://github.com/belgianpolice/internet-platform
+ */
+
+namespace Nooku\Component\Links;
+use Nooku\Library;
+
+class ModelRelations extends Library\ModelTable
+{
+    public function __construct(Library\ObjectConfig $config)
+    {
+        parent::__construct($config);
+
+        $this->getState()
+            ->insert('links_link_id', 'string')
+            ->insert('crawled', 'boolean');
+    }
+
+    protected function _buildQueryColumns(Library\DatabaseQuerySelect $query)
+    {
+        parent::_buildQueryColumns($query);
+
+        $query->columns(array(
+            'child_url'     => 'links.url',
+            'child_title'   => 'links.title',
+            'child_status'  => 'links.status'
+        ));
+    }
+
+    protected function _buildQueryJoins(Library\DatabaseQuerySelect $query)
+    {
+        parent::_buildQueryJoins($query);
+
+        $query->join(array('links'  => 'data.links'), 'links.links_link_id = tbl.linked_on');
+    }
+
+    protected function _buildQueryWhere(Library\DatabaseQuerySelect $query)
+    {
+        parent::_buildQueryWhere($query);
+        $state = $this->getState();
+
+        if ($state->links_link_id) {
+            $query->where('tbl.links_link_id = :links_link_id')->bind(array('links_link_id' => $state->links_link_id));
+        }
+
+        if ($state->crawled) {
+            $query->where('tbl.crawled = :crawled')->bind(array('crawled' => $state->crawled));
+        }
+    }
+}
\ No newline at end of file
diff --git a/scripts/phpmig/migrations/2015/20150427091313_AddComLinks.php b/scripts/phpmig/migrations/2015/20150427091313_AddComLinks.php
new file mode 100644
index 00000000..ddcfb81f
--- /dev/null
+++ b/scripts/phpmig/migrations/2015/20150427091313_AddComLinks.php
@@ -0,0 +1,166 @@
+<?php
+
+use MyPhpmig\Police\Migration;
+
+class AddComLinks extends Migration
+{
+    /**
+     * Do the migration
+     */
+    public function up()
+    {
+        $this->_queries = <<<EOL
+
+INSERT INTO `extensions` (`extensions_extension_id`, `title`, `name`, `params`, `enabled`)
+VALUES
+    (51, 'Links', 'com_links', '', 1);
+";
+
+INSERT INTO `pages` (`pages_page_id`, `pages_menu_id`, `users_group_id`, `title`, `slug`, `link_url`, `link_id`, `type`, `published`, `hidden`, `home`, `extensions_extension_id`, `created_by`, `created_on`, `modified_by`, `modified_on`, `locked_by`, `locked_on`, `access`, `params`)
+VALUES
+	(10, 1, 0, 'Links', 'links', 'option=com_links&view=links', NULL, 'component', 1, 0, 0, 51, 1, '2015-04-27 09:11:25', NULL, NULL, NULL, NULL, 0, '');
+
+INSERT INTO `pages_closures` (`ancestor_id`, `descendant_id`, `level`)
+VALUES
+	(10, 10, 0);
+
+INSERT INTO `pages_orderings` (`pages_page_id`, `title`, `custom`)
+VALUES
+	(10, 00000000005, 00000000005);
+
+EOL;
+
+        parent::up();
+
+
+        // All multilingual zones.
+        $this->getZones()->reset()->where('language', '=', 3);
+
+        $this->_queries = <<<END
+
+INSERT INTO `pages` (`pages_page_id`, `pages_menu_id`, `users_group_id`, `title`, `slug`, `link_url`, `link_id`, `type`, `published`, `hidden`, `home`, `extensions_extension_id`, `created_by`, `created_on`, `modified_by`, `modified_on`, `locked_by`, `locked_on`, `access`, `params`)
+VALUES
+	(120, 2, 0, 'Links', 'links', 'option=com_links&view=links', NULL, 'component', 1, 0, 0, 51, 1, '2015-04-27 09:11:25', NULL, NULL, NULL, NULL, 0, '');
+
+INSERT INTO `languages_translations` (`languages_translation_id`, `iso_code`, `table`, `row`, `slug`, `status`, `original`, `deleted`)
+VALUES
+	(0, 'nl-be', 'pages', 120, 'links', 1, 1, 0),
+	(0, 'fr-be', 'pages', 120, 'links', 3, 0, 0);
+
+END;
+
+        parent::up();
+
+
+        // Fed website.
+        $this->getZones()->reset()->where('language', '=', 7);
+
+        $this->_queries = <<<END
+
+INSERT INTO `fr-be_pages` (`pages_page_id`, `pages_menu_id`, `users_group_id`, `title`, `slug`, `link_url`, `link_id`, `type`, `published`, `hidden`, `home`, `extensions_extension_id`, `created_by`, `created_on`, `modified_by`, `modified_on`, `locked_by`, `locked_on`, `access`, `params`)
+VALUES
+	(120, 2, 0, 'Links', 'links', 'option=com_links&view=links', NULL, 'component', 1, 0, 0, 51, 1, '2015-04-27 09:11:25', NULL, NULL, NULL, NULL, 0, '');
+
+INSERT INTO `de-be_pages` (`pages_page_id`, `pages_menu_id`, `users_group_id`, `title`, `slug`, `link_url`, `link_id`, `type`, `published`, `hidden`, `home`, `extensions_extension_id`, `created_by`, `created_on`, `modified_by`, `modified_on`, `locked_by`, `locked_on`, `access`, `params`)
+VALUES
+	(120, 2, 0, 'Links', 'links', 'option=com_links&view=links', NULL, 'component', 1, 0, 0, 51, 1, '2015-04-27 09:11:25', NULL, NULL, NULL, NULL, 0, '');
+
+
+INSERT INTO `languages_translations` (`languages_translation_id`, `iso_code`, `table`, `row`, `slug`, `status`, `original`, `deleted`)
+VALUES
+	(0, 'nl-be', 'pages', 120, 'links', 1, 1, 0),
+	(0, 'de-be', 'pages', 120, 'links', 3, 0, 0),
+	(0, 'fr-be', 'pages', 120, 'links', 3, 0, 0);
+
+END;
+
+        parent::up();
+
+
+        // Target `manager` database
+        $this->getZones()->set(array('manager' => 'Manager'));
+
+        $this->_queries = <<<EOL
+
+INSERT INTO `extensions` (`extensions_extension_id`, `title`, `name`, `params`, `enabled`)
+VALUES
+	(6, 'Links', 'com_links', '', 1);
+
+INSERT INTO `pages` (`pages_page_id`, `pages_menu_id`, `users_group_id`, `title`, `slug`, `link_url`, `link_id`, `type`, `published`, `hidden`, `home`, `extensions_extension_id`, `created_by`, `created_on`, `modified_by`, `modified_on`, `locked_by`, `locked_on`, `access`, `params`)
+VALUES
+	(120, 2, 0, 'Links', 'links', 'option=com_links&view=links', NULL, 'component', 1, 0, 0, 51, 1, '2015-04-27 09:11:25', NULL, NULL, NULL, NULL, 0, '');
+
+INSERT INTO `pages_closures` (`ancestor_id`, `descendant_id`, `level`)
+VALUES
+	(9, 120, 1),
+	(120, 120, 0);
+
+INSERT INTO `pages_orderings` (`pages_page_id`, `title`, `custom`)
+VALUES
+	(120, 00000000005, 00000000007);
+
+EOL;
+
+        parent::up();
+
+
+        // Target `data` database
+        $this->getZones()->set(array('data' => 'Data'));
+
+        $this->_queries = <<<EOL
+
+CREATE TABLE `links` (
+  `links_link_id` varchar(255) NOT NULL DEFAULT '0',
+  `police_zone_id` varchar(11) DEFAULT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `url` varchar(255) NOT NULL DEFAULT '',
+  `status` int(11) NOT NULL DEFAULT '0',
+  `crawled` tinyint(1) NOT NULL DEFAULT '0',
+  `created_on` datetime DEFAULT NULL,
+  `last_crawled_on` datetime DEFAULT NULL,
+  `last_checked_on` datetime DEFAULT NULL,
+  PRIMARY KEY (`links_link_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- Create syntax for TABLE 'links_relations'
+CREATE TABLE `links_relations` (
+  `links_link_id` varchar(255) NOT NULL DEFAULT '',
+  `linked_on` varchar(255) NOT NULL DEFAULT '',
+  UNIQUE KEY `links_link_id` (`links_link_id`,`linked_on`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+EOL;
+
+        parent::up();
+
+    }
+
+    /**
+     * Undo the migration
+     */
+    public function down()
+    {
+        $this->_queries = "DROP TABLE IF EXISTS `links`;";
+        $this->_queries .= "DROP TABLE IF EXISTS `links_relations`;";
+
+        $this->_queries .= "DELETE FROM `extensions` WHERE `extensions_extension_id` IN ('51');";
+        $this->_queries .= "DELETE FROM `pages` WHERE `pages_page_id` IN ('120');";
+
+        parent::down();
+
+        // All multilingual zones.
+        $this->getZones()->where('language', '=', 3);
+
+        $this->_queries = "DELETE FROM `fr-be_pages` WHERE `pages_page_id` IN ('120');";
+
+        parent::down();
+
+        // All multilingual zones.
+        $this->getZones()->where('language', '=', 7);
+
+        $this->_queries = "DELETE FROM `fr-be_pages` WHERE `pages_page_id` IN ('120');";
+        $this->_queries = "DELETE FROM `de-be_pages` WHERE `pages_page_id` IN ('120');";
+
+        parent::down();
+    }
+}