Begun adding cli version