diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d9caf2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+**/*.class
+wordbubbles.jar
+wordbubbles.war
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..eb2d547
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+JAVA  = /usr/bin/java
+# JAVAFLAGS = -version # -classpath $(LIBS)
+JAVAC = /usr/bin/javac
+JFLAGS = -g # -classpath $(LIBS)
+
+SRCS = main.java \
+	uk/org/mafoo/wordbubbles/Cell.java \
+	uk/org/mafoo/wordbubbles/ImpossibleException.java \
+	uk/org/mafoo/wordbubbles/Lexicon.java \
+	uk/org/mafoo/wordbubbles/Prison.java
+
+OBJS = ${SRCS:.java=.class}
+
+.SUFFIXES: .java .class
+
+all: build wordbubbles.jar
+
+run: all
+	$(JAVA) main
+
+.java.class:
+	$(JAVAC) $(JFLAGS) $<
+
+build: $(OBJS)
+
+clean:
+	rm -f $(OBJS)
+
+wordbubbles.jar: build
+	jar cf $(OBJS)
diff --git a/mkwar.sh b/mkwar.sh
new file mode 100755
index 0000000..266884f
--- /dev/null
+++ b/mkwar.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash -x
+
+make wordbubbles.jar
+mkdir -p war/WEB-INF/lib war/WEB-INF/classes
+cp wordbubbles.jar war/WEB-INF/lib
+# cp -r uk war/WEB-INF/classes
+cd war
+zip -r ../wordbubbles.war *.jsp WEB-INF
diff --git a/test.txt b/test.txt
deleted file mode 100644
index 1006baa..0000000
--- a/test.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# 5 5 6 6
- skct
-ileii
-ctvnn
-eahrg
-hcu
\ No newline at end of file
diff --git a/test2.txt b/test2.txt
deleted file mode 100644
index 3ea6509..0000000
--- a/test2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-test
-ar
-rt
-n
\ No newline at end of file