Add progressbar and create CLI class