diff --git a/apps/welcome/WelcomeApplication.class.php b/apps/welcome/WelcomeApplication.class.php
index 00a73e8..f1e7bb2 100644
--- a/apps/welcome/WelcomeApplication.class.php
+++ b/apps/welcome/WelcomeApplication.class.php
@@ -14,6 +14,8 @@ public function __construct() {
 		
 		$this->routingPrefix = '/';
 		
+		$this->assetUrl = 'recess/recess/apps/tools/public/';
+		
 	}
 }
 ?>
\ No newline at end of file
diff --git a/apps/welcome/controllers/WelcomeHomeController.class.php b/apps/welcome/controllers/WelcomeHomeController.class.php
index d07ec5f..1aa35e8 100644
--- a/apps/welcome/controllers/WelcomeHomeController.class.php
+++ b/apps/welcome/controllers/WelcomeHomeController.class.php
@@ -12,12 +12,5 @@ class WelcomeHomeController extends Controller {
 	function index() {
 		$this->flash = 'Welcome to your new Recess app!';
 	}
-	
-	/**
-	 * !Route GET, foo
-	 */
-	function foo() {
-		
-	}
 }
 ?>
diff --git a/apps/welcome/views/common/footer.php b/apps/welcome/views/common/footer.php
deleted file mode 100644
index 5e60d78..0000000
--- a/apps/welcome/views/common/footer.php
+++ /dev/null
@@ -1,4 +0,0 @@
-
-		</div>
-	</body>
-</html>
\ No newline at end of file
diff --git a/apps/welcome/views/home/index.php b/apps/welcome/views/home/index.php
index 3826f6f..09564e1 100644
--- a/apps/welcome/views/home/index.php
+++ b/apps/welcome/views/home/index.php
@@ -1,6 +1,6 @@
 <?php 
+Layout::extend('master');
 $title = 'Welcome to Recess!';
-include_once($viewsDir . 'common/header.php');
 ?>
 <div class="span-24 last">
 <div class="span-12 notice">
@@ -16,6 +16,4 @@
 </div>
 </div>
 
-<h3>For more information visit <a href="http://www.recessframework.org/">http://www.recessframework.org/</a></h3>
-
-<?php include_once($viewsDir . 'common/footer.php'); ?>
\ No newline at end of file
+<h3>For more information visit <a href="http://www.recessframework.org/">http://www.recessframework.org/</a></h3>
\ No newline at end of file
diff --git a/apps/welcome/views/common/header.php b/apps/welcome/views/master.layout.php
similarity index 71%
rename from apps/welcome/views/common/header.php
rename to apps/welcome/views/master.layout.php
index 6cf6499..27c561d 100644
--- a/apps/welcome/views/common/header.php
+++ b/apps/welcome/views/master.layout.php
@@ -1,15 +1,16 @@
+<?php
+Layout::input($title, 'string');
+Layout::input($body, 'Block');
+?>
 <html>
 	<head>
 		<!-- Blue Print -->
-		<link rel="stylesheet" href="<?php echo $_ENV['url.content']; ?>css/blueprint/screen.css" type="text/css" media="screen, projection" />
-		<link rel="stylesheet" href="<?php echo $_ENV['url.content']; ?>css/blueprint/print.css" type="text/css" media="print" /> 
+		<?php echo Html::css('blueprint/screen', 'screen') ?>
+		<?php echo Html::css('blueprint/print', 'print') ?>
 		<!--[if IE]>
-		  <link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection" />
+			<?php echo Html::css('blueprint/ie', 'screen') ?>
 		<![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>
-		
 		<style type="text/css">
 			.error,.notice,.success{ margin: 0 0 1em 0; padding: 0.8em; border: 2px solid #000; }
 			.error{ background: #FBE3E4; border-color: #FBC2C4; }
@@ -38,6 +39,10 @@
 	<body>
 	<div class="container">
 		<div class="span-24">
-			<h1>Welcome to Recess!</h1>
+			<h1><?php echo $title ?></h1>
 		</div>
-		<div class="span-24 last">
\ No newline at end of file
+		<div class="span-24 last">
+			<?php echo $body ?>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/RecessToolsApplication.class.php b/recess/recess/apps/tools/RecessToolsApplication.class.php
index 4787aa0..6b49987 100644
--- a/recess/recess/apps/tools/RecessToolsApplication.class.php
+++ b/recess/recess/apps/tools/RecessToolsApplication.class.php
@@ -1,5 +1,6 @@
 <?php
 Library::import('recess.framework.Application');
+Library::import('recess.framework.helpers.AssertiveTemplate');
 
 class RecessToolsApplication extends Application {
 	
@@ -23,6 +24,8 @@ public function __construct() {
 		
 		$this->routingPrefix = 'recess/';
 		
+		AssertiveTemplate::addPath($_ENV['dir.recess'] . 'recess/framework/parts/');
+
 	}
 }
 
diff --git a/recess/recess/apps/tools/controllers/RecessToolsAppsController.class.php b/recess/recess/apps/tools/controllers/RecessToolsAppsController.class.php
index d67002a..cc7d5f8 100644
--- a/recess/recess/apps/tools/controllers/RecessToolsAppsController.class.php
+++ b/recess/recess/apps/tools/controllers/RecessToolsAppsController.class.php
@@ -95,8 +95,9 @@ private function generateApp() {
 		$this->messages[] = $this->tryGeneratingFile('Navigation Part', $this->application->codeTemplatesDir . 'scaffolding/views/parts/navigation.part.template.php', $appDir . '/views/parts/navigation.part.php', $appReplacements);
 		$this->messages[] = $this->tryGeneratingFile('Style Part', $this->application->codeTemplatesDir . 'scaffolding/views/parts/style.part.template.php', $appDir . '/views/parts/style.part.php', $appReplacements);
 		$this->messages[] = $this->tryCreatingDirectory($appDir . '/views/home', 'home views');
+		$this->messages[] = $this->tryCreatingDirectory($appDir . '/views/layouts', 'layouts');
 		$this->messages[] = $this->tryGeneratingFile('Home Template', $this->application->codeTemplatesDir . 'scaffolding/views/home/index.template.php', $appDir . '/views/home/index.php', $appReplacements);
-		$this->messages[] = $this->tryGeneratingFile('Master Layout', $this->application->codeTemplatesDir . 'scaffolding/views/master.template.php', $appDir . '/views/master.php', $appReplacements);
+		$this->messages[] = $this->tryGeneratingFile('Master Layout', $this->application->codeTemplatesDir . 'scaffolding/views/master.layout.template.php', $appDir . '/views/layouts/master.layout.php', $appReplacements);
 		
 		$this->messages[] = $this->tryCreatingDirectory($appDir . '/public', 'public');
 		$this->messages[] = $this->tryCreatingDirectory($appDir . '/public/css', 'css');
@@ -343,7 +344,7 @@ public function generateScaffolding($app, $model) {
 		
 		$viewsDir = $app->viewsDir . $replacements['viewsPrefix'] . '/';
 		$this->messages[] = $this->tryCreatingDirectory($viewsDir, $model . ' views dir');
-		$this->messages[] = $this->tryGeneratingFile('resource layout', $this->application->codeTemplatesDir . 'scaffolding/views/resource/layout.template.php', $viewsDir . 'layout.php', $replacements);
+		$this->messages[] = $this->tryGeneratingFile('resource layout', $this->application->codeTemplatesDir . 'scaffolding/views/resource/resource.layout.template.php', $viewsDir . '../layouts/' . $replacements['viewsPrefix'] . '.layout.php', $replacements);
 		$this->messages[] = $this->tryGeneratingFile('index view', $this->application->codeTemplatesDir . 'scaffolding/views/resource/index.template.php', $viewsDir . 'index.php', $replacements);
 		$this->messages[] = $this->tryGeneratingFile('editForm view', $this->application->codeTemplatesDir . 'scaffolding/views/resource/editForm.template.php', $viewsDir . 'editForm.php', $replacements, true);
 		$this->messages[] = $this->tryGeneratingFile('form part', $this->application->codeTemplatesDir . 'scaffolding/views/resource/form.part.template.php', $viewsDir . 'form.part.php', $replacements, true);
diff --git a/recess/recess/apps/tools/templates/Application.template.php b/recess/recess/apps/tools/templates/Application.template.php
index 099cffe..abd121d 100644
--- a/recess/recess/apps/tools/templates/Application.template.php
+++ b/recess/recess/apps/tools/templates/Application.template.php
@@ -15,7 +15,7 @@ public function __construct() {
 		$this->controllersPrefix = '{{camelProgrammaticName}}.controllers.';
 		
 		$this->routingPrefix = '{{routesPrefix}}';
-		
+				
 	}
 }
 ?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/templates/scaffolding/views/home/index.template.php b/recess/recess/apps/tools/templates/scaffolding/views/home/index.template.php
index abe9e58..420319b 100644
--- a/recess/recess/apps/tools/templates/scaffolding/views/home/index.template.php
+++ b/recess/recess/apps/tools/templates/scaffolding/views/home/index.template.php
@@ -1,6 +1,6 @@
 <?php
-Layout::extend('master');
-Layout::blockAssign('title', 'Home');
+Layout::extend('layouts/master');
+$title = 'Home';
 ?>
 <h1>Hello Kick-ass Developer!</h1>
 <h2 class="highlight"><?php echo $flash; ?></h2>
diff --git a/recess/recess/apps/tools/templates/scaffolding/views/master.template.php b/recess/recess/apps/tools/templates/scaffolding/views/master.layout.template.php
similarity index 57%
rename from recess/recess/apps/tools/templates/scaffolding/views/master.template.php
rename to recess/recess/apps/tools/templates/scaffolding/views/master.layout.template.php
index 259e5f2..7405269 100644
--- a/recess/recess/apps/tools/templates/scaffolding/views/master.template.php
+++ b/recess/recess/apps/tools/templates/scaffolding/views/master.layout.template.php
@@ -1,11 +1,17 @@
+<?php
+Layout::input($title, 'string');
+Layout::input($body, 'Block');
+Layout::input($navigation, 'Block', new HtmlBlock());
+Layout::input($style, 'Block', new HtmlBlock());
+?>
 <html>
 	<head>
-		<?php 
-		Layout::slot('style');
-			Part::render('parts/style');
-		Layout::slotEnd();		
+		<?php
+		if(!$style->draw()) {
+			Part::draw('parts/style');
+		}
 		?>
-		<title>{{appName}} - <?php Layout::slot('title'); Layout::slotEnd() ?></title> 
+		<title>{{appName}} - <?php echo $title; ?></title> 
 	</head>
 	<body>
 	<div class="container">
@@ -14,15 +20,9 @@
 		</div>
 		<div class="span-24 last">
 			<div class="navigation">
-			<?php
-			Layout::slot('navigation');
-			Layout::slotEnd();
-			?>
+			<?php echo $navigation; ?>
 			</div>
-			<?php 
-			Layout::slot('body');
-			Layout::slotEnd();
-			?>
+			<?php echo $body; ?>
 		</div>
 		<div class="span-24 footer">
 		  <p class="quiet bottom">
diff --git a/recess/recess/apps/tools/templates/scaffolding/views/resource/details.part.template.php b/recess/recess/apps/tools/templates/scaffolding/views/resource/details.part.template.php
index 723f3a6..7c86b92 100644
--- a/recess/recess/apps/tools/templates/scaffolding/views/resource/details.part.template.php
+++ b/recess/recess/apps/tools/templates/scaffolding/views/resource/details.part.template.php
@@ -1,5 +1,5 @@
 <?php
-assert(${{modelNameLower}} instanceof {{modelName}});
+Part::input(${{modelNameLower}}, '{{modelName}}');
 ?>
 <form method="POST" action="<?php echo Url::action('{{modelName}}Controller::delete', ${{modelNameLower}}->{{primaryKey}}) ?>">
 	<fieldset>
diff --git a/recess/recess/apps/tools/templates/scaffolding/views/resource/details.template.php b/recess/recess/apps/tools/templates/scaffolding/views/resource/details.template.php
index 16c15af..b6ef2ee 100644
--- a/recess/recess/apps/tools/templates/scaffolding/views/resource/details.template.php
+++ b/recess/recess/apps/tools/templates/scaffolding/views/resource/details.template.php
@@ -1,9 +1,9 @@
 <?php 
-Layout::extend('{{modelNameLower}}/layout');
-Layout::blockAssign('title', 'Details of {{modelName}} #' . ${{modelNameLower}}->{{primaryKey}} );
+Layout::extend('layouts/{{modelNameLower}}');
+$title = 'Details of {{modelName}} #' . ${{modelNameLower}}->{{primaryKey}} ;
 ?>
 
-<?php Part::render('{{modelNameLower}}/details', ${{modelNameLower}}) ?>
+<?php Part::draw('{{modelNameLower}}/details', ${{modelNameLower}}) ?>
 
 <?php echo Html::anchor(Url::action('{{modelName}}Controller::index'), 'Back to list of {{modelNameLower}}s') ?>
 <hr />
\ No newline at end of file
diff --git a/recess/recess/apps/tools/templates/scaffolding/views/resource/editForm.template.php b/recess/recess/apps/tools/templates/scaffolding/views/resource/editForm.template.php
index 483828e..ac219c2 100644
--- a/recess/recess/apps/tools/templates/scaffolding/views/resource/editForm.template.php
+++ b/recess/recess/apps/tools/templates/scaffolding/views/resource/editForm.template.php
@@ -1,13 +1,13 @@
 <?php 
-Layout::extend('{{modelNameLower}}/layout');
+Layout::extend('layouts/{{modelNameLower}}');
 if(isset(${{modelNameLower}}->{{primaryKey}})) {
 	$title = 'Edit {{modelName}} #' . ${{modelNameLower}}->{{primaryKey}};
 } else {
 	$title = 'Create New {{modelName}}';
 }
-Layout::blockAssign('title', $title);
+$title = $title;
 ?>
 
-<?php Part::render('{{modelNameLower}}/form', $_form, $title) ?>
+<?php Part::draw('{{modelNameLower}}/form', $_form, $title) ?>
 
 <?php echo Html::anchor(Url::action('{{modelName}}Controller::index'), '{{modelName}} List') ?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/templates/scaffolding/views/resource/form.part.template.php b/recess/recess/apps/tools/templates/scaffolding/views/resource/form.part.template.php
index 571a2c0..d0df3ae 100644
--- a/recess/recess/apps/tools/templates/scaffolding/views/resource/form.part.template.php
+++ b/recess/recess/apps/tools/templates/scaffolding/views/resource/form.part.template.php
@@ -1,6 +1,6 @@
 <?php
-assert($form instanceof ModelForm);
-assert(is_string($title));
+Part::input($form, 'ModelForm');
+Part::input($title, 'string');
 ?>
 <?php $form->begin(); ?>
 	<fieldset>
diff --git a/recess/recess/apps/tools/templates/scaffolding/views/resource/index.template.php b/recess/recess/apps/tools/templates/scaffolding/views/resource/index.template.php
index a2ddedb..3a4570b 100644
--- a/recess/recess/apps/tools/templates/scaffolding/views/resource/index.template.php
+++ b/recess/recess/apps/tools/templates/scaffolding/views/resource/index.template.php
@@ -1,6 +1,6 @@
 <?php 
-Layout::extend('{{modelNameLower}}/layout');
-Layout::blockAssign('title', 'Index');
+Layout::extend('layouts/{{modelNameLower}}');
+$title = 'Index';
 ?>
 
 <h3><?php echo Html::anchor(Url::action('{{modelName}}Controller::newForm'), 'Create New {{modelName}}') ?></h3>
@@ -12,6 +12,6 @@
 <?php endif; ?>
 
 <?php foreach(${{modelNameLower}}Set as ${{modelNameLower}}): ?>
-	<?php Part::render('{{modelNameLower}}/details', ${{modelNameLower}}) ?>
+	<?php Part::draw('{{modelNameLower}}/details', ${{modelNameLower}}) ?>
 	<hr />
 <?php endforeach; ?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/templates/scaffolding/views/resource/layout.template.php b/recess/recess/apps/tools/templates/scaffolding/views/resource/layout.template.php
deleted file mode 100644
index 46e228e..0000000
--- a/recess/recess/apps/tools/templates/scaffolding/views/resource/layout.template.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-Layout::extend('master');
-
-Layout::slotAppend('title', '{{modelName}} - ');
-
-Layout::block('navigation');
-	Part::render('parts/navigation');
-Layout::blockEnd();
-?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/templates/scaffolding/views/resource/resource.layout.template.php b/recess/recess/apps/tools/templates/scaffolding/views/resource/resource.layout.template.php
new file mode 100644
index 0000000..c86eb2a
--- /dev/null
+++ b/recess/recess/apps/tools/templates/scaffolding/views/resource/resource.layout.template.php
@@ -0,0 +1,9 @@
+<?php
+Layout::extend('layouts/master');
+Layout::input($title, 'string');
+Layout::input($body, 'Block');
+
+$title .= '{{modelName}} - ';
+
+$navigation = Part::block('parts/navigation');
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/apps/app.php b/recess/recess/apps/tools/views/apps/app.php
index 9bfa73e..4b8c9d5 100644
--- a/recess/recess/apps/tools/views/apps/app.php
+++ b/recess/recess/apps/tools/views/apps/app.php
@@ -1,42 +1,33 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', $app->name);
-
-Library::import('recess.apps.tools.controllers.RecessToolsCodeController');
-$codeController = new RecessToolsCodeController($response->request->meta->app);
+$title = $app->name;
 ?>
 <h1><?php echo $app->name; ?></h1>
 <p>Class: 
 	<a href="<?php 
-	echo $codeController
-			->urlTo(
-					'classInfo',
-					Library::getFullyQualifiedClassName(
-						get_class($app)
-					)
-				); ?>"><?php echo get_class($app); ?></a></p>
+	echo Url::action('RecessToolsCodeController::classInfo', Library::getFullyQualifiedClassName(get_class($app))) ?>"><?php echo get_class($app); ?></a></p>
 <div class="span-6">
 <h2 class="bottom">Models (<a href="<?php echo $controller->urlTo('createModel',get_class($app)); ?>">new</a>)</h2>
-<p>Location: <a href="<?php echo $codeController->urlTo('packageInfo', substr($app->modelsPrefix,0,-1)); ?>"><?php echo $app->modelsPrefix; ?></a></p>
+<p>Location: <?php echo Html::anchor(Url::action('RecessToolsCodeController::packageInfo',substr($app->modelsPrefix,0,-1)), $app->modelsPrefix ) ?> </p>
 <?php
-function printClassesInNamespace($namespace, $codeController) {
+function printClassesInNamespace($namespace) {
 	$classes = Library::findClassesIn($namespace);
 	if(!empty($classes)) {
 		echo '<ul>';
 		foreach($classes as $class) {
-			echo '<li><a href="' . $codeController->urlTo('classInfo',$namespace . $class) . '">' . $class . '</a></li>';
+			echo '<li>' . Html::anchor(Url::action('RecessToolsCodeController::classInfo', $namespace . $class), $class) . '</li>';
 		}
 		echo '</ul>';
 	}
 }
-printClassesInNamespace($app->modelsPrefix, $codeController);
+printClassesInNamespace($app->modelsPrefix);
 ?>
 </div>
 <div class="span-6">
 <h2 class="bottom">Controllers (<a href="<?php echo $controller->urlTo('createController', get_class($app)); ?>">new</a>)</h2>
-<p>Location: <a href="<?php echo $codeController->urlTo('packageInfo', substr($app->controllersPrefix,0,-1)); ?>"><?php echo $app->controllersPrefix; ?></a></p>
+<p>Location: <?php echo Html::anchor(Url::action('RecessToolsCodeController::packageInfo',substr($app->controllersPrefix,0,-1)), $app->controllersPrefix ) ?></p>
 <?php
-printClassesInNamespace($app->controllersPrefix, $codeController);
+printClassesInNamespace($app->controllersPrefix);
 ?>
 </div>
 
@@ -52,7 +43,7 @@ function printClassesInNamespace($namespace, $codeController) {
 $routes = new RtNode();
 $app->addRoutesToRouter($routes);
 // include_once($viewsDir . 'common/printRoutes.php');
-Part::render('routes/table', $routes, $codeController, '');
+Part::draw('routes/table', $routes, '');
 ?>
 
 <hr />
diff --git a/recess/recess/apps/tools/views/apps/createModel.php b/recess/recess/apps/tools/views/apps/createModel.php
index 705f1cc..b4f2e2f 100644
--- a/recess/recess/apps/tools/views/apps/createModel.php
+++ b/recess/recess/apps/tools/views/apps/createModel.php
@@ -1,10 +1,10 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', $app);
+$title = $app;
 
-Layout::block('scripts');
-include_once($viewsDir . 'apps/newModelJQuery.php');
-Layout::blockEnd();
+Buffer::to($scripts);
+include 'newModelJQuery.php';
+Buffer::end();
 ?>
 
 <h1>New <strong>Model</strong> Helper</h1>
diff --git a/recess/recess/apps/tools/views/apps/createModelComplete.php b/recess/recess/apps/tools/views/apps/createModelComplete.php
index 3244e5e..4dd717d 100644
--- a/recess/recess/apps/tools/views/apps/createModelComplete.php
+++ b/recess/recess/apps/tools/views/apps/createModelComplete.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', 'Model Created');
+$title = 'Model Created';
 ?>
 <h1>Creating <strong><?php echo $modelName; ?></strong> Model...</h1>
 
diff --git a/recess/recess/apps/tools/views/apps/genController.php b/recess/recess/apps/tools/views/apps/genController.php
index b9e65d1..8a7dc7a 100644
--- a/recess/recess/apps/tools/views/apps/genController.php
+++ b/recess/recess/apps/tools/views/apps/genController.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', 'Scaffolding Generation');
+$title = 'Scaffolding Generation';
 ?>
 
 <h1>Select the Model to Generate Scaffolding for:</h1>
diff --git a/recess/recess/apps/tools/views/apps/generateScaffolding.php b/recess/recess/apps/tools/views/apps/generateScaffolding.php
index c75210a..f375ee4 100644
--- a/recess/recess/apps/tools/views/apps/generateScaffolding.php
+++ b/recess/recess/apps/tools/views/apps/generateScaffolding.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', 'Scaffolding Generation');
+$title = 'Scaffolding Generation';
 ?>
 
 <h1>Generating Scaffolding for <?php echo $modelName; ?>...</h1>
diff --git a/recess/recess/apps/tools/views/apps/home.php b/recess/recess/apps/tools/views/apps/home.php
index 2515dae..0e61e50 100644
--- a/recess/recess/apps/tools/views/apps/home.php
+++ b/recess/recess/apps/tools/views/apps/home.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('Title', 'Home');
+$title = 'Home';
 ?>
 
 <h1>Applications</h1>
diff --git a/recess/recess/apps/tools/views/apps/newAppInstructions.php b/recess/recess/apps/tools/views/apps/newAppInstructions.php
index 26d929d..e9036b9 100644
--- a/recess/recess/apps/tools/views/apps/newAppInstructions.php
+++ b/recess/recess/apps/tools/views/apps/newAppInstructions.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', 'New App Instructions');
+$title = 'New App Instructions';
 ?>
 
 <h1>Your apps dir isn't writeable...</h1>
diff --git a/recess/recess/apps/tools/views/apps/newAppWizard.php b/recess/recess/apps/tools/views/apps/newAppWizard.php
index 97f73c4..90bdd24 100644
--- a/recess/recess/apps/tools/views/apps/newAppWizard.php
+++ b/recess/recess/apps/tools/views/apps/newAppWizard.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', 'New Application Instructions');
+$title = 'New Application Instructions';
 ?>
 
 
diff --git a/recess/recess/apps/tools/views/apps/newAppWizardComplete.php b/recess/recess/apps/tools/views/apps/newAppWizardComplete.php
index c573b55..606786c 100644
--- a/recess/recess/apps/tools/views/apps/newAppWizardComplete.php
+++ b/recess/recess/apps/tools/views/apps/newAppWizardComplete.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', 'New Application Instructions');
+$title = 'New Application Instructions';
 ?>
 
 <h1>Creating New Application...</h1>
diff --git a/recess/recess/apps/tools/views/apps/newAppWizardStep2.php b/recess/recess/apps/tools/views/apps/newAppWizardStep2.php
index bc01144..daf2edf 100644
--- a/recess/recess/apps/tools/views/apps/newAppWizardStep2.php
+++ b/recess/recess/apps/tools/views/apps/newAppWizardStep2.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', 'New Application');
+$title = 'New Application';
 ?>
 
 
diff --git a/recess/recess/apps/tools/views/apps/newModelComplete.php b/recess/recess/apps/tools/views/apps/newModelComplete.php
index 15cfd58..1465549 100644
--- a/recess/recess/apps/tools/views/apps/newModelComplete.php
+++ b/recess/recess/apps/tools/views/apps/newModelComplete.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', 'New Application');
+$title = 'New Application';
 ?>
 
 <h1>Creating <strong><?php echo $modelName; ?></strong> Model...</h1>
diff --git a/recess/recess/apps/tools/views/apps/uninstall.php b/recess/recess/apps/tools/views/apps/uninstall.php
index 9a7f465..97e785f 100644
--- a/recess/recess/apps/tools/views/apps/uninstall.php
+++ b/recess/recess/apps/tools/views/apps/uninstall.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/apps');
-Layout::blockAssign('title', 'Uninstall');
+$title = 'Uninstall';
 ?>
 
 <h1>To <span class="removed">Uninstall</span> <?php echo $app->name; ?>...</h1>
diff --git a/recess/recess/apps/tools/views/code/byClass.php b/recess/recess/apps/tools/views/code/byClass.php
index ec8dd4b..e159811 100644
--- a/recess/recess/apps/tools/views/code/byClass.php
+++ b/recess/recess/apps/tools/views/code/byClass.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/code');
-Layout::blockAssign('title', 'By Class');
+$title = 'By Class';
 ?>
 
 <h1>Browse Code by Class</h1>
diff --git a/recess/recess/apps/tools/views/code/byPackage.php b/recess/recess/apps/tools/views/code/byPackage.php
index 0b4ffa7..ced7ad4 100644
--- a/recess/recess/apps/tools/views/code/byPackage.php
+++ b/recess/recess/apps/tools/views/code/byPackage.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/code');
-Layout::blockAssign('title', 'By Package');
+$title = 'By Package';
 ?>
 
 <h1>Browse Code by Package</h1>
diff --git a/recess/recess/apps/tools/views/code/classInfo.php b/recess/recess/apps/tools/views/code/classInfo.php
index de16645..7d0b2a7 100644
--- a/recess/recess/apps/tools/views/code/classInfo.php
+++ b/recess/recess/apps/tools/views/code/classInfo.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/code');
-Layout::blockAssign('title', 'Class ' . $reflection->name);
+$title = 'Class ' . $reflection->name;
 ?>
 
 <?php
diff --git a/recess/recess/apps/tools/views/code/createTable.tpl b/recess/recess/apps/tools/views/code/createTable.tpl
deleted file mode 100644
index ad83803..0000000
--- a/recess/recess/apps/tools/views/code/createTable.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{$sql}
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/code/home.php b/recess/recess/apps/tools/views/code/home.php
index 86a8aee..bfad00d 100644
--- a/recess/recess/apps/tools/views/code/home.php
+++ b/recess/recess/apps/tools/views/code/home.php
@@ -1,37 +1,14 @@
 <?php
 Layout::extend('layouts/code');
-Layout::blockAssign('title', 'Code Browser');
+$title = 'Code Browser';
 ?>
 <h1>Code Browser</h1>
 <?php if(count($packages) == 0):?>
 	<h3><a href="<?php echo $controller->urlTo('index'); ?>">First time here? Index your code. (Note: this can take a few, please be patient!)</a></h3>
 <?php endif; ?>
 <h2>By Package</h2>
-<?php printTable($controller, $packages); ?>
+<?php Part::draw('code/table', $controller, $packages); ?>
 <h2>By Class</h2>
-<?php printTable($controller, $classes);?>
-<?php 
-function printTable($controller, $objects, $columns = 4) { 
-	$count = $objects->count();
-	$perColumn = ceil($count / $columns);
-	echo '<table>';
-	for($row = 0 ; $row < $perColumn ; $row++) {
-		echo '<tr>';
-		for($col = 0 ; $col < $columns ; $col++) {
-			$object = isset($objects[$perColumn*$col+$row]) ? $objects[$perColumn*$col+$row] : '';
-			$value = is_object($object) ? $object->name : '';
-			if($object instanceof RecessReflectorClass && $object->package() != null) {
-				$prefix = $object->package()->name . '.';
-			} else {
-				$prefix = '';
-			}
-			$linkTo = get_class($object) == 'RecessReflectorClass' ? 'class' : 'package';
-			echo '<td><a href="', $controller->urlTo($linkTo . 'Info', $prefix . $value),'">', $value, '</a></td>';
-		}
-		echo '</tr>';
-	}
-	echo '</table>';
-}
-?>
+<?php Part::draw('code/table', $controller, $classes);?>
 
 <a href="<?php echo $controller->urlTo('index'); ?>">Re-index your Code</a>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/code/packageInfo.php b/recess/recess/apps/tools/views/code/packageInfo.php
index 855f2cf..e14723a 100644
--- a/recess/recess/apps/tools/views/code/packageInfo.php
+++ b/recess/recess/apps/tools/views/code/packageInfo.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/code');
-Layout::blockAssign('title', $package->name);
+$title = $package->name;
 ?>
 <?php
 function linkedPackagePath($package, $linkPrefix = "") {
diff --git a/recess/recess/apps/tools/views/code/table.part.php b/recess/recess/apps/tools/views/code/table.part.php
new file mode 100644
index 0000000..0478fda
--- /dev/null
+++ b/recess/recess/apps/tools/views/code/table.part.php
@@ -0,0 +1,25 @@
+<?php
+Part::input($controller, 'Controller');
+Part::input($objects, 'ModelSet');
+Part::input($columns, 'int', 4);
+
+$count = $objects->count();
+$perColumn = ceil($count / $columns);
+echo '<table>';
+for($row = 0 ; $row < $perColumn ; $row++) {
+	echo '<tr>';
+	for($col = 0 ; $col < $columns ; $col++) {
+		$object = isset($objects[$perColumn*$col+$row]) ? $objects[$perColumn*$col+$row] : '';
+		$value = is_object($object) ? $object->name : '';
+		if($object instanceof RecessReflectorClass && $object->package() != null) {
+			$prefix = $object->package()->name . '.';
+		} else {
+			$prefix = '';
+		}
+		$linkTo = get_class($object) == 'RecessReflectorClass' ? 'class' : 'package';
+		echo '<td><a href="', $controller->urlTo($linkTo . 'Info', $prefix . $value),'">', $value, '</a></td>';
+	}
+	echo '</tr>';
+}
+echo '</table>';
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/database/dropTable.php b/recess/recess/apps/tools/views/database/dropTable.php
index a73761c..ed0fb18 100644
--- a/recess/recess/apps/tools/views/database/dropTable.php
+++ b/recess/recess/apps/tools/views/database/dropTable.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/database');
-Layout::blockAssign('title', 'Drop ' . $tableName);
+$title = 'Drop ' . $tableName;
 ?>
 <h1><span class="highlight">Drop "<?php echo $tableName; ?>" table</span>?</h1>
 <h2><a href="<?php echo $controller->urlTo('showTable', $sourceName, $tableName); ?>">No, Just Kidding, Take Me Back</a></h2>
diff --git a/recess/recess/apps/tools/views/database/emptyTable.php b/recess/recess/apps/tools/views/database/emptyTable.php
index 2d5a88f..d864f49 100644
--- a/recess/recess/apps/tools/views/database/emptyTable.php
+++ b/recess/recess/apps/tools/views/database/emptyTable.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/database');
-Layout::blockAssign('title', 'Empty ' . $tableName);
+$title = 'Empty ' . $tableName;
 ?>
 
 <h1><span class="highlight">Empty "<?php echo $tableName; ?>" table</span>?</h1>
diff --git a/recess/recess/apps/tools/views/database/home.php b/recess/recess/apps/tools/views/database/home.php
index 395d83f..dbe1fdf 100644
--- a/recess/recess/apps/tools/views/database/home.php
+++ b/recess/recess/apps/tools/views/database/home.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/database');
-Layout::blockAssign('title', 'Home');
+$title = 'Home';
 ?>
 <h1>Data Sources</h1>
 <hr />
diff --git a/recess/recess/apps/tools/views/database/newSource.php b/recess/recess/apps/tools/views/database/newSource.php
index 3e54c88..6b11cd5 100644
--- a/recess/recess/apps/tools/views/database/newSource.php
+++ b/recess/recess/apps/tools/views/database/newSource.php
@@ -1,6 +1,6 @@
 <?php
 Layout::extend('layouts/database');
-Layout::blockAssign('title', 'New Data Source');
+$title = 'New Data Source';
 ?>
 <h1>Adding a New Named Data Source</h1>
 <p>Recess allows for multiple named data sources. Currently only MySQL and Sqlite are supported.</p>
diff --git a/recess/recess/apps/tools/views/database/row.part.php b/recess/recess/apps/tools/views/database/row.part.php
new file mode 100644
index 0000000..cd5b2de
--- /dev/null
+++ b/recess/recess/apps/tools/views/database/row.part.php
@@ -0,0 +1,11 @@
+<?php 
+Part::input($class, 'string');
+Part::input($column, 'RecessColumnDescriptor');
+?>
+<tr<?php if($class != '') {echo " class=\"$class\"";}?>>
+	<td><?php echo $column->isPrimaryKey ? 'Yes' : ''; ?></td>
+	<td><?php echo $column->name; ?></td>
+	<td><?php echo $column->type; ?></td>
+	<td><?php echo $column->nullable ? 'Y' : 'N'; ?></td>
+	<td><?php echo $column->defaultValue == '' ? 'N/A' : $column->defaultValue; ?></td>
+</tr>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/database/showTable.php b/recess/recess/apps/tools/views/database/showTable.php
index 5460f66..4ff83a8 100644
--- a/recess/recess/apps/tools/views/database/showTable.php
+++ b/recess/recess/apps/tools/views/database/showTable.php
@@ -1,40 +1,28 @@
 <?php
 Layout::extend('layouts/database');
-Layout::blockAssign('title', $sourceName . ':' . $table);
+$title = $sourceName . ':' . $table;
 ?>
 <h1>Table: <strong><?php echo $table;?></strong></h1>
 <h2>Source: <?php echo $sourceName;?></h2>
 <h2>Columns:</h2>
-
 <table>
-<thead>
-	<tr>
-		<td>Primary</td>
-		<td>Column Name</td>
-		<td>Type</td>
-		<td>Nullable</td>
-		<td>Default Value</td>
-	</tr>
-</thead>
-<tbody>
-<?php 
-$i = 0;
-foreach($columns as $column): 
-$i++;
-if($i % 2 == 0) {
-	echo '<tr class="light">';
-} else {
-	echo '<tr>';
-}
-?>
-		<td><?php echo $column->isPrimaryKey ? 'Yes' : ''; ?></td>
-		<td><?php echo $column->name; ?></td>
-		<td><?php echo $column->type; ?></td>
-		<td><?php echo $column->nullable ? 'Y' : 'N'; ?></td>
-		<td><?php echo $column->defaultValue == '' ? 'N/A' : $column->defaultValue; ?></td>
-	</tr>
-<?php endforeach ?>
-</tbody>
+	<thead>
+		<tr>
+			<td>Primary</td>
+			<td>Column Name</td>
+			<td>Type</td>
+			<td>Nullable</td>
+			<td>Default Value</td>
+		</tr>
+	</thead>
+	<tbody>
+		<?php 
+		Part::draw( 'each-toggle', 
+					$columns, 
+					Part::block('database/row', ''),
+					Part::block('database/row', 'light')
+					); ?>
+	</tbody>
 </table>
 <hr />
 <h3><a href="<?php echo $controller->urlTo('emptyTable',$sourceName,$table); ?>">Empty Table</a> - <a href="<?php echo $controller->urlTo('dropTable', $sourceName, $table); ?>">Drop Table</a></h3>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/home/home.php b/recess/recess/apps/tools/views/home/home.php
index 6a8ad28..271d0f3 100644
--- a/recess/recess/apps/tools/views/home/home.php
+++ b/recess/recess/apps/tools/views/home/home.php
@@ -1,5 +1,5 @@
 <?php Layout::extend('layouts/home'); ?>
-<?php Layout::blockAssign('title', 'Welcome'); ?>
+<?php $title = 'Welcome' ?>
 
 <h1>Welcome to Recess</h1>
 <?php if(get_magic_quotes_gpc()): ?>
diff --git a/recess/recess/apps/tools/views/layouts/apps.layout.php b/recess/recess/apps/tools/views/layouts/apps.layout.php
new file mode 100644
index 0000000..0ccd4e6
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/apps.layout.php
@@ -0,0 +1,9 @@
+<?php 
+Layout::extend('layouts/master');
+Layout::input($title, 'string');
+Layout::input($body, 'Block');
+Layout::input($scripts, 'Block', new HtmlBlock());
+
+$title .= ' > Apps > ';
+$navigation = Part::block('layouts/navigation', 'Apps');
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/apps.php b/recess/recess/apps/tools/views/layouts/apps.php
deleted file mode 100644
index 961cd50..0000000
--- a/recess/recess/apps/tools/views/layouts/apps.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php 
-Layout::extend('layouts/master');
-
-Layout::slotAppend('title', ' > Apps > ');
-
-Layout::block('navigation');
-	Part::render('layouts/navigation', 'Apps');
-Layout::blockEnd() ;
-?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/code.layout.php b/recess/recess/apps/tools/views/layouts/code.layout.php
new file mode 100644
index 0000000..b3f5b4b
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/code.layout.php
@@ -0,0 +1,10 @@
+<?php 
+Layout::extend('layouts/master');
+Layout::input($title, 'string');
+Layout::input($body, 'Block');
+Layout::input($scripts, 'Block', new HtmlBlock());
+
+$title .= ' > Code > ';
+
+$navigation = Part::block('layouts/navigation', 'Code');
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/code.php b/recess/recess/apps/tools/views/layouts/code.php
deleted file mode 100644
index 0a4924e..0000000
--- a/recess/recess/apps/tools/views/layouts/code.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php 
-Layout::extend('layouts/master');
-
-Layout::slotAppend('title', ' > Code > ');
-
-Layout::block('navigation');
-	Part::render('layouts/navigation', 'Code');
-Layout::blockEnd() ;
-?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/database.layout.php b/recess/recess/apps/tools/views/layouts/database.layout.php
new file mode 100644
index 0000000..91aeade
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/database.layout.php
@@ -0,0 +1,11 @@
+<?php 
+Layout::extend('layouts/master');
+Layout::input($title, 'string');
+Layout::input($body, 'Block');
+Layout::input($scripts, 'Block', new HtmlBlock());
+
+
+$title .= ' > Database > ';
+
+$navigation = Part::block('layouts/navigation', 'Database');
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/database.php b/recess/recess/apps/tools/views/layouts/database.php
deleted file mode 100644
index 68c38c0..0000000
--- a/recess/recess/apps/tools/views/layouts/database.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php 
-Layout::extend('layouts/master');
-
-Layout::slotAppend('title', ' > Database > ');
-
-Layout::block('navigation');
-	Part::render('layouts/navigation', 'Database');
-Layout::blockEnd() ;
-?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/home.layout.php b/recess/recess/apps/tools/views/layouts/home.layout.php
new file mode 100644
index 0000000..2385171
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/home.layout.php
@@ -0,0 +1,8 @@
+<?php 
+Layout::extend('layouts/master');
+Layout::input($body, 'Block');
+Layout::input($title, 'string');
+
+$title .= ' > Home > ';
+$navigation = Part::block('layouts/navigation', '');
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/home.php b/recess/recess/apps/tools/views/layouts/home.php
deleted file mode 100644
index fc0fd8b..0000000
--- a/recess/recess/apps/tools/views/layouts/home.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php 
-Layout::extend('layouts/master');
-Layout::slotAppend('title', ' > Home > ');
-Layout::block('navigation');
-	Part::render('layouts/navigation', '');
-Layout::blockEnd() ;
-?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/master.php b/recess/recess/apps/tools/views/layouts/master.layout.php
similarity index 85%
rename from recess/recess/apps/tools/views/layouts/master.php
rename to recess/recess/apps/tools/views/layouts/master.layout.php
index 8e9c697..128a54f 100644
--- a/recess/recess/apps/tools/views/layouts/master.php
+++ b/recess/recess/apps/tools/views/layouts/master.layout.php
@@ -1,3 +1,9 @@
+<?php
+Layout::input($title, 'string');
+Layout::input($body, 'Block');
+Layout::input($navigation, 'Block');
+Layout::input($scripts, 'Block', new HtmlBlock());
+?>
 <html>
 	<head>
 		<!-- Blue Print -->
@@ -20,8 +26,8 @@
 				dp.SyntaxHighlighter.HighlightAll('code');
 			}
 		</script>
-		<?php Layout::slot('scripts') ?><?php Layout::slotEnd() ?>
-		<title>Recess Tools!<?php Layout::slot('title') ?><?php Layout::slotEnd() ?></title>
+		<?php echo $scripts ?>
+		<title>Recess Tools!<?php echo $title; ?></title>
 	</head>
 	<body>
 	<div class="container">
@@ -32,10 +38,8 @@
 				<p class="qotm quiet">"Give us the tools, and we'll finish the job." ~Churchill</p>
 			</div>
 			<div class="span-19">
-				<?php Layout::slot('navigation') ?>
-				<?php Layout::slotEnd() ?>
-				<?php Layout::slot('body') ?>
-				<?php Layout::slotEnd() ?>
+				<?php echo $navigation; ?>
+				<?php echo $body; ?>
 			</div>
 			<div class="span-5 last infobar">
 			  <h3><span>Recess Resources</span></h3>
diff --git a/recess/recess/apps/tools/views/layouts/navigation-item.part.php b/recess/recess/apps/tools/views/layouts/navigation-item.part.php
new file mode 100644
index 0000000..7afe1af
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/navigation-item.part.php
@@ -0,0 +1,13 @@
+<?php
+Part::input($action, 'string');
+Part::input($display, 'string');
+Part::input($selectedUrl, 'string');
+
+if($selectedUrl == $display)  {
+	$liClass = ' class="highlight"';
+} else {
+	$liClass = '';
+}
+
+echo '<li' . $liClass . '>' . Html::anchor(Url::action($action),$display) . '</li>';
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/navigation.part.php b/recess/recess/apps/tools/views/layouts/navigation.part.php
index 248a0a0..9b2ec73 100644
--- a/recess/recess/apps/tools/views/layouts/navigation.part.php
+++ b/recess/recess/apps/tools/views/layouts/navigation.part.php
@@ -1,20 +1,26 @@
 <?php
 /*== Part Inputs ==*/
 // selected: The name of the selected navigation item
-assert(is_string($selected));
+Part::input($selected, 'string');
 /*=================*/
-
-function printNavItem($action, $display, $selectedUrl) {
-	if($selectedUrl == $display) $liClass = ' class="highlight"';
-	else $liClass = '';
-	echo '<li' . $liClass . '>' . Html::anchor(Url::action($action),$display) . '</li>';
-}
 ?>
 <div class="span-19 navigation last">
 	<ul>
-	<?php printNavItem('RecessToolsAppsController::home', 'Apps', $selected) ?>
-	<?php printNavItem('RecessToolsDatabaseController::home', 'Database', $selected) ?>
-	<?php printNavItem('RecessToolsCodeController::home', 'Code', $selected) ?>
-	<?php printNavItem('RecessToolsRoutesController::home', 'Routes', $selected) ?>
+	<?php Part::draw('layouts/navigation-item',
+						'RecessToolsAppsController::home',
+						'Apps',
+						$selected) ?>
+	<?php Part::draw('layouts/navigation-item',
+						'RecessToolsDatabaseController::home',
+						'Database',
+						$selected) ?>
+	<?php Part::draw('layouts/navigation-item',
+						'RecessToolsCodeController::home',
+						'Code',
+						$selected) ?>
+	<?php Part::draw('layouts/navigation-item',
+						'RecessToolsRoutesController::home',
+						'Routes',
+						$selected) ?>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/routes.layout.php b/recess/recess/apps/tools/views/layouts/routes.layout.php
new file mode 100644
index 0000000..7745677
--- /dev/null
+++ b/recess/recess/apps/tools/views/layouts/routes.layout.php
@@ -0,0 +1,10 @@
+<?php 
+Layout::extend('layouts/master');
+Layout::input($title, 'string');
+Layout::input($body, 'Block');
+Layout::input($scripts, 'Block', new HtmlBlock());
+
+$title .= ' > Routes > ';
+
+$navigation = Part::block('layouts/navigation', 'Routes');
+?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/layouts/routes.php b/recess/recess/apps/tools/views/layouts/routes.php
deleted file mode 100644
index 45b4849..0000000
--- a/recess/recess/apps/tools/views/layouts/routes.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php 
-Layout::extend('layouts/master');
-
-Layout::slotAppend('title', ' > Routes > ');
-
-Layout::block('navigation');
-	Part::render('layouts/navigation', 'Routes');
-Layout::blockEnd() ;
-?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/routes/home.php b/recess/recess/apps/tools/views/routes/home.php
index 406b325..a954eee 100644
--- a/recess/recess/apps/tools/views/routes/home.php
+++ b/recess/recess/apps/tools/views/routes/home.php
@@ -1,15 +1,9 @@
 <?php
 Layout::extend('layouts/routes');
-Layout::blockAssign('title', 'Home');
+$title = 'Home';
 ?>
 <h2 class="bottom">Routes</h2>
 <?php
-//include_once($viewsDir . 'common/printRoutes.php');
 $routes = RecessConf::getRoutes();
-
-Library::import('recess.apps.tools.controllers.RecessToolsCodeController');
-$codeController = new RecessToolsCodeController($response->request->meta->app);
-
-// printRoutes($routes, $codeController, '/recess');
-Part::render('routes/table', $routes, $codeController, '/recess');
+Part::draw('routes/table', $routes, '/recess');
 ?>
\ No newline at end of file
diff --git a/recess/recess/apps/tools/views/routes/rows.part.php b/recess/recess/apps/tools/views/routes/rows.part.php
index b877eb1..1bf85e0 100644
--- a/recess/recess/apps/tools/views/routes/rows.part.php
+++ b/recess/recess/apps/tools/views/routes/rows.part.php
@@ -1,8 +1,7 @@
 <?php
-assert($routingNode instanceof RtNode);
-assert($codeController instanceof Controller);
-assert(is_string($fullPath));
-assert(is_string($omit));
+Part::input($routingNode, 'RtNode');
+Part::input($fullPath, 'string');
+Part::input($omit, 'string');
 
 if($omit != '' && strpos($fullPath, $omit) === 0) {
 	return;
@@ -30,10 +29,10 @@
 	ksort($staticPaths);
 	ksort($parametricPaths);
 	foreach($staticPaths as $path => $node) {
-		Part::render('routes/rows', $node, $codeController, $fullPath . '/' . $path, $omit);
+		Part::draw('routes/rows', $node, $fullPath . '/' . $path, $omit);
 	}
 	foreach($parametricPaths as $path => $node) {
-		Part::render('routes/rows', $node, $codeController, $fullPath . '/$' . $path, $omit);
+		Part::draw('routes/rows', $node, $fullPath . '/$' . $path, $omit);
 	}
 }
 ?>
diff --git a/recess/recess/apps/tools/views/routes/table.part.php b/recess/recess/apps/tools/views/routes/table.part.php
index 980d8a8..9cfe2f9 100644
--- a/recess/recess/apps/tools/views/routes/table.part.php
+++ b/recess/recess/apps/tools/views/routes/table.part.php
@@ -1,7 +1,6 @@
 <?php
-assert($routes instanceof RtNode);
-assert($codeController instanceof Controller);
-assert(is_string($omit));
+Part::input($routes, 'RtNode');
+Part::input($omit, 'string');
 
 $fullPath = $_ENV['url.base'];
 if(strrpos($fullPath, '/') == strlen($fullPath) - 1) $fullPath = substr($fullPath,0,-1);
@@ -10,6 +9,6 @@
 <table>
 <thead><td>HTTP</td><td>Route</td><td>Controller</td><td>Method</td></thead>
 <tbody>
-	<?php Part::render('routes/rows', $routes, $codeController, $fullPath, $omit) ?>
+	<?php Part::draw('routes/rows', $routes, $fullPath, $omit) ?>
 </tbody>
 </table>
\ No newline at end of file
diff --git a/recess/recess/framework/AbstractView.class.php b/recess/recess/framework/AbstractView.class.php
index 9cb8166..bdd0745 100644
--- a/recess/recess/framework/AbstractView.class.php
+++ b/recess/recess/framework/AbstractView.class.php
@@ -14,7 +14,7 @@
 abstract class AbstractView extends Object {
 	protected $response;
 	
-	public abstract function canRespondsWith(Response $response);
+	public abstract function canRespondWith(Response $response);
 	
 	/**
 	 * The entry point from the Recess with a Response to be rendered.
diff --git a/recess/recess/framework/DefaultPolicy.class.php b/recess/recess/framework/DefaultPolicy.class.php
index 1beab96..1294427 100644
--- a/recess/recess/framework/DefaultPolicy.class.php
+++ b/recess/recess/framework/DefaultPolicy.class.php
@@ -58,6 +58,10 @@ public function getViewFor(Response &$response) {
 			$response->meta->respondWith[] = 'JsonView';
 		}
 		
+		if($response instanceof ForwardingResponse) {
+			return new NativeView();
+		}
+		
 		// Here we select a view that can respond in the desired format
 		$viewClasses = $response->meta->respondWith;
 		$views = array();
@@ -70,13 +74,13 @@ public function getViewFor(Response &$response) {
 		do {
 			$format = $accepts->nextFormat();
 			foreach($views as $view) {
-				if($view->canRespondsWith($response)) {
+				if($view->canRespondWith($response)) {
 					return $view;
 				}
 			}
 		} while ($format !== false);
-		
-		throw new RecessResponseException('Unable to provide with desired content-type.', ResponseCodes::HTTP_NOT_ACCEPTABLE, array());
+		exit;
+		throw new RecessResponseException('Unable to provide with desired content-type.', ResponseCodes::HTTP_NOT_ACCEPTABLE, get_defined_vars());
 	}
 	
 	/////////////////////////////////////////////////////////////////////////
diff --git a/recess/recess/framework/controllers/Controller.class.php b/recess/recess/framework/controllers/Controller.class.php
index 2d7caf3..0b48dd5 100644
--- a/recess/recess/framework/controllers/Controller.class.php
+++ b/recess/recess/framework/controllers/Controller.class.php
@@ -40,7 +40,7 @@ protected static function initClassDescriptor($class) {
 		$descriptor->routes = array();
 		$descriptor->methodUrls = array();
 		$descriptor->routesPrefix = '';
-		$descriptor->viewClass = 'recess.framework.views.LayoutsView';
+		$descriptor->viewClass = 'LayoutsView';
 		$descriptor->viewsPrefix = '';
 		$descriptor->respondWith = array();
 		return $descriptor;
@@ -186,17 +186,22 @@ function wrappedServe(Request $request) {
 		}
 		
 		$descriptor = self::getClassDescriptor($this);
-		if(!isset($response->meta->viewName)) $response->meta->viewName = $methodName;
+		if(!$response instanceof ForwardingResponse && 
+		   !isset($response->meta->viewName)) $response->meta->viewName = $methodName;
 		// TODO: Remove this deprecated viewClass at 0.3
 		$response->meta->viewClass = $descriptor->viewClass;
 		$response->meta->viewsPrefix = $descriptor->viewsPrefix;
 		
 		$response->meta->respondWith = $descriptor->respondWith;
 		if(empty($response->data)) $response->data = get_object_vars($this);
-		$response->data['controller'] = $this;
+
 		if(is_array($this->headers)) { foreach($this->headers as $header) $response->addHeader($header); }
-		unset($response->data['request']);
-		unset($response->data['headers']);
+		
+		if(is_array($response->data)) {
+			$response->data['controller'] = $this;
+			unset($response->data['request']);
+			unset($response->data['headers']);
+		}
 		return $response;
 	}
 
diff --git a/recess/recess/framework/helpers/AssertiveTemplate.class.php b/recess/recess/framework/helpers/AssertiveTemplate.class.php
new file mode 100644
index 0000000..57b5a06
--- /dev/null
+++ b/recess/recess/framework/helpers/AssertiveTemplate.class.php
@@ -0,0 +1,207 @@
+<?php
+Library::import('recess.cache.Cache');
+Library::import('recess.lang.PathFinder');
+Library::import('recess.framework.helpers.exceptions.MissingRequiredInputException');
+Library::import('recess.framework.helpers.exceptions.InputTypeCheckException');
+
+/**
+ * AssertiveTemplate is a helper class that provides support for
+ * 'Assertive Templates' or templates that assert their inputs. Typically
+ * you will use a subclass of AssertiveTemplate, rather than the base
+ * class itself.
+ * 
+ * @author Kris Jordan
+ */
+abstract class AssertiveTemplate {
+	protected static $app;
+	
+	/**
+	 * Used to locate AssertiveTemplates 
+	 * @var Paths
+	 */
+	private static $paths;
+	
+	/**
+	 * Initialize the AssertiveTemplate helper class by registering
+	 * the application's views directory as a path.
+	 * 
+	 * @param AbstractView
+	 */
+	public static function init(AbstractView $view) {
+		$response = $view->getResponse();
+		if(self::$app == null) {
+			self::$app = $response->meta->app;
+			self::addPath(self::$app->getViewsDir());
+		}
+	}
+	
+	/**
+	 * Add a directory to be checked for the existance of AssertiveTemplates.
+	 * Paths are checked in the reverse order of their being added so
+	 * that the most specific paths are checked first.
+	 * @param string $path
+	 */
+	public static function addPath($path) {
+		if(!self::$paths instanceof PathFinder) {
+			// To-do: Cache Paths
+			self::$paths = new PathFinder();
+		}
+		self::$paths->addPath($path);
+	}
+	
+	protected static $loaded = array();
+	
+	/**
+	 * Include a PHP file with a context and return the context that results
+	 * after the template has been executed.
+	 * 
+	 * @param string The PHP file to include relative to registered paths.
+	 * @param array An associative array whose keys will become variables in the template.
+	 * @return array The context after execution of the template as a key/value array.
+	 */
+	public static function includeTemplate($__assertive_template__, $context) {
+		$__assertive_template__ = self::$paths->find($__assertive_template__);
+		if($__assertive_template__ === false) {
+			throw new Exception('Could not locate AssertiveTemplate: ' . $templateFile);
+		}
+		// Unset 'context' if it isn't a key in $context
+		if(isset($context['context'])) {
+			extract($context);
+		} else {
+			extract($context);
+			unset($context);
+		}
+		include $__assertive_template__;
+		return get_defined_vars();
+	}
+	
+	static $types = array('string','int','bool','float','array');
+	
+	/**
+	 * input is used by the assertive templates themselves to assert the
+	 * variable name and type of an expected input, as well as a default
+	 * value for optional inputs. If the input is required and is missing
+	 * this will throw a MissingRequiredInputException. If the input type
+	 * does not match the expected type this will throw an 
+	 * InputTypeCheckException.
+	 * 
+	 * @param varies based on the type string passed at argument 2.
+	 * @param string The type $input is expected to be.
+	 * @param varies Default value for optional arguments.
+	 * 
+	 * @return Returns the $input, if $input was null and optional returns $default.
+	 */
+	public static function input(&$input, $type, $default = null) {
+		if($input === null && $default !== null) {
+			$input = $default;
+		} else {
+			if($input === null) {
+				throw new MissingRequiredInputException('Missing required input.', 1);
+			}
+		}
+		
+		if(!self::typeCheck($input, $type)) {
+			$passed = gettype($input);
+			if($passed === 'object') {
+				$passed = get_class($value);
+			}
+			throw new InputTypeCheckException("Input type mismatch, expected: '$type', actual:'$passed'.", 1);			
+		}
+		
+		return $input;
+	}
+	
+	/**
+	 * Determines whether a provided value is of the requested type. Not
+	 * quite the same as PHP's internal type checking to allow for type
+	 * 'array' to be satisfied by implementations of ArrayAccess. The type
+	 * argument is a string that can be either a PHP type like 'string',
+	 * 'int', 'float', or a class name.
+	 * 
+	 * @param variable The value whose type is being checked.
+	 * @param string The expected type.
+	 * @return boolean True if $value is a $type. False if not.
+	 */
+	public static function typeCheck($value, $type) {
+		if(in_array($type, self::$types)) {
+			if($type === 'array') {
+				if(!(is_array($value) || $value instanceof ArrayAccess)) {
+					return false;
+				} else {
+					return true;
+				}
+			} else {
+				$fn = 'is_' . $type;
+				if(!$fn($value)) {
+					return false;
+				} else {
+					return true;
+				}
+			}
+		} else {
+			if(!$value instanceof $type) {
+				return false;
+			} else {
+				return true;
+			}
+		}
+	}
+	
+	/**
+	 * Returns a multi-dimensional array that describes the inputs
+	 * of an assertive template. Data available: 
+	 *   array[$inputName]['required'] = boolean
+	 *   array[$inputName]['type'] = string type representation
+	 *   
+	 * @param string Part name relative to AssertiveTemplate's paths.
+	 * @param string The class name to look for, i.e. for Part::input 'Part', Layout::input 'Layout'
+	 * @returns array Representation of required inputs.
+	 */
+	public static function getInputs($template, $class = 'AssertiveTemplate') {
+		if(!isset(self::$loaded[$template])) {
+			$cacheKey = 'AssertiveTemplate::inputs::' . $template;
+			if(($inputs = Cache::get($cacheKey)) !== false) {
+				self::$loaded[$template] = $inputs;
+			} else {
+				$templateFile = self::$paths->find($template);
+				if($templateFile === false) {
+					throw new RecessFrameworkException("The file \"$template\" does not exist.", 1);
+				}
+				$file = file_get_contents($templateFile);
+				$pattern = self::getInputRegex($class);
+				preg_match_all($pattern, $file, $matches);
+		
+				$inputs = array();
+				foreach($matches[0] as $key => $value) {
+					$input = array();
+					$name = $matches[1][$key];
+					$input['type'] = $matches[2][$key];
+					$input['required'] = !isset($matches[3][$key]) || $matches[3][$key] === '';
+					$inputs[$name] = $input;
+				}
+
+				self::$loaded[$template] = $inputs;
+				Cache::set($cacheKey, $inputs);
+			}
+		}
+		return self::$loaded[$template];
+	}
+	
+	/**
+	 * Returns the regex to extract all inputs from a file.
+	 * @param string The class name to search for.
+	 * @return string The regex.
+	 */
+	private static function getInputRegex($class) {
+		$ws = '(?:\W*)';
+		$openParen = '\(';
+		$closeParen = '\)';
+		$identifier = '[a-zA-Z_][a-zA-Z_0-9]*';
+		$quote = '["\']';
+		$classInput = "$class$ws::$ws" . "input$ws";
+		$dollar = '\$';
+		$pattern = "/$classInput$openParen$ws$dollar($identifier)$ws,$ws$quote($identifier)$quote$ws(?:,$ws(.*)|$ws)?$closeParen$ws;/";
+		return $pattern;	
+	}
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/Buffer.class.php b/recess/recess/framework/helpers/Buffer.class.php
new file mode 100644
index 0000000..a183258
--- /dev/null
+++ b/recess/recess/framework/helpers/Buffer.class.php
@@ -0,0 +1,133 @@
+<?php
+Library::import('recess.framework.helpers.blocks.HtmlBlock');
+Library::import('recess.framework.helpers.blocks.ListBlock');
+Library::import('recess.framework.AbstractHelper');
+
+/**
+ * Buffer is a helper class that acts as a factory for
+ * HtmlBlocks. Buffer and blocks are often used in conjunction
+ * with layouts as an easy mechanism for transferring chunks of
+ * HTML from a child template to a parent Layout.
+ * 
+ * Buffer can be used to fill unempty HtmlBlocks,
+ * overwrite HtmlBlocks, or append/prepend to them. Here are some
+ * example usages:
+ * 
+ * Buffer::to($block);
+ * echo 'hello world';
+ * Buffer::end();
+ * // $block is now an HtmlBlock with contents 'hello world'
+ * 
+ * Buffer::append($block);
+ * echo '!<br />';
+ * Buffer::end();
+ * // $block is now an HtmlBlock with contents 'hello world!<br />'
+ * 
+ * Buffer::to($block);
+ * print_r($block);
+ * Block::end();
+ * // $block is still 'hello world!<br />'
+ * 
+ * Buffer::to($block, Buffer::OVERWRITE);
+ * echo 'overwritten';
+ * Buffer::end();
+ * // $block is now 'overwritten'
+ * 
+ * echo $block;
+ * // overwritten
+ * 
+ * @author Kris Jordan
+ */
+abstract class Buffer extends AbstractHelper {
+	
+	const NORMAL = 0;
+	const OVERWRITE = 1;
+	const APPEND = 2;
+	const PREPEND = 3;
+	
+	/** STATIC MEMBERS **/
+	
+	private static $bufferBlocks = array();
+	private static $bufferModes = array();
+	
+	/**
+	 * Begin output buffering to the block passed by reference. If the
+	 * reference is set to Null a new HtmlBlock will be assigned to the 
+	 * reference.
+	 * 
+	 * @param HtmlBlock or Null - The block the buffer will fill.
+	 * @param int Optional - mode used to fill block.
+	 */
+	public static function to(&$block, $mode = self::NORMAL) {
+		self::modalStart($block, $mode);
+	}
+	
+	/**
+	 * Buffer will append to the provided HtmlBlock. If null this will
+	 * create a new block, not fail.
+	 * 
+	 * @param HtmlBlock The block to append to.
+	 */
+	public static function appendTo(&$block) {
+		self::modalStart($block, self::APPEND);
+	}
+	
+	/**
+	 * Buffer will append to the provided HtmlBlock. If null this will
+	 * create a new block, not fail.
+	 * 
+	 * @param HtmlBlock The block to append to.
+	 */
+	public static function prependTo(&$block) {
+		self::modalStart($block, self::PREPEND);
+	}
+
+	/**
+	 * Internal helper method for starting a new buffer.
+	 * 
+	 * @param HtmlBlock The block to append to.
+	 */
+	private static function modalStart(&$block, $mode) {
+		if($block === null) {
+			$block = new HtmlBlock();
+		}
+		array_push(self::$bufferBlocks, $block);
+		array_push(self::$bufferModes, $mode);
+		ob_start();
+	}
+	
+	/**
+	 * End the output buffer, clear contents, and assign contents
+	 * to the block passed by reference to start the buffer. Also
+	 * returns the block.
+	 * 
+	 * @return The final block.
+	 */
+	public static function end() {
+		if(empty(self::$bufferBlocks)) {
+			throw new RecessFrameworkException('Buffer ended without corresponding Buffer::to($block).', 2);
+		}		
+		$buffer = ob_get_clean();
+		$mode = array_pop(self::$bufferModes);
+		$block = array_pop(self::$bufferBlocks);
+		switch($mode) {
+			case self::NORMAL: 
+				if((string)$block === '') {
+					$block->set($buffer);
+				}
+				break;
+			case self::OVERWRITE:
+				$block->set($buffer);
+				break;
+			case self::APPEND:
+				$block->append($buffer);
+				break;
+			case self::PREPEND:
+				$block->prepend($buffer);
+				break;
+		}
+		return $block;
+	}
+	
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/Layout.class.php b/recess/recess/framework/helpers/Layout.class.php
index 4322306..877e60c 100644
--- a/recess/recess/framework/helpers/Layout.class.php
+++ b/recess/recess/framework/helpers/Layout.class.php
@@ -1,231 +1,71 @@
 <?php
-Library::import('recess.framework.AbstractHelper');
+Library::import('recess.framework.helpers.AssertiveTemplate');
+Library::import('recess.framework.helpers.Buffer');
 
 /**
- * The Layout helper enables template inheritance with a system of slots
- * filled by blocks. Parent templates define slots that can be filled by 
- * child templates with blocks. Slots and blocks are named with strings.
- * Content in a child template that appears outside of any blocks will
- * implicitly create a 'body' block.
+ * Layout is a style of AssertiveTemplate that allows child templates
+ * to 'extend' parent Layouts. Context is transferred from child to parent
+ * by matching variables that exist in the child and are registered
+ * as an input to the parent. Thus layouts must specify any required and
+ * optional inputs they expect to be passed.
  * 
- * <code>
- * <?php
- * // master.php
- * Layout::slot('foo');
- * echo 'This is the slot\'s default content.';
- * Layout::slotEnd();
+ * Parent layouts require a '.layout.php' extension.
  * 
- * Layout::slot('body');
- * echo 'This is the default body content.';
- * Layout::slotEnd();
- * ?>
- * 
- * <?php
- * // child.php
- * Layout::extend('master');
- * Layout::block('foo');
- * echo 'This overrides the parent\'s foo slot content.';
- * Layout::blockEnd();
- * 
- * echo 'By default this fills the body slot.';
- * ?>
- * </code>
- * @author Kris Jordan
- * @author Joshua Paine
+ * @author Kris
  */
-class Layout extends AbstractHelper {
-	
-	const DEFAULT_BLOCK = 'body';
-	
-	protected static $extendStack = array();
-	
-	protected static $blockStack = array();
-	protected static $blockMap = array();
-	
-	protected static $slotStack = array();
-	
-	protected static $app;
+class Layout extends AssertiveTemplate {
+	private static $parentStack = array();
+	private static $debugTraces = array();
 	
 	/**
-	 * Initialize the Layout helper with a View.
+	 * Outputs a child template. Pass the template name (with extension) and
+	 * an associative array context of variables to be passed to the child.
 	 * 
-	 * @param	AbstractView The view this helper is helping.
+	 * @param string The filename of the template, with extension, relative to AssertiveTemplate paths.
+	 * @param array The associative array of context the child template expects.
+	 * @return boolean Returns true on success.
 	 */
-	public static function init(AbstractView $view) {
-		$response = $view->getResponse();
-		self::$app = $response->meta->app;
-	}
-	
-	/**
-	 * Extend a parent layout. Referenced from the views/ directory in
-	 * the current application.
-	 * 
-	 * @param	string	The layout to extend.
-	 */
-	public static function extend($layout) {
-		if(!empty(self::$extendStack)) {
-			throw new RecessFrameworkException('Nesting extends is not allowed.', 1);
-		}
-		
-		$layout = self::$app->getViewsDir() . $layout;
-		if(strrpos($layout, '.') < strrpos($layout, '/')) {
-			$layout .= '.php';
-		}
-
-		if(!file_exists($layout)) {
-			throw new RecessFrameworkException('Extended layout ('.$layout.') does not exist.', 1);
-		}
-
-		array_push(self::$extendStack, $layout);
-		ob_start();
-	}
-	
-	/**
-	 * Open a block that will fill a slot on a parent template. Any content sent 
-	 * to the output buffer between block/blockEnd will be used to fill the slot.
-	 * 
-	 * @param	string	The name of the slot this block fills.
-	 */
-	public static function block($title) {
-		if(empty(self::$extendStack)) {
-			throw new RecessFrameworkException('Blocks are only valid when extending a layout using Layout::extend()', 1);
-		}
-		
-		if(!empty(self::$blockStack)) {
-			throw new RecessFrameworkException('Nesting blocks is not allowed. You must end a block with Layout::blockEnd() before starting a new block.', 1);
-		}
-		
-		array_push(self::$blockStack, $title);
-		ob_start();
-	}
-	
-	/**
-	 * Mark the end of a slot. Must be called after an opening block().
-	 */
-	public static function blockEnd() {
-		if(empty(self::$blockStack)) {
-			throw new RecessFrameworkException('Block end encountered without a preceding Layout::block() to open the block.', 1);
-		}
-		
-		$blockName = array_pop(self::$blockStack);
-		if(!isset(self::$blockMap[$blockName])) {
-			self::$blockMap[$blockName] = ob_get_clean();
-		} else {
-			ob_end_clean();
+	public static function draw($template, $context) {
+		Buffer::to($body);
+		$context = self::includeTemplate($template, $context);
+		Buffer::end();
+		if(!isset($context['body'])) {
+			$context['body'] = $body;
 		}
-	}
-	
-	/**
- 	 * Helper method for blocks whose content is a single string. Prints 
- 	 * string between a block/blockEnd pair to avoid verbosity in a child
- 	 * layout.
- 	 * 
- 	 * @param string The name of the slot this block fills.
- 	 * @param string The value of the block.
-	 */
-	public static function blockAssign($title, $value) {
-		self::block($title);
-		echo $value;
-		self::blockEnd();
-	}
-
-	/**
-	 * Marks the beging of a slot in a parent template to be optionally
-	 * filled by a child. Any content output between this slot open and
-	 * slotEnd will be used as the default content of a slot should the
-	 * extending template not fill it with a block.
-	 * 
-	 * @param string The name of the slot.
-	 */
-	public static function slot($title) {
-		if(!empty(self::$slotStack)) {
-			throw new RecessFrameworkException('Nesting slots is not allowed. You must end a slot with Layout::slotEnd() before starting a new slot.', 1);
-		}
-		
-		array_push(self::$slotStack, $title);
-		ob_start();
-	}
-	
-	/**
-	 * Marks the end of a slot. In effect this outputs the content of a slot.
-	 */
-	public static function slotEnd() {
-		if(empty(self::$slotStack)) {
-			throw new RecessFrameworkException('Slot end encountered without a preceding Layout::slot() to open the slot.', 1);
-		}
-		
-		$slotName = array_pop(self::$slotStack);
-		if(isset(self::$blockMap[$slotName])) {
-			ob_end_clean();
-			echo self::$blockMap[$slotName];
-			unset(self::$blockMap[$slotName]);
-		} else {
-			ob_end_flush();
+		while($parent = array_pop(self::$parentStack)) {
+			try{
+				$parentInputs = self::getInputs($parent, 'Layout');
+			}catch(RecessFrameworkException $e) {
+//				if(RecessConf::$mode == RecessConf::DEVELOPMENT) {
+					$trace = array_pop(self::$debugTraces);
+					throw new RecessErrorException('Extended layout does not exist.', 0, 0, $trace[0]['file'], $trace[0]['line'], $trace[0]['args']);
+//				} else {
+//					throw $e;
+//				}
+			}
+			$context = array_intersect_key($context, $parentInputs);
+			$context = self::includeTemplate($parent, $context);
 		}
+//		if(RecessConf::$mode == RecessConf::DEVELOPMENT) {
+			array_pop(self::$debugTraces);
+//		}
+		return true;
 	}
 	
 	/**
-	 * Helper method for a common scenario of a 'middle'
-	 * template filling some additional information in a slot
-	 * and re-opening the slot for a child to append to. Example:
-	 * 
-	 * <code>
-	 * // master.php
-	 * 	<html>
-	 * 	  <head>
-	 * 		<title>Master<?php Layout::slot('Title') ?><?php Layout::slotEnd(); ?></title>
-	 * 	  </head>
-	 * </html>
-	 * </code>
-	 * 
-	 * <code>
-	 * <?php 
-	 * // section.php
-	 * Layout::extend('master');
-	 * Layout::slotAppend('title', ' > Section');
-	 * ?>
-	 * </code>
+	 * Used by child templates so indicate they 'extend' a parent layout which
+	 * is to be included and assume all requested context from a child. Parent
+	 * layouts are required to use a '.layout.php' extension.
 	 * 
-	 * <code>
-	 * <?php
-	 * // page.php
-	 * Layout::extend('section');
-	 * Layout::slotAppend('title', ' > Page');
-	 * ?>
-	 * </code>
-	 * 
-	 * Result is: <title>Master > Section > Page</title>
-	 * 
-	 * @param string The slot to append to.
-	 * @param string The value to append to the slot.
-	 */
-	public static function slotAppend($title, $value) {
-		self::block($title);
-		echo $value;
-		self::slot($title);
-		self::slotEnd();
-		self::blockEnd();
-	}
-	
-	/**
-	 * End a template extension and process the parent. 
-	 * Called automatically by LayoutsView but can be called manually.
+	 * @param string The name of the layout being extended without the '.layout.php' extension.
 	 */
-	public static function extendEnd() {
-		if(!empty(self::$extendStack)) {
-			if(!isset(self::$blockMap[Layout::DEFAULT_BLOCK])) {
-				self::$blockMap[Layout::DEFAULT_BLOCK] = ob_get_clean();
-			} else {
-				ob_end_clean();
-			}
-			
-			$parent = array_pop(self::$extendStack);
-			include($parent);
-			
-			self::extendEnd();	
-		}
+	public static function extend($assertiveTemplate) {
+		array_push(self::$parentStack, $assertiveTemplate . '.layout.php');
+		//if(RecessConf::$mode == RecessConf::DEVELOPMENT) {
+			$trace = debug_backtrace();
+			array_pop($trace);
+			array_push(self::$debugTraces, $trace);
+		//}
 	}
-	
 }
-
-?>
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/Part.class.php b/recess/recess/framework/helpers/Part.class.php
index b1f37c5..3c5382b 100644
--- a/recess/recess/framework/helpers/Part.class.php
+++ b/recess/recess/framework/helpers/Part.class.php
@@ -1,50 +1,130 @@
 <?php
+Library::import('recess.framework.helpers.AssertiveTemplate');
+Library::import('recess.framework.helpers.blocks.PartBlock');
+Library::import('recess.framework.helpers.exceptions.MissingRequiredDrawArgumentsException');
+
 /**
- * @todo Exception handling
+ * A Part is a template that defines specific inputs and has similarities 
+ * to 'partials' of other frameworks. These inputs are defined sequentially
+ * so that parts can be drawn with a list of arguments just like a function
+ * call. Parts have a Block counterpart: PartBlock which can be instantiated
+ * using the static 'block' method.
  * 
- * @author Kris
+ * Part templates require the extension: '.part.php'
+ * 
+ * @author Kris Jordan
  */
-class Part extends AbstractHelper {
-	
+class Part extends AssertiveTemplate {
 	protected static $app;
 	
-	protected static $loaded = array();
-	
-	public static function init(AbstractView $view) {
-		$response = $view->getResponse();
-		self::$app = $response->meta->app;
+	/**
+	 * Returns a multi-dimensional array that describes the inputs
+	 * of a part. Data available: 
+	 *   array[$inputName]['required'] = boolean
+	 *   array[$inputName]['type'] = string type representation
+	 *   
+	 * @param string Part name relative to AssertiveTemplate's paths.
+	 * @param string Always use 'Part' here.
+	 * @returns array Representation of required inputs.
+	 */
+	public static function getInputs($part, $class = 'Part') {
+		return parent::getInputs($part . '.part.php', $class);
 	}
 	
-	public static function render() { 
+	/**
+	 * Send a part directly to output with the provided arguments. The first
+	 * argument is the filename of the part relative to paths registered with
+	 * AssertiveTemplate minus the '.part.php' extension. Subsequent arguments
+	 * depend on the parts themselves.
+	 * 
+	 * @param string The filename of part relative to AssertiveTemplate's paths minus '.part.php'
+	 * @param Depends on the part's inputs.
+	 * @return boolean Returns true if successful. Throws if unsuccessful.
+	 */
+	public static function draw() {
 		$args = func_get_args();
-		$templateFile = self::$app->getViewsDir() . $args[0] . '.part.php';
-	
-		if(!isset(self::$loaded[$templateFile])) {
-			$template = file_get_contents($templateFile);
-			
-			preg_match_all("/assert(?:\W*)\\((?:\W*)(?:is_(.*?)(?:\W*)\\((?:\W*)\\$(.*?)(?:\W*)\\)|\\$(\\w*?)(?:\W*)instanceof(?:\W*)(\\w*?))(?:\W*)\\)(?:\W*);/",
-							$template,
-							$matches);
-			
-			$parameters = array();
-			foreach($matches[0] as $key => $value) {
-				if(isset($matches[1][$key]) && $matches[1][$key] != '') {
-					$parameters[$matches[2][$key]] = $matches[1][$key];
-				} else if (isset($matches[3][$key])) {
-					$parameters[$matches[3][$key]] = $matches[4][$key];
+		try {	
+			if(!empty($args)) {
+				$partPath = array_shift($args);
+				
+				$argCount = count($args);
+				if($argCount > 0) {
+					$inputs = self::getInputs($partPath);
+					$inputKeys = array_keys($inputs);
+					$inputCount = count($inputKeys);
+					if($inputCount > $argCount) {
+						$inputKeys = array_slice($inputKeys, 0, $argCount);
+					} else {
+						$args = array_slice($args, 0, $inputCount);
+					}
+					if(!empty($inputKeys)) {
+						$args = array_combine($inputKeys, $args);
+					}
 				}
+				
+				self::drawArray($partPath, $args);
 			}
-			
-			self::$loaded[$templateFile] = $parameters;
+		} catch(MissingRequiredInputException $e) {
+			throw new MissingRequiredDrawArgumentsException($e->getMessage(), 1);
 		}
 		
-		$parameters = self::$loaded[$templateFile];
-		$keys = array_keys($parameters);
-		array_unshift($keys, '');
-		$params = array_combine($keys, $args);
-		extract($params);
-		include($templateFile);
+		return true;
 	}
 	
+	/**
+	 * Factory method to produce PartListBlock, a Block equivalent to Part. PartBlock
+	 * instances store the arguments they've been instantiated with so that when
+	 * their draw method is called only the remaining arguments (if any) must be
+	 * passed. Ex:
+	 * 
+	 * $block = Block::part('a-part', 'one');
+	 * $block->draw();
+	 * 
+	 * Equivalent to:
+	 * $block = Block::part('a-part');
+	 * $block->draw('one')
+	 * 
+	 * @see BlockPart for more information on its capabilities.
+	 * @param string The name of the part template.
+	 * @param varies Based on part.
+	 * @return PartBlock Returns a block that retains the arguments passed in.
+	 */
+	public static function block() {
+		$args = func_get_args();
+		return new PartBlock($args);
+	}
+	
+	/**
+	 * Draw a part by passing a key/value array where the keys match the
+	 * part's input variable names.
+	 * 
+	 * @param string The name of the part template.
+	 * @param array Key/values according to part's input(s).
+	 * @return boolean True if successful, throws exception if unsuccessful.
+	 */
+	public static function drawArray($partPath = '', $args = array()) {
+		if(!is_array($args)) {
+			throw new RecessFrameworkException("Part::drawArray must be called with an array.", 1);
+		}
+		if($partPath === '') {
+			throw new RecessFrameworkException("First parameter 'partPath' must not be empty.", 1);
+		}
+		
+		try {
+			$inputs = self::getInputs($partPath, 'Part');
+		} catch(Exception $e) { 
+			throw new RecessFrameworkException("Could not find Part: $partPath", 1);
+		}
+		
+		$part = $partPath;
+		$part .= '.part.php';
+		
+		// What if drawArray is always passed key=>value pairs?
+		$context = array_intersect_key($args, $inputs);
+		
+		self::includeTemplate($part, $context);
+		
+		return true;
+	}
 }
 ?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/Url.class.php b/recess/recess/framework/helpers/Url.class.php
index 5521ed7..d51d6b6 100644
--- a/recess/recess/framework/helpers/Url.class.php
+++ b/recess/recess/framework/helpers/Url.class.php
@@ -69,8 +69,12 @@ public static function asset($file = ''){
 	 * @return string URL to an application action.
 	 */
 	public static function action($actionControllerMethodPair) {
-		$args = func_get_args();
-		return call_user_func_array(array(self::$app,'urlTo'),$args);
+		try {
+			$args = func_get_args();
+			return call_user_func_array(array(self::$app,'urlTo'),$args);
+		} catch(Exception $e) {
+			throw new RecessFrameworkException("No URL for $actionControllerMethodPair exists.", 1);
+		}
 	}
 	
 }
diff --git a/recess/recess/framework/helpers/blocks/Block.class.php b/recess/recess/framework/helpers/blocks/Block.class.php
new file mode 100644
index 0000000..0e61961
--- /dev/null
+++ b/recess/recess/framework/helpers/blocks/Block.class.php
@@ -0,0 +1,33 @@
+<?php
+Library::import('recess.framework.helpers.exceptions.MissingRequiredDrawArgumentsException');
+Library::import('recess.framework.helpers.exceptions.BlockToStringException');
+
+/**
+ * A Block is a fundamental unit of UI in Recess.
+ * 
+ * @author Kris Jordan
+ * @since 0.20
+ */
+abstract class Block {
+	
+	/**
+	 * Output the contents of the block. Returns true if successful or false if
+	 * the block is empty. Sub-classes of block may optionally require parameters
+	 * be passed to draw. If these parameters are not passed as expected the
+	 * sub-class must throw an exception of type MissingRequiredDrawArgumentsException.
+	 * 
+	 * @return boolean
+	 */
+	public abstract function draw();
+	
+	/**
+	 * Return the contents of this block as a string. If the block is not fully
+	 * formed (i.e., it's draw requires an argument), then __toString will throw
+	 * an exception of type BlockToStringException.
+	 * 
+	 * @return string
+	 */
+	public abstract function __toString();
+	
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/blocks/HtmlBlock.class.php b/recess/recess/framework/helpers/blocks/HtmlBlock.class.php
new file mode 100644
index 0000000..36c6633
--- /dev/null
+++ b/recess/recess/framework/helpers/blocks/HtmlBlock.class.php
@@ -0,0 +1,59 @@
+<?php
+Library::import('recess.framework.helpers.blocks.Block');
+
+/**
+ * HtmlBlock is a Block that wraps around static HTML strings.
+ * It is often used in conjunction with Buffer which is a helper
+ * for automatically buffering output to blocks.
+ *  
+ * @author Kris Jordan
+ */
+class HtmlBlock extends Block {
+	protected $contents = '';
+	
+	/**
+	 * HtmlBlock can be constructed with an optional string that denotes
+	 * its initial contents. i.e. $block = new HtmlBlock('<p>hello world</p>');
+	 * @param string Contents optional.
+	 */
+	public function __construct($contents = '') {
+		$this->contents = $contents;
+	}
+	
+	/**
+	 * If the block has contents, draw will output the contents and return true. 
+	 * If not, it will return false. HtmlBlock's draw takes no arguments and 
+	 * will never throw MissingArgumentsException.
+	 * 
+	 * @see recess/framework/helpers/blocks/Block#draw()
+	 */
+	public function draw() {
+		if($this->contents !== '') {
+			echo $this->contents;
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
+	/**
+	 * Return 
+	 * @see recess/recess/recess/framework/helpers/blocks/Block#__toString()
+	 */
+	public function __toString(){
+		return $this->contents;
+	}
+	
+	public function set($contents) {
+		$this->contents = $contents;
+	}
+	
+	public function append($contents) {
+		$this->contents .= $contents;
+	}
+	
+	public function prepend($contents) {
+		$this->contents = $contents . $this->contents;
+	}
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/blocks/ListBlock.class.php b/recess/recess/framework/helpers/blocks/ListBlock.class.php
new file mode 100644
index 0000000..8fd9c35
--- /dev/null
+++ b/recess/recess/framework/helpers/blocks/ListBlock.class.php
@@ -0,0 +1,128 @@
+<?php
+Library::import('recess.framework.helpers.exceptions.InputTypeCheckException');
+
+/**
+ * The sequence Block type. Extends from Block so it acts as a block
+ * that can be composed of other Blocks. Its draw/to string iterates
+ * through contained blocks in-order and calls their draw method. Can
+ * form trees by adding ListBlocks to a ListBlock.
+ * 
+ * Only blocks whose draw method can be called without arguments should
+ * be added to a ListBlock else expect exceptions to be thrown when 
+ * drawing.
+ * 
+ * The instance methods: append, prepend, and add, as well as class
+ * methods: constructor, and make, can take strings or Blocks passed
+ * as a variable number of arguments or as an array.
+ * 
+ * @author Kris Jordan
+ */
+class ListBlock extends Block {
+
+	const APPEND = 0;
+	const PREPEND = 1;
+	protected $blocks = array();
+
+	/**
+	 * Create a new listblock. Variable parameters can be either
+	 * a sequence of Block or string arguments, or an array of Blocks
+	 * or strings.
+	 */
+	function __construct() {
+		$args = func_get_args();
+		$this->add($args, self::APPEND);
+	}
+
+	/**
+	 * Iterate through each block in the list and execute its draw.
+	 * @see recess/recess/recess/framework/helpers/blocks/Block#draw()
+	 */
+	function draw() {
+		foreach($this->blocks as $block) {
+			$block->draw();
+		}
+	}
+	
+	/**
+	 * Factory method for instantiating ListBlock without using new.
+	 * @return ListBlock
+	 */
+	static function make() {
+		$args = func_get_args();
+		$blocks = new ListBlock();
+		$blocks->add($args, self::APPEND);
+		return $blocks;
+	}
+	
+	/**
+	 * Append Blocks / strings to the ListBlock
+	 * @return ListBlock for chaining.
+	 */
+	function append() {
+		$args = func_get_args();
+		$this->add($args, self::APPEND);
+		return $this;
+	}
+
+	/**
+	 * Prepend Blocks / strings to the ListBlock
+	 * @return ListBlock for chaining.
+	 */
+	function prepend() {
+		$args = func_get_args();
+		$this->add($args, self::PREPEND);
+	}
+	
+	/**
+	 * Private helper method for adding elements
+	 * to the head or teail of the list.
+	 */
+	private function add($args, $mode) {
+		if(!empty($args)) {
+			if(count($args) == 1) {
+				if(is_array($args[0])) {
+					$blocks = $args[0];
+				} else {
+					$blocks = array($args[0]);
+				}
+			} else {
+				$blocks = $args;
+			}
+		} else {
+			return;
+		}
+		// Flip the blocks if prepending.
+		if($mode == self::PREPEND) {
+			$blocks = array_reverse($blocks);
+		}
+		foreach($blocks as $block) {
+			if(is_string($block)) {
+				$block = new HtmlBlock($block);
+			}
+			if(!$block instanceof Block) {
+				throw new InputTypeCheckException('ListBlock accepts only Block instances and strings, given: ' . gettype($block), 2);
+			}
+			switch($mode) {
+				case self::APPEND:
+					$this->blocks[] = $block;
+					break;
+					
+				case self::PREPEND:
+					array_unshift($this->blocks, $block);
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Get the string representation of the ListBlock.
+	 * @see recess/recess/recess/framework/helpers/blocks/Block#__toString()
+	 */
+	function __toString() {
+		Buffer::to($block);
+		$this->draw();
+		Buffer::end();
+		return (string)$block;
+	}
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/blocks/PartBlock.class.php b/recess/recess/framework/helpers/blocks/PartBlock.class.php
new file mode 100644
index 0000000..009a93b
--- /dev/null
+++ b/recess/recess/framework/helpers/blocks/PartBlock.class.php
@@ -0,0 +1,168 @@
+<?php
+Library::import('recess.framework.helpers.blocks.Block');
+Library::import('recess.framework.helpers.Buffer');
+Library::import('recess.framework.helpers.Part');
+Library::import('recess.framework.helpers.exceptions.InputDoesNotExistException');
+
+/**
+ * PartBlock is an object wrapper for Part templates. Its design is
+ * inspired by curried lambdas. When a PartBlock is instantiated arguments
+ * can be curried into the instance. Then, when the draw method is called
+ * the remaining arguments can be passed. Ex:
+ * 
+ * $part = new PartBlock('mypart');
+ * $part->draw('foo');
+ * /// Equivalent to:
+ * $part = new PartBlock('mypart', 'foo');
+ * $part->draw();
+ * 
+ * There is also a mechanism for assigning values to inputs out-of-order 
+ * with jQuery style property assignment:
+ * 
+ * $partBlock->inputName('value')->inputName2(10)->draw();
+ * 
+ * The purpose of PartBlock is to enable the state of a part to be 
+ * passed around and manipulated by different entities before finally
+ * being drawn.
+ * 
+ * @author Kris Jordan
+ */
+class PartBlock extends Block {
+	protected $partPath = '';
+	protected $args = array();
+	protected $curriedArgs = 0;
+	
+	/**
+	 * Instantiate a new PartBlock by passing the name of the Part template
+	 * as the first argument followed by any other arguments to curry into
+	 * the instance in the order defined by the part.
+	 */
+	function __construct() {
+		$args = func_get_args();
+		
+		if(!empty($args)) {
+			if(count($args) == 1) {
+				if(is_array($args[0])) {
+					$args = $args[0];
+				} else {
+					$args = array($args[0]);
+				}
+			}
+		} else {	
+			throw new RecessFrameworkException('PartListBlock are required to be constructed with the name of the part as the first argument.', 1);
+		}
+
+		$this->partPath = array_shift($args);
+		$this->curry($args);
+	}	
+	
+	/**
+	 * Draw may or may not take arguments depending on the inputs of the
+	 * wrapped part and the arguments that were curried in the construction
+	 * of the PartBlock. The Part will throw a MissingRequiredInputException
+	 * if a required input has not been satisfied.
+	 * 
+	 * @see recess/recess/recess/framework/helpers/blocks/Block#draw()
+	 */
+	public function draw() {
+		$args = func_get_args();
+		$clone = clone $this;
+		$clone->curry($args);
+		try {
+			Part::drawArray($clone->partPath, $clone->args);
+			return true;
+		} catch(MissingRequiredInputException $e) {
+			throw new MissingRequiredDrawArgumentsException($e->getMessage(), 1);
+		}
+	}
+	
+	/**
+	 * Converts the PartBlock to a string based on inputs available. This will 
+	 * only succeed if all required inputs have been satisfied by currying or 
+	 * out-of-order assignment. If not, throws 'MissingRequiredDrawArgumentsException'.
+	 * 
+	 * @see recess/recess/recess/framework/helpers/blocks/Block#__toString()
+	 */
+	public function __toString() {
+		Buffer::to($returnsBlock);
+		try {
+			$this->draw();
+		} catch(MissingRequiredDrawArgumentsException $e) {
+			throw new BlockToStringException($e->getMessage(), 1);
+		}
+		Buffer::end();
+		return (string)$returnsBlock;
+	}
+	
+	/**
+	 * Magic method for out-of-order assignment. Call with the name of 
+	 * an input and no arguments to get its current value, or one argument
+	 * to assign it a value.
+	 */
+	public function __call($name, $arguments) {
+		if(!empty($arguments)) {
+			$count = count($arguments);
+			if($count == 0) {
+				return $this->args[$name];
+			} else if($count == 1) {
+				$clone = clone $this;
+				$clone->assign($name, $arguments[0]);
+				return $clone;
+			}
+		}
+	}
+	
+	/**
+	 * Private helper method for currying arguments into an instance.
+	 * @param array
+	 */
+	private function curry($args) {
+		// pair any args with their input names
+		if(is_array($args) && !empty($args)) {
+			$inputs = Part::getInputs($this->partPath);
+			$param = 0;
+			$arg = 0;
+			$argCount = count($args);
+			foreach($inputs as $input => $attributes) {
+				if($arg >= $argCount) {
+					break;
+				}
+				if($param >= $this->curriedArgs) {
+					try {
+						$this->assign($input, $args[$arg++]);
+					} catch(InputTypeCheckException $e) {
+						throw new InputTypeCheckException($e->getMessage(), 2);
+					}				}
+				++$param;
+			}
+			$this->curriedArgs = $arg;
+		}
+	}
+	
+	/**
+	 * Assign a value to a property of the PartBlock. This is an internal
+	 * helper method. This method will throw an InputTypeCheckException if
+	 * the assigned value does not match the expected value of a template.
+	 * 
+	 * @param string $property input name
+	 * @param varies $value The value to be assigned.
+	 */
+	protected function assign($property, $value) {
+		$inputs = Part::getInputs($this->partPath);
+		if(isset($inputs[$property])) {
+			if(Part::typeCheck($value, $inputs[$property]['type'])) {
+				$this->args[$property] = $value;
+			} else {
+				$expected = $inputs[$property]['type'];
+				$passed = gettype($value);
+				if($passed === 'object') {
+					$passed = get_class($value);
+				}
+				throw new InputTypeCheckException("Part input type mismatch '$property' expects '$expected' passed '$passed'.");
+			}
+		} else {
+			throw new InputDoesNotExistException("Part input '$property' does not exist.", 2); 
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/exceptions/BlockToStringException.class.php b/recess/recess/framework/helpers/exceptions/BlockToStringException.class.php
new file mode 100644
index 0000000..128a6dd
--- /dev/null
+++ b/recess/recess/framework/helpers/exceptions/BlockToStringException.class.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+class BlockToStringException extends RecessFrameworkException { }
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/exceptions/InputDoesNotExistException.class.php b/recess/recess/framework/helpers/exceptions/InputDoesNotExistException.class.php
new file mode 100644
index 0000000..c45c0a5
--- /dev/null
+++ b/recess/recess/framework/helpers/exceptions/InputDoesNotExistException.class.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+class InputDoesNotExistException extends RecessFrameworkException { }
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/exceptions/InputTypeCheckException.class.php b/recess/recess/framework/helpers/exceptions/InputTypeCheckException.class.php
new file mode 100644
index 0000000..d6a306a
--- /dev/null
+++ b/recess/recess/framework/helpers/exceptions/InputTypeCheckException.class.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+class InputTypeCheckException extends RecessFrameworkException { }
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/exceptions/MissingRequiredDrawArgumentsException.class.php b/recess/recess/framework/helpers/exceptions/MissingRequiredDrawArgumentsException.class.php
new file mode 100644
index 0000000..138ded8
--- /dev/null
+++ b/recess/recess/framework/helpers/exceptions/MissingRequiredDrawArgumentsException.class.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+class MissingRequiredDrawArgumentsException extends RecessFrameworkException { }
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/helpers/exceptions/MissingRequiredInputException.class.php b/recess/recess/framework/helpers/exceptions/MissingRequiredInputException.class.php
new file mode 100644
index 0000000..5f1cab3
--- /dev/null
+++ b/recess/recess/framework/helpers/exceptions/MissingRequiredInputException.class.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @author Kris Jordan <krisjordan@gmail.com>
+ * @copyright 2008, 2009 Kris Jordan
+ * @package Recess PHP Framework
+ * @license MIT
+ * @link http://www.recessframework.org/
+ */
+class MissingRequiredInputException extends RecessFrameworkException { }
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/parts/each-toggle.part.php b/recess/recess/framework/parts/each-toggle.part.php
new file mode 100644
index 0000000..3db116c
--- /dev/null
+++ b/recess/recess/framework/parts/each-toggle.part.php
@@ -0,0 +1,13 @@
+<?php
+Part::input($items, 'array');
+Part::input($even, 'Block');
+Part::input($odd, 'Block');
+$i = -1;
+foreach($items as $item) {
+	if((++$i % 2) == 0) {
+		$even->draw($item);
+	} else {
+		$odd->draw($item);
+	}
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/parts/each.part.php b/recess/recess/framework/parts/each.part.php
new file mode 100644
index 0000000..378251e
--- /dev/null
+++ b/recess/recess/framework/parts/each.part.php
@@ -0,0 +1,11 @@
+<?php
+Part::input($items, 'array');
+Part::input($part, 'Block');
+try {
+	foreach($items as $item) {
+		$part->draw($item);
+	}
+} catch(RecessFrameworkException $e) {
+	throw new RecessFrameworkException($e->getMessage(), 1);
+}
+?>
\ No newline at end of file
diff --git a/recess/recess/framework/views/JsonView.class.php b/recess/recess/framework/views/JsonView.class.php
index d135e95..12b073c 100644
--- a/recess/recess/framework/views/JsonView.class.php
+++ b/recess/recess/framework/views/JsonView.class.php
@@ -3,7 +3,7 @@
 
 class JsonView extends AbstractView {
 	
-	public function canRespondsWith(Response $response) {
+	public function canRespondWith(Response $response) {
 		return 'json' === $response->request->accepts->format();
 	}
 	
diff --git a/recess/recess/framework/views/LayoutsView.class.php b/recess/recess/framework/views/LayoutsView.class.php
index 6f4de42..8e63843 100644
--- a/recess/recess/framework/views/LayoutsView.class.php
+++ b/recess/recess/framework/views/LayoutsView.class.php
@@ -3,6 +3,7 @@
 Library::import('recess.framework.helpers.Layout');
 Library::import('recess.framework.helpers.Url');
 Library::import('recess.framework.helpers.Html');
+Library::import('recess.framework.util.AssertedParams');
 
 class LayoutsView extends NativeView { 	
 	/**
@@ -15,13 +16,14 @@ class LayoutsView extends NativeView {
 	 * @abstract 
 	 */
 	protected function render(Response $response) {
-		$this->loadHelper(
-						'recess.framework.helpers.Layout',
-						'recess.framework.helpers.Part',
-						'recess.framework.helpers.Url',
-						'recess.framework.helpers.Html');
-		parent::render($response);
-		Layout::extendEnd();
+		$this->loadHelper(	'recess.framework.helpers.Layout',
+							'recess.framework.helpers.Part',
+							'recess.framework.helpers.Buffer',
+							'recess.framework.helpers.Url',
+							'recess.framework.helpers.Html' );
+		$template = $this->getTemplateFor($response);
+		$template = str_replace($response->meta->app->getViewsDir(), '', $template);
+		Layout::draw($template, $response->data);
 	}
 }
 ?>
\ No newline at end of file
diff --git a/recess/recess/framework/views/NativeView.class.php b/recess/recess/framework/views/NativeView.class.php
index bdfb6ec..b433626 100644
--- a/recess/recess/framework/views/NativeView.class.php
+++ b/recess/recess/framework/views/NativeView.class.php
@@ -3,28 +3,29 @@
 
 class NativeView extends AbstractView {
 	protected function getTemplateFor($response) {
-		// TODO: Cache in production mode
 		$format = $response->request->accepts->format();
-		
 		if($format == 'html' || $format == '') {
 			$extension = '.php';
 		} else {
 			$extension = ".$format.php";
 		}
-		
-		return $response->meta->app->getViewsDir() 
+		$template =
+				$response->meta->app->getViewsDir() 
 				. $response->meta->viewsPrefix 
 				. $response->meta->viewName 
 				. $extension;
+		return $template;
 	}
 	
-	public function canRespondsWith(Response $response) {
+	public function canRespondWith(Response $response) {
+		// TODO: Cache in production mode
 		return file_exists($this->getTemplateFor($response));
 	}
 	
 	protected function render(Response $response) {
-		extract($response->data);
-		$viewsDir = $response->meta->app->getViewsDir();
+		$context = $response->data;
+		$context['viewsDir'] = $response->meta->app->getViewsDir();
+		extract($context);
 		include $this->getTemplateFor($response);
 	}
 }
diff --git a/recess/recess/http/Request.class.php b/recess/recess/http/Request.class.php
index ce824bb..c9abe7f 100644
--- a/recess/recess/http/Request.class.php
+++ b/recess/recess/http/Request.class.php
@@ -1,5 +1,6 @@
 <?php
 Library::import('recess.lang.Object');
+Library::import('recess.http.Accepts');
 
 /**
  * @author Kris Jordan <krisjordan@gmail.com>
diff --git a/recess/recess/lang/PathFinder.class.php b/recess/recess/lang/PathFinder.class.php
new file mode 100644
index 0000000..93eb8b5
--- /dev/null
+++ b/recess/recess/lang/PathFinder.class.php
@@ -0,0 +1,23 @@
+<?php
+
+class PathFinder {
+	
+	protected $paths = array();
+	
+	function addPath($path) {
+		array_push($this->paths, $path);
+	}
+	
+	function find($file) {
+		for($i = count($this->paths) - 1; $i >= 0;  $i--) {
+			$filePath = $this->paths[$i] . $file;
+			if(file_exists($filePath)) {
+				return $filePath;
+			}
+		}
+		return false;
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/recess/test/bootstrap.php b/recess/test/bootstrap.php
index 58d108e..2b86690 100644
--- a/recess/test/bootstrap.php
+++ b/recess/test/bootstrap.php
@@ -8,7 +8,7 @@
 $_ENV['dir.recess'] = $_ENV['dir.bootstrap'] . 'recess/';
 $_ENV['dir.plugins'] = $_ENV['dir.bootstrap'] . 'plugins/';
 $_ENV['dir.apps'] = $_ENV['dir.bootstrap'] . 'apps/';
-$_ENV['dir.test'] = $_ENV['dir.bootstrap'] . 'data/test/';
+$_ENV['dir.test'] = $_ENV['dir.bootstrap'] . 'recess/test/';
 $_ENV['dir.temp'] = $_ENV['dir.bootstrap'] . 'data/temp/';
 $_ENV['url.content'] = $_ENV['url.base'] . 'content/';
 
diff --git a/recess/test/recess/framework/RecessFrameworkAllTests.php b/recess/test/recess/framework/RecessFrameworkAllTests.php
index 76690ad..97617c1 100644
--- a/recess/test/recess/framework/RecessFrameworkAllTests.php
+++ b/recess/test/recess/framework/RecessFrameworkAllTests.php
@@ -1,6 +1,7 @@
 <?php
 require_once 'PHPUnit/Framework.php';
 require_once 'recess/framework/routing/RecessFrameworkRoutingAllTests.php';
+require_once 'recess/framework/helpers/RecessFrameworkHelpersAllTests.php';
 
 class RecessFrameworkAllTests
 {
@@ -9,6 +10,7 @@ public static function suite()
         $suite = new PHPUnit_Framework_TestSuite('recess.framework');
 
         $suite->addTestSuite(RecessFrameworkRoutingAllTests::suite());
+        $suite->addTestSuite(RecessFrameworkHelpersAllTests::suite());
  		
         return $suite;
     }
diff --git a/recess/test/recess/framework/helpers/AssertiveTemplateTest.php b/recess/test/recess/framework/helpers/AssertiveTemplateTest.php
new file mode 100644
index 0000000..801b00a
--- /dev/null
+++ b/recess/test/recess/framework/helpers/AssertiveTemplateTest.php
@@ -0,0 +1,77 @@
+<?php
+Library::import('recess.framework.helpers.AssertiveTemplate');
+
+class AssertiveTemplateTest extends PHPUnit_Framework_TestCase {
+	protected $simple = '';
+	
+	function setUp() {
+		$this->simple = 'simple.at.php';
+		AssertiveTemplate::addPath($_ENV['dir.test'] . 'recess/framework/helpers/');
+	}
+	
+	function testGetInputs() {
+		$inputs = AssertiveTemplate::getInputs($this->simple);
+		$this->assertEquals(3, count($inputs));
+		
+		$this->assertEquals(array('title','aBlock','max'), array_keys($inputs));
+		
+		$this->assertEquals("string", $inputs['title']['type']);
+		$this->assertTrue($inputs['title']['required']);
+		
+		$this->assertEquals("Block", $inputs['aBlock']['type']);
+		$this->assertTrue($inputs['aBlock']['required']);
+		
+		$this->assertEquals("int", $inputs['max']['type']);
+		$this->assertFalse($inputs['max']['required']);
+	}
+	
+	function testRequiredInputs() {
+		$string = '1234';
+		$object = new stdclass;
+		$int = 1234;
+		$float = 12.24;
+		$bool = true;
+		
+		try{
+			AssertiveTemplate::input($string, 'string');
+			AssertiveTemplate::input($object, 'stdclass');
+			AssertiveTemplate::input($int, 'int');
+			AssertiveTemplate::input($float, 'float');
+			AssertiveTemplate::input($bool, 'bool');
+		} catch(Exception $e) {
+			$this->assertTrue(false);
+			return;
+		}
+		$this->assertTrue(true);
+	}
+	
+	function testOptionalInputs() {
+		AssertiveTemplate::input($string, 'string', '1234');
+		$stdclass = new stdclass;
+		AssertiveTemplate::input($object, 'stdclass', $stdclass);
+		AssertiveTemplate::input($int, 'int', 1234);
+		AssertiveTemplate::input($float, 'float', 12.24);
+		AssertiveTemplate::input($bool, 'bool', true);
+		
+		$this->assertEquals('1234', $string);
+		$this->assertEquals($stdclass, $object);
+		$this->assertEquals(1234, $int);
+		$this->assertEquals(12.24, $float);
+		$this->assertTrue($bool);
+	}
+	
+	function testInputFailure() {
+		$string = '1234';
+		$object = new stdclass;
+		$int = 1234;
+		$float = 12.24;
+		$bool = true;
+		try {	AssertiveTemplate::input($object, 'string'); $this->assertTrue(false); } catch(Exception $e) { $this->assertTrue(true); }
+		try {	AssertiveTemplate::input($int, 'stdclass');	$this->assertTrue(false); } catch(Exception $e) { $this->assertTrue(true); }
+		try {	AssertiveTemplate::input($float, 'int'); $this->assertTrue(false); } catch(Exception $e) { $this->assertTrue(true); }
+		try {	AssertiveTemplate::input($bool, 'float'); $this->assertTrue(false); } catch(Exception $e) { $this->assertTrue(true); }
+		try {	AssertiveTemplate::input($string, 'bool'); $this->assertTrue(false); } catch(Exception $e) { $this->assertTrue(true); }
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/BufferTest.php b/recess/test/recess/framework/helpers/BufferTest.php
new file mode 100644
index 0000000..300942b
--- /dev/null
+++ b/recess/test/recess/framework/helpers/BufferTest.php
@@ -0,0 +1,80 @@
+<?php
+Library::import('recess.framework.helpers.Buffer');
+Library::import('recess.framework.helpers.blocks.HtmlBlock');
+
+class BufferTest extends PHPUnit_Framework_TestCase {
+	
+	function testTo() {
+		$content = 'Hello world.';
+		Buffer::to($start);
+		echo $content;
+		Buffer::end();
+		$this->assertType('Block', $start);
+		$this->assertType('HtmlBlock', $start);
+		$this->assertEquals($content, (string)$start);
+	}
+	
+	function testNesting() {
+		$firstLevel = 'First';
+		$secondLevel = 'Second';
+		Buffer::to($first);
+			Buffer::to($second);
+				echo $secondLevel;
+			Buffer::end();
+			echo $firstLevel;
+		Buffer::end();
+		
+		$this->assertEquals($firstLevel, (string)$first);
+		$this->assertEquals($secondLevel, (string)$second);
+	}
+	
+	function testStartDefault() {
+		$expected = 'This should still be the content.';
+		Buffer::to($block);
+		echo $expected;
+		Buffer::end();
+		Buffer::to($block);
+		echo 'Should not override.';
+		Buffer::end();
+		$this->assertType('Block', $block);
+		$this->assertEquals($expected, (string)$block);
+	}
+	
+	function testStartOverwrite() {
+		$original = 'This should still be the content.';
+		Buffer::to($block);
+		echo $original;
+		Buffer::end();
+		Buffer::to($block, Buffer::OVERWRITE);
+		$expected = 'This will override.';
+		echo $expected;
+		Buffer::end();
+		$this->assertType('Block', $block);
+		$this->assertEquals($expected, (string)$block);
+	}
+	
+	function testAppend() {
+		$original = 'Original';
+		$append = 'Appended';
+		$block = new HtmlBlock($original);
+		Buffer::appendTo($block);
+		echo $append;
+		Buffer::end();
+		$this->assertType('Block', $block);
+		$this->assertEquals($original.$append, (string)$block);
+	}
+	
+	function testPrepend() {
+		$original = 'Original';
+		$prepend = 'Prepend';
+		$block = new HtmlBlock($original);
+		Buffer::prependTo($block);
+		echo $prepend;
+		Buffer::end();
+		$this->assertType('Block', $block);
+		$this->assertEquals($prepend.$original, (string)$block);
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/LayoutTest.php b/recess/test/recess/framework/helpers/LayoutTest.php
new file mode 100644
index 0000000..d5a7df7
--- /dev/null
+++ b/recess/test/recess/framework/helpers/LayoutTest.php
@@ -0,0 +1,64 @@
+<?php
+Library::import('recess.framework.helpers.Layout');
+class LayoutTest extends PHPUnit_Framework_TestCase {
+	
+	protected $zero = 'zero-input';
+	protected $single = 'single-input';
+	protected $multi = 'multi-input';
+	protected $optional = 'optional-inputs';
+	
+	function setUp() {
+		Layout::addPath($_ENV['dir.test'] . 'recess/framework/helpers/test-layouts/');
+	}
+	
+	function testSimple() {
+		ob_start();
+		Layout::draw('simple.php', array());
+		$content = ob_get_clean();
+		$this->assertEquals('simple', $content);
+	}
+	
+	function testContext() {
+		ob_start();
+		Layout::draw('context.php', array('context'=>'is valuable'));
+		$content = ob_get_clean();
+		$this->assertEquals('is valuable', $content);
+	}
+	
+	function testContextFail() {
+		ob_start();
+		try {
+			Layout::draw('context.php', array('contextFail'=>'is valuable'));
+			$this->fail('Should throw MissingRequiredInputException');
+		} catch(MissingRequiredInputException $e) {
+			$this->assertTrue(true);
+		} catch(Exception $e) {
+			$this->fail('Should throw MissingRequiredInputException. Threw: ' . get_class($e));
+		}
+	}
+	
+	function testMultiple() {
+		ob_start();
+		Layout::draw('multiple.php', array());
+		$content = ob_get_clean();
+		$this->assertEquals('great success', $content);
+	}
+	
+	function testDefaults() {
+		ob_start();
+		Layout::draw('defaults.php', array());
+		$content = ob_get_clean();
+		$this->assertEquals('great success', $content);
+	}
+	
+	function testMiddle() {
+		ob_start();
+		Layout::draw('middle.php', array());
+		$content = ob_get_clean();
+		$string = 'child middle master';
+		$this->assertEquals($string.$string, $content);
+		
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/PartTest.php b/recess/test/recess/framework/helpers/PartTest.php
new file mode 100644
index 0000000..c284c22
--- /dev/null
+++ b/recess/test/recess/framework/helpers/PartTest.php
@@ -0,0 +1,127 @@
+<?php
+Library::import('recess.framework.helpers.Part');
+Library::import('recess.framework.helpers.blocks.HtmlBlock');
+Library::import('recess.framework.helpers.exceptions.MissingRequiredDrawArgumentsException');
+
+class PartTest extends PHPUnit_Framework_TestCase {
+	
+	protected $zero = 'zero-input';
+	protected $single = 'single-input';
+	protected $multi = 'multi-input';
+	protected $optional = 'optional-inputs';
+	
+	function setUp() {
+		Part::addPath($_ENV['dir.test'] . 'recess/framework/helpers/test-parts/');
+	}
+	
+	function testDrawZeroArgs() {
+		ob_start();
+		Part::draw($this->zero);
+		$content = ob_get_clean();
+		$this->assertEquals('no input', $content);
+	}
+	
+	function testDrawZeroArgsPassOne() {
+		ob_start();
+		Part::draw($this->zero, 'ignored');
+		$content = ob_get_clean();
+		$this->assertEquals('no input', $content);
+	}
+	
+	function testDrawSingle() {
+		$pass = 'foo';
+		ob_start();
+		Part::draw($this->single, $pass);
+		$content = ob_get_clean();
+		$this->assertEquals($pass, $content);
+	}
+	
+	function testDrawSingleWithTwoArgs() {
+		$pass = 'foo';
+		ob_start();
+		Part::draw($this->single, $pass, $pass);
+		$content = ob_get_clean();
+		$this->assertEquals($pass, $content);
+	}
+	
+	function testDrawSingleFail() {
+		try {
+			Part::draw($this->single);	
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Passed.');
+		} catch (MissingRequiredDrawArgumentsException $e) {
+			$this->assertTrue(true);
+		} catch (Exception $e) {
+			echo $e;
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Got: ' . get_class($e));
+		}
+	}
+	
+	function testDrawMulti() {
+		$one = 'one';
+		$two = 2;
+		$three = 'three';
+		
+		ob_start();
+		Part::draw($this->multi, $one, $two, $three);
+		$content = ob_get_clean();
+		$this->assertEquals('onethreeonethree', $content);
+	}
+	
+	function testDrawMultiFail() {
+		try {
+			Part::draw($this->multi);	
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Passed.');
+		} catch (MissingRequiredDrawArgumentsException $e) {
+			$this->assertTrue(true);
+		} catch (Exception $e) {
+			echo $e;
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Got: ' . get_class($e));
+		}
+		
+		try {
+			Part::draw($this->multi, 'one');	
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Passed.');
+		} catch (MissingRequiredDrawArgumentsException $e) {
+			$this->assertTrue(true);
+		} catch (Exception $e) {
+			echo $e;
+			$this->fail('Should throw MissingRequiredDrawArgumentsException.');
+		}
+		
+		try {
+			Part::draw($this->multi, 'one', 2);	
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Passed.');
+		} catch (MissingRequiredDrawArgumentsException $e) {
+			$this->assertTrue(true);
+		} catch (Exception $e) {
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Got: ' . get_class($e));
+		}
+	}
+	
+	function testDrawOptional() {
+		ob_start();
+		Part::draw($this->optional);
+		$content = ob_get_clean();
+		$this->assertEquals('default', $content);
+		
+		ob_start();
+		Part::draw($this->optional, 'foo');
+		$content = ob_get_clean();
+		$this->assertEquals('non-default', $content);
+	}
+	
+	function testInputTypeFail() {
+		try{
+			Part::draw($this->optional, 1);
+			$this->fail('Should throw InputTypeCheckException');
+		} catch(InputTypeCheckException $e) {
+			$this->assertTrue(true);
+		} catch(Exception $e) {
+			print $e->getMessage();
+			$this->fail('Should throw InputTypeCheckException, Got: ' . get_class($e));
+		}
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/RecessFrameworkHelpersAllTests.php b/recess/test/recess/framework/helpers/RecessFrameworkHelpersAllTests.php
new file mode 100644
index 0000000..3bad15c
--- /dev/null
+++ b/recess/test/recess/framework/helpers/RecessFrameworkHelpersAllTests.php
@@ -0,0 +1,24 @@
+<?php
+require_once 'PHPUnit/Framework.php';
+require_once 'recess/framework/helpers/AssertiveTemplateTest.php';
+require_once 'recess/framework/helpers/BufferTest.php';
+require_once 'recess/framework/helpers/PartTest.php';
+require_once 'recess/framework/helpers/LayoutTest.php';
+require_once 'recess/framework/helpers/blocks/RecessFrameworkHelpersBlocksAllTests.php';
+
+class RecessFrameworkHelpersAllTests
+{
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('recess.framework.helpers');
+
+        $suite->addTestSuite('BufferTest');
+        $suite->addTestSuite('AssertiveTemplateTest');
+        $suite->addTestSuite('PartTest');
+        $suite->addTestSuite('LayoutTest');
+        $suite->addTestSuite(RecessFrameworkHelpersBlocksAllTests::suite());
+ 		
+        return $suite;
+    }
+}
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/blocks/HtmlBlockTest.php b/recess/test/recess/framework/helpers/blocks/HtmlBlockTest.php
new file mode 100644
index 0000000..c191ef4
--- /dev/null
+++ b/recess/test/recess/framework/helpers/blocks/HtmlBlockTest.php
@@ -0,0 +1,68 @@
+<?php
+Library::import('recess.framework.helpers.blocks.HtmlBlock');
+
+class HtmlBlockTest extends PHPUnit_Framework_TestCase {
+	
+	public function testConstructor() {
+		$string = 'foo';
+		$emptyBlock = new HtmlBlock();
+		$stringBlock = new HtmlBlock($string);
+		$this->assertEquals('', (string)$emptyBlock);
+		$this->assertEquals($string, (string)$stringBlock);
+	}
+	
+	public function testDrawEmpty() {
+		$block = new HtmlBlock();
+		ob_start();		
+		$result = $block->draw();
+		$content = ob_get_clean();
+		
+		$this->assertFalse($result);
+		$this->assertEquals('', $content);
+	}
+	
+	public function testDrawNonEmpty() {
+		$string = 'foo';
+		$block = new HtmlBlock($string);
+		ob_start();		
+		$result = $block->draw();
+		$content = ob_get_clean();
+		
+		$this->assertTrue($result);
+		$this->assertEquals($string, $content);
+	}
+	
+	public function testToString(){
+		// Same as constructor test.
+		$string = 'foo';
+		$emptyBlock = new HtmlBlock();
+		$stringBlock = new HtmlBlock($string);
+		$this->assertEquals('', (string)$emptyBlock);
+		$this->assertEquals($string, (string)$stringBlock);
+	}
+	
+	public function testSet() {
+		$string = 'foo';
+		$emptyBlock = new HtmlBlock();
+		$emptyBlock->set($string);
+		$this->assertEquals($string, (string)$emptyBlock);
+	}
+	
+	public function testAppend() {
+		$string = 'foo';
+		$stringBlock = new HtmlBlock($string);
+		$stringBlock->append($string . '?');
+		$this->assertEquals($string . $string . '?', (string)$stringBlock);
+	}
+	
+	public function testPrepend() {
+		$string = 'foo';
+		$stringBlock = new HtmlBlock($string);
+		$stringBlock->prepend($string . '?');
+		$this->assertEquals($string . '?' . $string , (string)$stringBlock);
+	
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/blocks/ListBlockTest.php b/recess/test/recess/framework/helpers/blocks/ListBlockTest.php
new file mode 100644
index 0000000..f5afdaa
--- /dev/null
+++ b/recess/test/recess/framework/helpers/blocks/ListBlockTest.php
@@ -0,0 +1,53 @@
+<?php
+Library::import('recess.framework.helpers.blocks.ListBlock');
+Library::import('recess.framework.helpers.blocks.HtmlBlock');
+
+class ListBlockTest extends PHPUnit_Framework_TestCase {
+	function test__construct($blocks = array()) {
+		$blocks = new ListBlock('one','two',new HtmlBlock('three'));
+		$this->assertEquals('onetwothree',(string)$blocks);
+	}
+
+	function testDraw() {
+		$blocks = new ListBlock('one','two');
+		ob_start();
+		$blocks->draw();
+		$content = ob_get_clean();
+		$this->assertEquals('onetwo', $content);
+	}
+	
+	function testMake() {
+		$block = ListBlock::make('one','two');
+		$this->assertEquals('onetwo', (string)$block);
+	}
+	
+	function testAppend() {
+		$block = ListBlock::make('one','two');
+		$block->append('three','four');
+		$block->append(array('five','six'));
+		$block->append('seven');
+		$this->assertEquals('onetwothreefourfivesixseven', (string)$block);
+	}
+	
+	function testPrepend() {
+		$block = ListBlock::make('one','two');
+		$block->prepend('three','four');
+		$block->prepend(array('five','six'));
+		$block->prepend('seven');
+		$this->assertEquals('sevenfivesixthreefouronetwo', (string)$block);
+	}
+	
+	function testAppendFail() {
+		$block = new ListBlock();
+		try {
+			$block->append(false);
+			$this->fail('Should throw exception!');
+		} catch(InputTypeCheckException $e) {
+			$this->assertTrue(true);
+		} catch(Exception $e) {
+			
+		}
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/blocks/PartBlockTest.php b/recess/test/recess/framework/helpers/blocks/PartBlockTest.php
new file mode 100644
index 0000000..d8f73e2
--- /dev/null
+++ b/recess/test/recess/framework/helpers/blocks/PartBlockTest.php
@@ -0,0 +1,198 @@
+<?php
+Library::import('recess.framework.helpers.Part');
+Library::import('recess.framework.helpers.blocks.PartBlock');
+
+class PartBlockTest extends PHPUnit_Framework_TestCase {
+	
+	protected $zero = 'zero-input';
+	protected $single = 'single-input';
+	protected $multi = 'multi-input';
+	protected $optional = 'optional-inputs';
+	
+	function setUp() {
+		Part::addPath($_ENV['dir.test'] . 'recess/framework/helpers/test-parts/');
+	}
+	
+	function testDrawZeroArgs() {
+		ob_start();
+		$block = new PartBlock($this->zero);
+		$block->draw();
+		$content = ob_get_clean();
+		$this->assertEquals('no input', $content);
+	}
+	
+	function testDrawZeroArgsPassOne() {
+		ob_start();
+		$block = new PartBlock($this->zero);
+		$block->draw('ignored');
+		$content = ob_get_clean();
+		$this->assertEquals('no input', $content);
+	}
+	
+	function testDrawSingle() {
+		$pass = 'foo';
+		ob_start();
+		$block = new PartBlock($this->single, $pass);
+		$block->draw();
+		$content = ob_get_clean();
+		$this->assertEquals($pass, $content);
+	}
+	
+	function testDrawSingleWithTwoArgs() {
+		$pass = 'foo';
+		ob_start();
+		$block = new PartBlock($this->single, $pass, $pass);
+		echo $block;
+		$content = ob_get_clean();
+		$this->assertEquals($pass, $content);
+	}
+	
+	function testDrawSingleFail() {
+		try {
+			$block = new PartBlock($this->single);
+			$block->draw();
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Passed.');
+		} catch (MissingRequiredDrawArgumentsException $e) {
+			$this->assertTrue(true);
+		} catch (Exception $e) {
+			echo $e;
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Got: ' . get_class($e));
+		}
+	}
+	
+	function testDrawMulti() {
+		$one = 'one';
+		$two = 2;
+		$three = 'three';
+		
+		ob_start();
+		$block = new PartBlock($this->multi);
+		$block->draw($one, $two, $three);
+		$content = ob_get_clean();
+		$this->assertEquals('onethreeonethree', $content);
+	}
+	
+	function testDrawMultiFail() {
+		try {
+			Part::block($this->multi)->draw();
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Passed.');
+		} catch (MissingRequiredDrawArgumentsException $e) {
+			$this->assertTrue(true);
+		} catch (Exception $e) {
+			echo $e;
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Got: ' . get_class($e));
+		}
+		
+		try {
+			Part::block($this->multi, 'one')->draw();
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Passed.');
+		} catch (MissingRequiredDrawArgumentsException $e) {
+			$this->assertTrue(true);
+		} catch (Exception $e) {
+			echo $e;
+			$this->fail('Should throw MissingRequiredDrawArgumentsException.');
+		}
+		
+		try {
+			Part::block($this->multi, 'one', 2)->draw();	
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Passed.');
+		} catch (MissingRequiredDrawArgumentsException $e) {
+			$this->assertTrue(true);
+		} catch (Exception $e) {
+			$this->fail('Should throw MissingRequiredDrawArgumentsException. Got: ' . get_class($e));
+		}
+	}
+	
+	function testDrawOptional() {
+		ob_start();
+		Part::block($this->optional)->draw();
+		$content = ob_get_clean();
+		$this->assertEquals('default', $content);
+		
+		ob_start();
+		Part::block($this->optional)->draw('foo');
+		$content = ob_get_clean();
+		$this->assertEquals('non-default', $content);
+	}
+	
+	function testInputTypeFail() {
+		try{
+			Part::block($this->optional, 1)->draw();
+			$this->fail('Should throw InputTypeCheckException');
+		} catch(InputTypeCheckException $e) {
+			$this->assertTrue(true);
+		} catch(Exception $e) {
+			print $e->getMessage();
+			$this->fail('Should throw InputTypeCheckException, Got: ' . get_class($e));
+		}
+	}
+	
+	function testOutOfOrderAssignment() {
+		$one = 'one';
+		$two = 2;
+		$three = 'three';
+		
+		ob_start();
+		$block = new PartBlock($this->multi);
+		$block->second($two)->first($one)->third($three)->draw();
+		$content = ob_get_clean();
+		$this->assertEquals('onethreeonethree', $content);
+	}
+	
+	function testCurrying() {
+		$one = 'one';
+		$two = 2;
+		$three = 'three';
+		
+		ob_start();
+		$block = new PartBlock($this->multi, $one);
+		$block->draw($two, $three);
+		$content = ob_get_clean();
+		$this->assertEquals('onethreeonethree', $content);
+	}
+	
+	function testCurryingFail() {
+		$one = 'one';
+		$two = 2;
+		$three = 'three';
+		
+		try {
+			$block = new PartBlock($this->multi, $one);	
+			$block->second($two)->draw($three);
+			$this->fail('Should throw InputTypeCheckException');
+		} catch(InputTypeCheckException $e) {
+			$this->assertTrue(true);
+		} catch(Exception $e) {
+			$this->fail('Should throw InputTypeCheckException, Got: ' . get_class($e));
+		}
+	}
+	
+	function testCurryingOptional() {
+		$one = 'one';
+		$two = 2;
+		$three = 'three';
+		
+		ob_start();
+		$block = new PartBlock($this->multi, $one);
+		$block->third($three)->draw($two);
+		$content = ob_get_clean();
+		$this->assertEquals('onethreeonethree', $content);
+	}
+	
+	function testNonExistantInput(){
+		$two = 2;
+		try {
+			$block = new PartBlock($this->multi);
+			$block->two($two);
+			$this->fail('Should throw InputDoesNotExistException');
+		} catch(InputDoesNotExistException $e) {
+			$this->assertTrue(true);
+		} catch(Exception $e) {
+			$this->fail('Should throw InputTypeCheckException, Got: ' . get_class($e));
+		}
+		
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/blocks/RecessFrameworkHelpersBlocksAllTests.php b/recess/test/recess/framework/helpers/blocks/RecessFrameworkHelpersBlocksAllTests.php
new file mode 100644
index 0000000..4118309
--- /dev/null
+++ b/recess/test/recess/framework/helpers/blocks/RecessFrameworkHelpersBlocksAllTests.php
@@ -0,0 +1,20 @@
+<?php
+require_once 'PHPUnit/Framework.php';
+require_once 'recess/framework/helpers/blocks/HtmlBlockTest.php';
+require_once 'recess/framework/helpers/blocks/ListBlockTest.php';
+require_once 'recess/framework/helpers/blocks/PartBlockTest.php';
+
+class RecessFrameworkHelpersBlocksAllTests
+{
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite('recess.framework.helpers.blocks');
+
+        $suite->addTestSuite('HtmlBlockTest');
+        $suite->addTestSuite('ListBlockTest');
+        $suite->addTestSuite('PartBlockTest');
+ 		
+        return $suite;
+    }
+}
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/simple.at.php b/recess/test/recess/framework/helpers/simple.at.php
new file mode 100644
index 0000000..1065390
--- /dev/null
+++ b/recess/test/recess/framework/helpers/simple.at.php
@@ -0,0 +1,10 @@
+<?php
+ AssertiveTemplate	::	input	( $title , 'string' ) ;
+AssertiveTemplate::input($aBlock, 'Block');
+AssertiveTemplate	:: input (	$max,	'int',	1	)	;
+
+echo "$block\n";
+for($i = 0; $i < $max; $i++) {
+	echo "$title\n";
+}
+?>
diff --git a/recess/test/recess/framework/helpers/test-layouts/context.layout.php b/recess/test/recess/framework/helpers/test-layouts/context.layout.php
new file mode 100644
index 0000000..f01d394
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/context.layout.php
@@ -0,0 +1,4 @@
+<?php
+Layout::input($context, 'string');
+echo $context;
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/context.php b/recess/test/recess/framework/helpers/test-layouts/context.php
new file mode 100644
index 0000000..1086be9
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/context.php
@@ -0,0 +1,3 @@
+<?php
+Layout::extend('context');
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/defaults.layout.php b/recess/test/recess/framework/helpers/test-layouts/defaults.layout.php
new file mode 100644
index 0000000..543aa05
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/defaults.layout.php
@@ -0,0 +1,4 @@
+<?php
+Layout::input($default, 'string', 'great success');
+echo $default;
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/defaults.php b/recess/test/recess/framework/helpers/test-layouts/defaults.php
new file mode 100644
index 0000000..53a9485
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/defaults.php
@@ -0,0 +1,3 @@
+<?php
+Layout::extend('defaults');
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/middle.layout.php b/recess/test/recess/framework/helpers/test-layouts/middle.layout.php
new file mode 100644
index 0000000..eb4573d
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/middle.layout.php
@@ -0,0 +1,6 @@
+<?php
+Layout::extend('middle.master');
+Layout::input($string, 'string');
+$string .= ' middle';
+$number = 2;
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/middle.master.layout.php b/recess/test/recess/framework/helpers/test-layouts/middle.master.layout.php
new file mode 100644
index 0000000..775b9dc
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/middle.master.layout.php
@@ -0,0 +1,8 @@
+<?php
+Layout::input($string, 'string');
+Layout::input($number, 'int');
+$string .= ' master';
+for($i = 0; $i < $number ; $i++) {
+	echo $string;
+}
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/middle.php b/recess/test/recess/framework/helpers/test-layouts/middle.php
new file mode 100644
index 0000000..60f1bbb
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/middle.php
@@ -0,0 +1,4 @@
+<?php
+Layout::extend('middle');
+$string = 'child';
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/multiple.layout.php b/recess/test/recess/framework/helpers/test-layouts/multiple.layout.php
new file mode 100644
index 0000000..323370c
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/multiple.layout.php
@@ -0,0 +1,11 @@
+<?php
+Layout::input($string, 'string');
+Layout::input($int, 'int');
+Layout::input($object, 'ReallyObnoxiousClass');
+
+if($string == 'foo' && $int == 1 && get_class($object) == 'ReallyObnoxiousClass') {
+	echo 'great success';
+} else {
+	echo 'fail.';
+}
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/multiple.php b/recess/test/recess/framework/helpers/test-layouts/multiple.php
new file mode 100644
index 0000000..4c0c29d
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/multiple.php
@@ -0,0 +1,10 @@
+<?php
+Layout::extend('multiple');
+
+$int = 1;
+$string = 'foo';
+
+class ReallyObnoxiousClass { }
+$object = new ReallyObnoxiousClass();
+
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/simple.layout.php b/recess/test/recess/framework/helpers/test-layouts/simple.layout.php
new file mode 100644
index 0000000..fbf5367
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/simple.layout.php
@@ -0,0 +1,4 @@
+<?php
+Layout::input($string, 'string');
+echo $string;
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-layouts/simple.php b/recess/test/recess/framework/helpers/test-layouts/simple.php
new file mode 100644
index 0000000..5fb68b0
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-layouts/simple.php
@@ -0,0 +1,4 @@
+<?php
+Layout::extend('simple');
+$string = 'simple';
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-parts/multi-input.part.php b/recess/test/recess/framework/helpers/test-parts/multi-input.part.php
new file mode 100644
index 0000000..86d4aa4
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-parts/multi-input.part.php
@@ -0,0 +1,9 @@
+<?php
+Part::input($first, 'string');
+Part::input($second, 'int');
+Part::input($third, 'string');
+
+for($i = 0; $i < $second; $i++) {
+	echo $first . $third;
+}
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-parts/optional-inputs.part.php b/recess/test/recess/framework/helpers/test-parts/optional-inputs.part.php
new file mode 100644
index 0000000..b64c599
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-parts/optional-inputs.part.php
@@ -0,0 +1,5 @@
+<?php
+Part::input($optional, 'string', 'default');
+if($optional == 'default') { echo 'default'; }
+else { echo 'non-default'; }
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-parts/single-input.part.php b/recess/test/recess/framework/helpers/test-parts/single-input.part.php
new file mode 100644
index 0000000..fa10f96
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-parts/single-input.part.php
@@ -0,0 +1,4 @@
+<?php
+Part::input($one, 'string');
+echo $one;
+?>
\ No newline at end of file
diff --git a/recess/test/recess/framework/helpers/test-parts/zero-input.part.php b/recess/test/recess/framework/helpers/test-parts/zero-input.part.php
new file mode 100644
index 0000000..1f9a622
--- /dev/null
+++ b/recess/test/recess/framework/helpers/test-parts/zero-input.part.php
@@ -0,0 +1,3 @@
+<?php
+echo 'no input';
+?>
\ No newline at end of file
