MOD: Working on CLI some more