Update, Refactor - Finished (mostly)

- Needs tests
Update, Minor Edits / Deletions

- Stubbed out tests
- Deleted old files
- Minor edits to cli.py
- Updated TODO.md