Worked some more on Player