From 272e2720eb89320ae633323c62d70a474dcfa078 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeracher@apple.com>
Date: Sat, 13 Aug 2011 01:38:18 +0200
Subject: [PATCH] Display and add annotations

---
 Medianno/MAAnno.h                |   4 +
 Medianno/MAAnno.mm               |  33 ++
 Medianno/MADocWindow.h           |   4 +
 Medianno/MADocWindow.mm          |  13 +-
 Medianno/MADocument.h            |   4 +
 Medianno/MADocument.mm           |  17 +-
 Medianno/en.lproj/MADocument.xib | 824 ++++++++++++++++---------------
 Medianno/en.lproj/MainMenu.xib   |  99 +++-
 8 files changed, 586 insertions(+), 412 deletions(-)

diff --git a/Medianno/MAAnno.h b/Medianno/MAAnno.h
index 0d4d0f5..499809f 100644
--- a/Medianno/MAAnno.h
+++ b/Medianno/MAAnno.h
@@ -18,6 +18,10 @@
 @property (nonatomic, retain) NSString * notes;
 @property (nonatomic, retain) NSSet *tags;
 @property (nonatomic, retain) NSManagedObject *media;
+
+- (NSString *)shortLocation;
++ (NSSet *)keyPathsForValuesAffectingShortLocation;
+
 @end
 
 @interface MAAnno (CoreDataGeneratedAccessors)
diff --git a/Medianno/MAAnno.mm b/Medianno/MAAnno.mm
index aa292f5..41bffbc 100644
--- a/Medianno/MAAnno.mm
+++ b/Medianno/MAAnno.mm
@@ -16,4 +16,37 @@
 @dynamic tags;
 @dynamic media;
 
+- (NSString *)shortLocation
+{
+    NSString * location = self.location;
+    NSRange rangeToUse = {0,0};
+    //
+    // Trim leading zeros, up to a point
+    //
+    while (rangeToUse.location < 6) {
+        switch ([location characterAtIndex:rangeToUse.location]) {
+        case '0':
+        case ':':
+            ++rangeToUse.location;
+            continue;
+        }
+        break;
+    }
+    //
+    // Trim fractions of seconds
+    //
+    for (rangeToUse.length = [location length]-rangeToUse.location; rangeToUse.length-- > 0; )
+        if ([location characterAtIndex:rangeToUse.location+rangeToUse.length] == '.')
+            break;
+    if (!rangeToUse.length)
+        rangeToUse.length = [location length]-rangeToUse.location;
+    
+    return [location substringWithRange:rangeToUse];
+}
+
++ (NSSet *)keyPathsForValuesAffectingShortLocation
+{
+    return [NSSet setWithObject:@"location"];
+}
+
 @end
diff --git a/Medianno/MADocWindow.h b/Medianno/MADocWindow.h
index 5124387..b5e1581 100644
--- a/Medianno/MADocWindow.h
+++ b/Medianno/MADocWindow.h
@@ -9,9 +9,13 @@
 #import <Cocoa/Cocoa.h>
 
 @interface MADocWindow : NSWindowController {
+    IBOutlet NSArrayController*     mediaController;
+    IBOutlet NSArrayController*     annotationController;
+    IBOutlet QTMovieView *          movieView;
 }
 
 - (IBAction)addMediaFiles:(id)sender;
 - (void)addMedia:(NSArray *)urls;
+- (IBAction)addAnnotation:(id)sender;
 
 @end
diff --git a/Medianno/MADocWindow.mm b/Medianno/MADocWindow.mm
index 6fac596..31511ac 100644
--- a/Medianno/MADocWindow.mm
+++ b/Medianno/MADocWindow.mm
@@ -17,9 +17,6 @@
 - (id)initWithWindow:(NSWindow *)window
 {
     self = [super initWithWindow:window];
-    if (self) {
-        // Initialization code here.
-    }
     
     return self;
 }
@@ -27,8 +24,8 @@
 - (void)windowDidLoad
 {
     [super windowDidLoad];
-    
-    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+    [mediaController setSortDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"name" ascending:YES]]];
+    [annotationController setSortDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"location" ascending:YES]]];
 }
 
 #pragma mark Media management
@@ -83,4 +80,10 @@
     [[[MAAddMediaSheet alloc] init] runWithParentWindow:self media:expandedURLs];
 }
 
+- (IBAction)addAnnotation:(id)sender
+{
+    QTTime location = [[movieView movie] currentTime];
+    [[self document] addAnnotationForMedia:[[mediaController selectedObjects] objectAtIndex:0] location:location];
+}
+
 @end
diff --git a/Medianno/MADocument.h b/Medianno/MADocument.h
index 6ebdd14..522ff6d 100644
--- a/Medianno/MADocument.h
+++ b/Medianno/MADocument.h
@@ -7,11 +7,15 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import <QTKit/QTKit.h>
+
+@class MAMedia;
 
 @interface MADocument : NSPersistentDocument {
     NSFileWrapper * mediaWrapper;
 }
 
 - (void)addMediaURL:(NSURL *)url name:(NSString *)name date:(NSDate *)date copying:(BOOL)copying;
+- (void)addAnnotationForMedia:(MAMedia *)media location:(QTTime)location;
 
 @end
diff --git a/Medianno/MADocument.mm b/Medianno/MADocument.mm
index feda324..4214919 100644
--- a/Medianno/MADocument.mm
+++ b/Medianno/MADocument.mm
@@ -10,6 +10,7 @@
 #import "MADocWindow.h"
 #import "MAFolder.h"
 #import "MAMedia.h"
+#import "MAAnno.h"
 
 #pragma mark -
 #pragma mark MADocument
@@ -73,11 +74,23 @@
     MAMedia * media = [NSEntityDescription insertNewObjectForEntityForName:@"MAMedia" inManagedObjectContext:moc];
     NSString * path = [url path];
     media.media = path;
-    media.date  = [date timeIntervalSince1970];
+    media.date  = [date timeIntervalSinceReferenceDate];
     media.name  = name;
     media.notes = @"";
     media.folder= inbox;
-    [moc processPendingChanges];
+}
+
+#pragma mark -
+#pragma mark Annotation management
+
+- (void)addAnnotationForMedia:(MAMedia *)media location:(QTTime)location
+{
+    NSManagedObjectContext *moc = [self managedObjectContext];
+    MAAnno * annotation = [NSEntityDescription insertNewObjectForEntityForName:@"MAAnno" inManagedObjectContext:moc];
+    annotation.media    = media;
+    annotation.location = QTStringFromTime(location);
+    annotation.notes    = @"";
+    [moc processPendingChanges];    
 }
 
 @end
diff --git a/Medianno/en.lproj/MADocument.xib b/Medianno/en.lproj/MADocument.xib
index 77422de..7dde109 100644
--- a/Medianno/en.lproj/MADocument.xib
+++ b/Medianno/en.lproj/MADocument.xib
@@ -61,7 +61,7 @@
 			<object class="NSWindowTemplate" id="275939982">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{133, 235}, {1279, 809}}</string>
+				<string key="NSWindowRect">{{133, 235}, {1280, 809}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -73,39 +73,39 @@
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSSplitView" id="240403983">
+						<object class="NSSplitView" id="1041938654">
 							<reference key="NSNextResponder" ref="568628114"/>
 							<int key="NSvFlags">274</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSScrollView" id="141262373">
-									<reference key="NSNextResponder" ref="240403983"/>
+								<object class="NSScrollView" id="374300448">
+									<reference key="NSNextResponder" ref="1041938654"/>
 									<int key="NSvFlags">292</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSClipView" id="735378444">
-											<reference key="NSNextResponder" ref="141262373"/>
+										<object class="NSClipView" id="281296419">
+											<reference key="NSNextResponder" ref="374300448"/>
 											<int key="NSvFlags">2304</int>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSTableView" id="677931807">
-													<reference key="NSNextResponder" ref="735378444"/>
+												<object class="NSTableView" id="435572973">
+													<reference key="NSNextResponder" ref="281296419"/>
 													<int key="NSvFlags">256</int>
 													<string key="NSFrameSize">{1279, 183}</string>
-													<reference key="NSSuperview" ref="735378444"/>
+													<reference key="NSSuperview" ref="281296419"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="728081730"/>
+													<reference key="NSNextKeyView" ref="379630635"/>
 													<string key="NSReuseIdentifierKey">_NS:1197</string>
 													<bool key="NSEnabled">YES</bool>
-													<object class="NSTableHeaderView" key="NSHeaderView" id="10263050">
-														<reference key="NSNextResponder" ref="950826239"/>
+													<object class="NSTableHeaderView" key="NSHeaderView" id="721813204">
+														<reference key="NSNextResponder" ref="493883668"/>
 														<int key="NSvFlags">256</int>
 														<string key="NSFrameSize">{1279, 17}</string>
-														<reference key="NSSuperview" ref="950826239"/>
+														<reference key="NSSuperview" ref="493883668"/>
 														<reference key="NSWindow"/>
-														<reference key="NSNextKeyView" ref="735378444"/>
+														<reference key="NSNextKeyView" ref="281296419"/>
 														<string key="NSReuseIdentifierKey">_NS:1199</string>
-														<reference key="NSTableView" ref="677931807"/>
+														<reference key="NSTableView" ref="435572973"/>
 													</object>
 													<object class="_NSCornerView" key="NSCornerView">
 														<nil key="NSNextResponder"/>
@@ -115,7 +115,7 @@
 													</object>
 													<object class="NSMutableArray" key="NSTableColumns">
 														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSTableColumn" id="62891107">
+														<object class="NSTableColumn" id="32864491">
 															<double key="NSWidth">284.265625</double>
 															<double key="NSMinWidth">250</double>
 															<double key="NSMaxWidth">500</double>
@@ -128,31 +128,31 @@
 																	<double key="NSSize">11</double>
 																	<int key="NSfFlags">3100</int>
 																</object>
-																<object class="NSColor" key="NSBackgroundColor" id="344446895">
+																<object class="NSColor" key="NSBackgroundColor" id="490399623">
 																	<int key="NSColorSpace">3</int>
 																	<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
 																</object>
-																<object class="NSColor" key="NSTextColor" id="333748245">
+																<object class="NSColor" key="NSTextColor" id="965084533">
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">headerTextColor</string>
-																	<object class="NSColor" key="NSColor" id="783264194">
+																	<object class="NSColor" key="NSColor" id="700204028">
 																		<int key="NSColorSpace">3</int>
 																		<bytes key="NSWhite">MAA</bytes>
 																	</object>
 																</object>
 															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="722993368">
+															<object class="NSTextFieldCell" key="NSDataCell" id="974163542">
 																<int key="NSCellFlags">337772096</int>
 																<int key="NSCellFlags2">2048</int>
 																<string key="NSContents">Text Cell</string>
-																<object class="NSFont" key="NSSupport" id="296237989">
+																<object class="NSFont" key="NSSupport" id="540173273">
 																	<string key="NSName">LucidaGrande</string>
 																	<double key="NSSize">13</double>
 																	<int key="NSfFlags">1044</int>
 																</object>
-																<reference key="NSControlView" ref="677931807"/>
-																<object class="NSColor" key="NSBackgroundColor" id="389294598">
+																<reference key="NSControlView" ref="435572973"/>
+																<object class="NSColor" key="NSBackgroundColor" id="687143842">
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">controlBackgroundColor</string>
@@ -161,19 +161,19 @@
 																		<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 																	</object>
 																</object>
-																<object class="NSColor" key="NSTextColor" id="100436510">
+																<object class="NSColor" key="NSTextColor" id="399797563">
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">controlTextColor</string>
-																	<reference key="NSColor" ref="783264194"/>
+																	<reference key="NSColor" ref="700204028"/>
 																</object>
 															</object>
 															<int key="NSResizingMask">3</int>
 															<bool key="NSIsResizeable">YES</bool>
 															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="677931807"/>
+															<reference key="NSTableView" ref="435572973"/>
 														</object>
-														<object class="NSTableColumn" id="1071402749">
+														<object class="NSTableColumn" id="3924643">
 															<double key="NSWidth">846.296875</double>
 															<double key="NSMinWidth">50</double>
 															<double key="NSMaxWidth">5200</double>
@@ -182,24 +182,24 @@
 																<int key="NSCellFlags2">2048</int>
 																<string key="NSContents">Notes</string>
 																<reference key="NSSupport" ref="26"/>
-																<reference key="NSBackgroundColor" ref="344446895"/>
-																<reference key="NSTextColor" ref="333748245"/>
+																<reference key="NSBackgroundColor" ref="490399623"/>
+																<reference key="NSTextColor" ref="965084533"/>
 															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="229865976">
+															<object class="NSTextFieldCell" key="NSDataCell" id="304181817">
 																<int key="NSCellFlags">337772096</int>
 																<int key="NSCellFlags2">2048</int>
 																<string key="NSContents">Text Cell</string>
-																<reference key="NSSupport" ref="296237989"/>
-																<reference key="NSControlView" ref="677931807"/>
-																<reference key="NSBackgroundColor" ref="389294598"/>
-																<reference key="NSTextColor" ref="100436510"/>
+																<reference key="NSSupport" ref="540173273"/>
+																<reference key="NSControlView" ref="435572973"/>
+																<reference key="NSBackgroundColor" ref="687143842"/>
+																<reference key="NSTextColor" ref="399797563"/>
 															</object>
 															<int key="NSResizingMask">3</int>
 															<bool key="NSIsResizeable">YES</bool>
 															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="677931807"/>
+															<reference key="NSTableView" ref="435572973"/>
 														</object>
-														<object class="NSTableColumn" id="1013716346">
+														<object class="NSTableColumn" id="412492128">
 															<double key="NSWidth">140</double>
 															<double key="NSMinWidth">140</double>
 															<double key="NSMaxWidth">140</double>
@@ -208,23 +208,23 @@
 																<int key="NSCellFlags2">2048</int>
 																<string key="NSContents">Date</string>
 																<reference key="NSSupport" ref="26"/>
-																<object class="NSColor" key="NSBackgroundColor" id="625279955">
+																<object class="NSColor" key="NSBackgroundColor" id="990853219">
 																	<int key="NSColorSpace">6</int>
 																	<string key="NSCatalogName">System</string>
 																	<string key="NSColorName">headerColor</string>
-																	<object class="NSColor" key="NSColor" id="654197677">
+																	<object class="NSColor" key="NSColor" id="234298249">
 																		<int key="NSColorSpace">3</int>
 																		<bytes key="NSWhite">MQA</bytes>
 																	</object>
 																</object>
-																<reference key="NSTextColor" ref="333748245"/>
+																<reference key="NSTextColor" ref="965084533"/>
 															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="767978022">
+															<object class="NSTextFieldCell" key="NSDataCell" id="569160493">
 																<int key="NSCellFlags">337772096</int>
 																<int key="NSCellFlags2">-2147481600</int>
 																<string key="NSContents">Text Cell</string>
-																<reference key="NSSupport" ref="296237989"/>
-																<object class="NSDateFormatter" key="NSFormatter" id="1046086656">
+																<reference key="NSSupport" ref="540173273"/>
+																<object class="NSDateFormatter" key="NSFormatter" id="217231872">
 																	<object class="NSMutableDictionary" key="NS.attributes">
 																		<bool key="EncodedWithXMLCoder">YES</bool>
 																		<object class="NSArray" key="dict.sortedKeys">
@@ -247,20 +247,20 @@
 																	<string key="NS.format">yyyy-MM-dd HH:mm </string>
 																	<bool key="NS.natural">NO</bool>
 																</object>
-																<reference key="NSControlView" ref="677931807"/>
-																<reference key="NSBackgroundColor" ref="389294598"/>
-																<reference key="NSTextColor" ref="100436510"/>
+																<reference key="NSControlView" ref="435572973"/>
+																<reference key="NSBackgroundColor" ref="687143842"/>
+																<reference key="NSTextColor" ref="399797563"/>
 															</object>
 															<int key="NSResizingMask">3</int>
 															<bool key="NSIsResizeable">YES</bool>
 															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="677931807"/>
+															<reference key="NSTableView" ref="435572973"/>
 														</object>
 													</object>
 													<double key="NSIntercellSpacingWidth">3</double>
 													<double key="NSIntercellSpacingHeight">2</double>
-													<reference key="NSBackgroundColor" ref="654197677"/>
-													<object class="NSColor" key="NSGridColor" id="258930933">
+													<reference key="NSBackgroundColor" ref="234298249"/>
+													<object class="NSColor" key="NSGridColor" id="679790194">
 														<int key="NSColorSpace">6</int>
 														<string key="NSCatalogName">System</string>
 														<string key="NSColorName">gridColor</string>
@@ -270,7 +270,7 @@
 														</object>
 													</object>
 													<double key="NSRowHeight">17</double>
-													<int key="NSTvFlags">-698318848</int>
+													<int key="NSTvFlags">-683638784</int>
 													<reference key="NSDelegate"/>
 													<reference key="NSDataSource"/>
 													<int key="NSColumnAutoresizingStyle">1</int>
@@ -281,83 +281,82 @@
 													<int key="NSTableViewGroupRowStyle">1</int>
 												</object>
 											</object>
-											<string key="NSFrame">{{1, 17}, {1278, 183}}</string>
-											<reference key="NSSuperview" ref="141262373"/>
+											<string key="NSFrame">{{1, 17}, {1279, 183}}</string>
+											<reference key="NSSuperview" ref="374300448"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="677931807"/>
+											<reference key="NSNextKeyView" ref="435572973"/>
 											<string key="NSReuseIdentifierKey">_NS:1195</string>
-											<reference key="NSDocView" ref="677931807"/>
-											<reference key="NSBGColor" ref="389294598"/>
+											<reference key="NSDocView" ref="435572973"/>
+											<reference key="NSBGColor" ref="687143842"/>
 											<int key="NScvFlags">4</int>
 										</object>
-										<object class="NSScroller" id="728081730">
-											<reference key="NSNextResponder" ref="141262373"/>
+										<object class="NSScroller" id="379630635">
+											<reference key="NSNextResponder" ref="374300448"/>
 											<int key="NSvFlags">-2147483392</int>
 											<string key="NSFrame">{{224, 17}, {15, 102}}</string>
-											<reference key="NSSuperview" ref="141262373"/>
+											<reference key="NSSuperview" ref="374300448"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="876748930"/>
+											<reference key="NSNextKeyView" ref="647289752"/>
 											<string key="NSReuseIdentifierKey">_NS:1214</string>
-											<reference key="NSTarget" ref="141262373"/>
+											<reference key="NSTarget" ref="374300448"/>
 											<string key="NSAction">_doScroller:</string>
 											<double key="NSCurValue">37</double>
 											<double key="NSPercent">0.1947367936372757</double>
 										</object>
-										<object class="NSScroller" id="876748930">
-											<reference key="NSNextResponder" ref="141262373"/>
-											<int key="NSvFlags">256</int>
+										<object class="NSScroller" id="647289752">
+											<reference key="NSNextResponder" ref="374300448"/>
+											<int key="NSvFlags">-2147483392</int>
 											<string key="NSFrame">{{1, 185}, {1278, 15}}</string>
-											<reference key="NSSuperview" ref="141262373"/>
+											<reference key="NSSuperview" ref="374300448"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="645991839"/>
+											<reference key="NSNextKeyView" ref="160742686"/>
 											<string key="NSReuseIdentifierKey">_NS:1216</string>
-											<bool key="NSEnabled">YES</bool>
 											<int key="NSsFlags">1</int>
-											<reference key="NSTarget" ref="141262373"/>
+											<reference key="NSTarget" ref="374300448"/>
 											<string key="NSAction">_doScroller:</string>
 											<double key="NSPercent">0.99921813917122748</double>
 										</object>
-										<object class="NSClipView" id="950826239">
-											<reference key="NSNextResponder" ref="141262373"/>
+										<object class="NSClipView" id="493883668">
+											<reference key="NSNextResponder" ref="374300448"/>
 											<int key="NSvFlags">2304</int>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<reference ref="10263050"/>
+												<reference ref="721813204"/>
 											</object>
-											<string key="NSFrame">{{1, 0}, {1278, 17}}</string>
-											<reference key="NSSuperview" ref="141262373"/>
+											<string key="NSFrame">{{1, 0}, {1279, 17}}</string>
+											<reference key="NSSuperview" ref="374300448"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="10263050"/>
+											<reference key="NSNextKeyView" ref="721813204"/>
 											<string key="NSReuseIdentifierKey">_NS:1200</string>
-											<reference key="NSDocView" ref="10263050"/>
-											<reference key="NSBGColor" ref="389294598"/>
+											<reference key="NSDocView" ref="721813204"/>
+											<reference key="NSBGColor" ref="687143842"/>
 											<int key="NScvFlags">4</int>
 										</object>
 									</object>
-									<string key="NSFrameSize">{1280, 201}</string>
-									<reference key="NSSuperview" ref="240403983"/>
+									<string key="NSFrameSize">{1281, 201}</string>
+									<reference key="NSSuperview" ref="1041938654"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="950826239"/>
+									<reference key="NSNextKeyView" ref="493883668"/>
 									<string key="NSReuseIdentifierKey">_NS:1193</string>
-									<int key="NSsFlags">133810</int>
-									<reference key="NSVScroller" ref="728081730"/>
-									<reference key="NSHScroller" ref="876748930"/>
-									<reference key="NSContentView" ref="735378444"/>
-									<reference key="NSHeaderClipView" ref="950826239"/>
+									<int key="NSsFlags">133682</int>
+									<reference key="NSVScroller" ref="379630635"/>
+									<reference key="NSHScroller" ref="647289752"/>
+									<reference key="NSContentView" ref="281296419"/>
+									<reference key="NSHeaderClipView" ref="493883668"/>
 									<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 								</object>
-								<object class="NSBox" id="645991839">
-									<reference key="NSNextResponder" ref="240403983"/>
+								<object class="NSBox" id="160742686">
+									<reference key="NSNextResponder" ref="1041938654"/>
 									<int key="NSvFlags">268</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSView" id="278111632">
-											<reference key="NSNextResponder" ref="645991839"/>
+										<object class="NSView" id="137109359">
+											<reference key="NSNextResponder" ref="160742686"/>
 											<int key="NSvFlags">274</int>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="QTMovieView" id="107556775">
-													<reference key="NSNextResponder" ref="278111632"/>
+												<object class="QTMovieView" id="128466737">
+													<reference key="NSNextResponder" ref="137109359"/>
 													<int key="NSvFlags">298</int>
 													<object class="NSMutableSet" key="NSDragTypes">
 														<bool key="EncodedWithXMLCoder">YES</bool>
@@ -369,45 +368,45 @@
 															<string>QTMoviePasteboardType</string>
 														</object>
 													</object>
-													<string key="NSFrame">{{0, 581}, {1280, 16}}</string>
-													<reference key="NSSuperview" ref="278111632"/>
+													<string key="NSFrame">{{0, 581}, {1281, 16}}</string>
+													<reference key="NSSuperview" ref="137109359"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="433502865"/>
+													<reference key="NSNextKeyView" ref="557171846"/>
 													<string key="NSReuseIdentifierKey">_NS:46</string>
-													<reference key="kCoderFillColor" ref="783264194"/>
+													<reference key="kCoderFillColor" ref="700204028"/>
 													<boolean value="YES" key="kCoderControllerVisible"/>
 													<boolean value="YES" key="kCoderPreservesAspectRatio"/>
 													<nil key="kCoderMovie"/>
 													<boolean value="NO" key="kCoderEditable"/>
 												</object>
-												<object class="NSScrollView" id="433502865">
-													<reference key="NSNextResponder" ref="278111632"/>
+												<object class="NSScrollView" id="557171846">
+													<reference key="NSNextResponder" ref="137109359"/>
 													<int key="NSvFlags">310</int>
 													<object class="NSMutableArray" key="NSSubviews">
 														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSClipView" id="515468715">
-															<reference key="NSNextResponder" ref="433502865"/>
+														<object class="NSClipView" id="1014471098">
+															<reference key="NSNextResponder" ref="557171846"/>
 															<int key="NSvFlags">2304</int>
 															<object class="NSMutableArray" key="NSSubviews">
 																<bool key="EncodedWithXMLCoder">YES</bool>
-																<object class="NSTableView" id="187344935">
-																	<reference key="NSNextResponder" ref="515468715"/>
+																<object class="NSTableView" id="568474981">
+																	<reference key="NSNextResponder" ref="1014471098"/>
 																	<int key="NSvFlags">256</int>
-																	<string key="NSFrameSize">{1359, 564}</string>
-																	<reference key="NSSuperview" ref="515468715"/>
+																	<string key="NSFrameSize">{1279, 564}</string>
+																	<reference key="NSSuperview" ref="1014471098"/>
 																	<reference key="NSWindow"/>
-																	<reference key="NSNextKeyView" ref="113223090"/>
+																	<reference key="NSNextKeyView" ref="301557991"/>
 																	<string key="NSReuseIdentifierKey">_NS:1197</string>
 																	<bool key="NSEnabled">YES</bool>
-																	<object class="NSTableHeaderView" key="NSHeaderView" id="401256486">
-																		<reference key="NSNextResponder" ref="375606828"/>
+																	<object class="NSTableHeaderView" key="NSHeaderView" id="732305867">
+																		<reference key="NSNextResponder" ref="812767685"/>
 																		<int key="NSvFlags">256</int>
-																		<string key="NSFrameSize">{1359, 17}</string>
-																		<reference key="NSSuperview" ref="375606828"/>
+																		<string key="NSFrameSize">{1279, 17}</string>
+																		<reference key="NSSuperview" ref="812767685"/>
 																		<reference key="NSWindow"/>
-																		<reference key="NSNextKeyView" ref="515468715"/>
+																		<reference key="NSNextKeyView" ref="1014471098"/>
 																		<string key="NSReuseIdentifierKey">_NS:1199</string>
-																		<reference key="NSTableView" ref="187344935"/>
+																		<reference key="NSTableView" ref="568474981"/>
 																	</object>
 																	<object class="_NSCornerView" key="NSCornerView">
 																		<nil key="NSNextResponder"/>
@@ -417,7 +416,7 @@
 																	</object>
 																	<object class="NSMutableArray" key="NSTableColumns">
 																		<bool key="EncodedWithXMLCoder">YES</bool>
-																		<object class="NSTableColumn" id="284421416">
+																		<object class="NSTableColumn" id="38954332">
 																			<double key="NSWidth">100</double>
 																			<double key="NSMinWidth">100</double>
 																			<double key="NSMaxWidth">100</double>
@@ -426,26 +425,26 @@
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Time</string>
 																				<reference key="NSSupport" ref="26"/>
-																				<object class="NSColor" key="NSBackgroundColor" id="995207238">
+																				<object class="NSColor" key="NSBackgroundColor" id="535590768">
 																					<int key="NSColorSpace">3</int>
 																					<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
 																				</object>
-																				<reference key="NSTextColor" ref="333748245"/>
+																				<reference key="NSTextColor" ref="965084533"/>
 																			</object>
-																			<object class="NSTextFieldCell" key="NSDataCell" id="964970916">
+																			<object class="NSTextFieldCell" key="NSDataCell" id="1007443467">
 																				<int key="NSCellFlags">337772096</int>
-																				<int key="NSCellFlags2">2048</int>
+																				<int key="NSCellFlags2">67110912</int>
 																				<string key="NSContents">Text Cell</string>
-																				<reference key="NSSupport" ref="296237989"/>
-																				<reference key="NSControlView" ref="187344935"/>
-																				<reference key="NSBackgroundColor" ref="389294598"/>
-																				<reference key="NSTextColor" ref="100436510"/>
+																				<reference key="NSSupport" ref="540173273"/>
+																				<reference key="NSControlView" ref="568474981"/>
+																				<reference key="NSBackgroundColor" ref="687143842"/>
+																				<reference key="NSTextColor" ref="399797563"/>
 																			</object>
 																			<int key="NSResizingMask">3</int>
 																			<bool key="NSIsResizeable">YES</bool>
-																			<reference key="NSTableView" ref="187344935"/>
+																			<reference key="NSTableView" ref="568474981"/>
 																		</object>
-																		<object class="NSTableColumn" id="673713016">
+																		<object class="NSTableColumn" id="579126605">
 																			<double key="NSWidth">550</double>
 																			<double key="NSMinWidth">200</double>
 																			<double key="NSMaxWidth">2000</double>
@@ -454,25 +453,25 @@
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Tags</string>
 																				<reference key="NSSupport" ref="26"/>
-																				<reference key="NSBackgroundColor" ref="995207238"/>
-																				<reference key="NSTextColor" ref="333748245"/>
+																				<reference key="NSBackgroundColor" ref="535590768"/>
+																				<reference key="NSTextColor" ref="965084533"/>
 																			</object>
-																			<object class="NSTextFieldCell" key="NSDataCell" id="657615961">
+																			<object class="NSTextFieldCell" key="NSDataCell" id="730633890">
 																				<int key="NSCellFlags">337772096</int>
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Text Cell</string>
-																				<reference key="NSSupport" ref="296237989"/>
-																				<reference key="NSControlView" ref="187344935"/>
-																				<reference key="NSBackgroundColor" ref="389294598"/>
-																				<reference key="NSTextColor" ref="100436510"/>
+																				<reference key="NSSupport" ref="540173273"/>
+																				<reference key="NSControlView" ref="568474981"/>
+																				<reference key="NSBackgroundColor" ref="687143842"/>
+																				<reference key="NSTextColor" ref="399797563"/>
 																			</object>
 																			<int key="NSResizingMask">3</int>
 																			<bool key="NSIsResizeable">YES</bool>
 																			<bool key="NSIsEditable">YES</bool>
-																			<reference key="NSTableView" ref="187344935"/>
+																			<reference key="NSTableView" ref="568474981"/>
 																		</object>
-																		<object class="NSTableColumn" id="864535406">
-																			<double key="NSWidth">700</double>
+																		<object class="NSTableColumn" id="320300624">
+																			<double key="NSWidth">620</double>
 																			<double key="NSMinWidth">50</double>
 																			<double key="NSMaxWidth">3.4028234663852886e+38</double>
 																			<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -480,30 +479,30 @@
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Notes</string>
 																				<reference key="NSSupport" ref="26"/>
-																				<reference key="NSBackgroundColor" ref="625279955"/>
-																				<reference key="NSTextColor" ref="333748245"/>
+																				<reference key="NSBackgroundColor" ref="990853219"/>
+																				<reference key="NSTextColor" ref="965084533"/>
 																			</object>
-																			<object class="NSTextFieldCell" key="NSDataCell" id="712731318">
+																			<object class="NSTextFieldCell" key="NSDataCell" id="813423854">
 																				<int key="NSCellFlags">337772096</int>
 																				<int key="NSCellFlags2">2048</int>
 																				<string key="NSContents">Text Cell</string>
-																				<reference key="NSSupport" ref="296237989"/>
-																				<reference key="NSControlView" ref="187344935"/>
-																				<reference key="NSBackgroundColor" ref="389294598"/>
-																				<reference key="NSTextColor" ref="100436510"/>
+																				<reference key="NSSupport" ref="540173273"/>
+																				<reference key="NSControlView" ref="568474981"/>
+																				<reference key="NSBackgroundColor" ref="687143842"/>
+																				<reference key="NSTextColor" ref="399797563"/>
 																			</object>
 																			<int key="NSResizingMask">3</int>
 																			<bool key="NSIsResizeable">YES</bool>
 																			<bool key="NSIsEditable">YES</bool>
-																			<reference key="NSTableView" ref="187344935"/>
+																			<reference key="NSTableView" ref="568474981"/>
 																		</object>
 																	</object>
 																	<double key="NSIntercellSpacingWidth">3</double>
 																	<double key="NSIntercellSpacingHeight">2</double>
-																	<reference key="NSBackgroundColor" ref="654197677"/>
-																	<reference key="NSGridColor" ref="258930933"/>
+																	<reference key="NSBackgroundColor" ref="234298249"/>
+																	<reference key="NSGridColor" ref="679790194"/>
 																	<double key="NSRowHeight">17</double>
-																	<int key="NSTvFlags">-18841600</int>
+																	<int key="NSTvFlags">-2064384</int>
 																	<reference key="NSDelegate"/>
 																	<reference key="NSDataSource"/>
 																	<int key="NSGridStyleMask">1</int>
@@ -515,81 +514,80 @@
 																	<int key="NSTableViewGroupRowStyle">1</int>
 																</object>
 															</object>
-															<string key="NSFrame">{{1, 17}, {1278, 564}}</string>
-															<reference key="NSSuperview" ref="433502865"/>
+															<string key="NSFrame">{{1, 17}, {1279, 564}}</string>
+															<reference key="NSSuperview" ref="557171846"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="187344935"/>
+															<reference key="NSNextKeyView" ref="568474981"/>
 															<string key="NSReuseIdentifierKey">_NS:1195</string>
-															<reference key="NSDocView" ref="187344935"/>
-															<reference key="NSBGColor" ref="389294598"/>
+															<reference key="NSDocView" ref="568474981"/>
+															<reference key="NSBGColor" ref="687143842"/>
 															<int key="NScvFlags">4</int>
 														</object>
-														<object class="NSScroller" id="113223090">
-															<reference key="NSNextResponder" ref="433502865"/>
+														<object class="NSScroller" id="301557991">
+															<reference key="NSNextResponder" ref="557171846"/>
 															<int key="NSvFlags">-2147483392</int>
 															<string key="NSFrame">{{224, 17}, {15, 102}}</string>
-															<reference key="NSSuperview" ref="433502865"/>
+															<reference key="NSSuperview" ref="557171846"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="940894617"/>
+															<reference key="NSNextKeyView" ref="298060294"/>
 															<string key="NSReuseIdentifierKey">_NS:1214</string>
-															<reference key="NSTarget" ref="433502865"/>
+															<reference key="NSTarget" ref="557171846"/>
 															<string key="NSAction">_doScroller:</string>
 															<double key="NSPercent">0.98210290827740487</double>
 														</object>
-														<object class="NSScroller" id="940894617">
-															<reference key="NSNextResponder" ref="433502865"/>
-															<int key="NSvFlags">256</int>
-															<string key="NSFrame">{{1, 566}, {1278, 15}}</string>
-															<reference key="NSSuperview" ref="433502865"/>
+														<object class="NSScroller" id="298060294">
+															<reference key="NSNextResponder" ref="557171846"/>
+															<int key="NSvFlags">-2147483392</int>
+															<string key="NSFrame">{{1, 566}, {1279, 15}}</string>
+															<reference key="NSSuperview" ref="557171846"/>
 															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView"/>
 															<string key="NSReuseIdentifierKey">_NS:1216</string>
-															<bool key="NSEnabled">YES</bool>
 															<int key="NSsFlags">1</int>
-															<reference key="NSTarget" ref="433502865"/>
+															<reference key="NSTarget" ref="557171846"/>
 															<string key="NSAction">_doScroller:</string>
-															<double key="NSPercent">0.94039735099337751</double>
+															<double key="NSPercent">0.99224204809930183</double>
 														</object>
-														<object class="NSClipView" id="375606828">
-															<reference key="NSNextResponder" ref="433502865"/>
+														<object class="NSClipView" id="812767685">
+															<reference key="NSNextResponder" ref="557171846"/>
 															<int key="NSvFlags">2304</int>
 															<object class="NSMutableArray" key="NSSubviews">
 																<bool key="EncodedWithXMLCoder">YES</bool>
-																<reference ref="401256486"/>
+																<reference ref="732305867"/>
 															</object>
-															<string key="NSFrame">{{1, 0}, {1278, 17}}</string>
-															<reference key="NSSuperview" ref="433502865"/>
+															<string key="NSFrame">{{1, 0}, {1279, 17}}</string>
+															<reference key="NSSuperview" ref="557171846"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="401256486"/>
-															<reference key="NSDocView" ref="401256486"/>
-															<reference key="NSBGColor" ref="389294598"/>
+															<reference key="NSNextKeyView" ref="732305867"/>
+															<reference key="NSDocView" ref="732305867"/>
+															<reference key="NSBGColor" ref="687143842"/>
 															<int key="NScvFlags">4</int>
 														</object>
 													</object>
-													<string key="NSFrame">{{0, -1}, {1280, 582}}</string>
-													<reference key="NSSuperview" ref="278111632"/>
+													<string key="NSFrame">{{0, -1}, {1281, 582}}</string>
+													<reference key="NSSuperview" ref="137109359"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="375606828"/>
+													<reference key="NSNextKeyView" ref="812767685"/>
 													<string key="NSReuseIdentifierKey">_NS:1193</string>
-													<int key="NSsFlags">133810</int>
-													<reference key="NSVScroller" ref="113223090"/>
-													<reference key="NSHScroller" ref="940894617"/>
-													<reference key="NSContentView" ref="515468715"/>
-													<reference key="NSHeaderClipView" ref="375606828"/>
+													<int key="NSsFlags">133682</int>
+													<reference key="NSVScroller" ref="301557991"/>
+													<reference key="NSHScroller" ref="298060294"/>
+													<reference key="NSContentView" ref="1014471098"/>
+													<reference key="NSHeaderClipView" ref="812767685"/>
 													<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 												</object>
 											</object>
-											<string key="NSFrameSize">{1280, 599}</string>
-											<reference key="NSSuperview" ref="645991839"/>
+											<string key="NSFrameSize">{1281, 599}</string>
+											<reference key="NSSuperview" ref="160742686"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="107556775"/>
+											<reference key="NSNextKeyView" ref="128466737"/>
 											<string key="NSReuseIdentifierKey">_NS:11</string>
 										</object>
 									</object>
-									<string key="NSFrame">{{0, 211}, {1280, 599}}</string>
-									<reference key="NSSuperview" ref="240403983"/>
+									<string key="NSFrame">{{0, 211}, {1281, 599}}</string>
+									<reference key="NSSuperview" ref="1041938654"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="278111632"/>
+									<reference key="NSNextKeyView" ref="137109359"/>
 									<string key="NSReuseIdentifierKey">_NS:9</string>
 									<string key="NSOffsets">{0, 0}</string>
 									<object class="NSTextFieldCell" key="NSTitleCell">
@@ -601,14 +599,14 @@
 											<int key="NSColorSpace">6</int>
 											<string key="NSCatalogName">System</string>
 											<string key="NSColorName">textBackgroundColor</string>
-											<reference key="NSColor" ref="654197677"/>
+											<reference key="NSColor" ref="234298249"/>
 										</object>
 										<object class="NSColor" key="NSTextColor">
 											<int key="NSColorSpace">3</int>
 											<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
 										</object>
 									</object>
-									<reference key="NSContentView" ref="278111632"/>
+									<reference key="NSContentView" ref="137109359"/>
 									<int key="NSBorderType">0</int>
 									<int key="NSBoxType">4</int>
 									<int key="NSTitlePosition">0</int>
@@ -616,17 +614,17 @@
 									<real value="0.0" key="NSBorderWidth2"/>
 								</object>
 							</object>
-							<string key="NSFrameSize">{1280, 810}</string>
+							<string key="NSFrameSize">{1281, 810}</string>
 							<reference key="NSSuperview" ref="568628114"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="141262373"/>
+							<reference key="NSNextKeyView" ref="374300448"/>
 							<int key="NSDividerStyle">3</int>
 						</object>
 					</object>
-					<string key="NSFrameSize">{1279, 809}</string>
+					<string key="NSFrameSize">{1280, 809}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="240403983"/>
+					<reference key="NSNextKeyView" ref="1041938654"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMinSize">{94, 108}</string>
@@ -636,9 +634,28 @@
 			<object class="NSCustomObject" id="796877042">
 				<string key="NSClassName">NSApplication</string>
 			</object>
-			<object class="NSArrayController" id="926600176">
+			<object class="NSArrayController" id="409762156">
+				<bool key="NSEditable">YES</bool>
+				<bool key="NSAutomaticallyPreparesContent">YES</bool>
 				<object class="_NSManagedProxy" key="_NSManagedProxy">
 					<string key="NSEntityName">MAMedia</string>
+				</object>
+				<bool key="_NSIsUsingManagedProxy">YES</bool>
+				<bool key="_NSUsesLazyFetching">YES</bool>
+				<bool key="NSAvoidsEmptySelection">YES</bool>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+				<bool key="NSAutomaticallyRearrangesObjects">YES</bool>
+			</object>
+			<object class="NSUserDefaultsController" id="330837327">
+				<bool key="NSSharedInstance">YES</bool>
+			</object>
+			<object class="NSObjectController" id="903642826">
+				<bool key="NSAutomaticallyPreparesContent">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy">
+					<string key="NSEntityName">MAFolder</string>
 					<object class="NSCompoundPredicate" key="NSFetchPredicate">
 						<object class="NSArray" key="NSSubpredicates">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -646,7 +663,7 @@
 								<object class="NSKeyPathExpression" key="NSLeftExpression">
 									<int key="NSExpressionType">3</int>
 									<string key="NSSelectorName">valueForKey:</string>
-									<object class="NSSelfExpression" key="NSOperand" id="343322019">
+									<object class="NSSelfExpression" key="NSOperand" id="69598618">
 										<int key="NSExpressionType">1</int>
 									</object>
 									<object class="NSMutableArray" key="NSArguments">
@@ -672,77 +689,7 @@
 								<object class="NSKeyPathExpression" key="NSLeftExpression">
 									<int key="NSExpressionType">3</int>
 									<string key="NSSelectorName">valueForKey:</string>
-									<reference key="NSOperand" ref="343322019"/>
-									<object class="NSMutableArray" key="NSArguments">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSKeyPathSpecifierExpression">
-											<int key="NSExpressionType">10</int>
-											<string key="NSKeyPath">parent</string>
-										</object>
-									</object>
-								</object>
-								<object class="NSConstantValueExpression" key="NSRightExpression">
-									<int key="NSExpressionType">0</int>
-									<nil key="NSConstantValueClassName"/>
-								</object>
-								<object class="NSEqualityPredicateOperator" key="NSPredicateOperator">
-									<int key="NSOperatorType">4</int>
-									<int key="NSModifier">0</int>
-									<bool key="NSNegate">NO</bool>
-									<int key="NSOptions">0</int>
-								</object>
-							</object>
-						</object>
-						<int key="NSCompoundPredicateType">1</int>
-					</object>
-				</object>
-				<bool key="_NSIsUsingManagedProxy">YES</bool>
-				<bool key="_NSUsesLazyFetching">YES</bool>
-				<bool key="NSAvoidsEmptySelection">YES</bool>
-				<bool key="NSPreservesSelection">YES</bool>
-				<bool key="NSSelectsInsertedObjects">YES</bool>
-				<bool key="NSFilterRestrictsInsertion">YES</bool>
-				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
-			</object>
-			<object class="NSUserDefaultsController" id="3419284">
-				<bool key="NSSharedInstance">YES</bool>
-			</object>
-			<object class="NSObjectController" id="530788161">
-				<bool key="NSAutomaticallyPreparesContent">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy">
-					<string key="NSEntityName">MAFolder</string>
-					<object class="NSCompoundPredicate" key="NSFetchPredicate">
-						<object class="NSArray" key="NSSubpredicates">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="NSComparisonPredicate">
-								<object class="NSKeyPathExpression" key="NSLeftExpression">
-									<int key="NSExpressionType">3</int>
-									<string key="NSSelectorName">valueForKey:</string>
-									<reference key="NSOperand" ref="343322019"/>
-									<object class="NSMutableArray" key="NSArguments">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSKeyPathSpecifierExpression">
-											<int key="NSExpressionType">10</int>
-											<string key="NSKeyPath">name</string>
-										</object>
-									</object>
-								</object>
-								<object class="NSConstantValueExpression" key="NSRightExpression">
-									<int key="NSExpressionType">0</int>
-									<string key="NSConstantValue">Inbox</string>
-								</object>
-								<object class="NSEqualityPredicateOperator" key="NSPredicateOperator">
-									<int key="NSOperatorType">4</int>
-									<int key="NSModifier">0</int>
-									<bool key="NSNegate">NO</bool>
-									<int key="NSOptions">0</int>
-								</object>
-							</object>
-							<object class="NSComparisonPredicate">
-								<object class="NSKeyPathExpression" key="NSLeftExpression">
-									<int key="NSExpressionType">3</int>
-									<string key="NSSelectorName">valueForKey:</string>
-									<reference key="NSOperand" ref="343322019"/>
+									<reference key="NSOperand" ref="69598618"/>
 									<object class="NSMutableArray" key="NSArguments">
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<object class="NSKeyPathSpecifierExpression">
@@ -768,7 +715,7 @@
 				</object>
 				<bool key="_NSIsUsingManagedProxy">YES</bool>
 			</object>
-			<object class="NSArrayController" id="780925118">
+			<object class="NSArrayController" id="439496616">
 				<bool key="NSEditable">YES</bool>
 				<bool key="NSAutomaticallyPreparesContent">YES</bool>
 				<object class="_NSManagedProxy" key="_NSManagedProxy">
@@ -780,6 +727,7 @@
 				<bool key="NSSelectsInsertedObjects">YES</bool>
 				<bool key="NSFilterRestrictsInsertion">YES</bool>
 				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+				<bool key="NSAutomaticallyRearrangesObjects">YES</bool>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -804,11 +752,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: arrangedObjects.name</string>
-						<reference key="source" ref="62891107"/>
-						<reference key="destination" ref="926600176"/>
+						<reference key="source" ref="32864491"/>
+						<reference key="destination" ref="409762156"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="62891107"/>
-							<reference key="NSDestination" ref="926600176"/>
+							<reference key="NSSource" ref="32864491"/>
+							<reference key="NSDestination" ref="409762156"/>
 							<string key="NSLabel">value: arrangedObjects.name</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">arrangedObjects.name</string>
@@ -820,11 +768,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: arrangedObjects.notes</string>
-						<reference key="source" ref="1071402749"/>
-						<reference key="destination" ref="926600176"/>
+						<reference key="source" ref="3924643"/>
+						<reference key="destination" ref="409762156"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1071402749"/>
-							<reference key="NSDestination" ref="926600176"/>
+							<reference key="NSSource" ref="3924643"/>
+							<reference key="NSDestination" ref="409762156"/>
 							<string key="NSLabel">value: arrangedObjects.notes</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">arrangedObjects.notes</string>
@@ -836,11 +784,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: arrangedObjects.date</string>
-						<reference key="source" ref="1013716346"/>
-						<reference key="destination" ref="926600176"/>
+						<reference key="source" ref="412492128"/>
+						<reference key="destination" ref="409762156"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1013716346"/>
-							<reference key="NSDestination" ref="926600176"/>
+							<reference key="NSSource" ref="412492128"/>
+							<reference key="NSDestination" ref="409762156"/>
 							<string key="NSLabel">value: arrangedObjects.date</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">arrangedObjects.date</string>
@@ -856,11 +804,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">movie: selection.movie</string>
-						<reference key="source" ref="107556775"/>
-						<reference key="destination" ref="926600176"/>
+						<reference key="source" ref="128466737"/>
+						<reference key="destination" ref="409762156"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="107556775"/>
-							<reference key="NSDestination" ref="926600176"/>
+							<reference key="NSSource" ref="128466737"/>
+							<reference key="NSDestination" ref="409762156"/>
 							<string key="NSLabel">movie: selection.movie</string>
 							<string key="NSBinding">movie</string>
 							<string key="NSKeyPath">selection.movie</string>
@@ -872,11 +820,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">contentSet: selection.contents</string>
-						<reference key="source" ref="926600176"/>
-						<reference key="destination" ref="530788161"/>
+						<reference key="source" ref="409762156"/>
+						<reference key="destination" ref="903642826"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="926600176"/>
-							<reference key="NSDestination" ref="530788161"/>
+							<reference key="NSSource" ref="409762156"/>
+							<reference key="NSDestination" ref="903642826"/>
 							<string key="NSLabel">contentSet: selection.contents</string>
 							<string key="NSBinding">contentSet</string>
 							<string key="NSKeyPath">selection.contents</string>
@@ -892,10 +840,10 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">managedObjectContext: document.managedObjectContext</string>
-						<reference key="source" ref="530788161"/>
+						<reference key="source" ref="903642826"/>
 						<reference key="destination" ref="512844837"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="530788161"/>
+							<reference key="NSSource" ref="903642826"/>
 							<reference key="NSDestination" ref="512844837"/>
 							<string key="NSLabel">managedObjectContext: document.managedObjectContext</string>
 							<string key="NSBinding">managedObjectContext</string>
@@ -908,11 +856,11 @@
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">contentSet: selection.annotations</string>
-						<reference key="source" ref="780925118"/>
-						<reference key="destination" ref="926600176"/>
+						<reference key="source" ref="439496616"/>
+						<reference key="destination" ref="409762156"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="780925118"/>
-							<reference key="NSDestination" ref="926600176"/>
+							<reference key="NSSource" ref="439496616"/>
+							<reference key="NSDestination" ref="409762156"/>
 							<string key="NSLabel">contentSet: selection.annotations</string>
 							<string key="NSBinding">contentSet</string>
 							<string key="NSKeyPath">selection.annotations</string>
@@ -925,37 +873,78 @@
 					</object>
 					<int key="connectionID">100151</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mediaController</string>
+						<reference key="source" ref="512844837"/>
+						<reference key="destination" ref="409762156"/>
+					</object>
+					<int key="connectionID">100155</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">movieView</string>
+						<reference key="source" ref="512844837"/>
+						<reference key="destination" ref="128466737"/>
+					</object>
+					<int key="connectionID">100156</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.location</string>
-						<reference key="source" ref="284421416"/>
-						<reference key="destination" ref="780925118"/>
+						<string key="label">value: arrangedObjects.shortLocation</string>
+						<reference key="source" ref="38954332"/>
+						<reference key="destination" ref="439496616"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="284421416"/>
-							<reference key="NSDestination" ref="780925118"/>
-							<string key="NSLabel">value: arrangedObjects.location</string>
+							<reference key="NSSource" ref="38954332"/>
+							<reference key="NSDestination" ref="439496616"/>
+							<string key="NSLabel">value: arrangedObjects.shortLocation</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.location</string>
+							<string key="NSKeyPath">arrangedObjects.shortLocation</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSConditionallySetsEditable</string>
+									<string>NSCreatesSortDescriptor</string>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<boolean value="YES"/>
+									<boolean value="NO"/>
+								</object>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">100153</int>
+					<int key="connectionID">100158</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: arrangedObjects.notes</string>
-						<reference key="source" ref="864535406"/>
-						<reference key="destination" ref="780925118"/>
+						<reference key="source" ref="320300624"/>
+						<reference key="destination" ref="439496616"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="864535406"/>
-							<reference key="NSDestination" ref="780925118"/>
+							<reference key="NSSource" ref="320300624"/>
+							<reference key="NSDestination" ref="439496616"/>
 							<string key="NSLabel">value: arrangedObjects.notes</string>
 							<string key="NSBinding">value</string>
 							<string key="NSKeyPath">arrangedObjects.notes</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSCreatesSortDescriptor</string>
+								<boolean value="NO" key="NS.object.0"/>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">100154</int>
+					<int key="connectionID">100159</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">annotationController</string>
+						<reference key="source" ref="512844837"/>
+						<reference key="destination" ref="439496616"/>
+					</object>
+					<int key="connectionID">100160</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -994,7 +983,7 @@
 						<reference key="object" ref="568628114"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="240403983"/>
+							<reference ref="1041938654"/>
 						</object>
 						<reference key="parent" ref="275939982"/>
 					</object>
@@ -1006,220 +995,221 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100086</int>
-						<reference key="object" ref="926600176"/>
+						<reference key="object" ref="409762156"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">MediaController</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100094</int>
-						<reference key="object" ref="3419284"/>
+						<reference key="object" ref="330837327"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100130</int>
-						<reference key="object" ref="240403983"/>
+						<reference key="object" ref="1041938654"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="141262373"/>
-							<reference ref="645991839"/>
+							<reference ref="374300448"/>
+							<reference ref="160742686"/>
 						</object>
 						<reference key="parent" ref="568628114"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100021</int>
-						<reference key="object" ref="141262373"/>
+						<reference key="object" ref="374300448"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="677931807"/>
-							<reference ref="876748930"/>
-							<reference ref="10263050"/>
-							<reference ref="728081730"/>
+							<reference ref="435572973"/>
+							<reference ref="647289752"/>
+							<reference ref="721813204"/>
+							<reference ref="379630635"/>
 						</object>
-						<reference key="parent" ref="240403983"/>
+						<reference key="parent" ref="1041938654"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100129</int>
-						<reference key="object" ref="645991839"/>
+						<reference key="object" ref="160742686"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="433502865"/>
-							<reference ref="107556775"/>
+							<reference ref="557171846"/>
+							<reference ref="128466737"/>
 						</object>
-						<reference key="parent" ref="240403983"/>
+						<reference key="parent" ref="1041938654"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100034</int>
-						<reference key="object" ref="433502865"/>
+						<reference key="object" ref="557171846"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="113223090"/>
-							<reference ref="401256486"/>
-							<reference ref="940894617"/>
-							<reference ref="187344935"/>
+							<reference ref="301557991"/>
+							<reference ref="732305867"/>
+							<reference ref="298060294"/>
+							<reference ref="568474981"/>
 						</object>
-						<reference key="parent" ref="645991839"/>
+						<reference key="parent" ref="160742686"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100033</int>
-						<reference key="object" ref="107556775"/>
-						<reference key="parent" ref="645991839"/>
+						<reference key="object" ref="128466737"/>
+						<reference key="parent" ref="160742686"/>
 						<string key="objectName">Movie View</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100035</int>
-						<reference key="object" ref="113223090"/>
-						<reference key="parent" ref="433502865"/>
+						<reference key="object" ref="301557991"/>
+						<reference key="parent" ref="557171846"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100036</int>
-						<reference key="object" ref="401256486"/>
-						<reference key="parent" ref="433502865"/>
+						<reference key="object" ref="732305867"/>
+						<reference key="parent" ref="557171846"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100037</int>
-						<reference key="object" ref="940894617"/>
-						<reference key="parent" ref="433502865"/>
+						<reference key="object" ref="298060294"/>
+						<reference key="parent" ref="557171846"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100038</int>
-						<reference key="object" ref="187344935"/>
+						<reference key="object" ref="568474981"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="284421416"/>
-							<reference ref="673713016"/>
-							<reference ref="864535406"/>
+							<reference ref="38954332"/>
+							<reference ref="579126605"/>
+							<reference ref="320300624"/>
 						</object>
-						<reference key="parent" ref="433502865"/>
+						<reference key="parent" ref="557171846"/>
+						<string key="objectName">Table View</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100039</int>
-						<reference key="object" ref="284421416"/>
+						<reference key="object" ref="38954332"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="964970916"/>
+							<reference ref="1007443467"/>
 						</object>
-						<reference key="parent" ref="187344935"/>
+						<reference key="parent" ref="568474981"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100040</int>
-						<reference key="object" ref="673713016"/>
+						<reference key="object" ref="579126605"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="657615961"/>
+							<reference ref="730633890"/>
 						</object>
-						<reference key="parent" ref="187344935"/>
+						<reference key="parent" ref="568474981"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100043</int>
-						<reference key="object" ref="864535406"/>
+						<reference key="object" ref="320300624"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="712731318"/>
+							<reference ref="813423854"/>
 						</object>
-						<reference key="parent" ref="187344935"/>
+						<reference key="parent" ref="568474981"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100044</int>
-						<reference key="object" ref="712731318"/>
-						<reference key="parent" ref="864535406"/>
+						<reference key="object" ref="813423854"/>
+						<reference key="parent" ref="320300624"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100041</int>
-						<reference key="object" ref="657615961"/>
-						<reference key="parent" ref="673713016"/>
+						<reference key="object" ref="730633890"/>
+						<reference key="parent" ref="579126605"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100042</int>
-						<reference key="object" ref="964970916"/>
-						<reference key="parent" ref="284421416"/>
+						<reference key="object" ref="1007443467"/>
+						<reference key="parent" ref="38954332"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100025</int>
-						<reference key="object" ref="677931807"/>
+						<reference key="object" ref="435572973"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1013716346"/>
-							<reference ref="1071402749"/>
-							<reference ref="62891107"/>
+							<reference ref="412492128"/>
+							<reference ref="3924643"/>
+							<reference ref="32864491"/>
 						</object>
-						<reference key="parent" ref="141262373"/>
+						<reference key="parent" ref="374300448"/>
 						<string key="objectName">Table View</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100024</int>
-						<reference key="object" ref="876748930"/>
-						<reference key="parent" ref="141262373"/>
+						<reference key="object" ref="647289752"/>
+						<reference key="parent" ref="374300448"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100023</int>
-						<reference key="object" ref="10263050"/>
-						<reference key="parent" ref="141262373"/>
+						<reference key="object" ref="721813204"/>
+						<reference key="parent" ref="374300448"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100022</int>
-						<reference key="object" ref="728081730"/>
-						<reference key="parent" ref="141262373"/>
+						<reference key="object" ref="379630635"/>
+						<reference key="parent" ref="374300448"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100030</int>
-						<reference key="object" ref="1013716346"/>
+						<reference key="object" ref="412492128"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="767978022"/>
+							<reference ref="569160493"/>
 						</object>
-						<reference key="parent" ref="677931807"/>
+						<reference key="parent" ref="435572973"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100027</int>
-						<reference key="object" ref="1071402749"/>
+						<reference key="object" ref="3924643"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="229865976"/>
+							<reference ref="304181817"/>
 						</object>
-						<reference key="parent" ref="677931807"/>
+						<reference key="parent" ref="435572973"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100026</int>
-						<reference key="object" ref="62891107"/>
+						<reference key="object" ref="32864491"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="722993368"/>
+							<reference ref="974163542"/>
 						</object>
-						<reference key="parent" ref="677931807"/>
+						<reference key="parent" ref="435572973"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100029</int>
-						<reference key="object" ref="722993368"/>
-						<reference key="parent" ref="62891107"/>
+						<reference key="object" ref="974163542"/>
+						<reference key="parent" ref="32864491"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100028</int>
-						<reference key="object" ref="229865976"/>
-						<reference key="parent" ref="1071402749"/>
+						<reference key="object" ref="304181817"/>
+						<reference key="parent" ref="3924643"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100031</int>
-						<reference key="object" ref="767978022"/>
+						<reference key="object" ref="569160493"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1046086656"/>
+							<reference ref="217231872"/>
 						</object>
-						<reference key="parent" ref="1013716346"/>
+						<reference key="parent" ref="412492128"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100032</int>
-						<reference key="object" ref="1046086656"/>
-						<reference key="parent" ref="767978022"/>
+						<reference key="object" ref="217231872"/>
+						<reference key="parent" ref="569160493"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100143</int>
-						<reference key="object" ref="530788161"/>
+						<reference key="object" ref="903642826"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">SelectedFolderController</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100148</int>
-						<reference key="object" ref="780925118"/>
+						<reference key="object" ref="439496616"/>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">AnnotationController</string>
 					</object>
@@ -1302,7 +1292,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>name == 'Inbox' AND parent == NULL</string>
+					<string/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1326,7 +1316,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">100154</int>
+			<int key="maxID">100160</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1335,14 +1325,74 @@
 					<string key="className">MADocWindow</string>
 					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">addMediaFiles:</string>
-						<string key="NS.object.0">id</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addAnnotation:</string>
+							<string>addMediaFiles:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">addMediaFiles:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">addMediaFiles:</string>
-							<string key="candidateClassName">id</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addAnnotation:</string>
+							<string>addMediaFiles:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">addAnnotation:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">addMediaFiles:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>annotationController</string>
+							<string>mediaController</string>
+							<string>movieView</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSArrayController</string>
+							<string>NSArrayController</string>
+							<string>QTMovieView</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>annotationController</string>
+							<string>mediaController</string>
+							<string>movieView</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">annotationController</string>
+								<string key="candidateClassName">NSArrayController</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">mediaController</string>
+								<string key="candidateClassName">NSArrayController</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">movieView</string>
+								<string key="candidateClassName">QTMovieView</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Medianno/en.lproj/MainMenu.xib b/Medianno/en.lproj/MainMenu.xib
index 8c14bd1..4c14373 100644
--- a/Medianno/en.lproj/MainMenu.xib
+++ b/Medianno/en.lproj/MainMenu.xib
@@ -273,6 +273,26 @@
 									<reference key="NSOnImage" ref="1033313550"/>
 									<reference key="NSMixedImage" ref="310636482"/>
 								</object>
+								<object class="NSMenuItem" id="906148750">
+									<reference key="NSMenu" ref="720053764"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1033313550"/>
+									<reference key="NSMixedImage" ref="310636482"/>
+								</object>
+								<object class="NSMenuItem" id="7029338">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Add Media Files…</string>
+									<string key="NSKeyEquiv">A</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1033313550"/>
+									<reference key="NSMixedImage" ref="310636482"/>
+								</object>
 								<object class="NSMenuItem" id="1010469920">
 									<reference key="NSMenu" ref="720053764"/>
 									<bool key="NSIsDisabled">YES</bool>
@@ -748,22 +768,22 @@
 							</object>
 						</object>
 					</object>
-					<object class="NSMenuItem" id="386451183">
+					<object class="NSMenuItem" id="610990130">
 						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Collection</string>
+						<string key="NSTitle">Annotate</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="1033313550"/>
 						<reference key="NSMixedImage" ref="310636482"/>
 						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="281430727">
-							<string key="NSTitle">Collection</string>
+						<object class="NSMenu" key="NSSubmenu" id="352060197">
+							<string key="NSTitle">Annotate</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="504872562">
-									<reference key="NSMenu" ref="281430727"/>
-									<string key="NSTitle">Add Media Files…</string>
-									<string key="NSKeyEquiv">A</string>
+								<object class="NSMenuItem" id="590509802">
+									<reference key="NSMenu" ref="352060197"/>
+									<string key="NSTitle">Add Annotation</string>
+									<string key="NSKeyEquiv">t</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="1033313550"/>
@@ -1258,10 +1278,18 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">addMediaFiles:</string>
 						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="504872562"/>
+						<reference key="destination" ref="7029338"/>
 					</object>
 					<int key="connectionID">539</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addAnnotation:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="590509802"/>
+					</object>
+					<int key="connectionID">542</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1301,7 +1329,7 @@
 							<reference ref="379814623"/>
 							<reference ref="586577488"/>
 							<reference ref="1050483726"/>
-							<reference ref="386451183"/>
+							<reference ref="610990130"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1356,6 +1384,8 @@
 							<reference ref="425164168"/>
 							<reference ref="579971712"/>
 							<reference ref="1010469920"/>
+							<reference ref="906148750"/>
+							<reference ref="7029338"/>
 						</object>
 						<reference key="parent" ref="379814623"/>
 					</object>
@@ -1903,26 +1933,36 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">536</int>
-						<reference key="object" ref="386451183"/>
+						<reference key="object" ref="610990130"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="281430727"/>
+							<reference ref="352060197"/>
 						</object>
 						<reference key="parent" ref="649796088"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">537</int>
-						<reference key="object" ref="281430727"/>
+						<reference key="object" ref="352060197"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="504872562"/>
+							<reference ref="590509802"/>
 						</object>
-						<reference key="parent" ref="386451183"/>
+						<reference key="parent" ref="610990130"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">540</int>
+						<reference key="object" ref="906148750"/>
+						<reference key="parent" ref="720053764"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">538</int>
-						<reference key="object" ref="504872562"/>
-						<reference key="parent" ref="281430727"/>
+						<reference key="object" ref="7029338"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">541</int>
+						<reference key="object" ref="590509802"/>
+						<reference key="parent" ref="352060197"/>
 					</object>
 				</object>
 			</object>
@@ -2011,6 +2051,8 @@
 					<string>536.IBPluginDependency</string>
 					<string>537.IBPluginDependency</string>
 					<string>538.IBPluginDependency</string>
+					<string>540.IBPluginDependency</string>
+					<string>541.IBPluginDependency</string>
 					<string>56.IBPluginDependency</string>
 					<string>57.IBPluginDependency</string>
 					<string>58.IBPluginDependency</string>
@@ -2123,6 +2165,8 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -2137,7 +2181,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">539</int>
+			<int key="maxID">542</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2179,6 +2223,25 @@
 						<string key="minorKey">./Classes/MADocWindow.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MADocument</string>
+					<string key="superclassName">NSPersistentDocument</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">addAnnotation:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">addAnnotation:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">addAnnotation:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MADocument.h</string>
+					</object>
+				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>