Reverted CLI changes. Starting Over. :/