Further work and 'setup' command