CLI should be in and stay in now