CLI Refactoring - Unhandled Rejection Issues Remain