Some changes to handle ids instead of names of Player. It is almost incompleted yet