diff --git a/laravel/cli/artisan.php b/laravel/cli/artisan.php
index eef931a8..1683e395 100644
--- a/laravel/cli/artisan.php
+++ b/laravel/cli/artisan.php
@@ -2,6 +2,7 @@
 
 use Laravel\IoC;
 use Laravel\Bundle;
+use Laravel\Config;
 use Laravel\Database as DB;
 
 /**
@@ -11,6 +12,44 @@ use Laravel\Database as DB;
  */
 Bundle::start(DEFAULT_BUNDLE);
 
+/**
+ * Set the CLI options on the $_SERVER global array so we can easily
+ * retrieve them from the various parts of the CLI code. We can use
+ * the Request class to access them conveniently.
+ */
+$_SERVER['cli'] = array();
+
+foreach ($_SERVER['argv'] as $key => $value)
+{
+	if (starts_with($value, '--'))
+	{
+		$option = array_get($_SERVER['argv'], $key + 1, true);
+
+		array_set($_SERVER, 'cli.'.substr($value, 2), $option);
+	}
+}
+
+/**
+ * The Laravel environment may be specified on the CLI using the "env"
+ * option, allowing the developer to easily use local configuration
+ * files from the CLI since the environment is usually controlled
+ * by server environmenet variables.
+ */
+if (isset($_SERVER['cli']['env']))
+{
+	$_SERVER['LARAVEL_ENV'] = $_SERVER['cli']['env'];
+}
+
+/**
+ * The default database connection may be set by specifying a value
+ * for the "database" CLI option. This allows migrations to be run
+ * conveniently for a test or staging database.
+ */
+if (isset($_SERVER['cli']['db']))
+{
+	Config::set('database.default', $_SERVER['cli']['db']);
+}
+
 /**
  * We will register all of the Laravel provided tasks inside the IoC
  * container so they can be resolved by the task class. This allows
diff --git a/laravel/cli/dependencies.php b/laravel/cli/dependencies.php
index 2e1cab05..ce57c823 100644
--- a/laravel/cli/dependencies.php
+++ b/laravel/cli/dependencies.php
@@ -1,4 +1,4 @@
-<?php
+<?php namespace Laravel\CLI; use Laravel\IoC;
 
 /**
  * The migrate task is responsible for running database migrations
@@ -32,7 +32,7 @@ IoC::register('task: bundle', function()
  */
 IoC::singleton('bundle.repository', function()
 {
-	return new Repository;
+	return new Tasks\Bundle\Repository;
 });
 
 /**
@@ -42,7 +42,7 @@ IoC::singleton('bundle.repository', function()
  */
 IoC::singleton('bundle.publisher', function()
 {
-	return new Publisher;
+	return new Tasks\Bundle\Publisher;
 });
 
 /**
@@ -53,5 +53,5 @@ IoC::singleton('bundle.publisher', function()
  */
 IoC::singleton('bundle.provider: github', function()
 {
-	return new Providers\Github;
+	return new Tasks\Bundle\Providers\Github;
 });
\ No newline at end of file
diff --git a/laravel/cli/tasks/migrate/database.php b/laravel/cli/tasks/migrate/database.php
index e42f2713..0684b359 100644
--- a/laravel/cli/tasks/migrate/database.php
+++ b/laravel/cli/tasks/migrate/database.php
@@ -1,5 +1,6 @@
 <?php namespace Laravel\CLI\Tasks\Migrate;
 
+use Laravel\Request;
 use Laravel\Database as DB;
 
 class Database {