updating for better CLI goodness (as in, now working)