Final Commit

Everything's working on my computer. Hopefully it's working properly on
yours too.