Final build of clean in prep for merge with Master. Broke CLI out into own class. Fully functional with Master branch.