diff --git a/after/queries/go/matchup.scm b/after/queries/go/matchup.scm
new file mode 100644
index 0000000..6dd0a87
--- /dev/null
+++ b/after/queries/go/matchup.scm
@@ -0,0 +1,12 @@
+(function_declaration "func" @open.func) @scope.func
+(func_literal "func" @open.func) @scope.func
+
+(return_statement "return" @mid.func.1)
+
+; 'else' and 'else if'
+(if_statement
+  "else" @_start (if_statement "if" @_end)?
+  (#make-range! "mid.if.1" @_start @_end))
+
+; if
+(block (if_statement "if" @open.if) @scope.if)