- Moved log for handling command line business into it's own unit