Hacked in ability to list devices. Should be cleaned up later...