Some changes to server
Refactor into player