add functions to player class
merge conflict