diff --git a/application/config/kohana.php b/application/config/kohana.php
index c481cb5..3d119ca 100644
--- a/application/config/kohana.php
+++ b/application/config/kohana.php
@@ -1,7 +1,12 @@
 <?php
 
-$config['timezone'] = 'GMT';
-
+/**
+ * Modules are additional resource paths. Any file that can be placed within
+ * the application or system directories can also be placed in a module.
+ * All modules are relative or absolute paths to directories.
+ * 
+ * @see  http://docs.kohanaphp.com/modules
+ */
 $config['modules'] = array
 (
 	MODPATH.'database',
@@ -9,4 +14,43 @@ $config['modules'] = array
 	MODPATH.'email',
 );
 
+/**
+ * Caching is an effective way to make your application scale better, at the
+ * cost of updates being visibly "delayed". Enable this when your are no
+ * longer making changes to the filesystem and file paths will be cached
+ * between requests.
+ * 
+ * @see  http://docs.kohanaphp.com/deployment
+ */
+$config['save_cache'] = TRUE;
+
+/**
+ * Character set of your application. Using anything besides UTF-8 may result
+ * in decreased compatibility and is strongly discouraged.
+ *
+ * @see  http://docs.kohanaphp.com/i18n
+ * @see  http://php.net/iconv
+ */
+$config['charset'] = 'UTF-8';
+
+/**
+ * Locale of your application. Note that even if you are not using a POSIX
+ * system, the first locale must be POSIX `xx_XX` locale name for internal i18n
+ * support to work properly.
+ *
+ * @see  http://docs.kohanaphp.com/i18n
+ * @see  http://php.net/setlocale
+ * @see  http://msdn.microsoft.com/en-us/library/39cwe7zf(VS.80).aspx
+ */
+$config['locale'] = array('en_US.UTF-8', 'english-us');
+
+/**
+ * Time zone of your application. If you do not specify a time zone, the
+ * default system time zone will be used instead.
+ *
+ * @see  http://php.net/manual/timezones.php
+ * @see  http://php.net/manual/datetime.configuration.php
+ */
+$config['timezone'] = NULL;
+
 return $config;
diff --git a/system/bootstrap.php b/system/bootstrap.php
index ba10899..4cb251a 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -35,18 +35,17 @@ require SYSPATH.'classes/kohana'.EXT;
 Kohana::init();
 
 // Convert global variables to UTF-8
-$_GET    = utf8::clean($_GET);
-$_POST   = utf8::clean($_POST);
-$_COOKIE = utf8::clean($_COOKIE);
-$_SERVER = utf8::clean($_SERVER);
-
+$_GET    = utf8::clean($_GET, Kohana::$charset);
+$_POST   = utf8::clean($_POST, Kohana::$charset);
+$_COOKIE = utf8::clean($_COOKIE, Kohana::$charset);
+$_SERVER = utf8::clean($_SERVER, Kohana::$charset);
 
 $route = Route::factory('(:controller(/:method(/:id)))')
 	->defaults(array('controller' => 'welcome', 'method' => 'index'));
 
 $route = Route::factory('(:path/):file(.:format)', array('path' => '.*'));
 
-echo Kohana::debug($route->matches('uploads/doc/foo.xml'));
+echo Kohana::debug($route->matches('templates/awesome.haml'));
 
 // Shutdown the environment
 Kohana::shutdown();
\ No newline at end of file
diff --git a/system/classes/kohana.php b/system/classes/kohana.php
index f729927..ad8e855 100644
--- a/system/classes/kohana.php
+++ b/system/classes/kohana.php
@@ -7,8 +7,6 @@
  * - Auto-loading and transparent extension of classes
  * - Variable and path debugging
  *
- * $Id: kohana.php 3733 2008-11-27 01:12:41Z Shadowhand $
- *
  * @package    Core
  * @author     Kohana Team
  * @copyright  (c) 2008 Kohana Team
@@ -16,6 +14,12 @@
  */
 final class Kohana {
 
+	// Has the environment been initialized?
+	private static $init = FALSE;
+
+	// Save the cache on shutdown?
+	public static $save_cache = FALSE;
+
 	// Command line instance
 	public static $cli_mode = FALSE;
 
@@ -23,10 +27,11 @@ final class Kohana {
 	public static $request_method = 'GET';
 
 	// Default charset for all requests
-	public static $charset = 'UTF-8';
+	public static $charset;
 
-	// Has the environment been initialized?
-	private static $init = FALSE;
+	// Current locale and timezone
+	public static $locale;
+	public static $timezone;
 
 	// Include paths that are used to find files
 	private static $include_paths = array(APPPATH, SYSPATH);
@@ -40,6 +45,11 @@ final class Kohana {
 	 * - Enables the auto-loader
 	 * - Enables the exception handler
 	 * - Enables error-to-exception handler
+	 * - Determines if the application was started from the command line
+	 * - Determines the HTTP request method, if possible
+	 * - Sets the environment locale and timezone
+	 * - Enables modules
+	 * - Loads hooks
 	 *
 	 * @return  void
 	 */
@@ -51,6 +61,12 @@ final class Kohana {
 		// Enable auto-loading of classes
 		spl_autoload_register(array(__CLASS__, 'auto_load'));
 
+		// Enable the exception handler
+		// set_exception_handler(array(__CLASS__, 'exception_handler'));
+
+		// Enable the error-to-exception handler
+		set_error_handler(array(__CLASS__, 'error_handler'));
+
 		// Load the file path cache
 		self::$file_path = Kohana::cache('kohana_file_paths');
 
@@ -68,8 +84,22 @@ final class Kohana {
 			}
 		}
 
-		/*
-		if ($hooks = self::find_file('hooks'))
+		// Load main configuration
+		$config = Kohana::load_file(APPPATH.'config/kohana'.EXT);
+
+		// Toggle cache saving
+		self::$save_cache = $config['save_cache'];
+
+		// Localize the application
+		self::locale($config['locale']);
+
+		// Localize the timezone
+		self::timezone($config['timezone']);
+
+		// Load module paths
+		self::modules($config['modules']);
+
+		if ($hooks = self::list_files('hooks', TRUE))
 		{
 			foreach ($hooks as $hook)
 			{
@@ -77,7 +107,6 @@ final class Kohana {
 				require $hook;
 			}
 		}
-		*/
 
 
 		// The system has been initialized
@@ -93,7 +122,96 @@ final class Kohana {
 	 */
 	public function shutdown()
 	{
-		Kohana::cache('kohana_file_paths', self::$file_path);
+		if (self::$save_cache === TRUE)
+		{
+			Kohana::cache('kohana_file_paths', self::$file_path);
+		}
+	}
+
+	/**
+	 * Sets the environment locale. The first locale must always be a valid
+	 * `xx_XX` locale name to be used for i18n:
+	 * 
+	 *     Kohana::locale(array('de_DE@euro.UTF-8', 'de_DE.UTF-8', 'german'));
+	 * 
+	 * When using this method, it is a good idea to provide many variations, as
+	 * locale availability on different systems is very unpredictable.
+	 * 
+	 * @param   array   locale choices
+	 * @return  void
+	 */
+	public static function locale(array $locales)
+	{
+		if (setlocale(LC_ALL, $locales) !== FALSE)
+		{
+			// Set the system locale
+			self::$locale = substr($locales[0], 0, 5);
+		}
+	}
+
+	/**
+	 * Sets the environment timezone. Any timezone supported by PHP cane be
+	 * used here:
+	 * 
+	 *     Kohana::timezone('Arctic/Longyearbyen');
+	 * 
+	 * @param   string   timezone name
+	 * @return  string
+	 */
+	public static function timezone($timezone)
+	{
+		if ($timezone === NULL)
+		{
+			// Disable notices when using date_default_timezone_get
+			$ER = error_reporting(~E_NOTICE);
+
+			$timezone = date_default_timezone_get();
+
+			// Restore error reporting
+			error_reporting($ER);
+		}
+
+		if (date_default_timezone_set($timezone) === TRUE)
+		{
+			// Set the system timezone
+			self::$timezone = $timezone;
+		}
+	}
+
+	/**
+	 * Changes the currently enabled modules. Module paths may be relative
+	 * or absolute, but must point to a directory:
+	 * 
+	 *     Kohana::modules(array('modules/foo', MODPATH.'bar'));
+	 * 
+	 * @param   array   module paths
+	 * @return  void
+	 */
+	public static function modules(array $modules)
+	{
+		// Start a new set of include paths, APPPATH first
+		$paths = array(APPPATH);
+
+		foreach ($modules as $module)
+		{
+			if ($module = realpath($module) AND is_dir($module))
+			{
+				if (KOHANA_IS_WIN)
+				{
+					// Remove backslashes
+					$module = str_replace('\\', '/', $module);
+				}
+
+				// Add the module to include paths
+				$paths[] = $module.'/';
+			}
+		}
+
+		// Finish the include paths by adding SYSPATH
+		$paths[] = SYSPATH;
+
+		// Set the new include paths
+		self::$include_paths = $paths;
 	}
 
 	/**
@@ -118,26 +236,76 @@ final class Kohana {
 		$ext = ($ext === NULL) ? EXT : '.'.$ext;
 
 		// Create a partial path of the filename
-		$file = $dir.'/'.$file.$ext;
+		$path = $dir.'/'.$file.$ext;
 
-		if (isset(self::$file_path[$file]))
+		if (isset(self::$file_path[$path]))
 		{
 			// The path to this file has already been found
-			return self::$file_path[$file];
+			return self::$file_path[$path];
 		}
 
-		foreach (self::$include_paths as $path)
+		foreach (self::$include_paths as $dir)
 		{
-			if (file_exists($path.$file))
+			if (file_exists($dir.$path))
 			{
 				// Cache and return the path to this file
-				return self::$file_path[$file] = $path.$file;
+				return self::$file_path[$path] = $dir.$path;
 			}
 		}
 
 		return FALSE;
 	}
 
+	/**
+	 * Find all of the files in a directory:
+	 * 
+	 *     $configs = Kohana::list_files('config');
+	 * 
+	 * @param   string   directory name
+	 * @param   boolean  list files recursively
+	 * @return  array
+	 */
+	public function list_files($directory, $recursive = FALSE)
+	{
+		// Reverse the paths so that lower entries are overwritten
+		$paths = array_reverse(self::$include_paths);
+
+		// Start the list of files
+		$files = array();
+
+		foreach ($paths as $path)
+		{
+			if (is_dir($path.$directory))
+			{
+				$dir = new DirectoryIterator($path.$directory);
+
+				foreach ($dir as $file)
+				{
+					$filename = $file->getFilename();
+
+					if ($filename[0] === '.')
+						continue;
+
+					if ($file->isDir())
+					{
+						if ($recursive === TRUE)
+						{
+							// Recursively add files
+							$files = array_merge($files, self::list_files($directory.'/'.$filename, TRUE));
+						}
+					}
+					else
+					{
+						// Add the file to the files
+						$files[$directory.'/'.$filename] = realpath($file->getPathname());
+					}
+				}
+			}
+		}
+
+		return $files;
+	}
+
 	/**
 	 * Loads a file within a totally empty scope and returns the output:
 	 *
@@ -148,7 +316,6 @@ final class Kohana {
 	 */
 	public function load_file($file)
 	{
-		// Return the output of the file
 		return include $file;
 	}
 
@@ -262,6 +429,25 @@ final class Kohana {
 		return (bool) file_put_contents($dir.$file, serialize($data));
 	}
 
+	/**
+	 * PHP error handler, converts all errors into ErrorExceptions. This handler
+	 * respects error_reporting settings.
+	 *
+	 * @throws   ErrorException
+	 * @return   TRUE
+	 */
+	public static function error_handler($code, $error, $file = NULL, $line = NULL)
+	{
+		if ((error_reporting() & $code) !== 0)
+		{
+			// This error is not suppressed by current error reporting settings
+			throw new ErrorException($error, $code, 0, $file, $line);
+		}
+
+		// Do not execute the PHP error handler
+		return TRUE;
+	}
+
 	/**
 	 * Returns an HTML string of debugging information about any number of
 	 * variables, each wrapped in a <pre> tag:
@@ -284,7 +470,19 @@ final class Kohana {
 		$output = array();
 		foreach ($variables as $var)
 		{
-			$output[] = '<pre>('.gettype($var).') '.htmlspecialchars(print_r($var, TRUE), ENT_QUOTES, self::$charset, TRUE).'</pre>';
+			$type = gettype($var);
+
+			switch ($type)
+			{
+				case 'boolean':
+					$var = $var ? 'TRUE' : 'FALSE';
+				break;
+				default:
+					$var = htmlspecialchars(print_r($var, TRUE), NULL, self::$charset, TRUE);
+				break;
+			}
+
+			$output[] = '<pre>('.$type.') '.$var.'</pre>';
 		}
 
 		return implode("\n", $output);
diff --git a/system/extensions/remote.php b/system/extensions/remote.php
new file mode 100644
index 0000000..065f18c
--- /dev/null
+++ b/system/extensions/remote.php
@@ -0,0 +1,3 @@
+<?php
+
+class remote extends Remote_Core {}