Started redesigning the command line argument parsing