rearranging stuff for this branch so that the cli is the 'focus' for setup/publish/etc