worked on player game classes, need to integrate them
merge conflict resolve attempt