Moved functions back into Player class