Refactors ranks.  Adds some tentative base classes to names.