Final Commit

I wrote this on a bus with no internet connection, so this is my only commit.