Move to using thor for option parsing