Cleanup and begin work on the rank command.