commenting out playerState
performing overdue namespace refactoring