Changed to a docopt to allow for more control