Fill in command line runner and improve pass