Start porting over to use Cmdliner library