diff --git a/.gitignore b/.gitignore
index 2e43ac9..c1bee88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 token
-.idea
\ No newline at end of file
+.idea
+.vscode
\ No newline at end of file
diff --git a/main.py b/main.py
index 7abdcb4..4af3cdd 100644
--- a/main.py
+++ b/main.py
@@ -2,9 +2,10 @@ import discord
 import yt_dlp as youtube_dl
 import time
 import asyncio
+import subprocess
 
 g_client = discord.Client()
-queue = []
+queue = []#dicts with keys link and type
 last_playing = {}
 voice_client = None
 last_start = 0
@@ -15,14 +16,28 @@ async def on_ready():
         await asyncio.sleep(.1)
         if len(queue) > 0:
             if not voice_client.is_playing() and voice_client is not None:
-                ydl = youtube_dl.YoutubeDL({"simulate": True})
-                res = ydl.extract_info(queue[0],
-                                       force_generic_extractor=ydl.params.get('force_generic_extractor', False))#lifted the second bit from the ytdl innards
                 link = None
-                for format in res["requested_formats"]:
-                    if not (format["asr"] is None):
-                        link = format["url"]
-                last_playing = res
+                res = {}
+                if queue[0]["type"] == "yt":
+                    ydl = youtube_dl.YoutubeDL({"simulate": True})
+                    try:
+                        res = ydl.extract_info(queue[0]["link"],
+                                            force_generic_extractor=ydl.params.get('force_generic_extractor', False))#lifted the second bit from the ytdl innards
+                    except:
+                        queue.pop(0)
+                        continue
+                    if "requested_formats" in res:
+                        for format in res["requested_formats"]:
+                            if not (format["asr"] is None):
+                                link = format["url"]
+                    else: link = res["url"]
+                    last_playing = res
+                    last_playing["raw"] = False
+                else:
+                    link = queue[0]["link"]
+                    last_playing = {"raw":True}
+                    result = subprocess.run(['ffprobe', '-v', 'error', '-show_entries', 'format=duration', '-of', 'default=noprint_wrappers=1:nokey=1', queue[0]["link"]], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+                    res["duration"] = int(float(result.stdout))#you actually need to do this laffo
                 voice_client.play(discord.PCMVolumeTransformer(discord.FFmpegPCMAudio(link, before_options="-reconnect 1 -reconnect_streamed 1 -reconnect_delay_max 5"), volume=1.0))
                 print("playan")
                 sav = queue[0]
@@ -51,15 +66,21 @@ async def on_message(message):
         return
 
     if message.content.startswith("*play"):
+        if (len(message.content.split(" ")) < 2):
+            await message.channel.send("missing argument")
+            return
         try:
              voice_client = await message.author.voice.channel.connect()
         except: #already conn'd/user not in chan/probably something else (?). fails are not /broadly/ (really) destructive neway so who cares#nevermind
             print("AAHHHHHHHHHHHHHHHHHHHH OH GOD")
             pass #it's ok if we do it ON PURPOSE ;^)
-        queue.append(message.content.split(" ")[1])
+        queue.append({"link":message.content.split(" ")[1], "type":("raw" if message.content.split(" ")[0] == "*playraw" else "yt")})
         await message.channel.send("k")
 
-    if message.content.startswith("*lp"):
+    if message.content == "*np":
+        if last_playing["raw"]:
+            await message.channel.send("`source is raw! link: {0}`".format(queue[0]["link"]))
+            return
         embed = discord.Embed(title="now playing...")
         embed.add_field(name="song:", value=last_playing["title"], inline=False)
         embed.set_image(url = last_playing["thumbnail"])
@@ -69,7 +90,7 @@ async def on_message(message):
     if message.content.startswith("*q"):
         embed = discord.Embed(title="queue")
         for q in queue:
-            embed.add_field(name="", value=q, inline=False)
+            embed.add_field(name=".", value=q["link"], inline=False)
         await message.channel.send(embed=embed)
 
     if message.content.startswith("*s"):