WIP: refactor commands as normal Rinci functions