changeset 699:9a7d829bc492

* Pulled through query start changes * Disables fields when no query selected / new db opened * Added icon files
author mas01mj
date Wed, 28 Apr 2010 15:48:59 +0000
parents 10d3692e0b06
children 54974e8a6b87
files examples/iAudioDB/AppController.h examples/iAudioDB/AppController.m examples/iAudioDB/English.lproj/MainMenu.xib examples/iAudioDB/iAudioDB.xcodeproj/project.pbxproj examples/iAudioDB/icons/Add.tiff examples/iAudioDB/icons/Play.tiff examples/iAudioDB/icons/Spotlight.tiff examples/iAudioDB/icons/Stop.tiff
diffstat 8 files changed, 2552 insertions(+), 1121 deletions(-) [+]
line wrap: on
line diff
--- a/examples/iAudioDB/AppController.h	Mon Apr 26 17:17:07 2010 +0000
+++ b/examples/iAudioDB/AppController.h	Wed Apr 28 15:48:59 2010 +0000
@@ -9,8 +9,9 @@
 #import <Cocoa/Cocoa.h>
 #include <audioDB_API.h>
 
+
 @interface AppController : NSObject {
-	adb_ptr db;
+	adb_t *db;
 	NSModalSession session;
 	
 	NSString* dbName;
@@ -20,28 +21,49 @@
 	NSString* selectedFilename;
 	
 	IBOutlet NSTextField *statusField;
-	IBOutlet NSTableView *tracksView;
+	IBOutlet NSTableView* tracksView;
 	IBOutlet id mainWindow;
 
-	// Querying
+	// Query Customizing
+	
+	IBOutlet NSButton* multipleCheckBox;
+	IBOutlet NSButton* resetButton;
+	IBOutlet NSTextField* queryStartVectors;
+	IBOutlet NSTextField* queryStartSeconds;
+	IBOutlet NSTextField* queryLengthVectors;
+	IBOutlet NSTextField* queryLengthSeconds;
+	IBOutlet NSTextField* queryPath;
+	IBOutlet NSButton* queryButton;
+	
+	// Main window buttons/fields.
+	
+	IBOutlet NSToolbarItem* importAudioButton;
+	IBOutlet NSToolbarItem* performQueryButton;
+	IBOutlet NSToolbarItem* playBothButton;
+	IBOutlet NSToolbarItem* playResultButton;
+	IBOutlet NSToolbarItem* stopButton;
 	IBOutlet NSTextField* queryKey;
-	IBOutlet NSButton* playBothButton;
-	IBOutlet NSButton* playResultButton;
-	IBOutlet NSButton* stopButton;
-	IBOutlet NSButton* chooseButton;
+	
+	NSSound* queryTrack;
+	NSSound* resultTrack;
+	
+	// Creating
+	IBOutlet id createSheet;
+	IBOutlet id querySheet;
+	
+	IBOutlet NSMatrix* extractorOptions;
+	IBOutlet NSTextField* windowSizeField;
+	IBOutlet NSTextField* hopSizeField;
+	IBOutlet NSTextField* maxTracksField;
+	IBOutlet NSTextField* maxLengthField;
+	
+	// Extracting
+	IBOutlet id importSheet;
+	IBOutlet NSProgressIndicator* indicator;
 	
 	NSMutableArray* results;
 	NSDictionary* trackMap;
-	
-	// Extracting
-	IBOutlet id importSheet;
-	IBOutlet NSBox* extractingBox;
-	IBOutlet NSMatrix* extractorOptions;
-	IBOutlet NSProgressIndicator* indicator;
-	
-	// Playback
-	NSSound* queryTrack;
-	NSSound* resultTrack;
+	NSDictionary* dbState;
 	
 	// Query param fields
 	
@@ -52,17 +74,26 @@
 	 IBOutlet NSTextField* queryLengthField;
 	 IBOutlet NSTextField* queryRadiusField;
 	 IBOutlet NSButtonCell* exhaustiveField;*/
-	
 }
 
 //  Menus
 -(IBAction)newDatabase:(id)sender;
 -(IBAction)openDatabase:(id)sender;
--(IBAction)selectFiles:(id)sender;
 
 // Import
 -(IBAction)importAudio:(id)sender;
--(IBAction)cancelImport:(id)sender;
+// -(IBAction)cancelImport:(id)sender;
+
+// Create
+-(IBAction)cancelCreate:(id)sender;
+-(IBAction)createDatabase:(id)sender;
+
+// Query
+-(IBAction)pathAction:(id)sender;
+-(IBAction)cancelQuery:(id)sender;
+-(IBAction)performQuery:(id)sender;
+-(IBAction)selectQueryFile:(id)sender;
+-(IBAction)resetLengths:(id)sender;
 
 // Buttons
 -(IBAction)playBoth:(id)sender;
@@ -70,9 +101,9 @@
 -(IBAction)stopPlay:(id)sender;
 -(IBAction)chooseQuery:(id)sender;
 -(IBAction)selectedChanged:(id)sender;
+-(IBAction)tableDoubleClick:(id)sender;
 
-
--(void)performQuery;
+-(void)reset;
 -(void)updateStatus;
 - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem;
 - (void)sound:(NSSound *)sound didFinishPlaying:(BOOL)playbackSuccessful;
--- a/examples/iAudioDB/AppController.m	Mon Apr 26 17:17:07 2010 +0000
+++ b/examples/iAudioDB/AppController.m	Wed Apr 28 15:48:59 2010 +0000
@@ -5,8 +5,8 @@
 //  Created by Mike Jewell on 27/01/2010.
 //  Copyright 2010 __MyCompanyName__. All rights reserved.
 //
+#import "AppController.h"
 
-#import "AppController.h"
 
 
 @implementation AppController
@@ -18,57 +18,158 @@
 	// A max of 100 results.
 	results = [[NSMutableArray alloc] initWithCapacity: 100];
 	
-	
 	return self;
 }
 
+- (void)awakeFromNib {
+	[tracksView setTarget:self];
+	[tracksView setDoubleAction:@selector(tableDoubleClick:)];
+	[self updateStatus];
+}
+
+
+- (IBAction)tableDoubleClick:(id)sender
+{
+	[self playResult:Nil];
+//	NSLog(@"Table double clicked");
+}
+	
 
 /**
  * Create a new database, given the selected filename.
  */
 -(IBAction)newDatabase:(id)sender
 {
+	
+	[NSApp beginSheet:createSheet modalForWindow:mainWindow modalDelegate:self didEndSelector:NULL contextInfo:nil];
+	session = [NSApp beginModalSessionForWindow:createSheet];
+	[NSApp runModalSession:session];	
+}
+
+/**
+ * Cancel the db creation (at configuration time).
+ */
+-(IBAction)cancelCreate:(id)sender
+{
+	[NSApp endModalSession:session];
+	[createSheet orderOut:nil];
+	[NSApp endSheet:createSheet];
+}
+
+-(IBAction)createDatabase:(id)sender
+{
+	[self cancelCreate:self];
+	
 	NSSavePanel* panel = [NSSavePanel savePanel];
 	NSInteger response = [panel runModalForDirectory:NSHomeDirectory() file:@""];
-	
+	 
 	[results removeAllObjects];
 	[tracksView reloadData];
-	
+	 
 	if(response == NSFileHandlingPanelOKButton)
 	{
-		// TODO: Refactor this into a 'tidy' method.
-		// Tidy any existing references up.
-		if(db)
+		// Work out which extractor to use
+		NSString* extractor = @"adb_chroma";
+		// TODO: This should be stored with the n3.
+		int dim;
+		switch([extractorOptions selectedTag])
 		{
-			audiodb_close(db);
+			case 0:
+				extractor = @"adb_chroma";
+				dim = 12;
+				break;
+			case 1:
+				extractor = @"adb_cq";
+				dim = 48;
+				break;
+			case 2:
+				extractor = @"qm_chroma";
+				dim = 12;
+				break;
+			case 3:
+				extractor = @"qm_mfcc";
+				dim = 12;
+				break;
 		}
 		
-		if(dbFilename)
-		{
-			[dbFilename release];
-			[dbName release];
-			[plistFilename release];
-		}
+		// Calculate the max DB size
+		int vectors = ceil(([maxLengthField doubleValue] * 60.0f) / ([hopSizeField doubleValue] / 44100.0f));
+		int numtracks = [maxTracksField intValue];
+		int datasize = ceil((numtracks * vectors * dim * 8.0f) / 1024.0f / 1024.0f); // In MB
 		
+		[self reset];
+		 
 		// Create new db, and set flags.
-		db = audiodb_create([[panel filename] cStringUsingEncoding:NSUTF8StringEncoding], 0, 0, 0);
+		db = audiodb_create([[panel filename] cStringUsingEncoding:NSUTF8StringEncoding], datasize, numtracks, dim);
 		audiodb_l2norm(db);
-		audiodb_power(db);
-		
+			 
 		// Store useful paths.
 		dbName = [[[panel URL] relativePath] retain];
 		dbFilename = [[panel filename] retain];
 		plistFilename = [[NSString stringWithFormat:@"%@.plist", [dbFilename stringByDeletingPathExtension]] retain];
-		
+			
 		// Create the plist file (contains mapping from filename to key).
+		dbState = [[NSMutableDictionary alloc] init];
 		trackMap = [[NSMutableDictionary alloc] init];
-		[trackMap writeToFile:plistFilename atomically:YES];
-		
+		[dbState setValue:trackMap forKey:@"tracks"];
+		[dbState setValue:extractor forKey:@"extractor"];
+		[dbState setValue:[hopSizeField stringValue] forKey:@"hopsize"];
+		[dbState setValue:[windowSizeField stringValue] forKey:@"windowsize"];
+		[dbState writeToFile:plistFilename atomically:YES];
+			 
 		[queryKey setStringValue:@"None Selected"];
 		[self updateStatus];
 	}
 }
 
+-(void)reset
+{
+	// Tidy any existing references up.
+	if(db)
+	{
+		NSLog(@"Close db");
+		audiodb_close(db);
+	}
+	
+	if(dbFilename)
+	{
+		NSLog(@"Tidy up filenames");
+		[dbFilename release];
+		[dbName release];
+		[plistFilename release];
+		[trackMap release];
+		[dbState release];
+	}
+	
+	if(selectedKey)
+	{
+		NSLog(@"Released selected key: %@", selectedKey);
+		[selectedKey release];
+		selectedKey = Nil;
+		NSLog(@"Is now %@", selectedKey);
+	}
+	
+	if(selectedKey)
+	{
+		NSLog(@"Still evals");
+	}
+	
+	// Reset query flags
+	[queryPath setStringValue: @"No file selected"];
+	[queryLengthSeconds setDoubleValue:0];
+	[queryLengthVectors setDoubleValue:0];
+	[multipleCheckBox setState:NSOnState];
+	[queryStartSeconds setDoubleValue:0];
+	[queryStartVectors setDoubleValue:0];
+	
+	[queryLengthSeconds setEnabled:NO];
+	[queryLengthVectors setEnabled:NO];
+	[queryStartSeconds setEnabled:NO];
+	[queryStartVectors setEnabled:NO];
+	[resetButton setEnabled:NO];
+	[multipleCheckBox setEnabled:NO];
+}
+
 /**
  * Open an existing adb (which must have a plist)
  */
@@ -79,21 +180,11 @@
 	NSInteger response = [panel runModalForDirectory:NSHomeDirectory() file:@"" types:fileTypes];
 	if(response == NSFileHandlingPanelOKButton)
 	{
-		// Tidy any existing references up.
-		if(db)
-		{
-			audiodb_close(db);
-		}
-		
-		if(dbFilename)
-		{
-			[dbFilename release];
-			[dbName release];
-			[plistFilename release];
-		}
+		[self reset];
 		
 		// Store useful paths.
-		db = audiodb_open([[panel filename] cStringUsingEncoding:NSUTF8StringEncoding], O_RDWR);
+		NSLog(@"Open");
+		db = audiodb_open([[panel filename] cStringUsingEncoding:NSUTF8StringEncoding], O_RDONLY);
 		dbName = [[[panel URL] relativePath] retain];
 		dbFilename = [[panel filename] retain];
 		
@@ -105,7 +196,6 @@
 		[tracksView reloadData];
 		
 		[queryKey setStringValue:@"None Selected"];
-		[self updateStatus];
 		
 		adb_liszt_results_t* liszt_results = audiodb_liszt(db);
 		
@@ -116,57 +206,58 @@
 		}
 		
 		audiodb_liszt_free_results(db, liszt_results);
-		trackMap = [[[NSMutableDictionary alloc] initWithContentsOfFile:plistFilename] retain];
+		dbState = [[[NSMutableDictionary alloc] initWithContentsOfFile:plistFilename] retain];
+		trackMap = [[dbState objectForKey:@"tracks"] retain];
+		
+		[self updateStatus];
+		
 		NSLog(@"Size: %d", [trackMap count]);
 	}
 }
 
+-(IBAction)pathAction:(id)sender
+{
+	NSLog(@"Path action");
+}
+
 /**
  * Update button states and status field based on current state.
  */
 -(void)updateStatus
 {
+	NSLog(@"Update status");
 	if(db)
 	{
-		adb_status_ptr status = (adb_status_ptr)malloc(sizeof(struct adbstatus));
+		NSLog(@"Got a db");
+		adb_status_t *status = (adb_status_t *)malloc(sizeof(adb_status_t));
 		int flags;
 		flags = audiodb_status(db, status);
-		[statusField setStringValue: [NSString stringWithFormat:@"Database: %@ Dimensions: %d Files: %d", dbName, status->dim, status->numFiles]];
-		[chooseButton setEnabled:YES];
+		[statusField setStringValue: [NSString stringWithFormat:@"%@ Dim: %d Files: %d Hop: %@ Win: %@ Ext: %@", 
+									  dbName, 
+									  status->dim, 
+									  status->numFiles, 
+									  [dbState objectForKey:@"hopsize"],
+									  [dbState objectForKey:@"windowsize"],
+									  [dbState objectForKey:@"extractor"]]];
+		[performQueryButton setEnabled:YES];
+		[importAudioButton setEnabled:YES];
 	}
 	else
 	{
-		[chooseButton setEnabled:NO];
-		[playBothButton setEnabled:FALSE];
-		[playResultButton setEnabled:FALSE];
+		NSLog(@"No db");
+		[performQueryButton setEnabled:NO];
+		[importAudioButton setEnabled:NO];
+		[playBothButton setEnabled:NO];
+		[playResultButton setEnabled:NO];
+		[stopButton setEnabled:NO];
 	}
 }
 
 /**
- * Get user's import choices.
- */
--(IBAction)importAudio:(id)sender
-{
-	[NSApp beginSheet:importSheet modalForWindow:mainWindow modalDelegate:self didEndSelector:NULL contextInfo:nil];
-	session = [NSApp beginModalSessionForWindow: importSheet];
-	[NSApp runModalSession:session];
-}
-
-/**
- * Cancel the import (at configuration time).
- */
--(IBAction)cancelImport:(id)sender;
-{
-	[NSApp endModalSession:session];
-	[importSheet orderOut:nil];
-	[NSApp endSheet:importSheet];
-}
-
-/**
  * Choose the file(s) to be imported.
  * TODO: Currently handles the import process too - split this off.
  */
--(IBAction)selectFiles:(id)sender
+-(IBAction)importAudio:(id)sender
 {
 	[tracksView reloadData];
 	
@@ -176,121 +267,75 @@
 	NSInteger response = [panel runModalForDirectory:NSHomeDirectory() file:@"" types:fileTypes];
 	if(response == NSFileHandlingPanelOKButton)
 	{
-		NSRect newFrame;
+		[indicator startAnimation:self];
 		
-		[extractingBox setHidden:FALSE];
-		newFrame.origin.x = [importSheet frame].origin.x;
-		newFrame.origin.y = [importSheet frame].origin.y - [extractingBox frame].size.height;
-		newFrame.size.width = [importSheet frame].size.width;
-		newFrame.size.height = [importSheet frame].size.height + [extractingBox frame].size.height;
-		
-		[indicator startAnimation:self];
-		[importSheet setFrame:newFrame display:YES animate:YES];
+		[NSApp beginSheet:importSheet modalForWindow:mainWindow modalDelegate:self didEndSelector:NULL contextInfo:nil];
+		session = [NSApp beginModalSessionForWindow: importSheet];
+		[NSApp runModalSession:session];
 		
 		NSArray *filesToOpen = [panel filenames];
 		
-		NSLog(@"Begin import");
+		NSString* extractor = [dbState objectForKey:@"extractor"];
+		NSString* extractorPath = [NSString stringWithFormat:@"/Applications/iAudioDB.app/rdf/%@.n3", extractor];
 		
-		// Work out which extractor to use
-		NSString* extractor = @"chromagram";
-		switch([extractorOptions selectedTag])
-		{
-			case 0:
-				extractor = @"mfcc";
-				break;
-			case 1:
-				extractor = @"chromagram";
-				break;
-		}
+		// TODO Shift this process into a separate function.
+		// Create the customized extractor config
+		NSString* extractorContent = [NSString stringWithContentsOfFile:extractorPath];
+		NSString* hopStr = [dbState objectForKey:@"hopsize"];
+		NSString* winStr = [dbState objectForKey:@"windowsize"];
+		NSString* newContent = [[extractorContent stringByReplacingOccurrencesOfString:@"HOP_SIZE" withString:hopStr] 
+								stringByReplacingOccurrencesOfString:@"WINDOW_SIZE" withString:winStr];
+		NSString* n3FileName = [NSTemporaryDirectory() stringByAppendingPathComponent:@"extractor_config.n3"];
+		
+		NSError* error;
+		[newContent writeToFile:n3FileName atomically:YES encoding:NSASCIIStringEncoding error:&error];
 		
 		for(int i=0; i<[filesToOpen count]; i++)
-		{
-			// First extract powers
-			
-			NSString *tempFileTemplate = [NSTemporaryDirectory() stringByAppendingPathComponent:@"powers.XXXXXX"];
-			const char *tempFileTemplateCString = [tempFileTemplate fileSystemRepresentation];
-			char *tempFileNameCString = (char *)malloc(strlen(tempFileTemplateCString) + 1);
-			strcpy(tempFileNameCString, tempFileTemplateCString);
-			mktemp(tempFileNameCString);
-			
-			NSString* powersFileName = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:tempFileNameCString length:strlen(tempFileNameCString)];
-			free(tempFileNameCString);
-			
-			NSTask *task = [[NSTask alloc] init];
-			[task setLaunchPath:@"/usr/local/bin/fftExtract"];
-			NSArray *args = [NSArray arrayWithObjects:@"-P", @"-s", @"250", [filesToOpen objectAtIndex:i], powersFileName, nil];
-			[task setArguments:args];
-			[task launch];
-			[task waitUntilExit];
-			[task release];
-			
-			// Then features
-			
-			tempFileTemplate = [NSTemporaryDirectory() stringByAppendingPathComponent:@"features.XXXXXX"];
-			tempFileTemplateCString = [tempFileTemplate fileSystemRepresentation];
-			tempFileNameCString = (char *)malloc(strlen(tempFileTemplateCString) + 1);
+		{		
+			audiodb_close(db);
+			NSString* tempFileTemplate = [NSTemporaryDirectory() stringByAppendingPathComponent:@"features.XXXXXX"];
+			const char* tempFileTemplateCString = [tempFileTemplate fileSystemRepresentation];
+			char* tempFileNameCString = (char *)malloc(strlen(tempFileTemplateCString) + 1);
 			strcpy(tempFileNameCString, tempFileTemplateCString);
 			mktemp(tempFileNameCString);
 
 			NSString* featuresFileName = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:tempFileNameCString length:strlen(tempFileNameCString)];
 			free(tempFileNameCString);
 			
-			task = [[NSTask alloc] init];
+			NSTask* task = [[NSTask alloc] init];
 			
-			[task setLaunchPath:@"/usr/local/bin/fftExtract"];
-			
-			NSArray *args2;
-			
-			// Choose the args (TODO: This should use sonic annotator eventually)
-			if([extractor isEqualToString:@"chromagram"])
-			{
-				args2 = [NSArray arrayWithObjects:@"-p",@"/Users/mikej/planfile",@"-c", @"12", @"-s", @"250", [filesToOpen objectAtIndex:i], featuresFileName, nil];
-			}
-			else
-			{
-				args2 = [NSArray arrayWithObjects:@"-p",@"/Users/mikej/planfile",@"-m", @"13", @"-s", @"250", [filesToOpen objectAtIndex:i], featuresFileName, nil];
-			}
-			[task setArguments:args2];
+			[task setLaunchPath:@"/usr/local/bin/sonic-annotator"];
+			NSArray* args;
+			args = [NSArray arrayWithObjects:@"-t", n3FileName, @"-w", @"rdf", @"-r", @"--rdf-network", @"--rdf-one-file", featuresFileName, @"--rdf-force", [filesToOpen objectAtIndex:i], nil];
+			[task setArguments:args];
 			[task launch];
 			[task waitUntilExit];
 			[task release];
 			
+			NSTask* importTask = [[NSTask alloc] init];
+			[importTask setLaunchPath:@"/usr/local/bin/populate"];
+			args = [NSArray arrayWithObjects:featuresFileName, dbFilename, nil];
+			[importTask setArguments:args];
+			[importTask launch];
+			[importTask waitUntilExit];
+			[importTask release];
+			
 			NSString* val = [[filesToOpen objectAtIndex:i] retain];
 			NSString* key = [[[filesToOpen objectAtIndex:i] lastPathComponent] retain]; 
-			
-			adb_insert_t insert;
-			insert.features = [featuresFileName cStringUsingEncoding:NSUTF8StringEncoding];
-			insert.power = [powersFileName cStringUsingEncoding:NSUTF8StringEncoding];
-			insert.times = NULL;
-			insert.key = [key cStringUsingEncoding:NSUTF8StringEncoding];
-			
-			// Insert into db.
-			if(audiodb_insert(db, &insert))
-			{
-				// TODO: Show an error message.
-				NSLog(@"Weep: %@ %@ %@", featuresFileName, powersFileName, key);
-				continue;
-			}
-			
+		
 			// Update the plist store.
 			[trackMap setValue:val forKey:key];
-			[trackMap writeToFile:plistFilename atomically: YES];
+			[dbState writeToFile:plistFilename atomically: YES];
 			
+			
+			db = audiodb_open([dbFilename cStringUsingEncoding:NSUTF8StringEncoding], O_RDONLY);
 			[self updateStatus];
 		}
 		
-		newFrame.origin.x = [importSheet frame].origin.x;
-		newFrame.origin.y = [importSheet frame].origin.y + [extractingBox frame].size.height;
-		newFrame.size.width = [importSheet frame].size.width;
-		newFrame.size.height = [importSheet frame].size.height - [extractingBox frame].size.height;
-		
-		[importSheet setFrame:newFrame display:YES animate:YES];
-		
 		[NSApp endModalSession:session];
 		[importSheet orderOut:nil];
 		[NSApp endSheet:importSheet];
 		[indicator stopAnimation:self];
-		[extractingBox setHidden:TRUE];
 	}
 }
 
@@ -313,7 +358,7 @@
 	if([[tc identifier] isEqualToString:@"meter"])
 	{
 		NSLevelIndicatorCell *distance = [[NSLevelIndicatorCell alloc] initWithLevelIndicatorStyle:NSRelevancyLevelIndicatorStyle];
-		[distance setFloatValue:10-[(NSNumber*)value floatValue]*100];
+		[distance setFloatValue:10.0f-[(NSNumber*)value floatValue]*100.0f];
 		return distance;
 	}
 	else
@@ -354,13 +399,13 @@
 {
 	if([tracksView numberOfSelectedRows] == 0)
 	{
-		[playBothButton setEnabled:FALSE];
-		[playResultButton setEnabled:FALSE];
+		[playBothButton setEnabled:NO];
+		[playResultButton setEnabled:NO];
 	}
 	else
 	{
-		[playBothButton setEnabled:TRUE];
-		[playResultButton setEnabled:TRUE];
+		[playBothButton setEnabled:YES];
+		[playResultButton setEnabled:YES];
 	}
 }
 
@@ -370,6 +415,11 @@
 -(IBAction)playResult:(id)sender
 {
 
+	if([tracksView selectedRow] == -1)
+	{
+		return;
+	}
+	
 	NSDictionary* selectedRow = [results objectAtIndex:[tracksView selectedRow]];
 	NSString* value = [selectedRow objectForKey:@"key"];
 	float ipos = [[selectedRow objectForKey:@"ipos"] floatValue];
@@ -384,6 +434,7 @@
 			[queryTrack stop];
 		}
 		[queryTrack release];
+		queryTrack = Nil;
 	}
 	
 	if(resultTrack)
@@ -394,6 +445,7 @@
 			[resultTrack stop];
 		}
 		[resultTrack release];
+		resultTrack = Nil;
 	}
 	
 	resultTrack = [[[NSSound alloc] initWithContentsOfFile:filename byReference:YES] retain];
@@ -413,7 +465,6 @@
 	NSDictionary* selectedRow = [results objectAtIndex:[tracksView selectedRow]];
 	NSString* value = [selectedRow objectForKey:@"key"];
 	float ipos = [[selectedRow objectForKey:@"ipos"] floatValue];
-	float qpos = [[selectedRow objectForKey:@"qpos"] floatValue];
 	NSString* filename = [trackMap objectForKey:value];
 	NSLog(@"Key: %@ Value: %@", value, filename);
 		
@@ -426,6 +477,7 @@
 			[queryTrack stop];
 		}
 		[queryTrack release];
+		queryTrack = Nil;
 	}
 	if(resultTrack)
 	{
@@ -435,11 +487,11 @@
 			[resultTrack stop];
 		}
 		[resultTrack release];
+		resultTrack = Nil;
 	}
 	
 	// Get query track and shift to start point
 	queryTrack = [[[NSSound alloc] initWithContentsOfFile:selectedFilename byReference:YES] retain];
-	[queryTrack setCurrentTime:qpos];
 	[queryTrack setDelegate:self];
 	
 	[queryTrack play];
@@ -488,16 +540,25 @@
  */
 -(IBAction)chooseQuery:(id)sender
 {
+	[queryButton setEnabled:(selectedKey ? YES : NO)];
+	[NSApp beginSheet:querySheet modalForWindow:mainWindow modalDelegate:self didEndSelector:NULL contextInfo:nil];
+	session = [NSApp beginModalSessionForWindow:querySheet];
+	[NSApp runModalSession:session];	
+}
+
+
+-(IBAction)selectQueryFile:(id)sender
+{
 	NSArray* fileTypes = [NSArray arrayWithObject:@"wav"];
 	NSOpenPanel* panel = [NSOpenPanel openPanel];
 	NSInteger response = [panel runModalForDirectory:NSHomeDirectory() file:@"" types:fileTypes];
 	if(response == NSFileHandlingPanelOKButton)
 	{
-		NSLog(@"%@", [panel filename]);
-		// Grab key
 		NSArray* opts = [trackMap allKeysForObject:[panel filename]];
 		if([opts count] != 1)
 		{
+			// TODO : Needs fixing!
+			
 			NSAlert *alert = [[[NSAlert alloc] init] autorelease];
 			[alert addButtonWithTitle:@"OK"];
 			[alert setMessageText:@"Track not found"];
@@ -509,34 +570,153 @@
 		{
 			selectedKey = [opts objectAtIndex:0];
 			[queryKey setStringValue:selectedKey];
+			[queryPath setStringValue:selectedKey];
 			selectedFilename = [[panel filename] retain];
-			[self performQuery];
+			[queryButton setEnabled:YES];
+			
+			[self resetLengths:self];
 		}
 	}
 }
 
+-(IBAction)resetLengths:(id)sender
+{
+	queryTrack = [[NSSound alloc] initWithContentsOfFile:selectedFilename byReference:YES];
+
+	double samples = ([queryTrack duration]*44100.0f);
+	double hopSize = [[dbState objectForKey:@"hopsize"] doubleValue];
+	double winSize = [[dbState objectForKey:@"windowsize"] doubleValue];
+	
+	[queryLengthSeconds setDoubleValue:[queryTrack duration]];
+	[queryLengthVectors setDoubleValue:ceil((samples-winSize)/hopSize)];
+	
+	// For now, go with 0
+	[queryStartSeconds setDoubleValue:0];
+	[queryStartVectors setDoubleValue:0];
+
+	[queryLengthSeconds setEnabled:YES];
+	[queryLengthVectors setEnabled:YES];
+	[queryStartSeconds setEnabled:YES];
+	[queryStartVectors setEnabled:YES];
+	[resetButton setEnabled:YES];
+	[multipleCheckBox setEnabled:YES];
+	
+}
+
+- (void)controlTextDidChange:(NSNotification *)nd
+{
+	NSTextField *ed = [nd object];
+	
+	double hopSize = [[dbState objectForKey:@"hopsize"] doubleValue];
+	double winSize = [[dbState objectForKey:@"windowsize"] doubleValue];
+	
+	if(!queryTrack)
+	{
+		queryTrack = [[NSSound alloc] initWithContentsOfFile:selectedFilename byReference:YES];
+	}
+	
+	double totalDuration = [queryTrack duration];
+	double samples = totalDuration * 44100.0f;
+	double totalVectors = ceil((samples-winSize)/hopSize);
+
+	double lengthSecs = [queryLengthSeconds doubleValue];
+	double startSecs = [queryStartSeconds doubleValue];
+	double lengthVectors = [queryLengthVectors doubleValue];
+	double startVectors = [queryStartVectors doubleValue];
+	
+	// Query Length
+	if (ed == queryLengthSeconds)
+	{
+		if(lengthSecs >= 0)
+		{
+			lengthVectors = ceil(((lengthSecs*44100.0f)-winSize)/hopSize);
+			if(lengthVectors < 0) {lengthVectors = 0; }
+			[queryLengthVectors setDoubleValue:lengthVectors];
+			
+		}
+	}
+	
+	if (ed == queryLengthVectors)
+	{
+		if(lengthVectors >= 0)
+		{
+			lengthSecs = ((hopSize*lengthVectors)+winSize)/44100.0f;
+			if(lengthSecs < 0) { lengthSecs = 0; }
+			[queryLengthSeconds setDoubleValue:lengthSecs];
+		}
+	}
+	
+	// Query start
+	if (ed == queryStartSeconds)
+	{
+		if(startSecs >= 0)
+		{
+			startVectors = ceil(((startSecs*44100.0f)-winSize)/hopSize);
+			if(startVectors < 0) { startVectors = 0; }
+			[queryStartVectors setDoubleValue:startVectors];
+		}
+	}
+	if (ed == queryStartVectors)
+	{
+		if(startVectors >= 0)
+		{
+			startSecs = ((hopSize*startVectors)+winSize)/44100.0f;
+			if(startSecs < 0) { startSecs = 0; }
+			[queryStartSeconds setDoubleValue:startSecs];
+		}
+	}
+	
+	if((lengthSecs + startSecs) > totalDuration || (lengthVectors + startVectors) > totalVectors || lengthVectors == 0)
+	{
+		[queryButton setEnabled:NO];
+	}
+	else if(![queryButton isEnabled])
+	{
+		[queryButton setEnabled:YES];
+	}
+}
+
+-(IBAction)cancelQuery:(id)sender
+{
+	[NSApp endModalSession:session];
+	[querySheet orderOut:nil];
+	[NSApp endSheet:querySheet];
+}
+
 /**
  * Actually perform the query. TODO: Monolithic.
  */
--(void)performQuery
+-(IBAction)performQuery:(id)sender
 {
+	[NSApp endModalSession:session];
+	[querySheet orderOut:nil];
+	[NSApp endSheet:querySheet];
+	
 	NSLog(@"Perform query! %@, %@", selectedKey, selectedFilename);
 	
 	adb_query_spec_t *spec = (adb_query_spec_t *)malloc(sizeof(adb_query_spec_t));
 	spec->qid.datum = (adb_datum_t *)malloc(sizeof(adb_datum_t));
 	
-	spec->qid.sequence_length = 20;
-	spec->qid.sequence_start = 0;
-	spec->qid.flags = 0;
+	spec->qid.sequence_length = [queryLengthVectors doubleValue];
+	spec->qid.sequence_start = [queryStartVectors doubleValue];
+	spec->qid.flags = 0;	
+//	spec->qid.flags = spec->qid.flags | ADB_QID_FLAG_EXHAUSTIVE;
 	
-//	spec->qid.flags = spec->qid.flags | ADB_QID_FLAG_EXHAUSTIVE;
 	spec->params.accumulation = ADB_ACCUMULATION_PER_TRACK;
+	
+	if([multipleCheckBox state] == NSOnState)
+	{
+		spec->params.npoints = 100;
+	}
+	else
+	{
+		spec->params.npoints = 1;
+	}
+		
 	spec->params.distance = ADB_DISTANCE_EUCLIDEAN_NORMED;
 	
-	spec->params.npoints = 1;
 	spec->params.ntracks = 100;
-	spec->refine.radius = 5.0;
-	spec->refine.hopsize = 1;
+	//spec->refine.radius = 5.0;
 //	spec->refine.absolute_threshold = -6;
 //	spec->refine.relative_threshold = 10;
 //	spec->refine.duration_ratio = 0;
@@ -544,8 +724,8 @@
 	spec->refine.flags = 0;
 //	spec->refine.flags |= ADB_REFINE_ABSOLUTE_THRESHOLD;
 //	spec->refine.flags |= ADB_REFINE_RELATIVE_THRESHOLD;
-	spec->refine.flags |= ADB_REFINE_HOP_SIZE;
-	spec->refine.flags |= ADB_REFINE_RADIUS;
+//	spec->refine.flags |= ADB_REFINE_HOP_SIZE;
+	//spec->refine.flags |= ADB_REFINE_RADIUS;
 
 	adb_query_results_t *result = (adb_query_results_t *)malloc(sizeof(adb_query_results_t));
 	spec->qid.datum->data = NULL;
@@ -557,6 +737,8 @@
 	int ok = audiodb_retrieve_datum(db, [selectedKey cStringUsingEncoding:NSUTF8StringEncoding], spec->qid.datum);
 	if(ok == 0)
 	{
+		
+		float hopSize = [[dbState objectForKey:@"hopsize"] floatValue];
 		NSLog(@"Got a datum");
 		result = audiodb_query_spec(db, spec);
 		if(result == NULL)
@@ -566,15 +748,17 @@
 		}
 		else
 		{
+			NSLog(@"Populate table: %d", result->nresults);
+			float divisor = (44100.0f/hopSize);
 			for(int i=0; i<result->nresults; i++)
 			{
+				
 				NSMutableDictionary* dict = [[NSMutableDictionary alloc] initWithCapacity:4];
-				[dict setValue:[NSString stringWithFormat:@"%s", result->results[i].key] forKey:@"key"];
+				[dict setValue:[NSString stringWithFormat:@"%s", result->results[i].ikey] forKey:@"key"];
 				[dict setValue:[NSNumber numberWithFloat:result->results[i].dist] forKey:@"distance"];
 				[dict setValue:[NSNumber numberWithFloat:result->results[i].dist] forKey:@"meter"];
-				[dict setValue:[NSNumber numberWithFloat:result->results[i].qpos/4] forKey:@"qpos"];
-				[dict setValue:[NSNumber numberWithFloat:result->results[i].ipos/4] forKey:@"ipos"];
-				NSLog(@"%s qpos %d ipos %d", result->results[i].key, result->results[i].qpos/4, result->results[i].ipos/4);
+				[dict setValue:[NSNumber numberWithFloat:result->results[i].ipos/divisor] forKey:@"ipos"];
+				NSLog(@"%s ipos: %d, dist: %f", result->results[i].ikey,result->results[i].ipos, result->results[i].dist);
 				[results addObject: dict];
 			}
 		}
--- a/examples/iAudioDB/English.lproj/MainMenu.xib	Mon Apr 26 17:17:07 2010 +0000
+++ b/examples/iAudioDB/English.lproj/MainMenu.xib	Wed Apr 28 15:48:59 2010 +0000
@@ -8,9 +8,11 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="371"/>
+			<integer value="793"/>
+			<integer value="565"/>
 			<integer value="57"/>
-			<integer value="565"/>
-			<integer value="524"/>
+			<integer value="779"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -384,13 +386,193 @@
 				<string key="NSName">_NSMainMenu</string>
 			</object>
 			<object class="NSWindowTemplate" id="972006081">
-				<int key="NSWindowStyleMask">7</int>
+				<int key="NSWindowStyleMask">4111</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{335, 273}, {606, 477}}</string>
 				<int key="NSWTFlags">1946157056</int>
 				<string key="NSWindowTitle">iAudioDB</string>
 				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
+				<object class="NSToolbar" key="NSViewClass" id="703229265">
+					<object class="NSMutableString" key="NSToolbarIdentifier">
+						<characters key="NS.bytes">0F013AFF-76CE-47B1-B051-A4C0663AC2E3</characters>
+					</object>
+					<nil key="NSToolbarDelegate"/>
+					<bool key="NSToolbarPrefersToBeShown">YES</bool>
+					<bool key="NSToolbarShowsBaselineSeparator">YES</bool>
+					<bool key="NSToolbarAllowsUserCustomization">NO</bool>
+					<bool key="NSToolbarAutosavesConfiguration">NO</bool>
+					<int key="NSToolbarDisplayMode">1</int>
+					<int key="NSToolbarSizeMode">1</int>
+					<object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>105D45A0-54C1-4F79-A213-7BD763B75FB9</string>
+							<string>8D8AC8A3-26FC-4B20-84A4-175BA2973EC2</string>
+							<string>9E9F684B-AC2D-4C64-BD36-9881ADEAABEC</string>
+							<string>A3831457-05C2-46D8-A720-CF818BD69A16</string>
+							<string>DB64CA1A-034C-4947-8BD1-A909E2B69D79</string>
+							<string>NSToolbarFlexibleSpaceItem</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="NSToolbarItem" id="680851766">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">105D45A0-54C1-4F79-A213-7BD763B75FB9</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Play Both</string>
+								<string key="NSToolbarItemPaletteLabel">Play Both</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage" id="248674883">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Play</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">NO</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">3</int>
+							</object>
+							<object class="NSToolbarItem" id="1056305994">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">8D8AC8A3-26FC-4B20-84A4-175BA2973EC2</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Play Result</string>
+								<string key="NSToolbarItemPaletteLabel">Play Result</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<reference key="NSToolbarItemImage" ref="248674883"/>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">NO</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">2</int>
+							</object>
+							<object class="NSToolbarItem" id="171684970">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">9E9F684B-AC2D-4C64-BD36-9881ADEAABEC</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Add</string>
+								<string key="NSToolbarItemPaletteLabel">Add</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Add</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">NO</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="768862092">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">A3831457-05C2-46D8-A720-CF818BD69A16</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Query</string>
+								<string key="NSToolbarItemPaletteLabel">Query</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Spotlight</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">NO</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">1</int>
+							</object>
+							<object class="NSToolbarItem" id="985641211">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">DB64CA1A-034C-4947-8BD1-A909E2B69D79</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Stop</string>
+								<string key="NSToolbarItemPaletteLabel">Stop</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Stop</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">NO</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">4</int>
+							</object>
+							<object class="NSToolbarFlexibleSpaceItem" id="997154698">
+								<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
+								<string key="NSToolbarItemLabel"/>
+								<string key="NSToolbarItemPaletteLabel">Flexible Space</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<nil key="NSToolbarItemImage"/>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{1, 5}</string>
+								<string key="NSToolbarItemMaxSize">{20000, 32}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+								<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+									<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="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSArray" key="NSToolbarIBAllowedItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference ref="171684970"/>
+						<reference ref="768862092"/>
+						<reference ref="1056305994"/>
+						<reference ref="680851766"/>
+						<reference ref="985641211"/>
+						<reference ref="997154698"/>
+					</object>
+					<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference ref="171684970"/>
+						<reference ref="768862092"/>
+						<reference ref="1056305994"/>
+						<reference ref="680851766"/>
+						<reference ref="985641211"/>
+					</object>
+					<object class="NSMutableArray" key="NSToolbarIBSelectableItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+					</object>
+				</object>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<object class="NSView" key="NSWindowView" id="439893737">
 					<reference key="NSNextResponder"/>
@@ -419,7 +601,7 @@
 									<int key="NSfFlags">1044</int>
 								</object>
 								<reference key="NSControlView" ref="407454331"/>
-								<object class="NSColor" key="NSBackgroundColor" id="999916820">
+								<object class="NSColor" key="NSBackgroundColor" id="53086941">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">textBackgroundColor</string>
@@ -428,7 +610,7 @@
 										<bytes key="NSWhite">MQA</bytes>
 									</object>
 								</object>
-								<object class="NSColor" key="NSTextColor">
+								<object class="NSColor" key="NSTextColor" id="109975633">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">textColor</string>
@@ -439,448 +621,265 @@
 								</object>
 							</object>
 						</object>
-						<object class="NSSplitView" id="171712411">
+						<object class="NSScrollView" id="788491600">
 							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">282</int>
+							<int key="NSvFlags">274</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSCustomView" id="382995127">
-									<reference key="NSNextResponder" ref="171712411"/>
-									<int key="NSvFlags">301</int>
+								<object class="NSClipView" id="205502490">
+									<reference key="NSNextResponder" ref="788491600"/>
+									<int key="NSvFlags">2304</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSTextField" id="846426635">
-											<reference key="NSNextResponder" ref="382995127"/>
+										<object class="NSTableView" id="21728481">
+											<reference key="NSNextResponder" ref="205502490"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{5, 39}, {70, 17}}</string>
-											<reference key="NSSuperview" ref="382995127"/>
+											<string key="NSFrameSize">{586, 418}</string>
+											<reference key="NSSuperview" ref="205502490"/>
 											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="1007308618">
-												<int key="NSCellFlags">68288064</int>
-												<int key="NSCellFlags2">272630784</int>
-												<string key="NSContents">Track Key:</string>
-												<reference key="NSSupport" ref="294883811"/>
-												<reference key="NSControlView" ref="846426635"/>
-												<object class="NSColor" key="NSBackgroundColor" id="907238901">
-													<int key="NSColorSpace">6</int>
-													<string key="NSCatalogName">System</string>
-													<string key="NSColorName">controlColor</string>
-													<object class="NSColor" key="NSColor" id="491397274">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="610587181">
+												<reference key="NSNextResponder" ref="1054180625"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{586, 17}</string>
+												<reference key="NSSuperview" ref="1054180625"/>
+												<reference key="NSTableView" ref="21728481"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="1053654724">
+												<reference key="NSNextResponder" ref="788491600"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{587, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="788491600"/>
+											</object>
+											<object class="NSMutableArray" key="NSTableColumns">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSTableColumn" id="253700397">
+													<string key="NSIdentifier">meter</string>
+													<double key="NSWidth">6.400000e+01</double>
+													<double key="NSMinWidth">1.000000e+01</double>
+													<double key="NSMaxWidth">3.402823e+38</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628032</int>
+														<int key="NSCellFlags2">0</int>
+														<string key="NSContents"/>
+														<object class="NSFont" key="NSSupport" id="26">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">1.100000e+01</double>
+															<int key="NSfFlags">3100</int>
+														</object>
+														<object class="NSColor" key="NSBackgroundColor" id="751640266">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerColor</string>
+															<reference key="NSColor" ref="282115067"/>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="953606733">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<reference key="NSColor" ref="617212895"/>
+														</object>
+													</object>
+													<object class="NSLevelIndicatorCell" key="NSDataCell" id="660173613">
+														<int key="NSCellFlags">-2080244224</int>
+														<int key="NSCellFlags2">131072</int>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="21728481"/>
+														<double key="NSValue">3.000000e+00</double>
+														<double key="NSMaxValue">1.000000e+01</double>
+														<double key="NSWarningValue">3.000000e+00</double>
+														<double key="NSCriticalValue">3.000000e+00</double>
+														<int key="NSNumberOfMajorTickMarks">5</int>
+														<int key="NSIndicatorStyle">1</int>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="21728481"/>
+													<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
+														<string key="NSKey">meter</string>
+														<bool key="NSAscending">NO</bool>
+														<string key="NSSelector">compare:</string>
 													</object>
 												</object>
-												<object class="NSColor" key="NSTextColor" id="915193604">
-													<int key="NSColorSpace">6</int>
-													<string key="NSCatalogName">System</string>
-													<string key="NSColorName">controlTextColor</string>
-													<reference key="NSColor" ref="617212895"/>
+												<object class="NSTableColumn" id="457363317">
+													<string key="NSIdentifier">key</string>
+													<double key="NSWidth">2.080000e+02</double>
+													<double key="NSMinWidth">1.000000e+01</double>
+													<double key="NSMaxWidth">3.402823e+38</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628032</int>
+														<int key="NSCellFlags2">0</int>
+														<string key="NSContents">Key</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="751640266"/>
+														<reference key="NSTextColor" ref="953606733"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="990606590">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="294883811"/>
+														<reference key="NSControlView" ref="21728481"/>
+														<object class="NSColor" key="NSBackgroundColor" id="904458979">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<object class="NSColor" key="NSColor" id="491397274">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+															</object>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="915193604">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlTextColor</string>
+															<reference key="NSColor" ref="617212895"/>
+														</object>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="21728481"/>
+													<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
+														<string key="NSKey">key</string>
+														<bool key="NSAscending">YES</bool>
+														<string key="NSSelector">compare:</string>
+													</object>
+												</object>
+												<object class="NSTableColumn" id="266345549">
+													<string key="NSIdentifier">ipos</string>
+													<double key="NSWidth">6.300000e+01</double>
+													<double key="NSMinWidth">1.000000e+01</double>
+													<double key="NSMaxWidth">3.402823e+38</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628032</int>
+														<int key="NSCellFlags2">0</int>
+														<string key="NSContents">IPos</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="751640266"/>
+														<reference key="NSTextColor" ref="953606733"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="24095276">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="294883811"/>
+														<reference key="NSControlView" ref="21728481"/>
+														<reference key="NSBackgroundColor" ref="904458979"/>
+														<reference key="NSTextColor" ref="915193604"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="21728481"/>
+													<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
+														<string key="NSKey">ipos</string>
+														<bool key="NSAscending">YES</bool>
+														<string key="NSSelector">compare:</string>
+													</object>
+												</object>
+												<object class="NSTableColumn" id="797051573">
+													<string key="NSIdentifier">distance</string>
+													<double key="NSWidth">2.390000e+02</double>
+													<double key="NSMinWidth">1.000000e+01</double>
+													<double key="NSMaxWidth">3.402823e+38</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628032</int>
+														<int key="NSCellFlags2">0</int>
+														<string key="NSContents">Distance</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="751640266"/>
+														<reference key="NSTextColor" ref="953606733"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="741932707">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="294883811"/>
+														<reference key="NSControlView" ref="21728481"/>
+														<reference key="NSBackgroundColor" ref="904458979"/>
+														<reference key="NSTextColor" ref="915193604"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="21728481"/>
+													<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
+														<string key="NSKey">distance</string>
+														<bool key="NSAscending">YES</bool>
+														<string key="NSSelector">compare:</string>
+													</object>
 												</object>
 											</object>
-										</object>
-										<object class="NSButton" id="313714439">
-											<reference key="NSNextResponder" ref="382995127"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{404, 3}, {98, 32}}</string>
-											<reference key="NSSuperview" ref="382995127"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="771965150">
-												<int key="NSCellFlags">604110336</int>
-												<int key="NSCellFlags2">134217728</int>
-												<string key="NSContents">Play Both</string>
-												<reference key="NSSupport" ref="294883811"/>
-												<reference key="NSControlView" ref="313714439"/>
-												<int key="NSButtonFlags">-2033303297</int>
-												<int key="NSButtonFlags2">129</int>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
+											<double key="NSIntercellSpacingWidth">3.000000e+00</double>
+											<double key="NSIntercellSpacingHeight">2.000000e+00</double>
+											<reference key="NSBackgroundColor" ref="904458979"/>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
 											</object>
-										</object>
-										<object class="NSButton" id="989505649">
-											<reference key="NSNextResponder" ref="382995127"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{200, 3}, {96, 32}}</string>
-											<reference key="NSSuperview" ref="382995127"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="475638353">
-												<int key="NSCellFlags">604110336</int>
-												<int key="NSCellFlags2">134217728</int>
-												<string key="NSContents">Browse</string>
-												<reference key="NSSupport" ref="294883811"/>
-												<reference key="NSControlView" ref="989505649"/>
-												<int key="NSButtonFlags">-2038284033</int>
-												<int key="NSButtonFlags2">129</int>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-										</object>
-										<object class="NSButton" id="988243878">
-											<reference key="NSNextResponder" ref="382995127"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{502, 3}, {96, 32}}</string>
-											<reference key="NSSuperview" ref="382995127"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="172127913">
-												<int key="NSCellFlags">604110336</int>
-												<int key="NSCellFlags2">134217728</int>
-												<string key="NSContents">Stop</string>
-												<reference key="NSSupport" ref="294883811"/>
-												<reference key="NSControlView" ref="988243878"/>
-												<int key="NSButtonFlags">-2033303297</int>
-												<int key="NSButtonFlags2">129</int>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-										</object>
-										<object class="NSTextField" id="446375157">
-											<reference key="NSNextResponder" ref="382995127"/>
-											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{5, 13}, {212, 17}}</string>
-											<reference key="NSSuperview" ref="382995127"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="822940230">
-												<int key="NSCellFlags">68288064</int>
-												<int key="NSCellFlags2">272630784</int>
-												<string key="NSContents">None Selected</string>
-												<reference key="NSSupport" ref="294883811"/>
-												<reference key="NSControlView" ref="446375157"/>
-												<object class="NSColor" key="NSBackgroundColor">
-													<int key="NSColorSpace">1</int>
-													<bytes key="NSRGB">MCAwIDAAA</bytes>
-												</object>
-												<reference key="NSTextColor" ref="915193604"/>
-											</object>
-										</object>
-										<object class="NSButton" id="482233744">
-											<reference key="NSNextResponder" ref="382995127"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{296, 3}, {108, 32}}</string>
-											<reference key="NSSuperview" ref="382995127"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="807113649">
-												<int key="NSCellFlags">604110336</int>
-												<int key="NSCellFlags2">134217728</int>
-												<string key="NSContents">Play Result</string>
-												<reference key="NSSupport" ref="294883811"/>
-												<reference key="NSControlView" ref="482233744"/>
-												<int key="NSButtonFlags">-2033303297</int>
-												<int key="NSButtonFlags2">129</int>
-												<string key="NSAlternateContents"/>
-												<string key="NSKeyEquivalent"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
+											<double key="NSRowHeight">1.700000e+01</double>
+											<int key="NSTvFlags">-692060160</int>
+											<int key="NSGridStyleMask">1</int>
+											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
 										</object>
 									</object>
-									<string key="NSFrameSize">{603, 63}</string>
-									<reference key="NSSuperview" ref="171712411"/>
-									<string key="NSClassName">NSView</string>
+									<string key="NSFrame">{{1, 17}, {586, 418}}</string>
+									<reference key="NSSuperview" ref="788491600"/>
+									<reference key="NSNextKeyView" ref="21728481"/>
+									<reference key="NSDocView" ref="21728481"/>
+									<reference key="NSBGColor" ref="904458979"/>
+									<int key="NScvFlags">4</int>
 								</object>
-								<object class="NSScrollView" id="680449350">
-									<reference key="NSNextResponder" ref="171712411"/>
-									<int key="NSvFlags">274</int>
+								<object class="NSScroller" id="854073106">
+									<reference key="NSNextResponder" ref="788491600"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{587, 17}, {15, 418}}</string>
+									<reference key="NSSuperview" ref="788491600"/>
+									<reference key="NSTarget" ref="788491600"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">9.970149e-01</double>
+								</object>
+								<object class="NSScroller" id="876758231">
+									<reference key="NSNextResponder" ref="788491600"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{1, 435}, {586, 15}}</string>
+									<reference key="NSSuperview" ref="788491600"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="788491600"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">9.982964e-01</double>
+								</object>
+								<object class="NSClipView" id="1054180625">
+									<reference key="NSNextResponder" ref="788491600"/>
+									<int key="NSvFlags">2304</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSClipView" id="853339537">
-											<reference key="NSNextResponder" ref="680449350"/>
-											<int key="NSvFlags">2304</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSTableView" id="372985267">
-													<reference key="NSNextResponder" ref="853339537"/>
-													<int key="NSvFlags">256</int>
-													<string key="NSFrameSize">{586, 337}</string>
-													<reference key="NSSuperview" ref="853339537"/>
-													<bool key="NSEnabled">YES</bool>
-													<object class="NSTableHeaderView" key="NSHeaderView" id="1022485640">
-														<reference key="NSNextResponder" ref="908089264"/>
-														<int key="NSvFlags">256</int>
-														<string key="NSFrameSize">{586, 17}</string>
-														<reference key="NSSuperview" ref="908089264"/>
-														<reference key="NSTableView" ref="372985267"/>
-													</object>
-													<object class="_NSCornerView" key="NSCornerView" id="837501212">
-														<reference key="NSNextResponder" ref="680449350"/>
-														<int key="NSvFlags">256</int>
-														<string key="NSFrame">{{587, 0}, {16, 17}}</string>
-														<reference key="NSSuperview" ref="680449350"/>
-													</object>
-													<object class="NSMutableArray" key="NSTableColumns">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSTableColumn" id="1014311959">
-															<string key="NSIdentifier">meter</string>
-															<double key="NSWidth">6.400000e+01</double>
-															<double key="NSMinWidth">1.000000e+01</double>
-															<double key="NSMaxWidth">3.402823e+38</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628032</int>
-																<int key="NSCellFlags2">0</int>
-																<string key="NSContents"/>
-																<object class="NSFont" key="NSSupport" id="26">
-																	<string key="NSName">LucidaGrande</string>
-																	<double key="NSSize">1.100000e+01</double>
-																	<int key="NSfFlags">3100</int>
-																</object>
-																<object class="NSColor" key="NSBackgroundColor" id="751640266">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">headerColor</string>
-																	<reference key="NSColor" ref="282115067"/>
-																</object>
-																<object class="NSColor" key="NSTextColor" id="953606733">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">headerTextColor</string>
-																	<reference key="NSColor" ref="617212895"/>
-																</object>
-															</object>
-															<object class="NSLevelIndicatorCell" key="NSDataCell" id="1036837113">
-																<int key="NSCellFlags">-2080244224</int>
-																<int key="NSCellFlags2">131072</int>
-																<reference key="NSSupport" ref="26"/>
-																<reference key="NSControlView" ref="372985267"/>
-																<double key="NSValue">3.000000e+00</double>
-																<double key="NSMaxValue">1.000000e+01</double>
-																<double key="NSWarningValue">3.000000e+00</double>
-																<double key="NSCriticalValue">3.000000e+00</double>
-																<int key="NSNumberOfMajorTickMarks">5</int>
-																<int key="NSIndicatorStyle">1</int>
-															</object>
-															<int key="NSResizingMask">3</int>
-															<bool key="NSIsResizeable">YES</bool>
-															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="372985267"/>
-															<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
-																<string key="NSKey">meter</string>
-																<bool key="NSAscending">NO</bool>
-																<string key="NSSelector">compare:</string>
-															</object>
-														</object>
-														<object class="NSTableColumn" id="602172838">
-															<string key="NSIdentifier">key</string>
-															<double key="NSWidth">2.080000e+02</double>
-															<double key="NSMinWidth">1.000000e+01</double>
-															<double key="NSMaxWidth">3.402823e+38</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628032</int>
-																<int key="NSCellFlags2">0</int>
-																<string key="NSContents">Key</string>
-																<reference key="NSSupport" ref="26"/>
-																<reference key="NSBackgroundColor" ref="751640266"/>
-																<reference key="NSTextColor" ref="953606733"/>
-															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="922928882">
-																<int key="NSCellFlags">337772096</int>
-																<int key="NSCellFlags2">2048</int>
-																<string key="NSContents">Text Cell</string>
-																<reference key="NSSupport" ref="294883811"/>
-																<reference key="NSControlView" ref="372985267"/>
-																<object class="NSColor" key="NSBackgroundColor" id="904458979">
-																	<int key="NSColorSpace">6</int>
-																	<string key="NSCatalogName">System</string>
-																	<string key="NSColorName">controlBackgroundColor</string>
-																	<reference key="NSColor" ref="491397274"/>
-																</object>
-																<reference key="NSTextColor" ref="915193604"/>
-															</object>
-															<int key="NSResizingMask">3</int>
-															<bool key="NSIsResizeable">YES</bool>
-															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="372985267"/>
-															<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
-																<string key="NSKey">key</string>
-																<bool key="NSAscending">YES</bool>
-																<string key="NSSelector">compare:</string>
-															</object>
-														</object>
-														<object class="NSTableColumn" id="913401705">
-															<string key="NSIdentifier">qpos</string>
-															<double key="NSWidth">6.800000e+01</double>
-															<double key="NSMinWidth">1.000000e+01</double>
-															<double key="NSMaxWidth">3.402823e+38</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628032</int>
-																<int key="NSCellFlags2">0</int>
-																<string key="NSContents">QPos</string>
-																<reference key="NSSupport" ref="26"/>
-																<reference key="NSBackgroundColor" ref="751640266"/>
-																<reference key="NSTextColor" ref="953606733"/>
-															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="66400504">
-																<int key="NSCellFlags">337772096</int>
-																<int key="NSCellFlags2">2048</int>
-																<string key="NSContents">Text Cell</string>
-																<reference key="NSSupport" ref="294883811"/>
-																<reference key="NSControlView" ref="372985267"/>
-																<reference key="NSBackgroundColor" ref="904458979"/>
-																<reference key="NSTextColor" ref="915193604"/>
-															</object>
-															<int key="NSResizingMask">3</int>
-															<bool key="NSIsResizeable">YES</bool>
-															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="372985267"/>
-															<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
-																<string key="NSKey">qpos</string>
-																<bool key="NSAscending">YES</bool>
-																<string key="NSSelector">compare:</string>
-															</object>
-														</object>
-														<object class="NSTableColumn" id="284178317">
-															<string key="NSIdentifier">ipos</string>
-															<double key="NSWidth">6.300000e+01</double>
-															<double key="NSMinWidth">1.000000e+01</double>
-															<double key="NSMaxWidth">3.402823e+38</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628032</int>
-																<int key="NSCellFlags2">0</int>
-																<string key="NSContents">IPos</string>
-																<reference key="NSSupport" ref="26"/>
-																<reference key="NSBackgroundColor" ref="751640266"/>
-																<reference key="NSTextColor" ref="953606733"/>
-															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="552420549">
-																<int key="NSCellFlags">337772096</int>
-																<int key="NSCellFlags2">2048</int>
-																<string key="NSContents">Text Cell</string>
-																<reference key="NSSupport" ref="294883811"/>
-																<reference key="NSControlView" ref="372985267"/>
-																<reference key="NSBackgroundColor" ref="904458979"/>
-																<reference key="NSTextColor" ref="915193604"/>
-															</object>
-															<int key="NSResizingMask">3</int>
-															<bool key="NSIsResizeable">YES</bool>
-															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="372985267"/>
-															<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
-																<string key="NSKey">ipos</string>
-																<bool key="NSAscending">YES</bool>
-																<string key="NSSelector">compare:</string>
-															</object>
-														</object>
-														<object class="NSTableColumn" id="950838651">
-															<string key="NSIdentifier">distance</string>
-															<double key="NSWidth">1.680000e+02</double>
-															<double key="NSMinWidth">1.000000e+01</double>
-															<double key="NSMaxWidth">3.402823e+38</double>
-															<object class="NSTableHeaderCell" key="NSHeaderCell">
-																<int key="NSCellFlags">75628032</int>
-																<int key="NSCellFlags2">0</int>
-																<string key="NSContents">Distance</string>
-																<reference key="NSSupport" ref="26"/>
-																<reference key="NSBackgroundColor" ref="751640266"/>
-																<reference key="NSTextColor" ref="953606733"/>
-															</object>
-															<object class="NSTextFieldCell" key="NSDataCell" id="398664767">
-																<int key="NSCellFlags">337772096</int>
-																<int key="NSCellFlags2">2048</int>
-																<string key="NSContents">Text Cell</string>
-																<reference key="NSSupport" ref="294883811"/>
-																<reference key="NSControlView" ref="372985267"/>
-																<reference key="NSBackgroundColor" ref="904458979"/>
-																<reference key="NSTextColor" ref="915193604"/>
-															</object>
-															<int key="NSResizingMask">3</int>
-															<bool key="NSIsResizeable">YES</bool>
-															<bool key="NSIsEditable">YES</bool>
-															<reference key="NSTableView" ref="372985267"/>
-															<object class="NSSortDescriptor" key="NSSortDescriptorPrototype">
-																<string key="NSKey">distance</string>
-																<bool key="NSAscending">YES</bool>
-																<string key="NSSelector">compare:</string>
-															</object>
-														</object>
-													</object>
-													<double key="NSIntercellSpacingWidth">3.000000e+00</double>
-													<double key="NSIntercellSpacingHeight">2.000000e+00</double>
-													<reference key="NSBackgroundColor" ref="904458979"/>
-													<object class="NSColor" key="NSGridColor">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">gridColor</string>
-														<object class="NSColor" key="NSColor">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MC41AA</bytes>
-														</object>
-													</object>
-													<double key="NSRowHeight">1.700000e+01</double>
-													<int key="NSTvFlags">-692060160</int>
-													<int key="NSGridStyleMask">1</int>
-													<object class="NSArray" key="NSSortDescriptors">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSSortDescriptor">
-															<string key="NSKey">ipos</string>
-															<bool key="NSAscending">NO</bool>
-															<string key="NSSelector">compare:</string>
-														</object>
-													</object>
-													<int key="NSColumnAutoresizingStyle">4</int>
-													<int key="NSDraggingSourceMaskForLocal">15</int>
-													<int key="NSDraggingSourceMaskForNonLocal">0</int>
-													<bool key="NSAllowsTypeSelect">YES</bool>
-												</object>
-											</object>
-											<string key="NSFrame">{{1, 17}, {586, 337}}</string>
-											<reference key="NSSuperview" ref="680449350"/>
-											<reference key="NSNextKeyView" ref="372985267"/>
-											<reference key="NSDocView" ref="372985267"/>
-											<reference key="NSBGColor" ref="904458979"/>
-											<int key="NScvFlags">4</int>
-										</object>
-										<object class="NSScroller" id="36188451">
-											<reference key="NSNextResponder" ref="680449350"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{587, 17}, {15, 337}}</string>
-											<reference key="NSSuperview" ref="680449350"/>
-											<reference key="NSTarget" ref="680449350"/>
-											<string key="NSAction">_doScroller:</string>
-											<double key="NSPercent">9.970149e-01</double>
-										</object>
-										<object class="NSScroller" id="1059929715">
-											<reference key="NSNextResponder" ref="680449350"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{1, 354}, {586, 15}}</string>
-											<reference key="NSSuperview" ref="680449350"/>
-											<int key="NSsFlags">1</int>
-											<reference key="NSTarget" ref="680449350"/>
-											<string key="NSAction">_doScroller:</string>
-											<double key="NSPercent">9.982964e-01</double>
-										</object>
-										<object class="NSClipView" id="908089264">
-											<reference key="NSNextResponder" ref="680449350"/>
-											<int key="NSvFlags">2304</int>
-											<object class="NSMutableArray" key="NSSubviews">
-												<bool key="EncodedWithXMLCoder">YES</bool>
-												<reference ref="1022485640"/>
-											</object>
-											<string key="NSFrame">{{1, 0}, {586, 17}}</string>
-											<reference key="NSSuperview" ref="680449350"/>
-											<reference key="NSNextKeyView" ref="1022485640"/>
-											<reference key="NSDocView" ref="1022485640"/>
-											<reference key="NSBGColor" ref="904458979"/>
-											<int key="NScvFlags">4</int>
-										</object>
-										<reference ref="837501212"/>
+										<reference ref="610587181"/>
 									</object>
-									<string key="NSFrame">{{0, 72}, {603, 370}}</string>
-									<reference key="NSSuperview" ref="171712411"/>
-									<reference key="NSNextKeyView" ref="853339537"/>
-									<int key="NSsFlags">50</int>
-									<reference key="NSVScroller" ref="36188451"/>
-									<reference key="NSHScroller" ref="1059929715"/>
-									<reference key="NSContentView" ref="853339537"/>
-									<reference key="NSHeaderClipView" ref="908089264"/>
-									<reference key="NSCornerView" ref="837501212"/>
-									<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+									<string key="NSFrame">{{1, 0}, {586, 17}}</string>
+									<reference key="NSSuperview" ref="788491600"/>
+									<reference key="NSNextKeyView" ref="610587181"/>
+									<reference key="NSDocView" ref="610587181"/>
+									<reference key="NSBGColor" ref="904458979"/>
+									<int key="NScvFlags">4</int>
 								</object>
+								<reference ref="1053654724"/>
 							</object>
-							<string key="NSFrame">{{3, 35}, {603, 442}}</string>
+							<string key="NSFrame">{{0, 27}, {603, 451}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSNextKeyView" ref="205502490"/>
+							<int key="NSsFlags">50</int>
+							<reference key="NSVScroller" ref="854073106"/>
+							<reference key="NSHScroller" ref="876758231"/>
+							<reference key="NSContentView" ref="205502490"/>
+							<reference key="NSHeaderClipView" ref="1054180625"/>
+							<reference key="NSCornerView" ref="1053654724"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 						</object>
 					</object>
 					<string key="NSFrameSize">{606, 477}</string>
@@ -901,9 +900,9 @@
 			<object class="NSWindowTemplate" id="298235049">
 				<int key="NSWindowStyleMask">17</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 412}, {530, 98}}</string>
+				<string key="NSWindowRect">{{196, 229}, {305, 281}}</string>
 				<int key="NSWTFlags">-1543503872</int>
-				<string key="NSWindowTitle">Window</string>
+				<string key="NSWindowTitle">Create</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -915,19 +914,18 @@
 						<object class="NSMatrix" id="948779024">
 							<reference key="NSNextResponder" ref="108412374"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{20, 20}, {132, 38}}</string>
+							<string key="NSFrame">{{20, 155}, {176, 86}}</string>
 							<reference key="NSSuperview" ref="108412374"/>
 							<bool key="NSEnabled">YES</bool>
-							<int key="NSNumRows">2</int>
+							<int key="NSNumRows">4</int>
 							<int key="NSNumCols">1</int>
 							<object class="NSMutableArray" key="NSCells">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSButtonCell" id="71088072">
 									<int key="NSCellFlags">-2080244224</int>
 									<int key="NSCellFlags2">0</int>
-									<string key="NSContents">Chromagram</string>
+									<string key="NSContents">AudioDB Chromagram</string>
 									<reference key="NSSupport" ref="294883811"/>
-									<int key="NSTag">1</int>
 									<reference key="NSControlView" ref="948779024"/>
 									<int key="NSButtonFlags">1211912703</int>
 									<int key="NSButtonFlags2">128</int>
@@ -942,8 +940,9 @@
 								<object class="NSButtonCell" id="857720735">
 									<int key="NSCellFlags">67239424</int>
 									<int key="NSCellFlags2">0</int>
-									<string key="NSContents">MFCCs</string>
+									<string key="NSContents">AudioDB Constant-Q</string>
 									<reference key="NSSupport" ref="294883811"/>
+									<int key="NSTag">1</int>
 									<reference key="NSControlView" ref="948779024"/>
 									<int key="NSButtonFlags">1211912703</int>
 									<int key="NSButtonFlags2">128</int>
@@ -1047,8 +1046,91 @@
 									<int key="NSPeriodicDelay">400</int>
 									<int key="NSPeriodicInterval">75</int>
 								</object>
+								<object class="NSButtonCell" id="853846524">
+									<int key="NSCellFlags">67239424</int>
+									<int key="NSCellFlags2">0</int>
+									<string key="NSContents">QM Chromagram</string>
+									<reference key="NSSupport" ref="294883811"/>
+									<int key="NSTag">2</int>
+									<reference key="NSControlView" ref="948779024"/>
+									<int key="NSButtonFlags">1211912703</int>
+									<int key="NSButtonFlags2">128</int>
+									<object class="NSImage" key="NSNormalImage" id="805939065">
+										<int key="NSImageFlags">549453824</int>
+										<string key="NSSize">{18, 18}</string>
+										<object class="NSMutableArray" key="NSReps">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSArray">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<reference ref="8"/>
+												<object class="NSBitmapImageRep">
+													<object class="NSData" key="NSTIFFRepresentation">
+														<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
+IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
+29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
+dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
+AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
+AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
+0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
+7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
+5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
+3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
+AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
+AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
+6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
+/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
+///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
+YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
+AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
+AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
+AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAANwAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAADcGFw
+cGwCAAAAbW50clJHQiBYWVogB9oAAQAVAAAACAAXYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAPbWAAEAAAAA0y1hcHBs4ZsmFceeX1KK+eNjBgv3CQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA
+AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAAwbmRpbgAA
+AggAAAA4ZGVzYwAAAkAAAABiZHNjbQAAAqQAAACAbW1vZAAAAyQAAAAoY3BydAAAA0wAAAAkWFlaIAAA
+AAAAAGR4AAA80AAACw9YWVogAAAAAAAAZ50AAKYHAAAQ5VhZWiAAAAAAAAAqwQAAHT8AALcxWFlaIAAA
+AAAAAPPYAAEAAAABFghzZjMyAAAAAAABC7cAAAWW///zVwAABykAAP3X///7t////aYAAAPaAADA9mN1
+cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAQAA
+0XQAAAAAAAEAAAAA0XQAAAAAAAEAAAAA0XQAAAAAAAEAAG5kaW4AAAAAAAAAMAAAkMAAAFkAAABXwAAA
+lcAAACh3AAAZWwAAUEAAAFRAAAIzMwACMzMAAjMzZGVzYwAAAAAAAAAIRGlzcGxheQAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAG1sdWMAAAAAAAAAAwAAAAxlblVTAAAADgAAADRmckZSAAAAMAAAAEJpdElUAAAADgAA
+AHIARABpAHMAcABsAGEAeQBNAG8AbgBpAHQAZQB1AHIAIABkAGUAIAB0AHkAcABlACAAaQBuAGMAbwBu
+AG4AdQBNAG8AbgBpAHQAbwBybW1vZAAAAAAAAA2vAAAQBAAAAADF1MaAAAAAAAAAAAAAAAAAAAAAAHRl
+eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDEwAA</bytes>
+													</object>
+												</object>
+											</object>
+										</object>
+										<reference key="NSColor" ref="737112587"/>
+									</object>
+									<reference key="NSAlternateImage" ref="325618037"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+								<object class="NSButtonCell" id="902679321">
+									<int key="NSCellFlags">67239424</int>
+									<int key="NSCellFlags2">0</int>
+									<string key="NSContents">QM MFCCs</string>
+									<reference key="NSSupport" ref="294883811"/>
+									<int key="NSTag">3</int>
+									<reference key="NSControlView" ref="948779024"/>
+									<int key="NSButtonFlags">1211912703</int>
+									<int key="NSButtonFlags2">128</int>
+									<reference key="NSNormalImage" ref="805939065"/>
+									<reference key="NSAlternateImage" ref="325618037"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
 							</object>
-							<string key="NSCellSize">{132, 18}</string>
+							<string key="NSCellSize">{176, 20}</string>
 							<string key="NSIntercellSpacing">{4, 2}</string>
 							<int key="NSMatrixFlags">1151868928</int>
 							<string key="NSCellClass">NSActionCell</string>
@@ -1105,97 +1187,41 @@
 								<int key="NSPeriodicInterval">75</int>
 							</object>
 							<reference key="NSSelectedCell" ref="71088072"/>
-							<reference key="NSBackgroundColor" ref="907238901"/>
+							<object class="NSColor" key="NSBackgroundColor" id="907238901">
+								<int key="NSColorSpace">6</int>
+								<string key="NSCatalogName">System</string>
+								<string key="NSColorName">controlColor</string>
+								<reference key="NSColor" ref="491397274"/>
+							</object>
 							<reference key="NSCellBackgroundColor" ref="282115067"/>
 							<reference key="NSFont" ref="294883811"/>
 						</object>
 						<object class="NSTextField" id="419880819">
 							<reference key="NSNextResponder" ref="108412374"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 66}, {123, 17}}</string>
+							<string key="NSFrame">{{17, 249}, {123, 17}}</string>
 							<reference key="NSSuperview" ref="108412374"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="207653454">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents">Available Features:</string>
+								<string key="NSContents">Feature Type:</string>
 								<reference key="NSSupport" ref="294883811"/>
 								<reference key="NSControlView" ref="419880819"/>
 								<reference key="NSBackgroundColor" ref="907238901"/>
 								<reference key="NSTextColor" ref="915193604"/>
 							</object>
 						</object>
-						<object class="NSBox" id="955715704">
-							<reference key="NSNextResponder" ref="108412374"/>
-							<int key="NSvFlags">-2147483636</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSView" id="790617918">
-									<reference key="NSNextResponder" ref="955715704"/>
-									<int key="NSvFlags">256</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSProgressIndicator" id="143167873">
-											<reference key="NSNextResponder" ref="790617918"/>
-											<int key="NSvFlags">1292</int>
-											<object class="NSPSMatrix" key="NSDrawMatrix"/>
-											<string key="NSFrame">{{5, 26}, {481, 20}}</string>
-											<reference key="NSSuperview" ref="790617918"/>
-											<int key="NSpiFlags">16394</int>
-											<double key="NSMinValue">2.000000e+01</double>
-											<double key="NSMaxValue">1.000000e+02</double>
-										</object>
-										<object class="NSTextField" id="79334017">
-											<reference key="NSNextResponder" ref="790617918"/>
-											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{178, 54}, {136, 17}}</string>
-											<reference key="NSSuperview" ref="790617918"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="662722795">
-												<int key="NSCellFlags">68288064</int>
-												<int key="NSCellFlags2">272630784</int>
-												<string key="NSContents">Extracting features...</string>
-												<reference key="NSSupport" ref="294883811"/>
-												<reference key="NSControlView" ref="79334017"/>
-												<reference key="NSBackgroundColor" ref="907238901"/>
-												<reference key="NSTextColor" ref="915193604"/>
-											</object>
-										</object>
-									</object>
-									<string key="NSFrameSize">{496, 71}</string>
-									<reference key="NSSuperview" ref="955715704"/>
-								</object>
-							</object>
-							<string key="NSFrame">{{11, -59}, {496, 71}}</string>
-							<reference key="NSSuperview" ref="108412374"/>
-							<string key="NSOffsets">{0, 0}</string>
-							<object class="NSTextFieldCell" key="NSTitleCell">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Box</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSBackgroundColor" ref="999916820"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
-								</object>
-							</object>
-							<reference key="NSContentView" ref="790617918"/>
-							<int key="NSBorderType">0</int>
-							<int key="NSBoxType">0</int>
-							<int key="NSTitlePosition">0</int>
-							<bool key="NSTransparent">NO</bool>
-						</object>
 						<object class="NSButton" id="331424260">
 							<reference key="NSNextResponder" ref="108412374"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{324, 11}, {96, 32}}</string>
+							<string key="NSFrame">{{99, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="108412374"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="614327950">
-								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags">-2080244224</int>
 								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Extract</string>
+								<string key="NSContents">Create</string>
 								<reference key="NSSupport" ref="294883811"/>
 								<reference key="NSControlView" ref="331424260"/>
 								<int key="NSButtonFlags">-2038284033</int>
@@ -1209,7 +1235,7 @@
 						<object class="NSButton" id="101359388">
 							<reference key="NSNextResponder" ref="108412374"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{420, 11}, {96, 32}}</string>
+							<string key="NSFrame">{{195, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="108412374"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="171111105">
@@ -1226,8 +1252,539 @@
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
+						<object class="NSTextField" id="243177593">
+							<reference key="NSNextResponder" ref="108412374"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{198, 249}, {117, 17}}</string>
+							<reference key="NSSuperview" ref="108412374"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="901184140">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Max Tracks:</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="243177593"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="837891765">
+							<reference key="NSNextResponder" ref="108412374"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{201, 219}, {84, 22}}</string>
+							<reference key="NSSuperview" ref="108412374"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="326075270">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">10</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="837891765"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<reference key="NSTextColor" ref="109975633"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="100300330">
+							<reference key="NSNextResponder" ref="108412374"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{198, 194}, {182, 17}}</string>
+							<reference key="NSSuperview" ref="108412374"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="586208572">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Max Length:</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="100300330"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="853306871">
+							<reference key="NSNextResponder" ref="108412374"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{201, 164}, {84, 22}}</string>
+							<reference key="NSSuperview" ref="108412374"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="232388524">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">5</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="853306871"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<reference key="NSTextColor" ref="109975633"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="306492447">
+							<reference key="NSNextResponder" ref="108412374"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{198, 139}, {182, 17}}</string>
+							<reference key="NSSuperview" ref="108412374"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="408521227">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Hop Size:</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="306492447"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="6587831">
+							<reference key="NSNextResponder" ref="108412374"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{201, 109}, {84, 22}}</string>
+							<reference key="NSSuperview" ref="108412374"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="552683571">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">2048</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="6587831"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<reference key="NSTextColor" ref="109975633"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="603098151">
+							<reference key="NSNextResponder" ref="108412374"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{198, 84}, {182, 17}}</string>
+							<reference key="NSSuperview" ref="108412374"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="723611735">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Window Size:</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="603098151"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="629729252">
+							<reference key="NSNextResponder" ref="108412374"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{201, 54}, {84, 22}}</string>
+							<reference key="NSSuperview" ref="108412374"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="849074580">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">16384</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="629729252"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<reference key="NSTextColor" ref="109975633"/>
+							</object>
+						</object>
 					</object>
-					<string key="NSFrameSize">{530, 98}</string>
+					<string key="NSFrameSize">{305, 281}</string>
+					<reference key="NSSuperview"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+			</object>
+			<object class="NSWindowTemplate" id="882433171">
+				<int key="NSWindowStyleMask">17</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 454}, {528, 56}}</string>
+				<int key="NSWTFlags">-1543503872</int>
+				<string key="NSWindowTitle">Import</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<object class="NSView" key="NSWindowView" id="211401506">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSProgressIndicator" id="395134946">
+							<reference key="NSNextResponder" ref="211401506"/>
+							<int key="NSvFlags">1292</int>
+							<object class="NSPSMatrix" key="NSDrawMatrix"/>
+							<string key="NSFrame">{{18, 16}, {492, 20}}</string>
+							<reference key="NSSuperview" ref="211401506"/>
+							<int key="NSpiFlags">16394</int>
+							<double key="NSMinValue">2.000000e+01</double>
+							<double key="NSMaxValue">1.000000e+02</double>
+						</object>
+					</object>
+					<string key="NSFrameSize">{528, 56}</string>
+					<reference key="NSSuperview"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+			</object>
+			<object class="NSWindowTemplate" id="726206840">
+				<int key="NSWindowStyleMask">17</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 179}, {294, 331}}</string>
+				<int key="NSWTFlags">-1543503872</int>
+				<string key="NSWindowTitle">Query</string>
+				<string key="NSWindowClass">NSPanel</string>
+				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<object class="NSView" key="NSWindowView" id="543728174">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSTextField" id="588391267">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{13, 116}, {77, 22}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="1063831987">
+								<int key="NSCellFlags">-1267597759</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="588391267"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<reference key="NSTextColor" ref="109975633"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="336787226">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{98, 116}, {79, 22}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="453084105">
+								<int key="NSCellFlags">-1267597759</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="336787226"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<reference key="NSTextColor" ref="109975633"/>
+							</object>
+						</object>
+						<object class="NSButton" id="192686954">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{11, 58}, {247, 18}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="94379046">
+								<int key="NSCellFlags">-1543373312</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Find multiple matches within tracks</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="192686954"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">130</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSSwitch</string>
+								</object>
+								<object class="NSButtonImageSource" key="NSAlternateImage">
+									<string key="NSImageName">NSSwitch</string>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="665545210">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{9, 298}, {72, 17}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="560976802">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Query File:</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="665545210"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="456008818">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{9, 146}, {94, 17}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="359811201">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Query Length</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="456008818"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="1052216460">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{19, 91}, {65, 17}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="306737653">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">138413056</int>
+								<string key="NSContents">(Vectors)</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="1052216460"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSBox" id="879403397">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">12</int>
+							<string key="NSFrame">{{12, 249}, {261, 5}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Box</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">2</int>
+							<int key="NSTitlePosition">0</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSTextField" id="591934983">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{103, 91}, {69, 17}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="1007215203">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">138413056</int>
+								<string key="NSContents">(Seconds)</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="591934983"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSBox" id="55130443">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">12</int>
+							<string key="NSFrame">{{13, 80}, {261, 5}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Box</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+								</object>
+							</object>
+							<int key="NSBorderType">3</int>
+							<int key="NSBoxType">2</int>
+							<int key="NSTitlePosition">0</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
+						<object class="NSButton" id="51051488">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{184, 110}, {96, 32}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="273140531">
+								<int key="NSCellFlags">604110336</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Reset</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="51051488"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="836048334">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{86, 12}, {96, 32}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="148131019">
+								<int key="NSCellFlags">604110336</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Query</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="836048334"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="292989424">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{182, 12}, {96, 32}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="273871207">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="292989424"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="236446787">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{9, 273}, {169, 17}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="599357318">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">No file selected</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="236446787"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSButton" id="528478972">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{177, 264}, {103, 32}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="69864074">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Select File</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="528478972"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="667672900">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{10, 226}, {94, 17}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="224767894">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Query Start</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="667672900"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="1011619545">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{13, 196}, {77, 22}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="45039974">
+								<int key="NSCellFlags">-1267597759</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="1011619545"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<reference key="NSTextColor" ref="109975633"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="744562290">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{98, 196}, {79, 22}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="123114174">
+								<int key="NSCellFlags">-1267597759</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="744562290"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="53086941"/>
+								<reference key="NSTextColor" ref="109975633"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="653083600">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{19, 171}, {65, 17}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="468200753">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">138413056</int>
+								<string key="NSContents">(Vectors)</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="653083600"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="161897573">
+							<reference key="NSNextResponder" ref="543728174"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{103, 171}, {69, 17}}</string>
+							<reference key="NSSuperview" ref="543728174"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="462693184">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">138413056</int>
+								<string key="NSContents">(Seconds)</string>
+								<reference key="NSSupport" ref="294883811"/>
+								<reference key="NSControlView" ref="161897573"/>
+								<reference key="NSBackgroundColor" ref="907238901"/>
+								<reference key="NSTextColor" ref="915193604"/>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{294, 331}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
@@ -1335,14 +1892,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">importSheet</string>
-						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="298235049"/>
-					</object>
-					<int key="connectionID">569</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">mainWindow</string>
 						<reference key="source" ref="232596070"/>
 						<reference key="destination" ref="972006081"/>
@@ -1358,22 +1907,6 @@
 					<int key="connectionID">631</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectFiles:</string>
-						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="331424260"/>
-					</object>
-					<int key="connectionID">632</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">extractingBox</string>
-						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="955715704"/>
-					</object>
-					<int key="connectionID">633</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">extractorOptions</string>
 						<reference key="source" ref="232596070"/>
@@ -1382,46 +1915,6 @@
 					<int key="connectionID">664</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="372985267"/>
-						<reference key="destination" ref="232596070"/>
-					</object>
-					<int key="connectionID">671</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tracksView</string>
-						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="372985267"/>
-					</object>
-					<int key="connectionID">673</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="372985267"/>
-						<reference key="destination" ref="232596070"/>
-					</object>
-					<int key="connectionID">675</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">cancelImport:</string>
-						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="101359388"/>
-					</object>
-					<int key="connectionID">695</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectedChanged:</string>
-						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="372985267"/>
-					</object>
-					<int key="connectionID">702</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">paste:</string>
 						<reference key="source" ref="1014"/>
@@ -1470,76 +1963,316 @@
 					<int key="connectionID">737</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">maxTracksField</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="837891765"/>
+					</object>
+					<int key="connectionID">772</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">maxLengthField</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="853306871"/>
+					</object>
+					<int key="connectionID">773</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">hopSizeField</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="6587831"/>
+					</object>
+					<int key="connectionID">774</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">indicator</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="395134946"/>
+					</object>
+					<int key="connectionID">782</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">createSheet</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="298235049"/>
+					</object>
+					<int key="connectionID">783</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">importSheet</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="882433171"/>
+					</object>
+					<int key="connectionID">784</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">createDatabase:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="331424260"/>
+					</object>
+					<int key="connectionID">785</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancelCreate:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="101359388"/>
+					</object>
+					<int key="connectionID">786</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">windowSizeField</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="629729252"/>
+					</object>
+					<int key="connectionID">791</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">querySheet</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="726206840"/>
+					</object>
+					<int key="connectionID">820</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">queryLengthSeconds</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="336787226"/>
+					</object>
+					<int key="connectionID">823</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">multipleCheckBox</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="192686954"/>
+					</object>
+					<int key="connectionID">824</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">resetButton</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="51051488"/>
+					</object>
+					<int key="connectionID">825</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performQuery:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="836048334"/>
+					</object>
+					<int key="connectionID">826</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancelQuery:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="292989424"/>
+					</object>
+					<int key="connectionID">827</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectQueryFile:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="528478972"/>
+					</object>
+					<int key="connectionID">839</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">queryPath</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="236446787"/>
+					</object>
+					<int key="connectionID">840</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">resetLengths:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="51051488"/>
+					</object>
+					<int key="connectionID">841</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">queryLengthVectors</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="588391267"/>
+					</object>
+					<int key="connectionID">843</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="588391267"/>
+						<reference key="destination" ref="232596070"/>
+					</object>
+					<int key="connectionID">844</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="336787226"/>
+						<reference key="destination" ref="232596070"/>
+					</object>
+					<int key="connectionID">845</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">queryButton</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="836048334"/>
+					</object>
+					<int key="connectionID">846</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">importAudio:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="171684970"/>
+					</object>
+					<int key="connectionID">865</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">playResult:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="1056305994"/>
+					</object>
+					<int key="connectionID">866</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">chooseQuery:</string>
 						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="989505649"/>
+						<reference key="destination" ref="768862092"/>
 					</object>
-					<int key="connectionID">740</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">chooseButton</string>
-						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="989505649"/>
-					</object>
-					<int key="connectionID">741</int>
+					<int key="connectionID">867</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">stopPlay:</string>
 						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="988243878"/>
+						<reference key="destination" ref="985641211"/>
 					</object>
-					<int key="connectionID">744</int>
+					<int key="connectionID">868</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">playResultButton</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="1056305994"/>
+					</object>
+					<int key="connectionID">882</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">performQueryButton</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="768862092"/>
+					</object>
+					<int key="connectionID">883</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">stopButton</string>
 						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="988243878"/>
+						<reference key="destination" ref="985641211"/>
 					</object>
-					<int key="connectionID">745</int>
+					<int key="connectionID">884</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">queryKey</string>
+						<string key="label">importAudioButton</string>
 						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="446375157"/>
+						<reference key="destination" ref="171684970"/>
 					</object>
-					<int key="connectionID">748</int>
+					<int key="connectionID">885</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tracksView</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="21728481"/>
+					</object>
+					<int key="connectionID">886</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="21728481"/>
+						<reference key="destination" ref="232596070"/>
+					</object>
+					<int key="connectionID">887</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="21728481"/>
+						<reference key="destination" ref="232596070"/>
+					</object>
+					<int key="connectionID">888</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">playBoth:</string>
+						<reference key="source" ref="232596070"/>
+						<reference key="destination" ref="680851766"/>
+					</object>
+					<int key="connectionID">890</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">playBothButton</string>
 						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="313714439"/>
+						<reference key="destination" ref="680851766"/>
 					</object>
-					<int key="connectionID">751</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">playBoth:</string>
-						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="313714439"/>
-					</object>
-					<int key="connectionID">752</int>
+					<int key="connectionID">891</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">playResultButton</string>
+						<string key="label">queryStartVectors</string>
 						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="482233744"/>
+						<reference key="destination" ref="1011619545"/>
 					</object>
-					<int key="connectionID">753</int>
+					<int key="connectionID">902</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">playResult:</string>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1011619545"/>
+						<reference key="destination" ref="232596070"/>
+					</object>
+					<int key="connectionID">903</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">queryStartSeconds</string>
 						<reference key="source" ref="232596070"/>
-						<reference key="destination" ref="482233744"/>
+						<reference key="destination" ref="744562290"/>
 					</object>
-					<int key="connectionID">754</int>
+					<int key="connectionID">904</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="744562290"/>
+						<reference key="destination" ref="232596070"/>
+					</object>
+					<int key="connectionID">905</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -1782,6 +2515,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="439893737"/>
+							<reference ref="703229265"/>
 						</object>
 						<reference key="parent" ref="1049"/>
 					</object>
@@ -1791,8 +2525,8 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="41357076"/>
-							<reference ref="171712411"/>
 							<reference ref="407454331"/>
+							<reference ref="788491600"/>
 						</object>
 						<reference key="parent" ref="972006081"/>
 					</object>
@@ -1836,16 +2570,6 @@
 						<reference key="parent" ref="720053764"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">524</int>
-						<reference key="object" ref="171712411"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="680449350"/>
-							<reference ref="382995127"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">564</int>
 						<reference key="object" ref="298235049"/>
 						<object class="NSMutableArray" key="children">
@@ -1861,7 +2585,14 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="419880819"/>
 							<reference ref="948779024"/>
-							<reference ref="955715704"/>
+							<reference ref="243177593"/>
+							<reference ref="837891765"/>
+							<reference ref="100300330"/>
+							<reference ref="853306871"/>
+							<reference ref="306492447"/>
+							<reference ref="6587831"/>
+							<reference ref="603098151"/>
+							<reference ref="629729252"/>
 							<reference ref="101359388"/>
 							<reference ref="331424260"/>
 						</object>
@@ -1875,6 +2606,8 @@
 							<reference ref="71088072"/>
 							<reference ref="857720735"/>
 							<reference ref="357486740"/>
+							<reference ref="853846524"/>
+							<reference ref="902679321"/>
 						</object>
 						<reference key="parent" ref="108412374"/>
 					</object>
@@ -1908,35 +2641,6 @@
 						<reference key="parent" ref="419880819"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">623</int>
-						<reference key="object" ref="955715704"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="79334017"/>
-							<reference ref="143167873"/>
-						</object>
-						<reference key="parent" ref="108412374"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">624</int>
-						<reference key="object" ref="143167873"/>
-						<reference key="parent" ref="955715704"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">625</int>
-						<reference key="object" ref="79334017"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="662722795"/>
-						</object>
-						<reference key="parent" ref="955715704"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">626</int>
-						<reference key="object" ref="662722795"/>
-						<reference key="parent" ref="79334017"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">627</int>
 						<reference key="object" ref="331424260"/>
 						<object class="NSMutableArray" key="children">
@@ -1951,172 +2655,6 @@
 						<reference key="parent" ref="331424260"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">527</int>
-						<reference key="object" ref="680449350"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="36188451"/>
-							<reference ref="1059929715"/>
-							<reference ref="372985267"/>
-							<reference ref="1022485640"/>
-						</object>
-						<reference key="parent" ref="171712411"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">530</int>
-						<reference key="object" ref="36188451"/>
-						<reference key="parent" ref="680449350"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">529</int>
-						<reference key="object" ref="1059929715"/>
-						<reference key="parent" ref="680449350"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">528</int>
-						<reference key="object" ref="372985267"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="913401705"/>
-							<reference ref="602172838"/>
-							<reference ref="1014311959"/>
-							<reference ref="284178317"/>
-							<reference ref="950838651"/>
-						</object>
-						<reference key="parent" ref="680449350"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">555</int>
-						<reference key="object" ref="913401705"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="66400504"/>
-						</object>
-						<reference key="parent" ref="372985267"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">556</int>
-						<reference key="object" ref="66400504"/>
-						<reference key="parent" ref="913401705"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">552</int>
-						<reference key="object" ref="602172838"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="922928882"/>
-						</object>
-						<reference key="parent" ref="372985267"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">553</int>
-						<reference key="object" ref="922928882"/>
-						<reference key="parent" ref="602172838"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">525</int>
-						<reference key="object" ref="382995127"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="846426635"/>
-							<reference ref="446375157"/>
-							<reference ref="989505649"/>
-							<reference ref="482233744"/>
-							<reference ref="313714439"/>
-							<reference ref="988243878"/>
-						</object>
-						<reference key="parent" ref="171712411"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">665</int>
-						<reference key="object" ref="846426635"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1007308618"/>
-						</object>
-						<reference key="parent" ref="382995127"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">666</int>
-						<reference key="object" ref="1007308618"/>
-						<reference key="parent" ref="846426635"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">674</int>
-						<reference key="object" ref="1022485640"/>
-						<reference key="parent" ref="680449350"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">686</int>
-						<reference key="object" ref="1014311959"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1036837113"/>
-						</object>
-						<reference key="parent" ref="372985267"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">687</int>
-						<reference key="object" ref="1036837113"/>
-						<reference key="parent" ref="1014311959"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">688</int>
-						<reference key="object" ref="284178317"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="552420549"/>
-						</object>
-						<reference key="parent" ref="372985267"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">689</int>
-						<reference key="object" ref="552420549"/>
-						<reference key="parent" ref="284178317"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">690</int>
-						<reference key="object" ref="950838651"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="398664767"/>
-						</object>
-						<reference key="parent" ref="372985267"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">691</int>
-						<reference key="object" ref="398664767"/>
-						<reference key="parent" ref="950838651"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">693</int>
-						<reference key="object" ref="101359388"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="171111105"/>
-						</object>
-						<reference key="parent" ref="108412374"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">694</int>
-						<reference key="object" ref="171111105"/>
-						<reference key="parent" ref="101359388"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">699</int>
-						<reference key="object" ref="313714439"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="771965150"/>
-						</object>
-						<reference key="parent" ref="382995127"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">700</int>
-						<reference key="object" ref="771965150"/>
-						<reference key="parent" ref="313714439"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">704</int>
 						<reference key="object" ref="638768185"/>
 						<object class="NSMutableArray" key="children">
@@ -2176,60 +2714,586 @@
 						<reference key="parent" ref="3884138"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">738</int>
-						<reference key="object" ref="989505649"/>
+						<int key="objectID">755</int>
+						<reference key="object" ref="853846524"/>
+						<reference key="parent" ref="948779024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">756</int>
+						<reference key="object" ref="902679321"/>
+						<reference key="parent" ref="948779024"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">693</int>
+						<reference key="object" ref="101359388"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="475638353"/>
+							<reference ref="171111105"/>
 						</object>
-						<reference key="parent" ref="382995127"/>
+						<reference key="parent" ref="108412374"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">739</int>
-						<reference key="object" ref="475638353"/>
-						<reference key="parent" ref="989505649"/>
+						<int key="objectID">694</int>
+						<reference key="object" ref="171111105"/>
+						<reference key="parent" ref="101359388"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">742</int>
-						<reference key="object" ref="988243878"/>
+						<int key="objectID">757</int>
+						<reference key="object" ref="243177593"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="172127913"/>
+							<reference ref="901184140"/>
 						</object>
-						<reference key="parent" ref="382995127"/>
+						<reference key="parent" ref="108412374"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">743</int>
-						<reference key="object" ref="172127913"/>
-						<reference key="parent" ref="988243878"/>
+						<int key="objectID">758</int>
+						<reference key="object" ref="901184140"/>
+						<reference key="parent" ref="243177593"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">746</int>
-						<reference key="object" ref="446375157"/>
+						<int key="objectID">759</int>
+						<reference key="object" ref="837891765"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="822940230"/>
+							<reference ref="326075270"/>
 						</object>
-						<reference key="parent" ref="382995127"/>
+						<reference key="parent" ref="108412374"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">747</int>
-						<reference key="object" ref="822940230"/>
-						<reference key="parent" ref="446375157"/>
+						<int key="objectID">760</int>
+						<reference key="object" ref="326075270"/>
+						<reference key="parent" ref="837891765"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">749</int>
-						<reference key="object" ref="482233744"/>
+						<int key="objectID">763</int>
+						<reference key="object" ref="100300330"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="807113649"/>
+							<reference ref="586208572"/>
 						</object>
-						<reference key="parent" ref="382995127"/>
+						<reference key="parent" ref="108412374"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">750</int>
-						<reference key="object" ref="807113649"/>
-						<reference key="parent" ref="482233744"/>
+						<int key="objectID">764</int>
+						<reference key="object" ref="586208572"/>
+						<reference key="parent" ref="100300330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">765</int>
+						<reference key="object" ref="853306871"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="232388524"/>
+						</object>
+						<reference key="parent" ref="108412374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">766</int>
+						<reference key="object" ref="232388524"/>
+						<reference key="parent" ref="853306871"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">767</int>
+						<reference key="object" ref="306492447"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="408521227"/>
+						</object>
+						<reference key="parent" ref="108412374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">768</int>
+						<reference key="object" ref="6587831"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="552683571"/>
+						</object>
+						<reference key="parent" ref="108412374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">769</int>
+						<reference key="object" ref="552683571"/>
+						<reference key="parent" ref="6587831"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">770</int>
+						<reference key="object" ref="408521227"/>
+						<reference key="parent" ref="306492447"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">778</int>
+						<reference key="object" ref="882433171"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="211401506"/>
+						</object>
+						<reference key="parent" ref="1049"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">779</int>
+						<reference key="object" ref="211401506"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="395134946"/>
+						</object>
+						<reference key="parent" ref="882433171"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">780</int>
+						<reference key="object" ref="395134946"/>
+						<reference key="parent" ref="211401506"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">787</int>
+						<reference key="object" ref="603098151"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="723611735"/>
+						</object>
+						<reference key="parent" ref="108412374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">788</int>
+						<reference key="object" ref="629729252"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="849074580"/>
+						</object>
+						<reference key="parent" ref="108412374"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">789</int>
+						<reference key="object" ref="849074580"/>
+						<reference key="parent" ref="629729252"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">790</int>
+						<reference key="object" ref="723611735"/>
+						<reference key="parent" ref="603098151"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">792</int>
+						<reference key="object" ref="726206840"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="543728174"/>
+						</object>
+						<reference key="parent" ref="1049"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">793</int>
+						<reference key="object" ref="543728174"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="665545210"/>
+							<reference ref="879403397"/>
+							<reference ref="236446787"/>
+							<reference ref="528478972"/>
+							<reference ref="667672900"/>
+							<reference ref="1011619545"/>
+							<reference ref="744562290"/>
+							<reference ref="588391267"/>
+							<reference ref="336787226"/>
+							<reference ref="192686954"/>
+							<reference ref="456008818"/>
+							<reference ref="1052216460"/>
+							<reference ref="591934983"/>
+							<reference ref="55130443"/>
+							<reference ref="51051488"/>
+							<reference ref="836048334"/>
+							<reference ref="292989424"/>
+							<reference ref="653083600"/>
+							<reference ref="161897573"/>
+						</object>
+						<reference key="parent" ref="726206840"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">796</int>
+						<reference key="object" ref="588391267"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1063831987"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">797</int>
+						<reference key="object" ref="1063831987"/>
+						<reference key="parent" ref="588391267"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">798</int>
+						<reference key="object" ref="336787226"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="453084105"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">799</int>
+						<reference key="object" ref="453084105"/>
+						<reference key="parent" ref="336787226"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">800</int>
+						<reference key="object" ref="192686954"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="94379046"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">801</int>
+						<reference key="object" ref="94379046"/>
+						<reference key="parent" ref="192686954"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">802</int>
+						<reference key="object" ref="665545210"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="560976802"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">803</int>
+						<reference key="object" ref="560976802"/>
+						<reference key="parent" ref="665545210"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">804</int>
+						<reference key="object" ref="456008818"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="359811201"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">805</int>
+						<reference key="object" ref="359811201"/>
+						<reference key="parent" ref="456008818"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">806</int>
+						<reference key="object" ref="1052216460"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="306737653"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">807</int>
+						<reference key="object" ref="306737653"/>
+						<reference key="parent" ref="1052216460"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">810</int>
+						<reference key="object" ref="879403397"/>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">811</int>
+						<reference key="object" ref="591934983"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1007215203"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">812</int>
+						<reference key="object" ref="1007215203"/>
+						<reference key="parent" ref="591934983"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">813</int>
+						<reference key="object" ref="55130443"/>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">814</int>
+						<reference key="object" ref="51051488"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="273140531"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">815</int>
+						<reference key="object" ref="273140531"/>
+						<reference key="parent" ref="51051488"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">816</int>
+						<reference key="object" ref="836048334"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="148131019"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">817</int>
+						<reference key="object" ref="148131019"/>
+						<reference key="parent" ref="836048334"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">818</int>
+						<reference key="object" ref="292989424"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="273871207"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">819</int>
+						<reference key="object" ref="273871207"/>
+						<reference key="parent" ref="292989424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">834</int>
+						<reference key="object" ref="236446787"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="599357318"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">835</int>
+						<reference key="object" ref="599357318"/>
+						<reference key="parent" ref="236446787"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">836</int>
+						<reference key="object" ref="528478972"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="69864074"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">837</int>
+						<reference key="object" ref="69864074"/>
+						<reference key="parent" ref="528478972"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">850</int>
+						<reference key="object" ref="703229265"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="997154698"/>
+							<reference ref="1056305994"/>
+							<reference ref="768862092"/>
+							<reference ref="985641211"/>
+							<reference ref="680851766"/>
+							<reference ref="171684970"/>
+						</object>
+						<reference key="parent" ref="972006081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">856</int>
+						<reference key="object" ref="997154698"/>
+						<reference key="parent" ref="703229265"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">862</int>
+						<reference key="object" ref="1056305994"/>
+						<reference key="parent" ref="703229265"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">863</int>
+						<reference key="object" ref="768862092"/>
+						<reference key="parent" ref="703229265"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">864</int>
+						<reference key="object" ref="985641211"/>
+						<reference key="parent" ref="703229265"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">869</int>
+						<reference key="object" ref="788491600"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="610587181"/>
+							<reference ref="21728481"/>
+							<reference ref="876758231"/>
+							<reference ref="854073106"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">870</int>
+						<reference key="object" ref="610587181"/>
+						<reference key="parent" ref="788491600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">871</int>
+						<reference key="object" ref="21728481"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="797051573"/>
+							<reference ref="266345549"/>
+							<reference ref="253700397"/>
+							<reference ref="457363317"/>
+						</object>
+						<reference key="parent" ref="788491600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">872</int>
+						<reference key="object" ref="876758231"/>
+						<reference key="parent" ref="788491600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">873</int>
+						<reference key="object" ref="854073106"/>
+						<reference key="parent" ref="788491600"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">874</int>
+						<reference key="object" ref="797051573"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="741932707"/>
+						</object>
+						<reference key="parent" ref="21728481"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">875</int>
+						<reference key="object" ref="266345549"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="24095276"/>
+						</object>
+						<reference key="parent" ref="21728481"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">876</int>
+						<reference key="object" ref="253700397"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="660173613"/>
+						</object>
+						<reference key="parent" ref="21728481"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">877</int>
+						<reference key="object" ref="457363317"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="990606590"/>
+						</object>
+						<reference key="parent" ref="21728481"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">878</int>
+						<reference key="object" ref="990606590"/>
+						<reference key="parent" ref="457363317"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">879</int>
+						<reference key="object" ref="660173613"/>
+						<reference key="parent" ref="253700397"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">880</int>
+						<reference key="object" ref="24095276"/>
+						<reference key="parent" ref="266345549"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">881</int>
+						<reference key="object" ref="741932707"/>
+						<reference key="parent" ref="797051573"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">889</int>
+						<reference key="object" ref="680851766"/>
+						<reference key="parent" ref="703229265"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">861</int>
+						<reference key="object" ref="171684970"/>
+						<reference key="parent" ref="703229265"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">892</int>
+						<reference key="object" ref="667672900"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="224767894"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">893</int>
+						<reference key="object" ref="224767894"/>
+						<reference key="parent" ref="667672900"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">894</int>
+						<reference key="object" ref="1011619545"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="45039974"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">895</int>
+						<reference key="object" ref="744562290"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="123114174"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">896</int>
+						<reference key="object" ref="123114174"/>
+						<reference key="parent" ref="744562290"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">897</int>
+						<reference key="object" ref="45039974"/>
+						<reference key="parent" ref="1011619545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">898</int>
+						<reference key="object" ref="653083600"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="468200753"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">899</int>
+						<reference key="object" ref="161897573"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="462693184"/>
+						</object>
+						<reference key="parent" ref="543728174"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">900</int>
+						<reference key="object" ref="462693184"/>
+						<reference key="parent" ref="161897573"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">901</int>
+						<reference key="object" ref="468200753"/>
+						<reference key="parent" ref="653083600"/>
 					</object>
 				</object>
 			</object>
@@ -2302,16 +3366,6 @@
 					<string>5.IBPluginDependency</string>
 					<string>5.ImportedFromIB2</string>
 					<string>522.IBPluginDependency</string>
-					<string>524.IBPluginDependency</string>
-					<string>525.IBPluginDependency</string>
-					<string>527.IBPluginDependency</string>
-					<string>528.IBPluginDependency</string>
-					<string>529.IBPluginDependency</string>
-					<string>530.IBPluginDependency</string>
-					<string>552.IBPluginDependency</string>
-					<string>553.IBPluginDependency</string>
-					<string>555.IBPluginDependency</string>
-					<string>556.IBPluginDependency</string>
 					<string>56.IBPluginDependency</string>
 					<string>56.ImportedFromIB2</string>
 					<string>564.IBEditorWindowLastContentRect</string>
@@ -2330,25 +3384,10 @@
 					<string>620.IBPluginDependency</string>
 					<string>621.IBPluginDependency</string>
 					<string>622.IBPluginDependency</string>
-					<string>623.IBPluginDependency</string>
-					<string>624.IBPluginDependency</string>
-					<string>625.IBPluginDependency</string>
-					<string>626.IBPluginDependency</string>
 					<string>627.IBPluginDependency</string>
 					<string>628.IBPluginDependency</string>
-					<string>665.IBPluginDependency</string>
-					<string>666.IBPluginDependency</string>
-					<string>674.IBPluginDependency</string>
-					<string>686.IBPluginDependency</string>
-					<string>687.IBPluginDependency</string>
-					<string>688.IBPluginDependency</string>
-					<string>689.IBPluginDependency</string>
-					<string>690.IBPluginDependency</string>
-					<string>691.IBPluginDependency</string>
 					<string>693.IBPluginDependency</string>
 					<string>694.IBPluginDependency</string>
-					<string>699.IBPluginDependency</string>
-					<string>700.IBPluginDependency</string>
 					<string>704.IBPluginDependency</string>
 					<string>705.IBEditorWindowLastContentRect</string>
 					<string>705.IBPluginDependency</string>
@@ -2361,22 +3400,97 @@
 					<string>714.IBPluginDependency</string>
 					<string>72.IBPluginDependency</string>
 					<string>72.ImportedFromIB2</string>
-					<string>738.IBPluginDependency</string>
-					<string>739.IBPluginDependency</string>
-					<string>742.IBPluginDependency</string>
-					<string>743.IBPluginDependency</string>
-					<string>746.IBPluginDependency</string>
-					<string>747.IBPluginDependency</string>
-					<string>749.IBPluginDependency</string>
-					<string>750.IBPluginDependency</string>
+					<string>755.IBPluginDependency</string>
+					<string>756.IBPluginDependency</string>
+					<string>757.IBPluginDependency</string>
+					<string>758.IBPluginDependency</string>
+					<string>759.IBPluginDependency</string>
+					<string>760.IBPluginDependency</string>
+					<string>763.IBPluginDependency</string>
+					<string>764.IBPluginDependency</string>
+					<string>765.IBPluginDependency</string>
+					<string>766.IBPluginDependency</string>
+					<string>767.IBPluginDependency</string>
+					<string>768.IBPluginDependency</string>
+					<string>769.IBPluginDependency</string>
+					<string>770.IBPluginDependency</string>
+					<string>778.IBEditorWindowLastContentRect</string>
+					<string>778.IBWindowTemplateEditedContentRect</string>
+					<string>778.NSWindowTemplate.visibleAtLaunch</string>
+					<string>779.IBPluginDependency</string>
+					<string>780.IBPluginDependency</string>
+					<string>787.IBPluginDependency</string>
+					<string>788.IBPluginDependency</string>
+					<string>789.IBPluginDependency</string>
+					<string>790.IBPluginDependency</string>
+					<string>792.IBEditorWindowLastContentRect</string>
+					<string>792.IBWindowTemplateEditedContentRect</string>
+					<string>792.NSWindowTemplate.visibleAtLaunch</string>
+					<string>793.IBPluginDependency</string>
+					<string>796.IBPluginDependency</string>
+					<string>797.IBPluginDependency</string>
+					<string>798.IBPluginDependency</string>
+					<string>799.IBPluginDependency</string>
+					<string>800.IBPluginDependency</string>
+					<string>801.IBPluginDependency</string>
+					<string>802.IBPluginDependency</string>
+					<string>803.IBPluginDependency</string>
+					<string>804.IBPluginDependency</string>
+					<string>805.IBPluginDependency</string>
+					<string>806.IBPluginDependency</string>
+					<string>807.IBPluginDependency</string>
 					<string>81.IBEditorWindowLastContentRect</string>
 					<string>81.IBPluginDependency</string>
 					<string>81.ImportedFromIB2</string>
 					<string>81.editorWindowContentRectSynchronizationRect</string>
+					<string>810.IBPluginDependency</string>
+					<string>811.IBPluginDependency</string>
+					<string>812.IBPluginDependency</string>
+					<string>813.IBPluginDependency</string>
+					<string>814.IBPluginDependency</string>
+					<string>815.IBPluginDependency</string>
+					<string>816.IBPluginDependency</string>
+					<string>817.IBPluginDependency</string>
+					<string>818.IBPluginDependency</string>
+					<string>819.IBPluginDependency</string>
 					<string>82.IBPluginDependency</string>
 					<string>82.ImportedFromIB2</string>
 					<string>83.IBPluginDependency</string>
 					<string>83.ImportedFromIB2</string>
+					<string>834.IBPluginDependency</string>
+					<string>835.IBPluginDependency</string>
+					<string>836.IBPluginDependency</string>
+					<string>837.IBPluginDependency</string>
+					<string>850.IBEditorWindowLastContentRect</string>
+					<string>850.IBPluginDependency</string>
+					<string>861.IBPluginDependency</string>
+					<string>862.IBPluginDependency</string>
+					<string>863.IBPluginDependency</string>
+					<string>864.IBPluginDependency</string>
+					<string>869.IBPluginDependency</string>
+					<string>870.IBPluginDependency</string>
+					<string>871.IBPluginDependency</string>
+					<string>872.IBPluginDependency</string>
+					<string>873.IBPluginDependency</string>
+					<string>874.IBPluginDependency</string>
+					<string>875.IBPluginDependency</string>
+					<string>876.IBPluginDependency</string>
+					<string>877.IBPluginDependency</string>
+					<string>878.IBPluginDependency</string>
+					<string>879.IBPluginDependency</string>
+					<string>880.IBPluginDependency</string>
+					<string>881.IBPluginDependency</string>
+					<string>889.IBPluginDependency</string>
+					<string>892.IBPluginDependency</string>
+					<string>893.IBPluginDependency</string>
+					<string>894.IBPluginDependency</string>
+					<string>895.IBPluginDependency</string>
+					<string>896.IBPluginDependency</string>
+					<string>897.IBPluginDependency</string>
+					<string>898.IBPluginDependency</string>
+					<string>899.IBPluginDependency</string>
+					<string>900.IBPluginDependency</string>
+					<string>901.IBPluginDependency</string>
 					<string>92.IBPluginDependency</string>
 					<string>92.ImportedFromIB2</string>
 				</object>
@@ -2427,13 +3541,13 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{525, 802}, {197, 73}}</string>
-					<string>{{639, 285}, {315, 20}}</string>
+					<string>{{71, 285}, {315, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{74, 862}</string>
 					<string>{{6, 978}, {478, 20}}</string>
-					<string>{{133, 278}, {606, 477}}</string>
-					<string>{{133, 278}, {606, 477}}</string>
+					<string>{{194, -257}, {606, 477}}</string>
+					<string>{{194, -257}, {606, 477}}</string>
 					<reference ref="9"/>
 					<string>{{33, 99}, {480, 360}}</string>
 					<string>{3.40282e+38, 3.40282e+38}</string>
@@ -2448,22 +3562,12 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>{{413, 467}, {305, 281}}</string>
+					<string>{{413, 467}, {305, 281}}</string>
+					<boolean value="NO" id="6"/>
 					<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>
-					<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>
-					<reference ref="9"/>
-					<string>{{82, 388}, {530, 98}}</string>
-					<string>{{82, 388}, {530, 98}}</string>
-					<boolean value="NO"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{651, 102}, {201, 183}}</string>
+					<string>{{83, 102}, {201, 183}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{23, 794}, {245, 183}}</string>
@@ -2480,21 +3584,6 @@
 					<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>
-					<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>
-					<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>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{778, 152}, {154, 133}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2514,15 +3603,90 @@
 					<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>
+					<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>{{76, 497}, {528, 56}}</string>
+					<string>{{76, 497}, {528, 56}}</string>
+					<reference ref="6"/>
+					<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>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{154, 421}, {294, 331}}</string>
+					<string>{{154, 421}, {294, 331}}</string>
+					<reference ref="6"/>
+					<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>
+					<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>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{736, 222}, {169, 63}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{145, 474}, {199, 203}}</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>
+					<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>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<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>{{54, 442}, {616, 0}}</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>
+					<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>
+					<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>
+					<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>
+					<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>
+					<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>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 				</object>
 			</object>
@@ -2546,7 +3710,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">754</int>
+			<int key="maxID">905</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2558,16 +3722,22 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>cancelImport:</string>
+							<string>cancelCreate:</string>
+							<string>cancelQuery:</string>
 							<string>chooseQuery:</string>
+							<string>createDatabase:</string>
 							<string>importAudio:</string>
 							<string>newDatabase:</string>
 							<string>openDatabase:</string>
+							<string>pathAction:</string>
+							<string>performQuery:</string>
 							<string>playBoth:</string>
 							<string>playResult:</string>
-							<string>selectFiles:</string>
+							<string>resetLengths:</string>
+							<string>selectQueryFile:</string>
 							<string>selectedChanged:</string>
 							<string>stopPlay:</string>
+							<string>tableDoubleClick:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2581,39 +3751,73 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>chooseButton</string>
-							<string>extractingBox</string>
+							<string>createSheet</string>
 							<string>extractorOptions</string>
+							<string>hopSizeField</string>
+							<string>importAudioButton</string>
 							<string>importSheet</string>
 							<string>indicator</string>
 							<string>mainWindow</string>
+							<string>maxLengthField</string>
+							<string>maxTracksField</string>
+							<string>multipleCheckBox</string>
+							<string>performQueryButton</string>
 							<string>playBothButton</string>
 							<string>playResultButton</string>
+							<string>queryButton</string>
 							<string>queryKey</string>
+							<string>queryLengthSeconds</string>
+							<string>queryLengthVectors</string>
+							<string>queryPath</string>
+							<string>querySheet</string>
+							<string>queryStartSeconds</string>
+							<string>queryStartVectors</string>
+							<string>resetButton</string>
 							<string>statusField</string>
 							<string>stopButton</string>
 							<string>tracksView</string>
+							<string>windowSizeField</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSButton</string>
-							<string>NSBox</string>
+							<string>id</string>
 							<string>NSMatrix</string>
+							<string>NSTextField</string>
+							<string>NSToolbarItem</string>
 							<string>id</string>
 							<string>NSProgressIndicator</string>
 							<string>id</string>
+							<string>NSTextField</string>
+							<string>NSTextField</string>
 							<string>NSButton</string>
+							<string>NSToolbarItem</string>
+							<string>NSToolbarItem</string>
+							<string>NSToolbarItem</string>
 							<string>NSButton</string>
 							<string>NSTextField</string>
 							<string>NSTextField</string>
+							<string>NSTextField</string>
+							<string>NSTextField</string>
+							<string>id</string>
+							<string>NSTextField</string>
+							<string>NSTextField</string>
 							<string>NSButton</string>
+							<string>NSTextField</string>
+							<string>NSToolbarItem</string>
 							<string>NSTableView</string>
+							<string>NSTextField</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
--- a/examples/iAudioDB/iAudioDB.xcodeproj/project.pbxproj	Mon Apr 26 17:17:07 2010 +0000
+++ b/examples/iAudioDB/iAudioDB.xcodeproj/project.pbxproj	Wed Apr 28 15:48:59 2010 +0000
@@ -11,14 +11,15 @@
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-		B798CFD3114A70DC00026712 /* Add.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B798CFCF114A70DB00026712 /* Add.tiff */; };
-		B798CFD4114A70DC00026712 /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B798CFD0114A70DB00026712 /* Play.tiff */; };
-		B798CFD5114A70DC00026712 /* Spotlight.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B798CFD1114A70DB00026712 /* Spotlight.tiff */; };
-		B798CFD6114A70DC00026712 /* Stop.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B798CFD2114A70DB00026712 /* Stop.tiff */; };
+		B7000BA71180AE2B00C3DAEC /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B7000BA61180AE2B00C3DAEC /* BWToolkitFramework.framework */; };
+		B7000BD71180AE3300C3DAEC /* BWToolkitFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B7000BA61180AE2B00C3DAEC /* BWToolkitFramework.framework */; };
+		B7000BFA1180B06800C3DAEC /* Add.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B7000BF61180B06800C3DAEC /* Add.tiff */; };
+		B7000BFB1180B06800C3DAEC /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B7000BF71180B06800C3DAEC /* Play.tiff */; };
+		B7000BFC1180B06800C3DAEC /* Spotlight.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B7000BF81180B06800C3DAEC /* Spotlight.tiff */; };
+		B7000BFD1180B06800C3DAEC /* Stop.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B7000BF91180B06800C3DAEC /* Stop.tiff */; };
 		B7CBF33211105F1700B8C1C8 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = B7CBF33111105F1700B8C1C8 /* AppController.m */; };
 		B7CBF3B711106F4C00B8C1C8 /* libaudioDB.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B7CBF3B611106F4C00B8C1C8 /* libaudioDB.0.0.dylib */; };
 		B7E0FD5B114164430003AB08 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B7E0FD5A114164430003AB08 /* BWToolkitFramework.framework */; };
-		B7E0FD8D114164850003AB08 /* BWToolkitFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B7E0FD5A114164430003AB08 /* BWToolkitFramework.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -28,7 +29,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				B7E0FD8D114164850003AB08 /* BWToolkitFramework.framework in CopyFiles */,
+				B7000BD71180AE3300C3DAEC /* BWToolkitFramework.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -45,10 +46,11 @@
 		32CA4F630368D1EE00C91783 /* iAudioDB_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iAudioDB_Prefix.pch; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* iAudioDB.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iAudioDB.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		B798CFCF114A70DB00026712 /* Add.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Add.tiff; path = ../../../../Downloads/devicons/Add.tiff; sourceTree = SOURCE_ROOT; };
-		B798CFD0114A70DB00026712 /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Play.tiff; path = ../../../../Downloads/devicons/Play.tiff; sourceTree = SOURCE_ROOT; };
-		B798CFD1114A70DB00026712 /* Spotlight.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Spotlight.tiff; path = ../../../../Downloads/devicons/Spotlight.tiff; sourceTree = SOURCE_ROOT; };
-		B798CFD2114A70DB00026712 /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Stop.tiff; path = ../../../../Downloads/devicons/Stop.tiff; sourceTree = SOURCE_ROOT; };
+		B7000BA61180AE2B00C3DAEC /* BWToolkitFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = BWToolkitFramework.framework; sourceTree = "<group>"; };
+		B7000BF61180B06800C3DAEC /* Add.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Add.tiff; sourceTree = "<group>"; };
+		B7000BF71180B06800C3DAEC /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = "<group>"; };
+		B7000BF81180B06800C3DAEC /* Spotlight.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Spotlight.tiff; sourceTree = "<group>"; };
+		B7000BF91180B06800C3DAEC /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Stop.tiff; sourceTree = "<group>"; };
 		B7CBF33011105F1700B8C1C8 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
 		B7CBF33111105F1700B8C1C8 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = "<group>"; };
 		B7CBF3B611106F4C00B8C1C8 /* libaudioDB.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libaudioDB.0.0.dylib; path = /usr/local/lib/libaudioDB.0.0.dylib; sourceTree = "<absolute>"; };
@@ -63,6 +65,7 @@
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
 				B7CBF3B711106F4C00B8C1C8 /* libaudioDB.0.0.dylib in Frameworks */,
 				B7E0FD5B114164430003AB08 /* BWToolkitFramework.framework in Frameworks */,
+				B7000BA71180AE2B00C3DAEC /* BWToolkitFramework.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -107,6 +110,7 @@
 		29B97314FDCFA39411CA2CEA /* iAudioDB */ = {
 			isa = PBXGroup;
 			children = (
+				B7000BA61180AE2B00C3DAEC /* BWToolkitFramework.framework */,
 				B7CBF3B611106F4C00B8C1C8 /* libaudioDB.0.0.dylib */,
 				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -129,10 +133,7 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				B798CFCF114A70DB00026712 /* Add.tiff */,
-				B798CFD0114A70DB00026712 /* Play.tiff */,
-				B798CFD1114A70DB00026712 /* Spotlight.tiff */,
-				B798CFD2114A70DB00026712 /* Stop.tiff */,
+				B7000BF51180B06800C3DAEC /* icons */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
@@ -150,6 +151,17 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		B7000BF51180B06800C3DAEC /* icons */ = {
+			isa = PBXGroup;
+			children = (
+				B7000BF61180B06800C3DAEC /* Add.tiff */,
+				B7000BF71180B06800C3DAEC /* Play.tiff */,
+				B7000BF81180B06800C3DAEC /* Spotlight.tiff */,
+				B7000BF91180B06800C3DAEC /* Stop.tiff */,
+			);
+			path = icons;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -196,10 +208,10 @@
 			files = (
 				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
-				B798CFD3114A70DC00026712 /* Add.tiff in Resources */,
-				B798CFD4114A70DC00026712 /* Play.tiff in Resources */,
-				B798CFD5114A70DC00026712 /* Spotlight.tiff in Resources */,
-				B798CFD6114A70DC00026712 /* Stop.tiff in Resources */,
+				B7000BFA1180B06800C3DAEC /* Add.tiff in Resources */,
+				B7000BFB1180B06800C3DAEC /* Play.tiff in Resources */,
+				B7000BFC1180B06800C3DAEC /* Spotlight.tiff in Resources */,
+				B7000BFD1180B06800C3DAEC /* Stop.tiff in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
Binary file examples/iAudioDB/icons/Add.tiff has changed
Binary file examples/iAudioDB/icons/Play.tiff has changed
Binary file examples/iAudioDB/icons/Spotlight.tiff has changed
Binary file examples/iAudioDB/icons/Stop.tiff has changed