Added player class, and player states