diff --git a/README.md b/README.md
index ec70a22..92ca68a 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,33 @@
# Typing Test
-
-#### Description
+
+## Description
The best way to test typing speed and accuracy for a user provided string. This JS + HTML combo can be run server or client side.
-#### Features / Todo
-- [ ] Fix ghost text in entry field
+### Features
+- Test any string
+- Can run local or server
+- Copy / Paste Protection
+- Gross and Net WPM
+- Error checker
+- Timer
+- Looks pretty!
+
+### Todo
+- [x] Fix ghost text in entry field
+- [ ] Improve progress bar
- [ ] Make the GUI look good
-- [ ] Database Implementation
-- [ ] Ballance WPM function
-- [ ] Test Everything
+- [ ] Database implementation
+- [ ] Balance WPM function
+- [ ] Test **Everything**
+
+
+## Footnotes
+###### Links
+[Link to this GitHub page.](https://github.com/SST-CTF/typing-test)
+
+[**Live demo coming soon!**](https://github.com/SST-CTF/typing-test)
-#### Credit and Links
-Otakar and Sterling from SST are currently working on this project. *More information will be added soon*
+[Link to our CTF (Programming) team / club.](http://sstctf.org)
+###### Questions?
+If you have any questions, feel free contact us: github@sstctf.org
+###### Credit
+Otakar and Sterling from SST are currently working on this project. *More information will be added soon*
diff --git a/TypingTest.htm b/TypingTest.htm
index 3adac92..a05bf7c 100755
--- a/TypingTest.htm
+++ b/TypingTest.htm
@@ -21,44 +21,19 @@
+