Pre-player.update refactor
Merge branch 'master' of https://github.com/colourBlindTeam/colourBlind.git
Merge branch 'master' of https://github.com/colourBlindTeam/colourBlind.git
half broken, push to update