Almost done, just need to finish and test the logic to return a player when he is not playing, which is the most important piece of this enhancement :)