From a61e5dcfd70da73094502c9286d12fa52f0601e5 Mon Sep 17 00:00:00 2001
From: Kris Jordan <krisjordan@gmail.com>
Date: Sun, 15 Mar 2009 23:17:52 +0800
Subject: [PATCH 1/3] Friendlier fail messages for missing PDO/PDO drivers.
 Stopgap for a true install experience.

Signed-off-by: Recess PHP Framework <kris@recessframework.org>
---
 bootstrap.php | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/bootstrap.php b/bootstrap.php
index 22d29c5..1061361 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -100,10 +100,45 @@ static function init() {
 		Library::import('recess.database.orm.ModelDataSource');
 		
 		if(empty(RecessConf::$defaultDatabase)) {
-			die('Congratulations, Recess is almost setup!<br /><strong>Next step</strong>: Setup <strong>recess-conf.php</strong> to point to your database. Checkout the <strong>README.textile</strong> file for detailed instructions.');
+			$message = 'Congratulations, Recess is almost setup!<br />';
+			$message .= '<strong>Next Step(s):</strong>';
+			$message .= '<ul>';
+			$pdoMessages = array();
+			if(!extension_loaded('PDO')) {
+				$pdoMessages[] = 'Install PHP\'s PDO Extension';
+				$pdoMessages[] = 'Install Sqlite or MySQL PDO Driver';
+			} else {
+				$drivers = pdo_drivers();
+				$hasMySql = in_array('mysql', $drivers);
+				$hasSqlite = in_array('sqlite', $drivers);
+				if(!$hasMySql && !$hasSqlite) {
+					$pdoMessages[] = 'Install Sqlite and/or MySQL PDO Driver';
+				} else {
+					$databases = '';
+					if($hasSqlite) { $databases = 'Sqlite'; };
+					if($hasMySql) { if($databases != '') { $databases .= ', '; } $databases .= 'MySql'; }
+					$pdoMessages[] = 'You have drivers for the following databases: ' . $databases;
+				}
+			}	
+			$pdoMessages[] = 'Setup <strong>recess-conf.php</strong> to point to your database.';
+			$pdoMessages[] = 'Checkout the <strong>README.textile</strong> file for instructions.';
+			$pdoMessages = '<li>' . implode('</li><li>', $pdoMessages) . '</li>';
+			$message .= $pdoMessages . '</ul>';
+			die($message);
 		}
-		Databases::setDefaultSource(new ModelDataSource(RecessConf::$defaultDatabase));//,RecessConf::$defaultDatabase[1],RecessConf::$defaultDatabase[2]));
 		
+		try {
+			Databases::setDefaultSource(new ModelDataSource(RecessConf::$defaultDatabase));
+		} catch(DataSourceCouldNotConnectException $e) {
+			$databaseType = parse_url(RecessConf::$defaultDatabase[0], PHP_URL_SCHEME);
+			if(!in_array($databaseType, pdo_drivers())) {
+				$message = 'It looks like PHP could not load the driver needed to connect to <strong>' . RecessConf::$defaultDatabase[0] . '</strong><br />';
+				$message .= 'Please install the <strong>' . ucfirst($databaseType) . '</strong> PDO driver and enable it in php.ini';
+			} else {
+				$message = 'Error connecting to data source: ' . $e->getMessage();
+			}
+			die($message);
+		}
 		if(!empty(RecessConf::$namedDatabases)) {
 			foreach(RecessConf::$namedDatabases as $name => $sourceInfo) {
 				Databases::addSource($name, new ModelDataSource($sourceInfo));

From 0fdaa0fc3f9080bfc129cfde76a43ade897e7895 Mon Sep 17 00:00:00 2001
From: KrisJordan <krisjordan@gmail.com>
Date: Fri, 13 Mar 2009 07:56:16 +0800
Subject: [PATCH 2/3] Major rewrite of low-level components in recess.lang to
 standardize the expansion of annotations and introduce Wrappable methods for
 simple extensibility.

Sub-history of commits:

Wrapping of methods created on FrameworkObject, RecessObject renamed Object. Model still broken, it is up next.

Getting closer with models running on FrameworkObject base. Still failing on multiple unit tests.

FrameworkObject integrated into main stack. All tests passing.

Documentation for FrameworkObject and some restructuring.

Made model::save, controller::serve wrappable.

Fleshing out of FrameworkAnnotation

Refactoring

FrameworkObject merged into Object, all Recess annotations rewritten to use the new model.

Tweaks in wrappingTests app, not to be merged into official tree.

Made RoutesPrefix Annotation conform to new standard.

Adding comments to new recess.lang features

Signed-off-by: Recess PHP Framework <kris@recessframework.org>
---
 .../WelcomeHomeController.class.php           |   3 +-
 bootstrap.php                                 |   4 +-
 recess-conf.php                               |   6 +-
 recess/lib/recess/Recess.class.php            |   4 +-
 .../RecessToolsAppsController.class.php       |   2 +-
 .../apps/tools/templates/header.template.php  |   2 +-
 .../apps/tools/views/apps/createModel.php     |   2 +-
 .../tools/views/apps/newAppWizardComplete.php |   2 +-
 .../recess/apps/tools/views/common/footer.php |   8 +-
 .../recess/apps/tools/views/common/header.php |   4 +-
 .../apps/tools/views/database/newSource.php   |   2 +-
 .../lib/recess/apps/tools/views/home/home.php |   4 +-
 recess/lib/recess/cache/Cache.class.php       |   2 +-
 .../lib/recess/database/Databases.class.php   |   4 +-
 .../lib/recess/database/orm/Model.class.php   | 101 +++----
 .../AbstractRelationshipAnnotation.class.php  |  51 ++++
 .../annotations/BelongsToAnnotation.class.php |  36 ++-
 .../annotations/ColumnAnnotation.class.php    |  54 ++--
 .../annotations/DatabaseAnnotation.class.php  |  30 +-
 .../annotations/HasManyAnnotation.class.php   |  35 ++-
 .../orm/annotations/ModelAnnotation.class.php |  50 ----
 .../ModelPropertyAnnotation.class.php         |  19 --
 .../orm/annotations/TableAnnotation.class.php |  32 ++-
 .../BelongsToRelationship.class.php           |  10 +-
 .../HasManyRelationship.class.php             |  10 +-
 .../orm/relationships/Relationship.class.php  |   4 +-
 .../pdo/IPdoDataSourceProvider.class.php      |   4 +-
 .../pdo/MysqlDataSourceProvider.class.php     |   4 +-
 .../recess/database/pdo/PdoDataSet.class.php  |   4 +-
 .../database/pdo/PdoDataSource.class.php      |   8 +-
 .../pdo/RecessColumnDescriptor.class.php      |   4 +-
 .../pdo/RecessTableDescriptor.class.php       |   4 +-
 .../recess/database/pdo/RecessType.class.php  |   4 +-
 ...taSourceCouldNotConnectException.class.php |   4 +-
 .../ProviderDoesNotExistException.class.php   |   6 +-
 .../database/sql/ISqlConditions.class.php     |   4 +-
 .../database/sql/ISqlSelectOptions.class.php  |   4 +-
 .../recess/database/sql/SqlBuilder.class.php  |  10 +-
 .../recess/diagnostics/Diagnostics.class.php  |   9 +-
 .../diagnostics/output/exception_report.php   |   7 +-
 .../recess/framework/Application.class.php    |   4 +-
 .../recess/framework/DefaultPolicy.class.php  |   1 +
 .../controllers/AbstractController.class.php  |  14 +-
 .../controllers/Controller.class.php          |  67 ++---
 .../ControllerAnnotation.class.php            |   9 -
 .../annotations/RouteAnnotation.class.php     |  87 +++---
 .../RoutesPrefixAnnotation.class.php          |  31 ++-
 .../annotations/ViewAnnotation.class.php      |  36 +--
 .../interfaces/IController.class.php          |   2 +-
 .../framework/views/AbstractView.class.php    |   4 +-
 recess/lib/recess/http/Cookie.class.php       |   4 +-
 recess/lib/recess/http/Environment.class.php  |   2 +-
 recess/lib/recess/http/Formats.class.php      |   4 +-
 .../recess/http/ForwardingResponse.class.php  |   4 +-
 recess/lib/recess/http/Methods.class.php      |   4 +-
 recess/lib/recess/http/Request.class.php      |   6 +-
 recess/lib/recess/http/Response.class.php     |   4 +-
 .../lib/recess/http/ResponseCodes.class.php   |   6 +-
 recess/lib/recess/lang/Annotation.class.php   | 248 ++++++++++++++++-
 .../lib/recess/lang/AttachedMethod.class.php  |  48 ++++
 .../lib/recess/lang/ClassDescriptor.class.php |  90 ++++++
 recess/lib/recess/lang/IWrapper.class.php     |  46 ++++
 recess/lib/recess/lang/Inflector.class.php    |   4 +-
 recess/lib/recess/lang/Library.class.php      |   6 +-
 recess/lib/recess/lang/Object.class.php       | 257 ++++++++++++++++++
 recess/lib/recess/lang/RecessObject.class.php | 218 ---------------
 .../recess/lang/WrappableAnnotation.class.php |  63 +++++
 .../lib/recess/lang/WrappedMethod.class.php   | 119 ++++++++
 .../lib/recess/lang/codegen/CodeGen.class.php |   4 +-
 .../lang/codegen/CodeGenClass.class.php       |   4 +-
 .../lang/codegen/CodeGenClassFile.class.php   |   4 +-
 .../lang/codegen/CodeGenClassMember.class.php |   4 +-
 .../lang/codegen/CodeGenDocComment.class.php  |   4 +-
 .../lang/codegen/CodeGenImport.class.php      |   4 +-
 .../lang/codegen/CodeGenMethod.class.php      |   4 +-
 .../lang/codegen/CodeGenProperty.class.php    |   4 +-
 .../InvalidAnnotationValueException.class.php |   4 +-
 .../UnknownAnnotationException.class.php      |   4 +-
 .../RecessReflectionClass.class.php           |  16 +-
 .../RecessReflectionMethod.class.php          |   4 +-
 .../RecessReflectionProperty.class.php        |   5 +-
 recess/test/recess/database/orm/ModelTest.php |  84 +-----
 .../test/recess/lang/FrameworkObjectTest.php  | 141 ++++++++++
 recess/test/recess/lang/ObjectTest.php        |  63 +++++
 .../test/recess/lang/RecessLangAllTests.php   |   8 +-
 recess/test/recess/lang/RecessObjectTest.php  |  63 -----
 .../RecessReflectionClassTest.php             |   2 +-
 87 files changed, 1529 insertions(+), 842 deletions(-)
 create mode 100644 recess/lib/recess/database/orm/annotations/AbstractRelationshipAnnotation.class.php
 delete mode 100644 recess/lib/recess/database/orm/annotations/ModelAnnotation.class.php
 delete mode 100644 recess/lib/recess/database/orm/annotations/ModelPropertyAnnotation.class.php
 delete mode 100644 recess/lib/recess/framework/controllers/annotations/ControllerAnnotation.class.php
 create mode 100644 recess/lib/recess/lang/AttachedMethod.class.php
 create mode 100644 recess/lib/recess/lang/ClassDescriptor.class.php
 create mode 100644 recess/lib/recess/lang/IWrapper.class.php
 create mode 100644 recess/lib/recess/lang/Object.class.php
 delete mode 100644 recess/lib/recess/lang/RecessObject.class.php
 create mode 100644 recess/lib/recess/lang/WrappableAnnotation.class.php
 create mode 100644 recess/lib/recess/lang/WrappedMethod.class.php
 rename recess/lib/recess/lang/{ => reflection}/RecessReflectionClass.class.php (80%)
 rename recess/lib/recess/lang/{ => reflection}/RecessReflectionMethod.class.php (93%)
 rename recess/lib/recess/lang/{ => reflection}/RecessReflectionProperty.class.php (88%)
 create mode 100644 recess/test/recess/lang/FrameworkObjectTest.php
 create mode 100644 recess/test/recess/lang/ObjectTest.php
 delete mode 100644 recess/test/recess/lang/RecessObjectTest.php
 rename recess/test/recess/lang/{ => reflection}/RecessReflectionClassTest.php (97%)

diff --git a/apps/welcome/controllers/WelcomeHomeController.class.php b/apps/welcome/controllers/WelcomeHomeController.class.php
index 953dc44..b97d535 100644
--- a/apps/welcome/controllers/WelcomeHomeController.class.php
+++ b/apps/welcome/controllers/WelcomeHomeController.class.php
@@ -13,5 +13,6 @@ function index() {
 		
 	}
 	
+
 }
-?>
\ No newline at end of file
+?>
diff --git a/bootstrap.php b/bootstrap.php
index 1061361..496c87d 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Recess! Framework is bootstrapped by passing control to Recess::main().
+ * Recess PHP Framework is bootstrapped by passing control to Recess::main().
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
  */
@@ -19,7 +19,7 @@
 Library::import('recess.http.Environment');
 Library::import('recess.Recess');
 
-// Entry point to Recess!
+// Entry point to Recess
 Recess::main(Environment::getRawRequest(), RecessConf::$policy, RecessConf::$applications, RecessConf::getRoutes(), RecessConf::$plugins);
 
 // RecessConf follows...
diff --git a/recess-conf.php b/recess-conf.php
index d6353d3..f8a029f 100644
--- a/recess-conf.php
+++ b/recess-conf.php
@@ -1,8 +1,8 @@
 <?php if(isset($bootstrapped)) unset($bootstrapped); else exit;
 /**
- * Welcome to Recess! Let's have some fun.
+ * Welcome to Recess Let's have some fun.
  * 
- * Recess! is full-stack, PHP application development framework.
+ * Recess is full-stack, PHP application development framework.
  * For tutorials, documentation, bug reports, feature suggestions
  * head over to: 
  * 
@@ -44,4 +44,4 @@
 				'Sqlite',
 			);
 
-?>
\ No newline at end of file
+?>
diff --git a/recess/lib/recess/Recess.class.php b/recess/lib/recess/Recess.class.php
index 55af586..63eef9b 100644
--- a/recess/lib/recess/Recess.class.php
+++ b/recess/lib/recess/Recess.class.php
@@ -1,7 +1,7 @@
 <?php
 Library::import('recess.http.ForwardingResponse');
 /**
- * Entry into Recess! Framework occurs in the coordinator. It is responsible
+ * Entry into Recess PHP Framework occurs in the coordinator. It is responsible
  * for the flow of control from preprocessing of request data, the serving of a request
  * in a controller, and rendering a response to the request through a view.
  * 
@@ -10,7 +10,7 @@
  */
 final class Recess {
 	/**
-	 * Recess! Framework Entry Point
+	 * Recess PHP Framework Entry Point
 	 * @param Request $request The raw Request.
 	 * @package recess
 	 * @static 
diff --git a/recess/lib/recess/apps/tools/controllers/RecessToolsAppsController.class.php b/recess/lib/recess/apps/tools/controllers/RecessToolsAppsController.class.php
index 07a30af..c9ac40b 100644
--- a/recess/lib/recess/apps/tools/controllers/RecessToolsAppsController.class.php
+++ b/recess/lib/recess/apps/tools/controllers/RecessToolsAppsController.class.php
@@ -186,7 +186,7 @@ public function createModel($app) {
 	
 	/** !Route POST, app/$app/model/gen */
 	public function generateModel($app) { 
-		// TODO: Clean up this pile of crap
+		// TODO: Clean this up.
 		$values = $this->request->post;
 		
 		$modelName = $values['modelName'];
diff --git a/recess/lib/recess/apps/tools/templates/header.template.php b/recess/lib/recess/apps/tools/templates/header.template.php
index 2f46fba..3b75190 100644
--- a/recess/lib/recess/apps/tools/templates/header.template.php
+++ b/recess/lib/recess/apps/tools/templates/header.template.php
@@ -8,7 +8,7 @@
 		<![endif]-->
 		<!-- Syntax Highlighter -->  
 		<link type="text/css" rel="stylesheet" href="<?php echo $_ENV['url.content']; ?>css/SyntaxHighlighter.css"></link>
-		<title><?php if(isset($title)) echo $title; else echo 'Recess!'; ?></title>
+		<title><?php if(isset($title)) echo $title; else echo 'Recess'; ?></title>
 		
 		<style type="text/css">
 			.error,.notice,.success{ margin: 0 0 1em 0; padding: 0.8em; border: 2px solid #000; }
diff --git a/recess/lib/recess/apps/tools/views/apps/createModel.php b/recess/lib/recess/apps/tools/views/apps/createModel.php
index 33f423d..e74c847 100644
--- a/recess/lib/recess/apps/tools/views/apps/createModel.php
+++ b/recess/lib/recess/apps/tools/views/apps/createModel.php
@@ -5,7 +5,7 @@
 include_once($viewsDir . 'common/header.php');
 ?>
 <h1>New <strong>Model</strong> Helper</h1>
-<p>The purpose of this helper is to help speed the process of creating Recess! Models. Please note <span class="highlight">this form is <strong>not</strong> child proof</span>!</p>
+<p>The purpose of this helper is to help speed the process of creating Recess Models. Please note <span class="highlight">this form is <strong>not</strong> child proof</span>!</p>
 <form class="modelForm" method="POST" action="<?php echo $controller->urlTo('generateModel',$app); ?>">
 <h2>Step 1) Name Your Model</h2>
 <label for="modelName">Model Class Name:</label> <input id="modelName" type="text" name="modelName" />
diff --git a/recess/lib/recess/apps/tools/views/apps/newAppWizardComplete.php b/recess/lib/recess/apps/tools/views/apps/newAppWizardComplete.php
index 1ae17b5..72f65ad 100644
--- a/recess/lib/recess/apps/tools/views/apps/newAppWizardComplete.php
+++ b/recess/lib/recess/apps/tools/views/apps/newAppWizardComplete.php
@@ -15,7 +15,7 @@
 </pre>
 
 <h2><span class="highlight">Last Step</span>: Activate <span class="highlight"><?php echo $applicationFullClass; ?></span> in recess-conf.php</h2>
-<p>To enable your application open the Recess! config file: <span class="highlight"><?php echo $_ENV['dir.bootstrap']; ?>recess-conf.php</span></p>
+<p>To enable your application open the Recess config file: <span class="highlight"><?php echo $_ENV['dir.bootstrap']; ?>recess-conf.php</span></p>
 <p>Find the RecessConf::$applications array and <span class="highlight">add the following application string</span>:</p>
 <pre name="code" class="php:nogutter">
 RecessConf::$applications 
diff --git a/recess/lib/recess/apps/tools/views/common/footer.php b/recess/lib/recess/apps/tools/views/common/footer.php
index 89d84c7..a1be1f4 100644
--- a/recess/lib/recess/apps/tools/views/common/footer.php
+++ b/recess/lib/recess/apps/tools/views/common/footer.php
@@ -1,17 +1,17 @@
 			</div>
 			<div class="span-5 last infobar">
-			  <h3><span>Recess! Resources</span></h3>
+			  <h3><span>Recess Resources</span></h3>
 			  <ul>
 				<li><a href="http://www.recessframework.org/">RecessFramework.org</a></li>
-				<li><a href="http://www.recessframework.org/blog">Recess! Blog</a></li>
+				<li><a href="http://www.recessframework.org/blog">Recess Blog</a></li>
 				<li><a href="http://www.krisjordan.com/">Kris' Blog</a></li>
 				<li><a href="http://groups.google.com/group/recess-framework">Mailing Group</a></li>
 				<li><a href="http://recess.lighthouseapp.com/">Report Bugs</a></li>
-				<li><a href="http://github.com/recess/recess/">Recess! Source</a></li>
+				<li><a href="http://github.com/recess/recess/">Recess Source</a></li>
 			  </ul>
 			</div>
 			<div class="span-24 footer">
-			  <p class="quiet bottom"><a href="http://www.recessframework.org/">Recess! Framework</a> is &copy; 2008 <a href="http://www.krisjordan.com/">Kris Jordan</a>. All rights reserved. Recess is open source under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT license</a>.</p>
+			  <p class="quiet bottom"><a href="http://www.recessframework.org/">Recess PHP Framework</a> is &copy; 2008 <a href="http://www.krisjordan.com/">Kris Jordan</a>. All rights reserved. Recess is open source under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT license</a>.</p>
 			</div>
 		</div>
 	</body>
diff --git a/recess/lib/recess/apps/tools/views/common/header.php b/recess/lib/recess/apps/tools/views/common/header.php
index f994ede..9a01cfa 100644
--- a/recess/lib/recess/apps/tools/views/common/header.php
+++ b/recess/lib/recess/apps/tools/views/common/header.php
@@ -40,12 +40,12 @@
 			}
 		}
 		?>
-		<title><?php if(isset($title)) echo $title; else echo 'Recess! Tools!'; ?></title>
+		<title><?php if(isset($title)) echo $title; else echo 'Recess Tools!'; ?></title>
 	</head>
 	<body>
 	<div class="container">
 			<div class="span-11 header">
-				<h1>Recess! Tools</h1>
+				<h1>Recess Tools</h1>
 			</div>
 			<div class="span-13 last">
 				<p class="qotm quiet"><?php echo $qotms[rand(0,count($qotms)-1)]; ?></p>
diff --git a/recess/lib/recess/apps/tools/views/database/newSource.php b/recess/lib/recess/apps/tools/views/database/newSource.php
index 1b3152c..439e377 100644
--- a/recess/lib/recess/apps/tools/views/database/newSource.php
+++ b/recess/lib/recess/apps/tools/views/database/newSource.php
@@ -4,7 +4,7 @@
 include_once($viewsDir . 'common/header.php');
 ?>
 <h1>Adding a New Named Data Source</h1>
-<p>Recess! allows for multiple named data sources. Currently only MySQL and Sqlite are supported.</p>
+<p>Recess allows for multiple named data sources. Currently only MySQL and Sqlite are supported.</p>
 
 <ol>
 	<li><span class="highlight">Open <?php echo $_ENV['dir.bootstrap']; ?>recess-conf.php</span></li>
diff --git a/recess/lib/recess/apps/tools/views/home/home.php b/recess/lib/recess/apps/tools/views/home/home.php
index b146e20..9eae5b2 100644
--- a/recess/lib/recess/apps/tools/views/home/home.php
+++ b/recess/lib/recess/apps/tools/views/home/home.php
@@ -1,10 +1,10 @@
 <?php
-$title = 'Recess! Tools! - Home';
+$title = 'Recess Tools! - Home';
 $selectedNav = '';
 include_once($viewsDir . 'common/header.php');
 ?>
 
-<h1>Welcome to Recess!</h1>
+<h1>Welcome to Recess</h1>
 
 <h2>What is Tools?</h2>
 <p>
diff --git a/recess/lib/recess/cache/Cache.class.php b/recess/lib/recess/cache/Cache.class.php
index 79463ae..8967f87 100644
--- a/recess/lib/recess/cache/Cache.class.php
+++ b/recess/lib/recess/cache/Cache.class.php
@@ -8,7 +8,7 @@
  * encouraged to remove unused cache providers from this file.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @package Recess! Framework
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  **/
diff --git a/recess/lib/recess/database/Databases.class.php b/recess/lib/recess/database/Databases.class.php
index 45183e5..5ea237a 100644
--- a/recess/lib/recess/database/Databases.class.php
+++ b/recess/lib/recess/database/Databases.class.php
@@ -3,8 +3,8 @@
  * Registry of Database Sources
  *
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/orm/Model.class.php b/recess/lib/recess/database/orm/Model.class.php
index 064ad7c..97bf857 100644
--- a/recess/lib/recess/database/orm/Model.class.php
+++ b/recess/lib/recess/database/orm/Model.class.php
@@ -1,7 +1,7 @@
 <?php
 Library::import('recess.lang.Inflector');
-Library::import('recess.lang.RecessObject');
-Library::import('recess.lang.RecessReflectionClass');
+Library::import('recess.lang.Object');
+Library::import('recess.lang.reflection.RecessReflectionClass');
 Library::import('recess.lang.Annotation');
 
 Library::import('recess.database.Databases');
@@ -23,12 +23,18 @@
  * Model is the basic unit of organization in Recess' simple ORM.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
-abstract class Model extends RecessObject implements ISqlConditions {
+abstract class Model extends Object implements ISqlConditions {
+	
+	const CLASSNAME = 'Model';
+	const INSERT = 'insert';
+	const UPDATE = 'update';
+	const DELETE = 'delete';
+	const SAVE = 'save';
 	
 	/**
 	 * Constructor can take either a keyed array or a string/int
@@ -142,55 +148,23 @@ static function getColumns($classOrInstance) {
 	static function getProperties($classOrInstance) {
 		return self::getClassDescriptor($classOrInstance)->properties;
 	}
+
+	protected static function initClassDescriptor($class) {	
+		return new ModelDescriptor($class, false);
+	}
 	
-	/**
-	 * Implementation of the RecessObject abstract method. This method
-	 * computes a static ModelDescriptor based on reflected meta data
-	 * and annotations from the model class.
-	 *
-	 * @see RecessObject
-	 * @param string $class
-	 * @return ModelDescriptor
-	 */
-	static protected function buildClassDescriptor($class) {
-		$descriptor = new ModelDescriptor($class, false);
-		
-		try {
-			$reflection = new RecessReflectionClass($class);
-		} catch(ReflectionException $e) {
-			throw new RecessException('Class "' . $class . '" has not been declared.', get_defined_vars());
-		}
-		
-		$annotations = $reflection->getAnnotations();
-		foreach($annotations as $annotation) {
-			if($annotation instanceof ModelAnnotation) {
-				$annotation->massage($descriptor);
-			}
-		}
-		
-		$reflectedProperties = $reflection->getProperties();
-		$properties = array();
-		foreach($reflectedProperties as $reflectedProperty) {
-			if(!$reflectedProperty->isStatic() && $reflectedProperty->isPublic()) {
-				$property = new ModelProperty();
-				$property->name = $reflectedProperty->name;
-				$annotations = $reflectedProperty->getAnnotations();
-				foreach($annotations as $annotation) {
-					if($annotation instanceof ModelPropertyAnnotation) {
-						$annotation->massage($property);
-						if($property->isPrimaryKey === true) {
-							$descriptor->primaryKey = $property->name;
-						}
-					}
-				}
-				$properties[] = $property;
-			}
+	protected static function shapeDescriptorWithProperty($class, $property, $descriptor, $annotations) {
+		if(!$property->isStatic() && $property->isPublic()) {
+			$modelProperty = new ModelProperty();
+			$modelProperty->name = $property->name;
+			$descriptor->properties[$modelProperty->name] = $modelProperty;
 		}
-		$descriptor->properties = $properties;
-		
+		return $descriptor;
+	}
+	
+	protected static function finalClassDescriptor($class, $descriptor) {
 		$modelSource = Databases::getSource($descriptor->getSourceName());
-		$modelSource->cascadeTableDescriptor($descriptor->getTable(), $modelSource->modelToTableDescriptor($descriptor));
-		
+		$modelSource->cascadeTableDescriptor($descriptor->getTable(), $modelSource->modelToTableDescriptor($descriptor));	
 		return $descriptor;
 	}
 	
@@ -270,6 +244,11 @@ function all() {
 	protected function assignmentSqlForThisObject(ModelDescriptor $descriptor, $useAssignment = true, $excludePrimaryKey = false) {
 		$sqlBuilder = new SqlBuilder();
 		$sqlBuilder->from($descriptor->getTable());
+		
+		if(empty($descriptor->columns)) {
+			throw new RecessException('The "' . $descriptor->getTable() . '" table does not appear to exist in your database.', get_defined_vars());
+		}
+		
 		foreach($this as $column => $value) {
 			if($excludePrimaryKey && $descriptor->primaryKey == $column) continue;
 			if(in_array($column, $descriptor->columns) && isset($value)) {
@@ -288,8 +267,10 @@ protected function assignmentSqlForThisObject(ModelDescriptor $descriptor, $useA
 	 *
 	 * @param boolean $cascade - Also delete models related to this model?
 	 * @return boolean
+	 * 
+	 * !Wrappable delete
 	 */
-	function delete($cascade = true) {	
+	function wrappedDelete($cascade = true) {
 		$thisClassDescriptor = self::getClassDescriptor($this);
 		
 		if($cascade) {
@@ -305,10 +286,11 @@ function delete($cascade = true) {
 
 	/**
 	 * Insert row into the data source based on the values of this instance.
-	 *
 	 * @return boolean
+	 * 
+	 * !Wrappable insert
 	 */
-	function insert() {
+	function wrappedInsert() {
 		$thisClassDescriptor = self::getClassDescriptor($this);
 		
 		$sqlBuilder = $this->assignmentSqlForThisObject($thisClassDescriptor);
@@ -324,10 +306,11 @@ function insert() {
 
 	/**
 	 * Update a row in the data source based on the values of this instance.
-	 *
 	 * @return boolean
+	 * 
+	 * !Wrappable update
 	 */
-	function update() {
+	function wrappedUpdate() {
 		$thisClassDescriptor = self::getClassDescriptor($this);
 		
 		$sqlBuilder = $this->assignmentSqlForThisObject($thisClassDescriptor, true, true);
@@ -341,8 +324,10 @@ function update() {
 	 * Insert or update depending on whether or not this instance's primary key is set.
 	 *
 	 * @return boolean
+	 * 
+	 * !Wrappable save
 	 */
-	function save()   {
+	function wrappedSave()   {
 		if($this->primaryKeyIsSet()) {
 			return $this->update();
 		} else {
@@ -495,7 +480,7 @@ function notLike($column, $rhs) { return $this->select()->notLike($column,$rhs);
 /**
  * Class descriptor + metadata for a model.
  */
-class ModelDescriptor extends RecessObjectDescriptor {
+class ModelDescriptor extends ClassDescriptor {
 	
 	public $primaryKey = 'id';
 	private $table;
diff --git a/recess/lib/recess/database/orm/annotations/AbstractRelationshipAnnotation.class.php b/recess/lib/recess/database/orm/annotations/AbstractRelationshipAnnotation.class.php
new file mode 100644
index 0000000..9f01caf
--- /dev/null
+++ b/recess/lib/recess/database/orm/annotations/AbstractRelationshipAnnotation.class.php
@@ -0,0 +1,51 @@
+<?php
+Library::import('recess.lang.Annotation');
+
+/**
+ * Abstract class for relationship annotations.
+ * 
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+abstract class AbstractRelationshipAnnotation extends Annotation {
+
+	static $ON_DELETE_VALUES = array(Relationship::CASCADE, Relationship::DELETE, Relationship::NULLIFY);
+	
+	protected $class;
+	protected $key;
+	protected $through;
+	protected $ondelete;
+	
+	public function isFor() {
+		return Annotation::FOR_CLASS;
+	}
+	
+	protected function expandHelper($relationship, $descriptor) {
+		$relationshipName = $this->values[0];
+		
+		if(isset($this->class)) {
+			$relationship->foreignClass = $this->class;
+		}
+		
+		if(isset($this->key)) {
+			$relationship->foreignKey = $this->key;
+		}
+		
+		if(isset($this->through)) {
+			$relationship->through = $this->through;
+		}
+		
+		if(isset($this->ondelete)) {
+			$relationship->onDelete = strtolower($this->ondelete);
+		}
+		
+		$descriptor->relationships[$relationshipName] = $relationship;
+		
+		$relationship->attachMethodsToModelDescriptor($descriptor);
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/recess/lib/recess/database/orm/annotations/BelongsToAnnotation.class.php b/recess/lib/recess/database/orm/annotations/BelongsToAnnotation.class.php
index 12bced7..2f1b4fd 100644
--- a/recess/lib/recess/database/orm/annotations/BelongsToAnnotation.class.php
+++ b/recess/lib/recess/database/orm/annotations/BelongsToAnnotation.class.php
@@ -1,31 +1,39 @@
 <?php
-Library::import('recess.database.orm.annotations');
+Library::import('recess.database.orm.annotations.AbstractRelationshipAnnotation');
+Library::import('recess.database.orm.relationships.BelongsToRelationship');
 
 /**
  * An annotation used on Model Classes, the BelongsTo annotation gives a model
  * a BelongsToRelationship.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
-class BelongsToAnnotation extends ModelAnnotation {
-	protected $relationshipName;
-	protected $settings = array();
+class BelongsToAnnotation extends AbstractRelationshipAnnotation {
 	
-	function init($array) {
-		if(count($array) < 1) {
-			throw new RecessException('BelongsTo annotation requires at least a name: /** BelongsTo nameOfRelationship */');
-		}
-		$this->relationshipName = array_shift($array);
-		$this->settings = $array;
+	static $ACCEPTED_KEYS = array(Relationship::FOREIGN_CLASS, Relationship::FOREIGN_KEY, Relationship::ON_DELETE);
+	
+	public function usage() {
+		return '!BelongsTo relationshipName [, Class: relatedClass] [, Key: foreignKey] [, OnDelete: ( Nullify | Cascade | Delete )]';
+	}
+	
+	protected function validate($class) {
+		$this->minimumParameterCount(1);
+		$this->maximumParameterCount(4);
+		$this->acceptedKeys(self::$ACCEPTED_KEYS);
+		$this->acceptedValuesForKey(Relationship::ON_DELETE, parent::$ON_DELETE_VALUES, CASE_LOWER);
 	}
 	
-	function massage(ModelDescriptor &$descriptor) {
+	protected function expand($class, $reflection, $descriptor) {
+		$relationshipName = $this->values[0];
+		
 		$relationship = new BelongsToRelationship();
-		$this->massageRelationshipHelper($descriptor, $relationship);
+		$relationship->init($class, $relationshipName);
+		
+		$this->expandHelper($relationship, $descriptor);
 	}
 
 }
diff --git a/recess/lib/recess/database/orm/annotations/ColumnAnnotation.class.php b/recess/lib/recess/database/orm/annotations/ColumnAnnotation.class.php
index e119db3..eac46d8 100644
--- a/recess/lib/recess/database/orm/annotations/ColumnAnnotation.class.php
+++ b/recess/lib/recess/database/orm/annotations/ColumnAnnotation.class.php
@@ -1,38 +1,48 @@
 <?php
-Library::import('recess.database.orm.annotations.ModelPropertyAnnotation');
+Library::import('recess.lang.Annotation');
+Library::import('recess.database.pdo.RecessType');
 
 /**
  * An annotation used on Model properties which specifies information about the column
  * a given property maps to in the data source.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
-class ColumnAnnotation extends ModelPropertyAnnotation {
-	public $type;
-	public $isPrimaryKey = false;
-	public $autoIncrement = false;
+class ColumnAnnotation extends Annotation {
+	const PRIMARY_KEY = 'PrimaryKey';
+	const AUTO_INCREMENT = 'AutoIncrement';
 	
-	function init($array) {
-		foreach($array as $item) {
-			$lowerItem = strtolower($item);
-			if($lowerItem == 'primarykey') {
-				$this->isPrimaryKey = true;
-			} else if ($lowerItem == 'autoincrement') {
-				$this->autoIncrement = true;
-			} else {
-				$this->type = $item;
-			}
-		}
+	public function usage() {
+		return '!Column type [, PrimaryKey] [, AutoIncrement]';
+	}
+	
+	public function isFor() {
+		return Annotation::FOR_PROPERTY;
+	}
+
+	protected function validate($class) {
+		$this->acceptsNoKeyedValues();
+		$this->minimumParameterCount(1);
+		$this->maximumParameterCount(3);
+		$this->acceptedKeylessValues(array_merge(RecessType::all(), array('PrimaryKey', 'AutoIncrement')));
 	}
 	
-	function massage(ModelProperty $property) {
-		$property->type = $this->type;
-		$property->isPrimaryKey = $this->isPrimaryKey;
-		$property->isAutoIncrement = $this->autoIncrement;
+	protected function expand($class, $reflection, $descriptor) {
+		$propertyName = $reflection->getName();
+		if(isset($descriptor->properties[$propertyName])) {
+			$property = &$descriptor->properties[$propertyName];
+			$property->type = $this->valueNotIn(array(self::PRIMARY_KEY, self::AUTO_INCREMENT));
+			$property->isPrimaryKey = $this->isAValue(self::PRIMARY_KEY);
+			$property->isAutoIncrement = $this->isAValue(self::AUTO_INCREMENT);
+			
+			if($property->isPrimaryKey) {
+				$descriptor->primaryKey = $propertyName;
+			}
+		}
 	}
 }
 ?>
\ No newline at end of file
diff --git a/recess/lib/recess/database/orm/annotations/DatabaseAnnotation.class.php b/recess/lib/recess/database/orm/annotations/DatabaseAnnotation.class.php
index 84ff59d..76b642e 100644
--- a/recess/lib/recess/database/orm/annotations/DatabaseAnnotation.class.php
+++ b/recess/lib/recess/database/orm/annotations/DatabaseAnnotation.class.php
@@ -6,24 +6,30 @@
  * of the data source (Databases::getSource($name)) this Model should talk to.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
-class DatabaseAnnotation extends ModelAnnotation {
-	public $source;
+class DatabaseAnnotation extends Annotation {
 	
-	function init($array) {
-		if(isset($array[0]) && count($array) == 1) {
-			$this->source = $array[0];
-		} else {
-			throw new RecessException('!Database annotation takes 1 parameter: name. Ex: !Database Default', get_defined_vars());
-		}
+	public function usage() {
+		return '!Database databaseName';
+	}
+
+	public function isFor() {
+		return Annotation::FOR_CLASS;
+	}
+
+	protected function validate($class) {
+		$this->acceptsNoKeyedValues();
+		$this->exactParameterCount(1);
+		$this->validOnInstancesOf($class, Model::CLASSNAME);
 	}
 	
-	function massage(ModelDescriptor &$descriptor) {
-		$descriptor->source = $this->source;
+	protected function expand($class, $reflection, $descriptor) {
+		$descriptor->source = $this->values[0];
 	}
+	
 }
 ?>
\ No newline at end of file
diff --git a/recess/lib/recess/database/orm/annotations/HasManyAnnotation.class.php b/recess/lib/recess/database/orm/annotations/HasManyAnnotation.class.php
index 2f208d2..bcc6768 100644
--- a/recess/lib/recess/database/orm/annotations/HasManyAnnotation.class.php
+++ b/recess/lib/recess/database/orm/annotations/HasManyAnnotation.class.php
@@ -1,5 +1,5 @@
 <?php
-Library::import('recess.database.orm.annotations.ModelAnnotation');
+Library::import('recess.database.orm.annotations.AbstractRelationshipAnnotation');
 Library::import('recess.database.orm.relationships.HasManyRelationship');
 
 /**
@@ -7,26 +7,33 @@
  * a HasManyRelationship.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
-class HasManyAnnotation extends ModelAnnotation {
-	protected $relationshipName;
-	protected $settings = array();
+class HasManyAnnotation extends AbstractRelationshipAnnotation {
 	
-	function init($array) {
-		if(count($array) < 1) {
-			throw new RecessException('HasMany annotation requires at least a name: /** HasMany nameOfRelationship */');
-		}
-		$this->relationshipName = array_shift($array);
-		$this->settings = $array;
+	static $ACCEPTED_KEYS = array(Relationship::FOREIGN_CLASS, Relationship::FOREIGN_KEY, Relationship::THROUGH, Relationship::ON_DELETE);	
+
+	public function usage() {
+		return '!HasMany relationshipName [, Class: relatedClass] [, Key: foreignKey] [, Through: throughClass ] [, OnDelete: ( Delete | Cascade | Nullify )]';
+	}
+	
+	protected function validate($class) {
+		$this->minimumParameterCount(1);
+		$this->maximumParameterCount(5);
+		$this->acceptedKeys(self::$ACCEPTED_KEYS);
+		$this->acceptedValuesForKey(Relationship::ON_DELETE, parent::$ON_DELETE_VALUES, CASE_LOWER);
 	}
 	
-	function massage(ModelDescriptor &$descriptor) {
+	protected function expand($class, $reflection, $descriptor) {
+		$relationshipName = $this->values[0];
+		
 		$relationship = new HasManyRelationship();
-		$this->massageRelationshipHelper($descriptor, $relationship);
+		$relationship->init($class, $relationshipName);
+		
+		$this->expandHelper($relationship, $descriptor);
 	}
 
 }
diff --git a/recess/lib/recess/database/orm/annotations/ModelAnnotation.class.php b/recess/lib/recess/database/orm/annotations/ModelAnnotation.class.php
deleted file mode 100644
index 6ee2dc1..0000000
--- a/recess/lib/recess/database/orm/annotations/ModelAnnotation.class.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-Library::import('recess.lang.Annotation');
-
-/**
- * Abstract class for annotations used on Model Classes
- * 
- * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
- * @license MIT
- * @link http://www.recessframework.org/
- */
-abstract class ModelAnnotation extends Annotation {
-	abstract function massage(ModelDescriptor &$descriptor);
-	
-	final protected function massageRelationshipHelper(ModelDescriptor &$descriptor, Relationship $relationship) {
-		$relationship->init($descriptor->modelClass, $this->relationshipName);
-		
-		foreach($this->settings as $key => $value) {
-			switch(strtolower($key)) {
-				case Relationship::FOREIGN_KEY:
-					$relationship->foreignKey = $value;
-					break;
-				case Relationship::FOREIGN_CLASS:
-					$relationship->foreignClass = $value;
-					break;
-				case Relationship::THROUGH:
-					$relationship->through = $value;
-					break;
-				case Relationship::ON_DELETE:
-					$lowerValue = strtolower($value);
-					switch(strtolower($lowerValue)) {
-						case Relationship::CASCADE:
-						case Relationship::DELETE:
-						case Relationship::NULLIFY:
-							break;
-						default:
-							throw new RecessException('Invalid OnDelete setting: "' . $value . '".', get_defined_vars());
-					}
-					$relationship->onDelete = strtolower($lowerValue);
-					break;
-			}
-		}
-
-		$descriptor->relationships[$relationship->name] = $relationship;
-		
-		$relationship->attachMethodsToModelDescriptor($descriptor);
-	}
-}
-?>
\ No newline at end of file
diff --git a/recess/lib/recess/database/orm/annotations/ModelPropertyAnnotation.class.php b/recess/lib/recess/database/orm/annotations/ModelPropertyAnnotation.class.php
deleted file mode 100644
index ac88a4c..0000000
--- a/recess/lib/recess/database/orm/annotations/ModelPropertyAnnotation.class.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-Library::import('recess.lang.Annotation');
-
-/**
- * Abstract class for annotations used on the properties of a model.
- * 
- * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
- * @license MIT
- * @link http://www.recessframework.org/
- */
-abstract class ModelPropertyAnnotation extends Annotation {
-	
-	abstract function massage(ModelProperty $property);
-	
-}
-
-?>
\ No newline at end of file
diff --git a/recess/lib/recess/database/orm/annotations/TableAnnotation.class.php b/recess/lib/recess/database/orm/annotations/TableAnnotation.class.php
index e8d8808..0ec4bde 100644
--- a/recess/lib/recess/database/orm/annotations/TableAnnotation.class.php
+++ b/recess/lib/recess/database/orm/annotations/TableAnnotation.class.php
@@ -6,26 +6,30 @@
  * to a table in the RDBMS.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
-class TableAnnotation extends ModelAnnotation {
-	public $table;
+class TableAnnotation extends Annotation {
+		
+	public function usage() {
+		return '!Table tableName';
+	}
+
+	public function isFor() {
+		return Annotation::FOR_CLASS;
+	}
 	
-	function init($array) {
-		if(isset($array[0]) && count($array) == 1) {
-			$this->table = $array[0];
-		} else {
-			throw new RecessException('!Table annotation takes 1 parameter: table name. Ex: !Table my_table', get_defined_vars());
-		}
+	protected function validate($class) {
+		$this->acceptsNoKeyedValues();
+		$this->exactParameterCount(1);
+		$this->validOnInstancesOf($class, Model::CLASSNAME);
 	}
 	
-	function massage(ModelDescriptor &$descriptor) {
-		if(isset($this->table)) {
-			$descriptor->setTable($this->table);
-		}
+	protected function expand($class, $reflection, $descriptor) {
+		$descriptor->setTable($this->values[0]);
 	}
+	
 }
 ?>
\ No newline at end of file
diff --git a/recess/lib/recess/database/orm/relationships/BelongsToRelationship.class.php b/recess/lib/recess/database/orm/relationships/BelongsToRelationship.class.php
index 5c708e3..dc885d7 100644
--- a/recess/lib/recess/database/orm/relationships/BelongsToRelationship.class.php
+++ b/recess/lib/recess/database/orm/relationships/BelongsToRelationship.class.php
@@ -4,8 +4,8 @@
  * foreign key relationship on the RDBMS.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
@@ -25,15 +25,15 @@ function init($modelClassName, $relationshipName) {
 	
 	function attachMethodsToModelDescriptor(ModelDescriptor &$descriptor) {
 		$alias = $this->name;
-		$attachedMethod = new RecessObjectAttachedMethod($this, 'selectModel', $alias);
+		$attachedMethod = new AttachedMethod($this, 'selectModel', $alias);
 		$descriptor->addAttachedMethod($alias, $attachedMethod);
 		
 		$alias = 'set' . ucfirst($this->name);
-		$attachedMethod = new RecessObjectAttachedMethod($this,'set', $alias);
+		$attachedMethod = new AttachedMethod($this,'set', $alias);
 		$descriptor->addAttachedMethod($alias, $attachedMethod);
 		
 		$alias = 'unset' . ucfirst($this->name);
-		$attachedMethod = new RecessObjectAttachedMethod($this,'remove', $alias);
+		$attachedMethod = new AttachedMethod($this,'remove', $alias);
 		$descriptor->addAttachedMethod($alias, $attachedMethod);
 	}
 	
diff --git a/recess/lib/recess/database/orm/relationships/HasManyRelationship.class.php b/recess/lib/recess/database/orm/relationships/HasManyRelationship.class.php
index b8c7794..e005bc1 100644
--- a/recess/lib/recess/database/orm/relationships/HasManyRelationship.class.php
+++ b/recess/lib/recess/database/orm/relationships/HasManyRelationship.class.php
@@ -6,8 +6,8 @@
  * foreign key relationship on the RDBMS.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
@@ -35,15 +35,15 @@ function getDefaultOnDeleteMode() {
 	
 	function attachMethodsToModelDescriptor(ModelDescriptor &$descriptor) {
 		$alias = $this->name;
-		$attachedMethod = new RecessObjectAttachedMethod($this,'selectModel', $alias);
+		$attachedMethod = new AttachedMethod($this,'selectModel', $alias);
 		$descriptor->addAttachedMethod($alias, $attachedMethod);
 		
 		$alias = 'addTo' . ucfirst($this->name);
-		$attachedMethod = new RecessObjectAttachedMethod($this,'addTo', $alias);
+		$attachedMethod = new AttachedMethod($this,'addTo', $alias);
 		$descriptor->addAttachedMethod($alias, $attachedMethod);
 		
 		$alias = 'removeFrom' . ucfirst($this->name);
-		$attachedMethod = new RecessObjectAttachedMethod($this,'removeFrom', $alias);
+		$attachedMethod = new AttachedMethod($this,'removeFrom', $alias);
 		$descriptor->addAttachedMethod($alias, $attachedMethod);
 	}
 	
diff --git a/recess/lib/recess/database/orm/relationships/Relationship.class.php b/recess/lib/recess/database/orm/relationships/Relationship.class.php
index d12f175..76ef9ee 100644
--- a/recess/lib/recess/database/orm/relationships/Relationship.class.php
+++ b/recess/lib/recess/database/orm/relationships/Relationship.class.php
@@ -3,8 +3,8 @@
  * A Recess Relationship is an abstraction of a foreign key relationship on the RDBMS.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/pdo/IPdoDataSourceProvider.class.php b/recess/lib/recess/database/pdo/IPdoDataSourceProvider.class.php
index df09355..d960ee2 100644
--- a/recess/lib/recess/database/pdo/IPdoDataSourceProvider.class.php
+++ b/recess/lib/recess/database/pdo/IPdoDataSourceProvider.class.php
@@ -7,8 +7,8 @@
  * Interface for vendor specific operations needed by PdoDataSource.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/pdo/MysqlDataSourceProvider.class.php b/recess/lib/recess/database/pdo/MysqlDataSourceProvider.class.php
index e32dd93..8e297a2 100644
--- a/recess/lib/recess/database/pdo/MysqlDataSourceProvider.class.php
+++ b/recess/lib/recess/database/pdo/MysqlDataSourceProvider.class.php
@@ -6,8 +6,8 @@
  * MySql Data Source Provider
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/pdo/PdoDataSet.class.php b/recess/lib/recess/database/pdo/PdoDataSet.class.php
index c5ed4e0..6d962e6 100644
--- a/recess/lib/recess/database/pdo/PdoDataSet.class.php
+++ b/recess/lib/recess/database/pdo/PdoDataSet.class.php
@@ -17,8 +17,8 @@
  * }
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/pdo/PdoDataSource.class.php b/recess/lib/recess/database/pdo/PdoDataSource.class.php
index 9e19b36..b31795f 100644
--- a/recess/lib/recess/database/pdo/PdoDataSource.class.php
+++ b/recess/lib/recess/database/pdo/PdoDataSource.class.php
@@ -7,12 +7,12 @@
 Library::import('recess.database.pdo.RecessColumnDescriptor');
 
 /**
- * A PDO wrapper in the Recess! Framework that provides a single interface for commonly 
+ * A PDO wrapper in the Recess PHP Framework that provides a single interface for commonly 
  * needed operations (i.e.: list tables, list columns in a table, etc).
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
@@ -58,7 +58,7 @@ function __construct($dsn, $username = '', $password = '', $driver_options = arr
 	
 	/**
 	 * Locate the pdo driver specific data source provider, instantiate, and return.
-	 * Throws ProviderDoesNotExistException for a pdo driver without a Recess! provider.
+	 * Throws ProviderDoesNotExistException for a pdo driver without a Recess provider.
 	 *
 	 * @return IPdoDataSourceProvider
 	 */
diff --git a/recess/lib/recess/database/pdo/RecessColumnDescriptor.class.php b/recess/lib/recess/database/pdo/RecessColumnDescriptor.class.php
index f3e2d17..5636a9b 100644
--- a/recess/lib/recess/database/pdo/RecessColumnDescriptor.class.php
+++ b/recess/lib/recess/database/pdo/RecessColumnDescriptor.class.php
@@ -3,8 +3,8 @@
  * RecessTable represents a basic abstraction of an RDBMS column.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/pdo/RecessTableDescriptor.class.php b/recess/lib/recess/database/pdo/RecessTableDescriptor.class.php
index be08d70..9f39504 100644
--- a/recess/lib/recess/database/pdo/RecessTableDescriptor.class.php
+++ b/recess/lib/recess/database/pdo/RecessTableDescriptor.class.php
@@ -5,8 +5,8 @@
  * RecessTableDescriptor represents a basic abstraction of an RDBMS table.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/pdo/RecessType.class.php b/recess/lib/recess/database/pdo/RecessType.class.php
index c187df2..7ed044b 100644
--- a/recess/lib/recess/database/pdo/RecessType.class.php
+++ b/recess/lib/recess/database/pdo/RecessType.class.php
@@ -4,8 +4,8 @@
  * column types by individual DataSourceProviders.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/pdo/exceptions/DataSourceCouldNotConnectException.class.php b/recess/lib/recess/database/pdo/exceptions/DataSourceCouldNotConnectException.class.php
index 142d36f..6fe79c6 100644
--- a/recess/lib/recess/database/pdo/exceptions/DataSourceCouldNotConnectException.class.php
+++ b/recess/lib/recess/database/pdo/exceptions/DataSourceCouldNotConnectException.class.php
@@ -3,8 +3,8 @@
  * This exception is thrown when the connect operation fails.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/pdo/exceptions/ProviderDoesNotExistException.class.php b/recess/lib/recess/database/pdo/exceptions/ProviderDoesNotExistException.class.php
index e3fcc59..020b012 100644
--- a/recess/lib/recess/database/pdo/exceptions/ProviderDoesNotExistException.class.php
+++ b/recess/lib/recess/database/pdo/exceptions/ProviderDoesNotExistException.class.php
@@ -1,12 +1,12 @@
 <?php
 /**
  * This exception is thrown when the PdoDataSource is instantiated
- * with a PDO Driver DSN that does not have an associated Recess!
+ * with a PDO Driver DSN that does not have an associated Recess
  * IPdoDataSourceProvider.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/sql/ISqlConditions.class.php b/recess/lib/recess/database/sql/ISqlConditions.class.php
index 1b64af8..b1f8ef0 100644
--- a/recess/lib/recess/database/sql/ISqlConditions.class.php
+++ b/recess/lib/recess/database/sql/ISqlConditions.class.php
@@ -3,8 +3,8 @@
  * Interface used which maps to conditional SQL statements
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/sql/ISqlSelectOptions.class.php b/recess/lib/recess/database/sql/ISqlSelectOptions.class.php
index 28ad0ff..9cc9526 100644
--- a/recess/lib/recess/database/sql/ISqlSelectOptions.class.php
+++ b/recess/lib/recess/database/sql/ISqlSelectOptions.class.php
@@ -3,8 +3,8 @@
  * Interface used which maps to SELECT SQL statements
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/database/sql/SqlBuilder.class.php b/recess/lib/recess/database/sql/SqlBuilder.class.php
index 0dd45da..e99e63b 100644
--- a/recess/lib/recess/database/sql/SqlBuilder.class.php
+++ b/recess/lib/recess/database/sql/SqlBuilder.class.php
@@ -24,8 +24,8 @@
  * @author Kris Jordan <krisjordan@gmail.com>
  * @contributor Luiz Alberto Zaiats 
  * 
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
@@ -179,11 +179,11 @@ protected function updateSanityCheck() {
 		if(	!empty($this->joins) )
 			throw new RecessException('Update does not use joins.', get_defined_vars());
 		if(	!empty($this->orderBy) ) 
-			throw new RecessException('Update (in Recess!) does not use order by.', get_defined_vars());
+			throw new RecessException('Update (in Recess) does not use order by.', get_defined_vars());
 		if(	isset($this->limit) )
-			throw new RecessException('Update (in Recess!) does not use limit.', get_defined_vars());
+			throw new RecessException('Update (in Recess) does not use limit.', get_defined_vars());
 		if(	isset($this->offset) )
-			throw new RecessException('Update (in Recess!) does not use offset.', get_defined_vars());
+			throw new RecessException('Update (in Recess) does not use offset.', get_defined_vars());
 		if(	isset($this->distinct) )
 			throw new RecessException('Update does not use distinct.', get_defined_vars());
 	}
diff --git a/recess/lib/recess/diagnostics/Diagnostics.class.php b/recess/lib/recess/diagnostics/Diagnostics.class.php
index 43ffb02..3f1f341 100644
--- a/recess/lib/recess/diagnostics/Diagnostics.class.php
+++ b/recess/lib/recess/diagnostics/Diagnostics.class.php
@@ -3,7 +3,7 @@
 
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008-2009 Kris Jordan
+ * @copyright 2008, 2009-2009 Kris Jordan
  * @package recess
  * @license MIT
  * @link http://www.recessframework.org/
@@ -31,6 +31,13 @@ public static function handleException(Exception $exception) {
 			}
 		}
 		
+		if(!class_exists('RecessConf', false)) {
+			print $exception->getMessage() . "\n";
+			print $exception->getTraceAsString();
+			print $exception->getFile() . ' ' . $exception->getLine();
+			exit;
+		}
+		
 		if(RecessConf::$mode == RecessConf::DEVELOPMENT) {
 			include('output/exception_report.php');
 		} else {
diff --git a/recess/lib/recess/diagnostics/output/exception_report.php b/recess/lib/recess/diagnostics/output/exception_report.php
index 7fc0148..5cbbe40 100644
--- a/recess/lib/recess/diagnostics/output/exception_report.php
+++ b/recess/lib/recess/diagnostics/output/exception_report.php
@@ -129,7 +129,7 @@ function printContext($context) {
 <html xmlns="http://www.w3.org/1999/XHTML" xml:lang="en" lang="en" dir="ltr"> 
 
 	<head>
-		<title>Recess! diagnostics! 500 :(</title>
+		<title>Recess diagnostics! 500 :(</title>
 		<script type="text/javascript" src="http://jqueryjs.googlecode.com/files/jquery-1.2.6.min.js"></script> 
 		<script type="text/javascript">
 			$(document).ready(function() {
@@ -204,7 +204,7 @@ function printContext($context) {
 		<div id="container">
 			<div id="header">
 				<div id="logo">
-					<h1 class="logo">Recess!</h1>
+					<h1 class="logo">Recess</h1>
 				</div>
 				<div id="httpCode">
 					<h2>500 Internal Server Error</h2>
@@ -212,7 +212,7 @@ function printContext($context) {
 			</div>
 			<div id="body">
 				<div id="error">
-					<h2><?php print $exception->getMessage(); ?></h2>
+					<h2><?php print nl2br($exception->getMessage()); ?></h2>
 					<p>Location: Line <?php print $exception->getLine(); ?> of <?php print $exception->getFile(); ?></p>
 					<?php printCodeSnippet($exception->getFile(), $exception->getLine()); ?>
 					<?php if($exception instanceof RecessException || $exception instanceof RecessErrorException) { printContext($exception->context); } ?>
@@ -221,7 +221,6 @@ function printContext($context) {
 				<div id="callstack">
 					<h2>Call Stack</h2>
 					<ul class="thestack">
-										
 					<?php
 					$i = 0;
 					$exceptionTrace = array();
diff --git a/recess/lib/recess/framework/Application.class.php b/recess/lib/recess/framework/Application.class.php
index e17ce05..e2c344b 100644
--- a/recess/lib/recess/framework/Application.class.php
+++ b/recess/lib/recess/framework/Application.class.php
@@ -38,7 +38,6 @@ abstract class Application {
 	
 	function addRoutesToRouter(RtNode $router) {
 		$classes = $this->listControllers();
-		
 		foreach($classes as $class) {
 			if(Library::classExists($this->controllersPrefix . $class)) {
 				$instance = new $class($this);
@@ -53,8 +52,7 @@ function addRoutesToRouter(RtNode $router) {
 					$router->addRoute($this, $route, $this->routingPrefix);
 				}
 			}
-		}
-		
+		}		
 		return $router;
 	}
 	
diff --git a/recess/lib/recess/framework/DefaultPolicy.class.php b/recess/lib/recess/framework/DefaultPolicy.class.php
index 07ee63f..9bd49e1 100644
--- a/recess/lib/recess/framework/DefaultPolicy.class.php
+++ b/recess/lib/recess/framework/DefaultPolicy.class.php
@@ -42,6 +42,7 @@ public function getControllerFor(Request &$request, array $applications, RtNode
 				throw new RecessResponseException('METHOD not supported, supported METHODs are: ' . implode(',', $routeResult->acceptableMethods), ResponseCodes::HTTP_METHOD_NOT_ALLOWED, get_defined_vars());
 			}
 		} else {
+			print_r($routes);exit;
 			throw new RecessResponseException('Resource does not exist.', ResponseCodes::HTTP_NOT_FOUND, get_defined_vars());
 		}
 		
diff --git a/recess/lib/recess/framework/controllers/AbstractController.class.php b/recess/lib/recess/framework/controllers/AbstractController.class.php
index 2487592..1076db5 100644
--- a/recess/lib/recess/framework/controllers/AbstractController.class.php
+++ b/recess/lib/recess/framework/controllers/AbstractController.class.php
@@ -1,6 +1,6 @@
 <?php
-Library::import('recess.lang.RecessObject');
-Library::import('recess.lang.RecessReflectionClass');
+Library::import('recess.lang.Object');
+Library::import('recess.lang.reflection.RecessReflectionClass');
 Library::import('recess.lang.Annotation', true);
 Library::import('recess.framework.interfaces.IController');
 Library::import('recess.framework.controllers.annotations.ViewAnnotation', true);
@@ -15,7 +15,7 @@
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
  */
-abstract class AbstractController extends RecessObject implements IController {
+abstract class AbstractController extends Object implements IController {
 	
 	public abstract function init();
 	
@@ -104,12 +104,4 @@ protected function unauthorized($forwardUri, $realm = '') {
 	}
 }
 
-class ControllerDescriptor extends RecessObjectDescriptor {
-	public $routes = array();
-	public $methodUrls = array();
-	public $routesPrefix = '';
-	public $viewClass = 'recess.framework.views.NativeView';
-	public $viewPrefix = '';
-}
-
 ?>
\ No newline at end of file
diff --git a/recess/lib/recess/framework/controllers/Controller.class.php b/recess/lib/recess/framework/controllers/Controller.class.php
index ea3ef2e..73988a8 100644
--- a/recess/lib/recess/framework/controllers/Controller.class.php
+++ b/recess/lib/recess/framework/controllers/Controller.class.php
@@ -16,6 +16,9 @@
  * @contributor Joshua Paine
  */
 abstract class Controller extends AbstractController {
+	
+	const CLASSNAME = 'Controller';
+	
 	/** @var Request */
 	protected $request;
 	
@@ -32,40 +35,27 @@ public function __construct($application = null) {
 	}
 	
 	public function init() { }
-	
-	protected static function buildClassDescriptor($class) {
-		try {
-			$reflection = new RecessReflectionClass($class);
-		} catch(ReflectionException $e) {
-			throw new RecessException('Class "' . $class . '" has not been declared.', get_defined_vars());
-		}
-		
-		$descriptor = new ControllerDescriptor();
-		
-		$annotations = $reflection->getAnnotations();
-		foreach($annotations as $annotation) {
-			if($annotation instanceof ControllerAnnotation) {
-				$annotation->massage($class, '', $descriptor);
-			}
-		}
-		
-		$reflectedMethods = $reflection->getMethods(false);
-		$methods = array();
+
+	protected static function initClassDescriptor($class) {
+		$descriptor = new ClassDescriptor();
+		$descriptor->routes = array();
+		$descriptor->methodUrls = array();
+		$descriptor->routesPrefix = '';
+		$descriptor->viewClass = 'recess.framework.views.NativeView';
+		$descriptor->viewPrefix = '';
+		return $descriptor;
+	}
+
+	protected static function shapeDescriptorWithMethod($class, $method, $descriptor, $annotations) {
 		$unreachableMethods = array('serve','urlTo','__call','__construct','init','application');
-		foreach($reflectedMethods as $reflectedMethod) {
-			if(in_array($reflectedMethod->getName(),$unreachableMethods)) continue;
-			$annotations = $reflectedMethod->getAnnotations();
-			foreach($annotations as $annotation) {
-				if($annotation instanceof ControllerAnnotation) {
-					$annotation->massage(Library::getFullyQualifiedClassName($class), $reflectedMethod->name, $descriptor, $reflectedMethod);
-				}
-			}
-			
-			if(	empty($annotations) && 
-				$reflectedMethod->isPublic() && 
-				!$reflectedMethod->isStatic()
+
+		if(in_array($method->getName(), $unreachableMethods)) return $descriptor;
+		
+		if(	empty($annotations) && 
+				$method->isPublic() && 
+				!$method->isStatic()
 			   ) {
-			   	$parameters = $reflectedMethod->getParameters();
+			   	$parameters = $method->getParameters();
 			   	$parameterNames = array();
 			   	foreach($parameters as $parameter) {
 			   		$parameterNames[] = '$' . $parameter->getName();
@@ -78,15 +68,13 @@ protected static function buildClassDescriptor($class) {
 				// Default Routing for Public Methods Without Annotations
 				$descriptor->routes[] = 
 					new Route(	$class, 
-								$reflectedMethod->getName(), 
+								$method->getName(), 
 								Methods::GET, 
-								$descriptor->routesPrefix . $reflectedMethod->getName() . $parameterPath);
-			}
+								$descriptor->routesPrefix . $method->getName() . $parameterPath);
 		}
-		
 		return $descriptor;
 	}
-	
+
 	/**
 	 * urlTo is a helper method that returns the url to a controller method.
 	 * Examples:
@@ -156,9 +144,10 @@ public function urlTo($methodName) {
 	 * Call the method and return its response.
 	 *
 	 * @param DefaultRequest $request The HTTP request being served.
-	 * @final
+	 * 
+	 * !Wrappable serve
 	 */
-	final function serve(Request $request) {		
+	function wrappedServe(Request $request) {		
 		$this->request = $request;
 		
 		$shortWiredResponse = $this->init();
diff --git a/recess/lib/recess/framework/controllers/annotations/ControllerAnnotation.class.php b/recess/lib/recess/framework/controllers/annotations/ControllerAnnotation.class.php
deleted file mode 100644
index eb396f3..0000000
--- a/recess/lib/recess/framework/controllers/annotations/ControllerAnnotation.class.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-Library::import('recess.lang.Annotation');
-
-abstract class ControllerAnnotation extends Annotation {
-	
-	abstract function massage($controller, $method, ControllerDescriptor $descriptor, ReflectionMethod $reflectedMethod = null);
-}
-
-?>
\ No newline at end of file
diff --git a/recess/lib/recess/framework/controllers/annotations/RouteAnnotation.class.php b/recess/lib/recess/framework/controllers/annotations/RouteAnnotation.class.php
index 0acc81a..af09513 100644
--- a/recess/lib/recess/framework/controllers/annotations/RouteAnnotation.class.php
+++ b/recess/lib/recess/framework/controllers/annotations/RouteAnnotation.class.php
@@ -1,60 +1,57 @@
 <?php
-Library::import('recess.framework.controllers.annotations.ControllerAnnotation');
+Library::import('recess.lang.Annotation');
 Library::import('recess.framework.routing.Route');
 
-class RouteAnnotation extends ControllerAnnotation {
-	protected $methods = array();
-	protected $path;
-	protected $hasError = false;
+class RouteAnnotation extends Annotation {
 	
-	function init($array) {
-		// Expectation GET, /some/path/info
-		if(count($array) == 1) {
-			if(is_string($array[0])) {
-				$fallBack = split(' ',trim($array[0]));
-				if(count($fallBack) > 1) {
-					$this->hasError = true;
-				}
-			}
-			$array[1] = ' ';
+	const EMPTY_PATH = ' ';
+	
+	protected $httpMethods = array();
+	protected $path = self::EMPTY_PATH;
+	
+	public function usage() {
+		return '!Route ( GET | POST | PUT | DELETE)[, route/path/here]';
+	}
+
+	public function isFor() {
+		return Annotation::FOR_METHOD;
+	}
+
+	protected function validate($class) {
+		$this->minimumParameterCount(1);
+		$this->maximumParameterCount(2);
+		$this->validOnInstancesOf($class, Controller::CLASSNAME);
+		$this->acceptedIndexedValues(0, array(Methods::GET, Methods::POST, Methods::PUT, Methods::DELETE));
+	}
+	
+	protected function expand($class, $reflection, $descriptor) {
+		if(is_array($this->values[0])) {
+			$this->httpMethods = $this->values[0];
+		} else {
+			$this->httpMethods = array($this->values[0]);
 		}
 		
-		if(count($array) != 2) {
-			throw new RecessException('RouteAnnotation takes 2 parameters: METHOD[s], route.', get_defined_vars());
+		if(isset($this->values[1])) {
+			$this->path = $this->values[1];
 		}
 		
-		if(!is_array($array[0])) {
-			$this->methods = array($array[0]);
-		} else {
-			$this->methods = $array[0];
-		}
+		$controller = Library::getFullyQualifiedClassName($class);
+		$controllerMethod	= $reflection->getName();
 		
-		$this->path = $array[1];
-	}
-	
-	function massage($controller, $method, ControllerDescriptor $descriptor, ReflectionMethod $reflectedMethod = null) {
-		if(isset($this->path[0]) && $this->path[0] != '/') {
-			$route = new Route($controller, $method,$this->methods, $descriptor->routesPrefix . $this->path);
-			$descriptor->methodUrls[$method] = $descriptor->routesPrefix . $this->path;
+		if(strpos($this->path, Library::pathSeparator)===0) {
+			// Absolute Route
+			$route = new Route($controller, $controllerMethod, $this->httpMethods, $this->path);
+			$descriptor->methodUrls[$controllerMethod] = $this->path;
 		} else {
-			$route = new Route($controller, $method,$this->methods, $this->path);
-			$descriptor->methodUrls[$method] = $this->path;
+			// Relative Route
+			$route = new Route($controller, $controllerMethod, $this->httpMethods, $descriptor->routesPrefix . $this->path);
+			$descriptor->methodUrls[$controllerMethod] = $descriptor->routesPrefix . $this->path;
 		}
-		$route->fileDefined = $reflectedMethod->getFileName();
-		$route->lineDefined = $reflectedMethod->getStartLine();
-		$descriptor->routes[] = $route;
 		
-		if($this->hasError == true) {
-			if(is_array($this->methods) && !empty($this->methods)) {
-				$parts = split(' ', $this->methods[0]);
-				if(sizeof($parts) > 1) {
-					$method = $parts[0];
-					$path = $parts[1];
-					throw new RecessErrorException('Invalid !Route annotation. Please separate HTTP Method and Path with a comma. Ex: /** !Route ' . $method . ', ' . $path . ' */', 0, 0, $reflectedMethod->getFileName(), $reflectedMethod->getStartLine(), array());
-				}
-			}
-			throw new RecessErrorException('Invalid !Route annotation. Please separate HTTP Method and Path with a comma. Ex: /** !Route GET, /path/info */', 0, 0, $reflectedMethod->getFileName(), $reflectedMethod->getStartLine(), array());	
-		}
+		$route->fileDefined = $reflection->getFileName();
+		$route->lineDefined = $reflection->getStartLine();
+		
+		$descriptor->routes[] = $route;
 	}
 }
 ?>
\ No newline at end of file
diff --git a/recess/lib/recess/framework/controllers/annotations/RoutesPrefixAnnotation.class.php b/recess/lib/recess/framework/controllers/annotations/RoutesPrefixAnnotation.class.php
index a4c6468..a69fb3b 100644
--- a/recess/lib/recess/framework/controllers/annotations/RoutesPrefixAnnotation.class.php
+++ b/recess/lib/recess/framework/controllers/annotations/RoutesPrefixAnnotation.class.php
@@ -1,23 +1,30 @@
 <?php
-Library::import('recess.framework.controllers.annotations.ControllerAnnotation');
+Library::import('recess.lang.Annotation');
 Library::import('recess.framework.routing.Route');
 
-class RoutesPrefixAnnotation extends ControllerAnnotation {
-	protected $prefix;
+class RoutesPrefixAnnotation extends Annotation {
 	
-	function init($array) {
-		if(count($array) == 1) {
-			$this->prefix = $array[0];
-		} else {
-			throw new RecessException('RoutePrefixAnnotation takes 1 parameter: prefix.', get_defined_vars());
-		}
+	public function usage() {
+		return '!RoutesPrefix prefix/of/route/';
+	}
+
+	public function isFor() {
+		return Annotation::FOR_CLASS;
+	}
+
+	protected function validate($class) {
+		$this->acceptsNoKeyedValues();
+		$this->exactParameterCount(1);
+		$this->validOnInstancesOf($class, Controller::CLASSNAME);
 	}
 	
-	function massage($controller, $method, ControllerDescriptor $descriptor, ReflectionMethod $reflectedMethod = null) {
-		if($this->prefix == '/')
+	protected function expand($class, $reflection, $descriptor) {
+		$prefix = $this->values[0];
+		if($prefix == '/')
 			$descriptor->routesPrefix = '';
 		else
-			$descriptor->routesPrefix = $this->prefix;
+			$descriptor->routesPrefix = $prefix;
 	}
+
 }
 ?>
\ No newline at end of file
diff --git a/recess/lib/recess/framework/controllers/annotations/ViewAnnotation.class.php b/recess/lib/recess/framework/controllers/annotations/ViewAnnotation.class.php
index ed26805..0a9389d 100644
--- a/recess/lib/recess/framework/controllers/annotations/ViewAnnotation.class.php
+++ b/recess/lib/recess/framework/controllers/annotations/ViewAnnotation.class.php
@@ -1,27 +1,31 @@
 <?php
-Library::import('recess.framework.controllers.annotations.ControllerAnnotation');
+Library::import('recess.lang.Annotation');
 
-class ViewAnnotation extends ControllerAnnotation {
+class ViewAnnotation extends Annotation {
 
-	protected $viewClass = 'Native';
+	const PREFIX = 'prefix';
+	
 	protected $prefix = '';
 	
-	function init($values) {
-		if(isset($values[0])) {
-			$this->viewClass = $values[0];
-		} else {
-			throw new RecessException('View annotation requires a view class (like Smarty or Native).');
-		}
-		
-		if(isset($values['Prefix'])) {
-			$this->prefix = $values['Prefix'];
-		}
+	public function usage() {
+		return '!View ViewProvider [, Prefix: pathWithinViews/]';
+	}
+
+	public function isFor() {
+		return Annotation::FOR_CLASS;
+	}
+
+	protected function validate($class) {
+		$this->acceptedKeys(array(self::PREFIX));
+		$this->minimumParameterCount(1);
+		$this->maximumParameterCount(2);
+		$this->validOnInstancesOf($class, Controller::CLASSNAME);
 	}
 	
-	function massage($controller, $method, ControllerDescriptor $descriptor, ReflectionMethod $reflectedMethod = null) {
-		$descriptor->viewClass = 'recess.framework.views.' . $this->viewClass . 'View';
+	protected function expand($class, $reflection, $descriptor) {
+		$descriptor->viewClass = 'recess.framework.views.' . $this->values[0] . 'View';
 		$descriptor->viewPrefix = $this->prefix;
 	}
-	
+
 }
 ?>
\ No newline at end of file
diff --git a/recess/lib/recess/framework/interfaces/IController.class.php b/recess/lib/recess/framework/interfaces/IController.class.php
index 35d9b88..d95a37d 100644
--- a/recess/lib/recess/framework/interfaces/IController.class.php
+++ b/recess/lib/recess/framework/interfaces/IController.class.php
@@ -2,7 +2,7 @@
 Library::import('recess.http.Request');
 
 interface IController {
-	function serve(Request $request);
+	// function wrappedServe(Request $request);
 	static function getRoutes($class);
 }
 
diff --git a/recess/lib/recess/framework/views/AbstractView.class.php b/recess/lib/recess/framework/views/AbstractView.class.php
index ac358fa..73dec44 100644
--- a/recess/lib/recess/framework/views/AbstractView.class.php
+++ b/recess/lib/recess/framework/views/AbstractView.class.php
@@ -1,6 +1,6 @@
 <?php
 Library::import('recess.http.Response');
-Library::import('recess.lang.RecessObject');
+Library::import('recess.lang.Object');
 
 /**
  * Renders a Response in a desired format by sending relevant
@@ -9,7 +9,7 @@
  * @author Kris Jordan <krisjordan@gmail.com>
  * @abstract 
  */
-abstract class AbstractView extends RecessObject {
+abstract class AbstractView extends Object {
 	/**
 	 * The entry point from the Recess with a Response to be rendered.
 	 * Delegates the two steps in rendering a view: 1) Send Headers, 2) Render Body
diff --git a/recess/lib/recess/http/Cookie.class.php b/recess/lib/recess/http/Cookie.class.php
index 12958e6..44c715e 100644
--- a/recess/lib/recess/http/Cookie.class.php
+++ b/recess/lib/recess/http/Cookie.class.php
@@ -2,8 +2,8 @@
 
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/http/Environment.class.php b/recess/lib/recess/http/Environment.class.php
index f9c92bf..16461cd 100644
--- a/recess/lib/recess/http/Environment.class.php
+++ b/recess/lib/recess/http/Environment.class.php
@@ -8,7 +8,7 @@
  * @contributor Luiz Alberto Zaiats
  * 
  * @copyright 2008, 2009 Kris Jordan
- * @package Recess! Framework
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/http/Formats.class.php b/recess/lib/recess/http/Formats.class.php
index 68454ee..0197c81 100644
--- a/recess/lib/recess/http/Formats.class.php
+++ b/recess/lib/recess/http/Formats.class.php
@@ -2,8 +2,8 @@
 
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/http/ForwardingResponse.class.php b/recess/lib/recess/http/ForwardingResponse.class.php
index 7d17264..74ad2e1 100644
--- a/recess/lib/recess/http/ForwardingResponse.class.php
+++ b/recess/lib/recess/http/ForwardingResponse.class.php
@@ -3,8 +3,8 @@
 
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/http/Methods.class.php b/recess/lib/recess/http/Methods.class.php
index 4487e1a..7c0fbbb 100644
--- a/recess/lib/recess/http/Methods.class.php
+++ b/recess/lib/recess/http/Methods.class.php
@@ -3,8 +3,8 @@
  * Http Methods as Const Strings
  *
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/http/Request.class.php b/recess/lib/recess/http/Request.class.php
index 88b9dde..8eff0bb 100644
--- a/recess/lib/recess/http/Request.class.php
+++ b/recess/lib/recess/http/Request.class.php
@@ -1,10 +1,10 @@
 <?php
-Library::import('recess.lang.RecessObject');
+Library::import('recess.lang.Object');
 
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
  * @copyright 2008, 2009 Kris Jordan
- * @package Recess! Framework
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
@@ -64,6 +64,6 @@ public function data($name) {
 	}
 }
 
-class Meta extends RecessObject {}
+class Meta extends Object {}
 
 ?>
\ No newline at end of file
diff --git a/recess/lib/recess/http/Response.class.php b/recess/lib/recess/http/Response.class.php
index 6be7087..0b7b323 100644
--- a/recess/lib/recess/http/Response.class.php
+++ b/recess/lib/recess/http/Response.class.php
@@ -4,8 +4,8 @@
 
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/http/ResponseCodes.class.php b/recess/lib/recess/http/ResponseCodes.class.php
index a98eac9..5a1b1f3 100644
--- a/recess/lib/recess/http/ResponseCodes.class.php
+++ b/recess/lib/recess/http/ResponseCodes.class.php
@@ -2,11 +2,11 @@
 /**
  * ResponseCodes provides named constants for
  * HTTP protocol status codes. Written for the
- * Recess Framework (http://www.recessframework.org/)
+ * Recess PHP Framework (http://www.recessframework.org/)
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/Annotation.class.php b/recess/lib/recess/lang/Annotation.class.php
index fff7b16..2e6acce 100644
--- a/recess/lib/recess/lang/Annotation.class.php
+++ b/recess/lib/recess/lang/Annotation.class.php
@@ -3,24 +3,251 @@
 Library::import('recess.lang.exceptions.UnknownAnnotationException');
 
 /**
- * Base class for class and method annotations.
+ * Base class for class, method, and property annotations.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
 abstract class Annotation {
+	
+	protected $errors = array();
+	protected $values = array();
+	
+	const FOR_CLASS = 1;
+	const FOR_METHOD = 2;
+	const FOR_PROPERTY = 4;
+	
+	/* Begin abstract methods */
+	
+	/**
+	 * Returns a string representation of the intended usage of an annotation.
+	 * 
+	 * @return string
+	 */
+	abstract public function usage();
+	
+	/**
+	 * Returns an integer representation of the type(s) of PHP language constructs
+	 * the annotation is applicable to. Use the Annotation::FOR_* consts to return
+	 * the desired result.
+	 * 
+	 * Examples:
+	 *  // Only valid on classes
+	 *  function isFor() { return Annotation::FOR_CLASS; }
+	 *  
+	 *  // Valid on methods or properties
+	 *  function isFor() { return Annotation::FOR_METHOD | Annotation::FOR_PROPERTY; }
+	 * 
+	 * @return integer
+	 */
+	abstract public function isFor();
+	
 	/**
-	 * Initialize the Annotation with value array.
-	 * @param array The list of parameters.
+	 * Validate is called just before expansion. Because there may be multiple 
+	 * constraints of an annotation the implementation of validate should append
+	 * any error messages to the protected $errors property. Commonly used validations
+	 * helper methods are provided as protected methods on the Annotation class.
+	 * 
+	 * @param $class The classname the annotation is on.
 	 */
-	abstract function init($array);
+	abstract protected function validate($class);
+	
+	/**
+	 * The expansion step of an annotation gives it an opportunity to manipulate
+	 * a class' descriptor by introducing additional metadata, attach methods, and
+	 * wrap methods.
+	 * 
+	 * @param string $class Classname the annotation is applied to.
+	 * @param mixed $reflection The Reflection(Class|Method|Property) object the annotation is applied to.
+	 * @param ClassDescriptor $descriptor The ClassDescriptor being manipulated.
+	 */
+	abstract protected function expand($class, $reflection, $descriptor);
+	
+	/* End abstract methods */
+	
+	/* Begin validation helper methods */
+	
+	protected function acceptedKeys($keys) {
+		foreach($this->parameters as $key => $value) {
+			if (is_string($key) && !in_array($key, $keys)) {
+				$this->errors[] = "Invalid parameter: \"$key\".";
+			}
+		}
+	}
+	
+	protected function requiredKeys($keys) {
+		foreach($keys as $key) {
+			if(!array_key_exists($key, $this->parameters)) {
+				$this->errors[] = get_class($this) . " requires a '$key' parameter.";
+			}
+		}
+	}
+	
+	protected function acceptedKeylessValues($values) {
+		foreach($this->parameters as $key => $value) {
+			if(!is_string($key) && !in_array($value, $values)) {
+				$this->errors[] = "Unknown parameter: \"$value\".";
+			}
+		}
+	}
+	
+	protected function acceptedIndexedValues($index, $values) {
+		if(!in_array($this->parameters[$index],$values)) {
+			$this->errors[] = "Parameter $index is set to \"" . $this->parameters[$key] . "\". Valid values: " . implode(', ', $values) . '.';
+		}
+	}
 	
+	protected function acceptedValuesForKey($key, $values, $case = null) {
+		if(!isset($this->parameters[$key])) { return; }
+		
+		if($case === null) {
+			$value = $this->parameters[$key];
+		} else if($case === CASE_LOWER) {
+			$value = strtolower($this->parameters[$key]);
+		} else if($case === CASE_UPPER) {
+			$value = strtoupper($this->parameters[$key]);
+		}
+		if(!in_array($value, $values)) {
+			$this->errors[] = 'The "' . $key . '" parameter is set to "' . $this->parameters[$key] . '". Valid values: ' . implode(', ', $values) . '.';
+		}
+	}
+	
+	protected function acceptsNoKeylessValues() {
+		$this->acceptedKeylessValues(array());
+	}
+	
+	protected function acceptsNoKeyedValues() {
+		$this->acceptedKeys(array());
+	}
+	
+	protected function validOnInstancesOf($annotatedClass, $baseClass) {
+		if( !is_subclass_of($annotatedClass, $baseClass) ) {
+			$this->errors[] = get_class($this) . " is only valid on objects of type $baseClass.";
+		}
+	}
+	
+	protected function minimumParameterCount($count) {
+		if( ! (count($this->parameters) >= $count) ) {
+			$this->errors[] = get_class($this) . " takes at least $count parameters.";
+		}
+	}
+	
+	protected function maximumParameterCount($count) {
+		if( ! (count($this->parameters) <= $count) ) {
+			$this->errors[] = get_class($this) . " takes at most $count parameters.";
+		}
+	}
+	
+	protected function exactParameterCount($count) {
+		if ( count($this->parameters) != $count ) {
+			$this->errors[] = get_class($this) . " requires exactly $count parameters.";
+		}
+	}
+	
+	/* End validation helper methods */
+	
+	
+	function init($parameters) {
+		$this->parameters = array_change_key_case($parameters, CASE_LOWER);
+	}
+	
+	function isAValue($value) {
+		return in_array($value, $this->values);
+	}
+	
+	/**
+	 * Mask other values to return the first not contained in the array.
+	 * 
+	 * @param $values
+	 * @return value not in the array of other values
+	 */
+	function valueNotIn($values) {
+		foreach($this->values as $value) {
+			if(!in_array($value, $values)) {
+				return $value;
+			}
+		}
+		return null;
+	}
+	
+	
+	function expandAnnotation($class, $reflection, $descriptor) {		
+		// First check to ensure this annotation is allowed
+		// to apply to this type of PHP construct (class, method, property)
+		// using a simple bitwise mask.
+		if($reflection instanceof ReflectionClass) {
+			$annotationIsOn = self::FOR_CLASS;
+			$annotationIsOnType = 'class';
+		} else if ($reflection instanceof ReflectionMethod) {
+			$annotationIsOn = self::FOR_METHOD;
+			$annotationIsOnType = 'method';
+		} else if ($reflection instanceof ReflectionProperty) {
+			$annotationIsOn = self::FOR_PROPERTY;
+			$annotationIsOnType = 'property';
+		}
+		if(!($annotationIsOn & $this->isFor())) {
+			$isFor = array();
+			foreach(array('Classes' => self::FOR_CLASS, 'Methods' => self::FOR_METHOD, 'Properties' => self::FOR_PROPERTY) as $key => $mask) {
+				if($mask & $this->isFor()) {
+					$isFor[] = $key; 
+				}
+			}
+			$this->errors[] = get_class($this) . ' is only valid on ' . implode(', ', $isFor) . '.';
+			$typeError = true;
+		} else {
+			$typeError = false;
+		}
+		
+		// Run annotation specified validations
+		$this->validate($class);
+		
+		// Throw Exception if Annotation Errors Exist
+		if(!empty($this->errors)) {
+			if($reflection instanceof ReflectionProperty) {
+				$message = 'Invalid ' . get_class($this) . ' on property "' . $reflection->getName() . '". ';
+				$reflection = new ReflectionClass($class);
+			} else {
+				$message = 'Invalid ' . get_class($this) . ' on ' . $annotationIsOnType . ' "' . $reflection->getName() . '". ';
+			}
+			if(!$typeError) {
+				$message .= "Expected usage: \n" . $this->usage();
+			}
+			$message .= "\n == Errors == \n * ";
+			$message .= implode("\n * ", $this->errors);
+			throw new RecessErrorException($message,0,0,$reflection->getFileName(),$reflection->getStartLine(),array());
+		}
+		
+		// Map keyed parameters to properties on this annotation
+		// Place unkeyed parameters on the $this->values array
+		foreach($this->parameters as $key => $value) {
+			if(is_string($key)) {
+				$this->{$key} = $value;
+			} else {
+				$this->values[] = $value;
+			}
+		}
+		
+		// At this point we've processed the parameters, clearing memory
+		unset($this->parameters);
+		
+		// Finally dispatch to abstract method expand() so that
+		// Annotation developers can implement glorious new
+		// functionalities.
+		$this->expand($class, $reflection, $descriptor);
+	}
+	
+	
+	/**
+	 * Given a docstring, returns an array of Recess Annotations.
+	 * @param $docstring
+	 * @return unknown_type
+	 */
 	static function parse($docstring) {
-		preg_match_all('%(?:\s|\*)*!(\S\S*)\s\s*(?:(.*)(?>\*/)|(.*))%', $docstring, $result, PREG_PATTERN_ORDER);
-
+		preg_match_all('%(?:\s|\*)*!(\S+)[^\n\r\S]*(?:(.*?)(?:\*/)|(.*))%', $docstring, $result, PREG_PATTERN_ORDER);
+		
 		$annotations = $result[1];
 		if(isset($result[2][0]) && $result[2][0] != '') {
 			$values = $result[2];
@@ -31,7 +258,7 @@ static function parse($docstring) {
 		if(empty($result[1])) return array();
 		foreach($annotations as $key => $annotation) {
 			// Strip Whitespace
-			$value = preg_replace('/\s*(\(|:|,|\))\s*/', '${1}', '(' . $values[$key] . ')');
+			$value = preg_replace('/\s*(\(|:|,|\))[^\n\r\S]*/', '${1}', '(' . $values[$key] . ')');
 			// Extract Strings
 			preg_match_all('/\'(.*?)(?<!\\\\)\'|"(.*?)(?<!\\\\)"/', $value, $result, PREG_PATTERN_ORDER);
 			$quoted_strings = $result[2];
@@ -51,8 +278,9 @@ static function parse($docstring) {
 			}
 			
 			$annotationClass = $annotation . 'Annotation';
+			$fullyQualified = Library::getFullyQualifiedClassName($annotationClass);
 			
-			if(class_exists($annotationClass, false)) {
+			if($annotationClass != $fullyQualified || class_exists($annotationClass,false)) {
 				$annotation = new $annotationClass;
 				$annotation->init($array);
 			} else {
diff --git a/recess/lib/recess/lang/AttachedMethod.class.php b/recess/lib/recess/lang/AttachedMethod.class.php
new file mode 100644
index 0000000..27fd79b
--- /dev/null
+++ b/recess/lib/recess/lang/AttachedMethod.class.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Data structure for an attached method. Holds a reference
+ * to an instance of an object and the mapped function on
+ * the object.
+ * 
+ * @author Kris Jordan <krisjordan@gmail.com>
+ */
+class AttachedMethod {
+	public $object;
+	public $method;
+	public $name;
+	
+	function __construct($object, $method, $name) { 
+		$this->object = $object;
+		$this->method = $method;
+		$this->name = $name;
+	}
+	
+	function isFinal() { return true; }
+    function isAbstract() { return false; }
+    function isPublic() { return true; }
+    function isPrivate() { return false; }
+    function isProtected() { return false; }
+    function isStatic() { return false; }
+    function isConstructor() { return false; }
+    function isDestructor() { return false; }
+    function isAttached() { return true; }
+
+    function getName() { return $this->alias; }
+    function isInternal() { return false; }
+    function isUserDefined() { return true; }
+    
+    function getFileName() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getFileName(); }
+    function getStartLine() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getStartLine(); }
+    function getEndLine() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getEndLine(); }
+    function getParameters() { 
+    	$reflection = new ReflectionClass($this->object); 
+    	$params = $reflection->getMethod($this->method)->getParameters(); 
+    	array_shift($params); 
+    	return $params;
+    }
+    function getNumberOfParameters() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getNumberOfParameters() - 1; }
+    function getNumberOfRequiredParameters() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getNumberOfRequiredParameters() - 1; }
+}
+
+?>
\ No newline at end of file
diff --git a/recess/lib/recess/lang/ClassDescriptor.class.php b/recess/lib/recess/lang/ClassDescriptor.class.php
new file mode 100644
index 0000000..3267c98
--- /dev/null
+++ b/recess/lib/recess/lang/ClassDescriptor.class.php
@@ -0,0 +1,90 @@
+<?php
+Library::import('recess.lang.AttachedMethod');
+
+/**
+ * Recess PHP Framework class info object that stores additional
+ * state about a Object. This additional state includes
+ * attached methods or named public properties.
+ * 
+ * @author Kris Jordan <krisjordan@gmail.com>
+ */
+class ClassDescriptor {
+	
+	protected $attachedMethods = array();
+	protected $wrappedMethods = array();
+	
+	/**
+	 * Return a RecessAttachedMethod for given name, or return false.
+	 *
+	 * @param string $methodName Method name.
+	 * @return RecessAttachedMethod on success, false on failure.
+	 */
+	function getAttachedMethod($methodName) {
+		if(isset($this->attachedMethods[$methodName]))
+			return $this->attachedMethods[$methodName];
+		else
+			return false;
+	}
+	
+	/**
+	 * Return all attached methods.
+	 *
+	 * @return array(AttachedMethod)
+	 */
+	function getAttachedMethods() {
+		return $this->attachedMethods;
+	}
+	
+	/**
+	 * Add an attached method with given methodName alias.
+	 *
+	 * @param string $methodName
+	 * @param AttachedMethod $attachedMethod
+	 */
+	function addAttachedMethod($methodName, AttachedMethod $attachedMethod) {
+		$this->attachedMethods[$methodName] = $attachedMethod;
+	}
+	
+	/**
+	 * Attach a method to a class. The result of this static method is the ability to
+	 * call, on any instance of $attachOnClassName, a method named $attachedMethodAlias
+	 * which delegates that method call to $providerInstance's $providerMethodName.
+	 *
+	 * @param string $attachOnClassName
+	 * @param string $attachedMethodAlias
+	 * @param object $providerInstance
+	 * @param string $providerMethodName
+	 */
+	function attachMethod($attachOnClassName, $attachedMethodAlias, $providerInstance, $providerMethodName) {
+		$attachedMethod = new AttachedMethod($providerInstance, $providerMethodName, $attachedMethodAlias);
+		$this->addAttachedMethod($attachedMethodAlias, $attachedMethod);
+	}
+	
+	/**
+	 * Add a Wrapper to a WrappedMethod on this class descriptor.
+	 * 
+	 * @param string $methodName
+	 * @param IWrapper $wrapper
+	 */
+	function addWrapper($methodName, IWrapper $wrapper) {
+		if(!isset($this->wrappedMethods[$methodName])) {
+			$this->wrappedMethods[$methodName] = new WrappedMethod();			
+		}
+		$this->wrappedMethods[$methodName]->addWrapper($wrapper);
+	}
+	
+	/**
+	 * Register a WrappedMethod on this class descriptor.
+	 * 
+	 * @param string $methodName
+	 * @param WrappedMethod $wrappedMethod
+	 */
+	function addWrappedMethod($methodName, WrappedMethod $wrappedMethod) {
+		if(isset($this->wrappedMethods[$methodName])) {
+			$this->wrappedMethods[$methodName] = $wrappedMethod->assume($this->wrappedMethods[$methodName]);
+		} else {
+			$this->wrappedMethods[$methodName] = $wrappedMethod;
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/recess/lib/recess/lang/IWrapper.class.php b/recess/lib/recess/lang/IWrapper.class.php
new file mode 100644
index 0000000..5716654
--- /dev/null
+++ b/recess/lib/recess/lang/IWrapper.class.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Implement this interface for classes that need to wrap functionality around a Wrappable method.
+ * 
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+interface IWrapper {
+	
+	/**
+	 * Called before the wrapped method is called. Before is given a chance to
+	 * massage the arguments being passed to the wrapped method, throw an exception,
+	 * or short-circuit a return value without the wrapped method being called.
+	 * 
+	 * @param $object
+	 * @param $args
+	 * @return mixed If a value is returned during a call to before that value short-circuits the method call.
+	 */
+	function before($object, &$args);
+	
+	/**
+	 * Called after the wrapped method is called. After is given a chance to
+	 * post-process the return value of the wrapped method. If a return value from
+	 * after is non-null then after's return value will override the return value
+	 * of the wrapped method.
+	 * 
+	 * @param $returnValue
+	 * @return mixed Should be of the same type as the wrapped method returns.
+	 */
+	function after($returnValue);
+	
+	/**
+	 * Attempt to combine a wrapper with another. Example usage:
+	 * Required wrappers declared on multiple fields of a model 
+	 * can be combined into a single wrapper.
+	 * 
+	 * @param IWrapper $wrapper
+	 * @return true on success, false on failure
+	 */
+	function combine(IWrapper $wrapper);
+	
+}
+?>
\ No newline at end of file
diff --git a/recess/lib/recess/lang/Inflector.class.php b/recess/lib/recess/lang/Inflector.class.php
index fc086fb..666f788 100644
--- a/recess/lib/recess/lang/Inflector.class.php
+++ b/recess/lib/recess/lang/Inflector.class.php
@@ -5,8 +5,8 @@
  * (i.e. camelCapsFormat, ProperCapsFormat, under_scores_format)
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/Library.class.php b/recess/lib/recess/lang/Library.class.php
index 7b3ea56..4ffffbd 100644
--- a/recess/lib/recess/lang/Library.class.php
+++ b/recess/lib/recess/lang/Library.class.php
@@ -5,12 +5,12 @@
 /**
  * Library is an important low level utility in Recess used to make importing class files
  * less painful. Library is also an important level of indirection between PHP's native
- * include/require functions. Library is how Recess! dynamically 'compiles' all classes
+ * include/require functions. Library is how Recess dynamically 'compiles' all classes
  * into a single PHP file.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  * 
diff --git a/recess/lib/recess/lang/Object.class.php b/recess/lib/recess/lang/Object.class.php
new file mode 100644
index 0000000..6cbf9fc
--- /dev/null
+++ b/recess/lib/recess/lang/Object.class.php
@@ -0,0 +1,257 @@
+<?php
+Library::import('recess.lang.ClassDescriptor');
+Library::import('recess.lang.AttachedMethod');
+Library::import('recess.lang.WrappableAnnotation');
+
+/**
+ * Object is the base class for extensible classes in the Recess.
+ * Object introduces a standard mechanism for building a class
+ * descriptor through reflection and the realization of Annotations.
+ * Object also introduces the ability to attach methods to a class
+ * at run-time.
+ * 
+ * Sub-classes of Object can introduce extensibility points 
+ * with 'wrappable' methods. A wrappable method can be dynamically 'wrapped' 
+ * by other methods which are called prior to or after the wrapped method.
+ * 
+ * Wrappable methods can be declared using a Wrappable annotation on the 
+ * method being wrapped. The annotation takes a single parameter, which is
+ * the desired name of the wrapped method. By convention the native PHP method
+ * being wrapped is prefixed with 'wrapped', i.e.:
+ *  class Foobar {
+ *    /** !Wrappable foo * /
+ *    function wrappedFoo() { ... }
+ *  }
+ *  $obj->foo();
+ * 
+ * Example usage of wrappable methods and a hypothetical "EchoWrapper" which
+ * wraps a method by echo'ing strings before and after. 
+ * 
+ *   class Model extends Object {
+ *     /** !Wrappable insert * /
+ *     function wrappedInsert() { echo "Wrapped (insert)"; }
+ *   }
+ * 
+ *   /** !EchoWrapper insert, Before: "Hello", After: "World" * /
+ *   class Person extends Model {}
+ * 
+ *   $person = new Person();
+ *   $person->insert();
+ *   
+ *   // Output:
+ *   Hello
+ *   Wrapped (insert)
+ *   World
+ * 
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+abstract class Object {
+	
+	protected static $descriptors = array();
+	
+	/**
+	 * Attach a method to a class. The result of this static method is the ability to
+	 * call, on any instance of $attachOnClassName, a method named $attachedMethodAlias
+	 * which delegates that method call to $providerInstance's $providerMethodName.
+	 *
+	 * @param string $attachOnClassName
+	 * @param string $attachedMethodAlias
+	 * @param object $providerInstance
+	 * @param string $providerMethodName
+	 */
+	static function attachMethod($attachOnClassName, $attachedMethodAlias, $providerInstance, $providerMethodName) {
+		self::getClassDescriptor($attachOnClassName)->attachMethod($attachOnClassName, $attachedMethodAlias, $providerInstance, $providerMethodName);
+	}
+	
+	/**
+	 * Dynamic dispatch of function calls to attached methods.
+	 *
+	 * @param string $name
+	 * @param array $arguments
+	 * @return variant
+	 */
+	final function __call($name, $arguments) {
+		$classDescriptor = self::getClassDescriptor($this);
+		
+		$attachedMethod = $classDescriptor->getAttachedMethod($name);
+		if($attachedMethod !== false) {
+			$object = $attachedMethod->object;
+			$method = $attachedMethod->method;
+			array_unshift($arguments, $this);
+			$reflectedMethod = new ReflectionMethod($object, $method);
+			return $reflectedMethod->invokeArgs($object, $arguments);
+			// return call_user_func_array($method, $object, $arguments);
+		} else {
+			throw new RecessException('"' . get_class($this) . '" class does not contain a method or an attached method named "' . $name . '".', get_defined_vars());
+		}
+	}
+	
+	const RECESS_CLASS_KEY_PREFIX = 'Object::desc::';
+
+	/**
+	 * Return the ObjectInfo for provided Object instance.
+	 *
+	 * @param variant $classNameOrInstance - String Class Name or Instance of Recess Class
+	 * @return ClassDescriptor
+	 */
+	final static protected function getClassDescriptor($classNameOrInstance) {
+		if($classNameOrInstance instanceof Object) {
+			$class = get_class($classNameOrInstance);
+			$instance = $classNameOrInstance;
+		} else {
+			$class = $classNameOrInstance;
+			if(class_exists($class, true)) {
+				$reflectionClass = new ReflectionClass($class);
+				if(!$reflectionClass->isAbstract()) {	
+					$instance = new $class;
+				} else {
+					return new ClassDescriptor();
+				}
+			}
+		}
+		
+		if(!isset(self::$descriptors[$class])) {		
+			$cache_key = self::RECESS_CLASS_KEY_PREFIX . $class;
+			$descriptor = Cache::get($cache_key);
+			
+			if($descriptor === false) {				
+				if($instance instanceof Object) {
+					$descriptor = call_user_func(array($class, 'buildClassDescriptor'), $class);
+					
+					Cache::set($cache_key, $descriptor);
+					self::$descriptors[$class] = $descriptor;
+				} else {
+					throw new RecessException('ObjectRegistry only retains information on classes derived from Object. Class of type "' . $class . '" given.', get_defined_vars());
+				}
+			} else {
+				self::$descriptors[$class] = $descriptor;
+			}
+		}
+		
+		return self::$descriptors[$class];
+	}
+	
+	/**
+	 * Retrieve an array of the attached methods for a particular class.
+	 *
+	 * @param variant $classNameOrInstance - String class name or instance of a Recess Class
+	 * @return array
+	 */
+	final static function getAttachedMethods($classNameOrInstance) {
+		$descriptor = self::getClassDescriptor($classNameOrInstance);
+		return $descriptor->getAttachedMethods();
+	}	
+	
+	/**
+	 * Clear the descriptors cache.
+	 */
+	final static function clearDescriptors() {
+		self::$descriptors = array();
+	}
+	
+	/**
+	 * Initialize a class' descriptor. Override to return a subclass specific descriptor.
+	 * A subclass's descriptor may need to initialize certain properties. For example
+	 * Model's descriptor has properties initialized for table, primary key, etc. The controller
+	 * descriptor has a routes array initialized as empty.
+	 * 
+	 * @param $class string Name of class whose descriptor is being initialized.
+	 * @return ClassDescriptor
+	 */
+	protected static function initClassDescriptor($class) {	return new ClassDescriptor(); }
+		
+	/**
+	 * Prior to expanding the annotations for a class method this hook is called to give
+	 * a subclass an opportunity to manipulate its descriptor. For example Controller
+	 * uses this in able to create default routes for methods which do not have explicit
+	 * Route annotations.
+	 * 
+	 * @param $class string Name of class whose descriptor is being initialized.
+	 * @param $method ReflectionMethod
+	 * @param $descriptor ClassDescriptor ByRef
+	 * @param $annotations Array of annotations found on method.
+	 * @return ClassDescriptor
+	 */
+	protected static function shapeDescriptorWithMethod($class, $method, $descriptor, $annotations) { return $descriptor; }
+	
+	/**
+	 * Prior to expanding the annotations for a class property this hook is called to give
+	 * a subclass an opportunity to manipulate its class descriptor. For example Model
+	 * uses this to initialize the datastructure for a Property before a Column annotation
+	 * applies metadata. 
+	 * 
+	 * @param $class string Name of class whose descriptor is being initialized.
+	 * @param $property ReflectionProperty
+	 * @param $descriptor ClassDescriptor ByRef
+	 * @param $annotations Array of annotations found on method.
+	 * @return ClassDescriptor
+	 */
+	protected static function shapeDescriptorWithProperty($class, $property, $descriptor, $annotations) { return $descriptor; }
+
+	/**
+	 * After all methods and properties of a class have been visited and annotations expanded
+	 * this hook provides a sub-class a final opportunity to do post-processing and sanitization.
+	 * For example, Model uses this hook to ensure consistency between model's descriptor
+	 * and the actual database's columns.
+	 * 
+	 * @param $class
+	 * @param $descriptor
+	 * @return unknown_type
+	 */
+	protected static function finalClassDescriptor($class, $descriptor) { return $descriptor; }
+	
+	/**
+	 * Builds a class' metadata structure (Class Descriptor through reflection 
+	 * and expansion of annotations. Hooks are provided in a Strategy Pattern-like 
+	 * fashion to allow subclasses to influence various points in the pipeline of 
+	 * building a class descriptor (initialization, discovery of method, discovery of
+	 * property, finalization). 
+	 * 
+	 * @param $class Name of class whose descriptor is being built.
+	 * @return ClassDescriptor
+	 */
+	protected static function buildClassDescriptor($class) {
+		$descriptor = call_user_func(array($class, 'initClassDescriptor'), $class);
+
+		try {
+			$reflection = new RecessReflectionClass($class);
+		} catch(ReflectionException $e) {
+			throw new RecessException('Class "' . $class . '" has not been declared.', get_defined_vars());
+		}
+		
+		foreach ($reflection->getAnnotations() as $annotation) {
+			$annotation->expandAnnotation($class, $reflection, $descriptor);
+		}
+		
+		foreach($reflection->getMethods(false) as $method) {
+			$annotations = $method->getAnnotations();
+			$descriptor = call_user_func(array($class, 'shapeDescriptorWithMethod'), $class, $method, $descriptor, $annotations);
+			foreach($annotations as $annotation) {
+				//if($annotation instanceof Annotation) {
+					$annotation->expandAnnotation($class, $method, $descriptor);
+				//}
+			}
+		}
+		
+		foreach($reflection->getProperties(false) as $property) {
+			$annotations = $property->getAnnotations();
+			$descriptor = call_user_func(array($class, 'shapeDescriptorWithProperty'), $class, $property, $descriptor, $annotations);
+			foreach($annotations as $annotation) {
+				//if($annotation instanceof Annotation) {
+					$annotation->expandAnnotation($class, $property, $descriptor);
+				//}
+			}
+		}
+		
+		$descriptor = call_user_func(array($class, 'finalClassDescriptor'), $class, $descriptor);
+		
+		return $descriptor;
+	}	
+	
+}
+
+?>
\ No newline at end of file
diff --git a/recess/lib/recess/lang/RecessObject.class.php b/recess/lib/recess/lang/RecessObject.class.php
deleted file mode 100644
index cc6519b..0000000
--- a/recess/lib/recess/lang/RecessObject.class.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Recess! Framework base class for anonymous classes
- * with attachable methods.
- * 
- * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
- * @license MIT
- * @link http://www.recessframework.org/
- */
-abstract class RecessObject {
-	
-	protected static $descriptors = array();
-	
-	/**
-	 * Attach a method to a RecessObject. The result of this static method is the ability to
-	 * call, on any instance of $attachOnClassName, a method named $attachedMethodAlias
-	 * which delegates that method call to $providerInstance's $providerMethodName.
-	 *
-	 * @param string $attachOnClassName
-	 * @param string $attachedMethodAlias
-	 * @param object $providerInstance
-	 * @param string $providerMethodName
-	 */
-	static function attachMethod($attachOnClassName, $attachedMethodAlias, $providerInstance, $providerMethodName) {
-		$attachedMethod = new RecessObjectAttachedMethod($providerInstance, $providerMethodName, $attachedMethodAlias);
-		self::getClassDescriptor($attachOnClassName)->addAttachedMethod($attachedMethodAlias, $attachedMethod);
-	}
-	
-	/**
-	 * Dynamic dispatch of function calls to attached methods.
-	 *
-	 * @param string $name
-	 * @param array $arguments
-	 * @return variant
-	 */
-	final function __call($name, $arguments) {
-		$classDescriptor = self::getClassDescriptor($this);
-		
-		$attachedMethod = $classDescriptor->getAttachedMethod($name);
-		if($attachedMethod !== false) {
-			$object = $attachedMethod->object;
-			$method = $attachedMethod->method;
-			array_unshift($arguments, $this);
-			$reflectedMethod = new ReflectionMethod($object, $method);
-			return $reflectedMethod->invokeArgs($object, $arguments);
-			// return call_user_func_array($method, $object, $arguments);
-		} else {
-			throw new RecessException('"' . get_class($this) . '" class does not contain a method or an attached method named "' . $name . '".', get_defined_vars());
-		}
-	}
-	
-	const RECESS_CLASS_KEY_PREFIX = 'RecessObject::desc::';
-	/**
-	 * Return the RecessObjectInfo for provided RecessObject instance.
-	 *
-	 * @param variant $classNameOrInstance - String Class Name or Instance of Recess Class
-	 * @return RecessObjectDescriptor
-	 */
-	final static protected function getClassDescriptor($classNameOrInstance) {
-		if($classNameOrInstance instanceof RecessObject) {
-			$class = get_class($classNameOrInstance);
-			$instance = $classNameOrInstance;
-		} else {
-			$class = $classNameOrInstance;
-			if(class_exists($class, true)) {
-				$reflectionClass = new ReflectionClass($class);
-				if(!$reflectionClass->isAbstract()) {	
-					$instance = new $class;
-				} else {
-					return new RecessObjectDescriptor();
-				}
-			}
-		}
-		
-		if(!isset(self::$descriptors[$class])) {		
-			$cache_key = self::RECESS_CLASS_KEY_PREFIX . $class;
-			$descriptor = Cache::get($cache_key);
-			
-			if($descriptor === false) {				
-				if($instance instanceof RecessObject) {
-					$descriptor = call_user_func(array($class, 'buildClassDescriptor'), $class);
-					Cache::set($cache_key, $descriptor);
-					self::$descriptors[$class] = $descriptor;
-				} else {
-					throw new RecessException('RecessObjectRegistry only retains information on classes derived from RecessObject. Class of type "' . $class . '" given.', get_defined_vars());
-				}
-			} else {
-				self::$descriptors[$class] = $descriptor;
-			}
-		}
-		
-		return self::$descriptors[$class];
-	}
-	
-	/**
-	 * Retrieve an array of the attached methods for a particular class.
-	 *
-	 * @param variant $classNameOrInstance - String class name or instance of a Recess Class
-	 * @return array
-	 */
-	final static function getAttachedMethods($classNameOrInstance) {
-		$descriptor = self::getClassDescriptor($classNameOrInstance);
-		return $descriptor->getAttachedMethods();
-	}
-	
-	/**
-	 * Returns instance of RecessObjectDescriptor which describes
-	 * this class. Should be overridden in subclasses.
-	 * 
-	 * @return RecessObjectDescriptor
-	 */
-	static protected function buildClassDescriptor($class) {
-		return new RecessObjectDescriptor();
-	}
-
-	/**
-	 * Clear the descriptors cache.
-	 */
-	final static function clearDescriptors() {
-		self::$descriptors = array();
-	}
-}
-
-/**
- * Recess! Framework class info object that stores additional
- * state about a RecessObject. This additional state includes
- * attached methods or named public properties.
- * 
- * @author Kris Jordan <krisjordan@gmail.com>
- */
-class RecessObjectDescriptor {
-	protected $attachedMethods = array();
-	
-	/**
-	 * Return a RecessAttachedMethod for given name, or return false.
-	 *
-	 * @param string $methodName Method name.
-	 * @return RecessAttachedMethod on success, false on failure.
-	 */
-	function getAttachedMethod($methodName) {
-		if(isset($this->attachedMethods[$methodName]))
-			return $this->attachedMethods[$methodName];
-		else
-			return false;
-	}
-	
-	/**
-	 * Return all attached methods.
-	 *
-	 * @return array(AttachedMethod)
-	 */
-	function getAttachedMethods() {
-		return $this->attachedMethods;
-	}
-	
-	/**
-	 * Add an attached method with given methodName alias.
-	 *
-	 * @param string $methodName
-	 * @param RecessObjectAttachedMethod $attachedMethod
-	 */
-	function addAttachedMethod($methodName, RecessObjectAttachedMethod $attachedMethod) {
-		$this->attachedMethods[$methodName] = $attachedMethod;
-	}
-}
-
-/**
- * Data structure for an attached method. Holds a reference
- * to an instance of an object and the mapped function on
- * the object.
- * 
- * @author Kris Jordan <krisjordan@gmail.com>
- */
-class RecessObjectAttachedMethod {
-	public $object;
-	public $method;
-	public $name;
-	
-	function __construct($object, $method, $name) { 
-		$this->object = $object;
-		$this->method = $method;
-		$this->name = $name;
-	}
-	
-	static function __set_state($array) {
-		return new RecessObjectAttachedMethod($array['object'], $array['method'], $array['name']);
-	}
-	
-	function isFinal() { return true; }
-    function isAbstract() { return false; }
-    function isPublic() { return true; }
-    function isPrivate() { return false; }
-    function isProtected() { return false; }
-    function isStatic() { return false; }
-    function isConstructor() { return false; }
-    function isDestructor() { return false; }
-    function isAttached() { return true; }
-
-    function getName() { return $this->alias; }
-    function isInternal() { return false; }
-    function isUserDefined() { return true; }
-    
-    function getFileName() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getFileName(); }
-    function getStartLine() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getStartLine(); }
-    function getEndLine() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getEndLine(); }
-    function getParameters() { 
-    	$reflection = new ReflectionClass($this->object); 
-    	$params = $reflection->getMethod($this->method)->getParameters(); 
-    	array_shift($params); 
-    	return $params;
-    }
-    function getNumberOfParameters() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getNumberOfParameters() - 1; }
-    function getNumberOfRequiredParameters() { $reflection = new ReflectionClass($this->object); return $reflection->getMethod($this->method)->getNumberOfRequiredParameters() - 1; }
-}
-
-?>
\ No newline at end of file
diff --git a/recess/lib/recess/lang/WrappableAnnotation.class.php b/recess/lib/recess/lang/WrappableAnnotation.class.php
new file mode 100644
index 0000000..02d732a
--- /dev/null
+++ b/recess/lib/recess/lang/WrappableAnnotation.class.php
@@ -0,0 +1,63 @@
+<?php
+Library::import('recess.lang.Annotation');
+Library::import('recess.lang.WrappedMethod');
+
+/**
+ * The WrappableAnnotation can be applied to methods in classes deriving
+ * from Object. The wrappable annotation expands to create a WrappedMethod
+ * called by the first (and only) parameter passed to the Wrappable annotation.
+ * 
+ * class Foo extends Object {
+ * 	/** !Wrappable test * /
+ * 	function wrappedTest($arg) { echo $arg; return 'fooz'; }
+ * 
+ *  /** !Before test * /
+ *  function echoArgs(&$args) { echo 'Before test("' . $args[0] . '")'; }
+ *  
+ *  /** !After test * /
+ *  function echoArgs($retVal) { echo 'After test() returns: ' . $retVal; return 'baz'; }
+ * }
+ * $foo = new Foo();
+ * $result = $foo->test('bar');
+ * // > Before test("bar")
+ * // > bar
+ * // > After test() returns: fooz
+ * echo $result
+ * // > baz
+ * 
+ * Key methods in the framework are made Wrappable so that functionality can
+ * easily be plugged into Recess.
+ * 
+ * 
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+class WrappableAnnotation extends Annotation {
+	
+	public function usage() {
+		return '!Wrappable wrappedMethodName';
+	}
+	
+	protected function validate($class) {
+		$this->exactParameterCount(1);
+	}
+	
+	public function isFor() {
+		return Annotation::FOR_METHOD;
+	}
+	
+	protected function expand($class, $reflection, $descriptor) {
+		$methodName = $this->values[0];
+		
+		$wrappedMethod = new WrappedMethod($reflection->name);
+		
+		$descriptor->attachMethod($class, $methodName, $wrappedMethod, WrappedMethod::CALL);
+				
+		$descriptor->addWrappedMethod($methodName, $wrappedMethod);
+	}
+	
+}
+?>
\ No newline at end of file
diff --git a/recess/lib/recess/lang/WrappedMethod.class.php b/recess/lib/recess/lang/WrappedMethod.class.php
new file mode 100644
index 0000000..2b1f08d
--- /dev/null
+++ b/recess/lib/recess/lang/WrappedMethod.class.php
@@ -0,0 +1,119 @@
+<?php
+Library::import('recess.lang.IWrapper');
+Library::import('recess.lang.reflection.ReflectionMethod');
+
+/**
+ * WrappedMethod is used as an attached method provider on a Recess Object.
+ * WrappedMethod provides an additional level of indirection prior to
+ * invoking a method on an Object that allows classes implementing
+ * IWrapper to register callbacks before() and after(). before() callbacks
+ * are able to modify the arguments being passed to a method, and
+ * can short-circuit a return value. after() callbacks can modify the
+ * return value. Shares similarities to the aspect oriented notion of join
+ * points.
+ * 
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+class WrappedMethod {
+	
+	const CALL = 'call';
+	
+	/**
+	 * Registered wrappers whose callbacks are invoked during call()
+	 * @var array(IWrapper)
+	 */
+	protected $wrappers = array();
+	
+	/**
+	 * Name of the method to invoke on the object passed to call()
+	 * @var string
+	 */
+	public $method;
+	
+	/**
+	 * The constructor takes an optional method name.
+	 * 
+	 * @param String $method name of the method to invoke
+	 */
+	function __construct($method = '') {
+		$this->method = $method;
+	}
+	
+	/**
+	 * Wrap the method with another IWrapper
+	 * 
+	 * @param IWrapper $wrapper
+	 */
+	function addWrapper(IWrapper $wrapper) {
+		foreach($this->wrappers as $existingWrapper) {
+			if($existingWrapper->combine($wrapper)) {
+				return;
+			}
+		}
+		$this->wrappers[] = $wrapper;
+	}
+	
+	/**
+	 * Assume takes the wrappers from another WrappedMethod
+	 * and makes them their own. Assume is necessary because
+	 * the actual WrappedMethod in a ClassDescriptor may not exist
+	 * prior to it needing to be wrapped (by a Class-level annotation)
+	 * so we create a place-holder WrappedMethod until the actual
+	 * wrapped method Assumes its rightful place.
+	 * 
+	 * @param WrappedMethod $wrappedMethod the place-holder WrappedMethod.
+	 * @return WrappedMethod
+	 */
+	function assume(WrappedMethod $wrappedMethod) {
+		$this->wrappers = $wrappedMethod->wrappers;
+		return $this;
+	}
+	
+	/**
+	 * The wrappers and wrapped method are invoked in call().
+	 * First the before() methods of wrappers are invoked in the order
+	 * in which the Wrappers were applied. The before methods are passed
+	 * the arguments which will eventually be passed to the actual wrapped
+	 * method by reference for possible manipulation. If a before method
+	 * returns a value this value is short-circuits the calling process
+	 * and returns that value immediately. Next the wrapped method is
+	 * invoked. The result is then passed to the after() methods of wrappers
+	 * in the reverse order in which they were applied. The after methods
+	 * can manipulate the returned value.
+	 * 
+	 * @return mixed
+	 */
+	function call() {
+		$args = func_get_args();
+		
+		$object = array_shift($args);
+		
+		foreach($this->wrappers as $wrapper) {
+			$returns = $wrapper->before($object, $args);
+			if($returns != null) { 
+				// Short-circuit return
+				return $returns;
+			}
+		}
+		
+		if(!isset($this->reflectedMethod)) {
+			$this->reflectedMethod = new ReflectionMethod($object, $this->method);
+		}
+		
+		$returns = $this->reflectedMethod->invokeArgs($object, $args);
+		
+		foreach(array_reverse($this->wrappers) as $wrapper) {
+			$wrapperReturn = $wrapper->after($returns);
+			if($wrapperReturn != null) {
+				$returns = $wrapperReturn;
+			}
+		}
+		
+		return $returns;
+	}
+}
+?>
\ No newline at end of file
diff --git a/recess/lib/recess/lang/codegen/CodeGen.class.php b/recess/lib/recess/lang/codegen/CodeGen.class.php
index 699a1da..1c55dd7 100644
--- a/recess/lib/recess/lang/codegen/CodeGen.class.php
+++ b/recess/lib/recess/lang/codegen/CodeGen.class.php
@@ -8,8 +8,8 @@
 Library::import('recess.lang.codegen.CodeGenProperty');
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/codegen/CodeGenClass.class.php b/recess/lib/recess/lang/codegen/CodeGenClass.class.php
index 9647e37..c6cff0e 100644
--- a/recess/lib/recess/lang/codegen/CodeGenClass.class.php
+++ b/recess/lib/recess/lang/codegen/CodeGenClass.class.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/codegen/CodeGenClassFile.class.php b/recess/lib/recess/lang/codegen/CodeGenClassFile.class.php
index 779e9d5..1cd89b3 100644
--- a/recess/lib/recess/lang/codegen/CodeGenClassFile.class.php
+++ b/recess/lib/recess/lang/codegen/CodeGenClassFile.class.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/codegen/CodeGenClassMember.class.php b/recess/lib/recess/lang/codegen/CodeGenClassMember.class.php
index 41c4228..1dee6b0 100644
--- a/recess/lib/recess/lang/codegen/CodeGenClassMember.class.php
+++ b/recess/lib/recess/lang/codegen/CodeGenClassMember.class.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/codegen/CodeGenDocComment.class.php b/recess/lib/recess/lang/codegen/CodeGenDocComment.class.php
index bbfda92..c6ea534 100644
--- a/recess/lib/recess/lang/codegen/CodeGenDocComment.class.php
+++ b/recess/lib/recess/lang/codegen/CodeGenDocComment.class.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/codegen/CodeGenImport.class.php b/recess/lib/recess/lang/codegen/CodeGenImport.class.php
index 4ef496a..d61679a 100644
--- a/recess/lib/recess/lang/codegen/CodeGenImport.class.php
+++ b/recess/lib/recess/lang/codegen/CodeGenImport.class.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/codegen/CodeGenMethod.class.php b/recess/lib/recess/lang/codegen/CodeGenMethod.class.php
index e0571d4..014e7fa 100644
--- a/recess/lib/recess/lang/codegen/CodeGenMethod.class.php
+++ b/recess/lib/recess/lang/codegen/CodeGenMethod.class.php
@@ -2,8 +2,8 @@
 Library::import('recess.lang.codegen.CodeGenClassMember');
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/codegen/CodeGenProperty.class.php b/recess/lib/recess/lang/codegen/CodeGenProperty.class.php
index 78c9ea4..38b9e3a 100644
--- a/recess/lib/recess/lang/codegen/CodeGenProperty.class.php
+++ b/recess/lib/recess/lang/codegen/CodeGenProperty.class.php
@@ -2,8 +2,8 @@
 Library::import('recess.lang.codegen.CodeGenClassMember');
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/exceptions/InvalidAnnotationValueException.class.php b/recess/lib/recess/lang/exceptions/InvalidAnnotationValueException.class.php
index fe0690e..7d41598 100644
--- a/recess/lib/recess/lang/exceptions/InvalidAnnotationValueException.class.php
+++ b/recess/lib/recess/lang/exceptions/InvalidAnnotationValueException.class.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/exceptions/UnknownAnnotationException.class.php b/recess/lib/recess/lang/exceptions/UnknownAnnotationException.class.php
index 8228889..b6ea827 100644
--- a/recess/lib/recess/lang/exceptions/UnknownAnnotationException.class.php
+++ b/recess/lib/recess/lang/exceptions/UnknownAnnotationException.class.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/RecessReflectionClass.class.php b/recess/lib/recess/lang/reflection/RecessReflectionClass.class.php
similarity index 80%
rename from recess/lib/recess/lang/RecessReflectionClass.class.php
rename to recess/lib/recess/lang/reflection/RecessReflectionClass.class.php
index f33b565..3c3195e 100644
--- a/recess/lib/recess/lang/RecessReflectionClass.class.php
+++ b/recess/lib/recess/lang/reflection/RecessReflectionClass.class.php
@@ -1,8 +1,8 @@
 <?php
-Library::import('recess.lang.RecessObject');
+Library::import('recess.lang.Object');
 
 /**
- * Recess! Framework reflection for class which introduces annotations.
+ * Recess PHP Framework reflection for class which introduces annotations.
  * Annotations follow the following syntax:
  * 
  * !AnnotationName value, key: value, value, (sub array value, key: value, (sub sub array value))
@@ -16,14 +16,14 @@
  * @todo Harden the regular expressions.
  * 
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
 class RecessReflectionClass extends ReflectionClass {
 	function getProperties($filter = null) {
-		Library::import('recess.lang.RecessReflectionProperty');
+		Library::import('recess.lang.reflection.RecessReflectionProperty');
 		$rawProperties = parent::getProperties();
 		$properties = array();
 		foreach($rawProperties as $rawProperty) {
@@ -32,7 +32,7 @@ function getProperties($filter = null) {
 		return $properties;
 	}
 	function getMethods($getAttachedMethods = true){
-		Library::import('recess.lang.RecessReflectionMethod');
+		Library::import('recess.lang.reflection.RecessReflectionMethod');
 		$rawMethods = parent::getMethods();
 		$methods = array();
 		foreach($rawMethods as $rawMethod) {
@@ -40,8 +40,8 @@ function getMethods($getAttachedMethods = true){
 			$methods[] = $method;
 		}
 		
-		if($getAttachedMethods && is_subclass_of($this->name, 'RecessObject')) {
-			$methods = array_merge($methods, RecessObject::getAttachedMethods($this->name));
+		if($getAttachedMethods && is_subclass_of($this->name, 'Object')) {
+			$methods = array_merge($methods, Object::getAttachedMethods($this->name));
 		}
 		
 		return $methods;
diff --git a/recess/lib/recess/lang/RecessReflectionMethod.class.php b/recess/lib/recess/lang/reflection/RecessReflectionMethod.class.php
similarity index 93%
rename from recess/lib/recess/lang/RecessReflectionMethod.class.php
rename to recess/lib/recess/lang/reflection/RecessReflectionMethod.class.php
index b99f444..2dbc2ac 100644
--- a/recess/lib/recess/lang/RecessReflectionMethod.class.php
+++ b/recess/lib/recess/lang/reflection/RecessReflectionMethod.class.php
@@ -3,8 +3,8 @@
 
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
  */
diff --git a/recess/lib/recess/lang/RecessReflectionProperty.class.php b/recess/lib/recess/lang/reflection/RecessReflectionProperty.class.php
similarity index 88%
rename from recess/lib/recess/lang/RecessReflectionProperty.class.php
rename to recess/lib/recess/lang/reflection/RecessReflectionProperty.class.php
index c57e730..4a8b02c 100644
--- a/recess/lib/recess/lang/RecessReflectionProperty.class.php
+++ b/recess/lib/recess/lang/reflection/RecessReflectionProperty.class.php
@@ -3,10 +3,11 @@
 
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
- * @copyright 2008 Kris Jordan
- * @package Recess! Framework
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
  * @license MIT
  * @link http://www.recessframework.org/
+ * @todo Add custom getFileName() and getStartLine() methods
  */
 class RecessReflectionProperty extends ReflectionProperty {
 	function getAnnotations() {
diff --git a/recess/test/recess/database/orm/ModelTest.php b/recess/test/recess/database/orm/ModelTest.php
index e2c7e0b..0bf95e9 100644
--- a/recess/test/recess/database/orm/ModelTest.php
+++ b/recess/test/recess/database/orm/ModelTest.php
@@ -1,5 +1,5 @@
 <?php
-Library::import('recess.lang.RecessObjectRegistry');
+Library::import('recess.lang.ObjectRegistry');
 
 Library::import('recess.database.Databases');
 Library::import('recess.database.orm.Model');
@@ -96,91 +96,13 @@ abstract class ModelTest extends PHPUnit_Extensions_Database_TestCase {
 	
 	function getDataSet() {
 		Databases::setDefaultSource($this->source);
-		RecessObject::clearDescriptors();
+		Object::clearDescriptors();
 		return $this->createXMLDataSet('recess/database/orm/sample-data.xml');
 	}
 	
 	function tearDown() {
-//		$this->source->commit();
-//		$this->source->beginTransaction();
-//		$this->source->exec('DROP TABLE IF EXISTS persons');
-//	 	$this->source->exec('DROP TABLE IF EXISTS groups');
-//	 	$this->source->exec('DROP TABLE IF EXISTS groupships');
-//		$this->source->exec('DROP TABLE IF EXISTS books');
-//	 	$this->source->exec('DROP TABLE IF EXISTS chapters');
-//	 	$this->source->exec('DROP TABLE IF EXISTS cars');
-//		$this->source->exec('DROP TABLE IF EXISTS movies');
-//		$this->source->exec('DROP TABLE IF EXISTS generas');
-//		$this->source->exec('DROP TABLE IF EXISTS movies_generas_joins');
-//	 	$this->source->exec('DROP TABLE IF EXISTS political_partys');
-//		$this->source->exec('DROP TABLE IF EXISTS books_generas_joins');
-//		$this->source->commit();
 		unset($this->source);
 	}
-	
-//	function setUpHelper() {
-//		$this->source->beginTransaction();
-//		$this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId, phone) VALUES ("Kris", "Jordan", 23, 1, "321-456-7890")');
-//		$this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId, phone) VALUES ("Joel", "Sutherland", 23, 1, "919-485-5387")');
-//		$this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId, phone) VALUES ("Clay", "Schossow", 22, 2, "917-228-5749")');
-//		$this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId, phone) VALUES ("Barack", "Obama", 47, 1, "203-507-4577")');
-//		$this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId, phone) VALUES ("Josh", "Lockhart", 22, 1, "")');
-//		$this->source->exec('INSERT INTO persons (firstName, lastName, age, politicalPartyId, phone) VALUES ("John", "McCain", 72, 3, "")');
-//		$this->source->exec('INSERT INTO political_partys (party) VALUES ("Democrat")');
-//		$this->source->exec('INSERT INTO political_partys (party) VALUES ("Independent")');
-//		$this->source->exec('INSERT INTO political_partys (party) VALUES ("Republican")');
-//		$this->source->exec('INSERT INTO books (authorId, title) VALUES (4,"The Audacity of Hope: Thoughts on Reclaiming the American Dream")');
-//		$this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Republicans and Democrats")');
-//		$this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Values")');
-//		$this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Our Constitution")');
-//		$this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Politics")');
-//		$this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Opportunity")');
-//		$this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Faith")');
-//		$this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Race")');
-//		$this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"The World Beyond our Borders")');
-//		$this->source->exec('INSERT INTO chapters (bookId, title) VALUES (1,"Family")');
-//		$this->source->exec('INSERT INTO books (authorId, title) VALUES (3,"How to Be a Sketch Ball")'); // 1
-//		$this->source->exec('INSERT INTO books (authorId, title) VALUES (2,"Steve Nash: A Modern Day Hero")'); // 2
-//		$this->source->exec('INSERT INTO books (authorId, title) VALUES (1,"How Michael Scott Touched My Life, and Could Touch Yours Too")'); // 3
-//		$this->source->exec('INSERT INTO books (authorId, title) VALUES (4,"Dreams from My Father: A Story of Race and Inheritance")'); // 4
-//		$this->source->exec('INSERT INTO books (authorId, title) VALUES (4,"Barack Obama: What He Believes In - From His Own Works")'); // 5
-//		$this->source->exec('INSERT INTO books (authorId, title) VALUES (3,"Hoop Dreams, The Clay Schossow Story")'); // 6
-//		$this->source->exec('INSERT INTO movies (authorId, title) VALUES (3,"Hoop Dreams, The Clay Schossow Story, The Movie")');
-//		$this->source->exec('INSERT INTO movies (authorId, title) VALUES (3,"Clay Schossow: Unleashed")');
-//		$this->source->exec('INSERT INTO movies (authorId, title) VALUES (3,"LeBron James and Other Assorted Dreams of Clay Schossow")');
-//		$this->source->exec('INSERT INTO generas (title) VALUES ("Sports Healing")'); // 1
-//		$this->source->exec('INSERT INTO generas (title) VALUES ("Political Healing")'); // 2
-//		$this->source->exec('INSERT INTO generas (title) VALUES ("Social Healing")'); // 3
-//		$this->source->exec('INSERT INTO generas (title) VALUES ("Comedy Healing")'); // 4
-//		$this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (1,3)');
-//		$this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (2,3)');
-//		$this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (2,4)');
-//		$this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (3,1)'); // 4: 4, 6: 3
-//		$this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (4,4)');
-//		$this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (5,3)');
-//		$this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (6,3)');
-//		$this->source->exec('INSERT INTO books_generas_joins (bookId,generaId) VALUES (7,1)');
-//		$this->source->exec('INSERT INTO movies_generas_joins (movieId,generaId) VALUES (1,1)');
-//		$this->source->exec('INSERT INTO movies_generas_joins (movieId,generaId) VALUES (1,4)');
-//		$this->source->exec('INSERT INTO movies_generas_joins (movieId,generaId) VALUES (2,4)');
-//		$this->source->exec('INSERT INTO movies_generas_joins (movieId,generaId) VALUES (3,1)');
-//		$this->source->exec('INSERT INTO groups (name) VALUES ("NRA")'); // 1
-//		$this->source->exec('INSERT INTO groups (name) VALUES ("Tree Huggers")'); // 2
-//		$this->source->exec('INSERT INTO groups (name) VALUES ("Hackers")'); // 3
-//		$this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (2,1)');
-//		$this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (3,1)');
-//		$this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (3,2)');
-//		$this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (2,2)');
-//		$this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (1,3)');
-//		$this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (2,4)');
-//		$this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (2,5)');
-//		$this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (3,5)');
-//		$this->source->exec('INSERT INTO groupships (groupId,personId) VALUES (1,6)');
-//		$this->source->exec('INSERT INTO cars (personId,make,isDriveable) VALUES (1,"VW",1)');
-//		$this->source->exec('INSERT INTO cars (personId,make,isDriveable) VALUES (2,"Toyota",1)');
-//		$this->source->commit();
-//		$this->source->beginTransaction();
-//	}
 
 	function testAll() {
 		$person = new Person();
@@ -356,7 +278,7 @@ function testInsert() {
 		$this->assertEquals($people_count + 1, count($people));
 	}
 	
-	function testDelete() {
+	function testDelete() {		
 		$people = Make::a('Person')->all();
 		$people_count = count($people);
 		$this->assertTrue($people[0]->delete());
diff --git a/recess/test/recess/lang/FrameworkObjectTest.php b/recess/test/recess/lang/FrameworkObjectTest.php
new file mode 100644
index 0000000..919793b
--- /dev/null
+++ b/recess/test/recess/lang/FrameworkObjectTest.php
@@ -0,0 +1,141 @@
+<?php
+require_once 'PHPUnit/Framework.php';
+
+Library::import('recess.lang.Object');
+
+class MyObject extends Object {
+	
+	/** !Wrappable argumentFree */
+	public function wrappedArgumentFree() {
+		return 'argumentFree';
+	}
+	
+	/** !Wrappable singleArgument */
+	public function wrappedSingleArgument($argument) {
+		return "Arg:$argument";
+	}
+	
+	/** !Wrappable testWrapper */
+	public function wrappedTestWrapper() {
+		return 0;
+	}
+	
+	/** !Wrappable testWrappers */
+	public function wrappedTestWrappers() {
+		return 0;
+	}
+	
+}
+
+class Add1ToAnnotation extends Annotation implements IWrapper {
+	protected $method; 
+	
+	function init($array) { $this->method = $array[0]; }
+	
+	function shapeDescriptor($class, $reflection, $descriptor) {
+		$descriptor->addWrapper($this->method, $this);
+	}
+	
+	function combine(IWrapper $requiredWrapper) {}
+	
+	function before(&$args) {}
+	
+	function after($result) { return $result + 1; }
+}
+
+class ConcatAnnotation extends Annotation implements IWrapper {
+	protected $prepend;
+	protected $append; 
+	protected $method; 
+	
+	function init($array) {
+		$this->prepend = $array[0];
+		$this->append = $array[1];
+		$this->method = $array[2];
+	}
+	
+	function shapeDescriptor($class, $reflection, $descriptor) {
+		$descriptor->addWrapper($this->method, $this);
+	}
+	
+	function combine(IWrapper $requiredWrapper) {}
+	
+	function before(&$args) { $args[1] = $this->prepend . $args[1]; }
+	
+	function after($result) { return $result . $this->append; }
+}
+
+/** 
+ *  !Add1To testWrapper 
+ * 	!Add1To testWrappers
+ * 	!Add1To testWrappers
+ *  !Concat "Hello ", "!!!", stringConcat
+ *  !Concat "{", "}", twoConcats
+ *  !Concat "[", "]", twoConcats
+ *  !Concat "(", ")", twoConcats
+ **/
+class MyExtendedObject extends MyObject {
+	
+	/** !Wrappable singleArgument */
+	public function wrappedSingleArgument($argument) {
+		return parent::wrappedSingleArgument($argument);
+	}
+	
+	/** !Wrappable stringConcat */
+	public function wrappedStringConcat($string) {
+		return $string . ' World';
+	}
+	
+	/** !Wrappable twoConcats */
+	public function theConventionDoesntMatter($string) {
+		return $string . ' World';
+	}
+	
+	
+}
+
+class ObjectTest extends PHPUnit_Framework_TestCase {
+
+	function testSimpleWrappedMethod() {
+		$obj = new MyObject();
+		$this->assertEquals('argumentFree', $obj->argumentFree());
+		$this->assertEquals('argumentFree', $obj->wrappedArgumentFree());
+	}
+	
+	function testSingleArgumentWrappedMethod() {
+		$obj = new MyObject();
+		$this->assertEquals('Arg:Hello World', $obj->singleArgument('Hello World'));
+	}
+	
+	function testShadowedSingleArgumentWrappedMethod() {
+		$obj = new MyExtendedObject();
+		$this->assertEquals('Arg:Hello World2', $obj->singleArgument('Hello World2'));
+	}
+	
+	function testParentWrapped() {
+		$obj = new MyExtendedObject();
+		$this->assertEquals('argumentFree', $obj->argumentFree());
+	}
+	
+	function testWrapperAfter() {
+		$obj = new MyExtendedObject();
+		$this->assertEquals(1, $obj->testWrapper());
+	}
+	
+	function testWrappersAfter() {
+		$obj = new MyExtendedObject();
+		$this->assertEquals(2, $obj->testWrappers());
+	}
+	
+	function testStringConcat() {
+		$obj = new MyExtendedObject();
+		$this->assertEquals('Hello Wrappable World!!!', $obj->stringConcat('Wrappable'));
+	}
+	
+	function testMultipleStringConcats() {
+		$obj = new MyExtendedObject();
+		$this->assertEquals('([{Wrappable World}])', $obj->twoConcats('Wrappable'));
+	}
+
+}
+?>
\ No newline at end of file
diff --git a/recess/test/recess/lang/ObjectTest.php b/recess/test/recess/lang/ObjectTest.php
new file mode 100644
index 0000000..17d8b36
--- /dev/null
+++ b/recess/test/recess/lang/ObjectTest.php
@@ -0,0 +1,63 @@
+<?php
+require_once 'PHPUnit/Framework.php';
+
+Library::import('recess.lang.Object');
+
+class MyObject extends Object {}
+
+class MyNewClassMethodProvider {
+	function callMe() {
+		return 'Hello World!';
+	}
+}
+
+class ObjectTest extends PHPUnit_Framework_TestCase
+{ 
+	function testAttachedMethod() {
+		$myObject = new MyObject();
+		try {
+			$this->assertEquals(
+				'Hello World!',
+				$myObject->helloWorld()
+				);
+			$this->hasFailed();
+		} catch (RecessException $e) {
+			// Success
+		}
+		
+		$attachedMethodProvider = new MyNewClassMethodProvider();
+		MyObject::attachMethod('MyObject','helloWorld',$attachedMethodProvider,'callMe');
+		
+		try {
+			$this->assertEquals(
+				$myObject->helloWorld(),
+				'Hello World!');
+			// Success
+		} catch (RecessException $e) {
+			$this->hasFailed();
+		}
+	}
+	
+	function testPropertiesPattern() {
+		$Object = new MyObject();
+
+		$this->assertFalse(isset($Object->prop));
+		
+		$Object->prop = true;
+		$this->assertTrue(isset($Object->prop));
+		$this->assertTrue($Object->prop);
+		
+		unset($Object->prop);
+		$this->assertFalse(isset($Object->prop));
+		
+		$settings = array('key1' => 'value1', 'key2' => 'value2');
+		foreach($settings as $key => $value) {
+			$Object->$key = $value;
+		}
+		
+		foreach($Object as $key => $value) {
+			$this->assertEquals($settings[$key], $Object->$key);
+		}
+ 	}
+}
+?>
\ No newline at end of file
diff --git a/recess/test/recess/lang/RecessLangAllTests.php b/recess/test/recess/lang/RecessLangAllTests.php
index d939abb..3767d0c 100644
--- a/recess/test/recess/lang/RecessLangAllTests.php
+++ b/recess/test/recess/lang/RecessLangAllTests.php
@@ -1,7 +1,8 @@
 <?php
 require_once 'PHPUnit/Framework.php';
-require_once 'recess/lang/RecessObjectTest.php';
-require_once 'recess/lang/RecessReflectionClassTest.php';
+require_once 'recess/lang/ObjectTest.php';
+require_once 'recess/lang/ObjectTest.php';
+require_once 'recess/lang/reflection/RecessReflectionClassTest.php';
 require_once 'recess/lang/InflectorTest.php';
 
 class RecessLangAllTests
@@ -10,7 +11,8 @@ public static function suite()
     {
         $suite = new PHPUnit_Framework_TestSuite('recess.lang');
 
-        $suite->addTestSuite('RecessObjectTest');
+        $suite->addTestSuite('ObjectTest');
+ 		$suite->addTestSuite('ObjectTest');
  		$suite->addTestSuite('RecessReflectionClassTest');
  		$suite->addTestSuite('InflectorTest');
  		
diff --git a/recess/test/recess/lang/RecessObjectTest.php b/recess/test/recess/lang/RecessObjectTest.php
deleted file mode 100644
index c95d753..0000000
--- a/recess/test/recess/lang/RecessObjectTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-require_once 'PHPUnit/Framework.php';
-
-Library::import('recess.lang.RecessObject');
-
-class MyRecessObject extends RecessObject {}
-
-class MyNewClassMethodProvider {
-	function callMe() {
-		return 'Hello World!';
-	}
-}
-
-class RecessObjectTest extends PHPUnit_Framework_TestCase
-{ 
-	function testAttachedMethod() {
-		$myRecessObject = new MyRecessObject();
-		try {
-			$this->assertEquals(
-				'Hello World!',
-				$myRecessObject->helloWorld()
-				);
-			$this->hasFailed();
-		} catch (RecessException $e) {
-			// Success
-		}
-		
-		$attachedMethodProvider = new MyNewClassMethodProvider();
-		MyRecessObject::attachMethod('MyRecessObject','helloWorld',$attachedMethodProvider,'callMe');
-		
-		try {
-			$this->assertEquals(
-				$myRecessObject->helloWorld(),
-				'Hello World!');
-			// Success
-		} catch (RecessException $e) {
-			$this->hasFailed();
-		}
-	}
-	
-	function testPropertiesPattern() {
-		$RecessObject = new MyRecessObject();
-
-		$this->assertFalse(isset($RecessObject->prop));
-		
-		$RecessObject->prop = true;
-		$this->assertTrue(isset($RecessObject->prop));
-		$this->assertTrue($RecessObject->prop);
-		
-		unset($RecessObject->prop);
-		$this->assertFalse(isset($RecessObject->prop));
-		
-		$settings = array('key1' => 'value1', 'key2' => 'value2');
-		foreach($settings as $key => $value) {
-			$RecessObject->$key = $value;
-		}
-		
-		foreach($RecessObject as $key => $value) {
-			$this->assertEquals($settings[$key], $RecessObject->$key);
-		}
- 	}
-}
-?>
\ No newline at end of file
diff --git a/recess/test/recess/lang/RecessReflectionClassTest.php b/recess/test/recess/lang/reflection/RecessReflectionClassTest.php
similarity index 97%
rename from recess/test/recess/lang/RecessReflectionClassTest.php
rename to recess/test/recess/lang/reflection/RecessReflectionClassTest.php
index 306e47b..cd42ae5 100644
--- a/recess/test/recess/lang/RecessReflectionClassTest.php
+++ b/recess/test/recess/lang/reflection/RecessReflectionClassTest.php
@@ -40,7 +40,7 @@ class AttrBAnnotation {
 	function init($args) {}
 }
 
-Library::import('recess.lang.RecessReflectionClass');
+Library::import('recess.lang.reflection.RecessReflectionClass');
 
 class RecessReflectionClassTest extends PHPUnit_Framework_TestCase {
 	

From 31b70eb1a1791c7391310c6ce9a4f2eb5a10f42c Mon Sep 17 00:00:00 2001
From: KevBurnsJr <kevburnsjr@gmail.com>
Date: Sun, 22 Mar 2009 14:05:20 +0800
Subject: [PATCH 3/3] Adding ForwardingForbiddenResponse

Signed-off-by: Recess PHP Framework <kris@recessframework.org>
---
 .../responses/ForwardingForbiddenResponse.class.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 recess/lib/recess/http/responses/ForwardingForbiddenResponse.class.php

diff --git a/recess/lib/recess/http/responses/ForwardingForbiddenResponse.class.php b/recess/lib/recess/http/responses/ForwardingForbiddenResponse.class.php
new file mode 100644
index 0000000..aa95218
--- /dev/null
+++ b/recess/lib/recess/http/responses/ForwardingForbiddenResponse.class.php
@@ -0,0 +1,13 @@
+<?php
+Library::import('recess.http.ForwardingResponse');
+Library::import('recess.http.ResponseCodes');
+
+class ForwardingForbiddenResponse extends ForwardingResponse {
+	public $context;
+	
+	public function __construct(Request $request, $contentUri, $context = '') {
+		parent::__construct($request, ResponseCodes::HTTP_FORBIDDEN, $contentUri);
+		$this->context = $context;
+	}
+}
+?>
\ No newline at end of file