Added Player/Puzzle Classes