Made some major changes to the Player class structure