Command overhaul.
1-layer sub-commands should be easier to add now.  This is mostly for automation and organization.