HUGE OVERHAUL (:P)
Merge pull request #1 from ScoreUnder/master

Stuff