Basic CLI seems to be about finished.