diff --git a/shard.yml b/shard.yml
index 5180d51d..dc5cb756 100644
--- a/shard.yml
+++ b/shard.yml
@@ -11,6 +11,8 @@ targets:
 dependencies:
   kemal:
      github: kemalcr/kemal
+  pg:
+    github: will/crystal-pg
 
 crystal: 0.23.1
 
diff --git a/src/proxy.cr b/src/proxy.cr
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/visor.cr b/src/visor.cr
index 76988b29..77e7e170 100644
--- a/src/visor.cr
+++ b/src/visor.cr
@@ -1,25 +1,56 @@
+require "http/client"
+require "json"
 require "kemal"
+require "pg"
 require "xml"
-require "http/client"
-require "base64"
 
 macro templated(filename)
   render "views/#{{{filename}}}.ecr", "views/layout.ecr"
 end
 
-context = OpenSSL::SSL::Context::Client.insecure
-client = HTTP::Client.new("www.youtube.com", 443, context)
+# pg = DB.open("postgres://kemal@visor/dev")
+
+alias Type = String | Hash(String, Type)
+
+def object_to_hash(value)
+  object = {} of String => Type
+  items = value.split("&")
+  items.each do |item|
+    key, value = item.split("=")
+    value = URI.unescape(value)
+    object[key] = parse_uri(value)
+  end
+  return object
+end
 
-def params_to_hash(params)
-  pairs = params.split("&")
-  hash = Hash(String, String).new
-  pairs.each do |pair|
-    key, value = pair.split("=")
-    hash[key] = URI.unescape(value)
+def array_to_hash(value)
+  array = {} of String => Type
+  items = value.split(",")
+  count = 0
+  items.each do |item|
+    array[count.to_s] = parse_uri(item)
+    count += 1
   end
-  return hash
+  return array
 end
 
+def parse_uri(value)
+  if value.starts_with?("http") || value.starts_with?("[")
+    return value
+  else
+    if value.includes?(",")
+      return array_to_hash(value)
+    elsif value.includes?("&")
+      return object_to_hash(value)
+    else
+      return value
+    end
+  end
+end
+
+context = OpenSSL::SSL::Context::Client.insecure
+client = HTTP::Client.new("www.youtube.com", 443, context)
+
 get "/" do |env|
   templated "index"
 end
@@ -27,42 +58,37 @@ end
 get "/watch/:video_id" do |env|
   video_id = env.params.url["video_id"]
 
-  if File.exists?("video_info/#{video_id}")
-    video_info = JSON.parse(File.open("video_info/#{video_id}"))
-  else
-    video_info_encoded = HTTP::Client.get("https://www.youtube.com/get_video_info?video_id=#{video_id}&el=info&ps=default&eurl=&gl=US&hl=en", nil, nil, tls = context).body
-    video_info = params_to_hash(video_info_encoded)
+  video_info_encoded = HTTP::Client.get("https://www.youtube.com/get_video_info?video_id=#{video_id}&el=info&ps=default&eurl=&gl=US&hl=en", nil, nil, tls = context).body
+  video_info = object_to_hash(video_info_encoded)
+  body = client.get("/watch?v=#{video_id}").body
+  doc = XML.parse(body)
 
-    File.write("video_info/#{video_id}", video_info.to_json)
+  likes = doc.xpath_node(%q(//button[@title="I like this"]/span))
+  if likes
+    likes = likes.content
+  else
+    likes = "n/a"
   end
-
-  fmt_stream_map = video_info["url_encoded_fmt_stream_map"].to_s.split(",")
-  fmt_stream = Array(Hash(String, String)).new
-  fmt_stream_map.each do |fmt|
-    fmt_stream << params_to_hash(fmt.to_s)
+  
+  dislikes = doc.xpath_node(%q(//button[@title="I dislike this"]/span))
+  if dislikes
+    dislikes.content
+  else
+    dislikes = "n/a"
   end
-  fmt_stream.reverse!
+
+  File.write("video_info/#{video_id}", video_info.to_json)
   templated "watch"
 end
 
-get "/listen/:video_id" do |env|
-  video_id = env.params.url["video_id"]
+# get "/listen/:video_id" do |env|
+#   video_id = env.params.url["video_id"]
 
-  if File.exists?("video_info/#{video_id}")
-    video_info = JSON.parse(File.open("video_info/#{video_id}"))
-  else
-    video_info_encoded = HTTP::Client.get("https://www.youtube.com/get_video_info?video_id=#{video_id}&el=info&ps=default&eurl=&gl=US&hl=en", nil, nil, tls = context).body
-    video_info = params_to_hash(video_info_encoded)
-
-    File.write("video_info/#{video_id}", video_info.to_json)
-  end
-
-  adaptive_fmt = Array(Hash(String, String)).new
-  video_info["adaptive_fmts"].to_s.split(",") do |fmt|
-    adaptive_fmt << params_to_hash(video_info["adaptive_fmts"].to_s)
-  end
-  templated "listen"
-end
+#   video_info_encoded = HTTP::Client.get("https://www.youtube.com/get_video_info?video_id=#{video_id}&el=info&ps=default&eurl=&gl=US&hl=en", nil, nil, tls = context).body
+#   video_info = object_to_hash(video_info_encoded)
+#   File.write("video_info/#{video_id}", video_info.to_json)
+#   templated "listen"
+# end
 
 public_folder "assets"
 
diff --git a/views/listen.ecr b/views/listen.ecr
index 13f03805..c8040f14 100644
--- a/views/listen.ecr
+++ b/views/listen.ecr
@@ -1,16 +1,19 @@
-<h1><%= URI.unescape(video_info["title"].to_s,true) %></h1>
-<video style="width: 100%" poster="<%= video_info["iurlmq"] %>" controls>
-<% adaptive_fmt.each do |fmt| %>
-    <% fmt_type = fmt["type"].to_s.split(";")[0] %>
-    <% if fmt_type.starts_with?("audio") %> 
-    <source src="<%= fmt["url"] %>" type="<%= fmt_type %>">
+<% title = URI.unescape(video_info["title"].as(String), true) %>
+<h1><%= title %></h1>
+<video style="width: 100%" poster="<%= video_info["iurlhq720"] %>" controls>
+<% video_info["adaptive_fmts"].as(Hash).each do |key, value| %>
+    <% url = value["url"] %>
+    <% type = value["type"].to_s.split(";")[0] %>
+    <% if type.starts_with?("audio") %>
+        <source src="<%= url %>" type="<%= type %>">
     <% end %>
 <% end %>
 </video>
-
-
 <div class="pure-g">
 <div class="pure-u-1 pure-u-md-1-5"></div>
 <div class="pure-u-1 pure-u-md-3-5"></div>
-<div class="pure-u-1 pure-u-md-1-5"></div>
+<div class="pure-u-1 pure-u-md-1-5">
+    <p>Views : <%= video_info["view_count"] %></p>
+    <p>Rating : <%= video_info["avg_rating"] %></p>
+</div>
 </div>
\ No newline at end of file
diff --git a/views/watch.ecr b/views/watch.ecr
index e46cf77c..3ad33676 100644
--- a/views/watch.ecr
+++ b/views/watch.ecr
@@ -1,15 +1,20 @@
-<h1><%= URI.unescape(video_info["title"].to_s,true) %></h1>
-<video style="width: 100%" poster="<%= video_info["iurlmq"] %>" controls>
-    <% fmt_stream.each do |fmt| %>
-        <source src="<%= fmt["url"] %>" type="<%= fmt["type"].to_s.split(";")[0] %>">
-    <% end %>
+<% title = URI.unescape(video_info["title"].as(String), true) %>
+<h1><%= title %></h1>
+<video style="width: 100%" poster="<%= video_info["iurl"] %>" controls>
+<% video_info["url_encoded_fmt_stream_map"].as(Hash).each do |key, value| %>
+    <% url = value["url"] %>
+    <% type = value["type"]["0"].to_s.split(";")[0] %>
+    <source src="<%= url %>" type="<%= type %>">
+<% end %>
 </video>
 <div class="pure-g">
-<div class="pure-u-1 pure-u-md-1-5"></div>
-<div class="pure-u-1 pure-u-md-3-5">
-<% fmt_stream.each do |fmt| %>
-<p><%= fmt["quality"] %></p>
-<% end %>
-</div>
-<div class="pure-u-1 pure-u-md-1-5"></div>
+    <div class="pure-u-1 pure-u-md-1-5">
+        <p>Likes: <%= likes %></p>
+        <p>Dislikes: <%= dislikes %></p>
+    </div>
+    <div class="pure-u-1 pure-u-md-3-5"></div>
+    <div class="pure-u-1 pure-u-md-1-5">
+        <p>Views : <%= video_info["view_count"] %></p>
+        <p>Rating : <%= video_info["avg_rating"] %></p>
+    </div>
 </div>
\ No newline at end of file