Some renaming to better reflect actual functions.
Started command line. Not pretty or actually working yet.