Chris
started the refactoring & added a test_cli.py
92cc291