Implement --non-interactive as per Juergens' request