diff --git a/.nvimrc b/.nvimrc
index 47ce77d..1cf1ebc 100644
--- a/.nvimrc
+++ b/.nvimrc
@@ -1,3 +1,3 @@
-noremap <F4> :!./build.sh<CR>
-noremap <F5> :!./run.sh<CR>
-noremap <F6> :!./test.sh<CR>
+noremap <F4> :!make build<CR>
+noremap <F5> :!make build && bin/kwil test_files/*.h<CR>
+noremap <F6> :!make test<CR>
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..e6ba46d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+build:
+	##### Compile kwil #####
+	gcc -o bin/kwil src/**.c -g -Itest_include -Wall
+
+run:
+
+test: build
+	##### Run kwil on test files #####
+	bin/kwil test_files/*.h
+
+	##### Compile test files #####
+	gcc -g -o bin/test test_files/*.c -Itest_include -Wall
+
+	##### Run test program #####
+	bin/test
+
+debug: build
+	ugdb -- bin/kwil test_files/**.h
+
+clean:
+	rm bin/**
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 993c2de..0000000
--- a/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-echo "Beginning build"
-bear -- \
-gcc -o bin/kwil src/**.c -g -Itest_include -Wall
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 7543790..0000000
--- a/run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-bin/kwil test_files/*.h
diff --git a/test.sh b/test.sh
deleted file mode 100755
index e59fc2d..0000000
--- a/test.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-echo ""
-echo "Beginning test"
-echo ""
-
-echo "" && echo "---- Running kwil ----" && \
-./run.sh && \
-echo "" && echo "---- Compiling test program ----" && \
-gcc -g -o bin/test test_files/*.c -Itest_include -Wall && \
-echo "" && echo "---- Running test program ----" && \
-bin/test
-
-if [[ $? == 0 ]]; then
-    echo ""
-    echo "Test succeeded"
-else
-    echo ""
-    echo "Test failed"
-fi