diff --git a/conf/httpd.conf b/conf/httpd.conf
index d683b79a2..b95838ea5 100644
--- a/conf/httpd.conf
+++ b/conf/httpd.conf
@@ -1,6 +1,6 @@
 <VirtualHost _IP_:80>
 	ServerName beta.crunchr.co
-	ServerAlias alpha.crunchr.co test.crunchr.co beta._DOMAIN_ alpha._DOMAIN_ test._DOMAIN_
+	ServerAlias beta._DOMAIN_
 	DocumentRoot /home/beta.crunchbutton/www
 	ServerAdmin webmaster@beta.crunchr.co
 	UseCanonicalName Off
@@ -10,6 +10,7 @@
 
 <VirtualHost _IP_:80>
 	ServerName dev.crunchr.co
+	ServerAlias dev._DOMAIN_
 	DocumentRoot /home/dev.crunchbutton/www
 	ServerAdmin webmaster@dev.crunchr.co
 	UseCanonicalName Off
@@ -27,6 +28,16 @@
 	CustomLog /home/obw.crunchbutton/logs/access_log combined
 </VirtualHost>
 
+<VirtualHost _IP_:80>
+	ServerName staging._DOMAIN_
+	ServerAlias staging.crunchr.co
+	DocumentRoot /home/staging.crunchbutton/www
+	ServerAdmin webmaster@staging._DOMAIN_
+	UseCanonicalName Off
+	ErrorLog /home/staging.crunchbutton/logs/error_log
+	CustomLog /home/staging.crunchbutton/logs/access_log combined
+</VirtualHost>
+
 <VirtualHost _IP_:80>
 	ServerName _DOMAIN_
 	ServerAlias crunchr.co *.crunchr.co *._DOMAIN_
diff --git a/include/library/Crunchbutton/App.php b/include/library/Crunchbutton/App.php
index d8e9a7e2a..362f97607 100755
--- a/include/library/Crunchbutton/App.php
+++ b/include/library/Crunchbutton/App.php
@@ -24,6 +24,7 @@ class Crunchbutton_App extends Cana_App {
 				break;
 			case 'crunchr.co':
 			case '_DOMAIN_':
+			case 'staging._DOMAIN_':
 				$params['env'] = 'live';
 				break;
 			case 'beta.crunchr.co':
@@ -52,6 +53,7 @@ class Crunchbutton_App extends Cana_App {
 								$_SERVER['__HTTP_HOST'] = 'beta.crunchr.co';
 								break;
 							case '/home/crunchbutton/include/library/Crunchbutton':
+							case '/home/staging.crunchbutton/include/library/Crunchbutton':
 								$params['env'] = 'live';
 								$_SERVER['__HTTP_HOST'] = 'crunchr.co';
 								break;
@@ -64,7 +66,7 @@ class Crunchbutton_App extends Cana_App {
 				}
 		}
 
-		if ($params['env'] == 'live' && !$cli) {
+		if ($params['env'] == 'live' && !$cli && $_SERVER['__HTTP_HOST'] == '_DOMAIN_') {
 			error_reporting(E_ERROR | E_PARSE);
 			
 			if ($_SERVER['HTTPS'] != 'on') {
@@ -91,7 +93,6 @@ class Crunchbutton_App extends Cana_App {
 		
 		if ($params['env'] != 'local' && $_SERVER['__HTTP_HOST'] != 'dev.crunchr.co') {
 			$config->bundle = true;
-
 		}
 
 		$this