starting with player classes
merge files 7-37