Work on command line parsing