diff --git a/src/main/java/org/deepsymmetry/beatlink/CdjStatus.java b/src/main/java/org/deepsymmetry/beatlink/CdjStatus.java
index d8559f9..6f92b1b 100644
--- a/src/main/java/org/deepsymmetry/beatlink/CdjStatus.java
+++ b/src/main/java/org/deepsymmetry/beatlink/CdjStatus.java
@@ -511,7 +511,8 @@ private TrackSourceSlot findOpusTrackSourceSlot() {
         if (rekordboxId != 0) {
            switch (packetBytes[41]){
                case 0: return TrackSourceSlot.SD_SLOT;
-               case 3: return TrackSourceSlot.USB_SLOT;
+               // TODO, figure out a way to identify more than one USB at a time
+               case 3: return TrackSourceSlot.SD_SLOT;
            }
         }
 
@@ -642,6 +643,10 @@ public CdjStatus(DatagramPacket packet) {
         if (Util.isOpusQuad(deviceName)) {
             trackSourcePlayer = translateOpusPlayerNumbers(packetBytes[40]);
             trackSourceSlot = findOpusTrackSourceSlot();
+            // isLocalSdLoaded() == true
+            packetBytes[115] = 0;
+            // isLocalUsbLoaded() == true
+            packetBytes[111] = 0;
         } else {
             trackSourcePlayer = packetBytes[40];
             trackSourceSlot = findTrackSourceSlot();
diff --git a/src/main/java/org/deepsymmetry/beatlink/MediaDetails.java b/src/main/java/org/deepsymmetry/beatlink/MediaDetails.java
index 75604f7..ba51ea0 100644
--- a/src/main/java/org/deepsymmetry/beatlink/MediaDetails.java
+++ b/src/main/java/org/deepsymmetry/beatlink/MediaDetails.java
@@ -1,17 +1,19 @@
 package org.deepsymmetry.beatlink;
 
 import org.deepsymmetry.beatlink.data.ColorItem;
+import org.deepsymmetry.beatlink.data.OpusProvider;
 import org.deepsymmetry.beatlink.data.SlotReference;
+import org.deepsymmetry.cratedigger.Database;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.awt.*;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.DatagramPacket;
 import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import java.nio.file.FileSystem;
+import java.util.*;
 
 /**
  * Represents information about the media mounted in a player's slot; returned in response to a media query packet.
@@ -102,26 +104,51 @@ public ByteBuffer getRawBytes() {
     /**
      * Given a source byte array, return the UTF-16 string length in bytes by finding a UTF-16 NUL sequence.
      * If a UTF-16 NUL sequence is not found, maxLength or source.length-offset is returned, which ever is smaller.
-     * 
-     * @param source the source byte array representing a UTF-16 string
-     * @param offset the byte offset to start at in the source byte array
+     *
+     * @param source    the source byte array representing a UTF-16 string
+     * @param offset    the byte offset to start at in the source byte array
      * @param maxLength the maximum length of the UTF-16 string (in bytes)
-     * 
      * @return the length in number of bytes excluding the UTF-16 NUL sequence, else maxLength or source.length-offset, which ever is smaller.
      */
     private int getUTF16StringLength(byte[] source, int offset, int maxLength) {
         int numBytes = maxLength;
-        int clampedMaxLength = Math.min(maxLength, source.length-offset);
-        
-        for (int i=offset; i<offset+clampedMaxLength-1; i+=2) {
-            if (source[i] == 0x00 && source[i+1] == 0x00) {
-                numBytes = i-offset;
+        int clampedMaxLength = Math.min(maxLength, source.length - offset);
+
+        for (int i = offset; i < offset + clampedMaxLength - 1; i += 2) {
+            if (source[i] == 0x00 && source[i + 1] == 0x00) {
+                numBytes = i - offset;
                 break;
             }
         }
         return numBytes;
     }
 
+    /**
+     * Constructor to emulate an actual MediaDetails object from CDJs. This allows our Status packets
+     * to use OpusProvider to enrich the track data. OpusProvider must be started up to use this method.
+     *
+     * @param slotReference Slot Reference to Emulate
+     * @param mediaType     Media Type to Emulate
+     * @param name          Name of device
+     */
+    MediaDetails(SlotReference slotReference, CdjStatus.TrackType mediaType, String name) {
+        if (!OpusProvider.getInstance().isRunning()) {
+            throw new IllegalStateException("OpusProvider must be started up to use this Constructor");
+        }
+        Database db = OpusProvider.getInstance().findDatabase(slotReference);
+        this.slotReference = slotReference;
+        this.mediaType = mediaType;
+        this.name = name;
+        this.creationDate = Long.toString(db.sourceFile.lastModified());
+        this.trackCount = db.trackIndex.size();
+        this.totalSize = 0;
+        this.playlistCount = db.playlistIndex.size();
+        this.rawBytes = ByteBuffer.wrap(new byte[]{});
+        this.color = new Color(0);
+        this.freeSpace = 0;
+        this.hasMySettings = false;
+    }
+
     /**
      * Constructor sets all the immutable interpreted fields based on the packet content.
      *
@@ -134,7 +161,7 @@ private int getUTF16StringLength(byte[] source, int offset, int maxLength) {
     /**
      * Constructor sets all the immutable interpreted fields based on the packet content.
      *
-     * @param packet the media response packet that was received or cached
+     * @param packet       the media response packet that was received or cached
      * @param packetLength the number of bytes within the packet which were actually received
      */
     public MediaDetails(byte[] packet, int packetLength) {
@@ -147,7 +174,7 @@ public MediaDetails(byte[] packet, int packetLength) {
                     " bytes and were given only " + packetCopy.length);
         }
 
-        final int payloadLength = (int)Util.bytesToNumber(packetCopy, 0x22, 2);
+        final int payloadLength = (int) Util.bytesToNumber(packetCopy, 0x22, 2);
         if (packetCopy.length != payloadLength + 0x24) {
             logger.warn("Received Media response packet with reported payload length of " + payloadLength + " and actual payload length of " +
                     (packetCopy.length - 0x24));
@@ -186,9 +213,9 @@ public MediaDetails(byte[] packet, int packetLength) {
             }
         }
 
-        trackCount = (int)Util.bytesToNumber(packetCopy, 0xa6, 2);
+        trackCount = (int) Util.bytesToNumber(packetCopy, 0xa6, 2);
         color = ColorItem.colorForId(packetCopy[0xa8]);
-        playlistCount = (int)Util.bytesToNumber(packetCopy, 0xae, 2);
+        playlistCount = (int) Util.bytesToNumber(packetCopy, 0xae, 2);
         hasMySettings = packetCopy[0xab] != 0;
         totalSize = Util.bytesToNumber(packetCopy, 0xb0, 8);
         freeSpace = Util.bytesToNumber(packetCopy, 0xb8, 8);
@@ -216,9 +243,7 @@ public String hashKey() {
      * free space because those probably just reflect history entries being added.
      *
      * @param originalMedia the media details when information about it was saved
-     *
      * @return true if there have been detectable significant  changes to the media since it was saved
-     *
      * @throws IllegalArgumentException if the {@link #hashKey()} values of the media detail objects differ
      */
     public boolean hasChanged(MediaDetails originalMedia) {
diff --git a/src/main/java/org/deepsymmetry/beatlink/Util.java b/src/main/java/org/deepsymmetry/beatlink/Util.java
index 8afce95..97f75f1 100644
--- a/src/main/java/org/deepsymmetry/beatlink/Util.java
+++ b/src/main/java/org/deepsymmetry/beatlink/Util.java
@@ -2,8 +2,7 @@
 
 import java.awt.*;
 import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.InetAddress;
+import java.net.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 import java.util.Collections;
@@ -959,6 +958,29 @@ public static String phraseLabel(final SongStructureEntry phrase) {
         }
     }
 
+    /**
+     * Scan a network interface to find if it has an address space which matches the device we are trying to reach.
+     * If so, return the address specification.
+     *
+     * @param announcement the DJ Link device we are trying to communicate with
+     * @param networkInterface the network interface we are testing
+     * @return the address which can be used to communicate with the device on the interface, or null
+     */
+    public static InterfaceAddress findMatchingAddress(DeviceAnnouncement announcement, NetworkInterface networkInterface) {
+        for (InterfaceAddress address : networkInterface.getInterfaceAddresses()) {
+            if (address == null) {
+                // This should never happen, but we are protecting against a Windows Java bug, see
+                // https://bugs.java.com/bugdatabase/view_bug?bug_id=8023649
+                logger.warn("Received a null InterfaceAddress from networkInterface.getInterfaceAddresses(), is this Windows? " +
+                        "Do you have a VPN installed? Trying to recover by ignoring it.");
+            } else if ((address.getBroadcast() != null) &&
+                    Util.sameNetwork(address.getNetworkPrefixLength(), announcement.getAddress(), address.getAddress())) {
+                return address;
+            }
+        }
+        return null;
+    }
+
     /**
      * Transforms an album art path to the version that will contain high resolution art, if that is available.
      *
diff --git a/src/main/java/org/deepsymmetry/beatlink/VirtualCdj.java b/src/main/java/org/deepsymmetry/beatlink/VirtualCdj.java
index d8ea49a..c540269 100644
--- a/src/main/java/org/deepsymmetry/beatlink/VirtualCdj.java
+++ b/src/main/java/org/deepsymmetry/beatlink/VirtualCdj.java
@@ -563,29 +563,6 @@ void processBeat(Beat beat) {
         }
     }
 
-    /**
-     * Scan a network interface to find if it has an address space which matches the device we are trying to reach.
-     * If so, return the address specification.
-     *
-     * @param aDevice the DJ Link device we are trying to communicate with
-     * @param networkInterface the network interface we are testing
-     * @return the address which can be used to communicate with the device on the interface, or null
-     */
-    private InterfaceAddress findMatchingAddress(DeviceAnnouncement aDevice, NetworkInterface networkInterface) {
-        for (InterfaceAddress address : networkInterface.getInterfaceAddresses()) {
-            if (address == null) {
-                // This should never happen, but we are protecting against a Windows Java bug, see
-                // https://bugs.java.com/bugdatabase/view_bug?bug_id=8023649
-                logger.warn("Received a null InterfaceAddress from networkInterface.getInterfaceAddresses(), is this Windows? " +
-                        "Do you have a VPN installed? Trying to recover by ignoring it.");
-            } else if ((address.getBroadcast() != null) &&
-                    Util.sameNetwork(address.getNetworkPrefixLength(), aDevice.getAddress(), address.getAddress())) {
-                return address;
-            }
-        }
-        return null;
-    }
-
     /**
      * The number of milliseconds for which the {@link DeviceFinder} needs to have been watching the network in order
      * for us to be confident we can choose a device number that will not conflict.
@@ -913,7 +890,7 @@ private boolean createVirtualCdj() throws SocketException {
         matchedAddress = null;
         DeviceAnnouncement aDevice = DeviceFinder.getInstance().getCurrentDevices().iterator().next();
         for (NetworkInterface networkInterface : Collections.list(NetworkInterface.getNetworkInterfaces())) {
-            InterfaceAddress candidate = findMatchingAddress(aDevice, networkInterface);
+            InterfaceAddress candidate = Util.findMatchingAddress(aDevice, networkInterface);
             if (candidate != null) {
                 if (matchedAddress == null) {
                     matchedAddress = candidate;
@@ -1503,11 +1480,11 @@ public Set<MediaDetailsListener> getMediaDetailsListeners() {
     }
 
     /**
-     * Send a media details response to all registered listeners.
+     * Send a media details response to all registered listeners. Is also called from VirtualRekordbox in proxy mode.
      *
      * @param details the response that has just arrived
      */
-    private void deliverMediaDetailsUpdate(final MediaDetails details) {
+    void deliverMediaDetailsUpdate(final MediaDetails details) {
         for (MediaDetailsListener listener : getMediaDetailsListeners()) {
             try {
                 listener.detailsAvailable(details);
diff --git a/src/main/java/org/deepsymmetry/beatlink/VirtualRekordbox.java b/src/main/java/org/deepsymmetry/beatlink/VirtualRekordbox.java
index 8bec698..e389c47 100644
--- a/src/main/java/org/deepsymmetry/beatlink/VirtualRekordbox.java
+++ b/src/main/java/org/deepsymmetry/beatlink/VirtualRekordbox.java
@@ -1,13 +1,12 @@
 package org.deepsymmetry.beatlink;
 
-import org.deepsymmetry.beatlink.data.MetadataFinder;
+import org.deepsymmetry.beatlink.data.OpusProvider;
 import org.deepsymmetry.beatlink.data.SlotReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.*;
-import java.nio.ByteBuffer;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.*;
@@ -21,7 +20,6 @@
  */
 @SuppressWarnings("WeakerAccess")
 public class VirtualRekordbox extends LifecycleParticipant {
-
     private static final Logger logger = LoggerFactory.getLogger(VirtualRekordbox.class);
 
     /**
@@ -121,7 +119,7 @@ public boolean getUseStandardPlayerNumber() {
      * @return the virtual player number
      */
     public synchronized byte getDeviceNumber() {
-        return keepAliveBytes[DEVICE_NUMBER_OFFSET];
+        return rekordboxKeepAliveBytes[DEVICE_NUMBER_OFFSET];
     }
 
     /**
@@ -138,7 +136,7 @@ public synchronized void setDeviceNumber(byte number) {
         if (isRunning()) {
             throw new IllegalStateException("Can't change device number once started.");
         }
-        keepAliveBytes[DEVICE_NUMBER_OFFSET] = number;
+        rekordboxKeepAliveBytes[DEVICE_NUMBER_OFFSET] = number;
     }
 
     /**
@@ -176,32 +174,33 @@ public void setAnnounceInterval(int interval) {
      * and IP address, as described in the
      * <a href="https://djl-analysis.deepsymmetry.org/djl-analysis/startup.html#cdj-keep-alive">Packet Analysis document</a>.
      */
-    private static final byte[] keepAliveBytes = {
-            0x51, 0x73, 0x70, 0x74,  0x31, 0x57, 0x6d, 0x4a,   0x4f, 0x4c, 0x06, 0x00,  0x62, 0x65, 0x61, 0x74,
-            0x2d, 0x6c, 0x69, 0x6e,  0x6b, 0x00, 0x00, 0x00,   0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
-            0x01, 0x02, 0x00, 0x36,  0x00, 0x01, 0x00, 0x00,   0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
-            0x02, 0x00, 0x00, 0x00,  0x01, 0x64
+    private static final byte[] rekordboxKeepAliveBytes = {
+            0x51, 0x73, 0x70, 0x74,  0x31, 0x57, 0x6d, 0x4a,  0x4f, 0x4c, 0x06, 0x00, 0x72, 0x65, 0x6b, 0x6f, 0x72,
+            0x64, 0x62, 0x6f, 0x78,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03,
+            0x00, 0x36, 0x17, 0x01,  0x18, 0x3e, (byte) 0xef, (byte) 0xda, 0x5b, (byte) 0xca, (byte) 0xc0, (byte) 0xa8,
+            0x02, 0x0b, 0x04, 0x01,  0x00, 0x00, 0x04, 0x08
     };
 
-    private static final byte[] initializeRekordboxLightingBytes = {
-            0x51, 0x73, 0x70, 0x74, 0x31, 0x57, 0x6d, 0x4a, 0x4f, 0x4c, 0x11, 0x72, 0x65, 0x6b, 0x6f, 0x72, 0x64,
-            0x62, 0x6f, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x17,
-            0x01, 0x04, 0x17, 0x01, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x61, 0x00, 0x63, 0x00, 0x62, 0x00, 0x6f, 0x00,
-            0x6f, 0x00, 0x6b, 0x00, 0x20, 0x00, 0x70, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    private static final byte[] rekordboxLightingRequestStatusBytes = {
+            0x51, 0x73, 0x70, 0x74,  0x31, 0x57, 0x6d, 0x4a,  0x4f, 0x4c, 0x11, 0x72,  0x65, 0x6b, 0x6f, 0x72,
+            0x64, 0x62, 0x6f, 0x78,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x01,
+            0x01, 0x17, 0x01, 0x04,  0x17, 0x01, 0x00, 0x00,  0x00, 0x6d, 0x00, 0x61,  0x00, 0x63, 0x00, 0x62,
+            0x00, 0x6f, 0x00, 0x6f,  0x00, 0x6b, 0x00, 0x20,  0x00, 0x70, 0x00, 0x72,  0x00, 0x6f, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00
     };
 
     /**
@@ -225,7 +224,7 @@ public void setAnnounceInterval(int interval) {
      * @return the device name reported in our presence announcement packets
      */
     public static String getDeviceName() {
-        return new String(keepAliveBytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH).trim();
+        return new String(rekordboxKeepAliveBytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH).trim();
     }
 
     /**
@@ -312,7 +311,18 @@ private DeviceUpdate buildUpdate(DatagramPacket packet) throws IOException {
 
             case CDJ_STATUS:
                 if (length >= CdjStatus.MINIMUM_PACKET_SIZE) {
-                    return new CdjStatus(packet);
+                    CdjStatus status = new CdjStatus(packet);
+
+                    // Need to fill in MediaDetails otherwise MetadataFinder won't forward us to OpusProvider
+                    MediaDetails details = new MediaDetails(
+                            SlotReference.getSlotReference(status.getDeviceNumber(), CdjStatus.TrackSourceSlot.SD_SLOT),
+                            CdjStatus.TrackType.REKORDBOX,
+                            status.getDeviceName());
+
+                    // Forward this to VirtualCdj where it will be sent to clients.
+                    VirtualCdj.getInstance().deliverMediaDetailsUpdate(details);
+
+                    return status;
                 } else {
                     logger.warn("Ignoring too-short CDJ Status packet with length " + length + " (we need " + CdjStatus.MINIMUM_PACKET_SIZE +
                             " bytes).");
@@ -340,10 +350,9 @@ private DeviceUpdate buildUpdate(DatagramPacket packet) throws IOException {
     /**
      * This will send the bytes Rekordbox Lighting sends to a player to acknowledge its existence on the network and
      * trigger it to begin sending CDJStatus packets.
-     *
      */
     public void sendRekordboxLightingPacket() {
-        DatagramPacket updatesAnnouncement = new DatagramPacket(initializeRekordboxLightingBytes, initializeRekordboxLightingBytes.length,
+        DatagramPacket updatesAnnouncement = new DatagramPacket(rekordboxLightingRequestStatusBytes, rekordboxLightingRequestStatusBytes.length,
                 broadcastAddress.get(), UPDATE_PORT);
         try {
             socket.get().send(updatesAnnouncement);
@@ -494,12 +503,12 @@ private void requestNumberFromMixer(InetAddress mixerAddress) {
         }
 
         // Send a packet directly to the mixer telling it we are ready for its device assignment.
-        Arrays.fill(assignmentRequestBytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte)0);
+        Arrays.fill(assignmentRequestBytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte) 0);
         System.arraycopy(getDeviceName().getBytes(), 0, assignmentRequestBytes, DEVICE_NAME_OFFSET, getDeviceName().getBytes().length);
         System.arraycopy(matchedAddress.getAddress().getAddress(), 0, assignmentRequestBytes, 0x24, 4);
-        System.arraycopy(keepAliveBytes, MAC_ADDRESS_OFFSET, assignmentRequestBytes, 0x28, 6);
+        System.arraycopy(rekordboxKeepAliveBytes, MAC_ADDRESS_OFFSET, assignmentRequestBytes, 0x28, 6);
         // Can't call getDeviceNumber() on next line because that's synchronized!
-        assignmentRequestBytes[0x31] = (keepAliveBytes[DEVICE_NUMBER_OFFSET] == 0)? (byte)1 : (byte)2;  // The auto-assign flag.
+        assignmentRequestBytes[0x31] = (rekordboxKeepAliveBytes[DEVICE_NUMBER_OFFSET] == 0) ? (byte) 1 : (byte) 2;  // The auto-assign flag.
         assignmentRequestBytes[0x2f] = 1;  // The packet counter.
         try {
             DatagramPacket announcement = new DatagramPacket(assignmentRequestBytes, assignmentRequestBytes.length,
@@ -526,9 +535,9 @@ void defendDeviceNumber(InetAddress invaderAddress) {
         }
 
         // Send a packet to the interloper telling it that we are using that device number.
-        Arrays.fill(deviceNumberDefenseBytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte)0);
+        Arrays.fill(deviceNumberDefenseBytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte) 0);
         System.arraycopy(getDeviceName().getBytes(), 0, deviceNumberDefenseBytes, DEVICE_NAME_OFFSET, getDeviceName().getBytes().length);
-        deviceNumberDefenseBytes[0x24] = keepAliveBytes[DEVICE_NUMBER_OFFSET];
+        deviceNumberDefenseBytes[0x24] = rekordboxKeepAliveBytes[DEVICE_NUMBER_OFFSET];
         System.arraycopy(matchedAddress.getAddress().getAddress(), 0, deviceNumberDefenseBytes, 0x25, 4);
         try {
             DatagramPacket defense = new DatagramPacket(deviceNumberDefenseBytes, deviceNumberDefenseBytes.length,
@@ -553,7 +562,7 @@ private boolean claimDeviceNumber() {
         mixerAssigned.set(0);
 
         // Send the initial series of three "coming online" packets.
-        Arrays.fill(helloBytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte)0);
+        Arrays.fill(helloBytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte) 0);
         System.arraycopy(getDeviceName().getBytes(), 0, helloBytes, DEVICE_NAME_OFFSET, getDeviceName().getBytes().length);
         for (int i = 1; i <= 3; i++) {
             try {
@@ -583,11 +592,11 @@ private boolean claimDeviceNumber() {
 
             // Send the series of three initial device number claim packets, unless we are interrupted by a defense
             // or a mixer assigning us a specific number.
-            Arrays.fill(claimStage1bytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte)0);
+            Arrays.fill(claimStage1bytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte) 0);
             System.arraycopy(getDeviceName().getBytes(), 0, claimStage1bytes, DEVICE_NAME_OFFSET, getDeviceName().getBytes().length);
-            System.arraycopy(keepAliveBytes, MAC_ADDRESS_OFFSET, claimStage1bytes, 0x26, 6);
+            System.arraycopy(rekordboxKeepAliveBytes, MAC_ADDRESS_OFFSET, claimStage1bytes, 0x26, 6);
             for (int i = 1; i <= 3 && mixerAssigned.get() == 0; i++) {
-                claimStage1bytes[0x24] = (byte)i;  // The packet counter.
+                claimStage1bytes[0x24] = (byte) i;  // The packet counter.
                 try {
                     logger.debug("Sending claim stage 1 packet " + i);
                     DatagramPacket announcement = new DatagramPacket(claimStage1bytes, claimStage1bytes.length,
@@ -612,14 +621,14 @@ private boolean claimDeviceNumber() {
 
             // Send the middle series of device claim packets, unless we are interrupted by a defense
             // or a mixer assigning us a specific number.
-            Arrays.fill(claimStage2bytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte)0);
+            Arrays.fill(claimStage2bytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte) 0);
             System.arraycopy(getDeviceName().getBytes(), 0, claimStage2bytes, DEVICE_NAME_OFFSET, getDeviceName().getBytes().length);
             System.arraycopy(matchedAddress.getAddress().getAddress(), 0, claimStage2bytes, 0x24, 4);
-            System.arraycopy(keepAliveBytes, MAC_ADDRESS_OFFSET, claimStage2bytes, 0x28, 6);
-            claimStage2bytes[0x2e] = (byte)claimingNumber.get();  // The number we are claiming.
-            claimStage2bytes[0x31] = (getDeviceNumber() == 0)? (byte)1 : (byte)2;  // The auto-assign flag.
+            System.arraycopy(rekordboxKeepAliveBytes, MAC_ADDRESS_OFFSET, claimStage2bytes, 0x28, 6);
+            claimStage2bytes[0x2e] = (byte) claimingNumber.get();  // The number we are claiming.
+            claimStage2bytes[0x31] = (getDeviceNumber() == 0) ? (byte) 1 : (byte) 2;  // The auto-assign flag.
             for (int i = 1; i <= 3 && mixerAssigned.get() == 0; i++) {
-                claimStage2bytes[0x2f] = (byte)i;  // The packet counter.
+                claimStage2bytes[0x2f] = (byte) i;  // The packet counter.
                 try {
                     logger.debug("Sending claim stage 2 packet " + i + " for device " + claimStage2bytes[0x2e]);
                     DatagramPacket announcement = new DatagramPacket(claimStage2bytes, claimStage2bytes.length,
@@ -650,11 +659,11 @@ private boolean claimDeviceNumber() {
 
             // Send the final series of device claim packets, unless we are interrupted by a defense, or the mixer
             // acknowledges our acceptance of its assignment.
-            Arrays.fill(claimStage3bytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte)0);
+            Arrays.fill(claimStage3bytes, DEVICE_NAME_OFFSET, DEVICE_NAME_LENGTH, (byte) 0);
             System.arraycopy(getDeviceName().getBytes(), 0, claimStage3bytes, DEVICE_NAME_OFFSET, getDeviceName().getBytes().length);
-            claimStage3bytes[0x24] = (byte)claimingNumber.get();  // The number we are claiming.
+            claimStage3bytes[0x24] = (byte) claimingNumber.get();  // The number we are claiming.
             for (int i = 1; i <= 3 && mixerAssigned.get() == 0; i++) {
-                claimStage3bytes[0x25] = (byte)i;  // The packet counter.
+                claimStage3bytes[0x25] = (byte) i;  // The packet counter.
                 try {
                     logger.debug("Sending claim stage 3 packet " + i + " for device " + claimStage3bytes[0x24]);
                     DatagramPacket announcement = new DatagramPacket(claimStage3bytes, claimStage3bytes.length,
@@ -680,14 +689,14 @@ private boolean claimDeviceNumber() {
             claimed = true;  // If we finished all our loops, the number we wanted is ours.
         }
         // Set the device number we claimed.
-        keepAliveBytes[DEVICE_NUMBER_OFFSET] = (byte)claimingNumber.getAndSet(0);
+        rekordboxKeepAliveBytes[DEVICE_NUMBER_OFFSET] = (byte) claimingNumber.getAndSet(0);
         mixerAssigned.set(0);
         return true;  // Huzzah, we found the right device number to use!
     }
 
-    public void sendRekordboxLightingAnnouncement(){
+    public void sendRekordboxAnnouncement() {
         if (isRunning()) {
-            DatagramPacket announcement = new DatagramPacket(keepAliveBytes, keepAliveBytes.length,
+            DatagramPacket announcement = new DatagramPacket(rekordboxKeepAliveBytes, rekordboxKeepAliveBytes.length,
                     broadcastAddress.get(), DeviceFinder.ANNOUNCEMENT_PORT);
             try {
                 this.socket.get().send(announcement);
@@ -698,31 +707,35 @@ public void sendRekordboxLightingAnnouncement(){
     }
 
     /**
-     *
-     *
      * @return true if we found DJ Link devices and were able to create the {@code VirtualRekordbox}.
      * @throws Exception if there is a problem opening a socket on the right network
      */
     private boolean createVirtualRekordbox() throws Exception {
-
-        // Find the network interface and address to use to communicate with the first device we found.
-        matchingInterfaces = new ArrayList<NetworkInterface>();
-        matchedAddress = null;
+        OpusProvider.getInstance().start();
 
         // Forward Updates to VirtualCdj. That's where all clients are used to getting them.
         addUpdateListener(VirtualCdj.getInstance().getUpdateListener());
 
+        // Find the network interface and address to use to communicate with the first device we found.
+        matchingInterfaces = new ArrayList<NetworkInterface>();
+        matchedAddress = null;
+        DeviceAnnouncement aDevice = DeviceFinder.getInstance().getCurrentDevices().iterator().next();
         for (NetworkInterface networkInterface : Collections.list(NetworkInterface.getNetworkInterfaces())) {
-            for (InterfaceAddress address : networkInterface.getInterfaceAddresses()) {
-                if (address.getAddress() instanceof Inet4Address && !address.getAddress().getHostAddress().contains("127.0.0.1")) {
-                    if (matchedAddress == null) {
-                        matchedAddress = address;
-                    }
-                    matchingInterfaces.add(networkInterface);
+            InterfaceAddress candidate = Util.findMatchingAddress(aDevice, networkInterface);
+            if (candidate != null) {
+                if (matchedAddress == null) {
+                    matchedAddress = candidate;
                 }
+                matchingInterfaces.add(networkInterface);
             }
         }
 
+        if (matchedAddress == null) {
+            logger.warn("Unable to find network interface to communicate with " + aDevice +
+                    ", giving up.");
+            return false;
+        }
+
         logger.info("Found matching network interface " + matchingInterfaces.get(0).getDisplayName() + " (" +
                 matchingInterfaces.get(0).getName() + "), will use address " + matchedAddress);
         if (matchingInterfaces.size() > 1) {
@@ -737,13 +750,13 @@ private boolean createVirtualRekordbox() throws Exception {
         socket.set(new DatagramSocket(UPDATE_PORT, matchedAddress.getAddress()));
 
         System.arraycopy(getMatchingInterfaces().get(0).getHardwareAddress(),
-                0, keepAliveBytes, MAC_ADDRESS_OFFSET, 6);
+                0, rekordboxKeepAliveBytes, MAC_ADDRESS_OFFSET, 6);
         System.arraycopy(matchedAddress.getAddress().getAddress(),
-                0, keepAliveBytes, 44, 4);
+                0, rekordboxKeepAliveBytes, 44, 4);
         System.arraycopy(getMatchingInterfaces().get(0).getHardwareAddress(),
-                0, initializeRekordboxLightingBytes, MAC_ADDRESS_OFFSET, 6);
+                0, rekordboxLightingRequestStatusBytes, MAC_ADDRESS_OFFSET, 6);
         System.arraycopy(matchedAddress.getAddress().getAddress(),
-                0, initializeRekordboxLightingBytes, 44, 4);
+                0, rekordboxLightingRequestStatusBytes, 44, 4);
 
         // Copy the chosen interface's hardware and IP addresses into the announcement packet template
         broadcastAddress.set(matchedAddress.getBroadcast());
@@ -763,9 +776,6 @@ private boolean createVirtualRekordbox() throws Exception {
             return false;
         }
 
-        // Now that VirtualRekordbox is running, start up VirtualCdj and it will run in proxy mode.
-        VirtualCdj.getInstance().start();
-
         // Set up our buffer and packet to receive incoming messages.
         final byte[] buffer = new byte[512];
         final DatagramPacket packet = new DatagramPacket(buffer, buffer.length);
@@ -832,12 +842,12 @@ public void run() {
      */
     private void sendAnnouncements() {
         try {
+            sendRekordboxAnnouncement();
             sendRekordboxLightingPacket();
-            sendRekordboxLightingAnnouncement();
 
             Thread.sleep(getAnnounceInterval());
         } catch (Throwable t) {
-            logger.warn("Unable to send announcement packet, flushing DeviceFinder due to likely network change and shutting down.", t);
+            logger.warn("Unable to send announcement packets, flushing DeviceFinder due to likely network change and shutting down.", t);
             DeviceFinder.getInstance().flush();
             stop();
         }
@@ -873,9 +883,6 @@ public void stopped(LifecycleParticipant sender) {
     @SuppressWarnings("UnusedReturnValue")
     synchronized boolean start() throws Exception {
         if (!isRunning()) {
-            if (VirtualCdj.getInstance().isRunning()) {
-                throw new IllegalStateException("Cannot start VirtualRekordbox when VirtualCdj has already been started up");
-            }
 
             // Set up so we know we have to shut down if the DeviceFinder shuts down.
             DeviceFinder.getInstance().addLifecycleListener(deviceFinderLifecycleListener);
@@ -913,7 +920,6 @@ synchronized boolean start() throws Exception {
      * driven by receipt of device announcement packets.</p>
      *
      * @param deviceNumber the device number to try to claim
-     *
      * @return true if we found DJ Link devices and were able to create the {@code VirtualRekordbox}, or it was already running.
      * @throws SocketException if the socket to listen on port 50002 cannot be created
      */
@@ -937,7 +943,7 @@ synchronized void stop() {
             socket.set(null);
             broadcastAddress.set(null);
             updates.clear();
-            setDeviceNumber((byte)0);  // Set up for self-assignment if restarted.
+            setDeviceNumber((byte) 0);  // Set up for self-assignment if restarted.
             deliverLifecycleAnnouncement(logger, false);
         }
     }
@@ -952,7 +958,6 @@ synchronized void stop() {
      * combines both status updates and beat messages, and so is more likely to be current and definitive.</p>
      *
      * @param deviceNumber the device number of interest
-     *
      * @return the matching detailed status update or null if none have been received
      * @throws IllegalStateException if the {@code VirtualRekordbox} is not active
      */
@@ -1050,12 +1055,13 @@ public static VirtualRekordbox getInstance() {
     /**
      * Register any relevant listeners; private to prevent instantiation.
      */
-    private VirtualRekordbox() {}
+    private VirtualRekordbox() {
+    }
 
     /**
      * We have received a packet from a device trying to claim a device number, see if we should defend it.
      *
-     * @param packet the packet received
+     * @param packet       the packet received
      * @param deviceOffset the index of the byte within the packet holding the device number being claimed
      */
     private void handleDeviceClaimPacket(DatagramPacket packet, int deviceOffset) {
@@ -1072,7 +1078,7 @@ private void handleDeviceClaimPacket(DatagramPacket packet, int deviceOffset) {
      * The {@link DeviceFinder} delegates packets it doesn't know how to deal with to us using this method, because
      * they relate to claiming or defending device numbers, which is our responsibility.
      *
-     * @param kind the kind of packet that was received
+     * @param kind   the kind of packet that was received
      * @param packet the actual bytes of the packet
      */
     void handleSpecialAnnouncementPacket(Util.PacketType kind, DatagramPacket packet) {
@@ -1114,7 +1120,7 @@ void handleSpecialAnnouncementPacket(Util.PacketType kind, DatagramPacket packet
                     logger.warn("Another device is defending a number we are not using, ignoring: " + defendedDevice);
                 }
             } else {
-                logger.warn("Received device number defense message for device number " + defendedDevice +  " when we are not even running!");
+                logger.warn("Received device number defense message for device number " + defendedDevice + " when we are not even running!");
             }
         } else {
             logger.warn("Received unrecognized special announcement packet type: " + kind);
diff --git a/src/main/java/org/deepsymmetry/beatlink/data/CrateDigger.java b/src/main/java/org/deepsymmetry/beatlink/data/CrateDigger.java
index d7735e3..4129e86 100644
--- a/src/main/java/org/deepsymmetry/beatlink/data/CrateDigger.java
+++ b/src/main/java/org/deepsymmetry/beatlink/data/CrateDigger.java
@@ -815,10 +815,10 @@ private void deliverDatabaseUpdate(SlotReference slot, Database database, boolea
      * and register the listeners that hook us into the streams of information we need.
      */
     private CrateDigger() {
-        MetadataFinder.getInstance().addLifecycleListener(lifecycleListener);
-        MetadataFinder.getInstance().addMountListener(mountListener);
-        DeviceFinder.getInstance().addDeviceAnnouncementListener(deviceListener);
-        VirtualCdj.getInstance().addMediaDetailsListener(mediaDetailsListener);
+//        MetadataFinder.getInstance().addLifecycleListener(lifecycleListener);
+//        MetadataFinder.getInstance().addMountListener(mountListener);
+//        DeviceFinder.getInstance().addDeviceAnnouncementListener(deviceListener);
+//        VirtualCdj.getInstance().addMediaDetailsListener(mediaDetailsListener);
         downloadDirectory = createDownloadDirectory();
     }
 
diff --git a/src/main/java/org/deepsymmetry/beatlink/data/MetadataFinder.java b/src/main/java/org/deepsymmetry/beatlink/data/MetadataFinder.java
index cf57968..2d554a9 100644
--- a/src/main/java/org/deepsymmetry/beatlink/data/MetadataFinder.java
+++ b/src/main/java/org/deepsymmetry/beatlink/data/MetadataFinder.java
@@ -1022,7 +1022,7 @@ private void handleUpdate(final CdjStatus update) {
                 }
 
                 // Not in the hot cache so try actually retrieving it, if possible.
-                if (ConnectionManager.getInstance().getPlayerDBServerPort(update.getTrackSourcePlayer()) > 0) {
+                if (ConnectionManager.getInstance().getPlayerDBServerPort(update.getTrackSourcePlayer()) > 0 || VirtualRekordbox.getInstance().isRunning()) {
                     if (activeRequests.add(update.getTrackSourcePlayer())) {
                         // We had to make sure we were not already asking for this track.
                         clearDeck(update);  // We won't know what it is until our request completes.
diff --git a/src/main/java/org/deepsymmetry/beatlink/data/OpusProvider.java b/src/main/java/org/deepsymmetry/beatlink/data/OpusProvider.java
index 5e5c6a8..dcf1446 100644
--- a/src/main/java/org/deepsymmetry/beatlink/data/OpusProvider.java
+++ b/src/main/java/org/deepsymmetry/beatlink/data/OpusProvider.java
@@ -2,9 +2,7 @@
 
 import io.kaitai.struct.RandomAccessFileKaitaiStream;
 import org.apiguardian.api.API;
-import org.deepsymmetry.beatlink.CdjStatus;
-import org.deepsymmetry.beatlink.MediaDetails;
-import org.deepsymmetry.beatlink.Util;
+import org.deepsymmetry.beatlink.*;
 import org.deepsymmetry.cratedigger.Database;
 import org.deepsymmetry.cratedigger.pdb.RekordboxAnlz;
 import org.deepsymmetry.cratedigger.pdb.RekordboxPdb;
@@ -161,7 +159,7 @@ public synchronized void attachMetadataArchive(File archive, CdjStatus.TrackSour
      */
     @API(status = API.Status.STABLE)
     public Database findDatabase(DataReference reference) {
-        if (reference.player >= 9 && reference.player <= 12) {  // This is an Opus Quad deck.
+        if (VirtualRekordbox.getInstance().isRunning()) {
             return findDatabase(reference.getSlotReference());
         }
         return null;
diff --git a/src/main/test/org/deepsymmetry/beatlink/TestRunner.java b/src/main/test/org/deepsymmetry/beatlink/TestRunner.java
deleted file mode 100644
index 3094c8e..0000000
--- a/src/main/test/org/deepsymmetry/beatlink/TestRunner.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.deepsymmetry.beatlink;
-
-import org.deepsymmetry.cratedigger.Database;
-import org.deepsymmetry.cratedigger.pdb.RekordboxPdb;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-
-public class TestRunner {
-
-    // Convenience integration test
-    @Test
-    public void TestRunner() throws Exception {
-        VirtualRekordbox.getInstance().start();
-        System.out.println("Started up!");
-        try {
-            Thread.sleep(600000000);
-        } catch (InterruptedException e) {
-            System.out.println("Interrupted, exiting.");
-        }
-    }
-}