CLI complete. Better functionality