CLI almost works!