Moved currentPlayer to service