diff --git a/e107_core/controllers/system/error.php b/e107_core/controllers/system/error.php
new file mode 100644
index 000000000..93374f441
--- /dev/null
+++ b/e107_core/controllers/system/error.php
@@ -0,0 +1,40 @@
+<?php
+
+class core_system_error_controller extends eController
+{
+	function preAction()
+	{
+		e107::coreLan('error');
+	}
+	
+	public function actionNotfound()
+	{
+		$this->addTitle(LAN_ERROR_7);
+		//var_dump($this->getRequest()->getRouteHistory());
+		$errorText = "<img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_21.'<br />'.LAN_ERROR_9."<br /><br />";
+		if (strlen($errFrom)) $errorText .= LAN_ERROR_23." <a href='{$errFrom}' rel='external'>{$errFrom}</a> ".LAN_ERROR_24." -- ".LAN_ERROR_19."<br /><br />";
+		
+	
+		$errorText .= "<h3>".LAN_ERROR_45."</h3>";
+		if($errReturnTo) 
+		{
+			foreach ($errReturnTo as $url => $label)
+			{
+				$errorText .= "<a href='{$url}'>".$label."</a><br />";
+			}
+			$errorText .= '<br />';
+		}
+		$url = e107::getUrl();
+		
+		$errorText .= "<a href='".SITEURL."'>".LAN_ERROR_20."</a><br />";
+		$errorText .= "<a href='".$url->create('search')."'>".LAN_ERROR_22."</a>";
+		
+		$this->addBody($errorText);
+	}
+	
+	function actionHelloWorld()
+	{
+		$this->addTitle('Hello!');
+		echo 'Hello World';
+	}
+}
diff --git a/e107_core/controllers/system/index.php b/e107_core/controllers/system/index.php
new file mode 100644
index 000000000..f526c32b4
--- /dev/null
+++ b/e107_core/controllers/system/index.php
@@ -0,0 +1,13 @@
+<?php
+
+class core_system_index_controller extends eController
+{
+	/**
+	 * Temporary redirect to site Index
+	 * XXX - move the index.php Front page detection to index/index/index, make index.php the entry point and _forward here
+	 */
+	public function actionIndex()
+	{
+		$this->_redirect('/', false, 301);
+	}
+}