diff --git a/README.md b/README.md
index 4cd48f07..05544c30 100644
--- a/README.md
+++ b/README.md
@@ -61,8 +61,8 @@ There is only an `Octo <object> <action> [arguments]` command:
 | gist | list | [repo] [key=value]*<br>[Available keys](https://cli.github.com/manual/gh_gist_list):  `repo`\|`public`\|`secret`<br>Mappings:<br>`<CR>`: Append Gist to buffer<br>`<C-b>`: Opens Gist in web browser |
 | comment | add | |
 | | delete | |
-| | resolve | |
-| | unresolve | |
+| thread | resolve| Mark a review thread as resolved |
+| | unresolve | Mark a review thread as unresolved |
 | label | add | <label> |
 | | delete | <label> |
 | assignees| add | <assignee> |
@@ -178,14 +178,16 @@ Just edit the issue title, description or comments as a regular buffer and use `
 | Name                        | Default          |
 | ---                         | ---              |
 | `OctoNvimDirty`             | `ErrorMsg`       |
-| `OctoNvimCommentHeading`    | `PreProc`        |
-| `OctoNvimCommentUser`       | `Underlined`     |
+| `OctoNvimUser`              | `String`     |
 | `OctoNvimIssueTitle`        | `PreProc`        |
 | `OctoNvimIssueId`           | `Question`       |
 | `OctoNvimIssueOpen`         | `MoreMsg`        |
 | `OctoNvimIssueClosed`       | `ErrorMsg`       |
 | `OctoNvimEmpty`             | `Comment`        |
 | `OctoNvimFloat`             | `NormalNC`       |
+| `OctoNvimDate`              | `Comment`       |
+| `OctoNvimSymbol`            | `Comment`       |
+| `OctoNvimTimelineItemHeading`| `Comment`       |
 | `OctoNvimBubbleRed`         | `DiffDelete`.fg  |
 | `OctoNvimBubbleGreen`       | `DiffAdd`.fg     |
 | `OctoNvimBubbleDelimiter`   | `NormalFloat`.bg |
@@ -200,6 +202,7 @@ Just edit the issue title, description or comments as a regular buffer and use `
 | `OctoNvimPullAdditions`     | `DiffAdd`        |
 | `OctoNvimPullDeletions`     | `DiffDelete`     |
 | `OctoNvimPullModifications` | `DiffChange`     |
+| `OctoNvimEditable`          | `NormalFloat`.bg|
 
 ## Settings
 
diff --git a/after/syntax/octo_issue.vim b/after/syntax/octo_issue.vim
index 83c019a0..2583d1be 100644
--- a/after/syntax/octo_issue.vim
+++ b/after/syntax/octo_issue.vim
@@ -4,15 +4,8 @@ if exists('b:current_syntax')
   unlet b:current_syntax
 endif
 
-syntax include @markdown syntax/markdown.vim
-unlet b:current_syntax
-
-syntax region issue_comment matchgroup=OctoNvimCommentDelimiters start=/commented:\n\n/ keepend end=/\n\n\n/ contains=@markdown
-syntax region issue_comment matchgroup=OctoNvimCommentDelimiters start=/\n\n/ keepend end=/\n\n\nOn/ contains=@markdown
-
 hi def link OctoNvimDirty ErrorMsg
-hi def link OctoNvimCommentHeading PreProc
-hi def link OctoNvimCommentUser String 
+hi def link OctoNvimUser String 
 hi def link OctoNvimIssueOpen MoreMsg
 hi def link OctoNvimIssueClosed ErrorMsg
 hi def link OctoNvimIssueMerged Keyword
@@ -20,9 +13,29 @@ hi def link OctoNvimIssueId Question
 hi def link OctoNvimIssueTitle PreProc
 hi def link OctoNvimEmpty Comment
 hi def link OctoNvimFloat NormalFloat
+hi def link OctoNvimTimelineItemHeading Comment
+hi def link OctoNvimSymbol Comment
+hi def link OctoNvimDate Comment
 hi def link OctoNvimDetailsLabel Title 
-hi def link OctoNvimMissingDetails Comment
 hi def link OctoNvimDetailsValue Identifier
+hi def link OctoNvimMissingDetails Comment
+
+call matchadd('Conceal', ':heart:', 10, -1, {'conceal':'❤️'})
+call matchadd('Conceal', ':+1:', 10, -1, {'conceal':'👍'})
+call matchadd('Conceal', ':see_no_evil:', 10, -1, {'conceal':'🙈'})
+call matchadd('Conceal', ':laughing:', 10, -1, {'conceal':'😆'})
+call matchadd('Conceal', ':thinking_face:', 10, -1, {'conceal':'🤔'})
+call matchadd('Conceal', ':thinking:', 10, -1, {'conceal':'🤔'})
+call matchadd('Conceal', ':ok_hand:', 10, -1, {'conceal':'👌'})
+call matchadd('Conceal', ':upside_down_face:', 10, -1, {'conceal':'🙃'})
+call matchadd('Conceal', ':grimacing:', 10, -1, {'conceal':'😬'})
+call matchadd('Conceal', ':rocket:', 10, -1, {'conceal':'🚀'})
+call matchadd('Conceal', ':blush:', 10, -1, {'conceal':'😊'})
+call matchadd('Conceal', ':tada:', 10, -1, {'conceal':'🎉'})
+call matchadd('Conceal', ':shrug:', 10, -1, {'conceal':'🤷'})
+call matchadd('Conceal', ':man_shrugging:', 10, -1, {'conceal':'🤷'})
+call matchadd('Conceal', ':face_palm:', 10, -1, {'conceal':'🤦'})
+call matchadd('Conceal', ':man_facepalmin:', 10, -1, {'conceal':'🤦'})
 
 " restore current syntax value
 if exists('old_syntax')
diff --git a/lua/octo/commands.lua b/lua/octo/commands.lua
index 6729a7ad..874d5019 100644
--- a/lua/octo/commands.lua
+++ b/lua/octo/commands.lua
@@ -103,7 +103,7 @@ local commands = {
     end,
     threads = function()
       M.review_threads()
-    end,
+    end
   },
   gist = {
     list = function(...)
@@ -116,18 +116,20 @@ local commands = {
       menu.gists(opts)
     end
   },
+  thread = {
+    resolve = function()
+      M.resolve_comment()
+    end,
+    unresolve = function()
+      M.unresolve_comment()
+    end
+  },
   comment = {
     add = function()
       M.add_comment()
     end,
     delete = function()
       M.delete_comment()
-    end,
-    resolve = function()
-      M.resolve_comment()
-    end,
-    unresolve = function()
-      M.unresolve_comment()
     end
   },
   label = {
@@ -251,32 +253,102 @@ function M.parse_url(url)
     type = "issue"
   end
   if repo and number then
-    if "issue" == type then M.get_issue(repo, number); return true end
-    if "pull" == type then M.get_pull_request(repo, number); return true end
+    if "issue" == type then
+      M.get_issue(repo, number)
+      return true
+    end
+    if "pull" == type then
+      M.get_pull_request(repo, number)
+      return true
+    end
   end
   return false
 end
 
 function M.add_comment()
   local bufnr = api.nvim_get_current_buf()
-  local repo, _ = util.get_repo_number({"octo_issue", "octo_reviewthread"})
+  local repo = util.get_repo_number({"octo_issue", "octo_reviewthread"})
   if not repo then
     return
   end
 
+  local kind
+  local cursor = api.nvim_win_get_cursor(0)
+  local thread_id, _, thread_end_line, first_comment_id = util.get_thread_at_cursor(bufnr, cursor)
+  if thread_id then
+    kind = "PullRequestReviewComment"
+  else
+    kind = "IssueComment"
+  end
+
   local comment = {
     createdAt = vim.fn.strftime("%FT%TZ"),
     author = {login = vim.g.octo_loggedin_user},
     body = " ",
-    reactions = {
-      totalCount = 0,
-      nodes = {}
-    },
-    id = -1
+    first_comment_id = first_comment_id,
+    id = -1,
+    reactionGroups = {
+      {
+        content = "THUMBS_UP",
+        users = {
+          totalCount = 0
+        }
+      },
+      {
+        content = "THUMBS_DOWN",
+        users = {
+          totalCount = 0
+        }
+      },
+      {
+        content = "LAUGH",
+        users = {
+          totalCount = 0
+        }
+      },
+      {
+        content = "HOORAY",
+        users = {
+          totalCount = 0
+        }
+      },
+      {
+        content = "CONFUSED",
+        users = {
+          totalCount = 0
+        }
+      },
+      {
+        content = "HEART",
+        users = {
+          totalCount = 0
+        }
+      },
+      {
+        content = "ROCKET",
+        users = {
+          totalCount = 0
+        }
+      },
+      {
+        content = "EYES",
+        users = {
+          totalCount = 0
+        }
+      }
+    }
   }
-  writers.write_comment(bufnr, comment)
-  vim.fn.execute("normal! Gkkk")
-  vim.fn.execute("startinsert")
+  if kind == "IssueComment" or vim.bo.ft == "octo_reviewthread" then
+    -- just place it at the bottom
+    writers.write_comment(bufnr, comment, kind)
+    vim.fn.execute("normal! Gkkk")
+    vim.fn.execute("startinsert")
+  elseif kind == "PullRequestReviewComment" and vim.bo.ft == "octo_issue" then
+    api.nvim_buf_set_lines(bufnr, thread_end_line + 1, thread_end_line + 1, false, {"x", "x", "x", "x", "x", "x"})
+    writers.write_comment(bufnr, comment, kind, thread_end_line + 2)
+    vim.fn.execute(":" .. thread_end_line + 4)
+    vim.fn.execute("startinsert")
+  end
 end
 
 function M.delete_comment()
@@ -286,24 +358,28 @@ function M.delete_comment()
     return
   end
   local cursor = api.nvim_win_get_cursor(0)
-  local comment, start_line, end_line = unpack(util.get_comment_at_cursor(bufnr, cursor))
+  local comment, start_line, end_line = util.get_comment_at_cursor(bufnr, cursor)
   if not comment then
     print("The cursor does not seem to be located at any comment")
     return
   end
+  local query
+  if comment.kind == "IssueComment" then
+    query = graphql("delete_issue_comment_mutation", comment.id)
+  elseif comment.kind == "PullRequestReviewComment" then
+    query = graphql("delete_pull_request_review_comment_mutation", comment.id)
+  elseif comment.kind == "PullRequestReview" then
+    -- Review top level comments cannot be deleted here
+    return
+  end
   local choice = vim.fn.confirm("Delete comment?", "&Yes\n&No\n&Cancel", 2)
   if choice == 1 then
-    local kind = util.get_buffer_kind(bufnr)
-    -- TODO: graphql
     gh.run(
       {
-        args = {
-          "api",
-          "-X",
-          "DELETE",
-          format("repos/%s/%s/comments/%s", repo, kind, comment.id)
-        },
+        args = {"api", "graphql", "-f", format("query=%s", query)},
         cb = function(_)
+          -- TODO: deleting the last review thread comment, it deletes the whole thread
+          -- so diff hunk should not be showed any more
           api.nvim_buf_set_lines(bufnr, start_line - 2, end_line + 1, false, {})
           api.nvim_buf_clear_namespace(bufnr, comment.namespace, 0, -1)
           api.nvim_buf_clear_namespace(bufnr, constants.OCTO_REACTIONS_VT_NS, start_line - 2, end_line + 1)
@@ -324,17 +400,21 @@ end
 
 function M.resolve_comment()
   local bufnr = api.nvim_get_current_buf()
-  local repo, _ = util.get_repo_number({"octo_reviewthread"})
+  local repo, _ = util.get_repo_number({"octo_issue", "octo_reviewthread"})
   if not repo then
     return
   end
-  local status, _, thread_id, comment_id =
-    string.find(api.nvim_buf_get_name(bufnr), "octo://.*/pull/%d+/reviewthread/(.*)/comment/(.*)")
-  if not status then
-    api.nvim_err_writeln("Cannot extract thread id from buffer name")
-    return
+
+  local thread_id, thread_line, comment_id
+  if vim.bo.ft == "octo_issue" then
+    local cursor = api.nvim_win_get_cursor(0)
+    thread_id, thread_line = util.get_thread_at_cursor(bufnr, cursor)
+  elseif vim.bo.ft == "octo_reviewthread" then
+    local bufname = api.nvim_buf_get_name(bufnr)
+    thread_id, comment_id = string.match(bufname, "octo://.*/pull/%d+/reviewthread/([^/]+)/comment/(.*)")
   end
-  local query = format(graphql.resolve_review_mutation, thread_id)
+
+  local query = graphql("resolve_review_thread_mutation", thread_id)
   gh.run(
     {
       args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -343,18 +423,36 @@ function M.resolve_comment()
           api.nvim_err_writeln(stderr)
         elseif output then
           local resp = json.parse(output)
-          if resp.data.resolveReviewThread.thread.isResolved then
-            local pattern = format("%s/%s", thread_id, comment_id)
-            local qf = vim.fn.getqflist({items = 0})
-            local items = qf.items
-            for _, item in ipairs(items) do
-              if item.pattern == pattern then
-                item.text = string.gsub(item.text, "%) ", ") RESOLVED ", 1)
-                break
+          local thread = resp.data.resolveReviewThread.thread
+          if thread.isResolved then
+            if vim.bo.ft == "octo_issue" then
+              -- review thread header
+              local start_line = thread.originalStartLine ~= vim.NIL and thread.originalStartLine or thread.originalLine
+              local end_line = thread.originalLine
+              writers.write_review_thread_header(
+                bufnr,
+                {
+                  path = thread.path,
+                  start_line = start_line,
+                  end_line = end_line,
+                  isOutdated = thread.isOutdated,
+                  isResolved = thread.isResolved
+                },
+                thread_line - 2
+              )
+              vim.cmd(string.format("%d,%dfoldclose", thread_line, thread_line))
+            elseif vim.bo.ft == "octo_reviewthread" then
+              local pattern = format("%s/%s", thread_id, comment_id)
+              local qf = vim.fn.getqflist({items = 0})
+              local items = qf.items
+              for _, item in ipairs(items) do
+                if item.pattern == pattern then
+                  item.text = string.gsub(item.text, "%) ", ") RESOLVED ", 1)
+                  break
+                end
               end
+              vim.fn.setqflist({}, "r", {items = items})
             end
-            vim.fn.setqflist({}, "r", {items = items})
-            print("RESOLVED!")
           end
         end
       end
@@ -364,17 +462,21 @@ end
 
 function M.unresolve_comment()
   local bufnr = api.nvim_get_current_buf()
-  local repo, _ = util.get_repo_number({"octo_reviewthread"})
+  local repo, _ = util.get_repo_number({"octo_issue", "octo_reviewthread"})
   if not repo then
     return
   end
-  local status, _, thread_id, comment_id =
-    string.find(api.nvim_buf_get_name(bufnr), "octo://.*/pull/%d+/reviewthread/(.*)/comment/(.*)")
-  if not status then
-    api.nvim_err_writeln("Cannot extract thread id from buffer name")
-    return
+
+  local thread_id, thread_line, comment_id
+  if vim.bo.ft == "octo_issue" then
+    local cursor = api.nvim_win_get_cursor(0)
+    thread_id, thread_line = util.get_thread_at_cursor(bufnr, cursor)
+  elseif vim.bo.ft == "octo_reviewthread" then
+    local bufname = api.nvim_buf_get_name(bufnr)
+    thread_id, comment_id = string.match(bufname, "octo://.*/pull/%d+/reviewthread/([^/]+)/comment/(.*)")
   end
-  local query = format(graphql.unresolve_review_mutation, thread_id)
+
+  local query = graphql("unresolve_review_thread_mutation", thread_id)
   gh.run(
     {
       args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -383,18 +485,37 @@ function M.unresolve_comment()
           api.nvim_err_writeln(stderr)
         elseif output then
           local resp = json.parse(output)
-          if not resp.data.unresolveReviewThread.thread.isResolved then
-            local pattern = format("%s/%s", thread_id, comment_id)
-            local qf = vim.fn.getqflist({items = 0})
-            local items = qf.items
-            for _, item in ipairs(items) do
-              if item.pattern == pattern then
-                item.text = string.gsub(item.text, "RESOLVED ", "")
-                break
+          local thread = resp.data.unresolveReviewThread.thread
+          if not thread.isResolved then
+            if vim.bo.ft == "octo_issue" then
+              -- review thread header
+              local start_line = thread.originalStartLine ~= vim.NIL and thread.originalStartLine or thread.originalLine
+              local end_line = thread.originalLine
+              writers.write_review_thread_header(
+                bufnr,
+                {
+                  path = thread.path,
+                  start_line = start_line,
+                  end_line = end_line,
+                  isOutdated = thread.isOutdated,
+                  isResolved = thread.isResolved
+                },
+                thread_line - 2
+              )
+            elseif vim.bo.ft == "octo_reviewthread" then
+              local pattern = format("%s/%s", thread_id, comment_id)
+              print(pattern)
+              local qf = vim.fn.getqflist({items = 0})
+              local items = qf.items
+              for _, item in ipairs(items) do
+                if item.pattern == pattern then
+                  print("found")
+                  item.text = string.gsub(item.text, "RESOLVED ", "")
+                  break
+                end
               end
+              vim.fn.setqflist({}, "r", {items = items})
             end
-            vim.fn.setqflist({}, "r", {items = items})
-            print("UNRESOLVED!")
           end
         end
       end
@@ -417,9 +538,9 @@ function M.change_state(type, state)
   local id = api.nvim_buf_get_var(bufnr, "iid")
   local query
   if type == "issue" then
-    query = format(graphql.update_issue_state_mutation, id, state)
+    query = graphql("update_issue_state_mutation", id, state)
   elseif type == "pull" then
-    query = format(graphql.update_pull_request_state_mutation, id, state)
+    query = graphql("update_pull_request_state_mutation", id, state)
   end
 
   gh.run(
@@ -464,7 +585,7 @@ function M.create_issue(repo)
   vim.fn.inputrestore()
 
   local repo_id = util.get_repo_id(repo)
-  local query = format(graphql.create_issue_mutation, repo_id, title, constants.NO_BODY_MSG)
+  local query = graphql("create_issue_mutation", repo_id, title, constants.NO_BODY_MSG)
   gh.run(
     {
       args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -564,7 +685,7 @@ function M.pr_checks()
             end
             table.insert(lines, table.concat(line, "  "))
           end
-          local _, bufnr = util.create_content_popup(lines)
+          local _, bufnr = util.create_popup({content=lines})
           local buf_lines = api.nvim_buf_get_lines(bufnr, 0, -1, false)
           for i, l in ipairs(buf_lines) do
             if #vim.split(l, "pass") > 1 then
@@ -625,7 +746,6 @@ function M.show_pr_diff()
     return
   end
   local url = format("/repos/%s/pulls/%s", repo, number)
-  -- TODO: graphql
   gh.run(
     {
       args = {"api", url},
@@ -652,7 +772,7 @@ function M.review_threads()
   end
   local owner = vim.split(repo, "/")[1]
   local name = vim.split(repo, "/")[2]
-  local query = format(graphql.review_threads_query, owner, name, number)
+  local query = graphql("review_threads_query", owner, name, number)
   gh.run(
     {
       args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -669,26 +789,26 @@ function M.review_threads()
 end
 
 function M.submit_review()
-  local winnr, bufnr = util.create_popup({""}, {
-    line = 5,
-    col = 5,
-    width = math.floor(vim.o.columns * 0.9),
-    height = math.floor(vim.o.lines * 0.5)
+  local winid, bufnr = util.create_popup({
+    header = "Press <c-a> to approve, <c-m> to comment or <c-r> to request changes"
   })
-  api.nvim_set_current_win(winnr)
+  api.nvim_set_current_win(winid)
+  api.nvim_buf_set_option(bufnr, "syntax", "markdown")
 
-  local help_vt = {
-    {"Press <c-a> to approve, <c-m> to comment or <c-r> to request changes", "OctoNvimDetailsValue"}
-  }
-  writers.write_block({"", "", ""}, {bufnr = bufnr, mark = false, line = 1})
-  api.nvim_buf_set_virtual_text(bufnr, constants.OCTO_TITLE_VT_NS, 0, help_vt, {})
   local mapping_opts = {script = true, silent = true, noremap = true}
-  api.nvim_buf_set_keymap(bufnr, "n", "q", format(":call nvim_win_close(%d, 1)<CR>", winnr), mapping_opts)
-  api.nvim_buf_set_keymap(bufnr, "n", "<esc>", format(":call nvim_win_close(%d, 1)<CR>", winnr), mapping_opts)
-  api.nvim_buf_set_keymap(bufnr, "n", "<C-c>", format(":call nvim_win_close(%d, 1)<CR>", winnr), mapping_opts)
+  api.nvim_buf_set_keymap(bufnr, "i", "<CR>", "<CR>", mapping_opts)
+  api.nvim_buf_set_keymap(bufnr, "n", "q", format(":call nvim_win_close(%d, 1)<CR>", winid), mapping_opts)
+  api.nvim_buf_set_keymap(bufnr, "n", "<esc>", format(":call nvim_win_close(%d, 1)<CR>", winid), mapping_opts)
+  api.nvim_buf_set_keymap(bufnr, "n", "<C-c>", format(":call nvim_win_close(%d, 1)<CR>", winid), mapping_opts)
   api.nvim_buf_set_keymap(bufnr, "n", "<C-a>", ":lua require'octo.reviews'.submit_review('APPROVE')<CR>", mapping_opts)
   api.nvim_buf_set_keymap(bufnr, "n", "<C-m>", ":lua require'octo.reviews'.submit_review('COMMENT')<CR>", mapping_opts)
-  api.nvim_buf_set_keymap(bufnr, "n", "<C-r>", ":lua require'octo.reviews'.submit_review('REQUEST_CHANGES')<CR>", mapping_opts)
+  api.nvim_buf_set_keymap(
+    bufnr,
+    "n",
+    "<C-r>",
+    ":lua require'octo.reviews'.submit_review('REQUEST_CHANGES')<CR>",
+    mapping_opts
+  )
   vim.cmd [[normal G]]
   --vim.cmd [[startinsert]]
 end
@@ -721,13 +841,16 @@ function M.start_review()
             }
             table.insert(changes, change)
           end
-          reviews.populate_changes_qf(changes, {
-            pull_request_repo = repo,
-            pull_request_number = number,
-            pull_request_id = pr.id,
-            baseRefSHA = pr.baseRefSHA,
-            headRefSHA = pr.headRefSHA
-          })
+          reviews.populate_changes_qf(
+            changes,
+            {
+              pull_request_repo = repo,
+              pull_request_number = number,
+              pull_request_id = pr.id,
+              baseRefSHA = pr.baseRefSHA,
+              headRefSHA = pr.headRefSHA
+            }
+          )
         end
       end
     }
@@ -737,7 +860,14 @@ end
 function M.reaction_action(action, reaction)
   local bufnr = api.nvim_get_current_buf()
 
-  local repo, number = util.get_repo_number({"octo_issue", "octo_reviewthread"})
+  reaction = reaction:upper()
+  if reaction == "+1" then
+    reaction = "THUMBS_UP"
+  elseif reaction == "-1" then
+    reaction = "THUMBS_DOWN"
+  end
+
+  local repo, _ = util.get_repo_number({"octo_issue", "octo_reviewthread"})
   if not repo then
     return
   end
@@ -745,102 +875,51 @@ function M.reaction_action(action, reaction)
   local cursor = api.nvim_win_get_cursor(0)
   local comment = util.get_comment_at_cursor(bufnr, cursor)
 
-  local url, args, line, cb_url, reactions
+  local query, reaction_line, reaction_groups
 
   if comment then
     -- found a comment at cursor
-    local kind = util.get_buffer_kind(bufnr)
-    comment = comment[1]
-    cb_url = format("repos/%s/%s/comments/%d", repo, kind, comment.id)
-    line = comment.reaction_line
-    reactions = comment.reactions
+    reaction_groups = comment.reaction_groups
+    reaction_line = comment.reaction_line
 
     if action == "add" then
-      url = format("repos/%s/%s/comments/%d/reactions", repo, kind, comment.id)
-      args = {"api", "-X", "POST", "-f", format("content=%s", reaction), url}
+      query = graphql("add_reaction_mutation", comment.id, reaction)
     elseif action == "delete" then
-      -- get list of reactions for issue comment and filter by user login and reaction
-      -- TODO: graphql
-      local output =
-        gh.run(
-        {
-          mode = "sync",
-          args = {"api", format("repos/%s/%s/comments/%d/reactions", repo, kind, comment.id)}
-        }
-      )
-      for _, r in ipairs(json.parse(output)) do
-        if r.user.login == vim.g.octo_loggedin_user and reaction == r.content then
-          url = format("repos/%s/%s/comments/%d/reactions/%d", repo, kind, comment.id, r.id)
-          args = {"api", "-X", "DELETE", url}
-          break
-        end
-      end
+      query = graphql("remove_reaction_mutation", comment.id, reaction)
     end
   elseif vim.bo.ft == "octo_issue" then
     -- cursor not located on a comment, using the issue instead
-    cb_url = format("repos/%s/issues/%d", repo, number)
     reactions = api.nvim_buf_get_var(bufnr, "body_reactions")
-    line = api.nvim_buf_get_var(bufnr, "body_reaction_line")
+    reaction_line = api.nvim_buf_get_var(bufnr, "body_reaction_line")
+
+    local id = api.nvim_buf_get_var(bufnr, "iid")
     if action == "add" then
-      url = format("repos/%s/issues/%d/reactions", repo, number)
-      args = {"api", "-X", "POST", "-f", format("content=%s", reaction), url}
+      query = graphql("add_reaction_mutation", id, reaction)
     elseif action == "delete" then
-      -- get list of reactions for issue comment and filter by user login and reaction
-      local output =
-        -- TODO: graphql
-        gh.run(
-        {
-          mode = "sync",
-          args = {"api", format("repos/%s/issues/%d/reactions", repo, number)}
-        }
-      )
-      for _, r in ipairs(json.parse(output)) do
-        if r.user.login == vim.g.octo_loggedin_user and reaction == r.content then
-          url = format("repos/%s/issues/%d/reactions/%d", repo, number, r.id)
-          args = {"api", "-X", "DELETE", url}
-          break
-        end
-      end
+      query = graphql("remove_reaction_mutation", id, reaction)
     end
   end
 
-  if not args or not cb_url then
-    return
-  end
-
   -- add/delete reaction
-  -- TODO: graphql
   gh.run(
     {
-      args = args,
+      args = {"api", "graphql", "-f", format("query=%s", query)},
       cb = function(output, stderr)
         if stderr and not util.is_blank(stderr) then
           api.nvim_err_writeln(stderr)
         elseif output then
-          reaction = string.upper(reaction)
-          if reaction == "+1" then
-            reaction = "THUMBS_UP"
-          elseif reaction == "-1" then
-            reaction = "THUMBS_DOWN"
-          end
+          local resp = json.parse(output)
           if action == "add" then
-            table.insert(reactions.nodes, {content = reaction})
-            reactions.totalCount = reactions.totalCount + 1
+            reaction_groups = resp.data.addReaction.subject.reactionGroups
           elseif action == "delete" then
-            for i, r in pairs(reactions.nodes) do
-              if r.content == reaction then
-                table.remove(reactions.nodes, i)
-                break
-              end
-            end
-            reactions.totalCount = reactions.totalCount - 1
+            reaction_groups = resp.data.removeReaction.subject.reactionGroups
           end
 
           -- update comment metadata with new reactions
-          util.update_reactions_at_cursor(bufnr, cursor, reactions) --, line)
+          util.update_reactions_at_cursor(bufnr, cursor, reaction_groups)
 
           -- refresh reactions
-          writers.write_reactions(bufnr, reactions, line)
+          writers.write_reactions(bufnr, reaction_groups, reaction_line)
         end
       end
     }
@@ -886,28 +965,31 @@ function M.add_project_card()
   end
 
   -- show column selection menu
-  menu.select_target_project_column(function(column_id)
-
-    -- add new card
-    local query = format(graphql.add_project_card_mutation, iid, column_id)
-    gh.run(
-      {
-        args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
-        cb = function(output, stderr)
-          if stderr and not util.is_blank(stderr) then
-            api.nvim_err_writeln(stderr)
-          elseif output then
-            -- refresh issue/pr details
-            octo.load(bufnr, function(obj)
-              writers.write_details(bufnr, obj, true)
-              api.nvim_buf_set_var(bufnr, "cards", obj.projectCards)
-            end)
+  menu.select_target_project_column(
+    function(column_id)
+      -- add new card
+      local query = graphql("add_project_card_mutation", iid, column_id)
+      gh.run(
+        {
+          args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
+          cb = function(output, stderr)
+            if stderr and not util.is_blank(stderr) then
+              api.nvim_err_writeln(stderr)
+            elseif output then
+              -- refresh issue/pr details
+              octo.load(
+                bufnr,
+                function(obj)
+                  writers.write_details(bufnr, obj, true)
+                  api.nvim_buf_set_var(bufnr, "cards", obj.projectCards)
+                end
+              )
+            end
           end
-        end
-      }
-    )
-  end)
-
+        }
+      )
+    end
+  )
 end
 
 function M.delete_project_card()
@@ -918,43 +1000,10 @@ function M.delete_project_card()
   end
 
   -- show card selection menu
-  menu.select_project_card(function(card)
-
-    -- delete card
-    local query = format(graphql.delete_project_card_mutation, card)
-    gh.run(
-      {
-        args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
-        cb = function(output, stderr)
-          if stderr and not util.is_blank(stderr) then
-            api.nvim_err_writeln(stderr)
-          elseif output then
-            -- refresh issue/pr details
-            octo.load(bufnr, function(obj)
-              writers.write_details(bufnr, obj, true)
-              api.nvim_buf_set_var(bufnr, "cards", obj.projectCards)
-            end)
-          end
-        end
-      }
-    )
-  end)
-end
-
-function M.move_project_card()
-  local bufnr = api.nvim_get_current_buf()
-  local repo = util.get_repo_number()
-  if not repo then
-    return
-  end
-
-  menu.select_project_card(function(source_card)
-
-    -- show project column selection menu
-    menu.select_target_project_column(function(target_column)
-
-      -- move card to selected column
-      local query = format(graphql.move_project_card_mutation, source_card, target_column)
+  menu.select_project_card(
+    function(card)
+      -- delete card
+      local query = graphql("delete_project_card_mutation", card)
       gh.run(
         {
           args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
@@ -963,16 +1012,58 @@ function M.move_project_card()
               api.nvim_err_writeln(stderr)
             elseif output then
               -- refresh issue/pr details
-              octo.load(bufnr, function(obj)
-                writers.write_details(bufnr, obj, true)
-                api.nvim_buf_set_var(bufnr, "cards", obj.projectCards)
-              end)
+              octo.load(
+                bufnr,
+                function(obj)
+                  writers.write_details(bufnr, obj, true)
+                  api.nvim_buf_set_var(bufnr, "cards", obj.projectCards)
+                end
+              )
             end
           end
         }
       )
-    end)
-  end)
+    end
+  )
+end
+
+function M.move_project_card()
+  local bufnr = api.nvim_get_current_buf()
+  local repo = util.get_repo_number()
+  if not repo then
+    return
+  end
+
+  menu.select_project_card(
+    function(source_card)
+      -- show project column selection menu
+      menu.select_target_project_column(
+        function(target_column)
+          -- move card to selected column
+          local query = graphql("move_project_card_mutation", source_card, target_column)
+          gh.run(
+            {
+              args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
+              cb = function(output, stderr)
+                if stderr and not util.is_blank(stderr) then
+                  api.nvim_err_writeln(stderr)
+                elseif output then
+                  -- refresh issue/pr details
+                  octo.load(
+                    bufnr,
+                    function(obj)
+                      writers.write_details(bufnr, obj, true)
+                      api.nvim_buf_set_var(bufnr, "cards", obj.projectCards)
+                    end
+                  )
+                end
+              end
+            }
+          )
+        end
+      )
+    end
+  )
 end
 
 function M.reload(bufnr)
@@ -996,25 +1087,29 @@ function M.add_label()
     api.nvim_err_writeln("Cannot get issue/pr id")
   end
 
-  menu.select_label(function(label_id)
-
-    local query = format(graphql.add_labels_mutation, iid, label_id)
-    gh.run(
-      {
-        args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
-        cb = function(output, stderr)
-          if stderr and not util.is_blank(stderr) then
-            api.nvim_err_writeln(stderr)
-          elseif output then
-            -- refresh issue/pr details
-            octo.load(bufnr, function(obj)
-              writers.write_details(bufnr, obj, true)
-            end)
+  menu.select_label(
+    function(label_id)
+      local query = graphql("add_labels_mutation", iid, label_id)
+      gh.run(
+        {
+          args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
+          cb = function(output, stderr)
+            if stderr and not util.is_blank(stderr) then
+              api.nvim_err_writeln(stderr)
+            elseif output then
+              -- refresh issue/pr details
+              octo.load(
+                bufnr,
+                function(obj)
+                  writers.write_details(bufnr, obj, true)
+                end
+              )
+            end
           end
-        end
-      }
-    )
-  end)
+        }
+      )
+    end
+  )
 end
 
 function M.delete_label()
@@ -1029,25 +1124,29 @@ function M.delete_label()
     api.nvim_err_writeln("Cannot get issue/pr id")
   end
 
-  menu.select_assigned_label(function(label_id)
-
-    local query = format(graphql.remove_labels_mutation, iid, label_id)
-    gh.run(
-      {
-        args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
-        cb = function(output, stderr)
-          if stderr and not util.is_blank(stderr) then
-            api.nvim_err_writeln(stderr)
-          elseif output then
-            -- refresh issue/pr details
-            octo.load(bufnr, function(obj)
-              writers.write_details(bufnr, obj, true)
-            end)
+  menu.select_assigned_label(
+    function(label_id)
+      local query = graphql("remove_labels_mutation", iid, label_id)
+      gh.run(
+        {
+          args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
+          cb = function(output, stderr)
+            if stderr and not util.is_blank(stderr) then
+              api.nvim_err_writeln(stderr)
+            elseif output then
+              -- refresh issue/pr details
+              octo.load(
+                bufnr,
+                function(obj)
+                  writers.write_details(bufnr, obj, true)
+                end
+              )
+            end
           end
-        end
-      }
-    )
-  end)
+        }
+      )
+    end
+  )
 end
 
 function M.add_user(subject)
@@ -1062,29 +1161,34 @@ function M.add_user(subject)
     api.nvim_err_writeln("Cannot get issue/pr id")
   end
 
-  menu.select_user(function(user_id)
-    local query
-    if subject == "assignee" then
-      query = format(graphql.add_assignees_mutation, iid, user_id)
-    elseif subject == "reviewer" then
-      query = format(graphql.request_reviews_mutation, iid, user_id)
-    end
-    gh.run(
-      {
-        args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
-        cb = function(output, stderr)
-          if stderr and not util.is_blank(stderr) then
-            api.nvim_err_writeln(stderr)
-          elseif output then
-            -- refresh issue/pr details
-            octo.load(bufnr, function(obj)
-              writers.write_details(bufnr, obj, true)
-            end)
+  menu.select_user(
+    function(user_id)
+      local query
+      if subject == "assignee" then
+        query = graphql("add_assignees_mutation", iid, user_id)
+      elseif subject == "reviewer" then
+        query = graphql("request_reviews_mutation", iid, user_id)
+      end
+      gh.run(
+        {
+          args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
+          cb = function(output, stderr)
+            if stderr and not util.is_blank(stderr) then
+              api.nvim_err_writeln(stderr)
+            elseif output then
+              -- refresh issue/pr details
+              octo.load(
+                bufnr,
+                function(obj)
+                  writers.write_details(bufnr, obj, true)
+                end
+              )
+            end
           end
-        end
-      }
-    )
-  end)
+        }
+      )
+    end
+  )
 end
 
 function M.remove_assignee()
@@ -1099,24 +1203,29 @@ function M.remove_assignee()
     api.nvim_err_writeln("Cannot get issue/pr id")
   end
 
-  menu.select_assignee(function(user_id)
-    local query = format(graphql.remove_assignees_mutation, iid, user_id)
-    gh.run(
-      {
-        args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
-        cb = function(output, stderr)
-          if stderr and not util.is_blank(stderr) then
-            api.nvim_err_writeln(stderr)
-          elseif output then
-            -- refresh issue/pr details
-            octo.load(bufnr, function(obj)
-              writers.write_details(bufnr, obj, true)
-            end)
+  menu.select_assignee(
+    function(user_id)
+      local query = graphql("remove_assignees_mutation", iid, user_id)
+      gh.run(
+        {
+          args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
+          cb = function(output, stderr)
+            if stderr and not util.is_blank(stderr) then
+              api.nvim_err_writeln(stderr)
+            elseif output then
+              -- refresh issue/pr details
+              octo.load(
+                bufnr,
+                function(obj)
+                  writers.write_details(bufnr, obj, true)
+                end
+              )
+            end
           end
-        end
-      }
-    )
-  end)
+        }
+      )
+    end
+  )
 end
 
 return M
diff --git a/lua/octo/constants.lua b/lua/octo/constants.lua
index dc02828d..f5250cd2 100644
--- a/lua/octo/constants.lua
+++ b/lua/octo/constants.lua
@@ -9,6 +9,8 @@ M.OCTO_DETAILS_VT_NS = api.nvim_create_namespace("octo_details_vt")
 M.OCTO_DIFFHUNKS_VT_NS = api.nvim_create_namespace("octo_diffhunks_vt")
 M.OCTO_EMPTY_MSG_VT_NS = api.nvim_create_namespace("octo_empty_msg_vt")
 M.OCTO_HIGHLIGHT_NS = api.nvim_create_namespace("octo_highlight")
+M.OCTO_THREAD_HEADER_VT_NS = api.nvim_create_namespace("octo_thread_header_vt")
+M.OCTO_THREAD_NS = api.nvim_create_namespace("octo_thread")
 M.NO_BODY_MSG = "No description provided."
 
 return M
diff --git a/lua/octo/folds.lua b/lua/octo/folds.lua
index 3770c6cf..54de722c 100644
--- a/lua/octo/folds.lua
+++ b/lua/octo/folds.lua
@@ -1,3 +1,14 @@
 function _G.OctoFoldText()
   return "..."
 end
+
+local M = {}
+
+function M.create(start_line, end_line, is_opened)
+  vim.cmd(string.format("%d,%dfold", start_line, end_line))
+  if is_opened then
+    vim.cmd(string.format("%d,%dfoldopen", start_line, end_line))
+  end
+end
+
+return M
diff --git a/lua/octo/graphql.lua b/lua/octo/graphql.lua
index 980f6fa6..847b20c6 100644
--- a/lua/octo/graphql.lua
+++ b/lua/octo/graphql.lua
@@ -1,24 +1,66 @@
 local M = {}
 
+-- https://docs.github.com/en/graphql/reference/mutations#addreaction
+M.add_reaction_mutation =
+  [[
+  mutation {
+    addReaction(input: {subjectId: "%s", content: %s}) {
+      subject {
+        reactionGroups {
+          content
+          users {
+            totalCount
+          }
+        }
+      }
+    }
+  }
+]]
+
+-- https://docs.github.com/en/graphql/reference/mutations#removereaction
+M.remove_reaction_mutation =
+  [[
+  mutation {
+    removeReaction(input: {subjectId: "%s", content: %s}) {
+      subject {
+        reactionGroups {
+          content
+          users {
+            totalCount
+          }
+        }
+      }
+    }
+  }
+]]
+
 -- https://docs.github.com/en/free-pro-team@latest/graphql/reference/mutations#resolvereviewthread
-M.resolve_review_mutation =
+M.resolve_review_thread_mutation =
   [[
   mutation {
     resolveReviewThread(input: {threadId: "%s"}) {
       thread {
+        originalStartLine
+        originalLine
+        isOutdated
         isResolved
+        path
       }
     }
   }
 ]]
 
 -- https://docs.github.com/en/free-pro-team@latest/graphql/reference/mutations#unresolvereviewthread
-M.unresolve_review_mutation =
+M.unresolve_review_thread_mutation =
   [[
   mutation {
     unresolveReviewThread(input: {threadId: "%s"}) {
       thread {
+        originalStartLine
+        originalLine
+        isOutdated
         isResolved
+        path
       }
     }
   }
@@ -37,6 +79,120 @@ M.submit_review_mutation =
   }
 ]]
 
+-- https://docs.github.com/en/graphql/reference/mutations#addcomment
+M.add_issue_comment_mutation =
+[[
+  mutation {
+    addComment(input: {subjectId: "%s", body: "%s"}) {
+      commentEdge {
+        node {
+          id
+          body
+        }
+      }
+    }
+  }
+]]
+
+-- https://docs.github.com/en/graphql/reference/mutations#updateissuecomment
+M.update_issue_comment_mutation =
+[[
+  mutation {
+    updateIssueComment(input: {id: "%s", body: "%s"}) {
+      issueComment {
+        id
+        body
+      }
+    }
+  }
+]]
+
+-- https://docs.github.com/en/graphql/reference/mutations#updatepullrequestreviewcomment
+M.update_pull_request_review_comment_mutation =
+[[
+  mutation {
+    updatePullRequestReviewComment(input: {pullRequestReviewCommentId: "%s", body: "%s"}) {
+      pullRequestReviewComment {
+        id
+        body
+      }
+    }
+  }
+]]
+
+-- https://docs.github.com/en/graphql/reference/mutations#updatepullrequestreview
+M.update_pull_request_review_mutation =
+[[
+  mutation {
+    updatePullRequestReview(input: {pullRequestReviewId: "%s", body: "%s"}) {
+      pullRequestReview {
+        id
+        body
+      }
+    }
+  }
+]]
+
+-- https://docs.github.com/en/graphql/reference/mutations#addpullrequestreviewcomment
+-- M.add_pull_request_review_comment_mutation =
+-- [[
+--   mutation {
+--     addPullRequestReviewComment(input: {inReplyTo: "%s", body: "%s"}) {
+--       comment{
+--         id
+--         body
+--       }
+--     }
+--   }
+-- ]]
+
+-- M.add_pull_request_review_comment_mutation =
+-- [[
+--   mutation {
+--     addPullRequestReviewThreadReply(input: { pullRequestReviewThreadId: "%s", body: "%s"}) {
+--       comment{
+--         id
+--         body
+--       }
+--     }
+--   }
+-- ]]
+
+-- https://docs.github.com/en/graphql/reference/mutations#deleteissuecomment
+M.delete_issue_comment_mutation =
+  [[
+  mutation {
+    deleteIssueComment(input: {id: "%s"}) {
+      clientMutationId
+    }
+  }
+]]
+
+-- https://docs.github.com/en/graphql/reference/mutations#deletepullrequestreviewcomment
+M.delete_pull_request_review_comment_mutation =
+  [[
+  mutation {
+    deletePullRequestReviewComment(input: {id: "%s"}) {
+      clientMutationId
+    }
+  }
+]]
+
+-- https://docs.github.com/en/free-pro-team@latest/graphql/reference/mutations#updateissue
+M.update_issue_mutation =
+  [[
+  mutation {
+    updateIssue(input: {id: "%s", title: "%s", body: "%s"}) {
+      issue {
+        id
+        number
+        state
+        title
+        body
+      }
+    }
+  }
+]]
 -- https://docs.github.com/en/free-pro-team@latest/graphql/reference/mutations#createissue
 M.create_issue_mutation =
   [[
@@ -64,10 +220,10 @@ M.create_issue_mutation =
             login
           }
         }
-        reactions(last: 20) {
-          totalCount
-          nodes {
-            content
+        reactionGroups {
+          content
+          users {
+            totalCount
           }
         }
         comments(first: 100) {
@@ -75,10 +231,10 @@ M.create_issue_mutation =
             id
             body
             createdAt
-            reactions(last:20) {
-              totalCount
-              nodes {
-                content
+            reactionGroups {
+              content
+              users {
+                totalCount
               }
             }
             author {
@@ -103,6 +259,22 @@ M.create_issue_mutation =
   }
 ]]
 
+-- https://docs.github.com/en/free-pro-team@latest/graphql/reference/mutations#updateissue
+M.update_issue_mutation =
+  [[
+  mutation {
+    updateIssue(input: {id: "%s", title: "%s", body: "%s"}) {
+      issue {
+        id
+        number
+        state
+        title
+        body
+      }
+    }
+  }
+]]
+
 -- https://docs.github.com/en/free-pro-team@latest/graphql/reference/mutations#updateissue
 M.update_issue_state_mutation =
   [[
@@ -130,10 +302,10 @@ M.update_issue_state_mutation =
             login
           }
         }
-        reactions(last: 20) {
-          totalCount
-          nodes {
-            content
+        reactionGroups {
+          content
+          users {
+            totalCount
           }
         }
         comments(first: 100) {
@@ -141,10 +313,10 @@ M.update_issue_state_mutation =
             id
             body
             createdAt
-            reactions(last:20) {
-              totalCount
-              nodes {
-                content
+            reactionGroups {
+              content
+              users {
+                totalCount
               }
             }
             author {
@@ -169,6 +341,22 @@ M.update_issue_state_mutation =
   }
 ]]
 
+-- https://docs.github.com/en/free-pro-team@latest/graphql/reference/mutations#updatepullrequest
+M.update_pull_request_mutation =
+  [[
+  mutation {
+    updatePullRequest(input: {pullRequestId: "%s", title: "%s", body: "%s"}) {
+      pullRequest {
+        id
+        number
+        state
+        title
+        body
+      }
+    }
+  }
+]]
+
 -- https://docs.github.com/en/free-pro-team@latest/graphql/reference/mutations#updatepullrequest
 M.update_pull_request_state_mutation =
   [[
@@ -213,10 +401,10 @@ M.update_pull_request_state_mutation =
         author {
           login
         }
-        reactions(last: 20) {
-          totalCount
-          nodes {
-            content
+        reactionGroups {
+          content
+          users {
+            totalCount
           }
         }
         comments(first: 100) {
@@ -224,10 +412,10 @@ M.update_pull_request_state_mutation =
             id
             body
             createdAt
-            reactions(last:20) {
-              totalCount
-              nodes {
-                content
+            reactionGroups {
+              content
+              users {
+                totalCount
               }
             }
             author {
@@ -271,44 +459,45 @@ M.review_threads_query =
 query($endCursor: String) {
   repository(owner:"%s", name:"%s") {
     pullRequest(number:%d) {
-        reviewThreads(last:80) {
-          nodes {
-            id
-            isResolved
-            isOutdated
-            path
-            resolvedBy { login }
-            line
-            originalLine
-            startLine
-            originalStartLine
-            comments(first: 100, after: $endCursor) {
-              nodes{
-                id
-                body
-                commit {
-                  oid
-                }
-                author { login }
-                authorAssociation
-                originalPosition
-                position
-                state
-                outdated
-                diffHunk
-                reactions(last:20) {
+      reviewThreads(last:80) {
+        nodes {
+          id
+          isResolved
+          isCollapsed
+          isOutdated
+          path
+          resolvedBy { login }
+          line
+          originalLine
+          startLine
+          originalStartLine
+          diffSide
+          comments(first: 100, after: $endCursor) {
+            nodes{
+              id
+              body
+              createdAt
+              commit {
+                oid
+              }
+              replyTo { id }
+              author { login }
+              authorAssociation
+              outdated
+              diffHunk
+              reactionGroups {
+                content
+                users {
                   totalCount
-                  nodes{
-                    content
-                  }
                 }
               }
-              pageInfo {
-                hasNextPage
-                endCursor
-              }
+            }
+            pageInfo {
+              hasNextPage
+              endCursor
             }
           }
+        }
       }
     }
   }
@@ -359,10 +548,10 @@ query($endCursor: String) {
       author {
         login
       }
-      reactions(last: 20) {
-        totalCount
-        nodes {
-          content
+      reactionGroups {
+        content
+        users {
+          totalCount
         }
       }
       projectCards(last: 20) {
@@ -377,45 +566,143 @@ query($endCursor: String) {
           }
         }
       }
-      comments(first: 100, after: $endCursor) {
+      timelineItems(first: 100, after: $endCursor) {
+        pageInfo {
+          hasNextPage
+          endCursor
+        }
         nodes {
-          id
-          body
-          createdAt
-          reactions(last:20) {
-            totalCount
-            nodes {
+          __typename
+          ... on AssignedEvent {
+            assignee {
+              ... on User {
+                login
+              }
+            }
+            createdAt
+          }
+          ... on PullRequestCommit {
+            commit {
+              committedDate
+              abbreviatedOid
+              changedFiles
+              additions
+              deletions
+              committer {
+                user {
+                  login
+                }
+              }
+            }          
+          }
+          ... on MergedEvent {
+            createdAt
+            actor {
+              login
+            }
+            commit {
+              abbreviatedOid
+            }
+            mergeRefName
+          }
+          ... on ClosedEvent {
+            createdAt
+            actor {
+              login
+            }
+          }
+          ... on IssueComment {
+            id
+            body
+            createdAt
+            reactionGroups {
               content
+              users {
+                totalCount
+              }
+            }
+            author {
+              login
             }
           }
-          author {
-            login
+          ... on PullRequestReview {
+            id
+            body
+            createdAt
+            reactionGroups {
+              content
+              users {
+                totalCount
+              }
+            }
+            author {
+              login
+            }
+            state
+            comments(last:100) {
+              totalCount
+              nodes{
+                id
+                replyTo {
+                  id
+                }
+                body
+                commit {
+                  oid
+                }
+                author { login }
+                authorAssociation
+                originalPosition
+                position
+                state
+                outdated
+                diffHunk
+                reactionGroups {
+                  content
+                  users {
+                    totalCount
+                  }
+                }
+              }
+            }
           }
         }
-        pageInfo {
-          hasNextPage
-          endCursor
-        }
       }
       reviewDecision
-      reviews(last:100) {
+      reviewThreads(last:100) {
         nodes {
           id
-          body
-          createdAt
-          reactions(last:20) {
-            totalCount
-            nodes {
-              content
+          isResolved
+          isCollapsed
+          isOutdated
+          path
+          resolvedBy { login }
+          line
+          originalLine
+          startLine
+          originalStartLine
+          diffSide
+          comments(first: 100) {
+            nodes{
+              id
+              body
+              createdAt
+              replyTo { id }
+              commit {
+                oid
+              }
+              author { login }
+              authorAssociation
+              outdated
+              diffHunk
+              reactionGroups {
+                content
+                users {
+                  totalCount
+                }
+              }
             }
           }
-          author {
-            login
-          }
-          state
-          comments {
-            totalCount
-          }
         }
       }
       labels(first: 20) {
@@ -475,10 +762,10 @@ query($endCursor: String) {
           login
         }
       }
-      reactions(last: 20) {
-        totalCount
-        nodes {
-          content
+      reactionGroups {
+        content
+        users {
+          totalCount
         }
       }
       projectCards(last: 20) {
@@ -493,24 +780,41 @@ query($endCursor: String) {
           }
         }
       }
-      comments(first: 100, after: $endCursor) {
+      timelineItems(first: 100, after: $endCursor) {
+        pageInfo {
+          hasNextPage
+          endCursor
+        }
         nodes {
-          id
-          body
-          createdAt
-          reactions(last:20) {
-            totalCount
-            nodes {
+          __typename
+          ... on IssueComment {
+            id
+            body
+            createdAt
+            reactionGroups {
               content
+              users {
+                totalCount
+              }
+            }
+            author {
+              login
             }
           }
-          author {
-            login
+          ... on ClosedEvent {
+            createdAt
+            actor {
+              login
+            }
+          }
+          ... on AssignedEvent {
+            assignee {
+              ... on User {
+                login
+              }
+            }
+            createdAt
           }
-        }
-        pageInfo {
-          hasNextPage
-          endCursor
         }
       }
       labels(first: 20) {
@@ -933,4 +1237,34 @@ query {
 }
 ]]
 
-return M
+local function escape_chars(string)
+  local escaped, _ = string.gsub(
+    string,
+    '["]',
+    {
+      ['"'] = '\\"',
+    }
+  )
+  return escaped
+end
+
+return function(query, ...)
+  local opts = { escape = true }
+  for _, v in ipairs{...} do
+    if type(v) == "table" then
+      opts = v
+      break
+    end
+  end
+  local escaped = {}
+  for _, v in ipairs{...} do
+    if type(v) == "string" and opts.escape then
+      local encoded = escape_chars(v)
+      table.insert(escaped, encoded)
+    else
+      table.insert(escaped, v)
+    end
+  end
+  return string.format(M[query], unpack(escaped))
+end
+
diff --git a/lua/octo/init.lua b/lua/octo/init.lua
index 76b672a2..e29e666d 100644
--- a/lua/octo/init.lua
+++ b/lua/octo/init.lua
@@ -5,6 +5,7 @@ local util = require "octo.util"
 local graphql = require "octo.graphql"
 local writers = require "octo.writers"
 local date = require "octo.date"
+local folds = require "octo.folds"
 local vim = vim
 local api = vim.api
 local format = string.format
@@ -52,10 +53,10 @@ function M.load(bufnr, cb)
   local name = vim.split(repo, "/")[2]
   local query, key
   if type == "pull" then
-    query = format(graphql.pull_request_query, owner, name, number)
+    query = graphql("pull_request_query", owner, name, number)
     key = "pullRequest"
   elseif type == "issue" then
-    query = format(graphql.issue_query, owner, name, number)
+    query = graphql("issue_query", owner, name, number)
     key = "issue"
   end
   gh.run(
@@ -65,7 +66,7 @@ function M.load(bufnr, cb)
         if stderr and not util.is_blank(stderr) then
           api.nvim_err_writeln(stderr)
         elseif output then
-          local resp = util.aggregate_pages(output, format("data.repository.%s.comments.nodes", key))
+          local resp = util.aggregate_pages(output, format("data.repository.%s.timelineItems.nodes", key))
           local obj = resp.data.repository[key]
             cb(obj)
         end
@@ -165,8 +166,10 @@ function M.create_buffer(type, obj, repo, create)
   vim.cmd [[setlocal foldtext=v:lua.OctoFoldText()]]
   vim.cmd [[setlocal foldmethod=manual]]
   vim.cmd [[setlocal foldenable]]
-  vim.cmd [[setlocal foldcolumn=1]]
+  vim.cmd [[setlocal foldcolumn=3]]
   vim.cmd [[setlocal foldlevelstart=99]]
+  vim.cmd [[setlocal conceallevel=2]]
+  vim.cmd [[setlocal syntax=markdown]]
 
   -- register issue
   api.nvim_buf_set_var(bufnr, "iid", iid)
@@ -195,21 +198,15 @@ function M.create_buffer(type, obj, repo, create)
   writers.write_body(bufnr, obj)
 
   -- write body reactions
-  local reaction_line = writers.write_reactions(bufnr, obj.reactions, api.nvim_buf_line_count(bufnr) - 1)
+  local reaction_line = writers.write_reactions(bufnr, obj.reactionGroups, api.nvim_buf_line_count(bufnr) - 1)
   api.nvim_buf_set_var(bufnr, "body_reactions", obj.reactions)
   api.nvim_buf_set_var(bufnr, "body_reaction_line", reaction_line)
 
-  -- collect comments
+  -- initialize comments metadata
   api.nvim_buf_set_var(bufnr, "comments", {})
-  local comments = obj.comments.nodes
 
+  -- PRs
   if obj.commits then
-
-    -- collect review comments
-    if obj.reviews then
-      vim.list_extend(comments, obj.reviews.nodes)
-    end
-
     -- for pulls, store some additional info
     api.nvim_buf_set_var(
       bufnr,
@@ -227,15 +224,92 @@ function M.create_buffer(type, obj, repo, create)
     )
   end
 
-  -- sort comments
-  table.sort(comments, function (c1, c2)
-    return date(c1.createdAt) < date(c2.createdAt)
-  end)
+  -- write timeline items
+  local review_thread_map = {}
+
+  for _, item in ipairs(obj.timelineItems.nodes) do
+    if item.__typename == "IssueComment" then
+      -- write the comment
+      local start_line, end_line = writers.write_comment(bufnr, item, "IssueComment")
+      folds.create(start_line+1, end_line, true)
+
+    elseif item.__typename == "PullRequestReview" then
+
+      -- A review can have 0+ threads
+      local threads = {}
+      for _, comment in ipairs(item.comments.nodes) do
+        for _, reviewThread in ipairs(obj.reviewThreads.nodes) do
+          if comment.id == reviewThread.comments.nodes[1].id then
+            -- found a thread for the current review
+            table.insert(threads, reviewThread)
+          end
+        end
+      end
+
+      -- skip reviews with no threads and empty body
+      if #threads == 0 and util.is_blank(item.body) then
+        goto continue
+      end
 
-  -- write comments
-  for _, c in ipairs(comments) do
-    writers.write_comment(bufnr, c)
+      -- print review header and top level comment
+      -- local line = api.nvim_buf_line_count(bufnr) - 1
+      -- writers.write_block({"", ""}, {bufnr = bufnr, line = line})
+      -- local max_length = vim.fn.winwidth(0) - 10 - vim.wo.foldcolumn
+      -- local header_vt = {{format("┌%s┐", string.rep("─", max_length + 2))}}
+      -- api.nvim_buf_set_extmark(bufnr, constants.OCTO_THREAD_HEADER_VT_NS, line, 0, { virt_text=header_vt, virt_text_pos='overlay'})
+      local review_start, review_end = writers.write_comment(bufnr, item, "PullRequestReview")
+
+      if #threads > 0 then
+        -- print each of the threads
+        for _, thread in ipairs(threads) do
+          local thread_start, thread_end
+          for _,comment in ipairs(thread.comments.nodes) do
+            if comment.replyTo == vim.NIL then
+
+              -- review thread header
+              local start_line = thread.originalStartLine ~= vim.NIL and thread.originalStartLine or thread.originalLine
+              local end_line = thread.originalLine
+              writers.write_review_thread_header(bufnr, {
+                path = thread.path,
+                start_line = start_line,
+                end_line = end_line,
+                isOutdated = thread.isOutdated,
+                isResolved = thread.isResolved,
+              })
+
+              -- write diff lines
+              thread_start, thread_end = writers.write_commented_lines(bufnr, comment.diffHunk, thread.diffSide, start_line, end_line)
+            end
+            local comment_start, comment_end = writers.write_comment(bufnr, comment, "PullRequestReviewComment")
+            folds.create(comment_start+1, comment_end, true)
+            thread_end = comment_end
+            review_end = comment_end
+          end
+          folds.create(thread_start-1, thread_end, not thread.isCollapsed)
+
+          -- mark the thread region
+          local thread_mark_id = api.nvim_buf_set_extmark(
+            bufnr,
+            constants.OCTO_THREAD_NS,
+            thread_start - 1,
+            0,
+            {
+              end_line = thread_end,
+              end_col = 0
+            }
+          )
+          -- store it as a buffer var to be able to find a thread_id given the cursor position
+          review_thread_map[tostring(thread_mark_id)] = {
+            thread_id = thread.id,
+            first_comment_id = thread.comments.nodes[1].id
+          }
+        end
+        folds.create(review_start+1, review_end, true)
+      end
+    end
+    ::continue::
   end
+  api.nvim_buf_set_var(bufnr, "reviewThreadMap", review_thread_map)
 
   async_fetch_taggable_users(bufnr, repo, obj.participants.nodes)
   async_fetch_issues(bufnr, repo)
@@ -271,6 +345,15 @@ function M.save_buffer()
     return
   end
 
+  local issue_kind
+  if string.match(api.nvim_buf_get_name(bufnr), "octo://.*/pull/.*") then
+    issue_kind = "pull"
+  elseif string.match(api.nvim_buf_get_name(bufnr), "octo://.*/issue/.*") then
+    issue_kind = "issue"
+  else
+    return
+  end
+
   -- collect comment metadata
   util.update_issue_metadata(bufnr)
 
@@ -278,6 +361,7 @@ function M.save_buffer()
   if ft == "octo_issue" then
     local title_metadata = api.nvim_buf_get_var(bufnr, "title")
     local desc_metadata = api.nvim_buf_get_var(bufnr, "description")
+    local id = api.nvim_buf_get_var(bufnr, "iid")
     if title_metadata.dirty or desc_metadata.dirty then
       -- trust but verify
       if string.find(title_metadata.body, "\n") then
@@ -288,30 +372,31 @@ function M.save_buffer()
         return
       end
 
-      -- TODO: graphql
+      local query
+      if issue_kind == "issue" then
+        query = graphql("update_issue_mutation", id, title_metadata.body, desc_metadata.body)
+      elseif issue_kind == "pull" then
+        query = graphql("update_pull_request_mutation", id, title_metadata.body, desc_metadata.body)
+      end
       gh.run(
         {
-          args = {
-            "api",
-            "-X",
-            "PATCH",
-            "-f",
-            format("title=%s", title_metadata.body),
-            "-f",
-            format("body=%s", desc_metadata.body),
-            format("repos/%s/issues/%s", repo, number)
-          },
+          args = {"api", "graphql", "-f", format("query=%s", query)},
           cb = function(output)
             local resp = json.parse(output)
-
-            if title_metadata.body == resp.title then
-              title_metadata.saved_body = resp.title
+            local obj
+            if issue_kind == "pull" then
+              obj = resp.data.updatePullRequest.pullRequest
+            elseif issue_kind == "issue" then
+              obj = resp.data.updateIssue.issue
+            end
+            if title_metadata.body == obj.title then
+              title_metadata.saved_body = obj.title
               title_metadata.dirty = false
               api.nvim_buf_set_var(bufnr, "title", title_metadata)
             end
 
-            if desc_metadata.body == resp.body then
-              desc_metadata.saved_body = resp.body
+            if desc_metadata.body == obj.body then
+              desc_metadata.saved_body = obj.body
               desc_metadata.dirty = false
               api.nvim_buf_set_var(bufnr, "description", desc_metadata)
             end
@@ -325,28 +410,47 @@ function M.save_buffer()
   end
 
   -- comments
-  local kind, post_url
-  if ft == "octo_issue" then
-    kind = "issues"
-    post_url = format("repos/%s/%s/%d/comments", repo, kind, number)
-  elseif ft == "octo_reviewthread" then
-    kind = "pulls"
-    local status, _, comment_id =
-      string.find(api.nvim_buf_get_name(bufnr), "octo://.*/pull/%d+/reviewthread/.*/comment/(.*)")
-    if not status then
-      api.nvim_err_writeln("Cannot extract comment id from buffer name")
-      return
-    end
-    post_url = format("/repos/%s/pulls/%d/comments/%s/replies", repo, number, comment_id)
-  end
-
   local comments = api.nvim_buf_get_var(bufnr, "comments")
   for _, metadata in ipairs(comments) do
     if metadata.body ~= metadata.saved_body then
       if metadata.id == -1 then
-        -- create new comment/reply
-        -- TODO: graphql
-        gh.run(
+        if metadata.kind == "IssueComment" then
+          -- create new comment
+          local id = api.nvim_buf_get_var(bufnr, "iid")
+          local add_query = graphql("add_issue_comment_mutation", id, metadata.body)
+          gh.run(
+            {
+              args = {"api", "graphql", "-f", format("query=%s", add_query)},
+              cb = function(output, stderr)
+                if stderr and not util.is_blank(stderr) then
+                  api.nvim_err_writeln(stderr)
+                elseif output then
+                  local resp = json.parse(output)
+                  local resp_body = resp.data.addComment.commentEdge.node.body
+                  local resp_id = resp.data.addComment.commentEdge.node.id
+                  if vim.fn.trim(metadata.body) == vim.fn.trim(resp_body) then
+                    for i, c in ipairs(comments) do
+                      if tonumber(c.id) == -1 then
+                        comments[i].id = resp_id
+                        comments[i].saved_body = resp_body
+                        comments[i].dirty = false
+                        break
+                      end
+                    end
+                    api.nvim_buf_set_var(bufnr, "comments", comments)
+                    signs.render_signcolumn(bufnr)
+                  end
+                end
+              end
+            }
+          )
+        elseif metadata.kind == "PullRequestReviewComment" then
+          -- create new thread reply
+          local cid = metadata.first_comment_id
+          if vim.bo.ft == "octo_issue" then
+            cid = util.graph2rest(metadata.first_comment_id)
+          end
+          gh.run(
           {
             args = {
               "api",
@@ -354,7 +458,7 @@ function M.save_buffer()
               "POST",
               "-f",
               format("body=%s", metadata.body),
-              post_url
+              format("/repos/%s/pulls/%d/comments/%s/replies", repo, number, cid)
             },
             cb = function(output, stderr)
               if stderr and not util.is_blank(stderr) then
@@ -372,40 +476,54 @@ function M.save_buffer()
                   end
                   api.nvim_buf_set_var(bufnr, "comments", comments)
                   signs.render_signcolumn(bufnr)
-                  print("Saved!")
                 end
               end
             end
           }
         )
+        elseif metadata.kind == "PullRequestReview" then
+          -- Review top level comments cannot be created here
+          return
+        end
       else
         -- update comment/reply
+        local update_query
+        if metadata.kind == "IssueComment" then
+          update_query = graphql("update_issue_comment_mutation", metadata.id, metadata.body)
+        elseif metadata.kind == "PullRequestReviewComment" then
+          update_query = graphql("update_pull_request_review_comment_mutation", metadata.id, metadata.body)
+        elseif metadata.kind == "PullRequestReview" then
+          update_query = graphql("update_pull_request_review_mutation", metadata.id, metadata.body)
+        end
         gh.run(
           {
-            args = {
-              "api",
-              "-X",
-              "PATCH",
-              "-f",
-              format("body=%s", metadata.body),
-              format("repos/%s/%s/comments/%d", repo, kind, metadata.id)
-            },
+            args = {"api", "graphql", "-f", format("query=%s", update_query)},
             cb = function(output, stderr)
               if stderr and not util.is_blank(stderr) then
                 api.nvim_err_writeln(stderr)
               elseif output then
                 local resp = json.parse(output)
-                if vim.fn.trim(metadata.body) == vim.fn.trim(resp.body) then
+                local resp_body, resp_id
+                if metadata.kind == "IssueComment" then
+                  resp_body = resp.data.updateIssueComment.issueComment.body
+                  resp_id = resp.data.updateIssueComment.issueComment.id
+                elseif metadata.kind == "PullRequestReviewComment" then
+                  resp_body = resp.data.updatePullRequestReviewComment.pullRequestReviewComment.body
+                  resp_id = resp.data.updatePullRequestReviewComment.pullRequestReviewComment.id
+                elseif metadata.kind == "PullRequestReview" then
+                  resp_body = resp.data.updatePullRequestReview.pullRequestReview.body
+                  resp_id = resp.data.updatePullRequestReview.pullRequestReview.id
+                end
+                if vim.fn.trim(metadata.body) == vim.fn.trim(resp_body) then
                   for i, c in ipairs(comments) do
-                    if tonumber(c.id) == tonumber(resp.id) then
-                      comments[i].saved_body = resp.body
+                    if c.id == resp_id then
+                      comments[i].saved_body = resp_body
                       comments[i].dirty = false
                       break
                     end
                   end
                   api.nvim_buf_set_var(bufnr, "comments", comments)
                   signs.render_signcolumn(bufnr)
-                  print("Saved!")
                 end
               end
             end
diff --git a/lua/octo/menu.lua b/lua/octo/menu.lua
index df340366..a584799a 100644
--- a/lua/octo/menu.lua
+++ b/lua/octo/menu.lua
@@ -124,7 +124,7 @@ function M.issues(opts)
 
   local owner = vim.split(opts.repo, "/")[1]
   local name = vim.split(opts.repo, "/")[2]
-  local query = format(graphql.issues_query, owner, name, filter)
+  local query = graphql("issues_query", owner, name, filter, {escape = false})
   print("Fetching issues (this may take a while) ...")
   gh.run(
     {
@@ -269,7 +269,7 @@ function M.pull_requests(opts)
 
   local owner = vim.split(opts.repo, "/")[1]
   local name = vim.split(opts.repo, "/")[2]
-  local query = format(graphql.pull_requests_query, owner, name, filter)
+  local query = graphql("pull_requests_query", owner, name, filter, {escape = false})
   print("Fetching issues (this may take a while) ...")
   gh.run(
     {
@@ -425,7 +425,7 @@ function M.issue_search(opts)
         if not prompt or prompt == "" then
           return nil
         end
-        prompt = util.escape_chars(prompt)
+        prompt = prompt
 
         -- skip requests for empty prompts
         if util.is_blank(prompt) then
@@ -445,7 +445,7 @@ function M.issue_search(opts)
             return
           end
 
-          local query = format(graphql.search_issues_query, opts.repo, prompt)
+          local query = graphql("search_issues_query", opts.repo, prompt)
           gh.run(
             {
               args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -504,7 +504,7 @@ function M.pull_request_search(opts)
         if not prompt or prompt == "" then
           return nil
         end
-        prompt = util.escape_chars(prompt)
+        prompt = prompt
 
         -- skip requests for empty prompts
         if util.is_blank(prompt) then
@@ -524,7 +524,7 @@ function M.pull_request_search(opts)
             return
           end
 
-          local query = format(graphql.search_pull_requests_query, opts.repo, prompt)
+          local query = graphql("search_pull_requests_query", opts.repo, prompt)
           gh.run(
             {
               args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -569,16 +569,20 @@ end
 function M.review_comments()
   local comments = vim.tbl_values(reviews.review_comments)
   local max_linenr_length = -1
+  local filtered_comments = {}
   for _, comment in ipairs(comments) do
     max_linenr_length = math.max(max_linenr_length, #tostring(comment.line1))
     max_linenr_length = math.max(max_linenr_length, #tostring(comment.line2))
+    if not util.is_blank(vim.fn.trim(comment.body)) then
+      table.insert(filtered_comments, comment)
+    end
   end
   pickers.new(
     {},
     {
       prompt_prefix = "Review Comments >",
       finder = finders.new_table {
-        results = comments,
+        results = filtered_comments,
         entry_maker = entry_maker.gen_from_review_comment(max_linenr_length)
       },
       sorter = conf.generic_sorter({}),
@@ -607,18 +611,6 @@ function M.review_comments()
           if diff_winid > -1 then
             api.nvim_win_set_cursor(diff_winid, {comment.line1, 1})
           end
-
-          -- show comment win/buf
-          if comment.comment_winid and api.nvim_win_is_valid(comment.comment_winid) then
-            api.nvim_win_set_buf(comment.comment_winid, comment.comment_bufnr)
-            api.nvim_set_current_win(comment.comment_winid)
-          else
-            -- move to qf win
-            api.nvim_set_current_win(comment.qf_winid)
-
-            -- create new win and show comment bufnr
-            vim.cmd(format("rightbelow vert sbuffer %d", comment.comment_bufnr))
-          end
         end)
         return true
       end
@@ -673,7 +665,7 @@ function M.select_target_project_column(cb)
   local owner = vim.split(repo, "/")[1]
   local name = vim.split(repo, "/")[2]
 
-  local query = format(graphql.projects_query, owner, name, vim.g.octo_loggedin_user, owner)
+  local query = graphql("projects_query", owner, name, vim.g.octo_loggedin_user, owner)
   gh.run(
     {
       args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
@@ -748,7 +740,7 @@ function M.select_label(cb)
 
   local owner = vim.split(repo, "/")[1]
   local name = vim.split(repo, "/")[2]
-  local query = format(graphql.labels_query, owner, name)
+  local query = graphql("labels_query", owner, name)
   gh.run(
     {
       args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -796,10 +788,10 @@ function M.select_assigned_label(cb)
   local name = vim.split(repo, "/")[2]
   local query, key
   if type == "issue" then
-    query = format(graphql.issue_labels_query, owner, name, number)
+    query = graphql("issue_labels_query", owner, name, number)
     key = "issue"
   elseif type == "pull" then
-    query = format(graphql.pull_request_labels_query, owner, name, number)
+    query = graphql("pull_request_labels_query", owner, name, number)
     key = "pullRequest"
   end
   gh.run(
@@ -852,7 +844,7 @@ function M.select_user(cb)
         if not prompt or prompt == "" then
           return nil
         end
-        prompt = "repos:>10 " .. util.escape_chars(prompt)
+        prompt = "repos:>10 " .. prompt
 
         -- skip requests for empty prompts
         if util.is_blank(prompt) then
@@ -872,7 +864,7 @@ function M.select_user(cb)
             return
           end
 
-          local query = format(graphql.user_query, prompt, prompt)
+          local query = graphql("user_query", prompt, prompt)
           gh.run(
             {
               args = {"api", "graphql", "--paginate", "-f", format("query=%s", query)},
@@ -990,10 +982,10 @@ function M.select_assignee(cb)
   local name = vim.split(repo, "/")[2]
   local query, key
   if type == "issue" then
-    query = format(graphql.issue_assignees_query, owner, name, number)
+    query = graphql("issue_assignees_query", owner, name, number)
     key = "issue"
   elseif type == "pull" then
-    query = format(graphql.pull_request_assignees_query, owner, name, number)
+    query = graphql("pull_request_assignees_query", owner, name, number)
     key = "pullRequest"
   end
   gh.run(
diff --git a/lua/octo/previewers.lua b/lua/octo/previewers.lua
index 097ad74d..d471c832 100644
--- a/lua/octo/previewers.lua
+++ b/lua/octo/previewers.lua
@@ -28,7 +28,7 @@ M.issue =
           local number = entry.issue.number
           local owner = vim.split(opts.repo, "/")[1]
           local name = vim.split(opts.repo, "/")[2]
-          local query = format(graphql.issue_query, owner, name, number)
+          local query = graphql("issue_query", owner, name, number)
           gh.run(
             {
               args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -89,7 +89,7 @@ M.pull_request =
           local number = entry.pull_request.number
           local owner = vim.split(opts.repo, "/")[1]
           local name = vim.split(opts.repo, "/")[2]
-          local query = format(graphql.pull_request_query, owner, name, number)
+          local query = graphql("pull_request_query", owner, name, number)
           gh.run(
             {
               args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -105,7 +105,7 @@ M.pull_request =
                   writers.write_state(bufnr, pull_request.state:upper(), number)
                   writers.write_reactions(
                     bufnr,
-                    pull_request.reactions,
+                    pull_request.reactionGroups,
                     api.nvim_buf_line_count(bufnr) - 1
                   )
                   api.nvim_buf_set_option(bufnr, "filetype", "octo_issue")
diff --git a/lua/octo/reviews.lua b/lua/octo/reviews.lua
index 0ab4cae9..74f338ea 100644
--- a/lua/octo/reviews.lua
+++ b/lua/octo/reviews.lua
@@ -157,7 +157,7 @@ function M.diff_changes_qf_entry()
   api.nvim_win_set_buf(right_win, right_bufnr)
   M.add_changes_qf_mappings()
   vim.cmd(format("leftabove vert sbuffer %d", left_bufnr))
-  local left_win = api.nvim_get_current_win()
+  local left_win = util.getwin4buf(left_bufnr)
   M.add_changes_qf_mappings()
 
   local write_diff_lines = function(lines, side)
@@ -200,6 +200,7 @@ function M.diff_changes_qf_entry()
 end
 
 function M.add_review_comment(isSuggestion)
+  -- get visual selected line range
   local line1, line2
   if vim.fn.getpos("'<")[2] == vim.fn.getcurpos()[2] then
     line1 = vim.fn.getpos("'<")[2]
@@ -208,6 +209,8 @@ function M.add_review_comment(isSuggestion)
     line1 = vim.fn.getcurpos()[2]
     line2 = vim.fn.getcurpos()[2]
   end
+
+  -- check we are in an octo diff buffer
   local bufnr = api.nvim_get_current_buf()
   local status, props = pcall(api.nvim_buf_get_var, bufnr, "OctoDiffProps")
   if status and props then
@@ -224,56 +227,27 @@ function M.add_review_comment(isSuggestion)
       return
     end
 
-    -- create new buffer
-    local bufname = format("%s:%d.%d", string.gsub(props.bufname, "/file/", "/comment/"), line1, line2)
-    local comment_bufnr
-    if vim.fn.bufnr(bufname) > -1 then
-      comment_bufnr = vim.fn.bufnr(bufname)
-      api.nvim_buf_set_lines(comment_bufnr, 0, -1, false, {})
-    else
-      comment_bufnr = api.nvim_create_buf(false, true)
-    end
-
-    -- check if there is a comment win already open
-    local _, comment_winid = pcall(api.nvim_win_get_var, props.qf_winid, "comment_winid")
-    if tonumber(comment_winid) and api.nvim_win_is_valid(comment_winid) then
-      -- move to comment win
-      api.nvim_win_set_buf(comment_winid, comment_bufnr)
-      api.nvim_set_current_win(comment_winid)
-    else
-      -- move to qf win
-      api.nvim_set_current_win(props.qf_winid)
-
-      -- create new win and show comment bufnr
-      vim.cmd(format("rightbelow vert sbuffer %d", comment_bufnr))
-
-      -- store comment win id
-      comment_winid = api.nvim_get_current_win()
-      api.nvim_win_set_var(props.qf_winid, "comment_winid", comment_winid)
-    end
+    -- create comment window and buffer
+    local comment_winid, comment_bufnr = util.create_popup({
+      header = format("Comment for %s (from %d to %d) [%s]", props.path, line1, line2, props.side)
+    })
+    api.nvim_set_current_win(comment_winid)
+    api.nvim_buf_set_option(comment_bufnr, "syntax", "markdown")
 
-    -- add mappings to comment buffer
-    M.add_changes_qf_mappings()
-
-    -- header
-    local header_vt = {
-      {format("%s", props.path), "OctoNvimDetailsValue"},
-      {" ["},
-      {format("%s", props.side), "OctoNvimDetailsLabel"},
-      {"] ("},
-      {format("%d,%d", line1, line2), "OctoNvimDetailsValue"},
-      {")"}
-    }
-    writers.write_block({"", ""}, {bufnr = comment_bufnr, mark = false, line = 1})
-    api.nvim_buf_set_virtual_text(comment_bufnr, constants.OCTO_TITLE_VT_NS, 0, header_vt, {})
+    local bufname = format("%s:%d.%d", string.gsub(props.bufname, "/file/", "/comment/"), line1, line2)
+    api.nvim_buf_set_name(comment_bufnr, bufname)
+    api.nvim_buf_set_option(comment_bufnr, "syntax", "markdown")
+    api.nvim_buf_set_option(comment_bufnr, "buftype", "acwrite")
+    api.nvim_buf_set_var(comment_bufnr, "OctoDiffProps", props)
+    api.nvim_win_set_var(props.qf_winid, "comment_winid", comment_winid)
 
     if isSuggestion then
       local lines = api.nvim_buf_get_lines(props.content_bufnr, line1-1, line2, false)
-      writers.write_block({"```suggestion"}, {bufnr = comment_bufnr, mark = false})
-      writers.write_block(lines, {bufnr = comment_bufnr, mark = false})
-      writers.write_block({"```"}, {bufnr = comment_bufnr, mark = false})
-    else
-      writers.write_block({""}, {bufnr = comment_bufnr, mark = false})
+      local suggestion = {"```suggestion"}
+      vim.list_extend(suggestion, lines)
+      table.insert(suggestion, "```")
+      api.nvim_buf_set_lines(comment_bufnr, 0, -1, false, suggestion)
+      api.nvim_buf_set_option(comment_bufnr, "modified", false)
     end
 
     -- change to insert mode
@@ -299,13 +273,6 @@ function M.add_review_comment(isSuggestion)
 
     -- add comment to list of pending comments
     M.review_comments[bufname] = comment
-
-    -- configure comment buffer
-    api.nvim_buf_set_var(comment_bufnr, "OctoDiffProps", props)
-    api.nvim_buf_set_option(comment_bufnr, "filetype", "octo_reviewcomment")
-    api.nvim_buf_set_option(comment_bufnr, "buftype", "acwrite")
-    api.nvim_buf_set_name(comment_bufnr, bufname)
-    api.nvim_buf_set_option(comment_bufnr, "modified", false)
   end
 end
 
@@ -317,15 +284,11 @@ function M.save_review_comment()
     local comment = M.review_comments[bufname]
     local body = table.concat(api.nvim_buf_get_lines(bufnr, 0, -1, false), "\n")
     comment.body = vim.fn.trim(body)
-    if util.is_blank(comment.body) then
-      -- ignore empty comments
-      return
-    end
     M.review_comments[bufname] = comment
-    api.nvim_buf_set_option(bufnr, "modified", false)
-
-    -- highlight commented lines
-    M.highlight_lines(comment.content_bufnr, comment.line1, comment.line2)
+    if not util.is_blank(comment.body) then
+      -- highlight commented lines
+      M.highlight_lines(comment.content_bufnr, comment.line1, comment.line2)
+    end
   end
 end
 
@@ -425,7 +388,7 @@ function M.populate_reviewthreads_qf(repo, number, reviewthreads)
 
   -- open qf
   vim.cmd(format("%dcopen", qf_height))
-  local qf_win = api.nvim_get_current_win()
+  local qf_win = vim.fn.getqflist({winid = 0}).winid
 
   -- highlight qf entries
   vim.cmd [[call matchadd("Comment", "\(.*\)")]]
@@ -530,6 +493,7 @@ function M.show_reviewthread_qf_entry(repo, number, main_win)
   M.add_reviewthread_qf_mappings(repo, number, main_win)
 
   util.get_file_contents(repo, commit, path, function(lines)
+    api.nvim_buf_set_option(content_bufnr, "modifiable", true)
     api.nvim_buf_set_lines(content_bufnr, 0, -1, false, lines)
     api.nvim_buf_set_option(content_bufnr, "modifiable", false)
     api.nvim_set_current_win(main_win)
@@ -563,6 +527,7 @@ function M.show_reviewthread_qf_entry(repo, number, main_win)
     comment_bufnr = api.nvim_create_buf(false, true)
     api.nvim_buf_set_var(comment_bufnr, "repo", repo)
     api.nvim_buf_set_var(comment_bufnr, "number", number)
+    api.nvim_buf_set_option(comment_bufnr, "syntax", "markdown")
     api.nvim_buf_set_option(comment_bufnr, "filetype", "octo_reviewthread")
     api.nvim_buf_set_option(comment_bufnr, "buftype", "acwrite")
     api.nvim_buf_set_name(comment_bufnr, comment_bufname)
@@ -572,22 +537,26 @@ function M.show_reviewthread_qf_entry(repo, number, main_win)
     M.add_reviewthread_qf_mappings(repo, number, main_win)
     octo.apply_buffer_mappings(comment_bufnr, "reviewthread")
 
-    -- write path
-    writers.write_title(comment_bufnr, reviewthread.path, 1)
-
     -- write diff hunk
     local main_comment = reviewthread.comments.nodes[1]
-    writers.write_diff_hunk(comment_bufnr, main_comment.diffHunk, 3)
+    local start_line = reviewthread.originalStartLine ~= vim.NIL and reviewthread.originalStartLine or reviewthread.originalLine
+    local end_line = reviewthread.originalLine
+    writers.write_review_thread_header(comment_bufnr, {
+      path = reviewthread.path,
+      start_line = start_line,
+      end_line = end_line,
+      isOutdated = reviewthread.isOutdated,
+      isResolved = reviewthread.isResolved
+    })
+    writers.write_commented_lines(comment_bufnr, main_comment.diffHunk, reviewthread.diffSide, start_line, end_line)
 
     -- write thread
     api.nvim_buf_set_var(comment_bufnr, "comments", {})
     for _, comment in ipairs(reviewthread.comments.nodes) do
-      writers.write_comment(comment_bufnr, comment)
+      writers.write_comment(comment_bufnr, comment, "PullRequestReviewComment")
     end
   end
 
-  vim.cmd [[normal! G]]
-
   -- show comment buffer signs
   signs.render_signcolumn(comment_bufnr)
 
@@ -603,8 +572,8 @@ function M.highlight_lines(bufnr, startLine, endLine)
   if not endLine then return end
   startLine = startLine or endLine
   for line = startLine, endLine do
-    api.nvim_buf_add_highlight(bufnr, constants.OCTO_HIGHLIGHT_NS, "OctoNvimCommentLine", line - 1, 0, -1)
-    signs.place("comment", bufnr, line - 1)
+    --api.nvim_buf_add_highlight(bufnr, constants.OCTO_HIGHLIGHT_NS, "OctoNvimCommentLine", line - 1, 0, -1)
+    signs.place("octo_comment", bufnr, line - 1)
   end
 end
 
@@ -658,20 +627,6 @@ end
 
 function M.close_review_tab()
   vim.cmd [[silent! tabclose]]
-
-  -- close fugitive buffers
-  --M.clean_fugitive_buffers()
-
-  -- close review comment buffers
-  local tabpage = api.nvim_get_current_tabpage()
-  for _, w in ipairs(api.nvim_tabpage_list_wins(tabpage)) do
-    if api.nvim_win_is_valid(w) then
-      local bufnr = api.nvim_win_get_buf(w)
-      if api.nvim_buf_get_option(bufnr, "filetype") == "octo_reviewcomment" then
-        vim.cmd(format("bdelete! %d", bufnr))
-      end
-    end
-  end
 end
 
 function M.add_changes_qf_mappings(bufnr)
@@ -717,6 +672,7 @@ function M.submit_review(event)
 
   local comments = {}
   for _, c in ipairs(vim.tbl_values(M.review_comments)) do
+    if util.is_blank(vim.fn.trim(c.body)) then goto continue end
     if c.line1 == c.line2 then
       table.insert(
         comments,
@@ -736,12 +692,13 @@ function M.submit_review(event)
         )
       )
     end
+    ::continue::
   end
   comments = table.concat(comments, ", ")
 
   local qf = vim.fn.getqflist({context = 0})
   local pull_request_id = qf.context.pull_request_id
-  local query = format(graphql.submit_review_mutation, pull_request_id, event, text, comments)
+  local query = graphql("submit_review_mutation", pull_request_id, event, text, comments, {escape = false})
   gh.run(
     {
       args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -751,11 +708,9 @@ function M.submit_review(event)
         elseif output then
           print("Submitted!")
         end
-        --api.nvim_win_close(0, true)
       end
     }
   )
-
   M.close_review_tab()
 end
 
diff --git a/lua/octo/signs.lua b/lua/octo/signs.lua
index 16c5e206..a1709459 100644
--- a/lua/octo/signs.lua
+++ b/lua/octo/signs.lua
@@ -1,23 +1,11 @@
 local util = require("octo.util")
+local writers = require("octo.writers")
 local constants = require("octo.constants")
 local format = string.format
 local api = vim.api
 
 local M = {}
 
-function M.setup()
-  -- sign definitions
-  vim.cmd [[ sign define comment text=❯ texthl=OctoNvimCommentLine linehl=OctoNvimCommentLine ]]
-  vim.cmd [[ sign define clean_block_start text=┌ ]]
-  vim.cmd [[ sign define clean_block_end text=└ ]]
-  vim.cmd [[ sign define dirty_block_start text=┌ texthl=OctoNvimDirty ]]
-  vim.cmd [[ sign define dirty_block_end text=└ texthl=OctoNvimDirty ]]
-  vim.cmd [[ sign define dirty_block_middle text=│ texthl=OctoNvimDirty ]]
-  vim.cmd [[ sign define clean_block_middle text=│ ]]
-  vim.cmd [[ sign define clean_line text=[ ]]
-  vim.cmd [[ sign define dirty_line text=[ texthl=OctoNvimDirty ]]
-end
-
 function M.place(name, bufnr, line)
   -- 0-index based wrapper
   pcall(vim.fn.sign_place, 0, "octo_ns", name, bufnr, {lnum = line + 1})
@@ -31,14 +19,14 @@ function M.place_signs(bufnr, start_line, end_line, is_dirty)
   local dirty_mod = is_dirty and "dirty" or "clean"
 
   if start_line == end_line or end_line < start_line then
-    M.place(format("%s_line", dirty_mod), bufnr, start_line)
+    M.place(format("octo_%s_line", dirty_mod), bufnr, start_line)
   else
-    M.place(format("%s_block_start", dirty_mod), bufnr, start_line)
-    M.place(format("%s_block_end", dirty_mod), bufnr, end_line)
+    M.place(format("octo_%s_block_start", dirty_mod), bufnr, start_line)
+    M.place(format("octo_%s_block_end", dirty_mod), bufnr, end_line)
   end
   if start_line + 1 < end_line then
     for j = start_line + 1, end_line - 1, 1 do
-      M.place(format("%s_block_middle", dirty_mod), bufnr, j)
+      M.place(format("octo_%s_block_middle", dirty_mod), bufnr, j)
     end
   end
 end
@@ -84,7 +72,7 @@ function M.render_signcolumn(bufnr)
     -- description virtual text
     if util.is_blank(desc["body"]) then
       local desc_vt = {{constants.NO_BODY_MSG, "OctoNvimEmpty"}}
-      api.nvim_buf_set_virtual_text(bufnr, constants.OCTO_EMPTY_MSG_VT_NS, start_line, desc_vt, {})
+      writers.write_virtual_text(bufnr, constants.OCTO_EMPTY_MSG_VT_NS, start_line, desc_vt)
     end
   end
 
@@ -101,7 +89,7 @@ function M.render_signcolumn(bufnr)
     -- comment virtual text
     if util.is_blank(c["body"]) then
       local comment_vt = {{constants.NO_BODY_MSG, "OctoNvimEmpty"}}
-      api.nvim_buf_set_virtual_text(bufnr, constants.OCTO_EMPTY_MSG_VT_NS, start_line, comment_vt, {})
+      writers.write_virtual_text(bufnr, constants.OCTO_EMPTY_MSG_VT_NS, start_line, comment_vt)
     end
   end
 
diff --git a/lua/octo/util.lua b/lua/octo/util.lua
index cee37a00..988b3638 100644
--- a/lua/octo/util.lua
+++ b/lua/octo/util.lua
@@ -8,7 +8,7 @@ local format = string.format
 local vim = vim
 local api = vim.api
 local json = {
-  parse = vim.fn.json_decode,
+  parse = vim.fn.json_decode
 }
 
 local M = {}
@@ -187,8 +187,7 @@ function M.update_issue_metadata(bufnr)
       -- description has been removed
       -- the space in ' ' is crucial to prevent this block of code from repeating on TextChanged(I)?
       api.nvim_buf_set_lines(bufnr, start_line, start_line + 1, false, {" ", ""})
-      local winnr = api.nvim_get_current_win()
-      api.nvim_win_set_cursor(winnr, {start_line + 1, 0})
+      api.nvim_win_set_cursor(0, {start_line + 1, 0})
     end
     M.update_metadata(metadata, start_line, end_line, text)
     api.nvim_buf_set_var(bufnr, "description", metadata)
@@ -205,8 +204,7 @@ function M.update_issue_metadata(bufnr)
       -- comment has been removed
       -- the space in ' ' is crucial to prevent this block of code from repeating on TextChanged(I)?
       api.nvim_buf_set_lines(bufnr, start_line, start_line + 1, false, {" ", ""})
-      local winnr = api.nvim_get_current_win()
-      api.nvim_win_set_cursor(winnr, {start_line + 1, 0})
+      api.nvim_win_set_cursor(0, {start_line + 1, 0})
     end
 
     M.update_metadata(metadata, start_line, end_line, text)
@@ -222,13 +220,40 @@ function M.get_comment_at_cursor(bufnr, cursor)
     local start_line = mark[1] + 1
     local end_line = mark[3]["end_row"] + 1
     if start_line <= cursor[1] and end_line >= cursor[1] then
-      return {comment, start_line, end_line}
+      return comment, start_line, end_line
     end
   end
   return nil
 end
 
-function M.update_reactions_at_cursor(bufnr, cursor, reactions) --, reaction_line)
+function M.get_thread_at_cursor(bufnr, cursor)
+  if vim.bo[bufnr].ft == "octo_issue" then
+    local thread_map = api.nvim_buf_get_var(bufnr, "reviewThreadMap")
+    local marks = api.nvim_buf_get_extmarks(bufnr, constants.OCTO_THREAD_NS, 0, -1, {details = true})
+    for _, mark in ipairs(marks) do
+      local info = thread_map[tostring(mark[1])]
+      if not info then
+        goto continue
+      end
+      local thread_id = info.thread_id
+      local first_comment_id = info.first_comment_id
+      local start_line = mark[2]
+      local end_line = mark[4]["end_row"]
+      if start_line <= cursor[1] and end_line >= cursor[1] then
+        return thread_id, start_line, end_line, first_comment_id
+      end
+      ::continue::
+    end
+  elseif vim.bo[bufnr].ft == "octo_reviewthread" then
+    local bufname = api.nvim_buf_get_name(bufnr)
+    local thread_id, first_comment_id = string.match(bufname, "octo://.*/pull/%d+/reviewthread/(.*)/comment/(.*)")
+    local end_line = api.nvim_buf_line_count(bufnr) - 1
+    return thread_id, 1, end_line, first_comment_id
+  end
+  return nil
+end
+
+function M.update_reactions_at_cursor(bufnr, cursor, reaction_groups)
   local comments = api.nvim_buf_get_var(bufnr, "comments")
   for i, comment in ipairs(comments) do
     local mark = api.nvim_buf_get_extmark_by_id(bufnr, constants.OCTO_EM_NS, comment.extmark, {details = true})
@@ -236,9 +261,7 @@ function M.update_reactions_at_cursor(bufnr, cursor, reactions) --, reaction_lin
     local end_line = mark[3]["end_row"] + 1
     if start_line <= cursor[1] and end_line >= cursor[1] then
       --  cursor located in the body of a comment
-      comments[i].reactions = reactions
-      --print("DIFF", comments[i].reaction_line, reaction_line)
-      --comments[i].reaction_line = reaction_line
+      comments[i].reaction_groups = reaction_groups
       api.nvim_buf_set_var(bufnr, "comments", comments)
       return
     end
@@ -246,7 +269,6 @@ function M.update_reactions_at_cursor(bufnr, cursor, reactions) --, reaction_lin
 
   -- cursor not located at any comment, so updating issue
   api.nvim_buf_set_var(bufnr, "body_reactions", reactions)
-  --api.nvim_buf_set_var(bufnr, "body_reaction_line", reaction_line)
 end
 
 function M.format_date(date_string)
@@ -254,44 +276,117 @@ function M.format_date(date_string)
   return date(date_string):addminutes(time_bias):fmt(vim.g.octo_date_format)
 end
 
-function M.create_content_popup(lines)
+function M.create_popup(opts)
+  opts = opts or {}
+  opts.x_percent = opts.x_percent or 0.6
+  opts.y_percent = opts.y_percent or 0.4
+
+  -- calculate vim height
+  local vim_height = vim.o.lines - vim.o.cmdheight
+  if vim.o.laststatus ~= 0 then
+    vim_height = vim_height - 1
+  end
+
+  -- calculate vim width
+  local vim_width = vim.o.columns
+
+  -- calculate longest line in lines
   local max_line = -1
-  for _, line in ipairs(lines) do
-    max_line = math.max(#line, max_line)
+  if opts.content then
+    for _, line in ipairs(opts.content) do
+      max_line = math.max(#line, max_line)
+    end
+  end
+
+  -- calculate window height/width
+  local width, height
+  if max_line > 0 then
+    -- pre-defined content
+    width = math.min(vim_width * 0.9, max_line)
+    if opts.header then
+      height = math.min(vim_height, 2 + #opts.content)
+    else
+      height = math.min(vim_height, #opts.content)
+    end
+  else
+    width = math.floor(vim_width * opts.x_percent)
+    height = math.floor(vim_height * opts.y_percent)
   end
-  local line_count = vim.o.lines - vim.o.cmdheight
-  local max_width = math.min(vim.o.columns * 0.9, max_line)
-  if vim.o.laststatus ~= 0 then
-    line_count = line_count - 1
-  end
-  local winnr, bufnr = M.create_popup(lines, {
-    line = (line_count - #lines) / 2,
-    col = (vim.o.columns - max_width) / 2,
-    height = #lines
-  })
-  return winnr, bufnr
-end
 
-function M.create_popup(content, opts)
-  local winnr, _ =
+  -- calculate offsets
+  local x_offset = (vim_width - width) / 2
+  local y_offset = (vim_height - height) / 2
+  local header_winid
+  local header_win_opts = {border = {}}
+  if opts.header then
+    header_winid, header_win_opts =
+      popup.create(
+      {opts.header},
+      {
+        moved = "non-existant",
+        line =y_offset,
+        col = x_offset,
+        minwidth = width,
+        maxheight = 2,
+        border = {1, 1, 0, 1},
+        borderchars = {"─", "│", "", "│", "┌", "┐", "┤", "├"},
+        padding = {0, 0, 0, 0}
+      }
+    )
+    vim.cmd("set eventignore+=WinClosed,WinLeave")
+    local header_bufnr = api.nvim_win_get_buf(header_winid)
+    api.nvim_buf_set_option(header_bufnr, "modifiable", false)
+  end
+  local winid =
     popup.create(
-    content,
+    opts.content or {},
     {
-      line = opts.line,
-      col = opts.col,
-      minwidth = opts.width or 40,
-      minheight = opts.height or 20,
+      moved = "non-existant",
+      line = opts.header and y_offset+2 or y_offset,
+      col = x_offset,
+      minwidth = width,
+      minheight = height,
       border = {1, 1, 1, 1},
-      borderchars = {"─", "│", "─", "│", "┌", "┐", "┘", "└"},
-      padding = {1, 1, 1, 1}
+      borderchars = opts.header and {"─", "│", "─", "│", "├", "┤", "┘", "└"} or {"─", "│", "─", "│", "┌", "┐", "┘", "└"},
+      padding = {0, 0, 0, 0}
     }
   )
-  local bufnr = api.nvim_win_get_buf(winnr)
+  local bufnr = api.nvim_win_get_buf(winid)
+  if header_winid then
+    vim.cmd(string.format(
+      "autocmd BufLeave,BufDelete <buffer=%d> ++nested ++once :lua require('octo.util').try_close_wins(%d, %d, %d)",
+      bufnr,
+      header_winid,
+      header_win_opts.border.win_id,
+      winid))
+    vim.cmd(string.format(
+      "autocmd WinClosed,WinLeave <buffer=%d> ++nested ++once :lua require('octo.util').try_close_wins(%d, %d, %d)",
+      bufnr,
+      header_winid,
+      header_win_opts.border.win_id,
+      winid))
+  else
+    vim.cmd(string.format(
+      "autocmd BufLeave,BufDelete <buffer=%d> ++nested ++once :lua require('octo.util').try_close_wins(%d)",
+      bufnr,
+      winid))
+    vim.cmd(string.format(
+      "autocmd WinClosed,WinLeave <buffer=%d> ++nested ++once :lua require('octo.util').try_close_wins(%d)",
+      bufnr,
+      winid))
+  end
   local mapping_opts = {script = true, silent = true, noremap = true}
-  api.nvim_buf_set_keymap(bufnr, "n", "q", format(":call nvim_win_close(%d, 1)<CR>", winnr), mapping_opts)
-  api.nvim_buf_set_keymap(bufnr, "n", "<esc>", format(":call nvim_win_close(%d, 1)<CR>", winnr), mapping_opts)
-  api.nvim_buf_set_keymap(bufnr, "n", "<C-c>", format(":call nvim_win_close(%d, 1)<CR>", winnr), mapping_opts)
-  return winnr, bufnr
+  api.nvim_buf_set_keymap(bufnr, "n", "q", format("<cmd>lua require'octo.util'.try_close_wins(%d)<CR>", winid), mapping_opts)
+  api.nvim_buf_set_keymap(bufnr, "n", "<esc>", format("<cmd>lua require'octo.util'.try_close_wins(%d)<CR>", winid), mapping_opts)
+  api.nvim_buf_set_keymap(bufnr, "n", "<C-c>", format("<cmd>lua require'octo.util'.try_close_wins(%d)<CR>", winid), mapping_opts)
+
+  return winid, bufnr
+end
+
+function M.try_close_wins(...)
+  for _, win_id in ipairs({...}) do
+    pcall(vim.api.nvim_win_close, win_id, true)
+  end
 end
 
 function M.get_buffer_kind(bufnr)
@@ -317,7 +412,7 @@ function M.get_repo_id(repo)
   else
     local owner = vim.split(repo, "/")[1]
     local name = vim.split(repo, "/")[2]
-    local query = format(graphql.repository_id_query, owner, name)
+    local query = graphql("repository_id_query", owner, name)
     local output =
       gh.run(
       {
@@ -390,7 +485,7 @@ function M.escape_chars(string)
     string,
     '["]',
     {
-      ['"'] = '\\"',
+      ['"'] = '\\"'
     }
   )
 end
@@ -399,7 +494,9 @@ function M.open_in_browser()
   local repo, number = M.get_repo_number()
   local bufname = vim.fn.bufname()
   local _, type = string.match(bufname, "octo://(.+)/(.+)/(%d+)")
-  if type == "pull" then type = "pr" end
+  if type == "pull" then
+    type = "pr"
+  end
   local cmd = format("gh %s view --web -R %s %d", type, repo, number)
   print(cmd)
   os.execute(cmd)
@@ -408,8 +505,8 @@ end
 function M.open_url_at_cursor()
   local uri = vim.fn.matchstr(vim.fn.getline("."), "[a-z]*:\\/\\/[^ >,;()]*")
   print(uri)
-  if uri then 
-    require"octo.commands".parse_url(uri)
+  if uri then
+    require "octo.commands".parse_url(uri)
   else
     api.nvim_err_writeln("No URI found in line.")
   end
@@ -418,7 +515,7 @@ end
 function M.get_file_contents(repo, commit, path, cb)
   local owner = vim.split(repo, "/")[1]
   local name = vim.split(repo, "/")[2]
-  local query = format(graphql.file_content_query, owner, name, commit, path)
+  local query = graphql("file_content_query", owner, name, commit, path)
   gh.run(
     {
       args = {"api", "graphql", "-f", format("query=%s", query)},
@@ -436,18 +533,34 @@ function M.get_file_contents(repo, commit, path, cb)
         end
       end
     }
-   )
+  )
 end
 
 function M.set_timeout(delay, callback, ...)
   local timer = vim.loop.new_timer()
   local args = {...}
-  vim.loop.timer_start(timer, delay, 0, function ()
-    vim.loop.timer_stop(timer)
-    vim.loop.close(timer)
-    callback(unpack(args))
-  end)
+  vim.loop.timer_start(
+    timer,
+    delay,
+    0,
+    function()
+      vim.loop.timer_stop(timer)
+      vim.loop.close(timer)
+      callback(unpack(args))
+    end
+  )
   return timer
 end
 
+function M.getwin4buf(bufnr)
+  local tabpage = api.nvim_get_current_tabpage()
+  local wins = api.nvim_tabpage_list_wins(tabpage)
+  for _, w in ipairs(wins) do
+    if bufnr == api.nvim_win_get_buf(w) then
+      return w
+    end
+  end
+  return -1
+end
+
 return M
diff --git a/lua/octo/writers.lua b/lua/octo/writers.lua
index 76d5d549..ecdbcce8 100644
--- a/lua/octo/writers.lua
+++ b/lua/octo/writers.lua
@@ -10,6 +10,7 @@ local format = string.format
 local M = {}
 
 function M.write_block(lines, opts)
+  opts = opts or {}
   local bufnr = opts.bufnr or api.nvim_get_current_buf()
 
   if type(lines) == "string" then
@@ -98,7 +99,7 @@ function M.write_state(bufnr, state, number)
       table.insert(title_vt, {"[DRAFT] ", "OctoNvimIssueId"})
     end
   end
-  api.nvim_buf_set_virtual_text(bufnr, constants.OCTO_TITLE_VT_NS, 0, title_vt, {})
+  M.write_virtual_text(bufnr, constants.OCTO_TITLE_VT_NS, 0, title_vt)
 end
 
 function M.write_body(bufnr, issue, line)
@@ -120,39 +121,23 @@ function M.write_body(bufnr, issue, line)
   )
 end
 
-function M.write_reactions(bufnr, reactions, line)
+function M.write_reactions(bufnr, reaction_groups, line)
   -- clear namespace and set vt
   api.nvim_buf_clear_namespace(bufnr, constants.OCTO_REACTIONS_VT_NS, line - 1, line + 1)
 
-  local reaction_map = {
-    ["THUMBS_UP"] = 0,
-    ["THUMBS_DOWN"] = 0,
-    ["LAUGH"] = 0,
-    ["HOORAY"] = 0,
-    ["CONFUSED"] = 0,
-    ["HEART"] = 0,
-    ["ROCKET"] = 0,
-    ["EYES"] = 0,
-    ["totalCount"] = reactions.totalCount
-  }
-  for _, reaction in ipairs(reactions.nodes) do
-    reaction_map[reaction.content] = reaction_map[reaction.content] + 1
-  end
-
-  if reaction_map.totalCount > 0 then
-    local reactions_vt = {}
-    for reaction, count in pairs(reaction_map) do
-      local content = util.reaction_map[reaction]
-      if content and count > 0 then
-        table.insert(reactions_vt, {"", "OctoNvimBubbleDelimiter"})
-        table.insert(reactions_vt, {content, "OctoNvimBubbleBody"})
-        table.insert(reactions_vt, {"", "OctoNvimBubbleDelimiter"})
-        table.insert(reactions_vt, {format(" %s ", count), "Normal"})
-      end
+  local reactions_vt = {}
+  for _, group in ipairs(reaction_groups) do
+    if group.users.totalCount > 0 then
+      vim.list_extend(reactions_vt, {
+        {"", "OctoNvimBubbleDelimiter"},
+        {util.reaction_map[group.content], "OctoNvimBubbleBody"},
+        {"", "OctoNvimBubbleDelimiter"},
+        {format(" %s ", group.users.totalCount), "Normal"}
+      })
     end
-
-    api.nvim_buf_set_virtual_text(bufnr, constants.OCTO_REACTIONS_VT_NS, line - 1, reactions_vt, {})
   end
+
+  M.write_virtual_text(bufnr, constants.OCTO_REACTIONS_VT_NS, line - 1, reactions_vt)
   return line
 end
 
@@ -213,8 +198,8 @@ function M.write_details(bufnr, issue, update)
     local projects_vt = {
       {"Projects: ", "OctoNvimDetailsLabel"}
     }
-    local project_color = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("NormalFloat")), "bg#"):sub(2)
-    local column_color = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("Comment")), "fg#"):sub(2)
+    --local project_color = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("NormalFloat")), "bg#"):sub(2)
+    --local column_color = vim.fn.synIDattr(vim.fn.synIDtrans(vim.fn.hlID("Comment")), "fg#"):sub(2)
     for _, card in ipairs(issue.projectCards.nodes) do
       table.insert(projects_vt, {card.column.name, })
       table.insert(projects_vt, {" (", "OctoNvimDetailsLabel"})
@@ -331,40 +316,68 @@ function M.write_details(bufnr, issue, update)
     table.insert(empty_lines, "")
   end
   if not update then
-    M.write_block(empty_lines, {bufnr = bufnr, mark = false, line = line})
+    M.write_block(empty_lines, {bufnr = bufnr, line = line})
   end
 
   -- print details as virtual text
   for _, d in ipairs(details) do
-    api.nvim_buf_set_virtual_text(bufnr, constants.OCTO_DETAILS_VT_NS, line - 1, d, {})
+    M.write_virtual_text(bufnr, constants.OCTO_DETAILS_VT_NS, line - 1, d)
     line = line + 1
   end
 end
 
-function M.write_comment(bufnr, comment, line)
+function M.write_comment(bufnr, comment, kind, line)
+
+  -- possible kinds:
+  ---- IssueComment
+  ---- PullRequestReview
+  ---- PullRequestReviewComment
 
   -- heading
   line = line or api.nvim_buf_line_count(bufnr) + 1
-  M.write_block({"", ""}, {bufnr = bufnr, mark = false, line = line})
-
-  local header_vt = {
-    {format("On %s ", util.format_date(comment.createdAt)), "OctoNvimCommentHeading"},
-    {comment.author.login, "OctoNvimCommentUser"},
-  }
-  if comment.comments and comment.state then
-    table.insert(header_vt, {" added a ", "OctoNvimCommentHeading"})
-    table.insert(header_vt, {comment.state, "OctoNvimCommentValue"})
-    table.insert(header_vt, {format(" review (%d comments)", comment.comments.totalCount), "OctoNvimCommentHeading"})
-  else
-    table.insert(header_vt, {" commented", "OctoNvimCommentHeading"})
+  local start_line = line
+  M.write_block({"", ""}, {bufnr = bufnr, line = line})
+
+  local header_vt
+  if kind == "PullRequestReview" then
+    -- Review top-level comments
+    header_vt = {
+      {"REVIEW: ", "OctoNvimTimelineItemHeading"},
+      {comment.author.login.." ", "OctoNvimUser"},
+      {comment.state:lower().." ", "OctoNvimDetailsValue"},
+      {"(", "OctoNvimSymbol"},
+      {util.format_date(comment.createdAt), "OctoNvimDate"},
+      {")", "OctoNvimSymbol"}
+    }
+  elseif kind == "PullRequestReviewComment" then
+    -- Review thread comments
+    header_vt = {
+      {"THREAD COMMENT: ", "OctoNvimTimelineItemHeading"},
+      {comment.author.login.." ", "OctoNvimUser"},
+      {"(", "OctoNvimSymbol"},
+      {util.format_date(comment.createdAt), "OctoNvimDate"},
+      {")", "OctoNvimSymbol"}
+    }
+  elseif kind == "IssueComment" then
+    -- Issue comments
+    header_vt = {
+      {"COMMENT: ", "OctoNvimTimelineItemHeading"},
+      {comment.author.login.." ", "OctoNvimUser"},
+      {"(", "OctoNvimSymbol"},
+      {util.format_date(comment.createdAt), "OctoNvimDate"},
+      {")", "OctoNvimSymbol"}
+    }
   end
+  local comment_vt_ns = api.nvim_create_namespace("")
+  M.write_virtual_text(bufnr, comment_vt_ns, line - 1, header_vt)
 
-  local comment_vt_ns = api.nvim_buf_set_virtual_text(bufnr, 0, line - 1, header_vt, {})
-
-  local fold_start_line = line + 2
+  if kind == "PullRequestReview" and util.is_blank(comment.body) then
+    -- do not render empty review comments
+    return start_line, start_line+1
+  end
 
   -- body
-  line = fold_start_line
+  line = line + 2
   local comment_body = string.gsub(comment.body, "\r\n", "\n")
   if vim.startswith(comment_body, constants.NO_BODY_MSG) or util.is_blank(comment_body) then
     comment_body = " "
@@ -375,12 +388,7 @@ function M.write_comment(bufnr, comment, line)
 
   -- reactions
   line = line + #content - 2
-  local reaction_line = M.write_reactions(bufnr, comment.reactions, line)
-
-  -- use v3 IDs
-  if not tonumber(comment.id) then
-    comment.id = util.graph2rest(comment.id)
-  end
+  local reaction_line = M.write_reactions(bufnr, comment.reactionGroups, line)
 
   -- update metadata
   local comments_metadata = api.nvim_buf_get_var(bufnr, "comments")
@@ -395,19 +403,18 @@ function M.write_comment(bufnr, comment, line)
       extmark = comment_mark,
       namespace = comment_vt_ns,
       reaction_line = reaction_line,
-      reactions = comment.reactions
+      reaction_groups = comment.reactionGroups,
+      kind = kind,
+      first_comment_id = comment.first_comment_id,
     }
   )
   api.nvim_buf_set_var(bufnr, "comments", comments_metadata)
 
-  -- add fold
-  vim.cmd(format("%d,%dfold", fold_start_line - 1, line))
-  vim.cmd(format("%d,%dfoldopen!", fold_start_line - 1, line))
-
+  return start_line, line
 end
 
-function M.write_diff_hunk(bufnr, diff_hunk, start_line)
-  start_line = start_line or 1
+function M.write_diff_hunk(bufnr, diff_hunk, start_line, marker)
+  start_line = start_line or api.nvim_buf_line_count(bufnr) + 1
 
   -- clear virtual texts
   api.nvim_buf_clear_namespace(bufnr, constants.OCTO_DIFFHUNKS_VT_NS, 0, start_line - 1)
@@ -423,19 +430,21 @@ function M.write_diff_hunk(bufnr, diff_hunk, start_line)
       max_length = #l
     end
   end
-  max_length = math.max(max_length, vim.fn.winwidth(0) - 8)
+  max_length = math.max(max_length, vim.fn.winwidth(0) - 10 - vim.wo.foldcolumn)
   vim.list_extend(empty_lines, {"", "", ""})
-  M.write_block(empty_lines, {bufnr = bufnr, mark = false, line = start_line})
+  M.write_block(empty_lines, {bufnr = bufnr, line = start_line})
 
   local vt_lines = {}
   table.insert(vt_lines, {{format("┌%s┐", string.rep("─", max_length + 2))}})
-  for _, line in ipairs(lines) do
+  for i, line in ipairs(lines) do
+
+    local arrow = i == marker and ">" or " "
     if vim.startswith(line, "@@ ") then
       local index = string.find(line, "@[^@]*$")
       table.insert(
         vt_lines,
         {
-          {"│ "},
+          {"│"..arrow},
           {string.sub(line, 0, index), "DiffLine"},
           {string.sub(line, index + 1), "DiffSubname"},
           {string.rep(" ", 1 + max_length - #line)},
@@ -446,7 +455,7 @@ function M.write_diff_hunk(bufnr, diff_hunk, start_line)
       table.insert(
         vt_lines,
         {
-          {"│ "},
+          {"│"..arrow},
           {line, "DiffAdd"},
           {string.rep(" ", max_length - #line)},
           {" │"}
@@ -456,7 +465,7 @@ function M.write_diff_hunk(bufnr, diff_hunk, start_line)
       table.insert(
         vt_lines,
         {
-          {"│ "},
+          {"│"..arrow},
           {line, "DiffDelete"},
           {string.rep(" ", max_length - #line)},
           {" │"}
@@ -466,7 +475,7 @@ function M.write_diff_hunk(bufnr, diff_hunk, start_line)
       table.insert(
         vt_lines,
         {
-          {"│ "},
+          {"│"..arrow},
           {line},
           {string.rep(" ", max_length - #line)},
           {" │"}
@@ -479,9 +488,108 @@ function M.write_diff_hunk(bufnr, diff_hunk, start_line)
   -- print diff_hunk as virtual text
   local line = start_line - 1
   for _, vt_line in ipairs(vt_lines) do
-    api.nvim_buf_set_virtual_text(bufnr, constants.OCTO_DETAILS_VT_NS, line, vt_line, {})
+    M.write_virtual_text(bufnr, constants.OCTO_DETAILS_VT_NS, line, vt_line)
+    line = line + 1
+  end
+
+  return start_line, line
+end
+
+function M.write_commented_lines(bufnr, diff_hunk, side, start_pos, end_pos, start_line)
+  start_line = start_line or api.nvim_buf_line_count(bufnr) + 1
+  start_pos = start_pos ~= vim.NIL and start_pos or end_pos
+
+  -- clear virtual texts
+  api.nvim_buf_clear_namespace(bufnr, constants.OCTO_DIFFHUNKS_VT_NS, 0, start_line - 1)
+
+  local lines = vim.split(diff_hunk, "\n")
+
+  -- print end_pos - start_pos + 2 empty lines
+  local empty_lines = {}
+  for _=1,(end_pos-start_pos+4) do
+    table.insert(empty_lines, "")
+  end
+  local diff_directive = lines[1]
+  local side_lines = {}
+  for i=2,#lines do
+    local line = lines[i]
+    if vim.startswith(line, "+") and side == "RIGHT" then
+      table.insert(side_lines, line)
+    elseif vim.startswith(line, "-") and side == "LEFT" then
+      table.insert(side_lines, line)
+    elseif not vim.startswith(line, "-") and not vim.startswith(line, "+") then
+      table.insert(side_lines, line)
+    end
+  end
+  local max_length = -1
+  for _, line in ipairs(side_lines) do
+    max_length = math.max(max_length, #line)
+  end
+  max_length = math.min(max_length, vim.fn.winwidth(0) - 10 - vim.wo.foldcolumn) + 1
+
+  M.write_block(empty_lines, {bufnr = bufnr, line = start_line})
+
+  local left_offset, right_offset  = string.match(diff_directive, "@@%s%-(%d+),%d+%s%+(%d+),%d+%s@@")
+  local offset = side == "RIGHT" and right_offset or left_offset
+  local final_lines = {unpack(side_lines, start_pos - offset + 1, end_pos - offset + 1)}
+  local vt_lines = {}
+  local max_lnum = math.max(#tostring(start_pos), #tostring(end_pos))
+  table.insert(vt_lines, {{format("┌%s┐", string.rep("─", max_lnum + max_length + 2))}})
+  for i, line in ipairs(final_lines) do
+    local stripped_line = line:gsub("^.", "")
+    local hl_line = side == "RIGHT" and "DiffAdd" or "DiffDelete"
+    local vt_line = {stripped_line, hl_line}
+    local fill = string.rep(" ", max_length - #stripped_line)
+    table.insert( vt_lines, {
+      {"│"},
+      {" "..tostring(i + start_pos - 1).." ", "DiffChange"},
+      vt_line,
+      {fill, hl_line},
+      {"│"}
+    })
+  end
+  table.insert(vt_lines, {{format("└%s┘", string.rep("─", max_lnum + max_length + 2))}})
+
+  -- print diff_hunk as virtual text
+  local line = start_line - 1
+  for _, vt_line in ipairs(vt_lines) do
+    M.write_virtual_text(bufnr, constants.OCTO_DETAILS_VT_NS, line, vt_line)
     line = line + 1
   end
+
+  return start_line, line
+end
+
+function M.write_review_thread_header(bufnr, opts, line)
+  line = line or api.nvim_buf_line_count(bufnr) - 1
+
+  -- clear virtual texts
+  api.nvim_buf_clear_namespace(bufnr, constants.OCTO_THREAD_HEADER_VT_NS, line, line + 2)
+
+  local header_vt = {
+    {"THREAD: ", "OctoNvimTimelineItemHeading"},
+    {"[", "OctoNvimSymbol"},
+    {opts.path.." ", "OctoNvimDetailsLabel"},
+    {tostring(opts.start_line)..":"..tostring(opts.end_line), "OctoNvimDetailsValue"},
+    {"]", "OctoNvimSymbol"},
+  }
+  if opts.isOutdated then
+    table.insert(header_vt, {"", "OctoNvimBubbleDelimiter"})
+    table.insert(header_vt, {"outdated", "OctoNvimBubbleRed"})
+    table.insert(header_vt, {" ", "OctoNvimBubbleDelimiter"})
+  end
+  if opts.isResolved then
+    table.insert(header_vt, {"", "OctoNvimBubbleDelimiter"})
+    table.insert(header_vt, {"resolved", "OctoNvimBubbleGreen"})
+    table.insert(header_vt, {" ", "OctoNvimBubbleDelimiter"})
+  end
+  M.write_block({""}, {bufnr = bufnr})
+  M.write_virtual_text(bufnr, constants.OCTO_THREAD_HEADER_VT_NS, line + 1, header_vt)
+end
+
+function M.write_virtual_text(bufnr, ns, line, chunks)
+  --api.nvim_buf_set_extmark(bufnr, ns, line, 0, { virt_text=chunks, virt_text_pos='overlay'})
+  api.nvim_buf_set_virtual_text(bufnr, ns, line, chunks, {})
 end
 
 return M
diff --git a/plugin/octo.vim b/plugin/octo.vim
index 00720ab6..cc60e49d 100644
--- a/plugin/octo.vim
+++ b/plugin/octo.vim
@@ -30,6 +30,9 @@ if get(g:, 'octo_color_bubble_bg', '') != '' && get(g:, 'octo_color_green', '')
   execute('hi! OctoNvimPullAdditions guifg='.g:octo_color_green)
   execute('hi! OctoNvimPullDeletions guifg='.g:octo_color_red)
   execute('hi! OctoNvimPullModifications guifg='.g:octo_color_blue)
+
+  " Editable regions
+  execute('hi! OctoNvimEditable guibg='.g:octo_color_bubble_bg)
 endif
 
 function! s:command_complete(...)
@@ -64,8 +67,16 @@ function s:configure_octo_buffer() abort
   if match(bufname(), "octo://.\\+/.\\+/pull/\\d\\+/file/") == -1
     setlocal omnifunc=octo#issue_complete
     setlocal nonumber norelativenumber nocursorline wrap
-    setlocal foldcolumn=1
+    setlocal foldcolumn=3
     setlocal signcolumn=yes
+    setlocal fillchars=fold:⠀,foldopen:⠀,foldclose:⠀,foldsep:⠀
+    setlocal foldtext=v:lua.OctoFoldText()
+    setlocal foldmethod=manual
+    setlocal foldenable
+    setlocal foldcolumn=3
+    setlocal foldlevelstart=99
+    setlocal conceallevel=2
+    setlocal syntax=markdown
   end
 endfunction
 
@@ -77,7 +88,15 @@ au BufWriteCmd octo://* lua require'octo'.save_buffer()
 augroup END
 
 " sign definitions
-lua require'octo.signs'.setup()
+sign define octo_comment text=❯ texthl=OctoNvimCommentLine linehl=OctoNvimCommentLine 
+sign define octo_clean_block_start text=┌ linehl=OctoNvimEditable
+sign define octo_clean_block_end text=└ linehl=OctoNvimEditable
+sign define octo_dirty_block_start text=┌ texthl=OctoNvimDirty linehl=OctoNvimEditable
+sign define octo_dirty_block_end text=└ texthl=OctoNvimDirty linehl=OctoNvimEditable
+sign define octo_dirty_block_middle text=│ texthl=OctoNvimDirty linehl=OctoNvimEditable
+sign define octo_clean_block_middle text=│ linehl=OctoNvimEditable
+sign define octo_clean_line text=[ linehl=OctoNvimEditable
+sign define octo_dirty_line text=[ texthl=OctoNvimDirty linehl=OctoNvimEditable
 
 " folds
 lua require'octo.folds'