diff --git a/models/Client.php b/models/Client.php
new file mode 100644
index 000000000..894c80355
--- /dev/null
+++ b/models/Client.php
@@ -0,0 +1,62 @@
+<?php
+class ClientModel extends Doctrine_Record
+{
+	public function setTableDefinition() 
+    {
+		$this->setTableName('clients');
+
+		$this->hasColumn('id', 'integer', 4, array('notnull' => true,
+	                                           'primary' => true,
+	                                           'autoincrement' => true,
+	                                           'unsigned' => true));
+		$this->hasColumn('short_name', 'string', 32, array('notnull' => true, 'notblank', 'unique' => true));
+	}
+
+	public function setUp() 
+    {
+		$this->hasMany('AddressModel', array('local' => 'client_id', 'foreign' => 'address_id', 'refClass' => 'ClientToAddressModel'));
+	}
+}
+
+class ClientToAddressModel extends Doctrine_Record 
+{
+	public function setTableDefinition() 
+    {
+		$this->setTableName('clients_to_addresses');
+
+		$this->hasColumn('client_id', 'integer', 11, array('primary' => true));
+		$this->hasColumn('address_id', 'integer', 11, array('primary' => true));
+	}
+
+	public function construct()
+    {
+	}
+
+	public function setUp() 
+    {
+    	$this->hasOne('ClientModel', array('local' => 'client_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+    	$this->hasOne('AddressModel', array('local' => 'address_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+	}
+}
+
+class AddressModel extends Doctrine_Record 
+{
+	public function setTableDefinition() 
+    {
+		$this->setTableName('addresses');
+
+		$this->hasColumn('id', 'integer', 11, array('autoincrement' => true,
+													'primary'       => true
+													));
+		$this->hasColumn('address1', 'string', 255, array('notnull' => true, 'notblank'));
+		$this->hasColumn('address2', 'string', 255, array('notnull' => true));
+		$this->hasColumn('city', 'string', 255, array('notnull' => true, 'notblank'));
+		$this->hasColumn('state', 'string', 10, array('notnull' => true, 'notblank', 'usstate'));
+		$this->hasColumn('zip', 'string', 15, array('notnull' => true, 'notblank', 'regexp' => '/^[0-9-]*$/'));
+	}
+
+	public function setUp() 
+    {
+		$this->hasMany('ClientModel', array('local' => 'address_id', 'foreign' => 'client_id', 'refClass' => 'ClientToAddressModel'));
+	}
+}
diff --git a/models/SearchTest.php b/models/SearchTest.php
new file mode 100644
index 000000000..d33b5c575
--- /dev/null
+++ b/models/SearchTest.php
@@ -0,0 +1,16 @@
+<?php
+class SearchTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 100);
+        $this->hasColumn('content', 'string');
+    }
+    public function setUp()
+    {
+    	$options = array('generateFiles' => false,
+                         'fields' => array('title', 'content'));
+
+        $this->loadTemplate('Doctrine_Search_Template', $options);
+    }
+}