Begin the switch to a new command handler (Again!)

Renamed Ranks class to Rank