Re-org.  Work on CLI script