Better handling of user and command-line options. Allowing multiple repos