work on progress bar, add badges