diff --git a/Default.tribo/Posts/2012-03-08-example-post.md b/Default.tribo/Posts/example-post/example-post.md
similarity index 100%
rename from Default.tribo/Posts/2012-03-08-example-post.md
rename to Default.tribo/Posts/example-post/example-post.md
diff --git a/Default.tribo/Posts/example-post/metadata.json b/Default.tribo/Posts/example-post/metadata.json
new file mode 100644
index 0000000..74db01d
--- /dev/null
+++ b/Default.tribo/Posts/example-post/metadata.json
@@ -0,0 +1 @@
+{"draft":true}
\ No newline at end of file
diff --git a/Mac App/Controllers/TBPostTableCellView.h b/Mac App/Controllers/TBPostTableCellView.h
new file mode 100644
index 0000000..bbe0844
--- /dev/null
+++ b/Mac App/Controllers/TBPostTableCellView.h	
@@ -0,0 +1,18 @@
+//
+//  TSPostTableCellView.h
+//  Tribo
+//
+//  Created by Tanner Smith on 9/4/13.
+//  Copyright (c) 2013 Opt-6 Products, LLC. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface TBPostTableCellView : NSTableCellView
+
+@property (assign) IBOutlet NSTextField *title;
+@property (assign) IBOutlet NSTextField *draft;
+@property (assign) IBOutlet NSTextField *date;
+@property (assign) IBOutlet NSTextField *postExcerpt;
+
+@end
diff --git a/Mac App/Controllers/TBPostTableCellView.m b/Mac App/Controllers/TBPostTableCellView.m
new file mode 100644
index 0000000..810f422
--- /dev/null
+++ b/Mac App/Controllers/TBPostTableCellView.m	
@@ -0,0 +1,52 @@
+//
+//  TSPostTableCellView.m
+//  Tribo
+//
+//  Created by Tanner Smith on 9/4/13.
+//  Copyright (c) 2013 Opt-6 Products, LLC. All rights reserved.
+//
+
+#import "TBPostTableCellView.h"
+
+#import "NSTextField+TBAdditions.h"
+
+@implementation TBPostTableCellView
+
+@synthesize title, date, draft, postExcerpt;
+
+- (id)initWithFrame:(NSRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        // Initialization code here.
+    }
+    
+    return self;
+}
+
+- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle {
+    switch (backgroundStyle) {
+        case NSBackgroundStyleDark: {
+            [title setTextColor:[NSColor whiteColor]];
+            [date setTextColor:[NSColor whiteColor]];
+            [draft setTextColor:[NSColor whiteColor]];
+            [postExcerpt setTextColor:[NSColor whiteColor]];
+            
+            [postExcerpt tb_setPlaceholderTextColor:[NSColor alternateSelectedControlColor]];
+            
+            break;
+        }
+        default: {
+            [title setTextColor:[NSColor blackColor]];
+            [date setTextColor:[NSColor alternateSelectedControlColor]];
+            [draft setTextColor:[NSColor grayColor]];
+            [postExcerpt setTextColor:[NSColor grayColor]];
+            
+            [postExcerpt tb_setPlaceholderTextColor:[NSColor grayColor]];
+
+            break;
+        }
+    }
+}
+
+@end
diff --git a/Mac App/Controllers/TBPostsView.xib b/Mac App/Controllers/TBPostsView.xib
index f2f1e78..d11885a 100644
--- a/Mac App/Controllers/TBPostsView.xib	
+++ b/Mac App/Controllers/TBPostsView.xib	
@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
 		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">4488.1</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
 		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">4488.1</string>
+			<string key="NS.object.0">3084</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBNSLayoutConstraint</string>
@@ -43,7 +43,7 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSView" id="262020719">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSScrollView" id="111634547">
@@ -60,7 +60,6 @@
 										<array class="NSMutableArray" key="NSSubviews"/>
 										<string key="NSFrameSize">{410, 360}</string>
 										<reference key="NSSuperview" ref="137612995"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="69636014"/>
 										<string key="NSReuseIdentifierKey">_NS:1828</string>
 										<bool key="NSEnabled">YES</bool>
@@ -135,7 +134,7 @@
 										</array>
 										<double key="NSIntercellSpacingWidth">3</double>
 										<double key="NSIntercellSpacingHeight">2</double>
-										<object class="NSColor" key="NSBackgroundColor" id="152584279">
+										<object class="NSColor" key="NSBackgroundColor">
 											<int key="NSColorSpace">3</int>
 											<bytes key="NSWhite">MQA</bytes>
 										</object>
@@ -163,7 +162,6 @@
 								</array>
 								<string key="NSFrameSize">{410, 360}</string>
 								<reference key="NSSuperview" ref="111634547"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="405033403"/>
 								<string key="NSReuseIdentifierKey">_NS:1826</string>
 								<reference key="NSDocView" ref="405033403"/>
@@ -175,7 +173,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 								<reference key="NSSuperview" ref="111634547"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="518927261"/>
 								<string key="NSReuseIdentifierKey">_NS:1845</string>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -188,8 +185,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{1, 119}, {223, 15}}</string>
 								<reference key="NSSuperview" ref="111634547"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:1847</string>
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								<int key="NSsFlags">1</int>
@@ -200,7 +195,6 @@
 						</array>
 						<string key="NSFrameSize">{410, 360}</string>
 						<reference key="NSSuperview" ref="262020719"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="137612995"/>
 						<string key="NSReuseIdentifierKey">_NS:1824</string>
 						<int key="NSsFlags">133680</int>
@@ -214,8 +208,6 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{410, 360}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="111634547"/>
 			</object>
 			<object class="NSMenu" id="117683742">
@@ -235,6 +227,14 @@
 							<string key="NSResourceName">NSMenuMixedState</string>
 						</object>
 					</object>
+					<object class="NSMenuItem" id="983684959">
+						<reference key="NSMenu" ref="117683742"/>
+						<string key="NSTitle">Draft</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="466303921"/>
+						<reference key="NSMixedImage" ref="202476203"/>
+					</object>
 					<object class="NSMenuItem" id="670666972">
 						<reference key="NSMenu" ref="117683742"/>
 						<string key="NSTitle">Preview in Safari</string>
@@ -276,6 +276,7 @@
 					<string>title</string>
 					<string>dateString</string>
 					<string>markdownContent</string>
+					<string>draft</string>
 				</array>
 				<string key="NSObjectClassName">TBPost</string>
 				<bool key="NSEditable">YES</bool>
@@ -329,6 +330,22 @@
 					</object>
 					<int key="connectionID">251</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">draftMenuItem</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="983684959"/>
+					</object>
+					<int key="connectionID">713</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">draft:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="983684959"/>
+					</object>
+					<int key="connectionID">714</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">deleteSelectedRows:</string>
@@ -337,6 +354,14 @@
 					</object>
 					<int key="connectionID">405</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="117683742"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">588</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">contentArray: document.site.posts</string>
@@ -395,9 +420,9 @@
 								<object class="NSTextField" id="35946243">
 									<reference key="NSNextResponder" ref="69636014"/>
 									<int key="NSvFlags">266</int>
-									<string key="NSFrame">{{17, 66}, {270, 17}}</string>
+									<string key="NSFrame">{{17, 66}, {178, 17}}</string>
 									<reference key="NSSuperview" ref="69636014"/>
-									<reference key="NSNextKeyView" ref="545181999"/>
+									<reference key="NSNextKeyView" ref="237441362"/>
 									<string key="NSReuseIdentifierKey">_NS:78</string>
 									<string key="NSAntiCompressionPriority">{250, 750}</string>
 									<bool key="NSEnabled">YES</bool>
@@ -422,28 +447,26 @@
 									</object>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
-								<object class="NSTextField" id="545181999">
+								<object class="NSTextField" id="187439019">
 									<reference key="NSNextResponder" ref="69636014"/>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{289, 66}, {101, 17}}</string>
 									<reference key="NSSuperview" ref="69636014"/>
-									<reference key="NSNextKeyView" ref="237441362"/>
+									<reference key="NSNextKeyView" ref="349074910"/>
 									<string key="NSReuseIdentifierKey">_NS:3944</string>
 									<string key="NSHuggingPriority">{750, 750}</string>
 									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="539272724">
+									<object class="NSTextFieldCell" key="NSCell" id="98032400">
 										<int key="NSCellFlags">68157504</int>
 										<int key="NSCellFlags2">71304256</int>
-										<string key="NSContents">Selected - Date</string>
+										<string key="NSContents">Draft</string>
 										<reference key="NSSupport" ref="715908122"/>
 										<string key="NSCellIdentifier">_NS:3944</string>
-										<reference key="NSControlView" ref="545181999"/>
+										<reference key="NSControlView" ref="187439019"/>
 										<reference key="NSBackgroundColor" ref="604588675"/>
-										<object class="NSColor" key="NSTextColor" id="290196275">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">highlightColor</string>
-											<reference key="NSColor" ref="152584279"/>
+										<object class="NSColor" key="NSTextColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MSAwIDAAA</bytes>
 										</object>
 									</object>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -451,9 +474,9 @@
 								<object class="NSTextField" id="237441362">
 									<reference key="NSNextResponder" ref="69636014"/>
 									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{289, 66}, {101, 17}}</string>
+									<string key="NSFrame">{{199, 66}, {191, 17}}</string>
 									<reference key="NSSuperview" ref="69636014"/>
-									<reference key="NSNextKeyView" ref="866606396"/>
+									<reference key="NSNextKeyView" ref="187439019"/>
 									<string key="NSReuseIdentifierKey">_NS:3944</string>
 									<string key="NSHuggingPriority">{750, 750}</string>
 									<bool key="NSEnabled">YES</bool>
@@ -477,27 +500,6 @@
 									</object>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 								</object>
-								<object class="NSTextField" id="866606396">
-									<reference key="NSNextResponder" ref="69636014"/>
-									<int key="NSvFlags">268</int>
-									<string key="NSFrame">{{17, 0}, {373, 63}}</string>
-									<reference key="NSSuperview" ref="69636014"/>
-									<reference key="NSNextKeyView" ref="349074910"/>
-									<string key="NSReuseIdentifierKey">_NS:360</string>
-									<string key="NSAntiCompressionPriority">{250, 750}</string>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSTextFieldCell" key="NSCell" id="398922892">
-										<int key="NSCellFlags">67108864</int>
-										<int key="NSCellFlags2">272630016</int>
-										<string key="NSContents">Post excerpt - selected</string>
-										<reference key="NSSupport" ref="715908122"/>
-										<string key="NSCellIdentifier">_NS:360</string>
-										<reference key="NSControlView" ref="866606396"/>
-										<reference key="NSBackgroundColor" ref="604588675"/>
-										<reference key="NSTextColor" ref="290196275"/>
-									</object>
-									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								</object>
 								<object class="NSTextField" id="349074910">
 									<reference key="NSNextResponder" ref="69636014"/>
 									<int key="NSvFlags">268</int>
@@ -537,40 +539,36 @@
 					<int key="connectionID">206</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: objectValue.dateString</string>
-						<reference key="source" ref="545181999"/>
-						<reference key="destination" ref="69636014"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="545181999"/>
-							<reference key="NSDestination" ref="69636014"/>
-							<string key="NSLabel">value: objectValue.dateString</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">objectValue.dateString</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">postExcerpt</string>
+						<reference key="source" ref="69636014"/>
+						<reference key="destination" ref="349074910"/>
 					</object>
-					<int key="connectionID">212</int>
+					<int key="connectionID">696</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: backgroundStyle</string>
-						<reference key="source" ref="545181999"/>
-						<reference key="destination" ref="69636014"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="545181999"/>
-							<reference key="NSDestination" ref="69636014"/>
-							<string key="NSLabel">hidden: backgroundStyle</string>
-							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">backgroundStyle</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NSNegateBoolean</string>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">date</string>
+						<reference key="source" ref="69636014"/>
+						<reference key="destination" ref="237441362"/>
+					</object>
+					<int key="connectionID">697</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">draft</string>
+						<reference key="source" ref="69636014"/>
+						<reference key="destination" ref="187439019"/>
+					</object>
+					<int key="connectionID">698</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">title</string>
+						<reference key="source" ref="69636014"/>
+						<reference key="destination" ref="35946243"/>
 					</object>
-					<int key="connectionID">213</int>
+					<int key="connectionID">699</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
@@ -593,7 +591,7 @@
 						<string key="label">hidden: backgroundStyle</string>
 						<reference key="source" ref="237441362"/>
 						<reference key="destination" ref="69636014"/>
-						<object class="NSNibBindingConnector" key="connector">
+						<object class="NSNibBindingConnector" key="connector" id="158695162">
 							<reference key="NSSource" ref="237441362"/>
 							<reference key="NSDestination" ref="69636014"/>
 							<string key="NSLabel">hidden: backgroundStyle</string>
@@ -602,7 +600,30 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">208</int>
+					<int key="connectionID">660</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden2: objectValue.draft</string>
+						<reference key="source" ref="237441362"/>
+						<reference key="destination" ref="69636014"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="237441362"/>
+							<reference key="NSDestination" ref="69636014"/>
+							<string key="NSLabel">hidden2: objectValue.draft</string>
+							<string key="NSBinding">hidden2</string>
+							<string key="NSKeyPath">objectValue.draft</string>
+							<dictionary key="NSOptions">
+								<integer value="-1" key="NSMultipleValuesPlaceholder"/>
+								<integer value="-1" key="NSNoSelectionPlaceholder"/>
+								<integer value="-1" key="NSNotApplicablePlaceholder"/>
+								<integer value="-1" key="NSNullPlaceholder"/>
+							</dictionary>
+							<reference key="NSPreviousConnector" ref="158695162"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">661</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
@@ -642,59 +663,66 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">hidden: backgroundStyle</string>
-						<reference key="source" ref="866606396"/>
+						<string key="label">value: objectValue.title</string>
+						<reference key="source" ref="35946243"/>
 						<reference key="destination" ref="69636014"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="866606396"/>
+							<reference key="NSSource" ref="35946243"/>
 							<reference key="NSDestination" ref="69636014"/>
-							<string key="NSLabel">hidden: backgroundStyle</string>
-							<string key="NSBinding">hidden</string>
-							<string key="NSKeyPath">backgroundStyle</string>
+							<string key="NSLabel">value: objectValue.title</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">objectValue.title</string>
 							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NSNegateBoolean</string>
+								<string key="NS.key.0">NSNullPlaceholder</string>
+								<string key="NS.object.0">(no title)</string>
 							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">214</int>
+					<int key="connectionID">410</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: objectValue.markdownContent</string>
-						<reference key="source" ref="866606396"/>
+						<string key="label">hidden: objectValue.draft</string>
+						<reference key="source" ref="187439019"/>
 						<reference key="destination" ref="69636014"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="866606396"/>
+						<object class="NSNibBindingConnector" key="connector" id="348195172">
+							<reference key="NSSource" ref="187439019"/>
 							<reference key="NSDestination" ref="69636014"/>
-							<string key="NSLabel">value: objectValue.markdownContent</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">objectValue.markdownContent</string>
+							<string key="NSLabel">hidden: objectValue.draft</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">objectValue.draft</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">215</int>
+					<int key="connectionID">523</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: objectValue.title</string>
-						<reference key="source" ref="35946243"/>
+						<string key="label">hidden2: backgroundStyle</string>
+						<reference key="source" ref="187439019"/>
 						<reference key="destination" ref="69636014"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="35946243"/>
+							<reference key="NSSource" ref="187439019"/>
 							<reference key="NSDestination" ref="69636014"/>
-							<string key="NSLabel">value: objectValue.title</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">objectValue.title</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSNullPlaceholder</string>
-								<string key="NS.object.0">(no title)</string>
-							</object>
+							<string key="NSLabel">hidden2: backgroundStyle</string>
+							<string key="NSBinding">hidden2</string>
+							<string key="NSKeyPath">backgroundStyle</string>
+							<dictionary key="NSOptions">
+								<integer value="-1" key="NSMultipleValuesPlaceholder"/>
+								<integer value="-1" key="NSNoSelectionPlaceholder"/>
+								<integer value="-1" key="NSNotApplicablePlaceholder"/>
+								<integer value="-1" key="NSNullPlaceholder"/>
+							</dictionary>
+							<reference key="NSPreviousConnector" ref="348195172"/>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">410</int>
+					<int key="connectionID">564</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -732,6 +760,7 @@
 							<reference ref="107642720"/>
 							<reference ref="788984813"/>
 							<reference ref="390935342"/>
+							<reference ref="983684959"/>
 						</array>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Post Context Menu</string>
@@ -777,7 +806,6 @@
 								<int key="scoringType">9</int>
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="6557545">
 								<reference key="firstItem" ref="111634547"/>
@@ -791,10 +819,9 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="262020719"/>
-								<int key="scoringType">0</int>
+								<int key="scoringType">8</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="150616630">
 								<reference key="firstItem" ref="111634547"/>
@@ -808,10 +835,9 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="262020719"/>
-								<int key="scoringType">0</int>
+								<int key="scoringType">8</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
 							</object>
 							<object class="IBNSLayoutConstraint" id="990598466">
 								<reference key="firstItem" ref="111634547"/>
@@ -825,10 +851,9 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="262020719"/>
-								<int key="scoringType">0</int>
+								<int key="scoringType">8</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
 							</object>
 						</array>
 						<reference key="parent" ref="0"/>
@@ -875,45 +900,11 @@
 						<int key="objectID">178</int>
 						<reference key="object" ref="69636014"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="335696821">
-								<reference key="firstItem" ref="237441362"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="35946243"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
-							</object>
-							<object class="IBNSLayoutConstraint" id="369722463">
-								<reference key="firstItem" ref="69636014"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="237441362"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">0</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
-							</object>
-							<object class="IBNSLayoutConstraint" id="311440364">
-								<reference key="firstItem" ref="545181999"/>
+							<object class="IBNSLayoutConstraint" id="305522227">
+								<reference key="firstItem" ref="187439019"/>
 								<int key="firstAttribute">11</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="35946243"/>
+								<reference key="secondItem" ref="237441362"/>
 								<int key="secondAttribute">11</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -924,14 +915,13 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
-								<bool key="placeholder">NO</bool>
 							</object>
-							<object class="IBNSLayoutConstraint" id="37336824">
-								<reference key="firstItem" ref="545181999"/>
-								<int key="firstAttribute">11</int>
+							<object class="IBNSLayoutConstraint" id="660288961">
+								<reference key="firstItem" ref="187439019"/>
+								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="237441362"/>
-								<int key="secondAttribute">11</int>
+								<reference key="secondItem" ref="349074910"/>
+								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
@@ -941,44 +931,25 @@
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
-								<bool key="placeholder">NO</bool>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1023581609">
-								<reference key="firstItem" ref="69636014"/>
+							<object class="IBNSLayoutConstraint" id="879922821">
+								<reference key="firstItem" ref="237441362"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="545181999"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">0</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
-							</object>
-							<object class="IBNSLayoutConstraint" id="695228678">
-								<reference key="firstItem" ref="545181999"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="35946243"/>
+								<reference key="secondItem" ref="187439019"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="69636014"/>
 								<int key="scoringType">6</int>
 								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
+								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1027347486">
-								<reference key="firstItem" ref="866606396"/>
+							<object class="IBNSLayoutConstraint" id="801999743">
+								<reference key="firstItem" ref="349074910"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="69636014"/>
@@ -989,13 +960,12 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">0</int>
+								<int key="scoringType">8</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
 							</object>
-							<object class="IBNSLayoutConstraint" id="952214032">
-								<reference key="firstItem" ref="866606396"/>
+							<object class="IBNSLayoutConstraint" id="79319131">
+								<reference key="firstItem" ref="349074910"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="69636014"/>
@@ -1006,33 +976,15 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">0</int>
+								<int key="scoringType">8</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
 							</object>
-							<object class="IBNSLayoutConstraint" id="841765391">
-								<reference key="firstItem" ref="866606396"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="349074910"/>
-								<int key="secondAttribute">3</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-								<bool key="placeholder">NO</bool>
-							</object>
-							<object class="IBNSLayoutConstraint" id="468765047">
+							<object class="IBNSLayoutConstraint" id="953755322">
 								<reference key="firstItem" ref="69636014"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="866606396"/>
+								<reference key="secondItem" ref="349074910"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -1040,61 +992,41 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">0</int>
+								<int key="scoringType">8</int>
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
 							</object>
-							<object class="IBNSLayoutConstraint" id="801999743">
-								<reference key="firstItem" ref="349074910"/>
-								<int key="firstAttribute">4</int>
+							<object class="IBNSLayoutConstraint" id="296268213">
+								<reference key="firstItem" ref="35946243"/>
+								<int key="firstAttribute">11</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="69636014"/>
-								<int key="secondAttribute">4</int>
+								<reference key="secondItem" ref="187439019"/>
+								<int key="secondAttribute">11</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">0</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="79319131">
-								<reference key="firstItem" ref="349074910"/>
+							<object class="IBNSLayoutConstraint" id="74407855">
+								<reference key="firstItem" ref="35946243"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="69636014"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">0</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
-							</object>
-							<object class="IBNSLayoutConstraint" id="953755322">
-								<reference key="firstItem" ref="69636014"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
 								<reference key="secondItem" ref="349074910"/>
-								<int key="secondAttribute">6</int>
+								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">0</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="595046925">
 								<reference key="firstItem" ref="35946243"/>
@@ -1111,30 +1043,11 @@
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
 							</object>
-							<object class="IBNSLayoutConstraint" id="288346165">
-								<reference key="firstItem" ref="35946243"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="69636014"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="69636014"/>
-								<int key="scoringType">0</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-								<bool key="placeholder">NO</bool>
-							</object>
-							<reference ref="545181999"/>
-							<reference ref="237441362"/>
 							<reference ref="349074910"/>
-							<reference ref="866606396"/>
 							<reference ref="35946243"/>
+							<reference ref="187439019"/>
+							<reference ref="237441362"/>
 						</array>
 						<reference key="parent" ref="275428091"/>
 					</object>
@@ -1143,79 +1056,27 @@
 						<reference key="object" ref="418709924"/>
 						<reference key="parent" ref="275428091"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">180</int>
-						<reference key="object" ref="695228678"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">181</int>
-						<reference key="object" ref="1023581609"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">182</int>
-						<reference key="object" ref="37336824"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">183</int>
-						<reference key="object" ref="545181999"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="539272724"/>
-						</array>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">184</int>
-						<reference key="object" ref="468765047"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">185</int>
-						<reference key="object" ref="311440364"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">186</int>
-						<reference key="object" ref="841765391"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">187</int>
-						<reference key="object" ref="952214032"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">188</int>
-						<reference key="object" ref="1027347486"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">189</int>
-						<reference key="object" ref="953755322"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">190</int>
-						<reference key="object" ref="79319131"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">191</int>
-						<reference key="object" ref="369722463"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">192</int>
-						<reference key="object" ref="335696821"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">193</int>
 						<reference key="object" ref="237441362"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="85870962"/>
+							<object class="IBNSLayoutConstraint" id="130417414">
+								<reference key="firstItem" ref="237441362"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">185</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="237441362"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
 						</array>
 						<reference key="parent" ref="69636014"/>
 					</object>
@@ -1224,30 +1085,8 @@
 						<reference key="object" ref="349074910"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="487405205"/>
-						</array>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">195</int>
-						<reference key="object" ref="801999743"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">196</int>
-						<reference key="object" ref="288346165"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">197</int>
-						<reference key="object" ref="595046925"/>
-						<reference key="parent" ref="69636014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">198</int>
-						<reference key="object" ref="866606396"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="593653361">
-								<reference key="firstItem" ref="866606396"/>
+							<object class="IBNSLayoutConstraint" id="927242920">
+								<reference key="firstItem" ref="349074910"/>
 								<int key="firstAttribute">8</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
@@ -1257,13 +1096,11 @@
 									<double key="value">63</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="866606396"/>
+								<reference key="containingView" ref="349074910"/>
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
-								<bool key="placeholder">NO</bool>
 							</object>
-							<reference ref="398922892"/>
 						</array>
 						<reference key="parent" ref="69636014"/>
 					</object>
@@ -1272,6 +1109,22 @@
 						<reference key="object" ref="35946243"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="672798422"/>
+							<object class="IBNSLayoutConstraint" id="95362289">
+								<reference key="firstItem" ref="35946243"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">172</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="35946243"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
 						</array>
 						<reference key="parent" ref="69636014"/>
 					</object>
@@ -1280,16 +1133,6 @@
 						<reference key="object" ref="672798422"/>
 						<reference key="parent" ref="35946243"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">201</int>
-						<reference key="object" ref="593653361"/>
-						<reference key="parent" ref="866606396"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">202</int>
-						<reference key="object" ref="398922892"/>
-						<reference key="parent" ref="866606396"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">203</int>
 						<reference key="object" ref="487405205"/>
@@ -1300,11 +1143,6 @@
 						<reference key="object" ref="85870962"/>
 						<reference key="parent" ref="237441362"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">205</int>
-						<reference key="object" ref="539272724"/>
-						<reference key="parent" ref="545181999"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">376</int>
 						<reference key="object" ref="238535976"/>
@@ -1335,6 +1173,107 @@
 						<reference key="object" ref="990598466"/>
 						<reference key="parent" ref="262020719"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">412</int>
+						<reference key="object" ref="187439019"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="98032400"/>
+							<object class="IBNSLayoutConstraint" id="94157932">
+								<reference key="firstItem" ref="187439019"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">95</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="187439019"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
+						<reference key="parent" ref="69636014"/>
+						<string key="objectName">Static Text - Draft</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">413</int>
+						<reference key="object" ref="98032400"/>
+						<reference key="parent" ref="187439019"/>
+						<string key="objectName">Text Field Cell - Draft</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">190</int>
+						<reference key="object" ref="79319131"/>
+						<reference key="parent" ref="69636014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">189</int>
+						<reference key="object" ref="953755322"/>
+						<reference key="parent" ref="69636014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">195</int>
+						<reference key="object" ref="801999743"/>
+						<reference key="parent" ref="69636014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">566</int>
+						<reference key="object" ref="595046925"/>
+						<reference key="parent" ref="69636014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">574</int>
+						<reference key="object" ref="983684959"/>
+						<reference key="parent" ref="117683742"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">654</int>
+						<reference key="object" ref="927242920"/>
+						<reference key="parent" ref="349074910"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">642</int>
+						<reference key="object" ref="94157932"/>
+						<reference key="parent" ref="187439019"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">663</int>
+						<reference key="object" ref="74407855"/>
+						<reference key="parent" ref="69636014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">700</int>
+						<reference key="object" ref="660288961"/>
+						<reference key="parent" ref="69636014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">701</int>
+						<reference key="object" ref="305522227"/>
+						<reference key="parent" ref="69636014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">703</int>
+						<reference key="object" ref="130417414"/>
+						<reference key="parent" ref="237441362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">707</int>
+						<reference key="object" ref="95362289"/>
+						<reference key="parent" ref="35946243"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">708</int>
+						<reference key="object" ref="296268213"/>
+						<reference key="parent" ref="69636014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">709</int>
+						<reference key="object" ref="879922821"/>
+						<reference key="parent" ref="69636014"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1356,66 +1295,65 @@
 				<array key="177.prototypeCellViews">
 					<reference ref="69636014"/>
 				</array>
-				<array key="178.IBNSViewMetadataConstraints">
-					<reference ref="288346165"/>
+				<string key="178.CustomClassName">TBPostTableCellView</string>
+				<array class="NSMutableArray" key="178.IBNSViewMetadataConstraints">
 					<reference ref="595046925"/>
+					<reference ref="74407855"/>
+					<reference ref="296268213"/>
 					<reference ref="953755322"/>
 					<reference ref="79319131"/>
 					<reference ref="801999743"/>
-					<reference ref="468765047"/>
-					<reference ref="841765391"/>
-					<reference ref="952214032"/>
-					<reference ref="1027347486"/>
-					<reference ref="695228678"/>
-					<reference ref="1023581609"/>
-					<reference ref="37336824"/>
-					<reference ref="311440364"/>
-					<reference ref="369722463"/>
-					<reference ref="335696821"/>
+					<reference ref="879922821"/>
+					<reference ref="660288961"/>
+					<reference ref="305522227"/>
 				</array>
 				<string key="178.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="178.userInterfaceItemIdentifier">PostCell</string>
 				<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="180.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="181.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="182.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="183.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="183.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="184.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="185.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="186.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="187.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="188.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="190.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="191.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="192.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="193.IBNSViewMetadataConstraints">
+					<reference ref="130417414"/>
+				</array>
 				<boolean value="NO" key="193.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="193.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="194.IBNSViewMetadataConstraints">
+					<reference ref="927242920"/>
+				</array>
 				<boolean value="NO" key="194.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="194.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array class="NSMutableArray" key="198.IBNSViewMetadataConstraints">
-					<reference ref="593653361"/>
+				<array class="NSMutableArray" key="199.IBNSViewMetadataConstraints">
+					<reference ref="95362289"/>
 				</array>
-				<boolean value="NO" key="198.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="199.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="199.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="200.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="399.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="400.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="408.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="409.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array key="412.IBNSViewMetadataConstraints">
+					<reference ref="94157932"/>
+				</array>
+				<boolean value="NO" key="412.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="412.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="413.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="566.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="574.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="642.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="654.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="663.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="700.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="701.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="703.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="707.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="708.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="709.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="81.IBNSViewMetadataConstraints">
 					<reference ref="238535976"/>
@@ -1430,20 +1368,96 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">411</int>
+			<int key="maxID">714</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">TBPostsViewController</string>
+					<string key="superclassName">TBViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="draft:">id</string>
+						<string key="editPost:">id</string>
+						<string key="previewPost:">id</string>
+						<string key="revealPost:">id</string>
+						<string key="unmarkDraft:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="draft:">
+							<string key="name">draft:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="editPost:">
+							<string key="name">editPost:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="previewPost:">
+							<string key="name">previewPost:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="revealPost:">
+							<string key="name">revealPost:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="unmarkDraft:">
+							<string key="name">unmarkDraft:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="draftMenuItem">NSMenuItem</string>
+						<string key="postTableView">NSTableView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="draftMenuItem">
+							<string key="name">draftMenuItem</string>
+							<string key="candidateClassName">NSMenuItem</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="postTableView">
+							<string key="name">postTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TBPostsViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TBTableView</string>
+					<string key="superclassName">NSTableView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">deleteSelectedRows:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">deleteSelectedRows:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">deleteSelectedRows:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TBTableView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">TBViewController</string>
+					<string key="superclassName">NSViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TBViewController.h</string>
+					</object>
+				</object>
+			</array>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<integer value="1070" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1070" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<integer value="4600" key="NS.object.0"/>
diff --git a/Mac App/Controllers/TBPostsViewController.h b/Mac App/Controllers/TBPostsViewController.h
index f40afb0..10af741 100644
--- a/Mac App/Controllers/TBPostsViewController.h	
+++ b/Mac App/Controllers/TBPostsViewController.h	
@@ -10,9 +10,13 @@
 #import "TBViewController.h"
 #import <Quartz/Quartz.h>
 
-@interface TBPostsViewController : TBViewController <QLPreviewPanelDelegate, QLPreviewPanelDataSource>
+@interface TBPostsViewController : TBViewController <QLPreviewPanelDelegate, QLPreviewPanelDataSource, NSMenuDelegate>
 @property (nonatomic, assign) IBOutlet NSTableView *postTableView;
+
+@property (assign) IBOutlet NSMenuItem *draftMenuItem;
+
 - (IBAction)editPost:(id)sender;
+- (IBAction)draft:(id)sender;
 - (IBAction)previewPost:(id)sender;
 - (IBAction)revealPost:(id)sender;
 @end
diff --git a/Mac App/Controllers/TBPostsViewController.m b/Mac App/Controllers/TBPostsViewController.m
index 9538122..26e3d23 100644
--- a/Mac App/Controllers/TBPostsViewController.m	
+++ b/Mac App/Controllers/TBPostsViewController.m	
@@ -23,6 +23,8 @@ - (void)undoMoveToTrashForURLs:(NSDictionary *)URLs;
 
 @implementation TBPostsViewController
 
+@synthesize draftMenuItem;
+
 #pragma mark - View Controller Configuration
 
 - (NSString *)defaultNibName {
@@ -38,6 +40,30 @@ - (void)viewDidLoad {
 	self.postTableView.doubleAction = @selector(editPost:);
 }
 
+#pragma mark - NSMenuDelegate
+
+- (void)menuNeedsUpdate:(NSMenu *)menu {
+	TBSiteDocument *document = (TBSiteDocument *)self.document;
+    
+    NSInteger clickedRow = [self.postTableView clickedRow];
+    
+    if (clickedRow < 0) {
+        [draftMenuItem setHidden:YES];
+        
+        return;
+    }
+    
+	TBPost *clickedPost = (document.site.posts)[clickedRow];
+    
+    [draftMenuItem setHidden:NO];
+    
+    if ([clickedPost draft]) {
+        [draftMenuItem setState:NSOnState];
+    } else {
+        [draftMenuItem setState:NSOffState];
+    }
+}
+
 #pragma mark - Actions
 
 - (IBAction)editPost:(id)sender {
@@ -46,6 +72,12 @@ - (IBAction)editPost:(id)sender {
 	[[NSWorkspace sharedWorkspace] openURL:clickedPost.URL];
 }
 
+- (IBAction)draft:(id)sender {
+	TBPost *clickedPost = (self.document.site.posts)[[self.postTableView clickedRow]];
+    
+    [clickedPost setDraft:![clickedPost draft]];
+}
+
 - (IBAction)previewPost:(id)sender {
 	TBPost *clickedPost = (self.document.site.posts)[[self.postTableView clickedRow]];
 	NSDateFormatter *formatter = [NSDateFormatter new];
diff --git a/Mac App/Controllers/TBSiteWindowController.m b/Mac App/Controllers/TBSiteWindowController.m
index 382edf8..d0507b0 100644
--- a/Mac App/Controllers/TBSiteWindowController.m	
+++ b/Mac App/Controllers/TBSiteWindowController.m	
@@ -88,9 +88,14 @@ - (IBAction)showAddPostSheet:(id)sender {
 	TBSiteDocument *document = (TBSiteDocument *)self.document;
 	[self.addPostSheetController runModalForWindow:[document windowForSheet] completionBlock:^(NSString *title, NSString *slug) {
         NSError *error = nil;
-        NSURL *siteURL = [document.site addPostWithTitle:title slug:slug error:&error];
-        if (!siteURL)
+        
+        TBPost *post = [TBPost postWithTitle:title slug:slug inSite:document.site error:&error];
+        
+        if (post) {
+            [document.site addPost:post];
+        } else {
             [self tb_presentErrorOnMainQueue:error];
+        }
 	}];
 }
 
diff --git a/Mac App/Publishing/TBFTPPublisher.m b/Mac App/Publishing/TBFTPPublisher.m
index a049a48..b6e0135 100644
--- a/Mac App/Publishing/TBFTPPublisher.m	
+++ b/Mac App/Publishing/TBFTPPublisher.m	
@@ -22,7 +22,7 @@ @implementation TBFTPPublisher
 - (void)publish {
 	
 	self.site.published = YES;
-	[self.site process:nil];
+	[self.site processIncludingDrafts:NO error:nil];
 	self.site.published = NO;
 	
 	NSString *hostname = (self.site.metadata)[TBSiteServerKey];
diff --git a/Mac App/Publishing/TBSFTPPublisher.m b/Mac App/Publishing/TBSFTPPublisher.m
index 632a449..41e9af7 100644
--- a/Mac App/Publishing/TBSFTPPublisher.m	
+++ b/Mac App/Publishing/TBSFTPPublisher.m	
@@ -68,7 +68,7 @@ - (NSString *)passwordFromKeychain {
 - (void)publish {
 	
 	self.site.published = YES;
-	[self.site process:nil];
+	[self.site processIncludingDrafts:NO error:nil];
 	self.site.published = NO;
 	
 	NSTask *rsync = [[NSTask alloc] init];
diff --git a/Mac App/TBSiteDocument.m b/Mac App/TBSiteDocument.m
index d6086bb..0cef1fb 100644
--- a/Mac App/TBSiteDocument.m	
+++ b/Mac App/TBSiteDocument.m	
@@ -32,7 +32,7 @@ - (void)startPreview:(TBSiteDocumentPreviewCallback)callback {
 		MAWeakSelfImport();
 
 		[[NSProcessInfo processInfo] disableSuddenTermination];
-		if (![self.site process:&error]) {
+		if (![self.site processIncludingDrafts:YES error:&error]) {
 			callback(nil, error);
 			return;
 		}
@@ -95,7 +95,7 @@ - (void)reloadSite {
 			NSError *error;
 			
 			[[NSProcessInfo processInfo] disableSuddenTermination];
-			if (![self.site process:&error]) {
+			if (![self.site processIncludingDrafts:YES error:&error]) {
 				[NSApp tb_presentErrorOnMainQueue:error];
 				return;
 			}
diff --git a/Shared/System Additions/NSTextField+TBAdditions.h b/Shared/System Additions/NSTextField+TBAdditions.h
new file mode 100644
index 0000000..748c712
--- /dev/null
+++ b/Shared/System Additions/NSTextField+TBAdditions.h	
@@ -0,0 +1,15 @@
+//
+//  NSTextField+TBAdditions.h
+//  Tribo
+//
+//  Created by Tanner Smith on 9/5/13.
+//  Copyright (c) 2013 Opt-6 Products, LLC. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface NSTextField (TBAdditions)
+
+- (void)tb_setPlaceholderTextColor:(NSColor *)aColor;
+
+@end
diff --git a/Shared/System Additions/NSTextField+TBAdditions.m b/Shared/System Additions/NSTextField+TBAdditions.m
new file mode 100644
index 0000000..21e6972
--- /dev/null
+++ b/Shared/System Additions/NSTextField+TBAdditions.m	
@@ -0,0 +1,29 @@
+//
+//  NSTextField+TBAdditions.m
+//  Tribo
+//
+//  Created by Tanner Smith on 9/5/13.
+//  Copyright (c) 2013 Opt-6 Products, LLC. All rights reserved.
+//
+
+#import "NSTextField+TBAdditions.h"
+
+@implementation NSTextField (TBAdditions)
+
+- (void)tb_setPlaceholderTextColor:(NSColor *)aColor {
+    NSString *placeholderString = [[self cell] placeholderString];
+    
+    if (!placeholderString) {
+        placeholderString = [[[self cell] placeholderAttributedString] string];
+        
+        if (!placeholderString) {
+            return;
+        }
+    }
+
+    NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:placeholderString attributes:@{aColor : NSForegroundColorAttributeName}];
+    
+    [[self cell] setPlaceholderAttributedString:attributedString];
+}
+
+@end
diff --git a/Shared/TBPost.h b/Shared/TBPost.h
index 20f86db..e8efe93 100644
--- a/Shared/TBPost.h
+++ b/Shared/TBPost.h
@@ -9,6 +9,8 @@
 
 #import "TBPage.h"
 
+#import "TBPostMetadata.h"
+
 /*!
 	@class TBPost
 	@discussion A post represents a piece of writing, loaded from disk, with its
@@ -28,9 +30,9 @@
 @interface TBPost : TBPage
 
 /*!
-	Create a TBPost object from a file on-disk.
+	Create a TBPost object from a directory.
 	@param URL
-		A filesystem URL pointing to the post file.
+		A filesystem URL pointing to the post directory.
 	@param site
 		The TBSite object which contains the post.
 	@param error
@@ -43,6 +45,22 @@
 					 inSite:(TBSite *)site
 					  error:(NSError **)error;
 
+/*!
+     Create a TBPost object with a title and slug.
+     @param title
+         The title of the post.
+     @param slug
+         The slug of the post.
+     @param site
+         The TBSite object which contains the post.
+     @param error
+         If the return value is nil, then this argument will contain an NSError
+         object describing what went wrong.
+     @return
+         A TBPost object, or nil if an error was encountered.
+ */
++ (instancetype)postWithTitle:(NSString *)title slug:(NSString *)slug inSite:(TBSite *)site error:(NSError **)error;
+
 /*!
 	Parse the contents of the markdownContent property, saving the HTML output
 	to the content property.
@@ -61,7 +79,7 @@
 		The publishing date of the post. Derived from the filename of the post,
 		which must begin with a calendar date in the form YYYY-MM-DD.
  */
-@property (nonatomic, strong) NSDate *date;
+@property (nonatomic, strong, readonly) NSDate *date;
 
 /*!
 	@property slug
@@ -72,6 +90,26 @@
  */
 @property (nonatomic, strong) NSString *slug;
 
+/*!
+    @property metadata
+        Any metadata that goes along with the post. Examaples include the post
+        date.
+ */
+@property (nonatomic, strong) TBPostMetadata *metadata;
+
+/*!
+    @property draft
+        The state of the post, i.e. is it a draft (unfinished).
+ */
+@property (nonatomic, assign) BOOL draft;
+
+/*!
+    @property postDirectory
+        The directory the post resides in. Contains the post markdown file (known
+        as slug.md) and metadata file.
+ */
+@property (nonatomic, strong) NSURL *postDirectory;
+
 /*!
 	@property markdownContent
 		The original content of the post, before being converted to HTML by the 
diff --git a/Shared/TBPost.m b/Shared/TBPost.m
index f72e739..7be54a1 100644
--- a/Shared/TBPost.m
+++ b/Shared/TBPost.m
@@ -17,15 +17,67 @@
 @implementation TBPost
 
 + (instancetype)postWithURL:(NSURL *)URL inSite:(TBSite *)site error:(NSError **)error {
-	return (TBPost *)[super pageWithURL:URL inSite:site error:error];
+    NSString *slug = [URL lastPathComponent];
+    NSURL *postURL = [URL URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.md", slug]];
+    TBPost *post = [super pageWithURL:postURL inSite:site error:error];
+    
+    if (post) {
+        post.postDirectory = URL;
+        post.slug = slug;
+        post.metadata = [TBPostMetadata metadataWithPostDirectory:URL withError:error];
+        
+        if (post.metadata) {
+            return post;
+        }
+    }
+    
+    return nil;
+}
+
++ (instancetype)postWithTitle:(NSString *)title slug:(NSString *)slug inSite:(TBSite *)site error:(NSError **)error {
+    TBPost *post = [super new];
+    
+    if (post) {
+        post.site = site;
+        
+        // Create the directory
+        NSString *filename = [NSString stringWithString:slug];
+        
+        post.postDirectory = [site.postsDirectory URLByAppendingPathComponent:slug isDirectory:YES];
+        
+        if (![[NSFileManager defaultManager] createDirectoryAtURL:post.postDirectory withIntermediateDirectories:YES attributes:nil error:error]) {
+            // Unable to create directory structure
+            return nil;
+        }
+        
+        // Metadata File
+        post.metadata = [TBPostMetadata metadataWithPostDirectory:post.postDirectory withError:error];
+        [post.metadata writeWithError:error];
+        
+        // Post File
+        NSURL *contentDestination = [[post.postDirectory URLByAppendingPathComponent:filename] URLByAppendingPathExtension:@"md"];
+        
+        NSString *contents = [NSString stringWithFormat:@"# %@ #\n\n", title];
+        
+        if (![contents writeToURL:contentDestination atomically:YES encoding:NSUTF8StringEncoding error:error]) {
+            return nil;
+        }
+        
+        post.URL = contentDestination;
+        [post parse:error];
+        
+        return post;
+    }
+    
+    return nil;
 }
 
 - (BOOL)parse:(NSError **)error {
-	
-	[self loadMarkdownContent];
-	
-	if (![self parseDateAndSlug:error])
+    [self loadMarkdownContent];
+    
+	if (![self parseSlug:error]) {
 		return NO;
+    }
 	
 	[self parseTitle];
 	
@@ -57,23 +109,16 @@ - (void)parseTitle {
 	self.markdownContent = markdownContent;
 }
 
-- (BOOL)parseDateAndSlug:(NSError **)error {
-	// Dates and slugs are parsed from a pattern in the post file name.
-	static NSRegularExpression *fileNameRegex;
-	if (fileNameRegex == nil)
-		fileNameRegex = [NSRegularExpression regularExpressionWithPattern:@"^(\\d+-\\d+-\\d+)-(.*)" options:0 error:nil];
-	NSString *fileName = [self.URL.lastPathComponent stringByDeletingPathExtension];
-	NSTextCheckingResult *fileNameResult = [fileNameRegex firstMatchInString:fileName options:0 range:NSMakeRange(0, fileName.length)];
-	if (fileNameResult) {
-		NSDateFormatter *fileNameDateFormatter = [NSDateFormatter tb_cachedDateFormatterFromString:@"yyyy-MM-dd"];
-		self.date = [fileNameDateFormatter dateFromString:[fileName substringWithRange:[fileNameResult rangeAtIndex:1]]];
-		self.slug = [fileName substringWithRange:[fileNameResult rangeAtIndex:2]];
-	}
-	else {
-		if (error) *error = TBError.badPostFileName(self.URL);
-		return NO;
-	}
-	return YES;
+- (BOOL)parseSlug:(NSError **)error {
+	NSString *filename = [[self.URL lastPathComponent] stringByDeletingPathExtension];
+    
+    if (filename && [filename length] > 0) {
+        self.slug = filename;
+        
+        return YES;
+    }
+    
+    return NO;
 }
 
 - (void)parseMarkdownContent {
@@ -99,4 +144,31 @@ - (void)parseMarkdownContent {
 	bufrelease(outputBuffer);
 }
 
+- (NSDate *)date {
+    return [self.metadata publishedDate];
+}
+
+- (BOOL)draft {
+    return [self.metadata draft];
+}
+
+- (void)setDraft:(BOOL)draft {
+    [self.metadata setDraft:draft];
+    
+    if (draft == NO) {
+        [self.metadata setPublishedDate:[NSDate date]];
+    } else {
+        [self.metadata setPublishedDate:nil];
+    }
+    
+    NSError *error = nil;
+    
+    [self.metadata writeWithError:&error];
+    
+    if (error) {
+        [self.metadata setDraft:!draft];
+        [self.metadata setPublishedDate:nil];
+    }
+}
+
 @end
diff --git a/Shared/TBPostMetadata.h b/Shared/TBPostMetadata.h
new file mode 100644
index 0000000..f01d1f9
--- /dev/null
+++ b/Shared/TBPostMetadata.h
@@ -0,0 +1,93 @@
+//
+//  TSPostMetadata.h
+//  Tribo
+//
+//  Created by Tanner Smith on 8/27/13.
+//  Copyright (c) 2013 The Tribo Authors.
+//  See the included License.md file.
+//
+
+#import <Foundation/Foundation.h>
+
+/*!
+ @class TSPostMetdata
+ @discussion Post metadata represents any extra data, i.e. metadata, about
+ a post (data other than the post itself). Metadata is written to the disk
+ in a standized format.
+ */
+
+@interface TBPostMetadata : NSObject
+
+#define METADATA_FILENAME @"metadata.json"
+
+/*!
+    @property postDirectory
+        The directory the post resides in. Contains the post markdown file (known
+        as slug.md) and metadata file.
+ */
+@property (retain, strong) NSURL *postDirectory;
+
+/*!
+    @property path
+        The complete path to the metadata file.
+ */
+@property (retain, strong) NSURL *path;
+
+/*!
+    @property draft
+        The state of the post, i.e. is it a draft (unfinished).
+ */
+@property (assign) BOOL draft;
+
+/*!
+    @property publishedDate
+        The date when the post was published and was no longer a draft.
+ */
+@property (retain, strong) NSDate *publishedDate;
+
+/*!
+    Create an empty metadata object.
+ */
+- (instancetype)init;
+
+/*!
+    Create an metadata object from a post directory.
+    @param error
+        If the return value is nil, then this argument will contain an NSError
+        object describing what went wrong.
+    @return
+        A TSPostMetadata object, or nil if an error was encountered.
+ */
++ (instancetype)metadataWithPostDirectory:(NSURL *)directory withError:(NSError **)error;
+
+/*!
+    Extract the metadata data from the given directory.
+
+    Populates the member variables with this data.
+ 
+    @param dictionary
+        Dictionary containing data.
+ */
+- (void)extractDataFromDictionary:(NSDictionary *)dictionary;
+
+/*!
+    Read the metadata file and store the data in the member variables.
+    @param error
+        If the return value is nil, then this argument will contain an NSError
+        object describing what went wrong.
+    @return
+        YES if an error was encountered.
+ */
+- (BOOL)readWithError:(NSError **)error;
+
+/*!
+    Write the metadata file from data in the member variables.
+    @param error
+        If the return value is nil, then this argument will contain an NSError
+        object describing what went wrong.
+    @return
+        YES if an error was encountered.
+ */
+- (BOOL)writeWithError:(NSError **)error;
+
+@end
diff --git a/Shared/TBPostMetadata.m b/Shared/TBPostMetadata.m
new file mode 100644
index 0000000..647d14c
--- /dev/null
+++ b/Shared/TBPostMetadata.m
@@ -0,0 +1,107 @@
+//
+//  TSPostMetadata.m
+//  Tribo
+//
+//  Created by Tanner Smith on 8/27/13.
+//  Copyright (c) 2013 The Tribo Authors.
+//  See the included License.md file.
+//
+
+#import "TBPostMetadata.h"
+
+#import "NSDateFormatter+TBAdditions.h"
+
+@implementation TBPostMetadata
+
+@synthesize draft, publishedDate;
+@synthesize postDirectory;
+
+- (instancetype)init {
+    if (self = [super init]) {
+        draft = YES;
+        publishedDate = nil;
+    }
+    
+    return self;
+}
+
++ (instancetype)metadataWithPostDirectory:(NSURL *)directory withError:(NSError **)error {
+    TBPostMetadata *metadata = [TBPostMetadata new];
+    
+    if (metadata) {
+        metadata.postDirectory = directory;
+        metadata.path = [directory URLByAppendingPathComponent:METADATA_FILENAME];
+        
+        [metadata readWithError:error];
+        
+        return metadata;
+    }
+    
+    return nil;
+}
+
++ (instancetype)metadataWithDictionary:(NSDictionary *)dictionary {
+    TBPostMetadata *metadata = [TBPostMetadata new];
+    
+    if (metadata) {
+        [metadata extractDataFromDictionary:dictionary];
+        
+        return metadata;
+    }
+    
+    return nil;
+}
+
+- (void)extractDataFromDictionary:(NSDictionary *)dictionary {
+    draft = [[dictionary objectForKey:@"draft"] boolValue];
+    
+    // Must convert back into NSDate from string
+    NSDateFormatter *dateFormatter = [NSDateFormatter tb_cachedDateFormatterFromString:@"yyyy-MM-dd'T'hh:mm:ssZ"];
+    NSString *dateString = [dictionary objectForKey:@"publishedDate"];
+    
+	publishedDate = [dateFormatter dateFromString:dateString];    
+}
+
+- (BOOL)readWithError:(NSError **)error {
+    if ([[NSFileManager defaultManager] fileExistsAtPath:[_path path]] == NO) {
+        return NO;
+    }
+    
+    NSData *data = [[NSData alloc] initWithContentsOfURL:_path];
+    NSDictionary *dictionary = [NSJSONSerialization JSONObjectWithData:data options:0 error:error];
+    
+    if (data) {
+        [self extractDataFromDictionary:dictionary];
+        
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (BOOL)writeWithError:(NSError **)error {
+    if (!postDirectory) {
+        return NO;
+    }
+    
+    NSData *data = [NSJSONSerialization dataWithJSONObject:[self dictionary] options:0 error:error];
+    NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+    
+    return [string writeToURL:_path atomically:YES encoding:NSUTF8StringEncoding error:error];
+}
+
+- (NSDictionary *)dictionary {
+    NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+    
+    [dictionary setValue:[NSNumber numberWithBool:draft] forKey:@"draft"];
+    
+    // Must format published date into string for JSON
+    NSDateFormatter *dateFormatter = [NSDateFormatter tb_cachedDateFormatterFromString:@"yyyy-MM-dd'T'hh:mm:ssZ"];
+	NSString *dateString = [dateFormatter stringFromDate:publishedDate];
+    
+    [dictionary setValue:dateString forKey:@"publishedDate"];
+    
+    return dictionary;
+}
+
+@end
diff --git a/Shared/TBSite.h b/Shared/TBSite.h
index 80d04ce..80f05c5 100644
--- a/Shared/TBSite.h
+++ b/Shared/TBSite.h
@@ -8,6 +8,7 @@
 //
 
 #import "TBConstants.h"
+#import "TBPost.h"
 
 @protocol TBSiteDelegate;
 
@@ -38,13 +39,15 @@
 
 /*!
 	Process the entire site, writing the output into the destination directory.
+    @param includeDrafts
+        If set to YES, the generated sites will include any posts that are drafts.
 	@param error
 		If the return value is NO, then this argument will contain an NSError
 		object describing what went wrong.
 	@return
 		YES on successful processing, NO if an error was encountered.
  */
-- (BOOL)process:(NSError **)error;
+- (BOOL)processIncludingDrafts:(BOOL)includeDrafts error:(NSError **)error;
 
 /*!
 	Parse all post files into TBPost objects.
@@ -56,26 +59,7 @@
  */
 - (BOOL)parsePosts:(NSError **)error;
 
-/*!
-	Add an empty post to the receiving site object.
-	@param title
-		The title of the post. Must not be nil.
-	@param slug
-		The slug of the post, i.e. the post title that will be used in URLs.
-		Must be URL-encoded and not nil.
-	@param error
-		If the return value is nil, then this argument will contain an NSError 
-		object describing what went wrong.
-	@return
-		A filesystem URL pointing to the newly-created post file.
-	@discussion
-		The new post file has no content, but is pre-filled with a Markdown 
-		title on the first line. The date of the post is automatically set to 
-		today's date.
- */
-- (NSURL *)addPostWithTitle:(NSString *)title
-					   slug:(NSString *)slug
-					  error:(NSError **)error;
+- (void)addPost:(TBPost *)post;
 
 /*!
 	@property root
diff --git a/Shared/TBSite.m b/Shared/TBSite.m
index 1bc5edb..d9901df 100644
--- a/Shared/TBSite.m
+++ b/Shared/TBSite.m
@@ -40,8 +40,7 @@ + (instancetype)siteWithRoot:(NSURL *)root {
 
 #pragma mark - Site Processing
 
-- (BOOL)process:(NSError **)error {
-		
+- (BOOL)processIncludingDrafts:(BOOL)includeDrafts error:(NSError **)error {
 	if (![self loadRawDefaultTemplate:error])
 		return NO;
 	
@@ -51,7 +50,7 @@ - (BOOL)process:(NSError **)error {
 	if (![self parsePosts:error])
 		return NO;
 	
-	if (![self writePosts:error])
+	if (![self writePostsIncludingDrafts:includeDrafts error:error])
 		return NO;
 	
 	if (![self writeFeed:error])
@@ -127,10 +126,12 @@ - (BOOL)parsePosts:(NSError **)error {
 	
 }
 
-- (BOOL)writePosts:(NSError **)error {
-	
+- (BOOL)writePostsIncludingDrafts:(BOOL)includeDrafts error:(NSError **)error {
 	for (TBPost *post in self.posts) {
-		
+        if (includeDrafts && post.draft) {
+            continue;
+        }
+
 		post.stylesheets = @[@{@"stylesheetName": @"post"}];
 		
 		// Create the path to the folder where we are going to write the post file.
@@ -301,18 +302,8 @@ - (NSString *)filteredContent:(NSString *)content fromFile:(NSURL *)file error:(
 
 #pragma mark - Site Modification
 
-- (NSURL *)addPostWithTitle:(NSString *)title slug:(NSString *)slug error:(NSError **)error {
-	NSDate *currentDate = [NSDate date];
-	NSDateFormatter *dateFormatter = [NSDateFormatter tb_cachedDateFormatterFromString:@"yyyy-MM-dd"];
-	NSString *dateString = [dateFormatter stringFromDate:currentDate];
-	NSString *filename = [NSString stringWithFormat:@"%@-%@", dateString, slug];
-	NSURL *destination = [[self.postsDirectory URLByAppendingPathComponent:filename] URLByAppendingPathExtension:@"md"];
-	NSString *contents = [NSString stringWithFormat:@"# %@ #\n\n", title];
-	if (![contents writeToURL:destination atomically:YES encoding:NSUTF8StringEncoding error:error])
-		return nil;
-	if (![self parsePosts:error])
-        return nil;
-	return destination;
+- (void)addPost:(TBPost *)post {
+    [self.posts addObject:post];
 }
 
 - (void)setMetadata:(NSDictionary *)metadata {
diff --git a/Shared/Template Additions/TBPost+TemplateAdditions.m b/Shared/Template Additions/TBPost+TemplateAdditions.m
index ae863d8..7d62e2c 100644
--- a/Shared/Template Additions/TBPost+TemplateAdditions.m	
+++ b/Shared/Template Additions/TBPost+TemplateAdditions.m	
@@ -11,7 +11,7 @@
 
 @implementation TBPost (TemplateAdditions)
 - (NSString *)dateString {
-	NSDateFormatter *dateStringFormatter = [NSDateFormatter tb_cachedDateFormatterFromString:@"d MMM yyyy"];
+	NSDateFormatter *dateStringFormatter = [NSDateFormatter tb_cachedDateFormatterFromString:@"yyyy-MM-dd hh:mm a z"];
 	return [dateStringFormatter stringFromDate:self.date];
 }
 - (NSString *)XMLDate {
diff --git a/Tribo.xcodeproj/project.pbxproj b/Tribo.xcodeproj/project.pbxproj
index a145f0c..787bfeb 100644
--- a/Tribo.xcodeproj/project.pbxproj
+++ b/Tribo.xcodeproj/project.pbxproj
@@ -163,6 +163,9 @@
 		9B6B669D14F3546C00759DC3 /* TBAsset.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B6B669B14F3546900759DC3 /* TBAsset.m */; };
 		9BEF1C7A14F5CFCF0072B295 /* TBSourceViewControllerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BEF1C7814F5CFCF0072B295 /* TBSourceViewControllerViewController.m */; };
 		9BEF1C7B14F5CFCF0072B295 /* TBSourceViewControllerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9BEF1C7914F5CFCF0072B295 /* TBSourceViewControllerView.xib */; };
+		C35C2A9717D8100800A6BE68 /* TBPostTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = C35C2A9617D8100800A6BE68 /* TBPostTableCellView.m */; };
+		C35C2A9A17D8B14B00A6BE68 /* NSTextField+TBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C35C2A9917D8B14B00A6BE68 /* NSTextField+TBAdditions.m */; };
+		C3ACCD1817CD1EF00002CE67 /* TBPostMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = C3ACCD1717CD1EEF0002CE67 /* TBPostMetadata.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -381,6 +384,12 @@
 		9BEF1C7714F5CFCF0072B295 /* TBSourceViewControllerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TBSourceViewControllerViewController.h; sourceTree = "<group>"; };
 		9BEF1C7814F5CFCF0072B295 /* TBSourceViewControllerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TBSourceViewControllerViewController.m; sourceTree = "<group>"; };
 		9BEF1C7914F5CFCF0072B295 /* TBSourceViewControllerView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TBSourceViewControllerView.xib; sourceTree = "<group>"; };
+		C35C2A9517D8100800A6BE68 /* TBPostTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TBPostTableCellView.h; path = Controllers/TBPostTableCellView.h; sourceTree = "<group>"; };
+		C35C2A9617D8100800A6BE68 /* TBPostTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TBPostTableCellView.m; path = Controllers/TBPostTableCellView.m; sourceTree = "<group>"; };
+		C35C2A9817D8B14B00A6BE68 /* NSTextField+TBAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTextField+TBAdditions.h"; sourceTree = "<group>"; };
+		C35C2A9917D8B14B00A6BE68 /* NSTextField+TBAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTextField+TBAdditions.m"; sourceTree = "<group>"; };
+		C3ACCD1617CD1EEF0002CE67 /* TBPostMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TBPostMetadata.h; sourceTree = "<group>"; };
+		C3ACCD1717CD1EEF0002CE67 /* TBPostMetadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TBPostMetadata.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -458,6 +467,8 @@
 				4A3DE5FD176CF16C00C20026 /* NSDateFormatter+TBAdditions.m */,
 				4AF2BFEB17B88AB6008D67AB /* NSResponder+TBAdditions.h */,
 				4AF2BFEC17B88AB6008D67AB /* NSResponder+TBAdditions.m */,
+				C35C2A9817D8B14B00A6BE68 /* NSTextField+TBAdditions.h */,
+				C35C2A9917D8B14B00A6BE68 /* NSTextField+TBAdditions.m */,
 			);
 			path = "System Additions";
 			sourceTree = "<group>";
@@ -580,6 +591,8 @@
 				4A00337A1430216500F6702F /* TBSite.m */,
 				4A00337C143028CA00F6702F /* TBPost.h */,
 				4A00337D143028CA00F6702F /* TBPost.m */,
+				C3ACCD1617CD1EEF0002CE67 /* TBPostMetadata.h */,
+				C3ACCD1717CD1EEF0002CE67 /* TBPostMetadata.m */,
 				4A72F14014368E1200A164E9 /* TBPage.h */,
 				4A72F14114368E1200A164E9 /* TBPage.m */,
 				9B6B669A14F3546900759DC3 /* TBAsset.h */,
@@ -874,6 +887,8 @@
 			isa = PBXGroup;
 			children = (
 				4AAC8E5E1456616F00AE978A /* TBPostsView.xib */,
+				C35C2A9517D8100800A6BE68 /* TBPostTableCellView.h */,
+				C35C2A9617D8100800A6BE68 /* TBPostTableCellView.m */,
 				4AAC8E5B1456609300AE978A /* TBPostsViewController.h */,
 				4AAC8E5C1456609300AE978A /* TBPostsViewController.m */,
 				4ABD6A5014417DBE007E2F5D /* TBQLPreviewView.xib */,
@@ -1163,6 +1178,9 @@
 				4A99C42917B4091D0023C9A9 /* CZAFileWatcher.m in Sources */,
 				4AA86A6C173EF28200046691 /* TBSite+TemplateAdditions.m in Sources */,
 				4AA86A70174124C300046691 /* TBPost+TemplateAdditions.m in Sources */,
+				C3ACCD1817CD1EF00002CE67 /* TBPostMetadata.m in Sources */,
+				C35C2A9717D8100800A6BE68 /* TBPostTableCellView.m in Sources */,
+				C35C2A9A17D8B14B00A6BE68 /* NSTextField+TBAdditions.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};