Higher ranks

WIP for #58.