Progress on merging player and rank