Refactored, player model removed - user model used instead