Quite a few changes, probably wont merge right :/
Fixed merge
Merge pull request #54 from OmgImAlexis/shnupbups

Quite a few changes, probably wont merge right :/