Breaking apart cli.py
Filled out cli.py