Refactor to create a separate command line builder
Finishing the command line application