Working on CmdLine Functionality