diff --git a/trunk/BTS2.php b/trunk/BTS2.php
new file mode 100644
index 0000000..b619d2f
--- /dev/null
+++ b/trunk/BTS2.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * BTS2 - Bill's Template System for PHP 5
+ * 
+ * A very simple Smarty-like template sytem
+ * 
+ * PHP Version 5
+ * 
+ * @category  HTML
+ * @package   BTS2
+ * @author    Bill Shupp <hostmaster@shupp.org> 
+ * @copyright 2006-2008 Bill Shupp
+ * @license   GPL 2.0  {@link http://www.gnu.org/licenses/gpl.txt}
+ * @link      http://shupp.org/bts
+ */
+
+require_once 'BTS2/Exception.php';
+
+/**
+ * BTS2 
+ * 
+ * @category  HTML
+ * @package   BTS2
+ * @author    Bill Shupp <hostmaster@shupp.org> 
+ * @copyright 2006-2008 Bill Shupp
+ * @license   GPL 2.0  {@link http://www.gnu.org/licenses/gpl.txt}
+ * @link      http://shupp.org/bts
+ */
+class BTS2
+{
+    /**
+     * data 
+     * 
+     * Where all data is stored
+     * 
+     * @var array
+     * @access public
+     */
+    protected $data = array();
+
+    /**
+     * templateDir 
+     * 
+     * Location of template directory
+     * 
+     * @var string
+     * @access protected
+     */
+    protected $templateDir = null;
+
+    /**
+     * __constructor
+     * 
+     * Setup
+     * 
+     * @param string $templateDir Teamplates directory
+     * 
+     * @access public
+     * @return void
+     */
+    public function __construct($templateDir = './templates')
+    {
+        $this->templateDir      = $templateDir;
+        $this->data['php_self'] = $_SERVER['PHP_SELF'];
+    }
+
+    /**
+     * __set 
+     * 
+     * @param mixed $key data array key
+     * @param mixed $val data array value
+     * 
+     * @access public
+     * @return void
+     */
+    public function __set($key, $val)
+    {
+        $this->data[$key] = $val;
+    }
+
+    /**
+     * __get 
+     * 
+     * @param mixed $key data array key
+     * 
+     * @access public
+     * @return void
+     */
+    public function __get($key)
+    {
+        if (isset($this->data[$key])) {
+            return $this->data[$key];
+        }
+        return null;
+    }
+
+    /**
+     * assign 
+     * 
+     * Assign a variable to $data
+     * 
+     * @param mixed $name  variable name
+     * @param mixed $value variable value
+     * 
+     * @access public
+     * @return void
+     */
+    public function assign($name, $value)
+    {
+        $this->data[$name] = $value;
+    }
+
+    /**
+     * getContents 
+     * 
+     * return the parsed PHP contents of a file
+     * 
+     * @param string $file filename
+     * 
+     * @access protected
+     * @throws BTS2_Exception if $file is not readable
+     * @return string
+     */
+    protected function getContents($file)
+    {
+        $path = $this->templateDir . DIRECTORY_SEPARATOR . $file;
+        if (!is_readable($path)) {
+            throw new BTS2_Exception("BTS2 Error: Could not retrieve $path");
+        } else {
+            // Get contents and parse PHP
+            foreach ($this->data as $key => $val) {
+                $$key = $val;
+            }
+            ob_start();
+            include $path;
+            $buffer = ob_get_contents();
+            ob_end_clean();
+            return $buffer;
+        }
+    }
+
+    /**
+     * parse 
+     * 
+     * Parse template data
+     * 
+     * @param mixed $data contents to parse
+     * 
+     * @protected
+     * @return $data
+     */
+    protected function parse($data)
+    {
+        // Replace Tags
+        foreach ($this->data as $key => $value) {
+            if (is_array($value)) {
+                $re   = '/{[$]*' . trim($key) . '}/i';
+                $data = preg_replace($re, 'Array', $data);
+                foreach ($value as $ar_key => $ar_val) {
+                    $re   = '/{[$]*' . trim($key) . '.' . trim($ar_key) . '}/i';
+                    $data = preg_replace($re, trim($ar_val), $data);
+                }
+            } else {
+                $re   = '/{[$]*' . trim($key) .'}/i';
+                $data = preg_replace($re, trim($value), $data);
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * display 
+     * 
+     * Output data using print() if second argument is 0.
+     * Otherwise, return the data to the caller
+     * 
+     * @param mixed $file   filename
+     * @param bool  $return whether to return rather than display
+     * 
+     * @access public
+     * @throws BTS2_Exception bubbles up from $this->getContents()
+     * @return mixed string $data or void
+     */
+    public function display($file, $return = false)
+    {
+        $data = $this->getContents($file);
+        $data = $this->parse($data);
+        if ($return == true) {
+            return $data;
+        }
+        print ($data);
+    }
+
+    /**
+     * selectOptions 
+     * 
+     * Determinte which option is selected in an array, output
+     * as an <option> list
+     * 
+     * @param mixed $opts        options array
+     * @param mixed $selectedOpt selected option
+     * 
+     * @access public
+     * @return void
+     */
+    public function selectOptions($opts, $selectedOpt)
+    {
+        $out = '';
+        foreach ($opts as $key => $val) {
+            $selected = '';
+            if ($val == $selectedOpt) {
+                $selected = ' selected';
+            }
+            $out .= "<option$selected>$val\n";
+        }
+        return $out;
+    }
+
+    /**
+     * cycle 
+     * 
+     * Simple function for cycling items like bgcolor in a foreach loop
+     * Derived from the Smarty Plugin by Monte Ohrt
+     * 
+     * @param mixed  $values bgcolor values
+     * @param string $name   name
+     * 
+     * @access public
+     * @return void
+     */
+    public function cycle($values, $name = 'default')
+    {
+        static $cycleVars;
+        if (isset($cycleVars[$name]['values']) 
+            && $cycleVars[$name]['values'] != $values) {
+            $cycleVars[$name]['index'] = 0;
+        }
+        $cycleVars[$name]['values'] = $values;
+
+        $cycleArray = explode(',', $cycleVars[$name]['values']);
+        if (!isset($cycleVars[$name]['index'])) {
+            $cycleVars[$name]['index'] = 0;
+        }
+        $retval = $cycleArray[$cycleVars[$name]['index']];
+        if ($cycleVars[$name]['index'] >= count($cycleArray) -1) {
+            $cycleVars[$name]['index'] = 0;
+        } else {
+            $cycleVars[$name]['index']++;
+        }
+        return $retval;
+    }
+}
+?>
diff --git a/trunk/BTS2/Exception.php b/trunk/BTS2/Exception.php
new file mode 100644
index 0000000..6f641fd
--- /dev/null
+++ b/trunk/BTS2/Exception.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * BTS2_Exception 
+ * 
+ * Exception class for BTS2
+ * 
+ * PHP Version 5
+ * 
+ * @category  HTML
+ * @package   BTS2
+ * @uses      Exception
+ * @author    Bill Shupp <hostmaster@shupp.org> 
+ * @copyright 2008 Bill Shupp
+ * @license   GPL 2.0  {@link http://www.gnu.org/licenses/gpl.txt}
+ * @link      http://shupp.org/bts
+ */
+
+
+/**
+ * BTS2_Exception 
+ * 
+ * Exception class for BTS2
+ * 
+ * @category  HTML
+ * @package   BTS2
+ * @uses      Exception
+ * @author    Bill Shupp <hostmaster@shupp.org> 
+ * @copyright 2008 Bill Shupp
+ * @license   GPL 2.0  {@link http://www.gnu.org/licenses/gpl.txt}
+ * @link      http://shupp.org/bts
+ */
+class BTS2_Exception extends Exception
+{
+}
+?>
diff --git a/trunk/examples/ex1.php b/trunk/examples/ex1.php
new file mode 100644
index 0000000..bf47001
--- /dev/null
+++ b/trunk/examples/ex1.php
@@ -0,0 +1,7 @@
+<?php
+require_once 'BTS2.php';
+$tpl = new BTS2('../examples/templates');;
+
+$tpl->assign('title', 'Welcome to my web site');
+$tpl->display('tpl1.tpl');
+?>
diff --git a/trunk/examples/ex2.php b/trunk/examples/ex2.php
new file mode 100644
index 0000000..b6af6a4
--- /dev/null
+++ b/trunk/examples/ex2.php
@@ -0,0 +1,11 @@
+<?php
+
+$name_array = array('first' => 'bill', 'last' => 'shupp');
+
+require_once 'BTS2.php';
+$tpl = new BTS2;
+
+$tpl->assign('title', 'Welcome to my web site');
+$tpl->assign('name', $name_array);
+$tpl->display('tpl2.tpl');
+?>
diff --git a/trunk/examples/ex3.php b/trunk/examples/ex3.php
new file mode 100644
index 0000000..982df9d
--- /dev/null
+++ b/trunk/examples/ex3.php
@@ -0,0 +1,15 @@
+<?php
+
+$names_array[0] = array('first' => 'John', 'last' => 'Parker');
+$names_array[1] = array('first' => 'Matt', 'last' => 'Timmons');
+$names_array[2] = array('first' => 'Joe', 'last' => 'Shmoe');
+$names_array[3] = array('first' => 'Fred', 'last' => 'Hamilton');
+
+require_once 'BTS2.php';
+$tpl = new BTS2;
+
+$tpl->assign('title', "Here's a List of names, with cycling tr bgcolors:");
+$tpl->assign('names', $names_array);
+$out = $tpl->display('tpl3.tpl', 1);
+echo $out;
+?>
diff --git a/trunk/examples/ex4.php b/trunk/examples/ex4.php
new file mode 100644
index 0000000..d7b6a34
--- /dev/null
+++ b/trunk/examples/ex4.php
@@ -0,0 +1,17 @@
+<?php
+
+$names_array[0] = 'bill';
+$names_array[1] = 'david';
+$names_array[2] = 'bob';
+$names_array[3] = 'steve';
+$names_array[4] = 'mike';
+
+require_once 'BTS2.php';
+$tpl = new BTS2;
+
+$tpl->assign('title', "Here's a List of names, with cycling tr bgcolors:");
+$tpl->assign('names', $names_array);
+$tpl->assign('name_selected', 'steve');
+$out = $tpl->display('tpl4.tpl', 1);
+echo $out;
+?>
diff --git a/trunk/examples/templates/tpl1.tpl b/trunk/examples/templates/tpl1.tpl
new file mode 100644
index 0000000..a463ec8
--- /dev/null
+++ b/trunk/examples/templates/tpl1.tpl
@@ -0,0 +1,5 @@
+<html>
+    <body>
+    {title}
+    </body>
+</html>
diff --git a/trunk/examples/templates/tpl2.tpl b/trunk/examples/templates/tpl2.tpl
new file mode 100644
index 0000000..c52877c
--- /dev/null
+++ b/trunk/examples/templates/tpl2.tpl
@@ -0,0 +1,7 @@
+<html>
+    <body>
+    {title}
+
+    My name is {name.first} {name.last}
+    </body>
+</html>
diff --git a/trunk/examples/templates/tpl3.tpl b/trunk/examples/templates/tpl3.tpl
new file mode 100644
index 0000000..b2274cc
--- /dev/null
+++ b/trunk/examples/templates/tpl3.tpl
@@ -0,0 +1,18 @@
+<html>
+    <body>
+    {title}
+
+<table>
+    <tr>
+        <td>First Name</td>
+        <td>Last Name</td>
+    </tr>
+<? foreach($names as $n): ?>
+    <tr bgcolor="<?= $this->cycle("#cccccc,#fefefe,#666666")?>">
+        <td><?= htmlentities($n['first'])?></td>
+        <td><?= $n['last']?></td>
+    </tr>
+<? endforeach?>
+</table>
+    </body>
+</html>
diff --git a/trunk/examples/templates/tpl4.tpl b/trunk/examples/templates/tpl4.tpl
new file mode 100644
index 0000000..9e1ad06
--- /dev/null
+++ b/trunk/examples/templates/tpl4.tpl
@@ -0,0 +1,14 @@
+<html>
+    <body>
+    {title}
+
+<table>
+    <tr>
+        <td bgcolor="<?= $this->cycle("#eeeeee,#dddddd") ?>">Select Name</td>
+        <td><select name=names><?= $this->selectOptions($names, $name_selected)?></select></td>
+        <td bgcolor="<?= $this->cycle("#eeeeee,#dddddd") ?>">Select Name</td>
+        <td><select name=names><?= $this->selectOptions($names, $name_selected)?></select></td>
+    </tr>
+</table>
+    </body>
+</html>
diff --git a/trunk/package.xml b/trunk/package.xml
new file mode 100644
index 0000000..b752a82
--- /dev/null
+++ b/trunk/package.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.5.0" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd">
+ <name>BTS2</name>
+ <channel>pear.merchbox.com</channel>
+ <summary>Bill&apos;s Template System</summary>
+ <description>Very simple Smarty-like template system, but with only very basic features.
+ </description>
+ <lead>
+  <name>Bill Shupp</name>
+  <user>shupp</user>
+  <email>hostmaster@shupp.org</email>
+  <active>yes</active>
+ </lead>
+ <date>2008-01-13</date>
+ <time>10:44:00</time>
+ <version>
+  <release>0.6.0</release>
+  <api>0.5.0</api>
+ </version>
+ <stability>
+  <release>beta</release>
+  <api>beta</api>
+ </stability>
+ <license>GPL2.0 (http://www.gnu.org/licenses/gpl.txt)</license>
+ <notes>
+    * Switched to PCRE
+    * Removed protected keyword to make it work with PHP4
+    * Added examples from web site
+    * Coding style fixes
+    * Second argument to display() is now a bool
+ </notes>
+ <contents>
+  <dir name="/">
+   <file name="BTS2.php" role="php" />
+   <file baseinstalldir="doc/BTS2" name="examples/ex1.php" role="doc" />
+   <file baseinstalldir="doc/BTS2" name="examples/ex2.php" role="doc" />
+   <file baseinstalldir="doc/BTS2" name="examples/ex3.php" role="doc" />
+   <file baseinstalldir="doc/BTS2" name="examples/ex4.php" role="doc" />
+   <file baseinstalldir="doc/BTS2" name="examples/templates/tpl1.tpl" role="doc" />
+   <file baseinstalldir="doc/BTS2" name="examples/templates/tpl2.tpl" role="doc" />
+   <file baseinstalldir="doc/BTS2" name="examples/templates/tpl3.tpl" role="doc" />
+   <file baseinstalldir="doc/BTS2" name="examples/templates/tpl4.tpl" role="doc" />
+  </dir>
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>4.0.0</min>
+   </php>
+   <pearinstaller>
+    <min>1.4.0b1</min>
+   </pearinstaller>
+   <extension>
+     <name>pcre</name>
+   </extension>
+  </required>
+ </dependencies>
+ <phprelease />
+ <changelog>
+ <release>
+ <version>
+  <release>0.6.0</release>
+  <api>0.5.0</api>
+ </version>
+ <date>2008-01-13</date>
+ <stability>
+  <release>beta</release>
+  <api>beta</api>
+ </stability>
+ <license>GPL2.0 (http://www.gnu.org/licenses/gpl.txt)</license>
+ <notes>
+    * Switched to PCRE
+    * Removed protected keyword to make it work with PHP4
+    * Added examples from web site
+    * Coding style fixes
+    * Second argument to display() is now a bool
+ </notes>
+ </release>
+
+  <release>
+   <version>
+    <release>0.5</release>
+    <api>0.5</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>-2007-02-05</date>
+   <license>GPL2.0 (http://www.gnu.org/licenses/gpl.txt)</license>
+   <notes>Initial Release
+   </notes>
+  </release>
+ </changelog>
+</package>
diff --git a/trunk/test/001-construct.phpt b/trunk/test/001-construct.phpt
new file mode 100644
index 0000000..ebab84e
--- /dev/null
+++ b/trunk/test/001-construct.phpt
@@ -0,0 +1,26 @@
+--TEST--
+__construct()
+--FILE--
+<?php
+
+$templateDir = 'dir';
+$phpself     = '/somepath.php';
+
+$_SERVER['PHP_SELF'] = $phpself;
+
+require_once 'BTS2.php';
+class Test extends BTS2 {
+    public function getTemplateDir()
+    {
+        return $this->templateDir;
+    }
+}
+
+$bts = new Test($templateDir);
+var_dump($bts->getTemplateDir() == $templateDir);
+var_dump($bts->php_self == $phpself);
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
diff --git a/trunk/test/002-get-set.phpt b/trunk/test/002-get-set.phpt
new file mode 100644
index 0000000..4692f82
--- /dev/null
+++ b/trunk/test/002-get-set.phpt
@@ -0,0 +1,15 @@
+--TEST--
+__construct()
+--FILE--
+<?php
+
+$test = 'test';
+require_once 'BTS2.php';
+$bts = new BTS2;
+$bts->test = $test;
+var_dump($bts->test == $test);
+var_dump($bts->bogus == null);
+?>
+--EXPECT--
+bool(true)
+bool(true)
diff --git a/trunk/test/003-assign.phpt b/trunk/test/003-assign.phpt
new file mode 100644
index 0000000..92a2f90
--- /dev/null
+++ b/trunk/test/003-assign.phpt
@@ -0,0 +1,12 @@
+--TEST--
+__construct()
+--FILE--
+<?php
+
+require_once 'BTS2.php';
+$bts = new BTS2;
+$bts->assign('test', 'test');
+var_dump($bts->test == 'test');
+?>
+--EXPECT--
+bool(true)
diff --git a/trunk/test/ex1.php b/trunk/test/ex1.php
new file mode 100644
index 0000000..bf47001
--- /dev/null
+++ b/trunk/test/ex1.php
@@ -0,0 +1,7 @@
+<?php
+require_once 'BTS2.php';
+$tpl = new BTS2('../examples/templates');;
+
+$tpl->assign('title', 'Welcome to my web site');
+$tpl->display('tpl1.tpl');
+?>
diff --git a/trunk/test/ex2.php b/trunk/test/ex2.php
new file mode 100644
index 0000000..b6af6a4
--- /dev/null
+++ b/trunk/test/ex2.php
@@ -0,0 +1,11 @@
+<?php
+
+$name_array = array('first' => 'bill', 'last' => 'shupp');
+
+require_once 'BTS2.php';
+$tpl = new BTS2;
+
+$tpl->assign('title', 'Welcome to my web site');
+$tpl->assign('name', $name_array);
+$tpl->display('tpl2.tpl');
+?>
diff --git a/trunk/test/ex3.php b/trunk/test/ex3.php
new file mode 100644
index 0000000..982df9d
--- /dev/null
+++ b/trunk/test/ex3.php
@@ -0,0 +1,15 @@
+<?php
+
+$names_array[0] = array('first' => 'John', 'last' => 'Parker');
+$names_array[1] = array('first' => 'Matt', 'last' => 'Timmons');
+$names_array[2] = array('first' => 'Joe', 'last' => 'Shmoe');
+$names_array[3] = array('first' => 'Fred', 'last' => 'Hamilton');
+
+require_once 'BTS2.php';
+$tpl = new BTS2;
+
+$tpl->assign('title', "Here's a List of names, with cycling tr bgcolors:");
+$tpl->assign('names', $names_array);
+$out = $tpl->display('tpl3.tpl', 1);
+echo $out;
+?>
diff --git a/trunk/test/ex4.php b/trunk/test/ex4.php
new file mode 100644
index 0000000..d7b6a34
--- /dev/null
+++ b/trunk/test/ex4.php
@@ -0,0 +1,17 @@
+<?php
+
+$names_array[0] = 'bill';
+$names_array[1] = 'david';
+$names_array[2] = 'bob';
+$names_array[3] = 'steve';
+$names_array[4] = 'mike';
+
+require_once 'BTS2.php';
+$tpl = new BTS2;
+
+$tpl->assign('title', "Here's a List of names, with cycling tr bgcolors:");
+$tpl->assign('names', $names_array);
+$tpl->assign('name_selected', 'steve');
+$out = $tpl->display('tpl4.tpl', 1);
+echo $out;
+?>
diff --git a/trunk/test/templates/tpl1.tpl b/trunk/test/templates/tpl1.tpl
new file mode 100644
index 0000000..a463ec8
--- /dev/null
+++ b/trunk/test/templates/tpl1.tpl
@@ -0,0 +1,5 @@
+<html>
+    <body>
+    {title}
+    </body>
+</html>
diff --git a/trunk/test/templates/tpl2.tpl b/trunk/test/templates/tpl2.tpl
new file mode 100644
index 0000000..c52877c
--- /dev/null
+++ b/trunk/test/templates/tpl2.tpl
@@ -0,0 +1,7 @@
+<html>
+    <body>
+    {title}
+
+    My name is {name.first} {name.last}
+    </body>
+</html>
diff --git a/trunk/test/templates/tpl3.tpl b/trunk/test/templates/tpl3.tpl
new file mode 100644
index 0000000..b2274cc
--- /dev/null
+++ b/trunk/test/templates/tpl3.tpl
@@ -0,0 +1,18 @@
+<html>
+    <body>
+    {title}
+
+<table>
+    <tr>
+        <td>First Name</td>
+        <td>Last Name</td>
+    </tr>
+<? foreach($names as $n): ?>
+    <tr bgcolor="<?= $this->cycle("#cccccc,#fefefe,#666666")?>">
+        <td><?= htmlentities($n['first'])?></td>
+        <td><?= $n['last']?></td>
+    </tr>
+<? endforeach?>
+</table>
+    </body>
+</html>
diff --git a/trunk/test/templates/tpl4.tpl b/trunk/test/templates/tpl4.tpl
new file mode 100644
index 0000000..9e1ad06
--- /dev/null
+++ b/trunk/test/templates/tpl4.tpl
@@ -0,0 +1,14 @@
+<html>
+    <body>
+    {title}
+
+<table>
+    <tr>
+        <td bgcolor="<?= $this->cycle("#eeeeee,#dddddd") ?>">Select Name</td>
+        <td><select name=names><?= $this->selectOptions($names, $name_selected)?></select></td>
+        <td bgcolor="<?= $this->cycle("#eeeeee,#dddddd") ?>">Select Name</td>
+        <td><select name=names><?= $this->selectOptions($names, $name_selected)?></select></td>
+    </tr>
+</table>
+    </body>
+</html>