@@ -131,8 +131,9 @@ require("codeql").setup {
 ## Mappings
 - `gd`: On a `codeql:/` file, jumps to the symbol definition.
 - `gr`: On a `codeql:/` file, show symbol references in the QuickFix window.
-- `qr`: Runs the current query.
-- `qe`: QuickEvals the selected predicate.
+- `<leader>qr`: Runs the current query.
+- `<leader>qe`: Quick evaluate the selected predicate.
+- `<leader>qp`: Quick evaluate the enclosing predicate.
 - `<Plug>(CodeQLGrepSource)`: shows a telescope menu to grep the source archive
 
 ## Result Browser
 
@@ -1,7 +1,3 @@
 au BufRead,BufNewFile *.ql  setfiletype ql
 au BufRead,BufNewFile *.qll setfiletype ql
 
-nnoremap qr :RunQuery<CR>
-nnoremap qp :QuickEvalPredicate<CR>
-nnoremap qe :QuickEval<CR>
-vnoremap qe :QuickEval<CR>
@@ -16,6 +16,11 @@ M.defaults = {
     group_by = "sink",
     context_lines = 3,
   },
+  mappings = {
+    run_query = { modes = { "n" }, lhs = "<space>qr", desc = "run query" },
+    quick_eval = { modes = { "x", "n" }, lhs = "<space>qe", desc = "quick evaluate" },
+    quick_eval_predicate = { modes = { "n" }, lhs = "<space>qp", desc = "quick evaluate enclosing predicate" },
+  },
 }
 
 M._config = M.defaults
 
@@ -123,26 +123,6 @@ function M.get_enclosing_predicate_position()
   end
 end
 
-function M.get_current_position()
-  local srow, scol, erow, ecol
-
-  if vim.fn.getpos("'<")[2] == vim.fn.getcurpos()[2] and vim.fn.getpos("'<")[3] == vim.fn.getcurpos()[3] then
-    srow = vim.fn.getpos("'<")[2]
-    scol = vim.fn.getpos("'<")[3]
-    erow = vim.fn.getpos("'>")[2]
-    ecol = vim.fn.getpos("'>")[3]
-
-    ecol = ecol == 2147483647 and 1 + vim.fn.len(vim.fn.getline(erow)) or 1 + ecol
-  else
-    srow = vim.fn.getcurpos()[2]
-    scol = vim.fn.getcurpos()[3]
-    erow = vim.fn.getcurpos()[2]
-    ecol = vim.fn.getcurpos()[3]
-  end
-
-  return { srow, scol, erow, ecol }
-end
-
 function M.quick_evaluate_enclosing_predicate()
   local position = M.get_enclosing_predicate_position()
   if position then
@@ -151,11 +131,11 @@ function M.quick_evaluate_enclosing_predicate()
 end
 
 function M.quick_evaluate()
-  M.query(true, M.get_current_position())
+  M.query(true, util.get_current_position())
 end
 
 function M.run_query()
-  M.query(false, M.get_current_position())
+  M.query(false, util.get_current_position())
 end
 
 function M.query(quick_eval, position)
@@ -334,6 +314,8 @@ function M.setup(opts)
     vim.cmd [[au BufEnter * if &ft ==# 'codeql_panel' | execute("lua require'codeql.panel'.apply_mappings()") | endif]]
     vim.cmd [[au BufEnter codeql://* lua require'codeql'.setup_archive_buffer()]]
     vim.cmd [[au BufReadCmd codeql://* lua require'codeql'.load_source_buffer()]]
+    vim.cmd [[autocmd FileType ql lua require'codeql.util'.apply_mappings()]]
+
     if require("codeql.config").get_config().format_on_save then
       vim.cmd [[autocmd FileType ql autocmd BufWrite <buffer> lua vim.lsp.buf.formatting()]]
     end
 
@@ -206,16 +206,10 @@ function M.run_query(opts)
   }
 
   local runQueries_callback = function(err, result)
-    print("FOO", vim.inspect(result))
     if err then
       util.err_message "ERROR: runQuery failed"
     end
     if util.is_file(bqrsPath) then
-      print(bqrsPath)
-      print(dbPath)
-      print(queryPath)
-      print(opts.metadata["kind"])
-      print(opts.metadata["id"])
       loader.process_results {
         bqrs_path = bqrsPath,
         bufnr = bufnr,
@@ -289,7 +283,6 @@ function M.run_query(opts)
         runQueries_params,
         runQueries_callback
       )
-      print("RunQuery", last_rpc_result, last_rpc_msg_id)
     end
   end
 
@@ -301,19 +294,16 @@ function M.run_query(opts)
     compileQuery_params,
     compileQuery_callback
   )
-  print("CompileQuery", last_rpc_result, last_rpc_msg_id)
 end
 
 function M.register_database(database)
   if not M.client then
     M.client = M.start_server()
   end
   config.database = database
-  print("Database details:", vim.inspect(database))
   local resp = util.database_upgrades(
     config.database.datasetFolder .. "/" .. config.database.languages[1] .. ".dbscheme"
   )
-  print(vim.inspect(resp.scripts))
   if resp ~= vim.NIL and #resp.scripts > 0 then
     util.database_upgrade(config.database.path)
   end
 
@@ -12,6 +12,112 @@ local cache = {
   qlpacks = nil,
 }
 
+--- Apply mappings to a buffer
+function M.apply_mappings()
+  local mappings = require "codeql.mappings"
+  local conf = config.get_config()
+  for action, value in pairs(conf.mappings) do
+    if
+      not M.is_blank(value)
+      and not M.is_blank(action)
+      and not M.is_blank(value.lhs)
+      and not M.is_blank(mappings[action])
+    then
+      if M.is_blank(value.desc) then
+        value.desc = ""
+      end
+      local mapping_opts = { silent = true, noremap = true, desc = value.desc }
+      for _, mode in ipairs(value.modes) do
+        vim.api.nvim_buf_set_keymap(0, mode, value.lhs, mappings[action], mapping_opts)
+      end
+    end
+  end
+end
+
+function M.get_current_position()
+  local modeInfo = vim.api.nvim_get_mode()
+  local mode = modeInfo.mode
+
+  local cursor = vim.api.nvim_win_get_cursor(0)
+  local cline, ccol = cursor[1], cursor[2]
+  local vline, vcol = vim.fn.line "v", vim.fn.col "v"
+
+  local sline, scol
+  local eline, ecol
+  if cline == vline then
+    if ccol <= vcol then
+      sline, scol = cline, ccol
+      eline, ecol = vline, vcol
+      scol = scol + 1
+    else
+      sline, scol = vline, vcol
+      eline, ecol = cline, ccol
+      ecol = ecol + 1
+    end
+  elseif cline < vline then
+    sline, scol = cline, ccol
+    eline, ecol = vline, vcol
+    scol = scol + 1
+  else
+    sline, scol = vline, vcol
+    eline, ecol = cline, ccol
+    ecol = ecol + 1
+  end
+
+  if mode == "V" or mode == "CTRL-V" or mode == "\22" then
+    scol = 1
+    ecol = nil
+  end
+
+  local pos = { sline, scol, eline, ecol }
+  return pos
+end
+
+function M.get_current_selection()
+  local pos = M.get_current_position()
+  local sline, scol, eline, ecol = pos[1], pos[2], pos[3], pos[4]
+  local lines = vim.api.nvim_buf_get_lines(0, sline - 1, eline, 0)
+  if #lines == 0 then
+    return
+  end
+
+  local startText, endText
+  if #lines == 1 then
+    startText = string.sub(lines[1], scol, ecol)
+  else
+    startText = string.sub(lines[1], scol)
+    endText = string.sub(lines[#lines], 1, ecol)
+  end
+  local selection = { startText }
+  if #lines > 2 then
+    vim.list_extend(selection, vim.list_slice(lines, 2, #lines - 1))
+  end
+  table.insert(selection, endText)
+
+  return selection
+end
+
+function M.get_current_position_orig()
+  local srow, scol, erow, ecol
+
+  if vim.fn.getpos("'<")[2] == vim.fn.getcurpos()[2] and vim.fn.getpos("'<")[3] == vim.fn.getcurpos()[3] then
+    srow = vim.fn.getpos("'<")[2]
+    scol = vim.fn.getpos("'<")[3]
+    erow = vim.fn.getpos("'>")[2]
+    ecol = vim.fn.getpos("'>")[3]
+
+    ecol = ecol == 2147483647 and 1 + vim.fn.len(vim.fn.getline(erow)) or 1 + ecol
+  else
+    srow = vim.fn.getcurpos()[2]
+    scol = vim.fn.getcurpos()[3]
+    erow = vim.fn.getcurpos()[2]
+    ecol = vim.fn.getcurpos()[3]
+  end
+
+  local pos = { srow, scol, erow, ecol }
+  return pos
+end
+
 function M.list_from_archive(zipfile)
   local job = Job:new {
     enable_recording = true,