diff --git a/forumdirectory/forumdirectory.css b/forumdirectory/forumdirectory.css
new file mode 100644
index 000000000..c3c848569
--- /dev/null
+++ b/forumdirectory/forumdirectory.css
@@ -0,0 +1,67 @@
+
+section .forumdirectory-item dl {
+  height: auto;
+  overflow: auto;	
+}
+
+section .forumdirectory-item dt {
+  float: left;
+  margin-left: 0px;
+  text-align: right;
+  color: #999;
+}
+section .forumdirectory-item dd {
+  float: left;
+  margin-left: 5px;
+}
+.forumdirectory-profile-wrapper {
+  float: left;
+  /*max-height: 178px; */
+  overflow: hidden;
+  width: 500px;
+  margin: 0px 20px;
+}
+.forumdirectory-copy-wrapper {
+  float: left;
+  overflow: hidden;	
+}
+
+.forumdirectory-item {
+  float: left;
+  width: 800px;
+ /* height: 200px; */
+  box-shadow: 8px 8px 4px #000;
+  margin-top: 30px;
+  border: solid 1px #222;
+}
+section .forumdirectory-photo-wrapper {
+  float: left;
+  height: 200px;
+  width: 165px;	
+}
+
+.forumcontact-name {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: -3px;
+  text-align: left;
+}
+
+.page-type {
+  font-size: 10px;
+  font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+  float: left;	
+  width: 305px;
+  margin-right: 10px;  
+}
+.directory-profile-wrapper dl {
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+.directory-profile-title {
+  font-weight: bold;
+  margin-bottom: 3px;
+  font-size: 14px;
+} 
diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
new file mode 100644
index 000000000..344846abd
--- /dev/null
+++ b/forumdirectory/forumdirectory.php
@@ -0,0 +1,201 @@
+<?php
+/**
+* Name: Forum Directory
+* Description: Add a directory of forums hosted on your server, with verbose descriptions.
+* Version: 1.0
+* Author: Thomas Willingham
+*/
+
+function forumdirectory_install() {
+register_hook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
+}
+
+function forumdirectory_uninstall() {
+unregister_hook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
+}
+
+function forumdirectory_module() {
+return;
+}
+
+function forumdirectory_init(&$a) {
+	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/forumdirectory/forumdirectory.css" media="all" />';
+
+	$a->set_pager_itemspage(60);
+
+	if(local_user()) {
+		require_once('include/contact_widgets.php');
+
+		$a->page['aside'] .= findpeople_widget();
+
+	}
+	else
+		unset($_SESSION['theme']);
+
+
+}
+
+
+function forumdirectory_post(&$a) {
+	if(x($_POST,'search'))
+		$a->data['search'] = $_POST['search'];
+}
+
+
+
+function forumdirectory_content(&$a) {
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		notice( t('Public access denied.') . EOL);
+		return;
+	}
+
+	$o = '';
+	nav_set_selected('directory');
+
+	if(x($a->data,'search'))
+		$search = notags(trim($a->data['search']));
+	else
+		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+
+	$tpl = get_markup_template('directory_header.tpl');
+
+	$globaldir = '';
+	$gdirpath = dirname(get_config('system','directory_submit_url'));
+	if(strlen($gdirpath)) {
+		$globaldir = '<ul><li><div id="global-directory-link"><a href="'
+		. zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
+	}
+
+	$admin = '';
+
+	$o .= replace_macros($tpl, array(
+		'$search' => $search,
+		'$globaldir' => $globaldir,
+		'$desc' => t('Find on this site'),
+		'$admin' => $admin,
+		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
+		'$sitedir' => t('Site Directory'),
+		'$submit' => t('Find')
+	));
+
+	if($search)
+		$search = dbesc($search);
+	$sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`pub_keywords`,`prv_keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+
+	$publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
+
+
+	$r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `page-flags` = 2 $sql_extra ");
+	if(count($r))
+		$a->set_pager_total($r[0]['total']);
+
+	$order = " ORDER BY `name` ASC "; 
+
+
+	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `page-flags` = 2 $sql_extra $order LIMIT %d , %d ",
+		intval($a->pager['start']),
+		intval($a->pager['itemspage'])
+	);
+	if(count($r)) {
+
+		if(in_array('small', $a->argv))
+			$photo = 'thumb';
+		else
+			$photo = 'photo';
+
+		foreach($r as $rr) {
+
+
+			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+		
+			$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
+
+			$details = '';
+			if(strlen($rr['locality']))
+				$details .= $rr['locality'];
+			if(strlen($rr['region'])) {
+				if(strlen($rr['locality']))
+					$details .= ', ';
+				$details .= $rr['region'];
+			}
+			if(strlen($rr['country-name'])) {
+				if(strlen($details))
+					$details .= ', ';
+				$details .= $rr['country-name'];
+			}
+			if(strlen($rr['dob'])) {
+				if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
+					$details .= '<br />' . t('Age: ') . $years ; 
+			}
+			if(strlen($rr['gender']))
+				$details .= '<br />' . t('Gender: ') . $rr['gender'];
+
+			if($rr['page-flags'] == PAGE_NORMAL)
+				$page_type = "Personal Profile";
+			if($rr['page-flags'] == PAGE_SOAPBOX)
+				$page_type = "Fan Page";
+			if($rr['page-flags'] == PAGE_COMMUNITY)
+				$page_type = "Community Forum";
+			if($rr['page-flags'] == PAGE_FREELOVE)
+				$page_type = "Open Forum";
+			if($rr['page-flags'] == PAGE_PRVGROUP)
+				$page_type = "Private Group";
+
+			$profile = $rr;
+
+			if((x($profile,'address') == 1)
+				|| (x($profile,'locality') == 1)
+				|| (x($profile,'region') == 1)
+				|| (x($profile,'postal-code') == 1)
+				|| (x($profile,'country-name') == 1))
+			$location = t('Location:');
+
+			$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
+
+			$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
+
+			$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
+
+			$about = ((x($profile,'about') == 1) ?  t('About:') : False);
+			
+			$tpl = file_get_contents( dirname(__file__).'/forumdirectory_item.tpl');
+
+			$entry = replace_macros($tpl,array(
+				'$id' => $rr['id'],
+				'$profile-link' => $profile_link,
+				'$photo' => $a->get_cached_avatar_image($rr[$photo]),
+				'$alt-text' => $rr['name'],
+				'$name' => $rr['name'],
+				'$details' => $pdesc . $details,
+				'$page-type' => $page_type,
+				'$profile' => $profile,
+				'$location' => template_escape($location),
+				'$gender'   => $gender,
+				'$pdesc'	=> $pdesc,
+				'$marital'  => $marital,
+				'$homepage' => $homepage,
+				'$about' => $about,
+
+			));
+
+			$arr = array('contact' => $rr, 'entry' => $entry);
+
+			call_hooks('directory_item', $arr);
+			
+			unset($profile);
+			unset($location);
+
+			$o .= $entry;
+
+		}
+
+		$o .= "<div class=\"directory-end\" ></div>\r\n";
+		$o .= paginate($a);
+
+	}
+	else
+		info( t("No entries \x28some entries may be hidden\x29.") . EOL);
+
+	return $o;
+}
diff --git a/forumdirectory/forumdirectory_item.tpl b/forumdirectory/forumdirectory_item.tpl
new file mode 100755
index 000000000..3b24d25f2
--- /dev/null
+++ b/forumdirectory/forumdirectory_item.tpl
@@ -0,0 +1,42 @@
+
+<div class="forumdirectory-item" id="forumdirectory-item-$id" >
+	<div class="forumdirectory-photo-wrapper" id="forumdirectory-photo-wrapper-$id" > 
+		<div class="forumdirectory-photo" id="forumdirectory-photo-$id" >
+			<a href="$profile-link" class="forumdirectory-profile-link" id="forumdirectory-profile-link-$id" >
+				<img class="forumdirectory-photo-img photo" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+	<div class="forumdirectory-profile-wrapper" id="forumdirectory-profile-wrapper-$id" >
+		<div class="contact-name" id="forumdirectory-name-$id">$name</div>
+		<div class="page-type">$page-type</div>
+		{{ if $pdesc }}<div class="forumdirectory-profile-title">$profile.pdesc</div>{{ endif }}
+    	<div class="forumdirectory-detailcolumns-wrapper" id="forumdirectory-detailcolumns-wrapper-$id">
+        	<div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn1-wrapper-$id">	
+			{{ if $location }}
+			    <dl class="location"><dt class="location-label">$location</dt>
+				<dd class="adr">
+					{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+					<span class="city-state-zip">
+						<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+						<span class="region">$profile.region</span>
+						<span class="postal-code">$profile.postal-code</span>
+					</span>
+					{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+				</dd>
+				</dl>
+			{{ endif }}
+
+			{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+			</div>	
+			<div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn2-wrapper-$id">	
+				{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+				{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+			</div>
+		</div>
+	  	<div class="forumdirectory-copy-wrapper" id="forumdirectory-copy-wrapper-$id" >
+			{{ if $about }}<dl class="forumdirectory-copy"><dt class="forumdirectory-copy-label">$about</dt><dd class="forumdirectory-copy-data">$profile.about</dd></dl>{{ endif }}
+  		</div>
+	</div>
+</div>