Added command line parse and user input parsing