Created a more full featured command line interface