refactoring. started changing to one player