Didn't change the way the program works, just made the source look better.
I wrote this a long time ago so it's a bit ugly and nonfunctional.
test commit 2