Merge pull request #1 from nunnerys14/master

sync with sam
even more player class referencing
Merge pull request #7 from AravAlexander/master

even more class references