diff --git a/classes/Controller.php b/classes/Controller.php
index 7cd074b..2f46717 100755
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -42,19 +42,45 @@ class Controller extends Object {
 	 * To make life a bit easier when using PICKLES, the Controller logic is
 	 * executed automatically via use of a constructor.
 	 *
-	 * @param object Config object
+	 * @param mixed Config object or filename (optional)
 	 */
-	public function __construct(Config $config = null) {
+	public function __construct($config = null) {
 		parent::__construct();
-
-		// If no Config object is passed, create a new one from assumptions
-		if ($config == null) {
-			$config = new Config();
-		}
-
-		// Creates all the other core objects we need to pass around.
+		
+		// Creates the core objects that don't need a Config object
 		$logger = new Logger();
 		$error  = new Error($logger);
+
+		// Check the passed config variables object type
+		if (is_object($config)) {
+			if ($config instanceof Config === false) {
+				$error->setWarning('Passed object is not an instance of Config');
+				$config = null;
+			}
+		}
+		
+		// Config filename to be loaded
+		$filename = null;
+
+		// Checks if the config value is a filename
+		if (is_string($config)) {
+			if (file_exists($config)) {
+				$filename = $config;
+			}
+			else {
+				$error->setWarning('Passed config filename does not exist');
+				$config = null;
+			}
+		}
+
+		// If no Config object is passed (or it's cleared), create a new one from assumptions
+		if ($config == null) {
+			$config = new Config($filename);
+		}
+
+		unset($filename);
+
+		// Creates all the other core objects we need to pass around
 		$db     = new DB($config, $logger, $error);
 		$mailer = new Mailer($config, $error);
 
@@ -153,8 +179,14 @@ class Controller extends Object {
 				}
 
 				// Creates a new viewer object
-				$viewer_class = 'Viewer_' . $model->getViewer();
-				$viewer = new $viewer_class($config, $error);
+				$viewer_name = $model->getViewer();
+				if (in_array($viewer_name, array('JSON', 'PHP', 'RSS', 'Smarty'))) {
+					$viewer_class = 'Viewer_' . $viewer_name;
+					$viewer = new $viewer_class($config, $error);
+				}
+				else {
+					$error->setError('Invalid viewer specified (' . $viewer_name . ')');
+				}
 
 				// Sets the viewers properties
 				$viewer->model_name  = $model_name;
@@ -164,6 +196,14 @@ class Controller extends Object {
 
 				// Runs the requested viewer's display function
 				$viewer->display();
+
+				// Do some cleanup
+				if (isset($security)) {
+					unset($security);
+				}
+
+				unset($model, $viewer);
+				unset($db, $mailer, $config, $error, $logger)
 			}
 		}
 	}
diff --git a/classes/Viewer/Common.php b/classes/Viewer/Common.php
index 4314e32..960a67b 100644
--- a/classes/Viewer/Common.php
+++ b/classes/Viewer/Common.php
@@ -60,6 +60,43 @@ abstract class Viewer_Common extends Object {
 		ini_set('url_rewriter.tags',    'a=href,area=href,frame=src,input=src,fieldset=');
 
 		header('Content-type: text/html; charset=UTF-8');
+
+		if ($this->config->getDebug() === true) {
+			$superglobals = array($GLOBALS, $_SERVER, $_GET, $_POST, $_FILES, $_COOKIE, $_SESSION, $_REQUEST, $_ENV);
+			?>
+			<div class="debug" style="border: 2px solid black; padding: 5px; margin: 10px;">
+				<h1>PICKLES Debug Console</h1>
+				<?php
+				/*
+				foreach ($superglobals as $superglobal => $array) {
+					?>
+					<h2><h2>
+					<?php
+				}
+				*/
+				?>
+				<h2>$_REQUEST</h2>
+				<pre><?php var_dump($_REQUEST); ?></pre>
+				<h2>$_SESSION</h2>
+				<pre><?php var_dump($_SESSION); ?></pre>
+				<h2>$_SERVER</h2>
+				<pre><?php var_dump($_SERVER); ?></pre>
+			</div>
+			<?php
+
+			/*
+			function display_buffer() {
+				$buffer = str_replace(
+					array('    ', "\r\n", "\n", "\t"),
+					null,
+					ob_get_contents()
+				);
+				ob_end_clean();
+				exit($buffer);
+			}
+			*/
+
+		}
 	}
 
 	/**
diff --git a/classes/Viewer/Debug.php b/classes/Viewer/Debug.php
deleted file mode 100644
index 1ee7eb9..0000000
--- a/classes/Viewer/Debug.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Debug Viewer Class File for PICKLES
- *
- * PICKLES is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * PICKLES 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with PICKLES.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * @author    Joshua John Sherman <josh@phpwithpickles.org>
- * @copyright Copyright 2007, 2008 Joshua John Sherman
- * @link      http://phpwithpickles.org
- * @license   http://www.gnu.org/copyleft/lesser.html
- * @package   PICKLES
- */
-
-/**
- * Debugging Viewer
- *
- * Displays debugging information on the screen.
- */
-class Viewer_Debug extends Viewer_Common {
-
-	/**
-	 * Display the debugging information
-	 *
-	 * var_dump()s a few important super globals to aid in debugging.
-	 *
-	 * @todo May want to use contrib/dBug as it has better output.
-	 * @todo Just a thought, perhaps instead of a debug viewer, the debug mode
-	 *       would be better served as an option in the model and then the
-	 *       regular viewer would be executed as well as displaying the debug
-	 *       data.
-	 * @todo May also be cool to add in logic to check for the vi swap file, and
-	 *       if that's present, force the model into a debug state, as it will
-	 *       indicate it's being worked on.
-	 * @todo Even cooler still, perhaps a debug console should be available when
-	 *       the model is marked debug or when a file is open.  It would be
-	 *       activated with a hot key, would be legendary.
-	 * @todo Perhaps it could be a configuration option to say that if a file is
-	 *       open, to now allow the end user to see the page, give them a generic
-	 *       "hey we're working on it" message.
-	 */
-	public function display() {
-		echo '<h1>Debug</h1>' . "\n";
-		echo '<h2>$_REQUEST</h2>' . "\n";
-		echo '<pre>';
-		var_dump($_REQUEST);
-		echo '</pre>';
-		echo '<h2>$_SESSION</h2>' . "\n";
-		echo '<pre>';
-		var_dump($_SESSION);
-		echo '</pre>';
-		echo '<h2>$_SERVER</h2>' . "\n";
-		echo '<pre>';
-		var_dump($_SERVER);
-		echo '</pre>';
-	}
-}
-
-?>
diff --git a/classes/Viewer/PHP.php b/classes/Viewer/PHP.php
index f1b915c..45f2c8c 100644
--- a/classes/Viewer/PHP.php
+++ b/classes/Viewer/PHP.php
@@ -27,59 +27,69 @@
 /**
  * PHP Viewer
  *
- * Displays the associated PHP templates for the Model.  This is for all you
- * folks that would prefer not to user the Smarty templating engine.  Your
- * PHP templates are just PHP code, plain and simple.
+ * Displays the associated PHP templates for the Model.  This is
+ * very similar to the Smarty viewer, but less overhead since it's
+ * straight PHP.  The PHP viewer also utilizes a different caching
+ * system than Smarty.  The general rules around the caching will
+ * be the same though.
  */
 class Viewer_PHP extends Viewer_Common {
 
+	private $template        = null;
+	private $shared_template = null;
+
 	/**
-	 * Displays the Smarty generated pages
+	 * Displays the PHP templated pages
 	 */
 	public function display() {
 
-		$smarty->template_dir = '../templates/';
+		// Establishes the template names
+		$this->template        = SITE_PATH . '../templates/' . $this->model_name . '.php';
+		$this->shared_template = PICKLES_PATH . 'templates/' . $this->shared_name . '.php';		
 
 		/**
-		 * @todo Resurrect my buffer clean up code
+		 * @todo There's a bug with the store home page since it's a redirect, maybe
 		 */
-		$smarty->load_filter('output','trimwhitespace');
+		if (!file_exists($this->template)) {
+			if (file_exists($this->shared_template)) {
+				$this->template = $this->shared_template;
+			}
+		}
 
-		// Pass all of our controller values to Smarty
-		$smarty->assign('section',    $this->model->section);
-		$smarty->assign('model',      $this->model->name);
-		$smarty->assign('template',   $template);
+		// Brings these variables to scope
+		/**
+		 * @todo Section or model needs to go, having both seems dumb.
+		 */
+		$section  = $this->model->section;
+		$model    = $this->model->name;
+		$template = $template;
 
 		// Loads the data from the config
-		$data = $this->config->getViewerData();
-
-		if (isset($data) && is_array($data)) {
-			$smarty->assign('config', $data);
-		}
+		$config = $this->config->getPublicData();
 
 		// Loads the data from the model
 		$data = $this->model->getData();
 
-		if (isset($data) && is_array($data)) {
-			foreach ($data as $variable => $value) {
-				$smarty->assign($variable, $value);
-			}
+		// If there's data set, this brings it into scope
+		if (isset($this->data) && is_array($this->data)) {
+			extract($this->data);
 		}
 
-		// Load it up!
-		header('Content-type: text/html; charset=UTF-8');
-
-		// If the index.tpl file is present, load it, else load the template directly
+		// If the index.php file is present, load it, else load the template directly
 		/**
 		 * @todo Should there be additional logic to allow the model or the
 		 *       template to determine whether or not the index should be loaded?
 		 */
-		if ($smarty->template_exists('index.tpl')) {
-			$smarty->display('index.tpl');
+		if (file_exists(SITE_PATH . '../templates/index.php')) {
+			require_once SITE_PATH . '../templates/index.php';
 		}
-		else {
-			$smarty->display($template);
+		else if (file_exists{$this->template)) {
+			require_once $this->template;
 		}
+
+		/**
+		 * @todo Resurrect my buffer clean up code
+		 */
 	}
 }
 
diff --git a/pickles.php b/pickles.php
index 74dd10e..b96591d 100755
--- a/pickles.php
+++ b/pickles.php
@@ -45,6 +45,12 @@ define('VAR_PATH',     PICKLES_PATH . 'var/' . $_SERVER['SERVER_NAME'] . '/');
 define('LOG_PATH',     VAR_PATH . 'logs/');
 define('SMARTY_PATH',  VAR_PATH . 'smarty/');
 
+// Sets up constants for the Viewer names
+define('VIEWER_JSON',   'JSON');
+define('VIEWER_PHP',    'PHP');
+define('VIEWER_RSS',    'RSS');
+define('VIEWER_SMARTY', 'Smarty');
+
 /**
  * Magic function to automatically load classes
  *
diff --git a/scripts/pickle b/scripts/pickle
index 80c999e..1ac210e 100755
--- a/scripts/pickle
+++ b/scripts/pickle
@@ -81,7 +81,7 @@ XML;
 	// public/.htaccess
 	$htaccess = <<<CONF
 # Alias the static libraries
-#Alias /static/ {$pickles_path}static/
+Alias /static/ {$pickles_path}static/
 
 # Set the PHP include path
 php_value include_path \".:{$pickles_path}\"
@@ -121,8 +121,7 @@ ini_set('include_path', ini_get('include_path') . ':{$pickles_path}');
 
 require_once 'pickles.php';
 
-\$config = new Config('../config.xml');
-new Controller(\$config);
+new Controller();
 
 ?>
 PHP;
@@ -145,7 +144,7 @@ class home extends Model {
 		// \$this->db->getRow('SELECT ...');
 		// \$this->db->getArray('SELECT ...');
 
-		\$this->data['message'] = "You have successfully set up a site <a href='http://phpwithpickles.org/'>with PICKLES!</a>";
+		\$this->message = "You have successfully set up a site <a href='http://phpwithpickles.org/'>with PICKLES!</a>";
 	}
 }