Merge pull request #3 from CacticalWarfare/temp

Zack's commit 3
Apparently things need committing
I hope I didn't break anything