Adding state_rank for junior and senior
Use new state_rank field. Let name suffixes take precedent over new ones for now.