Command line almost done