diff --git a/app/Http/Controllers/TagviewController.php b/app/Http/Controllers/TagviewController.php
index 5a6bd43..a048667 100644
--- a/app/Http/Controllers/TagviewController.php
+++ b/app/Http/Controllers/TagviewController.php
@@ -38,26 +38,33 @@ class TagviewController extends Controller
 
     public function tagview($tag, $id = null)
     {
-
-        if (is_null($tag)) {
-            return "penis";
-        }
-        // return $tag;
-        // $tag = 
-        $video = Video::getRandom($tag);
-        return $video;
-
-
-        //$video = Video::with('tags')->find($tag->id);
-        if(!$id) {
-            // id unset
-            return redirect('t/' . $tag . '/' . $video->id);
-        } else {
         
-            return view('tagviewdev',[
+        if (is_null($id)) {
+            // $x = Video::with('tags')->get();
+            // return $x;
+            $x = Video::orderByRaw("RAND()")->with('tags')->whereHas('tags', function ($query) use ($tag) {
+                $query->where('normalized', $tag);
+            })->first();
+            // $x = Video::orderByRaw("RAND()")->with('tags')->get()->first();
+            $responseArray = json_decode($x, true);
+            $normalizedTags = array_column($responseArray['tags'], 'normalized');
+            $variableToCompare = $tag;
+            if (in_array($variableToCompare, $normalizedTags)) {
+                // tag exists
+                return redirect('t/' . $tag . '/' . $x->id);
+            } else {
+                // tag does not exist on video
+                return 404;
+            }
+        } else {
+            // return $id;
+            $video = Video::where('id', $id)->with('tags')->get();
+            return view('tagviewdev', [
                 'video' => $video,
-                'related' => $video
+                'related' => $video,
+                'tag' => $tag
             ]);
+   
         }
     }
 
diff --git a/resources/views/layout1/tagviewdev.blade.php b/resources/views/layout1/tagviewdev.blade.php
index 3dfda68..ceb40f8 100644
--- a/resources/views/layout1/tagviewdev.blade.php
+++ b/resources/views/layout1/tagviewdev.blade.php
@@ -1 +1,8 @@
-{{$related}} lol
\ No newline at end of file
+
+<a href="/t/{{$tag}}">rand</a>
+<br>
+leon du huan
+<br>
+<video controls src="/b/{{ $video[0]['file'] }}"></video>
+
+<br>
\ No newline at end of file