diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 263a136..e1eeda2 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -13,7 +13,7 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="372"/>
-			<integer value="205"/>
+			<integer value="29"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -503,103 +503,6 @@
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSPopUpButton" id="379067245">
-							<reference key="NSNextResponder" ref="439893737"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 375}, {167, 26}}</string>
-							<reference key="NSSuperview" ref="439893737"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSPopUpButtonCell" key="NSCell" id="800758381">
-								<int key="NSCellFlags">-2076049856</int>
-								<int key="NSCellFlags2">2048</int>
-								<object class="NSFont" key="NSSupport" id="731765667">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">13</double>
-									<int key="NSfFlags">1044</int>
-								</object>
-								<reference key="NSControlView" ref="379067245"/>
-								<int key="NSButtonFlags">109199615</int>
-								<int key="NSButtonFlags2">129</int>
-								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="271797919">
-									<reference key="NSMenu" ref="887087914"/>
-									<string key="NSTitle">World 1</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<int key="NSState">1</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">_popUpItemAction:</string>
-									<int key="NSTag">1</int>
-									<reference key="NSTarget" ref="800758381"/>
-								</object>
-								<bool key="NSMenuItemRespectAlignment">YES</bool>
-								<object class="NSMenu" key="NSMenu" id="887087914">
-									<string key="NSTitle">OtherViews</string>
-									<object class="NSMutableArray" key="NSMenuItems">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="271797919"/>
-										<object class="NSMenuItem" id="815864939">
-											<reference key="NSMenu" ref="887087914"/>
-											<string key="NSTitle">World 2</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="35465992"/>
-											<reference key="NSMixedImage" ref="502551668"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<int key="NSTag">2</int>
-											<reference key="NSTarget" ref="800758381"/>
-										</object>
-										<object class="NSMenuItem" id="301692191">
-											<reference key="NSMenu" ref="887087914"/>
-											<string key="NSTitle">World 3</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="35465992"/>
-											<reference key="NSMixedImage" ref="502551668"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<int key="NSTag">3</int>
-											<reference key="NSTarget" ref="800758381"/>
-										</object>
-										<object class="NSMenuItem" id="373936608">
-											<reference key="NSMenu" ref="887087914"/>
-											<string key="NSTitle">World 4</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="35465992"/>
-											<reference key="NSMixedImage" ref="502551668"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<int key="NSTag">4</int>
-											<reference key="NSTarget" ref="800758381"/>
-										</object>
-										<object class="NSMenuItem" id="547351024">
-											<reference key="NSMenu" ref="887087914"/>
-											<string key="NSTitle">World 5</string>
-											<string key="NSKeyEquiv"/>
-											<int key="NSKeyEquivModMask">1048576</int>
-											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="35465992"/>
-											<reference key="NSMixedImage" ref="502551668"/>
-											<string key="NSAction">_popUpItemAction:</string>
-											<int key="NSTag">5</int>
-											<reference key="NSTarget" ref="800758381"/>
-										</object>
-									</object>
-									<reference key="NSMenuFont" ref="731765667"/>
-								</object>
-								<int key="NSPreferredEdge">1</int>
-								<bool key="NSUsesItemFromMenu">YES</bool>
-								<bool key="NSAltersState">YES</bool>
-								<int key="NSArrowPosition">2</int>
-							</object>
-						</object>
 						<object class="NSScrollView" id="489307225">
 							<reference key="NSNextResponder" ref="439893737"/>
 							<int key="NSvFlags">274</int>
@@ -613,7 +516,7 @@
 										<object class="NSOutlineView" id="69625062">
 											<reference key="NSNextResponder" ref="626284851"/>
 											<int key="NSvFlags">4352</int>
-											<string key="NSFrameSize">{551, 342}</string>
+											<string key="NSFrameSize">{551, 328}</string>
 											<reference key="NSSuperview" ref="626284851"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="563285969">
@@ -663,7 +566,11 @@
 														<int key="NSCellFlags">337772096</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Text Cell</string>
-														<reference key="NSSupport" ref="731765667"/>
+														<object class="NSFont" key="NSSupport" id="731765667">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">13</double>
+															<int key="NSfFlags">1044</int>
+														</object>
 														<reference key="NSControlView" ref="69625062"/>
 														<object class="NSColor" key="NSBackgroundColor" id="451382550">
 															<int key="NSColorSpace">6</int>
@@ -812,7 +719,7 @@
 													<bool key="NSIsEditable">YES</bool>
 													<reference key="NSTableView" ref="69625062"/>
 												</object>
-												<object class="NSTableColumn" id="947898867">
+												<object class="NSTableColumn" id="194250517">
 													<string key="NSIdentifier">id</string>
 													<double key="NSWidth">42</double>
 													<double key="NSMinWidth">10</double>
@@ -825,12 +732,12 @@
 														<reference key="NSBackgroundColor" ref="650783734"/>
 														<reference key="NSTextColor" ref="115003830"/>
 													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="682529580">
+													<object class="NSTextFieldCell" key="NSDataCell" id="79162137">
 														<int key="NSCellFlags">337772096</int>
 														<int key="NSCellFlags2">-2147481600</int>
 														<string key="NSContents">Text Cell</string>
 														<reference key="NSSupport" ref="731765667"/>
-														<object class="NSNumberFormatter" key="NSFormatter" id="457606247">
+														<object class="NSNumberFormatter" key="NSFormatter" id="20991559">
 															<object class="NSMutableDictionary" key="NS.attributes">
 																<bool key="EncodedWithXMLCoder">YES</bool>
 																<object class="NSArray" key="dict.sortedKeys">
@@ -889,7 +796,7 @@
 												</object>
 												<object class="NSTableColumn" id="82774056">
 													<string key="NSIdentifier">damage</string>
-													<double key="NSWidth">46</double>
+													<double key="NSWidth">149</double>
 													<double key="NSMinWidth">10</double>
 													<double key="NSMaxWidth">3.4028234663852886e+38</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -986,7 +893,7 @@
 											<int key="NSTableViewDraggingDestinationStyle">0</int>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {551, 342}}</string>
+									<string key="NSFrame">{{1, 17}, {551, 328}}</string>
 									<reference key="NSSuperview" ref="489307225"/>
 									<reference key="NSNextKeyView" ref="69625062"/>
 									<reference key="NSDocView" ref="69625062"/>
@@ -1007,7 +914,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 325}, {441, 15}}</string>
 									<reference key="NSSuperview" ref="489307225"/>
-									<bool key="NSEnabled">YES</bool>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="489307225"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1029,10 +935,10 @@
 								</object>
 								<reference ref="763389417"/>
 							</object>
-							<string key="NSFrame">{{-1, -1}, {553, 360}}</string>
+							<string key="NSFrame">{{-1, -1}, {553, 346}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
 							<reference key="NSNextKeyView" ref="626284851"/>
-							<int key="NSsFlags">690</int>
+							<int key="NSsFlags">562</int>
 							<reference key="NSVScroller" ref="623125528"/>
 							<reference key="NSHScroller" ref="802168654"/>
 							<reference key="NSContentView" ref="626284851"/>
@@ -1040,19 +946,19 @@
 							<reference key="NSCornerView" ref="763389417"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 						</object>
-						<object class="NSTextField" id="150312164">
+						<object class="NSTextField" id="574149520">
 							<reference key="NSNextResponder" ref="439893737"/>
 							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{186, 381}, {348, 14}}</string>
+							<string key="NSFrame">{{211, 392}, {332, 14}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="295511442">
+							<object class="NSTextFieldCell" key="NSCell" id="828498206">
 								<int key="NSCellFlags">68288064</int>
 								<int key="NSCellFlags2">71435264</int>
 								<string key="NSContents">Status</string>
 								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="150312164"/>
-								<object class="NSColor" key="NSBackgroundColor">
+								<reference key="NSControlView" ref="574149520"/>
+								<object class="NSColor" key="NSBackgroundColor" id="470684793">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">controlColor</string>
@@ -1061,6 +967,167 @@
 								<reference key="NSTextColor" ref="915322728"/>
 							</object>
 						</object>
+						<object class="NSTextField" id="395301483">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{53, 353}, {85, 19}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="52955396">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272761856</int>
+								<reference key="NSSupport" ref="26"/>
+								<object class="NSNumberFormatter" key="NSFormatter" id="1006689645">
+									<object class="NSMutableDictionary" key="NS.attributes">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSArray" key="dict.sortedKeys">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<string>allowsFloats</string>
+											<string>formatterBehavior</string>
+											<string>locale</string>
+											<string>negativeInfinitySymbol</string>
+											<string>nilSymbol</string>
+											<string>numberStyle</string>
+											<string>positiveInfinitySymbol</string>
+										</object>
+										<object class="NSMutableArray" key="dict.values">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<boolean value="YES"/>
+											<integer value="1040"/>
+											<reference ref="794904138"/>
+											<string>-∞</string>
+											<string/>
+											<integer value="1"/>
+											<string>+∞</string>
+										</object>
+									</object>
+									<string key="NS.positiveformat">#,##0.###</string>
+									<string key="NS.negativeformat">#,##0.###</string>
+									<nil key="NS.positiveattrs"/>
+									<nil key="NS.negativeattrs"/>
+									<nil key="NS.zero"/>
+									<object class="NSAttributedString" key="NS.nil">
+										<string key="NSString"/>
+									</object>
+									<object class="NSAttributedString" key="NS.nan">
+										<string key="NSString">NaN</string>
+										<reference key="NSAttributes" ref="329663068"/>
+									</object>
+									<reference key="NS.min" ref="674815117"/>
+									<reference key="NS.max" ref="674815117"/>
+									<object class="NSDecimalNumberHandler" key="NS.rounding">
+										<int key="NS.roundingmode">3</int>
+										<bool key="NS.raise.overflow">YES</bool>
+										<bool key="NS.raise.underflow">YES</bool>
+										<bool key="NS.raise.dividebyzero">YES</bool>
+									</object>
+									<string key="NS.decimal">.</string>
+									<string key="NS.thousand">,</string>
+									<bool key="NS.hasthousands">YES</bool>
+									<bool key="NS.localized">NO</bool>
+									<bool key="NS.allowsfloats">YES</bool>
+								</object>
+								<reference key="NSControlView" ref="395301483"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<object class="NSColor" key="NSBackgroundColor" id="61377669">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<reference key="NSColor" ref="665547368"/>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textColor</string>
+									<reference key="NSColor" ref="795034080"/>
+								</object>
+							</object>
+						</object>
+						<object class="NSTextField" id="924742053">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{8, 355}, {40, 14}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="421186712">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">71435264</int>
+								<string key="NSContents">Time:</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSControlView" ref="924742053"/>
+								<reference key="NSBackgroundColor" ref="470684793"/>
+								<reference key="NSTextColor" ref="915322728"/>
+							</object>
+						</object>
+						<object class="NSBox" id="263108995">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">12</int>
+							<string key="NSFrame">{{0, 378}, {551, 5}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<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="731765667"/>
+								<reference key="NSBackgroundColor" ref="61377669"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</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="NSSegmentedControl" id="626341130">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{11, 387}, {195, 25}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSSegmentedCell" key="NSCell" id="587756353">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<reference key="NSControlView" ref="626341130"/>
+								<object class="NSMutableArray" key="NSSegmentImages">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<object class="NSSegmentItem">
+										<string key="NSSegmentItemLabel">World 1</string>
+										<int key="NSSegmentItemTag">1</int>
+										<bool key="NSSegmentItemSelected">YES</bool>
+										<int key="NSSegmentItemImageScaling">0</int>
+									</object>
+									<object class="NSSegmentItem">
+										<string key="NSSegmentItemLabel">2</string>
+										<int key="NSSegmentItemTag">2</int>
+										<int key="NSSegmentItemImageScaling">0</int>
+									</object>
+									<object class="NSSegmentItem">
+										<string key="NSSegmentItemLabel">3</string>
+										<int key="NSSegmentItemTag">3</int>
+										<int key="NSSegmentItemImageScaling">0</int>
+									</object>
+									<object class="NSSegmentItem">
+										<string key="NSSegmentItemLabel">4</string>
+										<int key="NSSegmentItemTag">4</int>
+										<int key="NSSegmentItemImageScaling">0</int>
+									</object>
+									<object class="NSSegmentItem">
+										<string key="NSSegmentItemLabel">5</string>
+										<int key="NSSegmentItemTag">5</int>
+										<int key="NSSegmentItemImageScaling">0</int>
+									</object>
+								</object>
+								<int key="NSSegmentStyle">2</int>
+							</object>
+						</object>
 					</object>
 					<string key="NSFrameSize">{551, 419}</string>
 					<reference key="NSSuperview"/>
@@ -1321,22 +1388,6 @@
 					</object>
 					<int key="connectionID">580</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">worldPopup</string>
-						<reference key="source" ref="760161335"/>
-						<reference key="destination" ref="379067245"/>
-					</object>
-					<int key="connectionID">583</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">worldSelectionChanged:</string>
-						<reference key="source" ref="760161335"/>
-						<reference key="destination" ref="379067245"/>
-					</object>
-					<int key="connectionID">584</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">inventoryWindowController</string>
@@ -1349,10 +1400,50 @@
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">statusTextField</string>
 						<reference key="source" ref="760161335"/>
-						<reference key="destination" ref="150312164"/>
+						<reference key="destination" ref="574149520"/>
 					</object>
 					<int key="connectionID">593</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">worldSelectionControl</string>
+						<reference key="source" ref="760161335"/>
+						<reference key="destination" ref="626341130"/>
+					</object>
+					<int key="connectionID">603</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">worldSelectionChanged:</string>
+						<reference key="source" ref="760161335"/>
+						<reference key="destination" ref="626341130"/>
+					</object>
+					<int key="connectionID">604</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">initialFirstResponder</string>
+						<reference key="source" ref="972006081"/>
+						<reference key="destination" ref="69625062"/>
+					</object>
+					<int key="connectionID">605</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: worldTime</string>
+						<reference key="source" ref="395301483"/>
+						<reference key="destination" ref="760161335"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="395301483"/>
+							<reference key="NSDestination" ref="760161335"/>
+							<string key="NSLabel">value: worldTime</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">worldTime</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">607</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1720,8 +1811,11 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="489307225"/>
-							<reference ref="379067245"/>
-							<reference ref="150312164"/>
+							<reference ref="263108995"/>
+							<reference ref="924742053"/>
+							<reference ref="395301483"/>
+							<reference ref="574149520"/>
+							<reference ref="626341130"/>
 						</object>
 						<reference key="parent" ref="972006081"/>
 					</object>
@@ -1763,52 +1857,6 @@
 						<reference key="object" ref="760161335"/>
 						<reference key="parent" ref="0"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">536</int>
-						<reference key="object" ref="379067245"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="800758381"/>
-						</object>
-						<reference key="parent" ref="439893737"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">537</int>
-						<reference key="object" ref="800758381"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="887087914"/>
-						</object>
-						<reference key="parent" ref="379067245"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">538</int>
-						<reference key="object" ref="887087914"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="271797919"/>
-							<reference ref="815864939"/>
-							<reference ref="301692191"/>
-							<reference ref="373936608"/>
-							<reference ref="547351024"/>
-						</object>
-						<reference key="parent" ref="800758381"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">539</int>
-						<reference key="object" ref="271797919"/>
-						<reference key="parent" ref="887087914"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">540</int>
-						<reference key="object" ref="815864939"/>
-						<reference key="parent" ref="887087914"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">541</int>
-						<reference key="object" ref="301692191"/>
-						<reference key="parent" ref="887087914"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">565</int>
 						<reference key="object" ref="489307225"/>
@@ -1840,7 +1888,7 @@
 							<reference ref="231529269"/>
 							<reference ref="82774056"/>
 							<reference ref="212305399"/>
-							<reference ref="947898867"/>
+							<reference ref="194250517"/>
 						</object>
 						<reference key="parent" ref="489307225"/>
 					</object>
@@ -1923,52 +1971,98 @@
 						<reference key="object" ref="254754090"/>
 						<reference key="parent" ref="572080281"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">585</int>
-						<reference key="object" ref="373936608"/>
-						<reference key="parent" ref="887087914"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">586</int>
-						<reference key="object" ref="547351024"/>
-						<reference key="parent" ref="887087914"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">587</int>
-						<reference key="object" ref="947898867"/>
+						<reference key="object" ref="194250517"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="682529580"/>
+							<reference ref="79162137"/>
 						</object>
 						<reference key="parent" ref="69625062"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">588</int>
-						<reference key="object" ref="682529580"/>
+						<reference key="object" ref="79162137"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="457606247"/>
+							<reference ref="20991559"/>
 						</object>
-						<reference key="parent" ref="947898867"/>
+						<reference key="parent" ref="194250517"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">589</int>
-						<reference key="object" ref="457606247"/>
-						<reference key="parent" ref="682529580"/>
+						<reference key="object" ref="20991559"/>
+						<reference key="parent" ref="79162137"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">591</int>
-						<reference key="object" ref="150312164"/>
+						<reference key="object" ref="574149520"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="295511442"/>
+							<reference ref="828498206"/>
 						</object>
 						<reference key="parent" ref="439893737"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">592</int>
-						<reference key="object" ref="295511442"/>
-						<reference key="parent" ref="150312164"/>
+						<reference key="object" ref="828498206"/>
+						<reference key="parent" ref="574149520"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">594</int>
+						<reference key="object" ref="395301483"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="52955396"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">595</int>
+						<reference key="object" ref="52955396"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1006689645"/>
+						</object>
+						<reference key="parent" ref="395301483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">596</int>
+						<reference key="object" ref="1006689645"/>
+						<reference key="parent" ref="52955396"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">597</int>
+						<reference key="object" ref="924742053"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="421186712"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">598</int>
+						<reference key="object" ref="421186712"/>
+						<reference key="parent" ref="924742053"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">599</int>
+						<reference key="object" ref="263108995"/>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">600</int>
+						<reference key="object" ref="626341130"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="587756353"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">601</int>
+						<reference key="object" ref="587756353"/>
+						<reference key="parent" ref="626341130"/>
 					</object>
 				</object>
 			</object>
@@ -2070,14 +2164,6 @@
 					<string>5.IBPluginDependency</string>
 					<string>5.ImportedFromIB2</string>
 					<string>533.IBPluginDependency</string>
-					<string>536.IBPluginDependency</string>
-					<string>536.IBViewBoundsToFrameTransform</string>
-					<string>537.IBPluginDependency</string>
-					<string>538.IBEditorWindowLastContentRect</string>
-					<string>538.IBPluginDependency</string>
-					<string>539.IBPluginDependency</string>
-					<string>540.IBPluginDependency</string>
-					<string>541.IBPluginDependency</string>
 					<string>56.IBPluginDependency</string>
 					<string>56.ImportedFromIB2</string>
 					<string>565.IBPluginDependency</string>
@@ -2101,13 +2187,27 @@
 					<string>582.IBNumberFormatterBehaviorMetadataKey</string>
 					<string>582.IBNumberFormatterLocalizesFormatMetadataKey</string>
 					<string>582.IBPluginDependency</string>
-					<string>585.IBPluginDependency</string>
-					<string>586.IBPluginDependency</string>
 					<string>589.IBNumberFormatterBehaviorMetadataKey</string>
 					<string>589.IBNumberFormatterLocalizesFormatMetadataKey</string>
 					<string>589.IBPluginDependency</string>
 					<string>591.IBPluginDependency</string>
+					<string>591.IBViewBoundsToFrameTransform</string>
 					<string>592.IBPluginDependency</string>
+					<string>594.IBAttributePlaceholdersKey</string>
+					<string>594.IBPluginDependency</string>
+					<string>594.IBViewBoundsToFrameTransform</string>
+					<string>595.IBPluginDependency</string>
+					<string>596.IBNumberFormatterBehaviorMetadataKey</string>
+					<string>596.IBNumberFormatterLocalizesFormatMetadataKey</string>
+					<string>596.IBPluginDependency</string>
+					<string>597.IBPluginDependency</string>
+					<string>597.IBViewBoundsToFrameTransform</string>
+					<string>598.IBPluginDependency</string>
+					<string>599.IBPluginDependency</string>
+					<string>600.IBPluginDependency</string>
+					<string>600.IBViewBoundsToFrameTransform</string>
+					<string>601.IBPluginDependency</string>
+					<string>601.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
 					<string>74.IBPluginDependency</string>
 					<string>74.ImportedFromIB2</string>
 					<string>75.IBPluginDependency</string>
@@ -2207,9 +2307,9 @@
 					<string>{{475, 832}, {234, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{161, 134}, {551, 419}}</string>
+					<string>{{191, 193}, {551, 419}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{161, 134}, {551, 419}}</string>
+					<string>{{191, 193}, {551, 419}}</string>
 					<integer value="1"/>
 					<string>{{33, 99}, {480, 360}}</string>
 					<string>{3.40282e+38, 3.40282e+38}</string>
@@ -2222,16 +2322,6 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAw8oAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{167, 432}, {167, 103}}</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>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2254,14 +2344,43 @@
 					<integer value="1041"/>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<integer value="1041"/>
+					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDOgAAw8SAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="395301483"/>
+							<string key="toolTip">0-24,000.  0 is dawn, 12,000 is dusk.</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCPAAAw72AAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1041"/>
 					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAw60AAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDiYAAw82AAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<integer value="0"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
@@ -2295,7 +2414,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">593</int>
+			<int key="maxID">607</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2320,13 +2439,13 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>outlineView</string>
 							<string>statusTextField</string>
-							<string>worldPopup</string>
+							<string>worldSelectionControl</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSOutlineView</string>
 							<string>NSTextField</string>
-							<string>NSPopUpButton</string>
+							<string>NSSegmentedControl</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -2335,7 +2454,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>outlineView</string>
 							<string>statusTextField</string>
-							<string>worldPopup</string>
+							<string>worldSelectionControl</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2348,8 +2467,8 @@
 								<string key="candidateClassName">NSTextField</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">worldPopup</string>
-								<string key="candidateClassName">NSPopUpButton</string>
+								<string key="name">worldSelectionControl</string>
+								<string key="candidateClassName">NSSegmentedControl</string>
 							</object>
 						</object>
 					</object>
@@ -2431,6 +2550,14 @@
 						<string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSBox</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSBox.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSBrowser</string>
 					<string key="superclassName">NSControl</string>
@@ -2439,22 +2566,6 @@
 						<string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSButton</string>
-					<string key="superclassName">NSControl</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSButtonCell</string>
-					<string key="superclassName">NSActionCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSCell</string>
 					<string key="superclassName">NSObject</string>
@@ -2586,14 +2697,6 @@
 						<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSMenuItemCell</string>
-					<string key="superclassName">NSButtonCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSMovieView</string>
 					<string key="superclassName">NSView</string>
@@ -2856,22 +2959,6 @@
 					<string key="superclassName">NSTableView</string>
 					<reference key="sourceIdentifier" ref="741829912"/>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSPopUpButton</string>
-					<string key="superclassName">NSButton</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSPopUpButtonCell</string>
-					<string key="superclassName">NSMenuItemCell</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSResponder</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2903,6 +2990,22 @@
 						<string key="minorKey">AppKit.framework/Headers/NSScroller.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSSegmentedCell</string>
+					<string key="superclassName">NSActionCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSSegmentedCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSSegmentedControl</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSSegmentedControl.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSTableColumn</string>
 					<string key="superclassName">NSObject</string>
diff --git a/IJInventoryWindowController.h b/IJInventoryWindowController.h
index 7c169fc..a8760ea 100644
--- a/IJInventoryWindowController.h
+++ b/IJInventoryWindowController.h
@@ -15,7 +15,7 @@
 	NSArray *inventory;
 	
 	NSOutlineView *outlineView;
-	NSPopUpButton *worldPopup;
+	NSSegmentedControl *worldSelectionControl;
 	NSTextField *statusTextField;
 	
 	NSArray *rootItems;
@@ -28,9 +28,11 @@
 }
 
 @property (nonatomic, assign) IBOutlet NSOutlineView *outlineView;
-@property (nonatomic, assign) IBOutlet NSPopUpButton *worldPopup;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *worldSelectionControl;
 @property (nonatomic, assign) IBOutlet NSTextField *statusTextField;
 
+@property (nonatomic, retain) NSNumber *worldTime;
+
 - (IBAction)worldSelectionChanged:(id)sender;
 
 @end
diff --git a/IJInventoryWindowController.m b/IJInventoryWindowController.m
index 7bd3eda..8efbe25 100644
--- a/IJInventoryWindowController.m
+++ b/IJInventoryWindowController.m
@@ -14,7 +14,7 @@
 @implementation IJInventoryWindowController
 
 @synthesize outlineView;
-@synthesize worldPopup;
+@synthesize worldSelectionControl;
 @synthesize statusTextField;
 
 - (void)awakeFromNib
@@ -62,10 +62,14 @@
 		return;
 	}
 	
+	[self willChangeValueForKey:@"worldTime"];
+	
 	[level release];
 	level = [[IJMinecraftLevel nbtContainerWithData:fileData] retain];
 	inventory = [[level inventory] retain];
 	
+	[self didChangeValueForKey:@"worldTime"];
+	
 	// Add placeholder inventory items:
 	
 	for (int i = 0; i < IJInventorySlotQuickLast + 1 - IJInventorySlotQuickFirst; i++)
@@ -157,13 +161,13 @@
 
 - (IBAction)worldSelectionChanged:(id)sender
 {
-	int worldIndex = [[worldPopup selectedItem] tag];
+	int worldIndex = [worldSelectionControl selectedSegment] + 1;
 	[self loadWorldAtIndex:worldIndex];
 }
 
 - (void)saveDocument:(id)sender
 {
-	int worldIndex = [[worldPopup selectedItem] tag];
+	int worldIndex = [worldSelectionControl selectedSegment] + 1;
 	[self saveToWorldAtIndex:worldIndex];
 }
 
@@ -186,6 +190,18 @@
 	return YES;
 }
 
+- (NSNumber *)worldTime
+{
+	return 	[level worldTimeContainer].numberValue;
+}
+- (void)setWorldTime:(NSNumber *)number
+{
+	[self willChangeValueForKey:@"worldTime"];
+	[level worldTimeContainer].numberValue = number;
+	[self didChangeValueForKey:@"worldTime"];
+	[self markDirty];
+}
+
 #pragma mark -
 #pragma mark Inventory Outline View
 
diff --git a/IJItemPickerWindowController.h b/IJItemPickerWindowController.h
index 99000a2..5e2a7a8 100644
--- a/IJItemPickerWindowController.h
+++ b/IJItemPickerWindowController.h
@@ -11,11 +11,13 @@
 
 @interface IJItemPickerWindowController : NSWindowController {
 	void(^completionBlock)(uint16_t itemId);
+	NSSearchField *searchField;
 	NSTableView *tableView;
 	NSArray *allItemIds;
 	NSArray *filteredItemIds;
 }
 @property (nonatomic, assign) IBOutlet NSTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSSearchField *searchField;
 
 + (IJItemPickerWindowController *)sharedController;
 
diff --git a/IJItemPickerWindowController.m b/IJItemPickerWindowController.m
index 7b46835..cae1c52 100644
--- a/IJItemPickerWindowController.m
+++ b/IJItemPickerWindowController.m
@@ -11,7 +11,7 @@
 
 @implementation IJItemPickerWindowController
 
-@synthesize tableView;
+@synthesize tableView, searchField;
 
 + (IJItemPickerWindowController *)sharedController
 {
@@ -38,6 +38,8 @@
 {
 	[self showWindow:nil];
 	
+	[searchField becomeFirstResponder];
+	
 	[completionBlock autorelease];
 	completionBlock = [theBlock copy];
 	
diff --git a/IJMinecraftLevel.h b/IJMinecraftLevel.h
index 7e4e2d4..9ff66a4 100644
--- a/IJMinecraftLevel.h
+++ b/IJMinecraftLevel.h
@@ -14,6 +14,7 @@
 }
 
 @property (nonatomic, copy) NSArray *inventory; // Array of IJInventoryItem objects.
+@property (nonatomic, readonly) NBTContainer *worldTimeContainer;
 
 + (NSString *)pathForWorldAtIndex:(int)worldIndex;
 + (NSString *)pathForLevelDatAtIndex:(int)worldIndex;
diff --git a/IJMinecraftLevel.m b/IJMinecraftLevel.m
index 1ae8cf6..d2a310a 100644
--- a/IJMinecraftLevel.m
+++ b/IJMinecraftLevel.m
@@ -69,6 +69,11 @@
 	inventoryList.children = newChildren;
 }
 
+- (NBTContainer *)worldTimeContainer
+{
+	return [[self childNamed:@"Data"] childNamed:@"Time"];
+}
+
 #pragma mark -
 #pragma mark Helpers
 
diff --git a/ItemPicker.xib b/ItemPicker.xib
index da878cb..fa21856 100644
--- a/ItemPicker.xib
+++ b/ItemPicker.xib
@@ -175,7 +175,7 @@
 															<int key="NSColorSpace">3</int>
 															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
 														</object>
-														<object class="NSColor" key="NSTextColor" id="65060026">
+														<object class="NSColor" key="NSTextColor" id="261073037">
 															<int key="NSColorSpace">6</int>
 															<string key="NSCatalogName">System</string>
 															<string key="NSColorName">headerTextColor</string>
@@ -203,7 +203,7 @@
 													<bool key="NSIsResizeable">YES</bool>
 													<reference key="NSTableView" ref="69945491"/>
 												</object>
-												<object class="NSTableColumn" id="155586349">
+												<object class="NSTableColumn" id="158143353">
 													<string key="NSIdentifier">name</string>
 													<double key="NSWidth">191</double>
 													<double key="NSMinWidth">10</double>
@@ -219,9 +219,9 @@
 															<string key="NSColorName">headerColor</string>
 															<reference key="NSColor" ref="837009434"/>
 														</object>
-														<reference key="NSTextColor" ref="65060026"/>
+														<reference key="NSTextColor" ref="261073037"/>
 													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="53396406">
+													<object class="NSTextFieldCell" key="NSDataCell" id="529701029">
 														<int key="NSCellFlags">337772096</int>
 														<int key="NSCellFlags2">2048</int>
 														<string key="NSContents">Text Cell</string>
@@ -378,6 +378,14 @@
 					</object>
 					<int key="connectionID">24</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">searchField</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="801226773"/>
+					</object>
+					<int key="connectionID">28</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -466,7 +474,7 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="457520173"/>
-							<reference ref="155586349"/>
+							<reference ref="158143353"/>
 						</object>
 						<reference key="parent" ref="1009868452"/>
 					</object>
@@ -486,17 +494,17 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">26</int>
-						<reference key="object" ref="155586349"/>
+						<reference key="object" ref="158143353"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="53396406"/>
+							<reference ref="529701029"/>
 						</object>
 						<reference key="parent" ref="69945491"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">27</int>
-						<reference key="object" ref="53396406"/>
-						<reference key="parent" ref="155586349"/>
+						<reference key="object" ref="529701029"/>
+						<reference key="parent" ref="158143353"/>
 					</object>
 				</object>
 			</object>
@@ -551,7 +559,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">27</int>
+			<int key="maxID">28</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -592,14 +600,35 @@
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">tableView</string>
-						<string key="NS.object.0">NSTableView</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>searchField</string>
+							<string>tableView</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSSearchField</string>
+							<string>NSTableView</string>
+						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">tableView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">NSTableView</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>searchField</string>
+							<string>tableView</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">searchField</string>
+								<string key="candidateClassName">NSSearchField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">tableView</string>
+								<string key="candidateClassName">NSTableView</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">