More CLI Menu work