Adds feature to switch players
Resolves merge confilicts