First version of rank cmd rework