Changes to the class structure. Fixed up ranks.