Working on command line functionality