finished cli renaming, starting on framework