diff --git a/mod/contacts.php b/mod/contacts.php
index e6c2005e06..9441f3457a 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -95,6 +95,10 @@ function contacts_content(&$a) {
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d",
 		intval($_SESSION['uid']));
 
+define ( 'DIRECTION_IN',   0);
+define ( 'DIRECTION_OUT',  1);
+define ( 'DIRECTION_BOTH', 2);
+
 	if(count($r)) {
 
 		$tpl = file_get_contents("view/contact_template.tpl");
@@ -102,11 +106,32 @@ function contacts_content(&$a) {
 		foreach($r as $rr) {
 			if($rr['self'])
 				continue;
+			$direction = '';
+			if(strlen($rr['dfrn-id'])) {
+				if(strlen($rr['ret-id'])) {
+					$direction = DIRECTION_BOTH;
+					$dir_icon = 'images/lrarrow.gif';
+					$alt_text = 'Mutual Friendship';
+				}
+				else {
+					$direction = DIRECTION_OUT;
+					$dir_icon = 'images/rarrow.gif';
+					$alt_text = 'You are a fan of';
+				}
+			}
+			else {
+				$direction = DIRECTION_IN;
+				$dir_icon = 'images/larrow.gif';
+				$alt_text = 'is a fan of yours';
+			}
+
 			$o .= replace_macros($tpl, array(
 				'$id' => $rr['id'],
+				'$alt_text' => $alt_text,
+				'$dir_icon' => $dir_icon,
 				'$thumb' => $rr['thumb'], 
 				'$name' => $rr['name'],
-				'$url' => $rr['url']
+				'$url' => (($direction != DIRECTION_IN) ? "redir/{$rr['id']}" : $rr['url'] )
 			));
 		}
 	}
diff --git a/mod/directory.php b/mod/directory.php
new file mode 100644
index 0000000000..94a826e235
--- /dev/null
+++ b/mod/directory.php
@@ -0,0 +1,24 @@
+<?php
+
+
+function directory_content(&$a) {
+
+
+	$tpl .= file_get_contents('view/directory_header');
+
+	$o .= replace_macros($tpl);
+
+	$r = q("SELECT * FORM `profile` WHERE `default` = 1 AND `publish` = 1");
+	if(count($r)) {
+
+		$tpl = file_get_contents('view/directory_item);
+
+		foreach($r as $rr) {
+
+			$o .= directory_block($a,$rr,$tpl);
+
+		}
+	}
+	else
+		notice("No entries (some entries may be hidden).");
+}
\ No newline at end of file
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index c590ba3d14..bfa901734b 100644
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -1,5 +1,6 @@
 
 <div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
+<img class="contact-entry-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
 <div class="contact-entry-photo" id="contact-entry-photo-$id" >
 	<a href="$url" title="Visit $name's profile" /><img src="$thumb" alt="$name" ></a>
 </div>