Improved CLI, inspired by esheffield's fork