diff --git a/.envrc b/.envrc
deleted file mode 100644
index 051d09d..0000000
--- a/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-eval "$(lorri direnv)"
diff --git a/.gitignore b/.gitignore
index 3c3629e..5bcf74c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-node_modules
+#direnv
+/.envrc
+/.direnv/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index fdb49d7..00c9b5c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,33 @@
-.DEFAULT_GOAL := g
-.PHONY: g t b
+TS_CONF := $$HOME/.config/tree-sitter/config.json
 
-g:
-	tree-sitter generate
-
-t:
-	# @$(MAKE) --no-print-directory build
+test: build
 	tree-sitter test
 
-b:
-	tree-sitter test --update
+highlight: build
+	tree-sitter highlight -t test/highlight/*
+
+playground: build-wasm
+	tree-sitter playground --quiet
+
+build-wasm: build
+	tree-sitter build-wasm
+
+build:
+	tree-sitter generate
+
+init: init-tree-sitter init-git-hooks
+
+init-tree-sitter:
+	if [ ! -f "$(TS_CONF)" ]; then \
+		tree-sitter init-config; \
+	fi
+	
+	if [ -z $$(jq '."parser-directories"' $(TS_CONF) | grep $$(dirname $$PWD) ) ]; then \
+		cat <<< $$(jq ".\"parser-directories\" |= . + [\"$$(dirname $(PWD))\"]" $(TS_CONF)) > $(TS_CONF); \
+	fi
+
+init-git-hooks:
+	ln -s $(PWD)/scripts/pre-commit $(PWD)/.git/hooks/pre-commit
+
+help:
+	cat Makefile
diff --git a/dev/nvim-ts.nix b/dev/nvim-ts.nix
new file mode 100644
index 0000000..ffa7143
--- /dev/null
+++ b/dev/nvim-ts.nix
@@ -0,0 +1,65 @@
+{ pkgs ? import <nixpkgs> { } }:
+
+let
+  extraGrammars = {
+    tree-sitter-plpgsql = {
+      language = "psql";
+      src = ../.;
+      version = "0.0.0";
+    };
+  };
+
+  tree-sitter = (pkgs.tree-sitter.override { inherit extraGrammars; });
+  grammars = tree-sitter.withPlugins (g: tree-sitter.allGrammars);
+
+  nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (oldAttrs: {
+    postPatch = ''
+      rm -r parser
+      ln -s ${grammars} parser
+
+      ln -s ${../.}/queries queries/psql
+    '';
+  });
+
+  luaRc = ''
+    local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+    parser_config.psql = {}
+
+    require("nvim-treesitter.configs").setup({
+      ensure_installed = { },
+      sync_install = false,
+
+      highlight = {
+        enable = true,
+      },
+
+      indent = {
+        enable = true,
+      },
+    })
+
+    vim.g.catppuccin_flavour = "frappe"
+    require("catppuccin").setup()
+    vim.cmd([[colorscheme catppuccin]])
+  '';
+
+  neovim = pkgs.neovim.override {
+    configure = {
+      customRC = ''
+        source ${./vimrc.vim}
+        lua <<EOF
+        ${luaRc}
+        EOF
+      '';
+
+      packages.myPlugins.start = with pkgs.vimPlugins; [
+        nvim-treesitter
+        catppuccin-nvim
+      ];
+    };
+  };
+in
+pkgs.runCommand "nvim-ts" { } ''
+  mkdir -p $out/bin
+  ln -s ${neovim}/bin/nvim $out/bin/nvim-ts
+''
diff --git a/dev/vimrc.vim b/dev/vimrc.vim
new file mode 100644
index 0000000..ef59186
--- /dev/null
+++ b/dev/vimrc.vim
@@ -0,0 +1,18 @@
+" Basic settings for tests
+set mouse=a
+set number
+set cursorline
+set expandtab
+set shiftwidth=2
+set softtabstop=-1
+set signcolumn=yes
+set completeopt=menuone,noselect
+set ttimeoutlen=1
+set autoindent
+
+" Always show statusline.
+set laststatus=2
+set statusline=%<%f\ %m%r%y\ %LL\ %=\ 0x%-4.B\ %-16.(%lL,%cC%V,%oB%)\ %P
+
+" Detect d2 without d2-vim
+au BufNewFile,BufRead *.d2 setfiletype d2
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..9b16f49
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,43 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1672756850,
+        "narHash": "sha256-Smbq3+fitwA13qsTMeaaurv09/KVbZfW7m7lINwzDGA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "298add347c2bbce14020fcb54051f517c391196b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..7e75c43
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,25 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs { inherit system; };
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          packages = with pkgs; [
+            jq
+            nodejs-18_x
+            tree-sitter
+            nodePackages.eslint
+            nodePackages.prettier
+            nodePackages.vscode-langservers-extracted # html, css, json, eslint
+            (import ./dev/nvim-ts.nix { inherit pkgs; })
+          ];
+        };
+      });
+}
diff --git a/package.json b/package.json
index ac1441e..0c33b08 100644
--- a/package.json
+++ b/package.json
@@ -2,14 +2,14 @@
   "name": "tree-sitter-plpgsql",
   "version": "1.0.0",
   "description": "",
-  "main": "bindings/node",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
+  "main": "grammar.js",
   "author": "",
   "license": "ISC",
-  "dependencies": {
-    "nan": "^2.15.0",
-    "tree-sitter-cli": "^0.20.0"
-  }
+  "tree-sitter": [
+    {
+      "scope": "source.psql",
+      "file-types": ["psql"],
+      "injection-regex": "^psql$"
+    }
+  ]
 }
diff --git a/scripts/pre-commit b/scripts/pre-commit
new file mode 100644
index 0000000..6b06a4e
--- /dev/null
+++ b/scripts/pre-commit
@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+# Can be used as a pre-commit hook
+# Just symlink this file to .git/hooks/pre-commit
+
+set -xe
+
+if [ ! -z $(git diff --cached --name-only | grep -e "^grammar.js$") ]
+then
+  make build
+  make build-wasm
+  git add src bindings *.wasm
+fi
+
diff --git a/corpus/alter_table_statement.txt b/test/corpus/alter_table_statement.txt
similarity index 100%
rename from corpus/alter_table_statement.txt
rename to test/corpus/alter_table_statement.txt
diff --git a/corpus/create_function/general.txt b/test/corpus/create_function/general.txt
similarity index 100%
rename from corpus/create_function/general.txt
rename to test/corpus/create_function/general.txt
diff --git a/corpus/create_function/parameters.txt b/test/corpus/create_function/parameters.txt
similarity index 100%
rename from corpus/create_function/parameters.txt
rename to test/corpus/create_function/parameters.txt
diff --git a/corpus/create_index_statement.txt b/test/corpus/create_index_statement.txt
similarity index 100%
rename from corpus/create_index_statement.txt
rename to test/corpus/create_index_statement.txt
diff --git a/corpus/create_schema_statement.txt b/test/corpus/create_schema_statement.txt
similarity index 100%
rename from corpus/create_schema_statement.txt
rename to test/corpus/create_schema_statement.txt
diff --git a/corpus/create_sequence_statement.txt b/test/corpus/create_sequence_statement.txt
similarity index 100%
rename from corpus/create_sequence_statement.txt
rename to test/corpus/create_sequence_statement.txt
diff --git a/corpus/create_table_statement.txt b/test/corpus/create_table_statement.txt
similarity index 100%
rename from corpus/create_table_statement.txt
rename to test/corpus/create_table_statement.txt
diff --git a/corpus/create_trigger_statement.txt b/test/corpus/create_trigger_statement.txt
similarity index 100%
rename from corpus/create_trigger_statement.txt
rename to test/corpus/create_trigger_statement.txt
diff --git a/corpus/create_type_statement.txt b/test/corpus/create_type_statement.txt
similarity index 100%
rename from corpus/create_type_statement.txt
rename to test/corpus/create_type_statement.txt
diff --git a/corpus/delete_statement.txt b/test/corpus/delete_statement.txt
similarity index 100%
rename from corpus/delete_statement.txt
rename to test/corpus/delete_statement.txt
diff --git a/corpus/drop_function_statement.txt b/test/corpus/drop_function_statement.txt
similarity index 100%
rename from corpus/drop_function_statement.txt
rename to test/corpus/drop_function_statement.txt
diff --git a/corpus/drop_type_statement.txt b/test/corpus/drop_type_statement.txt
similarity index 100%
rename from corpus/drop_type_statement.txt
rename to test/corpus/drop_type_statement.txt
diff --git a/corpus/execute_statement.txt b/test/corpus/execute_statement.txt
similarity index 100%
rename from corpus/execute_statement.txt
rename to test/corpus/execute_statement.txt
diff --git a/corpus/grant_statement.txt b/test/corpus/grant_statement.txt
similarity index 100%
rename from corpus/grant_statement.txt
rename to test/corpus/grant_statement.txt
diff --git a/corpus/insert_statement/insert.txt b/test/corpus/insert_statement/insert.txt
similarity index 100%
rename from corpus/insert_statement/insert.txt
rename to test/corpus/insert_statement/insert.txt
diff --git a/corpus/insert_statement/on_conflict.txt b/test/corpus/insert_statement/on_conflict.txt
similarity index 100%
rename from corpus/insert_statement/on_conflict.txt
rename to test/corpus/insert_statement/on_conflict.txt
diff --git a/corpus/plpgsql/block.txt b/test/corpus/plpgsql/block.txt
similarity index 100%
rename from corpus/plpgsql/block.txt
rename to test/corpus/plpgsql/block.txt
diff --git a/corpus/plpgsql/for_statement.txt b/test/corpus/plpgsql/for_statement.txt
similarity index 100%
rename from corpus/plpgsql/for_statement.txt
rename to test/corpus/plpgsql/for_statement.txt
diff --git a/corpus/plpgsql/get_diagnostics_statement.txt b/test/corpus/plpgsql/get_diagnostics_statement.txt
similarity index 100%
rename from corpus/plpgsql/get_diagnostics_statement.txt
rename to test/corpus/plpgsql/get_diagnostics_statement.txt
diff --git a/corpus/plpgsql/if_statement.txt b/test/corpus/plpgsql/if_statement.txt
similarity index 100%
rename from corpus/plpgsql/if_statement.txt
rename to test/corpus/plpgsql/if_statement.txt
diff --git a/corpus/plpgsql/open_cursor_statement.txt b/test/corpus/plpgsql/open_cursor_statement.txt
similarity index 100%
rename from corpus/plpgsql/open_cursor_statement.txt
rename to test/corpus/plpgsql/open_cursor_statement.txt
diff --git a/corpus/plpgsql/raise_statement.txt b/test/corpus/plpgsql/raise_statement.txt
similarity index 100%
rename from corpus/plpgsql/raise_statement.txt
rename to test/corpus/plpgsql/raise_statement.txt
diff --git a/corpus/plpgsql/return_statement.txt b/test/corpus/plpgsql/return_statement.txt
similarity index 100%
rename from corpus/plpgsql/return_statement.txt
rename to test/corpus/plpgsql/return_statement.txt
diff --git a/corpus/select_statement/from.txt b/test/corpus/select_statement/from.txt
similarity index 100%
rename from corpus/select_statement/from.txt
rename to test/corpus/select_statement/from.txt
diff --git a/corpus/select_statement/join.txt b/test/corpus/select_statement/join.txt
similarity index 100%
rename from corpus/select_statement/join.txt
rename to test/corpus/select_statement/join.txt
diff --git a/corpus/select_statement/select.txt b/test/corpus/select_statement/select.txt
similarity index 100%
rename from corpus/select_statement/select.txt
rename to test/corpus/select_statement/select.txt
diff --git a/corpus/select_statement/value_expression.txt b/test/corpus/select_statement/value_expression.txt
similarity index 100%
rename from corpus/select_statement/value_expression.txt
rename to test/corpus/select_statement/value_expression.txt
diff --git a/corpus/update_statement.txt b/test/corpus/update_statement.txt
similarity index 100%
rename from corpus/update_statement.txt
rename to test/corpus/update_statement.txt
diff --git a/corpus/with_statement.txt b/test/corpus/with_statement.txt
similarity index 100%
rename from corpus/with_statement.txt
rename to test/corpus/with_statement.txt