moved everything in to the cli class