Add Command-Line Happiness