diff --git a/jmc.xcodeproj/project.pbxproj b/jmc.xcodeproj/project.pbxproj
index 6c3c69f..ad072ec 100644
--- a/jmc.xcodeproj/project.pbxproj
+++ b/jmc.xcodeproj/project.pbxproj
@@ -121,6 +121,7 @@
 		0DC7127C1E2F115A0054ECE6 /* ImportErrorWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DC7127A1E2F115A0054ECE6 /* ImportErrorWindowController.swift */; };
 		0DC7127D1E2F115A0054ECE6 /* ImportErrorWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0DC7127B1E2F115A0054ECE6 /* ImportErrorWindowController.xib */; };
 		0DCF1D1C1F1D113600240202 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0DCF1D191F1D10DC00240202 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		0DCF1D251F1D3C6300240202 /* AirPlayDeviceHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DCF1D241F1D3C6300240202 /* AirPlayDeviceHandler.swift */; };
 		0DD0DAE61E53A8EE00807CAC /* flac.rb in Resources */ = {isa = PBXBuildFile; fileRef = 0DD0DAA31E53A8EE00807CAC /* flac.rb */; };
 		0DD0DAE71E53A8EE00807CAC /* AUTHORS in Resources */ = {isa = PBXBuildFile; fileRef = 0DD0DAA41E53A8EE00807CAC /* AUTHORS */; };
 		0DD0DAE81E53A8EE00807CAC /* flac in Resources */ = {isa = PBXBuildFile; fileRef = 0DD0DAA61E53A8EE00807CAC /* flac */; };
@@ -352,6 +353,7 @@
 		0DC7127A1E2F115A0054ECE6 /* ImportErrorWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ImportErrorWindowController.swift; path = "Other Windows/ImportErrorWindowController.swift"; sourceTree = "<group>"; };
 		0DC7127B1E2F115A0054ECE6 /* ImportErrorWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ImportErrorWindowController.xib; path = "Other Windows/ImportErrorWindowController.xib"; sourceTree = "<group>"; };
 		0DCF1D191F1D10DC00240202 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = "../../Downloads/Sparkle-1.18.0/Sparkle.framework"; sourceTree = "<group>"; };
+		0DCF1D241F1D3C6300240202 /* AirPlayDeviceHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AirPlayDeviceHandler.swift; sourceTree = "<group>"; };
 		0DD0DAA31E53A8EE00807CAC /* flac.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = flac.rb; sourceTree = "<group>"; };
 		0DD0DAA41E53A8EE00807CAC /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AUTHORS; sourceTree = "<group>"; };
 		0DD0DAA61E53A8EE00807CAC /* flac */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = flac; sourceTree = "<group>"; };
@@ -631,6 +633,7 @@
 			children = (
 				0DD0DB0D1E54425800807CAC /* FlacDecoder.swift */,
 				0D1BDFA41D0F44A70092FBA0 /* AudioModule.swift */,
+				0DCF1D241F1D3C6300240202 /* AirPlayDeviceHandler.swift */,
 				0D606EF51E7B4C21007AE152 /* FileBufferer.swift */,
 				0D606EF81E7B4DB0007AE152 /* AVAudioFileBufferer.swift */,
 			);
@@ -1299,6 +1302,7 @@
 				0DE486831EA579FD009B226B /* AddWatchFolderSheetController.swift in Sources */,
 				0D76F69B1D24622F00C6E70F /* TagEditorWindow.swift in Sources */,
 				0D1BDFA51D0F44A70092FBA0 /* AudioModule.swift in Sources */,
+				0DCF1D251F1D3C6300240202 /* AirPlayDeviceHandler.swift in Sources */,
 				0DE957D81EEC5465008CBECF /* OrganizationTemplateBundle+CoreDataProperties.swift in Sources */,
 				0D8AFE581E6D136D004AC584 /* MediaScannerSheet.swift in Sources */,
 				0D592A4D1EDF6C8B0054D553 /* TrackView+CoreDataClass.swift in Sources */,
diff --git a/jmc.xcodeproj/project.xcworkspace/xcuserdata/johnmoody.xcuserdatad/UserInterfaceState.xcuserstate b/jmc.xcodeproj/project.xcworkspace/xcuserdata/johnmoody.xcuserdatad/UserInterfaceState.xcuserstate
index e0a6e57..31c8aa7 100644
Binary files a/jmc.xcodeproj/project.xcworkspace/xcuserdata/johnmoody.xcuserdatad/UserInterfaceState.xcuserstate and b/jmc.xcodeproj/project.xcworkspace/xcuserdata/johnmoody.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/jmc.xcodeproj/xcuserdata/johnmoody.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/jmc.xcodeproj/xcuserdata/johnmoody.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 5cc653e..28b8d41 100644
--- a/jmc.xcodeproj/xcuserdata/johnmoody.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/jmc.xcodeproj/xcuserdata/johnmoody.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -84,11 +84,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "jmc/Delegate:Main Window Controller/MainWindowController.swift"
-            timestampString = "521667626.788035"
+            timestampString = "522006893.470967"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "328"
-            endingLineNumber = "328"
+            startingLineNumber = "332"
+            endingLineNumber = "332"
             landmarkName = "tempBreak(_:)"
             landmarkType = "7">
          </BreakpointContent>
diff --git a/jmc/AirPlayDeviceHandler.swift b/jmc/AirPlayDeviceHandler.swift
new file mode 100644
index 0000000..8556891
--- /dev/null
+++ b/jmc/AirPlayDeviceHandler.swift
@@ -0,0 +1,71 @@
+//
+//  AirPlayDeviceHandler.swift
+//  jmc
+//
+//  Created by John Moody on 7/17/17.
+//  Copyright © 2017 John Moody. All rights reserved.
+//
+
+import Cocoa
+import CoreAudio
+import CoreFoundation
+
+class AirPlayDestination: NSObject {
+    
+    var name: String
+    var id: UInt32
+
+    init(id: UInt32, airPlayDevice: UInt32) {
+        self.id = id
+        var sourceID: UInt32 = 0
+        var nameAddr = AudioObjectPropertyAddress(mSelector: kAudioDevicePropertyDataSourceNameForIDCFString, mScope: kAudioObjectPropertyScopeOutput, mElement: kAudioObjectPropertyElementMaster)
+        var value: CFString = "" as CFString
+        var audioValueTranslation = AudioValueTranslation(mInputData: &sourceID, mInputDataSize: UInt32(MemoryLayout<UInt32>.size), mOutputData: &value, mOutputDataSize: UInt32(MemoryLayout<CFString>.size))
+        var propsize = UInt32(MemoryLayout<AudioValueTranslation>.size)
+        AudioObjectGetPropertyData(airPlayDevice, &nameAddr, 0, nil, &propsize, &audioValueTranslation)
+        self.name = value as String
+    }
+    
+}
+
+class AirPlayDeviceHandler: NSObject {
+    
+    var outputs = [AirPlayDestination]()
+    var device: UInt32 = 0
+    
+    
+    override init() {
+        var addr = AudioObjectPropertyAddress(mSelector: kAudioHardwarePropertyDevices, mScope: kAudioObjectPropertyScopeWildcard, mElement: kAudioObjectPropertyElementWildcard)
+        var propsize: UInt32 = 0
+        AudioObjectGetPropertyDataSize(AudioObjectID(kAudioObjectSystemObject), &addr, 0, nil, &propsize)
+        var deviceIDs = [UInt32](repeating: 0, count: Int(propsize))
+        AudioObjectGetPropertyData(AudioObjectID(kAudioObjectSystemObject), &addr, 0, nil, &propsize, &deviceIDs)
+        
+        var transportTypeAddr = AudioObjectPropertyAddress(mSelector: kAudioDevicePropertyTransportType, mScope: kAudioObjectPropertyScopeGlobal, mElement: kAudioObjectPropertyElementMaster)
+        var transportType: UInt32 = 0
+        
+        for device in deviceIDs {
+            AudioObjectGetPropertyData(device, &transportTypeAddr, 0, nil, &propsize, &transportType)
+            print(transportType)
+            if transportType == kAudioDeviceTransportTypeAirPlay {
+                self.device = device
+                print("found device")
+            }
+        }
+        super.init()
+        self.getAirPlayOutputs()
+        print(outputs)
+    }
+    
+    func getAirPlayOutputs() {
+        var addr = AudioObjectPropertyAddress(mSelector: kAudioDevicePropertyDataSources, mScope: kAudioDevicePropertyScopeOutput, mElement: kAudioObjectPropertyElementWildcard)
+        var propsize: UInt32 = 0
+        AudioObjectGetPropertyDataSize(self.device, &addr, 0, nil, &propsize)
+        var sourceIDs = [UInt32](repeating: 0, count: Int(propsize))
+        AudioObjectGetPropertyData(self.device, &addr, 0, nil, &propsize, &sourceIDs)
+        for source in sourceIDs {
+            outputs.append(AirPlayDestination(id: source, airPlayDevice: self.device))
+        }
+    }
+
+}
diff --git a/jmc/Assets.xcassets/AirPlay.imageset/AirPlayAudioIcon.png b/jmc/Assets.xcassets/AirPlay.imageset/AirPlayAudioIcon.png
new file mode 100644
index 0000000..e64d0b3
Binary files /dev/null and b/jmc/Assets.xcassets/AirPlay.imageset/AirPlayAudioIcon.png differ
diff --git a/jmc/Assets.xcassets/AirPlay.imageset/Contents.json b/jmc/Assets.xcassets/AirPlay.imageset/Contents.json
new file mode 100644
index 0000000..08252fb
--- /dev/null
+++ b/jmc/Assets.xcassets/AirPlay.imageset/Contents.json
@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "AirPlayAudioIcon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/jmc/Backend/Audio/AudioModule.swift b/jmc/Backend/Audio/AudioModule.swift
index 148581a..1b64e23 100644
--- a/jmc/Backend/Audio/AudioModule.swift
+++ b/jmc/Backend/Audio/AudioModule.swift
@@ -63,6 +63,7 @@ class AudioModule: NSObject {
     var fileManager = FileManager.default
     var upcomingTrackURL: URL?
     var endOfCurrentTrackFrame: AVAudioFramePosition?
+    var airplayDeviceHandler: AirPlayDeviceHandler
     
     let verbotenFileTypes = ["m4v", "m4p"]
     
@@ -156,6 +157,7 @@ class AudioModule: NSObject {
     }
     
     override init() {
+        self.airplayDeviceHandler = AirPlayDeviceHandler()
         super.init()
         addListenerBlock(audioObjectPropertyListenerBlock,
                          onAudioObjectID: AudioObjectID(bitPattern: kAudioObjectSystemObject),
diff --git a/jmc/Delegate:Main Window Controller/AppDelegate.swift b/jmc/Delegate:Main Window Controller/AppDelegate.swift
index 888498f..0847c1d 100644
--- a/jmc/Delegate:Main Window Controller/AppDelegate.swift	
+++ b/jmc/Delegate:Main Window Controller/AppDelegate.swift	
@@ -37,7 +37,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         mainWindowController!.jumpToCurrentSong()
     }
     @IBAction func jumpToSelection(_ sender: Any) {
-        mainWindowController.jumpToSelection()
+        mainWindowController?.jumpToSelection()
     }
     @IBAction func toggleAlbumArt(_ sender: Any) {
         mainWindowController?.toggleArtwork(self)
diff --git a/jmc/Delegate:Main Window Controller/MainWindowController.swift b/jmc/Delegate:Main Window Controller/MainWindowController.swift
index 6329c0d..bbce073 100644
--- a/jmc/Delegate:Main Window Controller/MainWindowController.swift	
+++ b/jmc/Delegate:Main Window Controller/MainWindowController.swift	
@@ -355,14 +355,19 @@ class MainWindowController: NSWindowController, NSSearchFieldDelegate, NSWindowD
     func initAlbumArtwork(for track: Track) {
         albumArtViewController?.initAlbumArt(track)
     }
+    @IBAction func airPlayPressed(_ sender: Any) {
+        
+    }
     
     @IBAction func toggleArtwork(_ sender: AnyObject) {
-        if artToggle.state == NSOnState {
-            UserDefaults.standard.set(true, forKey: DEFAULTS_SHOWS_ARTWORK_STRING)
-            self.artworkTargetView.isHidden = false
-        } else {
+        if self.artworkTargetView.isHidden == false {
+            artToggle.state = NSOffState
             UserDefaults.standard.set(false, forKey: DEFAULTS_SHOWS_ARTWORK_STRING)
             self.artworkTargetView.isHidden = true
+        } else {
+            artToggle.state = NSOnState
+            UserDefaults.standard.set(true, forKey: DEFAULTS_SHOWS_ARTWORK_STRING)
+            self.artworkTargetView.isHidden = false
         }
     }
 
diff --git a/jmc/Delegate:Main Window Controller/MainWindowController.xib b/jmc/Delegate:Main Window Controller/MainWindowController.xib
index 2ba7e6a..327c5e2 100644
--- a/jmc/Delegate:Main Window Controller/MainWindowController.xib	
+++ b/jmc/Delegate:Main Window Controller/MainWindowController.xib	
@@ -462,11 +462,25 @@
                             <outlet property="menu" destination="WAr-lr-0sM" id="tZk-Ww-b2z"/>
                         </connections>
                     </segmentedControl>
+                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3zk-MK-Txl">
+                        <rect key="frame" x="332" y="4" width="44" height="25"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="44" id="o3L-oL-E1Z"/>
+                        </constraints>
+                        <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="AirPlay" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Li0-sK-BT1">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="airPlayPressed:" target="-2" id="usU-lb-Air"/>
+                        </connections>
+                    </button>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="0eg-hu-JdK" secondAttribute="bottom" constant="6" id="1mf-qn-i1B"/>
                     <constraint firstItem="qNB-cP-szA" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="20" id="3Zf-1k-4fz"/>
                     <constraint firstItem="rfk-1e-A3X" firstAttribute="leading" secondItem="aLT-7j-MYS" secondAttribute="trailing" constant="8" id="8hA-tp-cFE"/>
+                    <constraint firstItem="3zk-MK-Txl" firstAttribute="leading" secondItem="mb6-nw-TjG" secondAttribute="trailing" constant="8" id="8uV-bl-nRX"/>
                     <constraint firstItem="wUv-cJ-CeL" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="3" id="9dD-af-Zpw"/>
                     <constraint firstItem="r3P-eO-TmU" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="60" id="FWU-KC-1lo"/>
                     <constraint firstItem="wUv-cJ-CeL" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="75" id="Gt8-ei-BxH"/>
@@ -487,6 +501,7 @@
                     <constraint firstAttribute="bottom" secondItem="mb6-nw-TjG" secondAttribute="bottom" constant="6" id="lba-F2-zcv"/>
                     <constraint firstItem="FOU-Bi-82q" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="mfK-fT-Eft"/>
                     <constraint firstAttribute="bottom" secondItem="aLT-7j-MYS" secondAttribute="bottom" constant="6" id="o6B-h3-TeK"/>
+                    <constraint firstAttribute="bottom" secondItem="3zk-MK-Txl" secondAttribute="bottom" constant="6" id="r5Z-q9-Dl3"/>
                     <constraint firstItem="aLT-7j-MYS" firstAttribute="leading" secondItem="eg4-23-xqc" secondAttribute="trailing" constant="8" id="tVc-S0-2bd"/>
                     <constraint firstAttribute="bottom" secondItem="r3P-eO-TmU" secondAttribute="bottom" constant="36" id="vhg-0d-8Gk"/>
                     <constraint firstAttribute="bottom" secondItem="gzN-xP-Utz" secondAttribute="bottom" constant="6" id="wBw-oE-Tlu"/>
@@ -521,6 +536,7 @@
         </menu>
     </objects>
     <resources>
+        <image name="AirPlay" width="18" height="16"/>
         <image name="NSAddTemplate" width="11" height="11"/>
         <image name="NSFlowViewTemplate" width="18" height="10"/>
         <image name="NSPlayTemplate" width="25" height="23"/>
diff --git a/jmc/Other Windows/Library Manager/LibraryManagerViewController.xib b/jmc/Other Windows/Library Manager/LibraryManagerViewController.xib
index b0afb64..4486e3e 100644
--- a/jmc/Other Windows/Library Manager/LibraryManagerViewController.xib	
+++ b/jmc/Other Windows/Library Manager/LibraryManagerViewController.xib	
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12118"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -13,18 +13,14 @@
                 <outlet property="changeLocationButton" destination="lG3-Fq-qhm" id="t3s-jL-z3l"/>
                 <outlet property="consolidateLibraryButton" destination="EYr-io-jRU" id="jHX-eY-bnr"/>
                 <outlet property="copyRadio" destination="Tc9-NX-a0t" id="NMY-FK-GRH"/>
-                <outlet property="dirScanStatusTextField" destination="cne-IQ-5GZ" id="Nn5-pd-VE9"/>
-                <outlet property="directoryPicker" destination="h7C-Tq-WtP" id="z5P-NQ-9SO"/>
                 <outlet property="doesOrganizeCheck" destination="P7g-tb-aOA" id="zIk-xC-C43"/>
                 <outlet property="enableDirectoryMonitoringCheck" destination="z11-19-8Af" id="JlC-vW-qYj"/>
                 <outlet property="fileMonitorDescriptionLabel" destination="AV9-ZF-cTG" id="r2C-nT-uij"/>
-                <outlet property="findNewMediaTabItem" destination="jUU-OL-6Zu" id="Vc1-CP-sQs"/>
                 <outlet property="libraryLocationStatusImageView" destination="I1c-gk-V84" id="tdd-Wx-rBo"/>
                 <outlet property="locationManagerTabItem" destination="07U-Hu-8Mt" id="c5I-7h-6gl"/>
                 <outlet property="locationManagerView" destination="evG-r5-drw" id="NaP-YH-QGw"/>
                 <outlet property="mediaAddBehaviorLabel" destination="6vp-tQ-c95" id="mGd-pp-IOL"/>
                 <outlet property="moveRadio" destination="mkl-Ic-VxO" id="81B-p3-Pwj"/>
-                <outlet property="newMediaTableView" destination="cjf-jD-81c" id="gzd-4k-bmf"/>
                 <outlet property="newTracksArrayController" destination="4Ry-w4-cNJ" id="Sfb-4f-ipr"/>
                 <outlet property="removeWatchFolderButton" destination="YxN-YA-YBq" id="4bH-fr-8W2"/>
                 <outlet property="sourceLocationField" destination="n1T-9X-h7D" id="k7O-we-ha8"/>
@@ -476,177 +472,6 @@ Gw
                                 </constraints>
                             </view>
                         </tabViewItem>
-                        <tabViewItem label="Find New Media" identifier="" id="jUU-OL-6Zu">
-                            <view key="view" id="Iby-Ob-Ox0">
-                                <rect key="frame" x="10" y="33" width="846" height="538"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iyZ-i1-ZRh">
-                                        <rect key="frame" x="689" y="10" width="146" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="134" id="xbi-kZ-qxa"/>
-                                        </constraints>
-                                        <buttonCell key="cell" type="push" title="Import Selected" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XGB-Ri-Y9z">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="importSelectedPressed:" target="-2" id="qfv-F9-uWT"/>
-                                        </connections>
-                                    </button>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lXX-sj-vAB">
-                                        <rect key="frame" x="11" y="465" width="229" height="32"/>
-                                        <buttonCell key="cell" type="push" title="Scan directory for new media..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9xv-oB-ATj">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="scanSourceButtonPressed:" target="-2" id="K01-c4-6PL"/>
-                                        </connections>
-                                    </button>
-                                    <scrollView autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C9o-81-nmE">
-                                        <rect key="frame" x="17" y="49" width="812" height="412"/>
-                                        <clipView key="contentView" id="2gV-b4-O0o">
-                                            <rect key="frame" x="1" y="0.0" width="810" height="411"/>
-                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                            <subviews>
-                                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="20" rowSizeStyle="automatic" headerView="aIU-i4-nDg" viewBased="YES" id="cjf-jD-81c">
-                                                    <rect key="frame" x="0.0" y="0.0" width="810" height="388"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <size key="intercellSpacing" width="3" height="2"/>
-                                                    <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
-                                                    <tableColumns>
-                                                        <tableColumn width="807" minWidth="40" maxWidth="5000" id="nEx-5x-8dN">
-                                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="URL">
-                                                                <font key="font" metaFont="smallSystem"/>
-                                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
-                                                            </tableHeaderCell>
-                                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="pfg-Ug-EQm">
-                                                                <font key="font" metaFont="system"/>
-                                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                            </textFieldCell>
-                                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
-                                                            <prototypeCellViews>
-                                                                <tableCellView id="mRk-9H-PLS">
-                                                                    <rect key="frame" x="1" y="1" width="807" height="20"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                                    <subviews>
-                                                                        <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VXc-uu-hFS">
-                                                                            <rect key="frame" x="7" y="0.0" width="793" height="20"/>
-                                                                            <pathCell key="cell" controlSize="small" selectable="YES" editable="YES" alignment="left" id="e2G-2X-1WP">
-                                                                                <font key="font" metaFont="smallSystem"/>
-                                                                                <url key="url" string="file:///Applications/"/>
-                                                                            </pathCell>
-                                                                        </pathControl>
-                                                                    </subviews>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="trailing" secondItem="VXc-uu-hFS" secondAttribute="trailing" constant="7" id="6xU-U3-wnH"/>
-                                                                        <constraint firstItem="VXc-uu-hFS" firstAttribute="leading" secondItem="mRk-9H-PLS" secondAttribute="leading" constant="7" id="Wl7-Ge-noB"/>
-                                                                        <constraint firstItem="VXc-uu-hFS" firstAttribute="top" secondItem="mRk-9H-PLS" secondAttribute="top" id="XlM-wb-Qmq"/>
-                                                                        <constraint firstAttribute="bottom" secondItem="VXc-uu-hFS" secondAttribute="bottom" id="mfP-kG-Edd"/>
-                                                                    </constraints>
-                                                                </tableCellView>
-                                                            </prototypeCellViews>
-                                                            <connections>
-                                                                <binding destination="4Ry-w4-cNJ" name="value" keyPath="arrangedObjects.url.path" id="6P5-bp-XHu"/>
-                                                            </connections>
-                                                        </tableColumn>
-                                                    </tableColumns>
-                                                    <connections>
-                                                        <binding destination="4Ry-w4-cNJ" name="content" keyPath="arrangedObjects" id="a1J-Sh-sdW"/>
-                                                    </connections>
-                                                </tableView>
-                                            </subviews>
-                                        </clipView>
-                                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="uJ6-tN-5qq">
-                                            <rect key="frame" x="1" y="7" width="0.0" height="16"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                        </scroller>
-                                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="iv5-ri-MYB">
-                                            <rect key="frame" x="224" y="17" width="15" height="102"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                        </scroller>
-                                        <tableHeaderView key="headerView" id="aIU-i4-nDg">
-                                            <rect key="frame" x="0.0" y="0.0" width="810" height="23"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                        </tableHeaderView>
-                                    </scrollView>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ePb-Ja-zph">
-                                        <rect key="frame" x="543" y="10" width="146" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="134" id="jFj-Q4-Htc"/>
-                                        </constraints>
-                                        <buttonCell key="cell" type="push" title="Select All" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6XW-UM-g5h">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="selectAllPressed:" target="-2" id="h2H-wv-QdN"/>
-                                        </connections>
-                                    </button>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cne-IQ-5GZ">
-                                        <rect key="frame" x="15" y="504" width="112" height="17"/>
-                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Directory to scan:" id="jQU-Q5-mFi">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hK1-VF-LRe">
-                                        <rect key="frame" x="397" y="10" width="146" height="32"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="134" id="ouu-QB-6FW"/>
-                                        </constraints>
-                                        <buttonCell key="cell" type="push" title="Select None" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="fNr-My-gxw">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="selectNonePressed:" target="-2" id="Nga-Wv-xz3"/>
-                                        </connections>
-                                    </button>
-                                    <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="h7C-Tq-WtP">
-                                        <rect key="frame" x="131" y="498" width="701" height="26"/>
-                                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Dgk-W2-Z1z" id="T5H-en-1I9">
-                                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="menu"/>
-                                            <menu key="menu" id="FCw-mH-mYz">
-                                                <items>
-                                                    <menuItem title="Item 1" state="on" id="Dgk-W2-Z1z"/>
-                                                    <menuItem title="Item 2" id="EMY-IQ-6iJ"/>
-                                                    <menuItem title="Item 3" id="nrr-z9-WNj"/>
-                                                </items>
-                                            </menu>
-                                            <connections>
-                                                <binding destination="JS5-8t-VeM" name="content" keyPath="arrangedObjects.path" id="GjY-JO-VFH"/>
-                                            </connections>
-                                        </popUpButtonCell>
-                                    </popUpButton>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="iyZ-i1-ZRh" firstAttribute="leading" secondItem="ePb-Ja-zph" secondAttribute="trailing" constant="12" id="2yi-JE-hqO"/>
-                                    <constraint firstAttribute="trailing" secondItem="iyZ-i1-ZRh" secondAttribute="trailing" constant="17" id="BQx-IW-Ln4"/>
-                                    <constraint firstItem="cne-IQ-5GZ" firstAttribute="top" secondItem="Iby-Ob-Ox0" secondAttribute="top" constant="17" id="C0v-Ff-VDb"/>
-                                    <constraint firstAttribute="bottom" secondItem="ePb-Ja-zph" secondAttribute="bottom" constant="17" id="Gqm-GM-XTo"/>
-                                    <constraint firstItem="hK1-VF-LRe" firstAttribute="top" secondItem="C9o-81-nmE" secondAttribute="bottom" constant="11" id="HwE-d5-CfS"/>
-                                    <constraint firstItem="lXX-sj-vAB" firstAttribute="leading" secondItem="Iby-Ob-Ox0" secondAttribute="leading" constant="17" id="Puc-8X-bRc"/>
-                                    <constraint firstAttribute="bottom" secondItem="iyZ-i1-ZRh" secondAttribute="bottom" constant="17" id="TBH-6K-7Fp"/>
-                                    <constraint firstAttribute="trailing" secondItem="h7C-Tq-WtP" secondAttribute="trailing" constant="17" id="Ufc-1r-uAi"/>
-                                    <constraint firstAttribute="bottom" secondItem="hK1-VF-LRe" secondAttribute="bottom" constant="17" id="WOa-US-Zo4"/>
-                                    <constraint firstItem="C9o-81-nmE" firstAttribute="top" secondItem="lXX-sj-vAB" secondAttribute="bottom" constant="11" id="XQr-7C-ckC"/>
-                                    <constraint firstItem="lXX-sj-vAB" firstAttribute="top" secondItem="cne-IQ-5GZ" secondAttribute="bottom" constant="11" id="YfW-3p-Xwl"/>
-                                    <constraint firstItem="C9o-81-nmE" firstAttribute="leading" secondItem="Iby-Ob-Ox0" secondAttribute="leading" constant="17" id="fiN-M2-UXZ"/>
-                                    <constraint firstAttribute="trailing" secondItem="C9o-81-nmE" secondAttribute="trailing" constant="17" id="gUx-fX-QEA"/>
-                                    <constraint firstItem="h7C-Tq-WtP" firstAttribute="top" secondItem="Iby-Ob-Ox0" secondAttribute="top" constant="16" id="hDc-Hp-xIG"/>
-                                    <constraint firstItem="ePb-Ja-zph" firstAttribute="leading" secondItem="hK1-VF-LRe" secondAttribute="trailing" constant="12" id="mb5-ek-TUQ"/>
-                                    <constraint firstItem="h7C-Tq-WtP" firstAttribute="leading" secondItem="cne-IQ-5GZ" secondAttribute="trailing" constant="8" id="qfm-aA-iSO"/>
-                                    <constraint firstItem="cne-IQ-5GZ" firstAttribute="leading" secondItem="Iby-Ob-Ox0" secondAttribute="leading" constant="17" id="v5U-Hm-iSV"/>
-                                </constraints>
-                            </view>
-                        </tabViewItem>
                     </tabViewItems>
                     <connections>
                         <outlet property="delegate" destination="-2" id="V4b-Eg-rRg"/>
diff --git a/jmc/Other Windows/PreferencesWindowController.xib b/jmc/Other Windows/PreferencesWindowController.xib
index 7261f18..76890d3 100644
--- a/jmc/Other Windows/PreferencesWindowController.xib	
+++ b/jmc/Other Windows/PreferencesWindowController.xib	
@@ -221,6 +221,12 @@
                                     </constraints>
                                 </view>
                             </tabViewItem>
+                            <tabViewItem label="Item 3" identifier="" id="oQK-z2-2RT">
+                                <view key="view" id="Aju-rr-jm8">
+                                    <rect key="frame" x="0.0" y="0.0" width="487" height="186"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                </view>
+                            </tabViewItem>
                             <tabViewItem label="Item 2" identifier="" id="taG-mr-0MG">
                                 <view key="view" id="wco-cp-Xi2">
                                     <rect key="frame" x="0.0" y="0.0" width="487" height="186"/>
@@ -343,11 +349,13 @@
                             <action selector="selectAdvanced:" target="-2" id="ZCj-eJ-2mf"/>
                         </connections>
                     </toolbarItem>
+                    <toolbarItem implicitItemIdentifier="28F69823-129A-4313-997B-61B34D2274FC" label="Playback" paletteLabel="Playback" tag="-1" image="NSAudioOutputVolumeMedTemplate" id="cDR-3z-Uco"/>
                 </allowedToolbarItems>
                 <defaultToolbarItems>
                     <toolbarItem reference="rKI-8j-jui"/>
                     <toolbarItem reference="Gk6-uZ-N5O"/>
                     <toolbarItem reference="6Da-d9-gln"/>
+                    <toolbarItem reference="cDR-3z-Uco"/>
                     <toolbarItem reference="rk1-eS-Lm3"/>
                     <toolbarItem reference="rKI-8j-jui"/>
                 </defaultToolbarItems>
@@ -363,6 +371,7 @@
     </objects>
     <resources>
         <image name="NSAdvanced" width="32" height="32"/>
+        <image name="NSAudioOutputVolumeMedTemplate" width="128" height="128"/>
         <image name="NSPreferencesGeneral" width="32" height="32"/>
         <image name="Shared Library" width="32" height="32"/>
     </resources>