diff --git a/include/controllers/cockpit/cockpit/home/index.php b/include/controllers/cockpit/cockpit/home/index.php
new file mode 100644
index 000000000..d0c9df39d
--- /dev/null
+++ b/include/controllers/cockpit/cockpit/home/index.php
@@ -0,0 +1,3 @@
+<?php
+
+die('default/cockpit');
\ No newline at end of file
diff --git a/include/controllers/cockpit/default/error/index.php b/include/controllers/cockpit/default/error/index.php
new file mode 100644
index 000000000..8f2f04040
--- /dev/null
+++ b/include/controllers/cockpit/default/error/index.php
@@ -0,0 +1,3 @@
+<?php
+
+die('sss');
\ No newline at end of file
diff --git a/include/controllers/cockpit/default/home/index.php b/include/controllers/cockpit/default/home/index.php
new file mode 100644
index 000000000..79d0a6e7e
--- /dev/null
+++ b/include/controllers/cockpit/default/home/index.php
@@ -0,0 +1,3 @@
+<?php
+
+die('cockput/dewhatevfault');
\ No newline at end of file
diff --git a/include/library/Crunchbutton/App.php b/include/library/Crunchbutton/App.php
index e1ff74289..ed0ea2e6a 100755
--- a/include/library/Crunchbutton/App.php
+++ b/include/library/Crunchbutton/App.php
@@ -27,6 +27,8 @@ class Crunchbutton_App extends Cana_App {
 				break;
 			case 'crunchr.co':
 			case '_DOMAIN_':
+			case 'cockpit.crunchr.co':
+			case 'cockpit._DOMAIN_':
 				$env = 'live';
 				break;
 			case 'beta.crunchr.co':
@@ -35,6 +37,7 @@ class Crunchbutton_App extends Cana_App {
 			case 'dev.crunchr.co':
 				$env = 'dev';
 				break;
+			case 'cockpit.localhost':
 			case 'crunchbutton.localhost':
 				$env = 'local';
 				break;
@@ -131,10 +134,17 @@ class Crunchbutton_App extends Cana_App {
 			case 'wenzel.localhost':
 				$domain->theme = 'onebuttonwenzel';
 				break;
+			case 'cockpit.localhost':
+			case 'cockpit.crunchr.co':
+			case 'cockpit._DOMAIN_':
+				$domain->version = 'cockpit';
+				$domain->theme = 'default';
+				break;
 			default:
 				$domain->theme = 'crunchbutton';
 				break;
 		}
+
 		
 		$config = $this->config();
 
@@ -288,6 +298,8 @@ class Crunchbutton_App extends Cana_App {
 		} else {
 			$params['layout'] =  $this->config()->defaults->layout;
 		}
+		
+		print_r($params);
 
 		parent::buildView($params);
 		
diff --git a/include/library/Crunchbutton/Order.php b/include/library/Crunchbutton/Order.php
index 05b83bb72..16dc2ccb5 100644
--- a/include/library/Crunchbutton/Order.php
+++ b/include/library/Crunchbutton/Order.php
@@ -964,6 +964,8 @@ class Crunchbutton_Order extends Cana_Table {
 		unset($out['id_user']);
 		unset($out['id']);
 		unset($out['id_order']);
+		
+		$out['id'] = $this->uuid;
 
 		$out['_restaurant_name'] = $this->restaurant()->name;
 		$out['user'] = $this->user()->uuid;