CLI-usage almost done