updated CLI to be MUCH cleaner. revved to v8, not pushed