Large scale refactoring to make uplaoding player stats easier