diff --git a/include/features.php b/include/features.php
new file mode 100644
index 000000000..6c4518526
--- /dev/null
+++ b/include/features.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * Features management
+ */
+
+
+function feature_enabled($uid,$feature) {
+	//return true;
+
+	$x = get_pconfig($uid,'feature',$feature);
+	$arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
+	call_hooks('feature_enabled',$arr);
+	return($arr['enabled']);
+}
+
+function get_features() {
+
+	$arr = array(
+
+		// General
+		'general' => array(
+			'General Features',
+			//array('expire',         t('Content Expiration'),		t('Remove old posts/comments after a period of time')),
+			array('multi_profiles', t('Multiple Profiles'),			t('Ability to create multiple profiles')),
+		),
+
+		// Post composition
+		'composition' => array(
+			'Post Composition Features',
+			array('richtext',       t('Richtext Editor'),			t('Enable richtext editor')),
+			array('preview',        t('Post Preview'),				t('Allow previewing posts and comments before publishing them')),
+		),
+
+		// Network sidebar widgets
+		'widgets' => array(
+			'Network Sidebar Widgets',
+			array('archives',       t('Search by Date'),			t('Ability to select posts by date ranges')),
+			array('groups',    		t('Group Filter'),				t('Enable widget to display Network posts only from selected group')),
+			array('networks',  		t('Network Filter'),			t('Enable widget to display Network posts only from selected network')),
+			array('savedsearch',    t('Saved Searches'),			t('Save search terms for re-use')),
+		),
+
+		// Network tabs
+		'net_tabs' => array(
+			'Network Tabs',
+			array('personal_tab',   t('Network Personal Tab'),		t('Enable tab to display only Network posts that you\'ve interacted on')),
+			array('new_tab',   		t('Network New Tab'),			t('Enable tab to display only new Network posts (from the last 12 hours)')),
+			array('link_tab',   	t('Network Shared Links Tab'),	t('Enable tab to display only Network posts with links in them')),
+		),
+
+		// Item tools
+		'tools' => array(
+			'Post/Comment Tools',
+			array('multi_delete',   t('Multiple Deletion'),			t('Select and delete multiple posts/comments at once')),
+			array('edit_posts',     t('Edit Sent Posts'),			t('Edit and correct posts and comments after sending')),
+			array('commtag',        t('Tagging'),					t('Ability to tag existing posts')),
+			array('categories',     t('Post Categories'),			t('Add categories to your posts')),
+			array('filing',         t('Saved Folders'),				t('Ability to file posts under folders')),
+			array('dislike',        t('Dislike Posts'),				t('Ability to dislike posts/comments')),
+			array('boring',         t('Mark Boring Posts'),			t('Ability to mark posts/comments boring')),
+			array('star_posts',     t('Star Posts'),				t('Ability to mark special posts with a star indicator')),
+		),
+	);
+
+	call_hooks('get_features',$arr);
+	return $arr;
+}
diff --git a/view/settings_features.tpl b/view/settings_features.tpl
new file mode 100644
index 000000000..4065d8fc7
--- /dev/null
+++ b/view/settings_features.tpl
@@ -0,0 +1,20 @@
+<h1>$title</h1>
+
+
+<form action="settings/features" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+{{ for $features as $f }}
+<h3 class="settings-heading">$f.0</h3>
+
+{{ for $f.1 as $fcat }}
+	{{ inc $field_yesno with $field=$fcat }}{{endinc}}
+{{ endfor }}
+{{ endfor }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-features-submit" value="$submit" />
+</div>
+
+</form>
+